Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,565 Commits 1 Branch 0 Tags
85ab2e40366ca1010fef91d1585a62f379c9a60a
Commit Graph

46565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Albert (AJ) St. Aubin
85ab2e4036 Merge pull request #18443 from edx/LEARNER-5275 
Update the entitlement fulfilment logic to work with enrollment end
 2018-06-22 09:59:36 -04:00
Albert St. Aubin
06af818322 Update the entitlement fulfilment logic to work with enrollment end 
[LEARNER-5275]

Update the endtitlement fulfillment logic to work for users who have
enrolled, enrollment window has closed, but upgrade window is still
open. These users should be able to use that enrollment on their course
run that they are enrolled in.
 2018-06-22 07:48:35 -04:00
J Eskew
64ce2a0d8a Merge pull request #18405 from edx/jeskew/PLAT_2185_idempotent_endpoints 
Make retirement endpoints idempotent.
 2018-06-21 16:11:06 -04:00
J Eskew
fe82954835 Merge pull request #18397 from edx/jeskew/perpare_hawthorn_retirement_states 
Use correct default user retirement states.
 2018-06-21 15:35:59 -04:00
John Eskew
a09a81b138 Make retirement endpoints idempotent. 2018-06-21 15:35:30 -04:00
J Eskew
df16836a8f Merge pull request #18427 from edx/jeskew/fix_some_deprecation_warnings 
Fix some deprecation warnings.
 2018-06-21 12:24:19 -04:00
John Eskew
b94ea6b4b1 Import XBlockMixin from the correct location. 2018-06-21 11:41:06 -04:00
John Eskew
56824d01cc Remove DataDog enrollment submissions using the deprecated offering. 2018-06-21 11:40:40 -04:00
Jeff LaJoie
b722fab98e Merge pull request #18424 from edx/jlajoie/LEARNER-5050 
LEARNER-5050: Adds in str serialization for celery tasks
 2018-06-21 11:26:51 -04:00
Farhanah Sheets
f4ebe13015 Merge pull request #18422 from edx/fsheets/sfe-headings-fix 
Fix for header level in new SFE pages
 2018-06-21 10:58:54 -04:00
Robert Raposa
be22529028 Merge pull request #18434 from edx/robrap/clean-up-imports 
Remove unused imports.
 2018-06-21 10:46:28 -04:00
Robert Raposa
611a995f50 Merge pull request #18435 from edx/robrap/ARCH-135-jwt-middleware 
ARCH-135: Add EnsureJWTAuthSettingsMiddleware middleware.
 2018-06-21 10:46:09 -04:00
Albert (AJ) St. Aubin
1c450e0f77 Merge pull request #18433 from edx/aj/learner-5456 
Added search fields to the entitlements admin panel
 2018-06-21 09:42:18 -04:00
Robert Raposa
59d0ada7aa Use EnsureJWTAuthSettingsMiddleware middleware. 2018-06-21 09:30:15 -04:00
Robert Raposa
92283a33b9 Remove unused imports. 2018-06-21 08:55:23 -04:00
Albert St. Aubin
f23fd19e99 Added search fields to the entitlements admin panel 2018-06-21 08:54:07 -04:00
Nimisha Asthagiri
e86eef65ce Merge pull request #18420 from edx/robrap/dependency-upgrade 
Upgrade edx-drf-extensions dependencies
 2018-06-20 18:14:13 -04:00
Robert Raposa
30b1ff0f5d Upgrade dependencies. 2018-06-20 17:48:41 -04:00
Douglas Hall
cc5f62d6d5 Merge pull request #18416 from edx/douglashall/oauth_scopes_part1 
ARCH-135 Add new custom DOT Application model to support OAuth2 per-application scopes.
 2018-06-20 16:58:58 -04:00
Douglas Hall
bab6e3669c Add new custom DOT Application model to support OAuth2 per-application scopes. 
This also introduces a model for persisting organization-based filters on
a per-application basis. See openedx/core/djangoapps/oauth_dispatch/docs/decisions/0007-include-organizations-in-tokens.rst
for additional details.
 2018-06-20 16:31:19 -04:00
Jeff LaJoie
056c1b8e99 LEARNER-5050: Adds in str serialization for celery tasks 2018-06-20 16:17:38 -04:00
Farhanah Sheets
9087cd4a09 Fix for header level in new SFE pages 2018-06-20 15:28:16 -04:00
Ayub-khan
aa4fcdd84f Merge pull request #18418 from edx/update-translations-20-june 
translations update
 2018-06-20 22:12:30 +05:00
