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

49771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
adeelehsan
db50cbe503 Merge pull request #20598 from edx/aehsan/prod-277/update_the_edx_icp_license 
Updated ICP license in edx footer
 2019-05-22 22:12:56 +05:00
edX requirements bot
7177d55f73 Updating Python Requirements (#20664) 2019-05-22 10:12:04 -04:00
Dave St.Germain
1c538a3ab8 Merge pull request #20659 from edx/dcs/update-when 
Update edx-when to 0.1.5
 2019-05-22 09:54:21 -04:00
Muhammad Ammar
6b37cbe44f Merge pull request #20663 from edx/ammar/update-edx-enterprise-version 
update edx-enterprise version
 2019-05-22 16:27:04 +05:00
muhammad-ammar
29ae9f1736 update edx-enterprise version 
ENT-1885
 2019-05-22 13:27:05 +05:00
Michael Roytman
5da94023e6 Merge pull request #20620 from edx/mroytman/bulk-email-python-api 
introduce Python API for BulkEmail Djangoapp
 2019-05-21 18:38:24 -04:00
Andytr1
1cfc6738cf Merge pull request #20631 from edx/andytr1/proctored_report 
EDUCATOR-4290 support for provider and track
 2019-05-21 15:54:45 -04:00
atesker
0bd94327fe killed rebase 2019-05-21 14:35:10 -04:00
Stu Young
d5ee03e81d INCR-258 Run python-modernize on lms/djangoapps/experiments (#20560) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:48:28 -04:00
Stu Young
5e6c7b9911 INCR-253 Run python-modernize on lms/djangoapps/shoppingcart/management lms/djangoapps/shoppingcart/tests (#20554) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:46:26 -04:00
Stu Young
760743cca2 INCR-294 Run python-modernize on lms/djangoapps/bulk_enroll (#20601) 
* run python modernize

* run isort

* Fix python
 2019-05-21 11:45:40 -04:00
Stu Young
4cf2e855c9 INCR-302 Run python-modernize on lms/djangoapps/discussion/django_comment_client/base (#20626) 
* run python modernize

* run isort

* Fix quality

* Fix quality
 2019-05-21 11:44:57 -04:00
Stu Young
51948f8895 INCR-306 Run python-modernize on lms/djangoapps/discussion/settings and lms/djangoapps/discussion/tests (#20619) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:44:00 -04:00
Stu Young
787868d48b INCR-308 Run python-modernize on lms/djangoapps/ccx/tests (#20617) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:43:22 -04:00
Stu Young
3e11ac8863 INCR-314 Run python-modernize on lms/djangoapps/grades/config and lms/djangoapps/grades/settings (#20611) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:42:18 -04:00
Stu Young
95986d162b INCR-280 Run python-modernize on lms/djangoapps/commerce/api/v1 (#20579) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:41:15 -04:00
Stu Young
94efff4636 INCR-279 Run python-modernize on lms/djangoapps/commerce/migrations (#20580) 
* run python modernize

* run isort
 2019-05-21 11:40:28 -04:00
Stu Young
caa9fd0009 INCR-254 Run python-modernize on lms/djangoapps/shoppingcart/migrations and lms/djangoapps/shoppingcart/processors (#20556) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:39:46 -04:00
Stu Young
1e01baf979 INCR-255 Run python-modernize on lms/djangoapps/notes (#20565) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:38:26 -04:00
Stu Young
ea98e08362 INCR-256 Run python-modernize on lms/djangoapps/debug (#20564) 
* run python modernize

* run isort
 2019-05-21 11:37:47 -04:00
Stu Young
367736614d INCR-259 Run python-modernize on lms/djangoapps/survey (#20561) 
* run python modernize

* run isort
 2019-05-21 11:35:25 -04:00
Stu Young
da616921f0 INCR-257 Run python-modernize on lms/djangoapps/bulk_email/migrations and lms/djangoapps/bulk_email/tests (#20563) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:34:42 -04:00
Stu Young
c33bd1c643 INCR-262 Run python-modernize on lms/djangoapps/certificates/migrations and lms/djangoapps/certificates/views (#20558) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:32:51 -04:00
Stu Young
c842b907b5 INCR-263 Run python-modernize on lms/djangoapps/instructor_task/config and lms/djangoapps/instructor_task/management (#20559) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:31:43 -04:00
Stu Young
c101a613d9 INCR-274 Run python-modernize on lms/djangoapps/badges/events and lms/djangoapps/badges/tests (#20585) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:30:40 -04:00
Stu Young
fa3f71cd13 INCR-284 Run python-modernize on lms/djangoapps/program_enrollments/api (#20591) 
* run python modernize

* run isort
 2019-05-21 11:29:23 -04:00
Stu Young
4e1f63bd15 INCR-283 Run python-modernize on lms/djangoapps/program_enrollments/migrations and lms/djangoapps/program_enrollments/tests (#20578) 
* run python modernize

* run isort

* Fix merge conflicts

* Fix merge conflict--file was deleted on master
 2019-05-21 11:27:52 -04:00
Stu Young
dcb92bdfad INCR-281 Run python-modernize on lms/djangoapps/course_wiki/tests (#20576) 
* run python modernize

* run isort
 2019-05-21 11:26:32 -04:00
Stu Young
b0e6870271 INCR-286 Run python-modernize on lms/djangoapps/course_api/blocks/tests (#20593) 
* run python modernize

* run isort

* Fix quality
 2019-05-21 11:24:39 -04:00
Stu Young
cea9390cdc INCR-287 Run python-modernize on lms/djangoapps/course_api/blocks/transformers (#20594) 
* run python modernize

* run isort
 2019-05-21 11:23:12 -04:00
Stu Young
3725595a62 INCR-288 Run python-modernize on lms/djangoapps/coursewarehistoryextended (#20595) 
* run python modernize

* run isort
 2019-05-21 11:21:45 -04:00
Matthew Piatetsky
8fd8c9e0a1 check course end date and verified mode for first purchase offer (#20640) 
check course end date and verified mode for first purchase offer
 2019-05-21 10:44:03 -04:00
AsadAzam
4444b1210c Merge pull request #20657 from edx/asad/prod-302-added-logs 
Added logs
 2019-05-21 19:16:27 +05:00
Syed Muhammad Dawoud Sheraz Ali
61b0bdf5cc Merge pull request #20655 from edx/dsheraz/email-logging 
added time logs for bulk email
 2019-05-21 19:03:55 +05:00
Dave St.Germain
3ff5d58f4c Update edx-when to 0.1.5 2019-05-21 09:57:44 -04:00
Chris Pappas
c2f3576475 ENT-1914 | Running make upgrade to bump version of edx-enterprise (#20652) 
This also pins scipy to version <=1.2.1 in constraints.txt, as 1.3.0 requires py3.5 or above
 2019-05-21 09:53:16 -04:00
Dave St.Germain
73e8324f64 Merge pull request #20399 from edx/dahlia/sgp 
Runtime Support for Staff Graded Points
 2019-05-21 09:29:01 -04:00
Michael Roytman
b33b8e8897 introduce Python API for BulkEmail Djangoapp 2019-05-21 09:22:08 -04:00
DawoudSheraz
9be988a12a added time logs for bulk email 2019-05-21 18:15:11 +05:00
asadazam93
e7ee94552b Added logs 2019-05-21 18:01:08 +05:00
Matthew Piatetsky
93300a2e0e check course end date and verified mode for first purchase offer 2019-05-21 08:34:07 -04:00
adeelehsan
791b9d8e5d Updated ICP license in edx footer 
changed ICP license to link and added
sentence with ICP license

PROD-277
 2019-05-21 16:23:18 +05:00
Waheed Ahmed
2d0662b49a Merge pull request #20634 from edx/geoip2-bot-update-country-database2019-05-15 
geoip2: update maxmind geolite country database
 2019-05-21 15:28:02 +05:00
Syed Muhammad Dawoud Sheraz Ali
89968f342b Merge pull request #20650 from edx/dsheraz/educator-1777 
fix discussion comment styling
 2019-05-21 15:16:34 +05:00
DawoudSheraz
1116cd4b7d fix discussion comment styling 2019-05-21 14:34:03 +05:00
Nimisha Asthagiri
3ed9a75cb3 Merge pull request #20651 from edx/douglashall/fix_deactivate_account_api_auth 
Reorder authentication classes for DeactivateLogoutView.
 2019-05-20 17:36:11 -04:00
Douglas Hall
c85a4da014 Reorder authentication classes for DeactivateLogoutView. 2019-05-20 16:55:00 -04:00
Dave St.Germain
5889d397f0 Addressed review 2019-05-20 12:10:28 -04:00
David Ormsbee
309c92f6e6 Merge pull request #20642 from jolyonb/linkfix 
Bug fix: broken course links in solution blocks
 2019-05-20 11:01:22 -04:00
Calen Pennington
ff73f7d746 Merge pull request #20397 from cpennington/revmi-34-attempt-2 
Revmi 34 attempt 2
 2019-05-20 10:35:39 -04:00