Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

1898 Commits

Author SHA1 Message Date
Nicholas D'Alfonso
3ad963b8a7 AA-3 course dates cleanup 
-change Important Course Dates to Upcoming Dates
-remove today's date
-left align date, right aling rest of info
 2020-01-13 14:58:23 -05:00
David Ormsbee
2cb2265ffe Add request caching to reduce ORM queries 
This adds request caching to the following places:
* course expiration wrapper (displayed in Units)
* offer banner generation (displayed in Units)
* get_enrollment
* user_by_anonymous_id
* youtube_disabled_for_course

On a sample course with edx-val enabled, this reduced the queries
for a large sequence from 450 to 155.
 2019-12-30 16:19:25 -05:00
Feanil Patel
046feb0cf0 Merge pull request #22649 from edx/feanil/fix_pep8 
Fix all E303 pep8 errors.
 2019-12-30 13:32:26 -05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
2df8b8226b Merge pull request #22643 from edx/feanil/2to3_asserts 
Run `2to3 -f asserts . -w` on edx-platform.
 2019-12-30 12:13:42 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w 
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
 2019-12-30 10:35:30 -05:00
Feanil Patel
70294b0ad2 Run 2to3 -f asserts . -w on edx-platform. 
https://docs.python.org/3.5/library/2to3.html#2to3fixer-asserts
 2019-12-30 10:22:19 -05:00
Matthew Piatetsky
652b49c5ac Merge pull request #22550 from edx/REV-1064 
[REV-1064] show discount in sidebar and sock
 2019-12-18 14:08:22 -05:00
DawoudSheraz
bb02732d37 update user check in user state service 2019-12-18 11:16:43 +05:00
Matthew Piatetsky
3a54df511a show discount in sidebar and sock 2019-12-17 09:09:19 -05:00
DawoudSheraz
c58ec73210 create service for CSM 2019-12-09 12:21:16 +05:00
saadyousafarbi
a59363432c handle section link bug for staff-only units for learners. 2019-11-27 15:52:39 +05:00
Diana Huang
f8c8bf36a6 Move password reset logic from student to user_authn. 2019-11-25 13:58:09 -05:00
Matthew Piatetsky
b0c9662b51 remove discount banner from track selection 2019-11-12 13:28:27 -05:00
Matthew Piatetsky
bd76a71019 delete old holdback code 2019-11-07 09:51:39 -05:00
uzairr
386e05d3b1 Add warning to the bottom of verification status card on dashboard. 
Learners are not allowed to make an attempt of the procotored exam if
they verify their identity near to proctored exam date.To make them,
aware about their expiry date, modification are done to the status card
so that user experience will be improved.

PROD-769
 2019-10-25 18:09:39 +05:00
