Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,994 Commits 1 Branch 0 Tags
322ac8a468c2d861643efb139db57408872679e7
Commit Graph

2363 Commits

Author SHA1 Message Date
Clinton Blackburn
bb7c5b3384 Corrected OAuth URL for Docker-base devstack 
ECOM-6634
 2017-01-25 13:13:50 -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
J. Cliff Dyer
0d2ae5d4af Store failed subsection grade calculations 
TNL-6250
 2017-01-18 09:43:07 -05:00
Jesse Zoldak
4a5426a6a7 Merge pull request #14289 from edx/zoldak/no-celery-retry-for-bok-choy 
Do not retry block structures tasks on bok choy servers
 2017-01-10 11:16:20 -05:00
Anthony Mangano
2d85fe4ab2 Merge pull request #14279 from edx/ECOM-5936-send-course-id-and-enrollment-track-to-zendesk-custom-fields 
Ecom 5936 enable users to select course when making support requests
 2017-01-10 10:55:51 -05:00
Jesse Zoldak
c25e836128 Do not retry block structures tasks on bok choy servers 2017-01-10 09:53:15 -05:00
Ned Batchelder
9ff91756e5 Happy New Year 2017-01-07 20:19:51 -05:00
Anthony Mangano
69ae314dd8 enable users to select course when making support requests 
ECOM-5936
 2017-01-06 13:34:13 -05:00
Christina Roberts
4a71af8d6e Merge pull request #14160 from edx/christina/help-menu-tests 
Add tests for context-sensitive Help button.
 2017-01-03 10:39:43 -05:00
Cliff Dyer
aa3d6e8791 Merge pull request #14092 from edx/cdyer/validate-capa-xml 
Use new XMLString field type for CAPA data field.
 2016-12-19 12:03:19 -05:00
cahrens
c9fb71c4a1 Add tests for context-sensitive Help button. 2016-12-15 16:42:06 -05:00
J. Cliff Dyer
22ce30039b Use new XMLString type for CAPA data field. 
TNL-5245
 2016-12-15 15:35:44 -05:00
Afzal Wali
e44e18592f Programs list conditionally added to the context of index and courses page. 2016-12-15 18:16:48 +05:00
Jesse Shapiro
fc814aee95 Add data sharing consent features for EnterpriseCustomer 2016-12-12 09:30:38 -05:00
Sven Marnach
6e801631d8 Merge pull request #14104 from open-craft/smarnach/enterprise-enrollment 
Changes required for the Enterprise app enrollment feature.
 2016-12-09 16:01:27 +01:00
Sven Marnach
2690a77151 Changes required for the Enterprise app enrollment feature. 2016-12-08 17:53:31 +01: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
attiyaishaque
be32d74afe TNL-6017 Receive Updates checkbox saved in discussion forums. 2016-12-01 11:25:44 +05:00
Andy Armstrong
746e310088 Clean up npm-installed packages 2016-11-22 17:51:09 -05:00
Eric Fischer
01cc136217 Allow CELERY_QUEUES to be overriden using ENV_TOKENS 2016-11-17 12:56:07 -05:00
Gregory Martin
b814678933 register dateutil_factory in request.js 2016-11-16 07:18:19 -05:00
Gregory Martin
1fa805a052 js bundling error 2016-11-14 14:33:23 -05:00
Ned Batchelder
781d3c9b30 Merge pull request #13925 from stvstnfrd/up/settings/zendesk 
Fallback to default ZENDESK_URL when not in JSON
 2016-11-10 11:12:49 -05:00
Brandon DeRosier
8c9aa7d3f3 Allow configuring TLS for celery broker 2016-11-09 12:14:42 -05:00
John Eskew
cd522358f2 Merge pull request #13706 from edx/jeskew/move_embargo_out_of_common 
Move embargo from common to openedx/core/djangoapps.
 2016-11-08 14:38:24 -05:00
Gregory Martin
f0cd29f02a Revert "Merge pull request #13915 from edx/revert-13794-yro_implement-dateutil" 
This reverts commit d59ab18b27, reversing
changes made to 0ebab35e89.
 2016-11-07 17:04:13 -05:00
