Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
23,800 Commits 1 Branch 0 Tags
7beaf4ed8a0b3f70ac023dade553e4abbfd0beee
Commit Graph

4771 Commits

Author SHA1 Message Date
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
Ben McMorran
d592b7eec1 Removes Conrad's name from the course schedule settings (STUD-1511). 2014-06-03 16:58:05 -04:00
Piotr Mitros
16078ba8a7 Added completion and audio XBlocks 2014-06-03 11:17:24 -04:00
Greg Price
0d37b4b254 Merge branch 'release' 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py
 2014-06-02 15:29:40 -04:00
Sarina Canelake
f683a4c576 Merge pull request #3943 from edx/flowerhack/cleanup-opaque-keys 
Change Location, CourseLocator, etc to reference opaque-keys library
 2014-05-30 17:38:27 -04:00
Julia Hansbrough
6ccb11f03e Change Location, CourseLocator, etc to reference opaque-keys library 2014-05-30 20:32:38 +00:00
Adam
e348ab9a9b Merge pull request #3937 from edx/adam/remove-qualaroo-studio 
removes qualaroo from studio (STUD-1684)
 2014-05-30 14:25:40 -04:00
Don Mitchell
77b8cbbaa9 Merge pull request #3932 from edx/dhm/bug_orphans 
Delete orphans was trying to get non-existent 'draft' modulestore
 2014-05-30 13:28:12 -04:00
Dave St.Germain
ed9ab3ad71 Merge pull request #3501 from edx/dcs/matlab-api-key 
Allow courses to set Matlab API key globally, in advanced settings.
 2014-05-30 11:40:32 -04:00
Mark Hoeber
2fd2eda6ea Merge pull request #3930 from edx/markhoeber/documentation/doc-446 
Studio Welcome, Sign Up, and Sign In pages Help and text fixes
 2014-05-30 11:31:30 -04:00
Don Mitchell
f0063d97c6 Delete orphans was trying to get non-existent 'draft' modulestore 2014-05-30 10:28:26 -04:00
Adam Palay
826aa4554c removes qualaroo from studio (STUD-1684) 2014-05-30 10:05:35 -04:00
Andy Armstrong
0a8b2649c7 Merge pull request #3933 from edx/andya/edit-container-fixes 
Fix the title of edit modals from the unit page.
 2014-05-30 09:38:36 -04:00
Andy Armstrong
5792e7e06a Fix the title of edit modals from the unit page. 2014-05-29 17:10:33 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library 
[LMS-2757]
 2014-05-29 17:03:35 -04:00
Mark Hoeber
97bc71bd23 Welcome page text edits 2014-05-29 15:44:59 -04:00
Mark Hoeber
714f440353 Update help for welcome, register, and login pages 
All now go to getting started, but have different tokens, for further
segmenting later.
 2014-05-29 15:34:49 -04:00
muhammad-ammar
026c6523e8 Merge pull request #3882 from edx/ammar/test-youtube-availibility 
Check YouTube Availability for Video Tests
 2014-05-29 23:53:58 +05:00
Don Mitchell
85565a3de8 lms dashboard ignores errored courses 2014-05-29 14:38:42 -04:00
Andy Armstrong
138cd45934 Merge pull request #3819 from edx/andya/edit-containers 
Allow editing of container xblocks/xmodules
 2014-05-29 14:33:26 -04:00
Julia Hansbrough
172c6d1559 Merge pull request #3905 from edx/flowerhack/change-hardcoded-defaults 
Moved hardcoded defaults into settings
 2014-05-29 14:23:06 -04:00
Andy Armstrong
6b3e100cc1 Allow editing of container xblocks/xmodules 
STUD-1312
 2014-05-29 14:02:45 -04:00
Carson Gee
7cb241b8cc Merge pull request #3717 from mitocw/cg/studio_addl_apps 
Add ADDL_INSTALLED_APPS to studio for parity with lms
 2014-05-29 13:22:36 -04:00
