Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,111 Commits 1 Branch 0 Tags
441d2e44b9457817bf9d2e052d160bc2e3effc2a
Commit Graph

50111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rick Reilly
712f6fc997 Add UML diagram for the ProgramEnrollments Plugin 2019-05-21 09:28:28 -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
Jillian Vogel
320288c34a Fixes issue encountered when cms worker updates grades: 
Grades: SGF.update
...
Cannot grade student 2 in course course-v1:...  because of exception: 'Settings' object has no attribute 'GENERATE_PROFILE_SCORES'

(cherry picked from commit e0ae8f49a64c3148d446d7e535eca26016dd17d1)
 2019-05-21 08:49:02 +09:30
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
edX requirements bot
deebe34652 Updating Python Requirements (#20649) 2019-05-20 10:09:19 -04:00
Robert Raposa
e2a8925419 Merge pull request #20644 from edx/robrap/remove-lint-rule 
remove ungrouped-imports rule from pylint
 2019-05-20 08:55:47 -04:00
Waheed Ahmed
137be4bf79 Merge pull request #20537 from edx/waheed/revert-LEARNER-4117 
Revert "Making honor code not eligible for Certificate"
 2019-05-20 14:29:02 +05:00
Waheed Ahmed
962dff88fc Merge pull request #20546 from edx/waheed/PROD-269-disable-honor-cert 
Add feature flag to disable honor mode certificates.
 2019-05-20 13:44:04 +05:00
Waheed Ahmed
2c80a76f8e Add feature flag to disable honor mode certificates. 
Added a feature flag to disable honor mode certificates for
edx.org, by default set to false to allow honor mode certificates
for open community.

PROD-269
 2019-05-20 12:53:22 +05:00
Robert Raposa
52266726b3 remove ungrouped-imports rule from pylint 2019-05-18 22:02:09 -04:00
Josue Balandrano Coronel
0e85af8a98 Update CourseEnrollment Admin ModelForm to correct edit and create 
student enrollments. We no longer need to parse the course key into an
opaque key since the opaque key class can already handle strings and the
parsing happens there. We also need to specify which course enrollment
are we editing or else the reference is lost when saving the edits.
 2019-05-18 17:24:13 +02:00
Jolyon Bloomfield
86f564e1b6 Fixing course links in solution blocks 2019-05-17 23:12:42 -04:00
edX requirements bot
c01ca30ff2 Updating Python Requirements (#20641) 2019-05-17 19:30:12 -04:00
Calen Pennington
755a5c7db6 Augment content_type_gating tests to detect the failure case from the original REVMI-34 implementation 2019-05-16 15:17:33 -04:00
Stu Young
6dc70a6758 incr-310 (#20615) 
* run python modernize

* run isort

* Add oauth2_handler module docstring.
 2019-05-16 14:42:22 -04:00
Stu Young
175c3c6d03 incr-292 (#20587) 
* run python modernize

* run isort

* Fix imports
 2019-05-16 14:37:44 -04:00
Stu Young
c0e3ab8e15 incr-317 (#20608) 
* run python modernize

* run isort

* try to fix quality

* imports fix

* pylint supression
 2019-05-16 13:57:43 -04:00
Stu Young
3e92168e80 incr-271 (#20568) 
* run python modernize

* run isort

* quality
 2019-05-16 13:56:35 -04:00
Stu Young
0bb7652a75 incr-303 (#20623) 
* run python modernize

* run isort

* Fix imports
 2019-05-16 13:55:47 -04:00
Matthew Piatetsky
3eadc332ab [REVMI-195] Fix missing FBE banner dates in firefox (#20627) 
[REVMI-195] Fix missing FBE banner dates in firefox
 2019-05-16 13:46:47 -04:00
Stu Young
0f1c391134 incr-275 (#20584) 
* run python modernize

* run isort

* quality fixed

* quality
 2019-05-16 13:44:02 -04:00