Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,674 Commits 1 Branch 0 Tags
7ecf0e5bc1edbc46a4fb8dfd3253bcc4f6697a93
Commit Graph

3927 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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