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

2086 Commits

Author SHA1 Message Date
Ned Batchelder
855346e9e1 Merge pull request #22042 from mahyard/activation-email-to-ace 
Activation email to ace
 2019-10-18 12:10:20 -04:00
Calen Pennington
97cc816d0b Pre-select the course overview during dashboard loading 2019-10-17 13:02:02 -04:00
Calen Pennington
7ceb0e30fa Mark course outline with graded and scored status in the DOM so that we can run optimizely code on them 2019-10-17 12:14:49 -04:00
Mahyar Damavand
8c55e11d1f Fix code quality test failures 2019-10-16 22:30:31 +03:30
Mahyar Damavand
810eea0e51 Fix celery send_activation_email task failure 2019-10-15 18:30:13 +03:30
Shadi Naif
7984c37a4f Convert Account Activation Emails to edx-ACE 2019-10-14 17:22:03 +03:30
Bill DeRusha
5a6b51bccf remove mailchimp tracking 2019-10-11 15:38:05 -04:00
jinder1s
eceb53c688 encoding str and opening file in rb mode 2019-10-09 16:48:51 -04:00
adeelehsan
7908808911 Configuration model added for bulk unenroll command 
Users information will be available in model as csvfile

Prod-655
 2019-10-03 16:33:13 +05:00
Nimisha Asthagiri
d6d9a17e67 student app: python-3 upgrade 2019-09-30 08:44:54 -04:00
aarif
d832c21a20 python 3 fixes 2019-09-27 17:17:15 +05:00
Aarif
56ee4e0222 Merge pull request #21791 from edx/BOM-742 
BOM-742
 2019-09-27 14:49:45 +05:00
Ned Batchelder
b3845b2b96 Merge pull request #21581 from edx/nedbat/fix-courseware-warning 
Finally import courseware properly everywhere to get rid of a warning
 2019-09-26 14:25:27 -04:00
Waheed Ahmed
5d6a2ea022 Merge pull request #21787 from edx/waheed/PROD-454-use-order-date-attr-for-refund 
Use order date_placed enrollment attribute for refund.
 2019-09-26 21:20:27 +05:00
Ned Batchelder
58828da55b Fix patches to use proper courseware imports 2019-09-26 10:53:55 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
aarif
90b0130a55 python 3 fixes 2019-09-26 18:34:17 +05:00
Waheed Ahmed
68b5f98485 Save order date attribute and some refactoring. 
Save order placement date attribute so that we don't need to call
ecommerce again. Also did some refactoring.
 2019-09-26 17:46:14 +05:00
Waheed Ahmed
551f690ade Use order date_placed enrollment attribute for refund. 
Use order date_placed enrollment attribute for refund if exist otherwise
fetch it from ecommerce.

PROD-454
 2019-09-26 15:20:00 +05:00
Aarif
6f1c05e28c Merge pull request #21744 from edx/BOM-645 
BOM-645
 2019-09-26 12:36:00 +05:00
Ayub khan
5c47a3b425 BOM Project 
Updated __unicode__ to __str__
 2019-09-25 18:31:54 +05:00
aarif
54cb483fc0 python 3 fixes 2019-09-23 15:30:18 +05:00
Aarif
e7a509faf0 Merge pull request #21704 from edx/BOM-724 
BOM-724
 2019-09-23 14:24:35 +05:00
Awais Qureshi
d8e49fadab Merge pull request #21727 from edx/awais786/BOM-637 
BOM-637
 2019-09-21 17:59:58 +05:00
Feanil Patel
57af13ddc4 Merge pull request #21721 from edx/python3-swarm-2 
Python3 swarm 2
 2019-09-20 08:48:19 -04:00
Ayub
39fed7c8fa Merge pull request #21706 from edx/BOM-723 
BOM-723
 2019-09-20 15:39:43 +05:00
Awais Qureshi
63ff4c147c BOM-637 
Fixing python3
 2019-09-20 15:19:05 +05:00
Feanil Patel
4eaf875741 BOM-621 Fix hashing in a bunch of places. 2019-09-19 15:53:39 -04:00
Feanil Patel
cbf35593ac BOM-618 Decode to utf-8 before loading as json in tests. 2019-09-19 11:15:11 -04:00
Feanil Patel
f259a911c7 BOM-618 Decode content we get from test requests. 2019-09-19 10:32:23 -04:00
Ayub khan
00a1db4109 BOM-723 
python3 compatibility
 2019-09-19 15:51:20 +05:00
aarif
048d7740b5 python 3 fixes 2019-09-19 15:08:05 +05:00
Jeremy Bowman
f68c7e87f7 Fix student.helpers logging tests 2019-09-18 12:59:32 -04:00
aarif
18ac219171 python 3 fixes 
made changes as requested

minor fixes

quality fixes
 2019-09-16 22:09:49 +05:00
aarif
ae8126bf98 python 3 fixes 2019-09-13 16:50:20 +05:00
Waheed Ahmed
6612423420 Merge pull request #21524 from edx/waheed/LEARNER-5114-fix-reset-password 
Fixed password reset for authenticated user.
 2019-09-04 16:26:44 +05:00
Feanil Patel
ca9cfb128c Fix errors when running runserver in python 3. 
- The fields need to be unicode not bytes.  In python 2 it was auto
converting.
- The static url base has been allowed to be a unicode string for a
while.
 2019-09-03 09:10:58 -04:00
Waheed Ahmed
9f80fd2b87 Fixed password reset for authenticated user. 
Password reset link for one user is working for other logged in users.
Fixed by verifying the token with request.user if authenticated.

LEARNER-5114
 2019-09-02 15:30:25 +05:00
Dave St.Germain
a3b52662d1 Prevent changing dict while iterating 2019-08-19 16:27:04 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
Dave St.Germain
5febcce20c Fix python3 compatibility in SafeCookieData and elsewhere 2019-08-19 10:24:15 -04:00
Zainab Amir
db67a212e8 Remove create_user management command (#21322) 
Our internal docs suggest using manage_user instead of create_user. We
are no longer using it and it can be removed

LEARNER-3934
 2019-08-17 13:50:58 +05:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -04:00
Ayub khan
2244540ade BOM-78 
Update uuid4().hex.decode(ascii) calls
 2019-08-06 17:16:08 +05:00
uzairr
80316c632d Update Help msgs of management commands 
PROD-399
 2019-08-02 15:20:26 +05:00
Ayub khan
4b2f68da84 INCR-405 python3 compatibility 2019-08-02 13:51:10 +05:00
Christie Rice
3d062aab62 REVMI-354 Add enroll_in_course permission (#21243) 
* REVMI-354 Add enroll_in_course permission

* Fix test
 2019-08-01 08:37:41 -04:00
Waheed Ahmed
ecf9485e59 Remove UTM params from password reset link. 
This type of email is just a transactional message
and should not be crediting revenue to email. Removed
UTM parameters and added ?track=pwreset query param.

PROD-482
 2019-07-29 18:21:30 +05:00
Adeel Khan
7d9be69112 Fix edx-ace templates 
This patch is part of multiple PR's to
protect templates against xss attack

PROD-465
 2019-07-25 12:51:05 +05:00
Ayub
d98133a96a Merge pull request #21071 from edx/INCR-407 
INCR-407 python3 compatibility
 2019-07-23 12:30:41 +05:00