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

3916 Commits

Author SHA1 Message Date
Feanil Patel
59ae37b3ba Merge pull request #21903 from edx/feanil/fix_date_mock 
Fix datetime mock to only mock the now function.
 2019-10-02 09:44:57 -04:00
Diana Huang
5e5c857208 Merge pull request #21902 from edx/diana/annotate-toggles 
Annotate a few of the course_experience waffle flags.
 2019-10-02 09:36:54 -04:00
Adeel Khan
f11afb57a2 Adds migration for simulate publish command 
A rewording of help text caused django to create
a new migration for config model and that was not
initially pushed to master.
 2019-10-02 14:45:43 +05:00
aarif
e6470fb970 python 3 fixes 
changes made to fix quality errors

changes made to fix quality errors

minor changes
 2019-10-02 12:13:45 +05:00
Feanil Patel
3132982141 Fix datetime mock to only mock the now function. 2019-10-01 16:17:45 -04:00
Diana Huang
ff795347dd Annotate a few of the course_experience waffle flags. 2019-10-01 16:03:36 -04:00
David J. Malan
680f62278c AccessTokenView: support for X-Token-Type in HTTP header (#21662) 
* AccessTokenView: support for X-Token-Type in HTTP header
 2019-10-01 15:57:21 -04:00
Aarif
bc6821ce53 Merge pull request #21810 from edx/BOM-745 
BOM-745
 2019-10-01 11:58:09 +05:00
Ayub
df066afdf7 Merge pull request #21848 from edx/BOM-882 
BOM-881, BOM-882
 2019-10-01 10:39:53 +05:00
Nimisha Asthagiri
4914c42364 Python 3: resp.content regex searches 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
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
Nimisha Asthagiri
95c2e49438 Merge pull request #21840 from edx/bom/block-structure-python-3 
block_structure python-3 upgrade
 2019-09-30 08:33:32 -04:00
Nimisha Asthagiri
468f1ad393 Merge pull request #21839 from edx/bom/course-overviews-python-3 
course_overviews python-3 upgrade
 2019-09-30 08:33:17 -04:00
Nimisha Asthagiri
4589e05215 Merge pull request #21838 from edx/bom/api-admin-python-3 
api_admin python-3 upgrade
 2019-09-30 08:32:54 -04:00
Ayub khan
86bd5a4643 BOM-881 
python3 compatibility
 2019-09-30 14:58:12 +05:00
Ayub khan
cc4050460e BOM-882 
python3 compatibility
 2019-09-30 14:42:55 +05:00
Aarif
7eee466c68 Merge pull request #21815 from edx/BOM-747 
BOM-747
 2019-09-30 12:59:46 +05:00
Aarif
d7d02b9802 Merge pull request #21808 from edx/BOM-744 
BOM-744
 2019-09-30 12:57:41 +05:00
Aarif
473398d410 Merge pull request #21792 from edx/BOM-743 
BOM-743
 2019-09-30 12:57:07 +05:00
Nimisha Asthagiri
b0a1a99aa6 block_structure python-3 upgrade 2019-09-28 14:15:24 -04:00
Nimisha Asthagiri
ea0bea8193 course_overviews python-3 upgrade 2019-09-28 14:00:14 -04:00
Nimisha Asthagiri
7c211a5843 api_admin python-3 upgrade 2019-09-28 12:54:34 -04:00
Jeremy Bowman
ead81288ad Always store transformers_schema_version as text BOM-576 (#21823) 2019-09-27 14:33:25 -04:00
Stu Young
7c6c166e73 fix toggle implementation annotations (#21802) 
fix toggle implementation annotations and rename waffle flags
 2019-09-27 11:45:40 -04:00
Jeremy Bowman
88b8e97409 Fix block_structure error handling BOM-577 (#21801) 2019-09-27 10:06:00 -04:00
Matthew Piatetsky
c7c4f6073d Merge pull request #21798 from edx/PROD-713 
show graded content block without the upsell when the upgrade deadline is expired
 2019-09-27 09:54:26 -04:00
aarif
14f7990b3e python 3 fixes 2019-09-27 18:05:05 +05:00
Hassan Javeed
8ad77f7f0c Removed one-off management commands. 2019-09-27 18:04:16 +05:00
aarif
a86b44a250 python 3 fixes 2019-09-27 16:56:41 +05:00
Awais Qureshi
2df263662b Merge pull request #21726 from edx/awais786/BOM-627 
BOM-627
 2019-09-27 16:20:19 +05:00
Awais Qureshi
b48fe6162e Merge pull request #21730 from edx/awais786/BOM-729 
BOM-729
 2019-09-27 16:07:16 +05:00
aarif
13afdbb84c python 3 fixes 
minor changes
 2019-09-27 15:59:03 +05:00
Aarif
889445a2fd Merge pull request #21790 from edx/BOM-741 
BOM-741
 2019-09-27 14:49:23 +05:00
Aarif
5597a86a6b Merge pull request #21773 from edx/BOM-739 
BOM-739
 2019-09-27 14:47:50 +05:00
Ayub
93386c8947 Merge pull request #21786 from edx/BOM-671 
BOM-671
 2019-09-27 09:45:45 +05:00
Matthew Piatetsky
0c03138229 show graded content block without the upsell when the upgrade deadline is expired 2019-09-26 17:49:08 -04: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
aarif
62e26f1273 python 3 fixes 2019-09-26 19:06:12 +05:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
aarif
eb694a71b8 python 3 fixes 2019-09-26 18:08:06 +05:00
noraiz-anwar
67af4b8eb1 fix course import issue 2019-09-26 18:00:21 +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
aarif
ac37cc6fd0 python 3 fixes 
minor changes

minor fixes

minor fixes
 2019-09-26 17:09:52 +05:00
Ayub khan
d1ff659942 BOM-671 
python3 compatibility
 2019-09-26 14:26:05 +05:00
Ayub
846a12939e Merge pull request #21735 from edx/BOM-update_str_method 
BOM Project __unicode__ to __str__
 2019-09-26 10:47:14 +05:00
Zia Fazal
8c9b13e6fc Merge pull request #21770 from edx/ziafazal/ENT-2268 
ENT-2268: Added signal handler for COURSE_GRADE_NOW_PASSED
 2019-09-25 23:31:36 +05:00
Zia Fazal
19436f8d3d Bumped edx-enterprise version to 1.10.7 
Fixed broken unit test

connected COURSE_GRADE_NOW_PASSED at the end

added receiver to signal connect call
 2019-09-25 22:32:53 +05:00