julianajlk
6e0914ad5d add FPD banner to courseware (#22113) 
REV-980
 2019-10-23 09:33:11 -04:00
Awais Qureshi
3959bdf1ea BOM-937 
Open a file in read binary mode to avoid bytes issues.
 2019-10-23 10:44:21 +05:00
julianajlk
98f907f23c Revert "add first purchase discount to courseware (#22058)" 
This reverts commit 059b619794.
 2019-10-21 13:57:18 -04:00
julianajlk
059b619794 add first purchase discount to courseware (#22058) 
REV-980.
* moved get_first_purchase_offer_banner_fragment to Discounts utils.py
* added banner wrapper method
* updated banner with time limit
 2019-10-21 13:56:38 -04:00
Ayub khan
b3c062be1b BOM-848 Different Hash Values 
hashlib produces different md5 hash in python3 against same values as
compared to python2.
 2019-10-21 14:02:49 +05:00
aarif
164141def9 replaced json.loads with a util to handle bytes 
changes made to fix jenkins/quality errors

changes made as suggested

added the docstring to fix quality issue

made a few changes to fix some tests

replaced json.loads with a util to handle bytes

changes made to fix jenkins/quality errors

changes made as suggested

added the docstring to fix quality issue

made a few changes to fix some tests

made changes as suggested

made changes as suggested

updated the requirements with make upgrade
 2019-10-16 12:14:01 +05:00
aarif
d176957708 Updated the tests to fix the string/bytes input 
changes made to pass tests with python 2 and other minor changes

Updated the tests to fix the string/bytes input

changes made to pass tests with python 2 and other minor changes

made some changes as suggested

made changes as suggested

changes made as suggested
 2019-10-14 18:47:18 +05:00
Ayub
732dfce14d Merge pull request #21996 from edx/BOM-test-fix-test_download_srt_exist 
BOM test_download_srt_exist test fix
 2019-10-11 13:01:47 +05:00
Feanil Patel
2cd474c72d Merge pull request #21970 from edx/feanil/fix_xmodule_video_tests 
Fix video module tests related to transcript conversion.
 2019-10-10 13:32:44 -04:00
Awais Qureshi
750b554637 BOM-915 
Fixing bytes and ordering issue.
 2019-10-10 18:00:12 +05:00
Ayub khan
198743f7b0 BOM test_download_srt_exist test fix 
need unicode to compare with unicode string
 2019-10-10 17:17:29 +05:00
Feanil Patel
76c578df36 Fix more transcript related tests to be consistent. 2019-10-09 11:00:23 -04:00
Awais Qureshi
9ed328879e BOM-861 
Dictionaries are being rendered into the HTML but in different order between python2 and python3.
The function parses and sorts the dictionary so that we get ordered data that can be compared in tests cases.
 2019-10-08 12:45:01 +05:00
Awais Qureshi
79b00c9af4 BOM-866 
Dictionaries are being rendered into the HTML but in different order between python2 and python3 and failing tests in python3.
The function parses and sorts the dictionary so that we get ordered data that can be compared in tests cases.
 2019-10-07 15:00:41 +05:00
Diana Huang
df32ffd37b Remove notes app and remaining js. 2019-10-02 15:00:37 -04:00
Aarif
7be6acb880 Merge pull request #21856 from edx/BOM-851 
BOM-851
 2019-10-02 11:44:45 +05:00
Ayub
ac3718055a Merge pull request #21855 from edx/BOM-842 
BOM-842
 2019-10-01 10:37:15 +05:00
Awais Qureshi
647527f916 Merge pull request #21852 from edx/awais786/BOM-829 
BOM-829
 2019-09-30 22:26:54 +05:00
Nimisha Asthagiri
8cfc33c0f1 Python 3: multi-line regex replacement of assertIn and assertNotIn 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
4914c42364 Python 3: resp.content regex searches 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
bb419b485d Python 3: assertEqual(response.content.count -> assertContains(.. 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
9bbc21ea8c Python 3: multi-lined assertIn, assertNotIn -> assertContains, assertNotContains 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
beb95eb69c Python 3: assertIn -> assertContains consistency 2019-09-30 08:51:01 -04:00
Nimisha Asthagiri
d4832a65aa Python 3: assertNotIn -> assertNotContains consistency 2019-09-30 08:50:38 -04:00
Nimisha Asthagiri
ccefde8d3c Python-3: assertNotIn(..response.content) -> assertNotContains 2019-09-30 08:50:38 -04:00
Nimisha Asthagiri
a6b219a9e9 Python-3: assertIn(..response.content) -> assertContains 2019-09-30 08:50:38 -04:00
aarif
bec80bb34b python 3 fixes 2019-09-30 16:02:00 +05:00
Ayub khan
73a453d3c2 BOM-842 2019-09-30 15:59:36 +05:00
Awais Qureshi
c96c172b3a BOM-829 
Python3 fix.
 2019-09-30 15:23:03 +05:00
Aarif
177b8ab60a Merge pull request #21623 from edx/BOM-421 
BOM-421
 2019-09-27 14:46:35 +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
1793de5cbb python 3 fixes 
test fixes

python 3 fixes

test fixes

test fixes

quality fix

python 3 fixes

minor fixes
 2019-09-26 14:50:14 +05:00
aarif
22e99642e7 python 3 fixes 2019-09-24 16:24:44 +05:00