Commit Graph

  • 525ffb5c76 ENT-1135 Upgrade edx-enterprise to 0.72.4 Brittney Exline 2018-08-08 11:25:59 -04:00
  • a1e2cccb3d Add ModelAdmin for UserRetirementPartnerReportingStatus Troy Sankey 2018-08-07 15:15:43 -04:00
  • b961569d35 Fix integrity errors Qubad786 2018-08-08 18:44:22 +05:00
  • b26bb7f98e Merge pull request #18743 from edx/feanil/upgrade_gunicorn Feanil Patel 2018-08-08 09:10:16 -04:00
  • 0d4a9a9e51 Merge pull request #18744 from edx/aj/add-more-logging-in-load_from_module_store Awais Jibran 2018-08-08 16:13:09 +05:00
  • e38957bdb0 Adding more logging Awais Jibran 2018-08-08 10:39:33 +05:00
  • 4dc4fa935a Merge pull request #18737 from edx/noraiz/EDUCATOR-3296 Noraiz Anwar 2018-08-08 11:46:17 +05:00
  • 17f54fbaff TE-2525 Finish removing nose.tools usage Jeremy Bowman 2018-08-07 14:24:53 -04:00
  • 4c93abda09 Merge pull request #18734 from edx/add_mobile_exclusion_for_vop_and_cgv3 Matthew Piatetsky 2018-08-07 19:35:07 -04:00
  • 26e7c82c5f Move pin of gunicorn to 2015 and run make upgrade Feanil Patel 2018-08-07 18:03:07 -04:00
  • cfa4dc6945 add course level mobile app exclusion for vop and cgv3 experiments Matthew Piatetsky 2018-08-06 18:04:06 -04:00
  • df9e6c6fc9 Merge pull request #18741 from edx/mroytman/bump-studio-frontend-1.16.5 Michael Roytman 2018-08-07 16:49:49 -04:00
  • 65d9d5411e Merge pull request #18732 from edx/douglashall/upgrade_drf_extensions Douglas Hall 2018-08-07 16:05:50 -04:00
  • 46cda3656b bump studio-frontend package to 1.16.5 Michael Roytman 2018-08-07 15:21:43 -04:00
  • 6e9d71f44c Upgrade edx-drf-extensions to 1.6.1. Douglas Hall 2018-08-06 15:31:32 -04:00
  • 02e4b87421 Merge pull request #18733 from edx/jmbowman/TE-2525 Jeremy Bowman 2018-08-07 13:55:04 -04:00
  • 6ee6e8935b Merge pull request #18711 from edx/jeskew/mgmt_cmd_cancel_user_retirement J Eskew 2018-08-07 12:03:11 -04:00
  • 4b13ad577b Merge pull request #18731 from edx/jmbowman/TE-2524 Jeremy Bowman 2018-08-07 10:34:54 -04:00
  • 7e410b0656 TE-2524 Remove remaining nose.plugins usage Jeremy Bowman 2018-08-06 14:19:29 -04:00
  • bcaec3c5bb TE-2525 nose.tools removal part 1/2 Jeremy Bowman 2018-08-06 16:52:11 -04:00
  • 70d1ca4740 Merge pull request #18736 from edx/noraiz/EDUCATOR-3074_lms_setting Noraiz Anwar 2018-08-07 17:15:53 +05:00
  • 22a6b08bda set x_frame_option to deny in lms common env noraiz-anwar 2018-08-07 12:04:18 +05:00
  • a5691b7cb6 Merge pull request #18727 from edx/ziafazal/gating-exclude-non-completable Zia Fazal 2018-08-07 16:39:58 +05:00
  • 0e005c4dd8 exempt pdf view from xframe_options:deny noraiz-anwar 2018-08-07 16:33:21 +05:00
  • 1eba936a9e Merge pull request #18730 from edx/aj/update-log Awais Jibran 2018-08-07 14:21:33 +05:00
  • 5fbbf2504d Merge pull request #18735 from edx/awais/remove_frading_flaky_test Agha Awais 2018-08-07 12:28:03 +05:00
  • 41a5f99ebe Merge pull request #18729 from edx/noraiz/EDUCATOR-3292 Noraiz Anwar 2018-08-07 11:56:54 +05:00
  • 4c966afc71 removed flaky test Agha Awais 2018-08-07 05:39:11 +00:00
  • f92a8f6e24 Mgmt command to cancel user retirement request. John Eskew 2018-07-30 16:32:54 -04:00
  • b386198a48 Merge pull request #18717 from edx/jmbowman/TE-2663 Jeremy Bowman 2018-08-06 12:45:59 -04:00
  • 23860605f0 Merge pull request #18699 from edx/mikix/visible_date Diana Huang 2018-08-06 10:49:30 -04:00
  • f1b2435437 Merge pull request #18721 from edx/jmbowman/TE-2524 Jeremy Bowman 2018-08-06 10:22:18 -04:00
  • a53a8a1f77 Update log for library not found Awais Jibran 2018-08-06 18:20:14 +05:00
  • dd9e10f750 exempt discussion upload from xframe deny noraiz-anwar 2018-08-06 16:31:49 +05:00
  • 4535f3f463 Merge pull request #18701 from edx/noraiz/EDUCATOR-3074 Noraiz Anwar 2018-08-06 16:02:54 +05:00
  • 45d1ce6d07 setting xframe_options to deny noraiz-anwar 2018-08-01 14:57:59 +05:00
  • 1d4b62ad6c exclude non completable blocks when calculating completion percentage Zia Fazal 2018-08-03 20:48:36 +05:00
  • 90e3270fd0 Update translations edX Transifex Bot 2018-08-05 20:37:58 +00:00
  • 92030ea152 Merge pull request #18719 from edx/spencerhance/learner-profile-contrast Spencer Hance 2018-08-03 17:49:26 -04:00
  • 0acb2289e1 Merge pull request #18688 from edx/awais/lett_2_bc_advance_settings_III Agha Awais 2018-08-04 00:52:29 +05:00
  • 202e990498 Merge pull request #18686 from edx/awais/lett_2_bc_grading_II Agha Awais 2018-08-04 00:52:09 +05:00
  • 718c6a9340 Test fixes for branch. Diana Huang 2018-08-03 08:30:10 -04:00
  • caaf351e63 Fix visible dates sent to Credentials Michael Terry 2018-07-31 16:29:59 -04:00
  • 2b65fa452e Updated Color of "View My Records" button to be a11y compliant Spencer Hance 2018-08-02 12:11:11 -04:00
  • d9e841298d Merge pull request #17699 from open-craft/clemente/add-coursefields-othercoursesettings Simon Chen 2018-08-03 09:41:36 -04:00
  • 1e2a69e22e Add CourseFields.other_course_settings to store custom fields Daniel Clemente Laboreo 2018-03-15 18:11:20 +02:00
  • e6a63b5693 Grading bokchoy tests II Agha Awais 2018-07-31 11:20:38 +00:00
  • be5ccf92e7 advanced settings bokchoy tests III Agha Awais 2018-07-31 12:31:11 +00:00
  • 3e3098074d Unpin edxval from base.in Qubad786 2018-08-02 21:01:00 +05:00
  • c290bf8a07 TE-2524 Stop using nose.plugins - openedx Jeremy Bowman 2018-08-02 14:54:44 -04:00
  • 8594c904fe Reset to master's migrations Kevin Falcone 2018-08-02 14:09:57 -04:00
  • 5050d8c629 Revert "Updating migrations" Kevin Falcone 2018-08-02 14:01:36 -04:00
  • 8b739fc411 Revert "Updating migrations" Kevin Falcone 2018-08-02 14:01:29 -04:00
  • e9f6e5ab49 Revert "Updating migrations" Kevin Falcone 2018-08-02 14:01:20 -04:00
  • 39ccbe3c89 Merge pull request #18709 from edx/jmbowman/TE-2524 Jeremy Bowman 2018-08-02 13:45:01 -04:00
  • edd4bed081 Merge pull request #18695 from edx/mroytman/course-validation-default-grading-policy Michael Roytman 2018-08-02 12:53:20 -04:00
  • 6083a11a5e add has_grading_policy to course validation API Michael Roytman 2018-07-31 10:27:20 -04:00
  • 5038cfb564 Merge pull request #18706 from edx/colelrogers/LEARNER-5924-render-pathways Cole Rogers 2018-08-02 12:03:35 -04:00
  • 6a390668d2 Merge pull request #18716 from edx/estute/TE-2660 Stu Young 2018-08-02 11:51:35 -04:00
  • defc987a88 TE-2663 Run bok-choy tests in headless Firefox Jeremy Bowman 2018-08-02 11:44:38 -04:00
  • 370501d156 Add feature to send an e-mail to staff when a student enrolls Daniel Clemente Laboreo 2017-11-24 02:54:19 +02:00
  • d30cff2b3a Merge pull request #18715 from edx/revert-ammar/EDUCATOR-2606-thumbnail-issue-with-hls Noraiz Anwar 2018-08-02 20:38:11 +05:00
  • fc811aab33 pass target branch to paver Stuart Young 2018-08-02 11:08:17 -04:00
  • 59a7f88bb1 Merge pull request #18714 from edx/arch/update-drf-repo Nimisha Asthagiri 2018-08-02 11:07:12 -04:00
  • 62559011dc Revert "fix poster display issue with hls" Awais Jibran 2018-08-02 19:53:40 +05:00
  • 0c72e4ee6c Merge pull request #18712 from edx/waheed/LEARNER-6002-exempt-xfram-options-for-xblock Waheed Ahmed 2018-08-02 19:33:40 +05:00
  • 3ea1f0e17c Update edx-drf-extensions to 1.5.5 Nimisha Asthagiri 2018-08-02 10:23:26 -04:00
  • 40b6faf253 Render credit pathways in program details sidebar Cole Rogers 2018-07-31 12:58:28 -04:00
  • e1d27d56f8 Merge pull request #18692 from edx/aj/fix-single-blackout-date Awais Jibran 2018-08-02 18:58:23 +05:00
  • c9d45c8698 Exempt xblock renderer from xframe option. Waheed Ahmed 2018-08-02 15:15:39 +05:00
  • 6e77a2ee2b Merge pull request #18713 from edx/awais/removed_lettuce_tests_for_discussions Agha Awais 2018-08-02 17:57:17 +05:00
  • 469d871994 Merge pull request #18702 from edx/awais/lett_2_bc_textbook Agha Awais 2018-08-02 16:43:41 +05:00
  • f3cc03007f Bump edxval version Qubad786 2018-07-30 18:10:00 +05:00
  • e1dcdd8ed9 Adds test Jillian Vogel 2018-08-02 13:14:25 +09:30
  • aeec52a9ae Improve CourseEnrollment admin search presentation John Hensley 2018-02-08 11:34:33 -05:00
  • 8a558902e0 Merge pull request #18705 from edx/feanil/make_ugprade_and_update_django Jeremy Bowman 2018-08-01 18:41:25 -04:00
  • d5dfbb77aa Run make upgrade but leave pytest behind for now. Feanil Patel 2018-08-01 17:10:10 -04:00
  • 1824ca2657 Merge pull request #18710 from edx/bbaker/fix-award-certificate-error-handling Brandon Baker 2018-08-01 16:17:33 -04:00
  • 2f8c5af246 Add better http error handling to award program certificate Brandon Baker 2018-08-01 14:58:52 -04:00
  • 4f8e8f1a23 Merge pull request #18708 from edx/jeskew/django_upgrade_base_in J Eskew 2018-08-01 15:08:42 -04:00
  • 9f1033dcd2 Merge pull request #18707 from edx/feanil/slightly_upgrade_gunicorn Feanil Patel 2018-08-01 15:04:51 -04:00
  • 4e8668d3be TE-2524 Stop using nose.plugins - LMS 2 Jeremy Bowman 2018-08-01 13:54:06 -04:00
  • e5b88f864f Merge pull request #18691 from edx/jmbowman/TE-2524 Jeremy Bowman 2018-08-01 12:57:29 -04:00
  • 95364acd9f Upgrade Django to 1.11.15 in base.in as well John Eskew 2018-08-01 12:49:19 -04:00
  • 634544a686 Update gunicorn slightly. Feanil Patel 2018-08-01 12:11:50 -04:00
  • ed0dce3be5 Merge pull request #18704 from edx/jeskew/django_upgrade_1_11_15 J Eskew 2018-08-01 11:52:03 -04:00
  • 2a438df3b1 Merge pull request #18641 from edx/colelrogers/LEARNER-5922-cache-pathways Cole Rogers 2018-08-01 11:13:44 -04:00
  • 600c331ade Merge pull request #18696 from edx/PLAT-2268 Brian Mesick 2018-08-01 11:12:10 -04:00
  • 5772506e9d Upgrade Django to 1.11.15 John Eskew 2018-08-01 10:59:13 -04:00
  • 74c6c7aa75 Merge pull request #18638 from open-craft/jill/reinstate-enrollments-admin Ned Batchelder 2018-08-01 10:35:31 -04:00
  • 13570232f7 Merge pull request #18697 from edx/bbaker/LEARNER-6004 Brandon Baker 2018-08-01 10:25:13 -04:00
  • 1c05308d4a Add credit pathway caching Cole Rogers 2018-07-25 10:20:23 -04:00
  • 101714bd0e Properly handle errors in award program certificates LEARNER-6004 Brandon Baker 2018-07-31 11:08:31 -04:00
  • ea06bb8b4d removed lettuce tests for discussion component Agha Awais 2018-08-01 12:53:05 +00:00
  • 2f94817118 bokchoy tests for textbook page Agha Awais 2018-08-01 11:22:04 +00:00
  • a3f8fe49cb Merge pull request #18690 from edx/awais/lett_2_bc_discussion_components Agha Awais 2018-08-01 16:44:54 +05:00
  • cab6c9fcbd Fix discussion blackout date pasrsing. EDUCATOR-3260 Awais Jibran 2018-07-31 22:21:25 +05:00
  • 90b2751997 Merge pull request #18689 from edx/waheed/LEARNER-6002-exempt-xfram-options-for-render-xblock Waheed Ahmed 2018-08-01 13:29:35 +05:00
  • 9e6d421db0 Merge pull request #18698 from edx/arch/update-drf-extensions Nimisha Asthagiri 2018-07-31 17:12:03 -04:00
  • fb30f9a29b Update edx-drf-extensions version Nimisha Asthagiri 2018-07-31 16:24:19 -04:00