Muhammad Ammar
7afcb9348c Check YouTube Availabitlity for Video Tests 2014-05-29 15:08:47 +00:00
Calen Pennington
a2ce703327 Don't access course.id on ErrorDescriptors when listing courses from mongo 2014-05-29 10:25:32 -04:00
Don Mitchell
c37e241230 Make reverse matching robust to errored courses 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
 2014-05-29 10:17:24 -04:00
David Baumgold
502b285bc2 Merge pull request #3893 from louyihua/tinymce-ie-fix 
Make TinyMCE's HTML source code editor work under Internet Explorer
 2014-05-29 10:13:15 -04:00
David Baumgold
0f580a7e46 Merge pull request #3892 from louyihua/ie-fix 
Fix exception on Internet Explorer when adding first transcript language
 2014-05-29 09:09:05 -04:00
louyihua
c0511bd1a9 Build 'window.location.origin' for Internet Explorer 
As TinyMCE's CodeMirror plug-in uses 'window.location.origin' which is not supported by Internet Explorer, the HTML or raw code editor does not work under Internet Explorer.
We need to create one in order to make these vendor codes work under Internet Explorer.
 2014-05-29 12:50:11 +08:00
Julia Hansbrough
0d854bd51e Moved hardcoded defaults into settings 2014-05-28 20:44:26 +00:00
Dave St.Germain
0173eaf9d2 Updated payload for new matlab endpoint. 2014-05-28 15:32:46 -04:00
louyihua
551301a7ac Fix exception on Internet Explorer when adding first transcript language 
Internet Explorer throws an "Invalid argument" exception when uses an empty string as the parameter in ```namedItem``` method.
Change empty string into null value can maintain browser consistency.
 2014-05-28 23:44:50 +08:00
Don Mitchell
62bccd4e93 Split mongo correctly serializes and deserialized references 
STUD-1592, STUD-1603, LMS-2642
 2014-05-28 08:29:13 -04:00
Waheed Ahmed
6ad6f77ca2 Cheatsheet visibility code refactored. 2014-05-28 12:07:59 +05:00
Fred Smith
a5daa10eda copied from LMS aws_migrate settings 2014-05-27 16:06:29 -04:00
Don Mitchell
9d2db736df Merge pull request #3869 from edx/dhm/bug_get_children 
Redirect most studio access through draft modulestore
 2014-05-27 11:57:15 -04:00
Greg Price
f25dd8dd8b Merge pull request #3888 from edx/dhm/bug_get_children 
Redirect most studio access through draft modulestore
 2014-05-27 11:51:50 -04:00
Don Mitchell
1be1283f26 Redirect most studio access through draft modulestore 
rather than have caller figure out whether to call draft or direct.
Fixes get_children to always find draft children in studio.
STUD-1662
 2014-05-27 11:16:29 -04:00
Andy Armstrong
6b64b157a8 Merge pull request #3877 from louyihua/translation-fix-cms 
i18n: Make XBlock buttons & components have localizable display names
 2014-05-27 09:06:37 -04:00
polesye
db213bf325 BLD-967: Fix regExp. 2014-05-27 13:31:18 +03:00
louyihua
559a2c8888 i18n: Make XBlock buttons & components have localizable display names 
1. Current code uses type name as the display names for XBlock buttons, so the name of these five buttons can't be localized. This fix contains code that adds a 'display_name' field for the buttons, and makes their names localizable.
2. The display names of components in advanced, html and problem types can be localized now.
 2014-05-27 11:16:54 +08:00
Sarina Canelake
d1672e31f7 Opaque-keys: fix pylint violations 2014-05-24 19:36:09 -04:00
Sarina Canelake
d01af063a6 Merge pull request #3861 from edx/sarina/fix-quality 
Fix quality violations from opaque-keys
 2014-05-24 19:34:25 -04:00