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

4170 Commits

Author SHA1 Message Date
Michael LoTurco
d6f910d5da Remove reference to reason field, add action field 
As work progressed on entitlement support tool,
additional clarity around the entitlement support
detail fields was needed, this adds the action field
at a later point the reason field will be removed

Learner-3925
 2018-03-06 13:35:17 -05:00
Alessandro Roux
fd48e3848e Merge pull request #17418 from edx/resume-button-on-dashboard 
EDUCATOR 2190: Course card resume buttons on the student dashboard.
 2018-03-02 15:59:41 -05:00
sandroroux
3f22ce3031 These changes add a resume button to course cards on the student dashboard. 2018-03-02 14:52:30 -05:00
Tyler Hallada
c3ecc8b4bb Merge pull request #17562 from edx/thallada/EDUCATOR-2419 
EDUCATOR-2419 No upgrade deadline for professional courses
 2018-03-01 13:22:41 -05:00
Jeremy Bowman
b3ac2b1b06 PLAT-1976 Add waffle switch to block auth_user write attempts 2018-02-28 13:13:06 -05:00
Calen Pennington
c45de5c32b Revert "Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…" 2018-02-28 11:06:39 -05:00
Tyler Hallada
8fb26258e4 Add a regression test 2018-02-27 16:25:41 -05:00
Calen Pennington
b1c9ad175d Revert "Revert "Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack"" 
This reverts commit 67177ac72d.

The original PR cause a breakage on production due to webpack building two different
copies of the asset_index.js bundle. However, it is unclear whether that was a
transitory issue or not. This commit restores the original PR to validate whether
the problem is reproducible.
 2018-02-27 16:18:27 -05:00
Tyler Hallada
c5cbbdf72e No dynamic_upgrade_deadline in prof. courses 2018-02-27 14:30:04 -05:00
Eric Fischer
2717ef5b80 Provide i18n data to SFE in DOM 
EDUCATOR-1613, edx-platform changes
 2018-02-27 10:17:35 -05:00
George Babey
3e840ff268 Merge pull request #17497 from edx/gbabey/move_paginators 
Moved pagination to edx_rest_framework_extensions package
 2018-02-23 15:24:40 -05:00
George Babey
1c7720a561 Bump drf-extensions for pagination move 2018-02-23 14:20:00 -05:00
John Eskew
b292bb43eb Merge pull request #17446 from mitodl/upstream/fix_error_page_themes 
Fixed unthemed error pages in Studio and LMS
 2018-02-23 13:25:08 -05:00
Albert (AJ) St. Aubin
312a9ec160 Merge pull request #17533 from edx/aj/LEARNER-3898 
Added entitlement redeemability method to the check for fulfillable
 2018-02-23 07:44:46 -05:00
edx-pipeline-bot
92ca38f489 Merge pull request #17535 from edx/release-mergeback-to-master 
Merge release back to master
 2018-02-22 18:32:36 -05:00
Gavin Sidebottom
67442c2641 Fixed unthemed error pages in Studio and LMS 2018-02-22 16:49:06 -05:00
Albert St. Aubin
8c5e37ba20 Added entitlement redeemability method to the check for fulfillable 
entitlements

[LEARNER-3898]
 2018-02-22 15:00:19 -05:00
Calen Pennington
67177ac72d Revert "Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack" 
This reverts commit 1c46bd89c3, reversing
changes made to eb6064e333.
 2018-02-22 14:12:32 -05:00
Matthew Piatetsky
92c94008a2 Fix tests that expected unified_course_tab to be off 2018-02-22 08:45:25 -05:00
Albert (AJ) St. Aubin
7484c1b135 Merge pull request #17491 from edx/aj/LEARNER-3898 
Aj/learner 3898
 2018-02-21 20:45:08 -05:00
Brian Mesick
714b25a83d Merge pull request #17480 from open-craft/ciuin/fix-user-creation-mgmtcmds 
Fix user creation management commands
 2018-02-21 15:55:09 -05:00
Calen Pennington
1c46bd89c3 Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack 
Switch asset index factory to webpack
 2018-02-21 11:48:37 -05:00
Albert St. Aubin
b56fdcc652 Changes to auto enroll users using their entitlement if they have one 
available.

[LEARNER-3898]
 2018-02-21 11:17:02 -05:00
