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

52627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edX requirements bot
bf0a6f6308 Updating Python Requirements (#22553) 2019-12-17 11:52:18 -05:00
Hassan
8960b58a34 Merge pull request #22555 from edx/hassan/add-history-to-course-entitlement-support-detail 
Add history to CourseEntitlementSupportDetail.
 2019-12-17 21:15:08 +05:00
Hassan Javeed
596cbbdf6c Add history to CourseEntitlementSupportDetail 2019-12-17 19:10:45 +05:00
Calen Pennington
31d96dbc47 Merge pull request #22549 from cpennington/git-revision-on-disk 
Read the current edx-platform git revision from a file on disk
 2019-12-17 08:57:41 -05:00
Abdul Hannan
67ea6e9a4a Merge pull request #22480 from edx/pwnage101/add-history-to-generatedcertificate 
Add history to GeneratedCertificate
 2019-12-17 18:23:48 +05:00
Troy Sankey
22f8b65228 Add history to GeneratedCertificate 
DE-1881
 2019-12-17 17:50:25 +05:00
Calen Pennington
11e163d420 Read the current edx-platform git revision from a file on disk 2019-12-17 07:44:28 -05:00
Usama Sadiq
3fb00a40e0 Merge pull request #22552 from edx/usama/prod-793-custom-backpopulate-credentials-arguments 
Code fix & removed Pylint Warning Supression
 2019-12-17 15:44:41 +05:00
usama sadiq
dc666127f1 Code fix & removed Pylint Warning 2019-12-17 15:01:30 +05:00
Robert Raposa
0133288c39 Merge pull request #22548 from edx/robrap/update-READMEs 
update READMEs to clarify responsibilities
 2019-12-16 19:16:01 -05:00
Robert Raposa
c5f44bf20e update READMEs to clarify responsibilities 
Add some clarifications for student, user_api, and user_authn given
the recent clean-up of moving code to the appropriate apps.

ARCH-1248
 2019-12-16 13:51:43 -05:00
Simon Chen
c5e0a9f636 PROD-1089 upgrade edx-proctoring to the code with bug fixes on Instructor Dashboard Proctoring view 2019-12-16 10:40:29 -05:00
edX cache uploader bot
95a015a388 Updating Bokchoy testing database cache (#22540) 2019-12-16 10:06:04 -05:00
Waheed Ahmed
dde52f2ee3 Merge pull request #22542 from edx/transifex-bot-update-translations2019-12-16 
fix(i18n): update translations
 2019-12-16 18:02:42 +05:00
Awais Qureshi
1ac7fa503b Merge pull request #22527 from edx/awais786/BOM-1088 
BOM-1088
 2019-12-16 17:20:56 +05:00
Awais Qureshi
572448d82b BOM-1088 
Upgrade django-ses
 2019-12-16 16:26:07 +05:00
edX Transifex Bot
d8f114b7f8 fix(i18n): update translations 2019-12-16 11:20:20 +00:00
Ayub
bec7893ec5 Merge pull request #22526 from edx/BOM-1085 
BOM-1085
 2019-12-16 15:43:33 +05:00
Aarif
16e0207512 Merge pull request #22494 from edx/BOM-1081 
Updated the django-cors-headers to support Django 2.2
 2019-12-16 14:50:10 +05:00
Syed Muhammad Dawoud Sheraz Ali
2325831d2b Merge pull request #22495 from edx/dsheraz/PROD-1053 
update ORA version to use user state service
 2019-12-16 14:18:34 +05:00
Ayub khan
5c4c9fd26e BOM-1085 
-bumped django-model-utils version to support django 22
 2019-12-16 14:03:57 +05:00
aarif
e9672344f8 updated the django-cors-headers to version that supports django 2.2 
downgrade the django-cors-headers version to 2.5.3

downgrade the django-cors-headers version to 2.5.3

updated the django-cors-headers to version that supports django 2.2

downgrade the django-cors-headers version to 2.5.3

downgrade the django-cors-headers version to 2.5.3

updated the django-cors-headers to version that supports django 2.2

downgrade the django-cors-headers version to 2.5.3

downgrade the django-cors-headers version to 2.5.3

ran make upgrade
 2019-12-16 12:57:10 +05:00
DawoudSheraz
113f48d545 update ora version 2019-12-16 11:20:55 +05:00
DawoudSheraz
5178256f3c add user state service in module render 2019-12-16 11:20:55 +05:00
Robert Raposa
b2be6b3ba2 Merge pull request #22513 from edx/robrap/ARCH-1253-login-user-post-only-take-3 
ARCH-1253: require POST for login_user
 2019-12-15 15:59:00 -05:00
Robert Raposa
3505492fff require POST for login_user 
ARCH-1253
 2019-12-15 11:20:06 -05:00
Diana Huang
ca519d63f3 Merge pull request #22536 from edx/release-candidate 
Release candidate
 2019-12-13 17:04:35 -05:00
Diana Huang
c68d4e1648 Merge pull request #22534 from edx/robrap/BOM-1094-fix-proctoring-bug 
make upgrade to get python 3 proctoring fix
 2019-12-13 15:54:28 -05:00
Robert Raposa
f9613e8436 Merge pull request #22523 from edx/robrap/ARCH-1253-remove-DISABLE_DEPRECATED_LOGIN_POST 
ARCH-1253: remove unused /login_post endpoint
 2019-12-13 15:20:34 -05:00
Feanil Patel
5f2539b49e Bump to the latest edx-proctoring. 2019-12-13 14:59:50 -05:00
Robert Raposa
dea12d85a6 make upgrade to get python 3 proctoring fix 
BOM-1094
 2019-12-13 14:22:50 -05:00
Jeremy Bowman
e13855a295 Upgrade pycryptodomex (#22520) 2019-12-13 14:20:43 -05:00
Diana Huang
95ff97e87d Merge pull request #22532 from edx/diana/transcript-handling 
Standardize input into SubRipFile
 2019-12-13 14:07:15 -05:00
edX cache uploader bot
595b2ce529 Updating Bokchoy testing database cache (#22531) 2019-12-13 13:34:40 -05:00
Feanil Patel
66a3cbc091 Merge pull request #22525 from edx/jenkins/upgrade-python-requirements-2316aba 
Python Requirements Update
 2019-12-13 13:30:53 -05:00
Diana Huang
217228dffc Standardize input into SubRipFile. 2019-12-13 13:28:27 -05:00
Awais Qureshi
078dd82a1e Merge pull request #22514 from edx/awais786/BOM-1083 
BOM-1083
 2019-12-13 23:17:06 +05:00
Matt Tuchfarber
5039ec6a01 Merge pull request #22519 from edx/tuchfarber/enable_devstack_theming 
Adds optional setting to enable devstack theming
 2019-12-13 12:56:28 -05:00
edx-pipeline-bot
a751a4a069 Merge pull request #22530 from edx/release-mergeback-to-master 
Merge release back to master
 2019-12-13 12:44:27 -05:00
Usama Sadiq
08237d58f3 Merge pull request #22509 from edx/usama/prod-793-custom-backpopulate-credentials-arguments 
Added custom arguments to the back-populate job
 2019-12-13 21:04:17 +05:00
Feanil Patel
1411ef548c Merge branch 'master' into release-mergeback-to-master 2019-12-13 10:28:35 -05:00
usama sadiq
044a4899c5 Added custom arguments to the back-populate job 
BackPopulate Program Credentials job performs data for all the programs
and for all the available learners which takes a lot of time.
Adding in custom arguments will help run this job for specific learners
and specific programs.
 2019-12-13 19:34:53 +05:00
Uzair Rasheed
98fe3eaa89 Merge pull request #22524 from edx/PROD-1066/update-tos-and-privacy-links 
Update privacy and TOS links for edge.
 2019-12-13 19:13:47 +05:00
uzairr
c545ed8bbe Update privacy and TOS links for edge. 
Currently,edge environment is serving empty pages against privacy
and TOS.Now, this behaviour is modified by pointing those links to
edX's privacy and TOS pages.

PROD-1066
 2019-12-13 17:39:03 +05:00
AsadAzam
a6735cd8d3 Merge pull request #22252 from edx/asad/prod-969-export-csv 
Export staff users csv
 2019-12-13 17:31:35 +05:00
asadazam93
30c8e1571e Export staff users csv 2019-12-13 16:57:01 +05:00
Awais Qureshi
222523ec24 BOM-1083 
Upgrade django-debug-toolbar
 2019-12-13 16:08:00 +05:00
edX requirements bot
e35eef88c8 Updating Python Requirements 2019-12-13 05:50:32 -05:00
Hasnain Naveed
2316aba391 Merge pull request #22456 from edx/hasnain-naveed/ENT-1961 
ENT-1961 | Making the manual enrollment reason field optional via con…
 2019-12-13 11:03:20 +05:00
Robert Raposa
a9825889bf remove /login_post endpoint 
- retires toggle DISABLE_DEPRECATED_LOGIN_POST
- permanently removes /login_post

Now that studio signin has been retired, we are able to remove the
unused /login_post endpoint.

ARCH-1253
 2019-12-12 17:09:18 -05:00