Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,054 Commits 1 Branch 0 Tags
4feaee2bd850dfbf306038fcedf0c62bf8d73045
Commit Graph

48054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Youngstrom
4feaee2bd8 Fix some eslint warnings 2018-12-18 12:52:45 -05:00
Alex Dusenbery
7b04832606 EDUCATOR-3668 | The CreateSubsectionGrade class should reflect possibly overridden values from the PersistentSubsectionGrade class. 2018-12-18 11:23:12 -05:00
DawoudSheraz
19b7adae5c Merge pull request #19365 from edx/dsheraz/educator_3764 
EDUCATOR-3764 Mathjax accessibility files
 2018-12-18 17:29:48 +05:00
Saleem Latif
a320bc67d3 Merge pull request #19426 from edx/saleem-latif/ENT-1117 
ENT-1117: Request password reset with recovery email address
 2018-12-18 15:07:46 +05:00
Saleem Latif
38ac3d5032 Request password reset with recovery email address 2018-12-18 14:20:08 +05:00
DawoudSheraz
e954eb01a0 EDUCATOR-3764 Mathjax accessibility inclusion inside edx-platform 2018-12-18 14:16:47 +05:00
Bill Filler
0858ae233a Merge pull request #19461 from edx/bfiller/REVE-190 
REVE:190 - check if user is in holdback before showing new track selection
 2018-12-17 16:45:31 -05:00
Bill Filler
684d6e3669 check if user is in holdback before showing new track selection 2018-12-17 16:05:13 -05:00
Ned Batchelder
0db0649af5 Merge pull request #19449 from edx/nedbat/move-pins 
Move defensive pins to constraints.txt
 2018-12-17 15:04:56 -05:00
Nimisha Asthagiri
358ed851dc Merge pull request #19442 from edx/arch/infinite-login-loop-spike 
Check and update login status with all login-related cookies
 2018-12-17 14:31:48 -05:00
Nimisha Asthagiri
c7c8e856cd Check and update login status with all login-related cookies 2018-12-17 13:03:32 -05:00
Nimisha Asthagiri
c5b47ec109 Merge pull request #19422 from edx/arch/remove-grades-v0 
Remove Grades v0 REST API (DEPR-3)
 2018-12-17 11:22:35 -05:00
Matthew Piatetsky
51af02e28d Merge pull request #19457 from edx/REVE-186 
localize datetime for banner
 2018-12-17 09:14:33 -05:00
Matthew Piatetsky
e2490d8f8e localize datetime for banner 2018-12-17 08:41:14 -05:00
Waheed Ahmed
0f10260ec3 Merge pull request #19455 from edx/transifex-bot-update-translations2018-12-16 
Update translations
 2018-12-17 11:09:27 +05:00
edX Transifex Bot
916b6299ab Update translations 2018-12-16 20:38:03 +00:00
Matt Tuchfarber
b034f4e0d4 Merge pull request #19450 from edx/tuchfarber/fix_experiment_integrity_error 
Ignore integrity error in revenue holdback experiment
 2018-12-14 16:52:29 -05:00
Cali
ebf4278c7b Merge pull request #19451 from edx/cstenson/update_django_utils 
Update django utils version
 2018-12-14 16:12:23 -05:00
Cali Stenson
7dd6e2d87f Update django utils version 
REVE-69
 2018-12-14 15:30:15 -05:00
Matt Tuchfarber
885850eadb Ignore integrity error in revenue holdback experiment 2018-12-14 14:53:51 -05:00
Ned Batchelder
bec7fd66de $ make upgrade 2018-12-14 13:22:42 -05:00
Ned Batchelder
55cc2aea20 Have to pin django-simple-history 2018-12-14 13:15:45 -05:00
Bessie Steinberg
04c17192c5 Merge pull request #19444 from edx/bessiesteinberg/REVE-154-feature-based-enrollment-global-kill-switch 
REVE-154 FBE Global Kill Switch
 2018-12-14 12:05:59 -05:00