Matthew Piatetsky
6a841d5b2b Merge pull request #17494 from edx/limit_enrollment_count 
limit bundling code to users with less than 4 enrollments
 2018-02-21 11:10:21 -05:00
Calen Pennington
c906c186ce Move the context course and sock into require_page compatible forms 2018-02-21 10:29:41 -05:00
Michael LoTurco
449c6903a6 Add Support endpoint for Course Entitlements 2018-02-20 13:20:47 -05:00
Matthew Piatetsky
70ec5e47c6 limit bundling code to users with less than 4 enrollments 2018-02-16 14:24:23 -05:00
George Babey
26bac9f611 Moved paginators to edx_rest_framework_extensions package 
Pagination should be standard and easy to adopt so moved the paginators
into the edx_rest_framework_extensions package so they can be easily
installed into other app/projects
 2018-02-16 09:46:01 -05:00
Tyler Hallada
4a6d8f78f0 Fix borked rebase conflict resolution 2018-02-15 13:20:20 -05:00
Tyler Hallada
6bc1d34022 Add class=SFE to root div to increase specificity 2018-02-15 13:20:18 -05:00
Tyler Hallada
3e7a742177 Fix integration of accessibility policy page 2018-02-15 13:20:18 -05:00
Tyler Hallada
73cffad5ce Dev in sfe container & prod use /dist of sfe 2018-02-15 13:20:18 -05:00
John Hensley
c7c01e4a22 Fix user creation management commands 
Two user creation scripts were broken by the move of
student.views._do_create_account to student.helpers.do_create_account.

This patch just catches the scripts up.
 2018-02-14 11:32:26 -05:00
Michael Frey
ed54cdc1d9 increase limit for staff users 2018-02-13 12:49:26 -05:00
Michael Roytman
7fc5a78528 Merge pull request #17457 from edx/mroytman/EDUCATOR-1613-i18n 
pass language to mako template
 2018-02-13 09:58:00 -05:00
Michael Roytman
3496bb9a0a pass language to mako template 2018-02-12 15:44:20 -05:00
Michael LoTurco
82f4ce4252 Add CourseEntitlementSupportDetail model and related admin model 
Learner-3919
 2018-02-12 11:43:44 -05:00
Matthew Piatetsky
bb8f9ae915 Merge pull request #17431 from edx/bundling_test_handle_exceptions 
handle exceptions and create the necessary html in optimizely
 2018-02-09 08:59:40 -05:00
Ahsan Ulhaq
25130ae3c8 Making honor code not eligible for Certificate 
LEARNER-4117
 2018-02-09 13:53:50 +05:00
Matthew Piatetsky
618146e415 addressing comments 2018-02-08 11:29:56 -05:00
Matthew Piatetsky
826ef28b4d handle exceptions and create the necessary html in optimizely 2018-02-08 10:25:52 -05:00
Brian Mesick
86d077ac3d Merge pull request #17413 from edx/bmedx/upgrade_nltk 
Upgrade NLTK to 3.2.5, fixup usage and tests
 2018-02-07 15:39:22 -05:00
bmedx
6a22de454f Upgrade NLTK to 3.2.5, fixup usage and tests 2018-02-07 10:42:23 -05:00
Jeremy Bowman
378287fbc0 Merge pull request #17404 from edx/jmbowman/PLAT-1942 
PLAT-1942 Handle xmodule_django field deprecations
 2018-02-06 13:23:04 -05:00
Jeremy Bowman
9682e00f4c PLAT-1943 Fix more naive datetime warnings 2018-02-05 17:58:35 -05:00
Jeremy Bowman
bf86b3da98 PLAT-1942 Handle xmodule_django field deprecations 2018-02-05 15:05:54 -05:00
Jeremy Bowman
5289c7e828 PLAT-1915 Stop using deprecated BaseException.message 2018-01-31 17:22:01 -05:00
Douglas Hall
71bd63e361 Merge pull request #17354 from edx/douglashall/ENT-854_part3 
Add migration for removing old edx-enterprise password fields from the database.
 2018-01-31 10:21:46 -05:00
Albert (AJ) St. Aubin
55c6387db6 Merge pull request #17349 from edx/aj/LEARNER-3800 
Aj/learner 3800
 2018-01-31 07:03:34 -05:00
Calen Pennington
f2c3aed8e7 Merge pull request #17316 from cpennington/switch-cms-login-to-webpack 
Migrate login.js to webpack
 2018-01-30 14:24:08 -05:00