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

6068 Commits

Author SHA1 Message Date
Julia Hansbrough
7beaf4ed8a Merge pull request #4019 from lduarte1991/lduarte-harvardx-pr2 
Annotation Tools Reverting commit @3bfb633 and updating openseadragon.js for latest build
 2014-06-06 17:30:03 -04:00
lduarte1991
894428ea9a Reverting commit @3bfb633 and updating openseadragon.js for latest build 2014-06-06 15:40:03 -04:00
Julia Hansbrough
d2b2699166 Merge pull request #3969 from lduarte1991/lduarte-harvardx-pr2 
Annotation Tool: Urgent update for ChinaX AB Testing
 2014-06-06 13:55:10 -04:00
lduarte1991
3bfb633fd3 Annotator Tool: Fixed delete bug and factored out settings 
Removed print context
 2014-06-06 12:39:35 -04:00
lduarte1991
54974a51ca Annotation Tools: Added CommonAnnotatorMixin 2014-06-06 10:09:22 -04:00
benmcmorran
aca0971a06 Merge pull request #3997 from edx/benmcmorran/template-text-formatting 
Reformats markdown problem templates avoid extra line breaks.
 2014-06-05 15:33:55 -04:00
Ben McMorran
914f0f7415 Fixes spelling of Michigan in template. 2014-06-05 14:07:03 -04:00
Ben McMorran
da6c337702 Revert "Fixes spelling of Michigan in template." 
This reverts commit 9e9e69ace3.
 2014-06-05 14:03:49 -04:00
Ben McMorran
9e9e69ace3 Fixes spelling of Michigan in template. 2014-06-05 13:59:40 -04:00
lduarte1991
68acf66f6c Annotation Tools: PR Fixes 
- Fixed camel case for variable name
- Fixed indentation in imageannotation.html
- Changed all mentions of Instructor Username to Email
- Turned annotation_mode into phrase
- Fixed indentation in imageannotation.html
- Added comments in imageannotation.html

- Changing annotation_mode in OSDA
 2014-06-05 13:05:37 -04:00
Ben McMorran
e18fd76d07 Reformats markdown problem templates avoid extra line breaks. 2014-06-05 12:54:39 -04:00
lduarte1991
50e8ae9a6e Image Annotation Tool: Added Instructor Filter 2014-06-05 12:47:48 -04:00
lduarte1991
1dcf2dc10a Video Annotation Tool: Added Instructor Filter 2014-06-05 12:47:48 -04:00
lduarte1991
8429897c82 Text Annotation Tool: Added Instructor Filter and Clear Search 2014-06-05 12:47:48 -04:00
cahrens
5ab61fc4b2 Implement a custom editor for the split_module. 
STUD-1529
 2014-06-05 12:16:16 -04:00
Alexander Kryklia
2eae8b8380 Merge pull request #3981 from edx/alex/fix_matlab_check 
Improve escaping in code response.
 2014-06-05 15:59:28 +03:00
polesye
7b2d67f209 BLD-1049: Allow the video player to work with redirected links. 2014-06-05 09:34:54 +03:00
Alexander Kryklia
97e8f94379 Improve escaping in code response. 2014-06-03 18:56:36 +03:00
Nick Parlante
0039536fe2 Merge pull request #3872 from edx/nick/disable-masking 
Temporarily disable masking
 2014-06-02 13:21:47 -07: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
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
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
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
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
polesye
73df5a9343 BLD-724: ChoiceTextResponse i18n. 2014-06-02 09:22:25 +03: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
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
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
Oleg Marshev
daf4840cb6 Add span tag. 2014-05-30 10:30:23 +03:00
Nick Parlante
3ef1e0f7ad Temporarily disable capa name masking 
There is a bug I need to fix when a student re-visits a problem that they
had solved previously without masking enabled, their old state does not
load correclty.

It's simplest to turn off masking now, and re-enable it with the whole fix.

The change here is a small deletion to remove the masking=True logic, and more
lengthy changes to adjust the tests.
 2014-05-29 22:12:43 -07: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
Johnny Brown
0bd2286e5b show a friendly message for an empty course rather than an error page 2014-05-29 16:55:40 -05:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library 
[LMS-2757]
 2014-05-29 17:03:35 -04:00
Andy Armstrong
6b3e100cc1 Allow editing of container xblocks/xmodules 
STUD-1312
 2014-05-29 14:02:45 -04:00
lduarte1991
a4c912a05b Annotation Tools: Fixing tests for student_view 
Fixed typo from autocomplete

Fixed dict for tests
 2014-05-29 11:34:40 -04:00
lduarte1991
1d6f3c631d Annotation Tools: Load Tinymce in student_view 2014-05-29 11:34:40 -04:00
Don Mitchell
701eac33ec get_courses doesn't return ErrorDescriptor 2014-05-29 11:01:56 -04:00
Calen Pennington
81d785d192 Merge pull request #3862 from cpennington/external-opaque-keys 
Extract opaque_keys into a separate library
 2014-05-29 10:21:48 -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
Anton Stupak
50e820db4e Merge pull request #3916 from edx/anton/fix-choice-text-response 
Fix ChoiceTextResponse.
 2014-05-29 15:56:30 +03:00
jmclaus
f45dc94930 JavascriptResponse i18n. [BLD-737] 2014-05-29 13:49:04 +02:00
Anton Stupak
79a0cd2445 Merge pull request #3902 from edx/anton/i18n-choice-group 
ChoiceGroup  i18n.
 2014-05-29 11:47:09 +03:00
polesye
1f7d59de5b BLD-1103: Fix ChoiceTextResponse. 2014-05-29 11:03:15 +03:00
Dave St.Germain
0173eaf9d2 Updated payload for new matlab endpoint. 2014-05-28 15:32:46 -04:00
Dave St.Germain
964e73f053 Allow courses to set Matlab API key globally, in advanced settings. 2014-05-28 15:32:46 -04:00
David Adams
54e1faea47 Merge pull request #3394 from edx/dcadams/parse_query_params 
Parse urls with query params for ^/static
 2014-05-28 10:59:54 -07:00