Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
24,245 Commits 1 Branch 0 Tags
ef68541069c372b41ec1bebe4a8a360fa545f18b
Commit Graph

4831 Commits

Author SHA1 Message Date
Stephen Sanchez
573d3c89fc Updating settings and requirements for lms and cms to support file upload 2014-07-08 13:15:37 -04:00
Andy Armstrong
5f11aa9aee Revert "First attempt to fix split test" 
This reverts commit a16f5487bc.
 2014-07-07 16:49:11 -04:00
Andy Armstrong
a16f5487bc First attempt to fix split test 2014-07-07 16:40:17 -04:00
Tim Babych
34ac6abe1c Merge pull request #4316 from edx/anton/group-experiments 
BLD-1117, BLD-1217: Add read-only list of Group Configurations, Create feature flag.
 2014-07-07 20:03:43 +03:00
Tim Babych
453c583714 Hide GroupConfiguration behind feature flag in cms/templates/settings.html. 2014-07-04 08:23:35 +03:00
Tim Babych
a153092cb5 Add FEATURE['ENABLE_GROUP_CONFIGURATIONS'] and os.environ['FEATURE_GROUP_CONFIGURATIONS']. 2014-07-03 15:30:18 +03:00
louyihua
ac8d6fc1a6 Make the strings in "Advanced Settings" page localizable 
The fields should be translated before render into html templates.
 2014-07-03 10:57:26 +08:00
Andy Armstrong
220a028b82 Merge pull request #4282 from louyihua/fix-name-in-studio 
Misuse of 'gettext' in mako templates
 2014-07-02 14:43:32 -04:00
Calen Pennington
3893a9aee6 Merge pull request #4258 from cpennington/studio-deprecated-urls 
Make Studio able to handle deprecated key formats in urls
 2014-07-02 14:26:46 -04:00
clytwynec
c4a5299e55 Merge pull request #4283 from edx/clytwynec/lms_cms_joint_bokchoy_test 
add lms_base and cms_base urls to bokchoy envs
 2014-07-02 12:42:49 -04:00
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
louyihua
94faa6b836 Misuse of 'gettext' into mako templates 
To translate strings in mako templates, the pattern of ```${_()}``` should be used instead of ```gettext``` even if the strings to be translated is located in a ```script``` block.
 2014-07-02 20:59:18 +08:00
Christina Roberts
3f2a6d1edf Merge pull request #4241 from louyihua/fix-name-in-studio 
Change 'Course Name' to 'Course Run' in "Schedule & Details" page
 2014-07-01 11:53:20 -04:00
Ben McMorran
f670ff74e4 Uses ModuleStoreEnum in is_xblock_visible_to_students 2014-06-30 15:34:39 -04:00
Calen Pennington
1c882da397 Make Studio able to handle deprecated key formats in urls 2014-06-30 14:29:10 -04:00
Ben McMorran
09908bde4c Merge pull request #4229 from edx/studio/uses-mixed-modulestore-xblock-visibility 
Adds is_xblock_visible_to_students
 2014-06-30 12:00:52 -04:00
Nimisha Asthagiri
91f102c778 Merge pull request #4232 from edx/nimisha/modulestore-enum-constants 
ModulestoreEnum class.
 2014-06-30 08:58:03 -04:00
Nimisha Asthagiri
8dca8053f6 Fix branch settings. 2014-06-27 21:47:53 -04:00
Ben McMorran
397bdb4348 Adds is_xblock_visible_to_students 2014-06-27 14:52:14 -04:00
louyihua
5aaae2ebc4 Change 'Course Name' to 'Course Run' in settings.html 
The code behind uses course run to fill this field, so maybe the filed's name should be changed as well?
 2014-06-28 02:50:09 +08:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
Christine Lytwynec
d6ebf59dbe add lms_base and cms_base values to bokchoy envs 2014-06-27 13:52:00 -04:00
louyihua
7555c6ec0c Fix saving error of video editor in non-english translation 
Currently the code in ```tabs-aggregator.coffee``` uses the display name of a tab as the key to index the current tab. When a non-english translation is applied, the javascript code will get localized names instead of the original english names, which causes the following ```getValue``` function fails as it cannot reference the correct tab.
Use the 'data' attribute to store the original tab name.
 2014-06-27 14:08:44 +08:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540 
