Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
41,069 Commits 1 Branch 0 Tags
08dcbace0f9fbeecb4da46fb5d2b4d006ff93e4e
Commit Graph

1134 Commits

Author SHA1 Message Date
Matt Drayer
5097bd6e54 mattdrayer/ENT-328: Update account activation message on sign-in form. 2017-05-04 10:58:42 -04:00
Ned Batchelder
6be4337c7d Merge pull request #14898 from edx/nedbat/help-tokens-app 
Use a new external app for help tokens
 2017-05-03 18:08:27 -04:00
Brian Jacobel
a2323797f5 Work on sandbox bundling for webpack 2017-05-01 17:09:32 -04:00
Ned Batchelder
2f1936ce73 Replace context processor with new help-tokens app 
This makes it possible to refer to multiple book from a single app.

This also means that Open edX branches will be able to pass bok-choy
tests (at least if the books have already been built.)
 2017-04-27 10:34:09 -04:00
Calen Pennington
33fee20c3a Reapply "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 65f13ddec4.
 2017-04-27 09:25:02 -04:00
Calen Pennington
65f13ddec4 Revert "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 88dd85caec, reversing
changes made to bf8aef33fc.
 2017-04-26 11:29:56 -04:00
Calen Pennington
f8b050a5d8 Put LANGUAGE_COOKIE into settings 2017-04-24 13:03:17 -04:00
Asad Iqbal
7493c11ec2 Merge pull request #14890 from edx/asadiqbal08/ENT-188 
ENT-188 Enterprise Learner support requests from LMS to Zendesk queue
 2017-04-21 17:22:42 +05:00
asadiqbal
8cea65b2d7 ENT-188 2017-04-21 16:30:23 +05:00
Muhammad Ammar
c3d0a50d42 Merge pull request #14514 from edx/ammar/tnl-6513-frontend-hls-support 
HLS playback support in video player
 2017-04-21 12:38:11 +05:00
Clinton Blackburn
163c71e8c4 Updated CREDENTIALS_SERVICE_USERNAME setting for Docker-based devstack 2017-04-20 14:57:22 -04:00
Qubad786
b2cfad1650 Add Configuration Models for HLS Playback Feature. 2017-04-20 16:35:46 +05:00
Clinton Blackburn
792d134de5 Added Studio test settings for Docker devstack 2017-04-18 10:11:35 -04:00
muhammad-ammar
cc330a8c25 disable hls profile 2017-04-13 14:51:42 +05:00
Clinton Blackburn
1ff2be0d93 Removed unnecessary Studio settings for Docker devstack 2017-04-10 18:01:39 -04:00
iivic
49c3f20a15 Fix getting xblock settings in studio edit modal 2017-04-05 14:44:41 +00: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
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
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
bmedx
6ca739d811 Send emails on completed django-user-tasks 
- Creates a new app under cms
- Sends emails asynchronously on completion of any top-level job
- Moves old user task related cms tests to cms_user_tasks
 2017-03-01 17:07:42 -05:00
Jeremy Bowman
d3b873c7e9 PLAT-1104 Import courses asynchronously 2017-02-22 15:06:34 -05:00
Ned Batchelder
98b250b66e A new django app for unicorn migrations 2017-02-15 11:40:05 -05:00
Ayesha Baig
61f2067935 [YONK-513]: Add feature flag which allows for disabling of account creation 2017-02-13 12:28:57 +05:00
syed-awais-ali
31f178ea59 Merge pull request #14498 from edx/aali/OPS-1407_celery_max_ttl 
added ttl setting
 2017-02-10 23:38:11 +05:00
syed-awais-ali
65d4b76d9b ttl removed from yaml config and default value addedto aws 2017-02-09 16:47:48 +05:00
syed-awais-ali
95c6edd187 added ttl setting 2017-02-09 00:39:45 +05:00
muzaffaryousaf
d73d2f5889 Increase the yttimeout to un-skip the video tests. 2017-02-08 20:30:54 +05:00
cahrens
fdba584472 Removes an obsolete Django setting, ALLOW_ALL_ADVANCED_COMPONENTS. 
We moved from configuring installed components in settings.py files to using just Python entry points.
This used to be a setting which enabled all XBlocks with appropriate entry points.
It was removed from the rest of the codebase in a previous PR, and this usage was
inadvertently left behind.
 2017-02-03 09:31:01 -05:00
