Commit Graph

  • f56776dba8 Merge pull request #21180 from edx/dsheraz/educator-4521 Syed Muhammad Dawoud Sheraz Ali 2019-07-31 13:03:09 +05:00
  • 69b647ae08 Merge pull request #21104 from edx/INCR-432 Ayub 2019-07-31 12:29:26 +05:00
  • 82874538e3 run make upgrade to update DnD Xblock version DawoudSheraz 2019-07-22 15:45:35 +05:00
  • 1836cce9e3 Merge pull request #21253 from cpennington/coverage-combine-test-suite Calen Pennington 2019-07-30 15:18:59 -04:00
  • d0b160888b Archive all coverage reports, named by test context Calen Pennington 2019-07-30 14:18:09 -04:00
  • c00b60ffa5 Merge pull request #21244 from cpennington/check-permissions-view-course-home Calen Pennington 2019-07-30 13:06:13 -04:00
  • 2d1eb9923f Convert a has_access check into a bridgekeeper rule Calen Pennington 2019-07-29 13:56:29 -04:00
  • 9f9a07db4f Stop the commerce API from deleting Masters course modes. Kyle McCormick 2019-07-23 16:42:06 -04:00
  • 4feaa7971d Merge pull request #21251 from edx/awais786/bom-68-django-wiki-0.23 Awais Qureshi 2019-07-30 17:30:08 +05:00
  • 900b7e2515 Merge pull request #20001 from mahyard/master Nimisha Asthagiri 2019-07-30 08:16:44 -04:00
  • ffc9e14635 INCR-432 python3 compatibility Ayub khan 2019-07-12 13:46:10 +05:00
  • 1cb09ec344 Merge pull request #21250 from edx/revert-21090-zaid-prod-449 Muhammad Zaid Bamber 2019-07-30 02:55:25 -07:00
  • 00ce1f84c3 Merge pull request #21084 from edx/INCR-421 Ayub 2019-07-30 14:49:10 +05:00
  • 5a21319374 Merge pull request #21106 from edx/INCR-433 Ayub 2019-07-30 14:48:25 +05:00
  • dfa2cb14b7 https://openedx.atlassian.net/browse/BOM-68 Upgrade the django-wiki version. arbisoft 2019-07-30 14:44:52 +05:00
  • 2f5ed8e199 Merge pull request #21249 from edx/adeel/prod-508_xss_lint_directive_leakage adeel khan 2019-07-30 14:37:14 +05:00
  • ffc2d9729b Revert "Added logs for XQueue Information" Muhammad Zaid Bamber 2019-07-30 14:14:04 +05:00
  • 05718a63db Fix xss-linter directives from edx-ace templates Adeel Khan 2019-07-30 13:34:44 +05:00
  • fdd8652bb6 INCR-421 Ayub khan 2019-07-11 16:40:42 +05:00
  • 7ca32f9197 INCR-433 python3 compatibility Ayub khan 2019-07-12 13:57:00 +05:00
  • cf74aee8ff Merge pull request #21099 from edx/INCR-429 Ayub 2019-07-30 12:07:28 +05:00
  • 11d4cec9d7 Merge pull request #21245 from edx/feanil/fix_make_upgrade Feanil Patel 2019-07-29 16:24:51 -04:00
  • 8746a67357 Merge pull request #21239 from edx/feanil/remove_unused_setting Feanil Patel 2019-07-29 15:52:15 -04:00
  • d9f936b85b Constrain two more requirements. Feanil Patel 2019-07-29 15:48:01 -04:00
  • bb8420bb51 Rmove the extra configurabilty logic for reset buttons. Feanil Patel 2019-07-29 10:48:32 -04:00
  • 8cee2685ad Merge pull request #21240 from edx/revert-21208-permission-courseware-view-course-home Calen Pennington 2019-07-29 12:06:29 -04:00
  • 5e8f90caa1 Revert "Convert a has_access check into a bridgekeeper rule" Calen Pennington 2019-07-29 11:38:26 -04:00
  • da3cdb4f26 Merge pull request #21232 from edx/feanil/remove_parsepy_leftovers Feanil Patel 2019-07-29 10:52:13 -04:00
  • 97e10e168c Merge pull request #21231 from edx/dcs/count-cache Dave St.Germain 2019-07-29 10:13:01 -04:00
  • 4a8f81f8bf Merge pull request #21230 from edx/waheed/PROD-482-remove-utm-param-from-pwd-reset Waheed Ahmed 2019-07-29 18:48:40 +05:00
  • 9bd0d915dc Cache the total and filtered counts in the gradebook API. Dave St.Germain 2019-07-26 14:10:44 -04:00
  • a8a1dffbbb Merge pull request #21211 from cpennington/correct-combine Calen Pennington 2019-07-29 09:39:08 -04:00
  • 03d7d87850 Merge pull request #21160 from cpennington/fbe-orphan-block Calen Pennington 2019-07-29 09:29:47 -04:00
  • ecf9485e59 Remove UTM params from password reset link. Waheed Ahmed 2019-07-26 17:05:35 +05:00
  • c3d923f296 Merge pull request #21235 from edx/waheed/PROD-499-fix-image-croping-and-upload Waheed Ahmed 2019-07-29 18:17:37 +05:00
  • 557213acc1 Fix image cropping and submission for photo ID verify. Waheed Ahmed 2019-07-29 16:49:40 +05:00
  • 0e8f5a9c4a Merge pull request #21233 from edx/iahmad/ENT-1954-Update-Logs-For-Enterprise-SSO-Workflows irfanuddinahmad 2019-07-29 16:46:43 +05:00
  • e723448a77 minor logs update irfanuddinahmad 2019-07-29 16:22:42 +05:00
  • 1dcfaef703 Fix Numeric input problems are backwards for right-to-left languages Awais Jibran 2019-07-22 17:30:18 +05:00
  • d5d10942b1 Merge pull request #21102 from edx/INCR-430 Ayub 2019-07-29 13:21:07 +05:00
  • 636af346d5 Don't skip the migration test. Feanil Patel 2019-07-26 16:27:14 -04:00
  • 63f8167dfc Remove the task that is no longer being referenced. Feanil Patel 2019-07-26 16:24:05 -04:00
  • f21017d5d6 Remove the configmodel for push notifications. Feanil Patel 2019-07-26 16:19:55 -04:00
  • 68b83f763f Rename who-tests-what environment variables Calen Pennington 2019-07-26 14:42:45 -04:00
  • f638723b24 Specify unittest wtw branch Calen Pennington 2019-07-24 13:59:19 -04:00
  • 82c49f0db9 Separate bokchoy coverage files by shard Calen Pennington 2019-07-24 13:47:46 -04:00
  • 21595eaefc Merge pull request #21198 from edx/feanil/update_sandbox_matplotlib Feanil Patel 2019-07-26 14:15:41 -04:00
  • f668e0f53a Merge pull request #21208 from cpennington/permission-courseware-view-course-home Calen Pennington 2019-07-26 12:10:44 -04:00
  • 7fba761050 Convert a has_access check into a bridgekeeper rule Calen Pennington 2019-07-24 11:12:32 -04:00
  • 2f6b4c0a46 Management command to reset program enrollment data (#21221) Zachary Hancock 2019-07-26 09:39:40 -04:00
  • af7ee42bde Merge pull request #21228 from edx/usama/prod-493-contact-us-form-spanish-translation Usama Sadiq 2019-07-26 17:42:47 +05:00
  • ad0e05e6ba Merge pull request #21227 from edx/waheed/PROD-499-fix-photo-verification-image Waheed Ahmed 2019-07-26 16:22:07 +05:00
  • 8530513756 Fix image cropping for photo ID verify. Waheed Ahmed 2019-07-26 14:31:11 +05:00
  • c131418f9d Contact Us Form Spanish Translations usama sadiq 2019-07-26 15:18:08 +05:00
  • b9c9df00c4 Merge pull request #21225 from edx/revert-20793-zaid-prod-250 Muhammad Zaid Bamber 2019-07-26 03:13:47 -07:00
  • b035c2f10b Merge pull request #21105 from edx/INCR-434 Ayub 2019-07-26 13:05:43 +05:00
  • ac919d6010 Merge pull request #21107 from edx/INCR-436 Ayub 2019-07-26 13:03:40 +05:00
  • ae574ae2cc Merge pull request #21108 from edx/INCR-437 Ayub 2019-07-26 13:03:01 +05:00
  • 734d7a1308 Merge pull request #21109 from edx/INCR-438 Ayub 2019-07-26 13:02:26 +05:00
  • 89d0f81855 Merge pull request #21216 from edx/awais786/BOM-68-django-wiki Awais Qureshi 2019-07-26 12:57:24 +05:00
  • b7d4f30769 Revert "Fixed CDN urls to Static urls on edit." Muhammad Zaid Bamber 2019-07-26 11:42:15 +05:00
  • b793c5e791 Merge pull request #21224 from edx/ammar/bump-edx-enterprise Muhammad Ammar 2019-07-26 10:43:30 +05:00
  • 9645035d16 Merge pull request #21124 from edx/adeel/part5_fix_templates adeel khan 2019-07-26 00:37:55 +05:00
  • e3e74788f6 bump edx-enterprise version to 1.8.6 muhammad-ammar 2019-07-25 23:55:09 +05:00
  • 642be6c8b6 Upgrade edx-enterprise to 1.8.5. (#21223) Douglas Hall 2019-07-25 15:20:33 -04:00
  • 03bb45ad62 Merge pull request #21125 from edx/adeel/django_linter adeel khan 2019-07-26 00:07:13 +05:00
  • b5aefd9e83 Fix courseware's app for xss injections. Adeel Khan 2019-07-14 05:40:30 +05:00
  • 5a2c3149a0 Merge pull request #21222 from edx/revert-20723-guruprasad/fix-rcb David Ormsbee 2019-07-25 14:30:34 -04:00
  • b1f3d2cef2 Revert "Fix the unpredictable order randomization issue with randomized content blocks" David Ormsbee 2019-07-25 13:42:20 -04:00
  • 0dcb6ecea5 Making the regex that gets the index courses more secure Diego Millan 2018-12-06 16:55:03 -05:00
  • e1b9869b26 Merge pull request #21194 from edx/feanil/remove_parsepy Feanil Patel 2019-07-25 10:25:08 -04:00
  • 75b0afe721 Merge pull request #21162 from edx/mroytman/EDUCATOR-4434-gradebook-user-counts Dave St.Germain 2019-07-25 09:54:09 -04:00
  • 37c6b60fc8 Adds Django template linter. Adeel Khan 2019-07-25 18:45:17 +05:00
  • 82a010b3b2 Merge pull request #21202 from edx/hammad/WL-1951 George Babey 2019-07-25 09:45:40 -04:00
  • a6045f9d13 Merge pull request #21217 from edx/iahmad/ENT-1954-Reformat-Logs-For-Enterprise-SSO-Workflows irfanuddinahmad 2019-07-25 17:31:40 +05:00
  • df1c7f553a reformatted logging irfanuddinahmad 2019-07-25 14:27:30 +05:00
  • 877168f72b Merge pull request #21081 from edx/INCR-420 Ayub 2019-07-25 15:50:03 +05:00
  • c5a4154400 Merge pull request #21098 from edx/INCR-428 Ayub 2019-07-25 15:49:28 +05:00
  • 4b1ef3005e Merge pull request #21116 from edx/INCR-447 Aarif 2019-07-25 14:51:17 +05:00
  • dc9f67c618 Merge pull request #21096 from edx/INCR-427 Ayub 2019-07-25 14:50:38 +05:00
  • 2a22ff3890 Merge pull request #21080 from edx/INCR-419 Ayub 2019-07-25 14:50:06 +05:00
  • 5255799845 Merge pull request #21085 from edx/INCR-423 Aarif 2019-07-25 14:34:21 +05:00
  • dbd66707e2 https://openedx.atlassian.net/browse/BOM-68 Upgrade the django-wiki version. arbisoft 2019-07-25 14:29:57 +05:00
  • 408ca5645f Merge pull request #21050 from edx/LEARNER-3761/capa-grading-exception Uzair Rasheed 2019-07-25 14:23:24 +05:00
  • 4640641c9c Merge pull request #21201 from edx/BOM-69 Ayub 2019-07-25 14:23:10 +05:00
  • 09e4835c48 Merge pull request #21123 from edx/part4_edx_ace_templates adeel khan 2019-07-25 13:49:09 +05:00
  • 7d9be69112 Fix edx-ace templates Adeel Khan 2019-07-14 04:13:44 +05:00
  • cb530bf788 Merge pull request #21113 from edx/INCR-444 Aarif 2019-07-25 12:43:33 +05:00
  • 60c6f4ff2d Merge pull request #20987 from edx/INCR-332 Aarif 2019-07-25 12:40:50 +05:00
  • a1fed395ee Merge pull request #21121 from edx/part3_template_fix adeel khan 2019-07-25 12:19:57 +05:00
  • 632bee5177 Fix edx templates. Adeel Khan 2019-07-13 04:20:58 +05:00
  • 77dc0fa9f0 add number of total users and number of filtered users to the gradebook API Michael Roytman 2019-07-18 19:47:12 -04:00
  • 889f5e4e58 Merge pull request #21212 from edx/fsheets/PROD-500 Farhanah Sheets 2019-07-24 17:05:18 -04:00
  • 99868f9fca geoip2: update maxmind geolite country database edX Transifex Bot 2019-07-24 20:33:16 +00:00
  • fed5322725 Filter NULL expiry_date from SoftwareSecure filter query Farhanah Sheets 2019-07-24 14:44:24 -04:00
  • cffcce7df0 Merge pull request #20723 from open-craft/guruprasad/fix-rcb David Ormsbee 2019-07-24 16:08:24 -04:00
  • 670540225a Merge pull request #20944 from open-craft/fix-capa-editor-html David Ormsbee 2019-07-24 16:02:11 -04:00
  • d7647c66e3 Select children again when current children don't match the selections Guruprasad Lakshmi Narayanan 2019-05-29 18:08:20 +05:30
  • df4aee23b9 Fix the order randomization behaviour of Randomized Content Block Guruprasad Lakshmi Narayanan 2018-07-23 13:37:04 +05:30
  • a0e4adbaa5 Archive the combined python coverage file Calen Pennington 2019-07-24 13:37:30 -04:00