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

8328 Commits

Author SHA1 Message Date
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
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
Calen Pennington
1c60da02df fixup! Fix management commands 2014-05-21 16:20:46 -04:00
Calen Pennington
32e0387fa0 Merge pull request #3811 from cpennington/ok-dont-use-empty 
Don't use Empty directly, let the manager handle it
 2014-05-21 16:14:42 -04:00
Calen Pennington
61e621fc6e Merge pull request #3812 from cpennington/ok-simpler-loc-mapper 
Make the arguments to translate_location_to_course_locator more specific
 2014-05-21 16:12:27 -04:00
Calen Pennington
3b58997b82 Merge pull request #3814 from cpennington/ok-conditional-test 
Fix ConditionalTest test system
 2014-05-21 16:10:56 -04:00
Andy Armstrong
541d20ef83 Allow creation of components on container page 
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.

Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
 2014-05-21 15:40:31 -04:00
Julia Hansbrough
5752312bbb Merge pull request #2776 from aboudreault/embargo-restrict-additions 
Extended Embargo feature to support site access restriction and ip network
 2014-05-21 15:24:07 -04:00
Calen Pennington
c62b6b0083 Fix ConditionalTest test system 2014-05-21 14:44:46 -04:00
Calen Pennington
4c2e612aeb Make mongoengine field for UsageKeys expect a Location 2014-05-21 14:43:51 -04:00
Calen Pennington
4836252972 Make the arguments to translate_location_to_course_locator more specific 2014-05-21 14:39:28 -04:00
Calen Pennington
06d680cded Don't use Empty directly, let the manager handle it 2014-05-21 14:38:16 -04:00
Calen Pennington
1f849e441d Fix management commands 2014-05-21 14:36:41 -04:00
Calen Pennington
4af2249a9d Remove dead code 2014-05-21 14:28:04 -04:00
Calen Pennington
3d90c83199 Call other CourseModeView methods using serialized course_id 2014-05-21 14:27:01 -04:00
Don Mitchell
9af40ae2cc Migration for role_coursenum deprecated roles 2014-05-21 12:03:09 -04:00
jmclaus
db239c69fe Tolerance expressed in percentage now computes correctly. [BLD-522] 2014-05-21 17:14:12 +02:00
Calen Pennington
39e264041e Merge pull request #3778 from cpennington/mixed-modulestore-bad-keys 
Handle malformed keys in MixedModuleStore configuration
 2014-05-21 11:05:50 -04:00
John Jarvis
d25136893c Merge pull request #3712 from edx/jarv/cert-mode 
returning enrollment mode for both active and inactive users
 2014-05-21 10:07:17 -04:00
Don Mitchell
c085578383 Fix student progress @sarina bug 2014-05-20 18:08:33 -04:00
clytwynec
b7816aafa2 Merge pull request #3775 from edx/clytwynec/bokchoy-language-test-fix 
added check for modal to disappear in _change_lang_promise
 2014-05-20 16:27:52 -04:00
clytwynec
722870eb5f Merge pull request #3762 from edx/clytwynec/bok-choy-auto_auth-page-fix 
made is_browser_on_page actually check for the right page in AutoAuthPag...
 2014-05-20 16:02:29 -04:00
David Baumgold
6e0e13003f Merge pull request #3744 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool [Fix]
 2014-05-20 15:34:34 -04:00
Jason Bau
b23beda8a9 Merge pull request #3782 from edx/jbau/shib-activate-on-acct-linking 
Autoactivate inactive users on external_auth login
 2014-05-20 12:30:41 -07:00
Ned Batchelder
cf6a83f4a4 Merge pull request #3730 from louyihua/localization-fix-video 
i18n: Make translation works for video editor tabs
 2014-05-20 14:22:40 -04:00