Commit Graph

  • a42698a7ed Use a common base req file to avoid tox double requirements. John Eskew 2017-12-07 13:50:05 -05:00
  • b43ac4e80e Merge pull request #16590 from open-craft/jill/video-block-all-sources Jillian Vogel 2017-12-12 02:19:02 +10:30
  • 9b3aad31cc Merge pull request #16852 from edx/dahlia/sfe_bump Farhanah Sheets 2017-12-11 09:31:51 -05:00
  • 1736371b6c add analytics api env variables jaebradley 2017-12-07 11:02:48 -05:00
  • f589dc9d29 WL-1219 Added extended profile fields to the Account settings page. Afzal Wali 2017-11-15 16:50:42 +05:00
  • cdcb4be077 Adds "all_sources" field to Mobile API and video module Course Blocks student_view_data. Jillian Vogel 2017-11-15 13:41:19 +10:30
  • e7ff0230c6 Merge pull request #16822 from edx/tasawer/learner-3165/fix-error-logging-on-program-certificate-error Tasawer Nawaz 2017-12-11 18:26:16 +05:00
  • 02ddf4d321 Merge pull request #16166 from open-craft/smarnach/filter-course-enrollment-allowed Sven Marnach 2017-12-11 13:57:24 +01:00
  • a6f4f1762b update logging in award program certiicate task LEARNER-3165 Tasawer Nawaz 2017-12-07 15:36:07 +05:00
  • bb9e5922e1 Merge pull request #16853 from edx/ddumesnil/xblock Dillon-Dumesnil 2017-12-08 16:40:45 -05:00
  • a03ce146a0 Removing debugging Dillon Dumesnil 2017-12-08 15:35:29 -05:00
  • 78d61c1ad9 Bump to SFE v0.6.1 Farhanah Sheets 2017-12-08 15:08:41 -05:00
  • e61af093a6 Merge pull request #16846 from edx/ddumesnil/xblock Dillon-Dumesnil 2017-12-08 14:57:16 -05:00
  • f63cf61a9d cleanup regex Eric Fischer 2017-12-08 14:36:43 -05:00
  • cffc155307 test fixup Eric Fischer 2017-12-08 13:29:35 -05:00
  • 8ec97371bd drop eslint limit Eric Fischer 2017-12-08 12:37:42 -05:00
  • 5bc6b31e29 eslint --fix Eric Fischer 2017-12-08 12:36:39 -05:00
  • e0112d18e3 Merge pull request #16842 from edx/HarryRein/popover-styling Michael Frey 2017-12-08 14:18:28 -05:00
  • 6240907839 paver function to fingerprint bokchoy db files Stuart Young 2017-12-08 13:54:15 -05:00
  • 3e09b2d09d Remove old Preview config files (not used). David Ormsbee 2017-12-08 13:43:32 -05:00
  • aa8b7ab2ec Fixing correctness text so it doesn't match 'correct' in the word 'correctness' causing my tests to fail. This should be improved soon Dillon Dumesnil 2017-12-08 13:34:44 -05:00
  • b4a4318d1a Merge pull request #16705 from edx/sofiya/1552 Sofiya Semenova 2017-12-08 13:24:07 -05:00
  • 0def70e725 Updating xblock-review version to include commit for being more defensive about score field in the state of a problem Dillon Dumesnil 2017-12-08 13:03:05 -05:00
  • 8752480aac Merge pull request #16829 from edx/diana/registration-form-improvements Diana Huang 2017-12-08 13:00:20 -05:00
  • 2568a4280b Reduce size of the commons.js bundle. David Ormsbee 2017-12-08 12:48:28 -05:00
  • 2162b966d0 Fix styling on the popover. Harry Rein 2017-12-08 12:28:06 -05:00
  • 171e671577 Merge pull request #16838 from edx/dahlia/sfe_bump Eric Fischer 2017-12-08 12:00:10 -05:00
  • 1225bde736 Merge pull request #16807 from edx/LEARNER-3385/content-injection-on-registration Uzair Rasheed 2017-12-08 21:34:09 +05:00
  • a1f0679f3a Educator 1552 - Implement roving tabindex for WYSIWYG editor for discussions Sofiya Semenova 2017-11-28 16:42:24 -05:00
  • 25498df8e3 remove placeholder heading Eric Fischer 2017-12-08 10:41:21 -05:00
  • 648bfeae37 Merge pull request #16832 from edx/dahlia/raise_zendesk_rate_limit Eric Fischer 2017-12-08 09:43:00 -05:00
  • 9bd75eaad1 Update studio-frontend to 0.6.0 Eric Fischer 2017-12-08 09:40:54 -05:00
  • 0ecc0558a3 More registration form cleanup. Diana Huang 2017-12-07 13:02:29 -05:00
  • 3fc788286b Merge pull request #16823 from edx/waheed/LEARNER-2731-implement-journeys-app-banner Waheed Ahmed 2017-12-08 19:37:47 +05:00
  • 8ffac2061d Verify 'Full Name' field does not allow HTML in Signup form uzairr 2017-12-06 14:58:17 +00:00
  • 3ed08e3b35 Implement journeys app banner. Waheed Ahmed 2017-12-07 16:22:06 +05:00
  • 979c7cd1f0 Merge pull request #16703 from edx/zub/ENT-762-update-account-settings-page-for-enterprise-sso Zubair Afzal 2017-12-08 17:56:19 +05:00
  • 2ac544caeb Update account settings page for enterprise learners ENT-762 zubair-arbi 2017-11-29 16:19:05 +05:00
  • 17c889b7dd Merge pull request #16835 from edx/ri/update-edx-organizations-version-0.4.9 Rabia Iftikhar 2017-12-08 15:00:12 +05:00
  • eceacb491b update edx-organizations version to 0.4.9 rabia23 2017-12-08 08:08:52 +00:00
  • 4c352e2f2b Merge pull request #16472 from edx/HarryRein/course-run-selection-dashboard Harry Rein 2017-12-07 16:39:04 -05:00
  • 1a7ffc73c2 raise zendesk_proxy rate limit Eric Fischer 2017-12-07 16:04:01 -05:00
  • f9623fc96a Merge pull request #16796 from edx/thallada/schedules-hold-back-fix Tyler Hallada 2017-12-07 15:10:05 -05:00
  • 6294baf456 Add command to bulk move user language prefs from one code to another bmedx 2017-12-06 12:48:05 -05:00
  • 254aa84f9d Merge pull request #16815 from edx/jeskew/fix_model_import_for_video_transcripts John Eskew 2017-12-07 13:58:06 -05:00
  • 5d1eecd43c python tests, quality, and html element type fix McKenzie Welter 2017-11-28 13:46:51 -05:00
  • 95bb6e3db0 Use pytest-style asserts in test_signals.py Tyler Hallada 2017-12-06 15:57:14 -05:00
  • 6e791c58ea Fix hold back error Tyler Hallada 2017-12-05 15:53:19 -05:00
  • 28837c020f Allowing a user to fulfill their entitlement on the course dashboard. Albert St. Aubin 2017-11-08 11:09:31 -05:00
  • 292848cfe7 Merge pull request #16617 from edx/aj/entitlement_session_backend Albert (AJ) St. Aubin 2017-12-07 12:05:17 -05:00
  • d1630a5871 Merge pull request #16808 from edx/adjust-max-pylint Calen Pennington 2017-12-07 11:54:49 -05:00
  • f7ea33351b Merge pull request #16809 from edx/discussions/remove-roll-out-waffles Alessandro Roux 2017-12-07 11:32:08 -05:00
  • 0ea3753d94 Added Entitlement enroll and unenroll logic to the Enrollment API Albert St. Aubin 2017-11-16 12:41:06 -05:00
  • 4ff39cf51f Merge pull request #16819 from edx/cale/remove-studio-dynamic-asset-dir Calen Pennington 2017-12-07 10:49:34 -05:00
  • df63e311d0 Merge pull request #16818 from edx/jmbowman/PLAT-1372 Jeremy Bowman 2017-12-07 10:26:31 -05:00
  • b14d2e9cf7 Fix video transcript model import before Django initialization occurs. John Eskew 2017-12-06 16:26:04 -05:00
  • 7d28b41bc8 Merge pull request #16825 from edx/update_translations_dec_7 Ayub khan 2017-12-07 18:25:12 +05:00
  • 96984aa3a4 updated translations 7 dec ayub-khan 2017-12-07 17:17:16 +05:00
  • 033645758d Use single quotes on aws.py mrey 2017-12-07 08:54:55 +01:00
  • 3fe6ba59bc PLAT-1372 Remove dead templates copying old admin HTML Jeremy Bowman 2017-12-06 17:11:52 -05:00
  • db2be76adf Merge pull request #16799 from edx/jeskew/turn_on_django_deprecation_warnings John Eskew 2017-12-06 16:55:52 -05:00
  • f365aa9b6a Deleted waffle-based tests. sandroroux 2017-12-06 16:20:47 -05:00
  • a7d6f84398 Don't use the edx-platform revision as the studio assets base url Calen Pennington 2017-12-06 16:12:07 -05:00
  • 4bbc3aa37a Turn on deprecation warnings post-Django 1.11 for bokchoy tests. John Eskew 2017-12-06 15:07:51 -05:00
  • 941bc5cf21 EDUCATOR-1547 | ORA2 v2.1.6 Alex Dusenbery 2017-12-06 14:48:08 -05:00
  • 64bcfa2a04 Merge pull request #16810 from mikix/mikix/LEARNER-3125 Michael Terry 2017-12-06 16:00:15 -05:00
  • 35611e81ec Merge pull request #16769 from edx/dahlia/zendesk_proxy_client Eric Fischer 2017-12-06 15:47:01 -05:00
  • 0974e5b055 Merge pull request #16812 from edx/jmbowman/PLAT-1749 Jeremy Bowman 2017-12-06 15:31:16 -05:00
  • 63d7f87f4f Merge pull request #16811 from edx/pacing/revert-schedule-waffle-removal Nimisha Asthagiri 2017-12-06 14:26:15 -05:00
  • 8743cda0d6 Zendesk Proxy Eric Fischer 2017-12-04 13:28:59 -05:00
  • 19709cd36f PLAT-1749 Support Django 1.10+ CSRF tokens Jeremy Bowman 2017-12-06 13:18:00 -05:00
  • 8acf3434c0 Revert "Merge pull request #16728 from edx/pacing/remove-create-schedules-from-course-waffle-flag" Nimisha Asthagiri 2017-12-06 11:58:39 -05:00
  • e9b3ba72df Fix breadcrumb tooltips in IE Michael Terry 2017-12-06 11:31:50 -05:00
  • 4d948672cd Brought SiteConfig checks back. sandroroux 2017-12-06 11:43:29 -05:00
  • 98b391a278 Merge pull request #16805 from edx/alasdair/LEARNER-3128-sequence-list-role-presentation-a11y-update AlasdairSwan 2017-12-06 11:16:46 -05:00
  • 8b59c6d596 Merge pull request #16639 from edx/ari/react-renderer Ari Rizzitano 2017-12-06 11:12:24 -05:00
  • 9b92a3b73a Merge pull request #16800 from edx/jmbowman/PLAT-1427 Jeremy Bowman 2017-12-06 10:40:57 -05:00
  • f52f0914fa Removed enable_forum_notifications sandroroux 2017-12-06 10:12:29 -05:00
  • fef38170f3 Merge pull request #16798 from edx/youngstrom/bokchoy_cache Michael Youngstrom 2017-12-06 10:11:58 -05:00
  • bcd66c5135 Lower pylint threshold to just above what it is on master Calen Pennington 2017-12-06 10:03:48 -05:00
  • e40b00eda6 Merge pull request #16788 from edx/sylvia/DOC-3826 Sylvia Pearce 2017-12-06 09:59:50 -05:00
  • f89b31da58 Merge pull request #16627 from edx/jlajoie/LEARNER-2983 Jeff LaJoie 2017-12-06 09:46:12 -05:00
  • b3bbc159a0 Removed discussions.forum_response_notifications and discussions.send_notifications_for_course sandroroux 2017-12-06 09:29:15 -05:00
  • ff03f037fc Merge pull request #16804 from edx/douglashall/upgrade_enterprise_0_55_4 Douglas Hall 2017-12-06 09:16:32 -05:00
  • acab64be4d LEARNER-3128 add role=presentation to sequence nav list items AlasdairSwan 2017-12-06 08:38:56 -05:00
  • a567719236 LEARNER-2983: Adding of helper functions and modification of DRF to use SiteConfiguration policy Jeff LaJoie 2017-11-15 12:39:49 -05:00
  • 6598fb2141 Upgrade edx-enterprise package to 0.55.4. Douglas Hall 2017-12-06 05:57:37 -05:00
  • ff7fa721a1 Update translation strings edX Transifex Bot 2017-12-06 10:06:19 +00:00
  • 6b146db12b Merge pull request #16690 from edx/LEARNER-3337/validate-username-field Uzair Rasheed 2017-12-06 14:29:57 +05:00
  • 7a38c5a13a Update bokchoy db cache Michael Youngstrom 2017-12-05 16:46:28 -05:00
  • 63b49ee051 Fix safe_lxml. SEC-338 Ned Batchelder 2017-11-22 16:59:23 -05:00
  • d2963a66b2 Merge pull request #14674 from cpennington/cale/latest-edx-lint Calen Pennington 2017-12-05 20:16:02 -05:00
  • 8ca0fe9dfc introduce ReactRenderer module and renderReact mako def [FEDX-453] Ari Rizzitano 2017-11-21 10:12:20 -05:00
  • 0a341cf526 Merge pull request #16775 from edx/jeskew/test_migrations_in_d111 John Eskew 2017-12-05 17:37:18 -05:00
  • 54d14098c0 PLAT-1427 Adapt to build_attrs change in Django 1.11 Jeremy Bowman 2017-12-05 16:47:44 -05:00
  • 740268c668 Merge pull request #16792 from edx/release-mergeback-to-master edx-pipeline-bot 2017-12-05 17:02:08 -05:00
  • d4667691fb Convert final field from CommaSeparatedIntegerField to CharField. John Eskew 2017-12-04 18:14:45 -05:00
  • f5a83d5d6c Fix URLs that generate warnings in Django 1.10. John Eskew 2017-12-04 13:52:15 -05:00
  • 62f91dd7e9 Merge pull request #16795 from edx/jmbowman/PLAT-1418 Jeremy Bowman 2017-12-05 16:45:32 -05:00
  • 811f313c5e Merge pull request #16791 from edx/jmbowman/PLAT-1382 Jeremy Bowman 2017-12-05 16:36:56 -05:00