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
Will Daly
e41bb8462c
Added lettuce tests for script (customresponse) problems.
...
Increased wait time for login screen to reduce false positives.
2013-03-15 14:04:22 -04:00
Will Daly
8423816076
LMS contentstore lettuce tests now dynamically create courses in mongo
...
using terrain.factories.py and capa.tests.response_xml_factory
2013-03-15 14:04:22 -04:00
Will Daly
e6466fdddc
Changed user creation so that it creates the user only if it doesn't
...
already exist
Updated login dialog handling to workaround multiple login dialogs
that sometimes appear on a page (where the first one is hidden)
2013-03-15 14:02:20 -04:00
Will Daly
90213d483c
Wrote lettuce tests for drop-down, multiple choice, and checkbox
...
problems.
2013-03-15 14:02:20 -04:00
Your Name
53257a3c47
i need more sleep:
2013-03-15 12:47:28 -04:00
Your Name
68cb63daa8
accidentally deleted models file
2013-03-15 12:42:59 -04:00
Brian Talbot
84a5475d5a
studio - sass cleanup: resolving conflicts with local master merge
2013-03-15 12:42:33 -04:00
Arthur Barrett
20767d5cc7
create notes djangoapp for annotator.js
2013-03-15 12:41:52 -04:00
Your Name
a761e2e829
make pinning backward compatible
2013-03-15 12:38:28 -04:00
Calen Pennington
f1d4096bcd
Mark snippets as raw strings to avoid having to escape backslashes
2013-03-15 11:52:50 -04:00
Calen Pennington
9f99c9004b
Fix up capa tests
2013-03-15 11:28:33 -04:00
Calen Pennington
6b64b4214f
Make relative imports explicitly relative
2013-03-15 11:23:22 -04:00
Calen Pennington
f1c66e9178
Make common/djangoapps not a python module either
2013-03-15 11:16:15 -04:00
Calen Pennington
fd3ba7db2a
Don't make cms.djangoapps a python module
2013-03-15 10:50:46 -04:00
Calen Pennington
fb8352e2cc
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
2013-03-15 10:33:54 -04:00
Calen Pennington
8531d56268
Merge pull request #1665 from MITx/jmpm-analytics
...
Enables basic analytics tab in instructor dashboard
2013-03-15 07:06:02 -07:00
Calen Pennington
029d8c8085
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
2013-03-15 09:46:47 -04:00
Calen Pennington
116ecf2a50
Disable sequence nav buttons when the sequence is empty
2013-03-15 08:39:24 -04:00
Calen Pennington
44e6572e12
Make StringyInteger and StringyFloat return None when they can't parse the string from json, and don't try to overwrite max_attempts if it's ''
2013-03-15 08:25:27 -04:00
Brian Talbot
1aa8786b53
studio - checklists: added in smoothscrolling to in-page links across Studio but used only on checklists currently
2013-03-14 19:07:03 -04:00
Will Daly
ce5e86895a
Fixed pep8
2013-03-14 14:45:08 -04:00
Will Daly
5e433cda2e
Clarified comments about the logic of showing the save button
2013-03-14 14:43:04 -04:00
Will Daly
4dabb4ceb6
Save button no longer appears for non-randomized problems unlimited attempts
2013-03-14 14:34:36 -04:00
Chris Dodge
5070e5b209
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
2013-03-14 14:01:07 -04:00
Chris Dodge
d2f216615f
move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled
2013-03-14 13:57:48 -04:00
Valera Rozuvan
c54ad38fef
Better positioning of elements draggables with labels in slider.
2013-03-14 19:42:55 +02:00
Brian Talbot
0aea85a4d9
studio - checklists: moved content to yaml file, cleaned up new checklists production view, added in page-level nav, and collapse/expand indicators
2013-03-14 12:55:44 -04:00
cahrens
e0207432ca
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
2013-03-14 09:23:05 -04:00
cahrens
54156b7ac1
Saving work.
2013-03-14 09:22:58 -04:00
Peter Baratta
bac9f1f571
Merge branch 'master' into peter/symbolic
2013-03-14 06:31:17 -06:00
Kevin Chugh
8d766c4b51
fix conflict
2013-03-13 21:01:37 -04:00
Calen Pennington
3211221f98
Merge pull request #1664 from MITx/feature/cdodge/cache-metadata-inheritence-in-django-cache
...
use django caching to hold computed metadata inheritence. Also invalidat...
2013-03-13 17:13:02 -07:00
Your Name
7f877344d6
added comment to explain sorting
2013-03-13 19:47:19 -04:00
Your Name
896ee094c6
added comment to explain sorting
2013-03-13 19:44:41 -04:00
Your Name
117be695cb
candidate without inline
2013-03-13 18:40:10 -04:00
David Ormsbee
c0efb0136e
Merge branch 'master' into jmpm-analytics
2013-03-13 16:55:54 -04:00
Your Name
08bc073fa5
updates
2013-03-13 16:40:04 -04:00
Chris Dodge
c67f1677fd
remove imports of Mongo.py from modules. They shouldn't need them. Also, video captions shouldn't need special logic to compute the url rewrites as the main get_html() should do this.
2013-03-13 15:57:38 -04:00
Chris Dodge
413aeed1b3
use django caching to hold computed metadata inheritence. Also invalidate the cache entries on writes (insert, updates)
2013-03-13 15:33:15 -04:00
Your Name
a2f9e4d565
almost there
2013-03-13 15:29:57 -04:00
Calen Pennington
a9c5a6388c
Update to version of xblock that supports full inheritance of field attributes
2013-03-13 14:51:10 -04:00
Your Name
7450128064
update coffeescript
2013-03-13 12:52:07 -04:00
Calen Pennington
531eb80eb2
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-13 12:18:04 -04:00
Calen Pennington
5379a9fd2b
Make the id property available on both modules and descriptors, and make it a property, so that we aren't duplicating the location data
2013-03-13 11:56:53 -04:00
