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

4788 Commits

Author SHA1 Message Date
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
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