ayub-khan
17e78d85c1 -updated-translations 2018-06-20 21:32:16 +05:00
Jeremy Bowman
5c7fa062d2 Merge pull request #18406 from edx/jmbowman/TE-2593 
TE-2593 Make pip-compile output whitespace consistent
 2018-06-20 11:48:53 -04:00
Farhanah Sheets
5f6069eeaa Merge pull request #18351 from edx/hack/course-health-check 
Course Checklists UI Integration
 2018-06-20 11:31:05 -04:00
Simon Chen
b273770934 Merge pull request #18213 from jolyonb/jolyonb/showanswer_on_attempts 
Allow solutions to be displayed past due on showanswer=attempted
 2018-06-20 09:37:42 -04:00
Muhammad Ammar
941c2a2e88 Merge pull request #18413 from edx/ammar/update-enterprise-version 
update enterprise version
 2018-06-20 18:14:25 +05:00
muhammad-ammar
29cf5be9db update enterprise version 2018-06-20 16:35:26 +05:00
Dennis Jen
9b228ada89 Add Checklists to new page and to course outline view 2018-06-19 17:25:41 -04:00
Christopher Lee
75d71097b8 Merge pull request #18407 from edx/clee/paginate 
Set max page size for get courses
 2018-06-19 16:18:11 -04:00
christopher lee
939c7f4857 Set max page size for get courses 2018-06-19 15:39:50 -04:00
Jeremy Bowman
9311f268c1 TE-2593 Make pip-compile output whitespace consistent 2018-06-19 15:09:11 -04:00
Christopher Lee
ebda77b22a Merge pull request #18390 from edx/clee/wafflestr 
Add namespaced_name to WaffleSwitch
 2018-06-19 14:41:44 -04:00
Christopher Lee
0d04453794 Merge pull request #18387 from edx/clee/courseapipagelimit 
Set max page size for get courses
 2018-06-19 13:57:49 -04:00
Christopher Lee
52d2b2de74 Add namespaced_name to WaffleSwitch 2018-06-19 13:51:19 -04:00
christopher lee
48b5485be1 Set max page size for get courses 
LEARNER-5566
 2018-06-19 13:07:04 -04:00
Stu Young
da4952eacb Merge pull request #18402 from edx/estute/reorder-a11y-script 
reorder env sourcing in a11y script
 2018-06-19 12:23:56 -04:00
Stuart Young
365f65834b reorder env sourcing in a11y script 2018-06-19 10:42:18 -04:00
Brian Mesick
3434c0f59b Merge pull request #18372 from edx/bmedx/retirement_reporting_queue 
Add retirement partner reporting queue and APIs
 2018-06-18 17:24:13 -04:00
John Eskew
dd688d508a PLAT-2193: Use correct default user retirement states. 2018-06-18 17:17:33 -04:00
Braden MacDonald
b12346f390 Merge pull request #18170 from open-craft/eugeny/instructor_report_popup_backend 
Answers report: Return task ID and generated filename for frontend to consume
 2018-06-18 13:26:27 -07:00
bmedx
8fbe12e4cc Add retirement partner reporting queue and APIs 2018-06-18 16:22:02 -04:00
Christopher Lee
b8028163d3 Merge pull request #18384 from edx/clee/anonbasketcalc 
Add switch to always calculate program price as anon user
 2018-06-18 13:43:13 -04:00
Stu Young
6d5179571d Merge pull request #18381 from edx/estute/fixup-toxenv-var 
change toxenv checking in ci script
 2018-06-18 12:48:43 -04:00
Stu Young
caca33585c Merge pull request #18386 from edx/estute/TE-2544-a11y 
set up tox env var for a11y scripts
 2018-06-18 12:44:11 -04:00
christopher lee
56f83b5704 Add switch to always calculate program price as anon user 
LEARNER-5555
 2018-06-18 12:33:40 -04:00
Stuart Young
05d8f22be1 set up tox env var for a11y scripts 2018-06-18 11:48:53 -04:00
Stuart Young
193c355fa3 change toxenv checking in ci script 2018-06-18 10:13:48 -04:00
Jeff LaJoie
5a9d21db74 Merge pull request #18352 from edx/jlajoie/LEARNER-5050 
LEARNER-5050: Adds award course cert job
 2018-06-18 09:38:39 -04:00