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

4864 Commits

Author SHA1 Message Date
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
polesye
d9d11a21ef BLD-933: Add table of contents. 2014-06-11 13:42:57 +03:00
Sarina Canelake
2aea261d48 Merge branch 'release' 
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
 2014-06-10 16:59:23 -04:00
Julia Hansbrough
2757ac4fcb Opaque-keys: response to code review 2014-06-09 15:13:31 -04:00
Don Mitchell
c808277007 Change document_class back to dict 2014-06-09 15:13:31 -04:00
Don Mitchell
acc02b0e09 Fix to excess asset query 2014-06-09 15:13:23 -04:00
Julia Hansbrough
e3459cd3cb Opaque-Keys: Response to code review 2014-06-09 15:12:22 -04:00
Julia Hansbrough
3f3e9724d0 Add fallback for org based roles 2014-06-09 15:10:49 -04:00
Brian Talbot
1209daa7f3 making system status notifications flexible based on content 2014-06-09 14:08:20 -04:00
Will Daly
b33a511172 Merge pull request #4001 from edx/will/ora2-i18n-js-strings 
Serve ORA2 JavaScript i18n strings
 2014-06-09 12:40:37 -04:00
Will Daly
dc34d753c0 Serve ORA2 JavaScript i18n strings 2014-06-09 11:35:09 -04:00
cahrens
5ab61fc4b2 Implement a custom editor for the split_module. 
STUD-1529
 2014-06-05 12:16:16 -04:00
polesye
7b2d67f209 BLD-1049: Allow the video player to work with redirected links. 2014-06-05 09:34:54 +03:00
benmcmorran
5dd7ffe7e3 Merge pull request #3979 from edx/benmcmorran/delete-page-confirmation 
Fixes delete page confirmation text.
 2014-06-04 11:39:47 -04:00
zubair-arbi
f19ad92ddf Merge pull request #3977 from edx/zub/bugfix/std1691-IEeditannouncement 
prevent caching of GET requests for xblock student view
 2014-06-04 20:15:22 +05:00
benmcmorran
6a89375245 Merge pull request #3980 from edx/benmcmorran/remove-conrads-name 
Removes Conrad's name from the course schedule settings (STUD-1511).
 2014-06-04 11:00:25 -04:00
Ben McMorran
b55736035a Fixes delete page confirmation text. 2014-06-04 09:39:17 -04:00
zubair-arbi
dbd9e56c6c prevent caching of GET requests for xblock student view 
STUD-1691
 2014-06-04 16:14:13 +05:00
zubair-arbi
56e0b86394 make only section name in headers editable 
STUD-1679
 2014-06-04 15:00:52 +05:00