Diana Huang
eda6169b8b
Pass along a url creator as opposed to just a url through
...
the ModuleSystem.
2013-03-20 09:23:25 -04:00
Diana Huang
58e8f7db12
- Pep8 and pylint fixes
...
- beginnings of new Matlab input type
- update progress after getting a response from xqueue
2013-03-20 09:23:25 -04:00
Alexander Kryklia
05ba082c8f
Merge pull request #1692 from MITx/fix/valera/polls_firefox_button_not_blue
...
Bug fix for Polls tool.
2013-03-20 01:53:15 -07:00
jmclaus
8e7990598c
Merge branch 'master' into jmclaus/genex-save-state
2013-03-20 09:23:16 +01:00
Mark L. Chang
10ac7e04f8
copy finalized
2013-03-19 21:31:59 -04:00
Chris Dodge
e0d1449e91
add a finally statement to be sure to turn back on event firing on writes in case an import throws an exception
2013-03-19 17:42:21 -04:00
cahrens
f5bae8d8e3
Reduce pep8 warnings.
2013-03-19 17:29:06 -04:00
cahrens
b5a587d8d0
Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False.
2013-03-19 16:57:19 -04:00
John Jarvis
01d95b7ebe
fixing merge issues
2013-03-19 16:24:23 -04:00
John Jarvis
63d85a52dc
fixing merge issues
2013-03-19 16:22:36 -04:00
John Jarvis
78987cc400
resolving merge conflicts
2013-03-19 16:16:32 -04:00
Will Daly
66434d7d05
Moved XQueue mock from terrain into LMS, so that the
...
server is not created for cms tests.
2013-03-19 15:55:05 -04:00
Will Daly
20ccf5937b
Implemented CodeResponse lettuce tests
2013-03-19 15:55:05 -04:00
Will Daly
2087b81573
Created MockXQueueServer which listens on a local port
...
and simulates an XQueue.
2013-03-19 15:53:06 -04:00
Arthur Barrett
0710bbd70c
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-03-19 13:43:45 -04:00
Valera Rozuvan
0884051b32
Fixed bug where in firefox a marked poll button was not highlighted in blue.
2013-03-19 19:29:09 +02:00
e0d
39d451d92a
Merge pull request #1687 from MITx/hotfix/edz/pinning
...
Allow backwards compatibility for forums pinning UI.
2013-03-19 09:31:14 -07:00
jmclaus
57b43d7a6c
Genex now saves its state
2013-03-19 16:36:55 +01:00
Vasyl Nakvasiuk
3c645de43f
extend xmodule.ConditionalModule docstrings
2013-03-19 17:29:28 +02:00
Calen Pennington
8fda5af4e4
Comment cleanup
2013-03-19 10:54:46 -04:00
Calen Pennington
0209c883bb
Remove trailing whitespace
2013-03-19 10:41:38 -04:00
Calen Pennington
94d3ccf674
Always compute the metadata inheritance tree, even on a course module, so that when walking down the tree, we always get the right data
2013-03-19 10:41:12 -04:00
cahrens
dc89a4b3d5
Beginning of Selenium test, updates to work with master.
2013-03-18 21:25:44 -04:00
Arthur Barrett
1b08071fdc
merged from master and resolved conflict with annotatable module.
2013-03-18 15:51:27 -04:00
Arthur Barrett
7507f91d22
Added TODO and explanation for the top-level scss variables.
2013-03-18 15:43:43 -04:00
cahrens
49ee903eda
Merge branch 'master' into feature/btalbot/studio-checklists
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/template_loader.js
2013-03-18 15:30:19 -04:00
Jay Zoldak
a70a23a48e
Merge pull request #1680 from MITx/feature/will/courseware_lettuce_tests
...
Feature/will/courseware lettuce tests
2013-03-18 12:24:19 -07:00
cahrens
f6fb64f130
Saving checkbox state, client template for individual checklist.
2013-03-18 15:03:54 -04:00
Chris Dodge
e59b650fab
add an array of courses to not refresh the metadata cache on writes. This is needed for imports where we are doing bulk updates otherwise, the DB gets thrashed and the import takes too long, timing out the browser
2013-03-18 15:02:49 -04:00
VikParuchuri
9a59336b5e
Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite
...
Fix version handling for combined open ended
2013-03-18 11:58:38 -07:00
Jay Zoldak
b6e82afb0e
Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests
...
Fix/will/fix broken jasmine lms tests
2013-03-18 11:53:22 -07:00
Will Daly
568f557dfc
Pep8 fixes
...
Changed constant to uppercase
2013-03-18 13:57:26 -04:00
Brian Talbot
cdcdfd49e0
studio - alerts: resolving local master merge conflcits
2013-03-18 10:58:16 -04:00
Vasyl Nakvasiuk
f172405c9a
remove xml documentation from docs/source/
2013-03-18 15:37:29 +02:00
Chris Dodge
9a18685c1c
add a discussion module write through cache to speed up Forum rendering
2013-03-18 09:01:54 -04:00
Chris Dodge
3e65a68828
auto generate the discussion id on create. Also add 'discussion_id' to the list of 'system-metadata' so that end users cannot edit it
2013-03-15 23:01:03 -04:00
Chris Dodge
b54ebb3460
make discussion module use MetadataOnlyEditingDescriptor which will not present a code edit region and only display the metadata editor
2013-03-15 22:43:20 -04:00
Victor Shnayder
d91008b73a
Prevent random.Random() from running at import time.
2013-03-15 19:40:47 -07:00
Chris Dodge
03caf94c98
remove redundent XML attribtues which are in metadata
2013-03-15 16:26:39 -04:00
Vik Paruchuri
e4efda9a47
Reformat code
2013-03-15 16:21:36 -04:00
Will Daly
5fd1e7426d
Lettuce tests now import one_time_startup.py to ensure
...
that mongo caches are initialized for the test database.
This avoids a warning from the mongo modulestore.
2013-03-15 16:17:45 -04:00
Vik Paruchuri
cd3e88fdd5
Fix version tuples to be a dictionary
2013-03-15 16:05:38 -04:00
Vik Paruchuri
500c4ab86e
Convert versions to tuples
2013-03-15 15:40:04 -04:00
Vik Paruchuri
01b1974f50
Address review comment
2013-03-15 15:15:23 -04:00
Will Daly
3a13cd7b34
Merged changes in factories.py with version in master
2013-03-15 15:09:39 -04:00
Vik Paruchuri
b609ab0e6a
Convert to using versioninteger class
2013-03-15 15:05:47 -04:00
Vik Paruchuri
405ea8d675
Remove copy.copy
2013-03-15 14:57:48 -04:00
Vik Paruchuri
97839d9de5
Fix default version string integer issues
2013-03-15 14:52:55 -04:00
Victor Shnayder
64e1eb9903
Fix randomness bug in cohort placement
...
capa re-seeds the global RNG all the time, resulting in non-random
cohort placement. Switch to using a local random module.
(Thanks Cale for helping me figure this out!)
2013-03-15 11:35:27 -07:00
Vik Paruchuri
c34666af80
Fix version handling
2013-03-15 14:20:55 -04:00
