Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 47e1785a89 Merge pull request #21990 from edx/BOM-911 Aarif 2019-10-17 01:24:36 +05:00
  • 8c55e11d1f Fix code quality test failures Mahyar Damavand 2019-10-16 11:59:42 +03:30
  • 24bb73ed16 Add random2 to codejails (#22054) Jeremy Bowman 2019-10-16 14:20:46 -04:00
  • 7436f9c186 Merge pull request #21915 from edx/REV-733 Matthew Piatetsky 2019-10-16 12:03:58 -04:00
  • f6d0bf77df check if discount expired Matthew Piatetsky 2019-10-02 16:52:59 -04:00
  • 4d3d6c0178 add dynamic_upgrade_deadline to user-metadata (#22046) julianajlk 2019-10-16 11:07:32 -04:00
  • 0e1dba1b24 ENT-1289 | Running make upgrade to bump edx-enterprise (#22047) Chris Pappas 2019-10-16 10:18:15 -04:00
  • c27643e5ce Updating Bokchoy testing database cache (#22049) edX cache uploader bot 2019-10-16 10:15:41 -04:00
  • 5da7a98d63 Merge pull request #22050 from edx/jenkins/upgrade-python-requirements-98b381d Feanil Patel 2019-10-16 08:51:15 -04:00
  • 96112149ac Updating Python Requirements edX requirements bot 2019-10-16 06:49:07 -04:00
  • 98b381d4ac Merge pull request #22048 from edx/bump-recommender-xblock-version Ayub 2019-10-16 15:24:23 +05:00
  • f168aa16ae -version bump recommender-xblock Ayub khan 2019-10-16 14:36:13 +05:00
  • f529e2e393 Merge pull request #22033 from edx/awais786/bom-415-ora2 Awais Qureshi 2019-10-16 14:15:58 +05:00
  • 164141def9 replaced json.loads with a util to handle bytes aarif 2019-10-10 13:57:43 +05:00
  • 6bf8cfc5bd BOM-415 Bump the edx-ora2 version. Run make upgrade. Awais Qureshi 2019-10-14 17:51:44 +05:00
  • 6e7f2f61ef Merge pull request #21994 from edx/BOM-914 Aarif 2019-10-16 01:44:31 +05:00
  • 69255bee73 Merge pull request #21816 from regisb/regisb/simplify-swagger-auto-schema Ned Batchelder 2019-10-15 14:35:46 -04:00
  • f37de7464c Updating Bokchoy testing database cache (#22044) edX cache uploader bot 2019-10-15 14:29:16 -04:00
  • b14ce70053 Add program enrollment status option: ended Matt Hughes 2019-10-11 12:31:51 -04:00
  • 810eea0e51 Fix celery send_activation_email task failure Mahyar Damavand 2019-10-15 18:30:13 +03:30
  • 9de36477ea Merge pull request #22040 from edx/jenkins/upgrade-python-requirements-149f47f Feanil Patel 2019-10-15 10:13:44 -04:00
  • ebe29d9303 Merge pull request #21943 from edx/ziafazal/ENT-1688 Zia Fazal 2019-10-15 18:53:34 +05:00
  • d9180b472d Merge pull request #22006 from edx/bderusha/remove-mailchimp Bill DeRusha 2019-10-15 09:47:08 -04:00
  • c718c02d6e Show blank screen instead of logout message for Enterprise SSO flow Zia Fazal 2019-10-07 16:59:15 +05:00
  • 1d5fcc60bb ENT-1604 Send signal when user is verified via SSO (#21946) Christie Rice 2019-10-15 08:18:54 -04:00
  • 0358587320 Merge pull request #22039 from edx/ziafazal/ENT-2384 Zia Fazal 2019-10-15 16:42:13 +05:00
  • 6304aa5b9b Merge pull request #22030 from edx/BOM-922 Aarif 2019-10-15 16:21:25 +05:00
  • 3b69a4f279 Invoke learner transmission task only for enterprise learners Zia Fazal 2019-10-15 14:40:18 +05:00
  • a40b3376f6 Updating Python Requirements edX requirements bot 2019-10-15 06:48:51 -04:00
  • 149f47ff49 Merge pull request #22038 from edx/awais786/BOM-925 Awais Qureshi 2019-10-15 13:58:59 +05:00
  • f08a7e7268 Merge pull request #22032 from edx/BOM-xblock-recommender-tests-fix Ayub 2019-10-15 13:03:40 +05:00
  • f679768f9e BOM-925 Fixing TypeError, the JSON object must be str, not 'bytes'. Awais Qureshi 2019-10-15 12:57:49 +05:00
  • ce18f581c7 Merge pull request #22034 from edx/awais786/BOM-924 Awais Qureshi 2019-10-15 12:39:42 +05:00
  • f7adc71c44 BOM-924 Fixing TypeError, the JSON object must be str, not 'bytes'. Awais Qureshi 2019-10-14 23:33:21 +05:00
  • 7984c37a4f Convert Account Activation Emails to edx-ACE Shadi Naif 2018-09-13 14:51:16 +03:00
  • d176957708 Updated the tests to fix the string/bytes input aarif 2019-10-10 17:15:18 +05:00
  • f0133d861d BOM Project Xblock Recommber integration tests fix Python3 json can not work with bytes type input so used simplejson instead of python json which works with both bytes and unicode type input. Previously we mistakenly updated StringIO to six.String io. which caused the tests failure. Used io.BytesIO to fix the issues as assci character bytes can not be converted to unicode. Ayub khan 2019-10-14 18:20:42 +05:00
  • 8aa2fad4ec Merge pull request #21988 from edx/BOM-898 Ayub 2019-10-14 17:33:27 +05:00
  • ea4557ff70 removed unnecesary transcript decode aarif 2019-10-14 17:28:47 +05:00
  • d600a5a087 Merge pull request #21910 from edx/BOM-837 Aarif 2019-10-14 16:54:18 +05:00
  • dbc27fd57d Merge pull request #21921 from edx/BOM-805 Ayub 2019-10-14 16:42:26 +05:00
  • 6c98571bbd removed unnecessary encode method to fix input to csv write method aarif 2019-10-02 17:53:28 +05:00
  • 8717510d35 BOM-805 python3 compatibility: Before comparison with unicode decode text if its type is bytes. Ayub khan 2019-10-03 15:16:28 +05:00
  • e9c4c22e6a BOM fixed remaining capa module issues Ayub khan 2019-10-10 12:36:05 +05:00
  • c3735cef01 Merge pull request #21874 from edx/BOM-804 Ayub 2019-10-14 12:30:18 +05:00
  • 4bce520f29 Merge pull request #21919 from edx/BOM-819 Aarif 2019-10-14 11:32:05 +05:00
  • ae216c8584 Rename API decorators to "apidocs" to be provider-agnostic Régis Behmo 2019-10-09 11:31:58 +02:00
  • 1d9a5ab4e7 Rename swagger_auto_schema decorator Régis Behmo 2019-09-27 18:10:44 +02:00
  • e78d69695d Ensure proper arguments in swagger decorator Régis Behmo 2019-09-27 16:55:18 +02:00
  • 33bd0f953a Update swagger.yml Régis Behmo 2019-09-27 15:31:59 +02:00
  • 59635b689e Simplify BookmarksListView.get docs Régis Behmo 2019-09-27 15:29:46 +02:00
  • dac393e9e7 Auto-document API endpoints using view function docstring Régis Behmo 2019-09-27 13:08:57 +02:00
  • c7cb995797 fix(i18n): update translations edX Transifex Bot 2019-10-13 20:52:43 +00:00
  • 14e8e782c9 Merge pull request #22013 from edx/awais786/BOM-917 Awais Qureshi 2019-10-12 13:12:12 +05:00
  • b254df3c52 Merge pull request #22011 from edx/awais786/BOM-916 Awais Qureshi 2019-10-12 13:10:20 +05:00
  • 3db3403fc4 Fix mock transcript responses BOM-918 (#22020) Jeremy Bowman 2019-10-11 16:22:52 -04:00
  • b4d36383e5 Merge pull request #22021 from edx/Remove-backtick-typo Nick 2019-10-11 16:11:09 -04:00
  • b939791fe0 Fix problematic mock in instructor_task tests BOM-403 (#22007) Jeremy Bowman 2019-10-11 15:44:42 -04:00
  • 5a6b51bccf remove mailchimp tracking Bill DeRusha 2019-10-10 16:49:15 -04:00
  • d1ebd1294b Remove backtick typo in advanced_entry.underscore Nick 2019-10-11 15:25:33 -04:00
  • 55c0151cc8 Merge pull request #22019 from edx/feanil/fix_perf_pins Feanil Patel 2019-10-11 14:59:48 -04:00
  • 1098c106e3 Run make upgrade. Feanil Patel 2019-10-11 14:18:31 -04:00
  • 695ed0cb29 Pin just edx-drf-extensions. Feanil Patel 2019-10-11 14:08:36 -04:00
  • 190b175955 Merge pull request #21971 from edx/ndalfonso/DISCO-1388-publisher-link Nick 2019-10-11 13:18:07 -04:00
  • 501cd6795b Merge pull request #22001 from cpennington/no-discount-for-anonymous-users Calen Pennington 2019-10-11 12:44:42 -04:00
  • bf3d337312 Fix dismissal of enterprise learner portal banner. (#22015) Douglas Hall 2019-10-11 11:49:09 -04:00
  • ae9dcdef8a BOM-917 Fix encoding issue. Awais Qureshi 2019-10-11 20:12:34 +05:00
  • 545d5eddc8 DISCO-188 publisher link Nicholas D'Alfonso 2019-10-03 14:16:59 -04:00
  • c446964721 BOM-916 Fixed double decoding issue. Fixed the mock.assertMethod. Dict keys were coming different order. Awais Qureshi 2019-10-11 16:39:44 +05:00
  • b8a19b7b92 Merge pull request #21809 from edx/asad/prod-694 AsadAzam 2019-10-11 17:22:29 +05:00
  • ab49dfa324 Merge pull request #22008 from edx/waheed/PROD-816-remove-youtube-logo Waheed Ahmed 2019-10-11 15:28:02 +05:00
  • 44b2414a5d BOM-804 python3 compatibility we only need to decode if the xml is bytes Ayub khan 2019-10-01 12:38:35 +05:00
  • 313183f3aa Merge pull request #21986 from edx/BOM-821_BOM-822 Ayub 2019-10-11 13:05:59 +05:00
  • e289326172 Merge pull request #21991 from edx/BOM-905 Ayub 2019-10-11 13:02:16 +05:00
  • 732dfce14d Merge pull request #21996 from edx/BOM-test-fix-test_download_srt_exist Ayub 2019-10-11 13:01:47 +05:00
  • 637e1d0bee Remove YouTube logo from footer. Waheed Ahmed 2019-10-11 12:41:35 +05:00
  • c9aa258495 Do not display enterprise learner portal banner if no enterprise learner portals exist for user. (#22005) Douglas Hall 2019-10-10 19:02:15 -04:00
  • 9c92bd96ed Fix assertions failing under Python 3 BOM-668 (#21978) Jeremy Bowman 2019-10-10 15:22:07 -04:00
  • d8d91f4e68 Merge pull request #21945 from edx/nedbat/update-contributing Ned Batchelder 2019-10-10 15:11:09 -04:00
  • 54b00573bd Merge pull request #22002 from edx/release-mergeback-to-master Feanil Patel 2019-10-10 14:28:07 -04:00
  • b6638d21ca Update everything but the constrained packages. Feanil Patel 2019-10-10 14:02:37 -04:00
  • f4738c4b82 Merge pull request #21958 from edx/andytr1/get-override-history-by-grade-id Andytr1 2019-10-10 13:42:29 -04:00
  • e44f238611 Merge pull request #21995 from edx/awais786/BOM-913 Awais Qureshi 2019-10-10 22:38:55 +05:00
  • 2cd474c72d Merge pull request #21970 from edx/feanil/fix_xmodule_video_tests Feanil Patel 2019-10-10 13:32:44 -04:00
  • ef96137ca0 Merge branch 'master' into release-mergeback-to-master Feanil Patel 2019-10-10 13:30:33 -04:00
  • 4aff507847 EDUCATOR-4700 - pull grade overrides by grade_id atesker 2019-10-08 10:57:54 -04:00
  • 076908b38d Merge pull request #22000 from edx/feanil/merge_more_of_master Feanil Patel 2019-10-10 11:38:02 -04:00
  • b098ba633c Merge pull request #21993 from edx/awais786/BOM-912 Awais Qureshi 2019-10-10 20:25:24 +05:00
  • 91e7d8a7be BOM-913 reduce functions moves into functools in python3. Fixed the import. Fixing bytes issue. Awais Qureshi 2019-10-10 17:11:23 +05:00
  • 3e217e3a43 Merge pull request #21999 from edx/awais786/BOM-915 Awais Qureshi 2019-10-10 20:03:39 +05:00
  • 7fba045ce6 Merge branch 'master' into feanil/fix_xmodule_video_tests Feanil Patel 2019-10-10 11:00:54 -04:00
  • 355826f7d8 Don't try to show anonymous users the first-purchase discount Calen Pennington 2019-10-10 10:52:59 -04:00
  • 7dd7f2344b Merge commit 'bbadf48b8e19a0c9f1e1ca750f5ad8b26856bcc1' into feanil/merge_more_of_master Feanil Patel 2019-10-10 10:36:56 -04:00
  • f07fae6e74 Merge pull request #21989 from edx/awais786/BOM-910 Awais Qureshi 2019-10-10 18:39:09 +05:00
  • 750b554637 BOM-915 Fixing bytes and ordering issue. Awais Qureshi 2019-10-10 17:57:42 +05:00
  • d9302ab73b Merge pull request #21982 from edx/feanil/revert_requirements_changes Feanil Patel 2019-10-10 08:45:32 -04:00
  • df0f601057 Merge pull request #21981 from edx/msingh/str_no_decode Manjinder Singh 2019-10-10 08:36:30 -04:00
  • 198743f7b0 BOM test_download_srt_exist test fix need unicode to compare with unicode string Ayub khan 2019-10-10 17:17:29 +05:00
  • 69920f2781 Merge pull request #21985 from edx/zafzal/bump-edx-enterprise-version Zaman Afzal 2019-10-10 16:09:23 +05:00
  • 4387f753d5 BOM-912 Can't convert 'bytes' object to str implicitly Awais Qureshi 2019-10-10 16:06:17 +05:00