Ned Batchelder
66c0f40e89 Move defensive pins to constraints.txt 2018-12-14 11:58:02 -05:00
Bessie Steinberg
6f2a2785e8 REVE-154 FBE Global Kill Switch 
Create a global kill switch for feature based enrollment.  To turn on
the kill switch (and turn off both course duration gating and content
type gating) enable a waffle flag named:
'content_type_gating.global_kill_switch'
 2018-12-14 09:36:56 -05:00
noraiz-anwar
da2319cac1 bumping edxval to 0.1.23 2018-12-14 12:38:41 +05:00
Matthew Piatetsky
77a9b8eedc Merge pull request #19445 from edx/transifex-bot-update-translations2018-12-13 
Update translations
 2018-12-13 23:38:13 -05:00
Matthew Piatetsky
d7a6fb5c0c fix quality error 2018-12-13 16:17:37 -05:00
Gabe Mulley
181a531aca remove translations from support form values 2018-12-13 16:13:10 -05:00
edX Transifex Bot
772d8af669 Update translations 2018-12-13 19:29:23 +00:00
Bill Filler
92551e7b7a Merge pull request #19369 from edx/bfiller/REVE-88 
Add feature-based enrollments search to support form
 2018-12-13 14:01:45 -05:00
Matthew Piatetsky
e4ab7565ed Merge pull request #19443 from edx/update_messaging 
fix upgrade deadline bug
 2018-12-13 13:09:51 -05:00
Matthew Piatetsky
dda5eded24 fix bug with banner deadline logic 2018-12-13 12:32:14 -05:00
Jeremy Bowman
d3d0d0a2ff Merge pull request #19437 from edx/jmbowman/TE-2808 
TE-2808 Fix diff-quality comparison target
 2018-12-13 11:22:43 -05:00
Gabe Mulley
5831a1f73d Merge pull request #19439 from edx/update_messaging 
update banner messaging
 2018-12-13 09:50:01 -05:00
Matthew Piatetsky
eaa07082ed update messaging 2018-12-13 01:15:48 -05:00
Matthew Piatetsky
14a59c7768 Merge pull request #19424 from edx/REVE-156 
remove username from holdback key
 2018-12-12 23:50:45 -05:00
Matthew Piatetsky
93f6dfa330 Remove username from holdback key 2018-12-12 20:46:45 -05:00
Jansen Kantor
b2b92308d8 Merge pull request #19436 from edx/jkantor/list-user-roles2 
Add API call to list roles of the logged-on user
 2018-12-12 15:59:14 -05:00
Jeremy Bowman
f2ee1b5cfe TE-2808 Fix diff-quality comparison target 2018-12-12 15:51:28 -05:00
Alex Dusenbery
e44c6af957 Gradebook: add attempted field to subsection data, remove 2 unused fields. 2018-12-12 15:23:32 -05:00
jansenk
0fb7c101c7 Add API call to list roles of the logged-on user 
EDUCATOR-3796
 2018-12-12 14:54:07 -05:00
Zubair Afzal
14009d3a6b Merge pull request #19425 from edx/zub/ENT-1324-add-enterprise-customer-types 
ENT-1324 Update enterprise app version to 1.1.2
 2018-12-12 16:33:36 +05:00
zubair-arbi
217b63b492 ENT-1324 Update enterprise app version to 1.1.2 2018-12-12 15:46:26 +05:00
raeeschachar
dc37fb2cbc Merge pull request #19416 from edx/raees/update-bootstrap 
Updated edx-bootstrap version to 1.0.3. Updating it on platform as part of
 2018-12-12 15:30:43 +05:00
Awais Jibran
fda85ddcf5 Merge pull request #19418 from edx/aj/fix-segmentio-event 
Handle string datetime with datetime parser.
 2018-12-12 12:08:08 +05:00
Ned Batchelder
9aef89ab2d Merge pull request #19419 from edx/nedbat/constraints-file 
Constraints file for pinning packages
 2018-12-11 19:35:13 -05:00
Nimisha Asthagiri
6645d3f426 Remove Grades v0 REST API (DEPR-3) 2018-12-11 19:03:07 -05:00
Ned Batchelder
fe57498a4d $ make upgrade 2018-12-11 17:13:41 -05:00
Ned Batchelder
e4adce6869 Pin edx-lint to keep the version stable 2018-12-11 17:13:41 -05:00