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

8351 Commits

Author SHA1 Message Date
Anton Stupak
29ec66facd Merge pull request #3885 from edx/anton/fix-video-outline 
Remove Video player outline.
 2014-05-27 16:41:30 +03:00
Diana Huang
eb8f696964 Merge pull request #3886 from edx/diana/clean-up-outdated-files 
Remove some outdated code.
 2014-05-27 09:35:22 -04:00
Andy Armstrong
c5d23b4aa7 Merge pull request #3876 from louyihua/localization-fix-video 
i18n: Fix an i18n string extraction problem in 02_html5_video.js
 2014-05-27 09:05:48 -04:00
muhammad-ammar
fb16e013fd Merge pull request #3694 from edx/ammar/bok-choy-video-time-tests 
Bok-Choy Video Time Tests
 2014-05-27 17:08:21 +05:00
polesye
dc818d41a0 BLD-975: Remove Video player outline. 2014-05-27 15:04:28 +03:00
Muhammad Ammar
510d0ae153 Bok-Choy Tests for Video Start Time, End Time and Finish Time 2014-05-27 10:37:26 +00:00
polesye
db213bf325 BLD-967: Fix regExp. 2014-05-27 13:31:18 +03:00
louyihua
1208908b57 i18n: Fix an i18n string extraction error in 02_html5_video.js 
Replace a string concation to a single string to prevent the partial extraction of the string.
 2014-05-27 12:59:23 +08:00
Andy Armstrong
926ce567a6 Merge pull request #3878 from louyihua/master 
i18n: More extractable & localizable strings in xmodules
 2014-05-26 15:08:14 -04:00
louyihua
63ef3bd05a i18n: More extractable & localizable strings in xmodules 2014-05-26 15:30:01 +08:00
polesye
8c26fc6805 Refactor video volume control. 2014-05-26 09:48:27 +03: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
Julia Hansbrough
6f7bc7e174 Fixed some TODOs, removed irrelevant ones 2014-05-24 18:49:06 -04:00
Sarina Canelake
110719deae StaffFactories accept course_keys, not courses. Make that clear in the interface. 2014-05-24 18:49:06 -04:00
stv
e4df2c2ceb Add 'forum_roles' endpoint to user_api 
Expose a new endpoint to query a list of users based on a
role name (Moderator, Student, etc.) and a course_id.

This will initially be used by the notifier to send daily digest
messages to forum moderators.
 2014-05-23 13:07:04 -07:00
lduarte1991
e4e4b32c62 Image Annotation Tool: Add linkback functionality to image thumbnails 
Changes requested in PR
 2014-05-23 14:59:31 -04:00
lduarte1991
0318c95537 Image Annotation Tool Fixes 
- Added component to view

- Added correct images for OSD

- Fixed path to codemirror

- Tinymce fullscreen works now

- Pep8/Pylint Fixes

- Default image changed and added call to super
 2014-05-23 14:58:18 -04:00
lduarte1991
008bbc224b Image Annotation Tool: Add static images for openseadragon navigation 2014-05-23 14:57:48 -04:00
lduarte1991
32e96681f6 Image Annotation Tool: create xmodule and install js files 2014-05-23 14:57:23 -04:00
lduarte1991
c24252001c Annotation Tools: Add helper functions and fixed pep8/pylint errors 
Small plugin fixes
 2014-05-23 14:57:16 -04:00
Sarina Canelake
265fa826ca Opaque-keys: fix pylint violations 2014-05-23 14:23:12 -04:00
Sarina Canelake
bf32f5a7b9 Opaque-keys: fix pep8 violations 2014-05-23 14:22:54 -04:00
Calen Pennington
9feff62857 Merge pull request #3834 from cpennington/ok-merge-from-master 
Merge master into opaque-keys
 2014-05-23 11:36:52 -04:00
