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

2995 Commits

Author SHA1 Message Date
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
Don Mitchell
64b909c5f0 Merge pull request #12 from edx/feature/dhm/timeconv 
Feature/dhm/timeconv
 2013-06-11 11:11:05 -07: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
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
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
Vasyl Nakvasiuk
45e32107e7 video module: remove old methods 2013-06-06 16:46:47 +03:00
Vasyl Nakvasiuk
68716f99cc video module: _get_timeframe -> get_timeframe 2013-06-06 16:46:47 +03:00
Anto Stupak
8b06916eb6 Fix tests for firefox 2013-06-06 16:45:16 +03:00
Anton Stupak
7eb18fe019 adds test files for video 2013-06-06 16:45:16 +03:00
Calen Pennington
16fc7b37fb Make xmodule_assets incremental, rather than removing the entire generated asset tree 2013-06-05 13:08:53 -04:00
Chris Dodge
4391783248 add exporting of 'about' content as well as adding unit test checks 2013-06-05 12:40:09 -04:00
Diana Huang
ff7b851f95 Merge pull request #4 from edx/diana/fix-error-descriptor 
Ensure that the original error gets preserved by the ErrorModule
 2013-06-05 07:39:40 -07:00
Joe Blaylock
e092aadbf9 Merge pull request #48 from edx/jrbl/substitute-anonymous-user-id-in-html 
Expose site-wide anonymized ids to HTML module
 2013-06-04 14:13:59 -07:00
Diana Huang
d895c64f4a Use full descriptor when showing errors, not just the model data. 2013-06-04 10:43:06 -04:00
Diana Huang
f3b36b8bc9 Use from_descriptor instead of from_xml to make ErrorDescriptor 2013-06-03 17:21:41 -04:00
Joe Blaylock
6262274805 Expose site-wide anonymized ids to HTML module 
Co-authored-by: Nate Hardison <natehardison@gmail.com>
 2013-06-03 11:35:42 -07:00
jkarni
4bc27b930c Merge pull request #47 from edx/hotfix/jkarni/folditpartialcred 
Add partial credit for foldit
 2013-06-03 09:19:10 -07:00
Julian Arni
198d63db86 Update docstring for get_score 2013-06-03 12:13:05 -04:00
Julian Arni
c639bbc6f0 Add partial credit for foldit 2013-06-03 11:15:45 -04:00
Peter Fogg
8c5f9e6e41 Fix merge conflict. 2013-06-03 08:49:52 -04:00