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

7383 Commits

Author SHA1 Message Date
Clinton Blackburn
1edfd795fb Cloning additional data when re-running a course 
Re-running a course now clones the OrganizationCourse and RestrictedCourse data from the old run to the new run. This will allow administrators to avoid the tedium of manually recreating this data.
 2017-04-18 10:11:35 -04:00
Ned Batchelder
d3ddb2ae68 Merge pull request #14857 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-04-11 14:13:10 -04:00
Dennis Jen
02f6715075 Merge pull request #14853 from edx/dsjen/update-mathjax-cdn 
Update mathjax CDN to cloudflare.
 2017-04-11 13:50:10 -04:00
Ned Batchelder
babf349f87 Update translations (autogenerated message) 2017-04-11 15:12:19 +00:00
Clinton Blackburn
1ff2be0d93 Removed unnecessary Studio settings for Docker devstack 2017-04-10 18:01:39 -04:00
Dennis Jen
f90b80da62 Update mathjax CDN to cloudflare. 2017-04-10 19:52:35 +00:00
Jeremy Bowman
871c931065 Merge pull request #14648 from edx/iivic/fix-get-xblock-settings 
Fix get xblock settings
 2017-04-06 10:17:58 -04:00
Christina Roberts
15ab2b6be7 Merge pull request #14798 from edx/christina/tnl-6744 
Add Enrollment tracks to component visibility dialog
 2017-04-05 12:10:56 -04:00
cahrens
dbae1e397d Add ability to set visibility by enrollment track. 
TNL-6744
 2017-04-05 11:05:31 -04:00
iivic
49c3f20a15 Fix getting xblock settings in studio edit modal 2017-04-05 14:44:41 +00:00
Mushtaq Ali
0bede12821 Fix multiple copies of components on discard changing a move operation - TNL-6670 2017-04-04 16:53:35 +05:00
asadiqbal
ed33d3b09f ENT-287 Track Selection: Enterprise messaging only for catalog courses 2017-03-31 16:54:16 +05:00
cahrens
e5035746bf Introduce EnrollmentTrackUserPartition. 
TNL-6674
 2017-03-30 12:24:48 -04:00
Ned Batchelder
bca2db88ce Update translations (autogenerated message) 2017-03-30 11:00:31 +00:00
Mushtaq Ali
d4c6f9fad2 Merge pull request #14748 from edx/mushtaq/fix-group-id 
Make matching group ID condition be more specific
 2017-03-30 11:46:10 +05:00
Mushtaq Ali
6b9f853ccf make matching group ID condition be more specific 2017-03-29 19:19:50 +05:00
Nimisha Asthagiri
b1b950c6e6 Merge pull request #14770 from edx/neem/waffle-utils 
Waffle Switch with namespacing and request caching
 2017-03-28 20:07:50 -04:00
Nimisha Asthagiri
4ac78706a3 Waffle Switch with namespacing and request caching 2017-03-28 17:49:20 -04:00
Jillian Vogel
9660e13221 Adds ENTERPRISE_ENROLLMENT_API_URL to cms.envs.common 
Fixes migration error thrown by edxapp-migrate-cms
 2017-03-25 19:29:07 +10:30
Nimisha Asthagiri
e83182c743 Have generate_course_blocks pass with_storage option to celery tasks 2017-03-20 16:22:44 -04:00
M. Rehan
dd6b203cf0 Merge pull request #14664 from edx/mrehan/prioritize-youtube-subs-over-html5-on-save 
TNL-6539 – Prioritize youtube subs over html5 ones
 2017-03-17 12:23:06 +05:00
Ned Batchelder
73850f4627 Update translations (autogenerated message) 2017-03-16 14:07:42 -04:00
Ned Batchelder
75cb211cbe Update translations (autogenerated message) 2017-03-16 14:07:41 -04:00
Qubad786
0ff62e766e prioritize youtube transcripts over html5 ones 2017-03-16 14:38:51 +05:00
David Ormsbee
294bbe7fe0 Test speedup: Monkey patch Kombu entrypoints fn. 
We monkey patch Kombu's entrypoints listing because scanning through
this accounts for the majority of LMS/Studio startup time for tests,
and we don't use custom Kombu serializers (which is what this is for).
Still, this is pretty evil, and should be taken out when we update
Celery to the next version where it looks like this method of custom
serialization has been removed.

FWIW, this is identical behavior to what happens in Kombu if
pkg_resources isn't available.
 2017-03-14 13:45:40 -04:00