Calen Pennington
29f7fe14fb Merge remote-tracking branch 'edx/master' into ok-merge-from-master 2014-05-23 10:05:56 -04:00
muhammad-ammar
ff1e9466be Merge pull request #3849 from edx/ammar/uniqe-course-fix 
Unique Course Fix
 2014-05-23 19:04:07 +05:00
Muhammad Ammar
3919b4a47b Unique Course Fix 2014-05-23 13:29:12 +00:00
polesye
2133ebd0a2 BLD-1033: Fix transcript displaying on iPad. 2014-05-23 08:31:26 +03:00
Andy Armstrong
b6f933a1f5 Merge pull request #3838 from louyihua/translation-fix 
i18n: Make static strings in xmodule files extractable
 2014-05-23 00:30:22 -04:00
Calen Pennington
35083ad9f9 Fix bad uses of course_id/location/locator in new code on master 2014-05-22 16:24:02 -04:00
Calen Pennington
240fcc1d5a Fix merge conflicts 2014-05-22 16:24:02 -04:00
Diana Huang
db0cd78152 Remove some outdated code. 2014-05-22 15:39:29 -04:00
Jay Zoldak
72cb5ec93f Merge pull request #3828 from edx/ammar/flaky-for-video-tests 
Flaky for Bok-Choy Video Tests
 2014-05-22 15:12:11 -04:00
louyihua
a6bae4d238 i18n: Make static strings in xmodule files extractable 
They can now be extracted.
 2014-05-23 01:58:19 +08:00
Diana Huang
a69e42dd5a Merge pull request #3830 from edx/diana/fix-cohorting 
Fix cohorting views
 2014-05-22 12:13:15 -04:00
Diana Huang
ae95e07cce Deserialze values coming into course_groups views 2014-05-22 12:11:48 -04:00
Dave St.Germain
7bbffd8bee Merge pull request #3254 from edx/dcs/a11y-dragdrop 
This fixes a few accessibility problems with drag and drop
 2014-05-22 11:45:04 -04:00
Sarina Canelake
c7bf96f048 Merge pull request #3822 from edx/sarina/course-modes-display 
Sarina/course modes display
 2014-05-22 11:40:15 -04:00
Don Mitchell
1223c8a08d has_course was incorrect, fixed 2014-05-22 10:52:24 -04:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
 2014-05-22 10:52:00 -04:00
Muhammad Ammar
33d01232de Flaky is a plugin for nose that automatically reruns flaky tests. 2014-05-22 14:51:57 +00:00
Dave St.Germain
285c07fc22 Addressed review feedback. 2014-05-22 10:40:31 -04:00
louyihua
34d2f051a4 i18n: Make checklists translatable 
Now the description & action_text strings in checklists can be extracted and translated.
 2014-05-22 22:15:45 +08:00
Dave St.Germain
232df30b3e support aria-grabbed and aria-dropeffect 2014-05-22 09:51:50 -04:00
Dave St.Germain
f4391b5eb9 fixing drag and drop 2014-05-22 09:51:50 -04:00
Calen Pennington
4b69cf5472 Merge pull request #3810 from cpennington/ok-management-commands 
Fix management commands
 2014-05-21 21:53:43 -04:00
Calen Pennington
75ad81bea3 Merge pull request #3813 from cpennington/ok-mongoengine-fields 
Make mongoengine field for UsageKeys expect a Location
 2014-05-21 20:35:55 -04:00
Sarina Canelake
4723467345 Validate forms to allow old and new style course key serialization syntax 2014-05-21 17:44:50 -04:00
Don Mitchell
bef8134eea Merge pull request #3806 from edx/dhm/opaque_migrate_0036 
Migration for role_coursenum deprecated roles
 2014-05-21 16:33:33 -04:00
Calen Pennington
708d758d65 Merge pull request #3808 from cpennington/ok-course-mode-errors 
Call other CourseModeView methods using serialized course_id
 2014-05-21 16:21:27 -04:00
Calen Pennington
1f9c7b2ed4 Merge pull request #3809 from cpennington/ok-dead-code 
Remove dead code
 2014-05-21 16:21:17 -04:00