Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,484 Commits 1 Branch 0 Tags
9e0997d3c8c2d5d682ec84aa9a5e393fdcaf80fb
Commit Graph

3010 Commits

Author SHA1 Message Date
Christina Roberts
9e0997d3c8 Merge pull request #111 from edx/feature/christina/unify-fields 
Move "stringy" functionality into xblock fields
 2013-06-13 13:49:14 -07:00
Calen Pennington
e791e84ea7 Remove the stores_state field from XModule 
stores_state is now only used in a single test, in conjunction with
has_score. In practice, it's never the case that stores_state is false
when has_score is true, so we can delete stores_state entirely, and just
use has_score for the grading test.
 2013-06-13 14:38:59 -04:00
cahrens
9d0867ea11 Merge cleanup. 2013-06-13 11:31:10 -04:00
cahrens
c7e37887b3 Merge updates. 2013-06-13 11:22:34 -04:00
cahrens
fae8fd3841 Merge branch 'master' into feature/christina/unify-fields 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt
 2013-06-13 10:55:13 -04:00
cahrens
0f8d7c744c Test cleanup. 2013-06-13 10:42:23 -04:00
Peter Fogg
d52329be23 Merge pull request #128 from edx/peter-fogg/fix-video-captions-setting 
Make video captions respect course author's setting.
 2013-06-13 06:32:33 -07:00
cahrens
6e92ddf3dd Cannot set String field to a dict anymore! 2013-06-12 17:07:41 -04:00
cahrens
89d0003603 Be strict about ModelType expected types, rename Object as Dict. 2013-06-12 14:59:17 -04:00
cahrens
86d952bf91 Change to putting serialize/de-serialize directly in xml_module. 2013-06-12 13:34:38 -04:00
Brian Talbot
14100ba14c syncs up font-weight across problem button/input actions 2013-06-12 11:44:00 -04:00
Brian Talbot
832da3ad48 syncs styling rules for buttons/inputs to ensure consistency 2013-06-12 11:43:59 -04:00
Brian Talbot
050846af71 abstracts height rule to apply to the capa check, show, save actions 2013-06-12 11:43:59 -04:00
Brian Talbot
664efb9887 removes HTML elemements from problem action Sass selectors 2013-06-12 11:43:59 -04:00
Brian Talbot
a17bf5e2ce resolves height issue when display the check and show answer actions alongside problems 2013-06-12 11:43:59 -04:00
Calen Pennington
eccf800f47 Ignore files that don't exist when we try and delete them while compiling xmodule assets 2013-06-12 09:02:44 -04:00
Peter Fogg
fc6f0606c2 0;95;cRemove unnecessary boolean conversion. 2013-06-11 14:33:28 -04:00
Don Mitchell
64b909c5f0 Merge pull request #12 from edx/feature/dhm/timeconv 
Feature/dhm/timeconv
 2013-06-11 11:11:05 -07:00
Peter Fogg
8543043f86 Make video captions respect course author's setting. 2013-06-11 13:39:15 -04:00
Brian Talbot
d778f2e9b9 updates jasmine tests to correspond to new capa template HTML 2013-06-10 16:22:20 -07:00
Brian Talbot
8e30981f6f revises the show/hide answer input to use an HTML button element for accessibility purposes 2013-06-10 16:22:14 -07:00
Don Mitchell
5a8e4bff67 Test all date_utils variants 2013-06-10 17:16:35 -04:00
Don Mitchell
e4757452f0 Partial implementation of means to get xmodule from descriptor and 
attempt to test xmodule_modified (see fixme)
Removed obsolete else clause from before conversion
Ensure factories use datetime not struct_time for start date
Added more unit tests for settings encoder
 2013-06-10 17:16:35 -04:00
Don Mitchell
168cb306d3 Move tz_aware into connection config rather than settings. 
Make django use_tz
 2013-06-10 17:16:35 -04:00
Don Mitchell
909fe134f9 Added date_util tests back in and handle null time obj. 2013-06-10 17:16:34 -04:00
Don Mitchell
28f8910db4 Make pymongo tz_aware 2013-06-10 17:16:34 -04:00
Don Mitchell
855433341d Minor code review fixes (removing commented code). 2013-06-10 17:16:34 -04:00
Don Mitchell
e47f8b1765 Coding consistency changes for code review. 2013-06-10 17:16:34 -04:00
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
Don Mitchell
976280e693 Merge pull request #110 from edx/bug/dhm/baddrafts 
Have the draft module store actively prevent non-leaf nodes from being
 2013-06-10 12:01:49 -07:00
Ned Batchelder
62b2323588 Merge pull request #94 from edx/ned/fix-silly-xml-encoding-errors 
Fix encoding errors when hashing XML
 2013-06-10 10:45:37 -07:00
Ned Batchelder
fea6792637 In these tests, 'rendered_html' is neither rendered, nor HTML. Name it context_repr, since that's what it is. 2013-06-10 13:11:10 -04:00
Ned Batchelder
5bc7333ca8 Test the Unicode handling during construction of an ErrorModule directly. 2013-06-10 12:58:10 -04:00
Ned Batchelder
a841bf7d2e Use repr instead of str for getting context data via the system render function, so it works better for non-ASCII data. 2013-06-10 12:57:39 -04:00
cahrens
b0b3062a20 Allow a value of 0 for max attempts. STUD-264. 2013-06-10 11:51:25 -04:00
Ned Batchelder
979ee6844e Add to the test, a check that the XML file truly has a non-ASCII character in it. 2013-06-07 19:05:01 -04:00
cahrens
1273bc22b3 Additional test coverage. 2013-06-07 17:24:07 -04:00
Ned Batchelder
4896e44589 Write a test for the XML unicode conversion fix. 2013-06-07 17:07:33 -04:00
Ned Batchelder
aac7e364d3 Make the repr right. 2013-06-07 17:05:58 -04:00
cahrens
f3b92312d9 Add test for serialize/deserialize. 2013-06-07 15:58:31 -04:00
cahrens
0baec0a164 Move string fields, get rid of hard-coded list of booleans. 2013-06-07 15:45:34 -04:00
Don Mitchell
2266028921 Have the draft module store actively prevent non-leaf nodes from being 
saved as draft.
 2013-06-07 15:40:30 -04:00
Ned Batchelder
69f8bf7afa Fix weird formatting. 2013-06-07 09:58:12 -04:00
Ned Batchelder
ccaf8178fd Change a test to get at some Unicode issues. 2013-06-07 09:57:51 -04:00
Valera Rozuvan
01678c3be0 Merge pull request #70 from edx/valera/gst_fixes_hsph 
GST fixes
 2013-06-07 06:15:28 -07:00
Valera Rozuvan
d9651d7497 GST fixes. Removed red error messages preseneted to the user. The errors are now displayed when a flag is turned on. Added graphical_slider_tool tag to the list which shows staff debug info. 2013-06-07 16:12:50 +03:00
Valera Rozuvan
1956020f5c Overhaul of event log of load, play, pause, seek, speed-change events. 2013-06-07 16:05:02 +03:00
Valera Rozuvan
48edd4a2bf Experimenting with optimal event attachment strategy. 2013-06-07 16:05:02 +03:00
Ned Batchelder
d4db4c6dea Fix encoding errors when hashing XML 
We occasionally get UnicodeEncodeErrors from these two places,
because the XML is a Unicode string, and is implicitly encoded to ascii.
 2013-06-07 07:10:32 -04:00
Calen Pennington
5489a3b645 Merge pull request #44 from edx/feature/cale/run-all-tests 
Run all tests on jenkins
 2013-06-06 09:52:27 -07:00