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

23706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
benmcmorran
dbf4425ea0 Merge pull request #3957 from edx/benmcmorran/authors 
Adds Ben McMorran to authors file.
 2014-06-02 14:47:22 -04:00
Ben McMorran
1a0f57ac45 Adds Ben McMorran to authors file. 2014-06-02 14:44:44 -04:00
muhammad-ammar
4f55c827a6 Merge pull request #3948 from edx/ammar/check-youtube-for-bok-choy 
Check YouTube for Bok-Choy
 2014-06-02 23:27:25 +05:00
muhammad-ammar
ba673f8f21 Merge pull request #3949 from edx/ammar/improve-lettuce-youtube-availability-check 
Lettuce YouTube Check Improvements
 2014-06-02 23:25:09 +05:00
Will Daly
ba0bad1d0b Merge pull request #3955 from edx/will/ora2-release-2014-06-02T15.45 
ORA2 release-2014-06-02T15.45
 2014-06-02 13:50:03 -04:00
Anton Stupak
007fde03a1 Merge pull request #3951 from edx/anton/fix-relative-time 
RelativeTime: incorrect value after XML serialization.
 2014-06-02 20:11:37 +03:00
Muhammad Ammar
55f0d0f9d1 Check YouTube for Bok-Choy 2014-06-02 16:37:24 +00:00
Muhammad Ammar
84ac562831 Lettuce YouTube Check Improvements 2014-06-02 16:27:04 +00:00
muhammad-ammar
fd18165bbe Merge pull request #3682 from edx/ammar/bok-choy-video-tests-batch9 
Bok-Choy Video Tests Batch9
 2014-06-02 21:20:13 +05:00
David Baumgold
f17e0bc105 Merge pull request #3704 from louyihua/localization-fix 
i18n: Make .underscore files translatable
 2014-06-02 12:15:41 -04:00
Will Daly
1a90aa9fcd ORA2 release-2014-06-02T15.45 2014-06-02 11:47:53 -04:00
Sarina Canelake
31274a52dc Merge pull request #3480 from lduarte1991/lduarte-harvardx2 
Annotation Tool Clean up and Plugins
 2014-06-02 11:40:12 -04:00
srpearce
f33eb60c56 Merge pull request #3938 from edx/sylvia/docs/BLD-1049 
Sylvia/docs/bld 1049
 2014-06-02 11:29:26 -04:00
Sylvia Pearce
df83f7ab96 Fix typo 2014-06-02 11:27:46 -04:00
lduarte1991
b83e27fc9d Diacritic Plugin for Annotator Tool: Pull-request Fixes 
Making sure extension comes after annotator css
 2014-06-02 10:45:29 -04:00
lduarte1991
88d8813942 Diacritic Plugin for Annotator Tool: Added studio input 2014-06-02 10:45:29 -04:00
lduarte1991
de5edcffbb Diacritic Plugin for Annotator TooL: Added CSS and JS files 
- UI Fixes for Diacritic Mark Plugin
 2014-06-02 10:45:29 -04:00
polesye
865b69361f BLD-1060: Fix RelativeTime. 2014-06-02 16:48:59 +03:00
Anton Stupak
ee368da66b Merge pull request #3946 from edx/anton/i18n-code-response 
CodeResponse: fix i18n.
 2014-06-02 16:32:45 +03:00
Anton Stupak
1a9f98b2dd Merge pull request #3895 from edx/anton/i18n-choice-text-response 
BLD-724: ChoiceTextResponse i18n.
 2014-06-02 15:11:16 +03:00
Muhammad Ammar
d9fe111c5b Bok-Choy Video Tests Batch9 2014-06-02 11:48:40 +00:00
Waheed Ahmed
141c1cd2d6 Merge pull request #3755 from edx/waheed/lms2711-staff-debug-links-fixed-for-all-units 
Fixed links for units loaded via ajax.
 2014-06-02 16:04:59 +05:00
Waheed Ahmed
cc36162df1 Fixed links for units loaded via ajax. 
LMS-2711
 2014-06-02 14:19:19 +05:00
Waheed Ahmed
e6a9047f8a Merge pull request #3852 from edx/waheed/lms2737-fix-staff-debug-info-links 
Fixed staff debug info endpoints for staff member.
 2014-06-02 14:01:33 +05:00
Waheed Ahmed
cb2af13418 Fixed staff debug info endpoints for staff member. 
LMS-2737
 2014-06-02 12:26:27 +05:00
polesye
73df5a9343 BLD-724: ChoiceTextResponse i18n. 2014-06-02 09:22:25 +03: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
Sylvia Pearce
09efc6790c Add note strongly recommending .webm and .mp4 video format 2014-05-30 15:13:16 -04:00
Ben Patterson
049e9f0db4 Merge pull request #3919 from edx/benpatterson/clean-up-rbenv 
Ensure no old gems are left behind between test runs.
 2014-05-30 14:40:24 -04: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
Andy Armstrong
c389746a2a Describe Python support for multi-line comments 
Added more details around Python's support for multi-line translator comments.
 2014-05-30 11:45:23 -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
Carlos Andrés Rocha
8d84bfab0b Merge pull request #3926 from rocha/update-event-tracking-version 
Updated version of event-tracking library to 0.1.0
 2014-05-30 11:28:27 -04:00
Will Daly
ebbcf59f8a Merge pull request #3936 from edx/will/update-ease 
Update EASE in edx-platform requirements
 2014-05-30 11:26:49 -04:00
David Baumgold
30dd47a62c Merge pull request #3907 from lduarte1991/lduarte-harvardx-image2 
Annotation Tools: Load Tinymce in student_view
 2014-05-30 10:51:46 -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
David Baumgold
0c9d682df3 Merge pull request #3196 from mtyaka/enrollment-emails-http 
Don't hardcode https protocol in enrollment emails.
 2014-05-30 09:30:43 -04:00
Will Daly
684c6fad98 Update EASE in edx-platform requirements 2014-05-30 09:26:25 -04:00
Ben Patterson
1b67aebbe5 Run bundle clean after bundle install 
Running it beforehand was resulting in a corrupted state
if it was the first time bundle install was run.
 2014-05-30 07:40:18 -04:00
Oleg Marshev
aeaddef301 Merge pull request #3917 from edx/oleg/add-span-tag-matlab 
Accept span tag from xqueue. BLD-1006.
 2014-05-30 12:02:07 +03:00
Oleg Marshev
daf4840cb6 Add span tag. 2014-05-30 10:30:23 +03:00
Sarina Canelake
0a30f24e26 Merge pull request #3754 from theJohnnyBrown/empty-course-error 
show a friendly message for an empty course rather than an error page
 2014-05-29 21:07:42 -04:00
Sarina Canelake
5c9fe4bb7a Merge pull request #3929 from edx/sarina/lms-2786 
Fix location.url [LMS-2786]
 2014-05-29 21:01:46 -04:00
Sarina Canelake
0f2b4cd2b6 Merge pull request #3931 from edx/sarina/fixup-external-opaque-keys-impls 
Use external OpaqueKey implementations
 2014-05-29 18:23:08 -04:00