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

2966 Commits

Author SHA1 Message Date
cahrens
b0b3062a20 Allow a value of 0 for max attempts. STUD-264. 2013-06-10 11:51:25 -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
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
Christina Roberts
52b76c87f4 Merge pull request #11 from edx/feature/christina/metadata-ui 
Feature/christina/metadata ui
 2013-06-01 16:01:53 -07:00
VikParuchuri
4a997842c7 Merge pull request #2 from edx/fix/vik/single-step-oe 
Fix js that prevented single step OE problems (ie only self assessment) ...
 2013-05-31 12:10:45 -07:00
Vik Paruchuri
badd3a8d13 Properly stub out the controller_qs variable in the tested module. Test times out without this. 2013-05-31 13:14:19 -04:00
Vik Paruchuri
9281a80089 Fix js that prevented single step OE problems (ie only self assessment) from working 2013-05-31 13:08:41 -04:00
marco
290d049c29 Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui 2013-05-31 12:41:13 -04:00
marco
72e1fab1c4 SASS variable and naming standards sync-up based on @talbs feedback completed 2013-05-31 12:40:40 -04:00
cahrens
ab5834fb41 Pylint cleanup. 2013-05-31 11:26:19 -04:00
cahrens
8fd15ce45d Review feedback. 2013-05-30 14:13:10 -04:00
cahrens
14eb9c9a3b Merge branch 'master' into feature/christina/metadata-ui 2013-05-30 12:27:03 -04:00
Diana Huang
5118b06ef2 Merge pull request #2147 from edx/diana/fix-error-descriptor 
Fix XML Error Module so that it no longer shows the data to non-staff.
 2013-05-30 08:52:41 -07:00
Peter Fogg
6eeb12ad1c Add Lettuce tests for autoplay in Studio. 2013-05-30 11:34:15 -04:00
chrisndodge
5eaa6aea23 Merge pull request #2140 from edx/fix/cdodge/add-randomize-to-list-of-collections 
add the new category which can act as a category
 2013-05-30 06:20:21 -07:00
cahrens
b2fe7f5c01 Update documentation (per Toddi). 2013-05-29 17:19:33 -04:00
Peter Fogg
5465bda5f3 Use MITX_FEATURES to tell if we're in the CMS; this is much cleaner. Also use $.data instead of a hidden div. 2013-05-29 17:00:25 -04:00
cahrens
f0260757c5 Cleanup. 2013-05-29 16:50:22 -04:00
Diana Huang
910324fb49 Fix XML Error Module so that it no longer shows the data to non-staff. 2013-05-29 16:31:11 -04:00
cahrens
d7a1dda937 Update display name. 2013-05-29 16:23:31 -04:00
Peter Fogg
3bfe3de679 Do autoplay in lms, not in cms. 2013-05-29 16:07:43 -04:00
Peter Fogg
81d3aa1464 Use self.system.debug instead of self.system.course_id; this seems less hacky. 2013-05-29 16:00:43 -04:00
cahrens
b77919a849 Remove unnecessary fields. 2013-05-29 15:53:30 -04:00
Peter Fogg
0332d22a02 Prevent autoplaying of videos in Studio. 2013-05-29 15:52:42 -04:00
cahrens
551a1c1516 pep8 and documentation cleanup. 2013-05-29 15:47:46 -04:00
Peter Fogg
e0d5118ca0 Add hidden HTML so that the video player knows whether or not we're in the LMS. 2013-05-29 15:45:36 -04:00
chrisndodge
42a55fafb2 Merge pull request #1714 from edx/feature/valera/videoalpha1_studio 
Added videoalpha version 1 to the advanced components in studio.
 2013-05-29 12:01:18 -07:00
cahrens
e3bc5e6bef Update for metadata changes. 2013-05-29 14:43:31 -04:00
Chris Dodge
25dae57226 add the new category which can act as a category 2013-05-29 11:16:33 -04:00
cahrens
625c6b518c Cleanup, change how we load templates. 2013-05-28 14:07:35 -04:00
cahrens
f3d4381fde Minor cleanup. 2013-05-28 12:53:00 -04:00
cahrens
2c32200cce Updated text per Alex's e-mail. 2013-05-28 11:12:22 -04:00