Jesse Shapiro
9d5db5ae24 Adds OpenStack settings to CMS environment 
and a comment and explaining why we import aws.* in the openstack settings.
 2017-02-02 09:27:22 +10:30
Jesse Zoldak
83a451dc0b Revert "PLAT-1104 Import courses asynchronously" 2017-01-30 19:21:43 -05:00
Jeremy Bowman
576f6755f8 Merge pull request #14200 from edx/jmbowman/async_course_import 
PLAT-1104 Import courses asynchronously
 2017-01-30 16:50:55 -05:00
Jeremy Bowman
831cd4b85b PLAT-1104 Import courses asynchronously 2017-01-30 12:19:33 -05:00
Renzo Lucioni
31f5c8ddcb Remove the program admin tool from Studio 
All programs are now managed using the Django admin on the catalog service. This is the first in a series of commits removing use of the old programs service from edx-platform.

ECOM-4422
 2017-01-27 19:33:06 -05:00
Clinton Blackburn
01d79c518e Merge pull request #14394 from edx/clintonb/fix-oauth-settings 
Corrected OAuth URL for Docker-base devstack
 2017-01-25 17:46:45 -05:00
Clinton Blackburn
bb7c5b3384 Corrected OAuth URL for Docker-base devstack 
ECOM-6634
 2017-01-25 13:13:50 -05:00
Clinton Blackburn
681cc1dc53 Set LMS_BASE setting for Studio 
This allows previews in LMS to work properly.

ECOM-6634
 2017-01-25 02:05:13 -05:00
Clinton Blackburn
e7c0ed77e5 Added settings for Docker-based devstack 
ECOM-6634
 2017-01-24 00:38:00 -05:00
Renzo Lucioni
3f6d6cbf84 Reintroduce Waffle 
Waffle serves as a complement to config models. It's useful in feature rollout situations where you may not want to incur the overhead of creating and committing a migration (required for adding a field to a config model), and also handles gradual, percentage-based rollouts.

ECOM-4422
 2017-01-20 16:20:13 -05:00
Douglas Hall
934dcce148 Merge pull request #14170 from edx/douglashall/session_cookie_domain_override 
Allow for SiteConfiguration override of SESSION_COOKIE_DOMAIN setting in Studio
 2016-12-20 07:31:34 -05:00
Douglas Hall
65f0420500 Allow for SiteConfiguration override of SESSION_COOKIE_DOMAIN setting in Studio 2016-12-20 05:17:27 -05:00
J. Cliff Dyer
22ce30039b Use new XMLString type for CAPA data field. 
TNL-5245
 2016-12-15 15:35:44 -05:00
Eric Fischer
3994615d2d Merge pull request #14090 from edx/efischer/alt_queues 
Get alternate queues from ENV_TOKENS
 2016-12-05 12:51:59 -05:00
Brandon DeRosier
097b6417e1 Merge pull request #13958 from edx/bdero/celery-broker-tls 
Allow configuring TLS for celery broker
 2016-12-03 12:18:25 -05:00
Eric Fischer
b610215e08 Get alternate queues from ENV_TOKENS 2016-12-02 10:32:00 -05:00
Eric Fischer
01cc136217 Allow CELERY_QUEUES to be overriden using ENV_TOKENS 2016-11-17 12:56:07 -05:00
Jeremy Bowman
f05899b2ba Merge pull request #13930 from edx/PLAT-1074 
PLAT-1074 Add support for django-user-tasks
 2016-11-09 15:11:26 -05:00
Jeremy Bowman
3ee8fc130c PLAT-1074 Add support for django-user-tasks 2016-11-09 14:12:09 -05:00