Mushtaq Ali
40621b6cc2 Merge pull request #14315 from edx/mushtaq/move-component 
Move a component
 2017-03-14 12:58:20 +05:00
Jeremy Bowman
8d36c3825c PLAT-1121 Export courses asynchronously 2017-03-13 09:00:11 -04:00
Clinton Blackburn
4cc7628696 Upgraded to Python Social Auth 0.2.21 to resolve migration issue 2017-03-10 23:06:02 -05:00
Mushtaq Ali
cb2d78bf34 Add logging on move xblock 
Add i18n to backend error messages in case they appear to end user
Remove success banner when trying to publish or discard changes on container page
 2017-03-10 19:25:03 +05:00
Ned Batchelder
7d7f17a3b3 Merge pull request #14663 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-03-09 14:03:09 -05:00
Ned Batchelder
9d9266f1c5 Update translations (autogenerated message) 2017-03-09 16:17:10 +00:00
Albert (AJ) St. Aubin
ee68726bf2 Merge pull request #14655 from edx/aj/fix_cms_style_bug 
Update to Studio style for recent capa action bar style changes
 2017-03-09 08:42:15 -05:00
Ned Batchelder
15a4fc420a Update translations (autogenerated message) 2017-03-09 12:08:25 +00:00
Calen Pennington
0c30c06a78 Merge pull request #14656 from edx/release-mergeback-to-master 
Merge release back to master
 2017-03-08 15:23:50 -05:00
Albert St. Aubin
86e202c5ab Update to Studio style for recent capa action bar style changes 2017-03-08 14:23:19 -05:00
Nimisha Asthagiri
1224e341de Revert "Merge pull request #14588 from edx/efischer/kill_stuff" 
This reverts commit 83f2be4929, reversing
changes made to 01ed17426f.
 2017-03-08 13:10:48 -05:00
Mushtaq Ali
e83bee65bd Fixed Backend: Move component directly to content experiment level (component will now be the sibling of groups) 
Fixed Move button is disabled when moving components inside conditional module

Fixed When navigating upward/backward, target parent is not set correct, resulting source to be moved in the previously selected parent
 2017-03-08 16:48:52 +05:00
Clinton Blackburn
078974d24a Disabled search for Docker-based devstack 
This feature is not well-documented, so it is unclear how to setup Elasticsearch properly to make it work. The next person who needs to work on this feature will need to make it work and, ideally, document it.
 2017-03-07 21:21:49 -05:00
Brian Mesick
8caa4c56d6 Merge pull request #14619 from edx/bmedx/user-task-email 
PLAT-1075 - Send email async upon completed django-user-tasks
 2017-03-07 14:32:53 -05:00
Qubad786
f064e991bf duplicate video id in basic tab 2017-03-07 15:33:33 +05:00
M. Rehan
f90470a59e Merge pull request #14510 from edx/mrehan/mgmt-cmd-sync-mktg-urls 
MA-3050 – Sync course runs from Catalog service
 2017-03-06 23:21:23 +05:00
Qubad786
7c1f6ff2c0 Mgmt. Command to Sync Marketing Urls from Catalog service 
Introduces a mgmt. command that retrieves course runs from catalog service in order to update marketing urls for the courses found in course metadata cache (i.e. CourseOverview). This also provides an updated utility to retrieve course sharing url.
 2017-03-06 20:12:31 +05:00
Eric Fischer
83f2be4929 Merge pull request #14588 from edx/efischer/kill_stuff 
Kill edx-reverification-block
 2017-03-06 09:29:36 -05:00
bmedx
6e88c2d26e Linting fixes 2017-03-03 17:03:35 -05:00
bmedx
322de9604d Address PR feedback 2017-03-03 15:42:11 -05:00
bmedx
d5eb9c0b21 Fix more lint violations, remove prints 2017-03-03 10:32:22 -05:00
Eric Fischer
a82b8549dc Merge pull request #14607 from edx/efischer/deprecated_message 
More specific messaging for unsupported block types
 2017-03-03 10:27:50 -05:00
bmedx
327aeb18aa Fix pep8 violation 2017-03-03 09:49:23 -05:00
bmedx
1b6123294d Fixes to celery queuing and text 2017-03-02 15:29:54 -05:00
Ned Batchelder
6c44eee00e Update translations (autogenerated message) 2017-03-02 19:25:59 +00:00