Refactor get_parent_locations STUD-1663
 2014-06-26 18:00:11 -04:00
cahrens
a4b172d9d8 Display names, help text, and "deprecated" for Advanced Settings. 
STUD-302, STUD-303
 2014-06-26 16:54:22 -04:00
Alexander Kryklia
35aacfb6f2 Merge pull request #4105 from edx/alex/remove_unused_code_when_downloading_from_youtube 
Remove unused code when download from youtube.
 2014-06-26 14:44:45 +03:00
Christine Lytwynec
96e5139d66 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py
 2014-06-25 13:51:31 -04:00
Alexander Kryklia
1f5c95ba9a Remove unused code when download from youtube. 2014-06-25 16:12:16 +03:00
Oleg Marshev
715fde27c4 Redirect Chinese students to a Chinese CDN for video. 2014-06-24 18:39:52 +03:00
Alexander Kryklia
a7251e06d4 Add possibility to run bok_choy tests in local env. 2014-06-23 14:44:48 +03:00
Andy Armstrong
20675857dc Merge pull request #3999 from edx/christina/updating-split-test 
Ability to change the associated group configuration for a split test
 2014-06-20 14:15:41 -04:00
cahrens
a395c2fa4b Complete Studio support for handling group configuration changes 
STUD-1658
 2014-06-20 11:41:23 -04:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00
Andy Armstrong
11c25e8c1a Add Studio handling for changes to group configurations 
STUD-1658
 2014-06-20 11:41:22 -04:00
Mat Peterson
3a35121099 Useless code path in import_from_xml causing errors removed 2014-06-20 13:21:40 +00:00
Sarina Canelake
4477c2857f Merge pull request #4156 from edx/sarina/fix-i18n-bugs 
Fix variable names to give context for translators
 2014-06-19 00:13:38 -04:00
Sarina Canelake
30c8da1596 Fix variable names to give context for translators 
fix other various i18n issues
 2014-06-18 23:28:39 -04:00
Ben McMorran
bba85e8037 Merge pull request #4154 from edx/benmcmorran/remove-datetuple 
Removes DateTuple field type
 2014-06-18 16:33:36 -04:00
Christina Roberts
b7eea135d4 Merge pull request #4119 from edx/christina/requirejs-promise 
Wait for scripts defined in common xmodule code to execute.
 2014-06-18 14:56:10 -04:00
Ben McMorran
a8817b83ab Removes DateTuple field type 2014-06-18 14:55:43 -04:00
Ben McMorran
702bdd36a9 Merge pull request #4060 from edx/benmcmorran/edit-tracking 
Tracks last edited date and user, and adds has_changes for blocks
 2014-06-18 13:13:26 -04:00
cahrens
3acf394d05 Wait for scripts defined in common xmodule code to execute. 
STUD-1792
 2014-06-18 13:11:37 -04:00
Ben McMorran
ea97dd4508 Tracks last edited date and user, and adds has_changes for blocks. 2014-06-18 11:36:49 -04:00
Jay Zoldak
14a80e9c3c Merge pull request #4114 from edx/zoldak/fix-negative-assertion 
Speed up test by fixing negative assertion
 2014-06-17 09:12:11 -04:00
Jay Zoldak
6d53bf710d Merge pull request #4115 from edx/zoldak/fix-test-captions-closed 
Speed up test for closed caption state
 2014-06-17 09:11:47 -04:00
zubair-arbi
6cb6680139 fix reply/return to annotation links 
STUD-1629
 2014-06-17 12:16:07 +05:00
Jay Zoldak
4ac1079a99 Speed up test for closed caption state 2014-06-16 13:59:19 -04:00
Jay Zoldak
c33261aefc Speed up test by fixing negative assertion 2014-06-16 13:47:14 -04:00
zubair-arbi
8e47219a8d trigger change event for file field while uploading pdf 
STUD-1775
 2014-06-16 14:06:33 +05:00
Andy Armstrong
6704d59db0 Allow xblocks to be added as advanced problem types 2014-06-13 17:51:46 -04:00