John Eskew
e3cb462d18 Move embargo from common to openedx/core/djangoapps. 2016-11-07 08:47:36 -05:00
attiyaishaque
0ffde1a620 ECOM-5281 Adding retries and celery task for sending activation email. 2016-11-07 11:23:43 +05:00
stv
9c5fcfac17 Fallback to default ZENDESK_URL when not in JSON 
This line previously departed from the convention of coalescing down to
the original value specified in `lms/envs/common.py`.

Now, the setting can fall back to its default value from `common.py`,
instead of only respecting the value loaded from JSON (or `None` if not
defined).
 2016-11-04 16:04:55 -07:00
Jesse Zoldak
ec880138d2 Revert "Implement DateUtils in LMS" 2016-11-04 07:50:26 -04:00
Gregory Martin
f21dbc797a Merge pull request #13794 from edx/yro_implement-dateutil 
Implement DateUtils in LMS
 2016-11-03 13:51:46 -04:00
Troy Sankey
ece785ff92 Implement the newrelic_custom_metrics middleware 
Use this middleware and its helpers to accumulate custom New Relic
metrics on a per-request basis.  If, while handling a request, the app
does not accumulate any metrics, this middleware is a very lightweight
no-op.

This commit also enables the middleware!

PERF-354
 2016-11-03 10:30:25 -04:00
Gregory Martin
3fd16eb6be Implement DateUtils in LMS 2016-11-03 10:06:10 -04:00
Eugeny Kolpakov
1dc7567282 Merge pull request #13723 from edx/ekolpakov/enterprise_app 
Enterprise Customer: model and admin integration
 2016-10-28 12:51:22 +03:00
E. Kolpakov
aab3ad5c35 Addded enterpirse app 2016-10-21 20:15:41 +03:00
alisan617
0799033693 Merge pull request #13681 from edx/alisan/instructor-dashboard-coffeescript 
Convert instructor dashboard coffeeScript to js
 2016-10-20 12:45:29 -04:00
alisan617
5fe397f8c9 change Instructor Dashboard coffeeScript bundle path and move fixtures to JS folder, plus eslint 2016-10-20 09:32:45 -04:00
Eric Fischer
2ca7484c1a Merge pull request #13763 from edx/efischer/use_env_tokens 
Allow Celery queue settings to be defined by ENV_TOKENS
 2016-10-19 10:02:22 -04:00
Nimisha Asthagiri
6e7f131c40 Merge pull request #13790 from edx/release 
Merge Release to Master
 2016-10-18 19:23:23 -04:00
Douglas Hall
ac390e13f6 Refactored middleware that supports SESSION_COOKIE_DOMAIN overrides. 2016-10-18 09:07:03 -04:00
Eric Fischer
5df9f20160 Allow Celery queue settings to be defined by ENV_TOKENS 
General good-practice cleanup requested by @jibsheet. Also includes some
pylint fixes myh editor flagged during this cleanup.
 2016-10-17 11:45:07 -04:00
Eric Fischer
76b3a65259 Use redefined LOW_PRIORITY queue 
aws.py redefines the default queues in order to expose cross-environment
work. The new recalculate grades routing key shgould use that value
rather than the default defined in common.py.
 2016-10-17 11:32:06 -04:00
Gregory Martin
2f868e5e24 Merge pull request #13733 from edx/yro_localized-datetime 
Set up DateUtil factory, modify requests to handle moment-timezones, moment-with-locales.
 2016-10-17 10:10:58 -04:00
Greg Martin
4ddda443b8 Implement localized datetimes in browser 
moment-timezone require config

jasmine test fix, duplicate req. cleanup
 2016-10-14 15:25:38 -04:00
Eric Fischer
c4c2875232 Route grading updates to low priority queue 2016-10-14 14:24:08 -04:00
Andy Armstrong
03c3ee53e5 Move cors_crsf to openedx/core 2016-10-14 13:59:01 -04:00
Sanford Student
e8c508596b removing extra instance of MILESTONES_APP 2016-10-14 12:38:03 -04:00