Commit Graph

  • ce87896fb6 Merge pull request #15609 from edx/HarryRein/LEARNER-1879-updates-image-styling Harry Rein 2017-07-20 09:34:35 -04:00
  • 4f00b85d10 Upgrade xblock-lti-consumer. cahrens 2017-07-19 16:58:37 -04:00
  • 8702988000 Update translations (autogenerated message) Ned Batchelder 2017-07-20 11:52:03 +00:00
  • 8de3bc2fe6 Removed darken from the css for icon of microsoft auth button. Hamza Munir 2017-07-20 12:06:45 +05:00
  • 1922faf191 Merge pull request #15612 from edx/christina/fix-violations Christina Roberts 2017-07-19 20:43:03 -04:00
  • 0b945270a3 Merge pull request #15601 from edx/asadiqbal08/ENT-508 Douglas Hall 2017-07-19 16:43:31 -04:00
  • 299fd0982f Fix safe lint violation. cahrens 2017-07-19 16:20:38 -04:00
  • e604e66033 update version asadiqbal 2017-07-19 14:42:07 +05:00
  • aa5b8bed11 Merge pull request #15289 from edx/jlajoie/EDUCATOR-434 Jeff LaJoie 2017-07-19 15:32:02 -04:00
  • 3d610fd78d Merge pull request #15554 from edx/HarryRein/LEARNER-1652-course-tool-eventing Harry Rein 2017-07-19 14:46:10 -04:00
  • 2658646e1e Fixing styling on updates. Harry Rein 2017-07-19 13:25:44 -04:00
  • 1c90220462 EDUCATOR-434: Extends Course Outline Unit settings to allow Group Access configuration Jeff LaJoie 2017-06-07 08:41:15 -04:00
  • e9e72aec89 Merge pull request #15596 from edx/christina/update-organizations Christina Roberts 2017-07-19 14:02:45 -04:00
  • f2ef2b034a Adding eventing to the course tools. Harry Rein 2017-07-12 15:03:22 -04:00
  • 2eea7606a3 Exposed ExperimentKeyValue model in Django admin Clinton Blackburn 2017-07-13 11:51:58 -04:00
  • eadc099512 Merge pull request #15597 from edx/christina/revert-ed-60 Christina Roberts 2017-07-19 11:03:38 -04:00
  • 67e61e878a Remove flaky editing test. cahrens 2017-07-18 14:11:32 -04:00
  • 9cf2d7ea5a Merge pull request #15600 from edx/mjevtic/LEARNER-442 Marko Jevtić 2017-07-19 15:50:33 +02:00
  • d384c6dfd2 Merge pull request #15588 from edx/aj/masquerade_user_change_language Awais Jibran 2017-07-19 18:47:00 +05:00
  • 2a7b41673b [LEARNER-1104] Allow staff members to view enrollment for any user Marko Jevtic 2017-07-19 06:48:47 +00:00
  • 125552f204 Switching course view to specific student retains the profile language setting https://openedx.atlassian.net/browse/EDUCATOR-891 Awais Jibran 2017-07-18 15:31:20 +05:00
  • 831ee5f3cb Passing the extra argument key value pair to the social auth url for microsoft. Hamza Munir 2017-07-19 15:34:01 +05:00
  • 2d6b477e83 Merge pull request #15593 from edx/efischer/edu-274_logging Eric Fischer 2017-07-18 15:45:03 -04:00
  • 7799c4adf4 Merge pull request #15592 from edx/yro-cert-pacing-signal Gregory Martin 2017-07-18 15:36:39 -04:00
  • 4e3ed8b5c6 Restore more specific error messages. cahrens 2017-07-18 15:21:00 -04:00
  • dfca1fa2fa Merge pull request #15574 from edx/jmbowman/PLAT-1619 Jeremy Bowman 2017-07-18 15:04:02 -04:00
  • f7613819a0 Add ActiveBulkThread record logging; CMS memory leak debug Eric Fischer 2017-07-18 10:29:09 -04:00
  • da931349d5 Merge pull request #15595 from edx/dahlia/EDU-949 Eric Fischer 2017-07-18 14:39:14 -04:00
  • 07ad189b9d Merge pull request #15263 from edx/sstudent/grade-override sanfordstudent 2017-07-18 14:33:27 -04:00
  • 0bff61533d Merge pull request #15585 from edx/andya/learner-profile-as-feature Andy Armstrong 2017-07-18 14:24:44 -04:00
  • 932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. Sanford Student 2017-06-07 12:56:28 -04:00
  • 16945cc310 greening tests Gregory Martin 2017-07-18 13:31:49 -04:00
  • 03896448ce Skip flaky tests until we can fix them Eric Fischer 2017-07-18 11:52:19 -04:00
  • 33bee3f70b Refactor learner profile into openedx/features directory Andy Armstrong 2017-07-17 17:04:55 -04:00
  • 583719cce1 Merge pull request #15579 from open-craft/bdero/bulk-enroll Brittney Exline 2017-07-18 11:32:08 -04:00
  • 5189f2524d remove dupe Gregory Martin 2017-07-18 11:19:26 -04:00
  • 8b3f285d04 fix tests Gregory Martin 2017-07-18 11:13:01 -04:00
  • b4c2b56109 Merge pull request #15583 from edx/bexline/revert_ent_457 Brittney Exline 2017-07-18 10:05:23 -04:00
  • 9bd50f3463 Background color changed for microsoft button in social auth login/register Hamza Munir 2017-07-18 18:11:00 +05:00
  • d58f2ac2db Merge pull request #15580 from edx/andya/course-home-messaging Andy Armstrong 2017-07-17 23:58:47 -04:00
  • 3e786ec6c5 Show page banner for anonymous and unenrolled users Andy Armstrong 2017-07-14 17:21:05 -04:00
  • 97d5e3d8e0 Remove password hiding test code Joshua Spayd 2017-07-17 22:52:15 +00:00
  • 433477abe4 Hide passwords in register/login crash reports Joshua Spayd 2017-07-17 22:45:35 +00:00
  • e2c8fc53e8 add persistence Gregory Martin 2017-07-17 17:57:30 -04:00
  • a82b73ed0c fix Gregory Martin 2017-07-17 17:08:17 -04:00
  • dd6d172abe WIP: Add toggle timer functionality Joshua Spayd 2017-06-30 14:15:54 -07:00
  • 7df91841ee cleanup Gregory Martin 2017-07-17 15:44:29 -04:00
  • 4370142a84 Merge pull request #15581 from edx/ari/flaky-problem-type-test Ari Rizzitano 2017-07-17 15:01:54 -04:00
  • 0e8e3ad6a5 Merge pull request #15582 from open-craft/haikuginger/bump-enterprise-0.38.3 Jesse Shapiro 2017-07-17 14:57:09 -04:00
  • 8c362d4df6 Revert "Create EnterpriseCourseEnrollment when enrolling via Track Selection page" Brittney Exline 2017-07-17 11:44:53 -04:00
  • 6c761ce8aa Revert "Specify catalog URL to configure" Brittney Exline 2017-07-17 11:44:05 -04:00
  • 30df7c693f Update Enterprise to 0.38.3 to fix dependency issues Jesse Shapiro 2017-07-17 11:20:56 -04:00
  • 0365712b96 Merge pull request #15584 from edx/jeskew/fix_drf_upgrade_incompat John Eskew 2017-07-17 13:54:06 -04:00
  • 33b1e7ca1b Merge pull request #15564 from edx/tuchfarber/wl-1109_zendesk Douglas Hall 2017-07-17 13:40:50 -04:00
  • 31039ab504 Merge pull request #15570 from edx/andya/page-banners Andy Armstrong 2017-07-17 13:16:52 -04:00
  • d003765047 Remove request.POST save - incompatible with DRF v3.6.3. John Eskew 2017-07-17 13:05:39 -04:00
  • 4813df02a3 Fix WL sites from causing multiple zendesk emails Matt Tuchfarber 2017-07-13 15:55:48 -04:00
  • a077a5e364 Add support for page banner status messages Andy Armstrong 2017-07-14 10:33:47 -04:00
  • a16f0b2fe0 test_problem_type_a11y is flaky Ari Rizzitano 2017-07-17 11:39:27 -04:00
  • febf2a07ae Merge pull request #15373 from edx/jeskew/drf_upgrade_django_1.11 John Eskew 2017-07-17 11:19:56 -04:00
  • 05f55d5b3d Merge pull request #15555 from edx/bmedx/django_1.11_upgrade_restframework-jwt_PLAT-1586 Brian Mesick 2017-07-17 10:48:56 -04:00
  • 51208f370a Merge pull request #15339 from edx/sarahkf/fix-structure-files-and-uploads sarahkf 2017-07-17 10:46:06 -04:00
  • f617deea05 Fix files and uploads template in Studio Sarah Fischmann 2017-06-15 14:36:09 -04:00
  • 2e140a6a5f Merge pull request #15569 from edx/staubina/ed-592_tests Albert (AJ) St. Aubin 2017-07-17 07:24:16 -04:00
  • cc49c74a29 Merge pull request #15578 from edx/douglashall/upgrade_enterprise_0_38_2 Douglas Hall 2017-07-16 20:07:22 -04:00
  • bff39b034e Merge pull request #15575 from open-craft/configure-ecommerce-service-worker-username Douglas Hall 2017-07-15 07:49:42 -04:00
  • 43e161f66b Fix the BulkEnrollSerializer courses field to internally behave with strings and lists Brandon DeRosier 2017-07-14 19:17:16 -04:00
  • db16ec2a04 Merge pull request #15577 from edx/robrap/LEARNER-1896-fix-waffle-flag-cache Robert Raposa 2017-07-14 18:33:54 -04:00
  • a45ae04e8b Merge pull request #15006 from open-craft/bdero/bulk-enroll George Song 2017-07-14 14:20:23 -07:00
  • 7e8566b4d8 Fix course override caching bug. Robert Raposa 2017-07-14 16:09:55 -04:00
  • 7ff9bce86b Upgrade edx-enterprise package version to 0.38.2. Douglas Hall 2017-07-14 16:37:47 -04:00
  • 6fa00e75a6 Upgrade django-config-models to 0.1.8 John Eskew 2017-07-11 17:33:43 -04:00
  • 2cd62c7bfb Upgrade django-rest-framework version to edX fork, which is DRF v3.6.3 with a custom patch needed by edx-platform. Upgrade django-filter as well to v1.0.4 Import DjangoFilterBackend from the correct module - django_filter. Add django-filter to INSTALLED_APPS. John Eskew 2017-06-21 09:48:19 -04:00
  • 309ec0ac86 PLAT-1619 karma and bok-choy Docker Devstack fixes Jeremy Bowman 2017-07-12 20:11:57 -04:00
  • 427967ea83 Working tests for the new Group moderator error messaging Albert St. Aubin 2017-07-07 19:58:16 +00:00
  • 0c72a62ad8 Merge pull request #15556 from edx/andya/pre-start-date-access Andy Armstrong 2017-07-14 15:46:25 -04:00
  • 921950d7eb update Gregory Martin 2017-07-14 15:12:51 -04:00
  • a31855c935 Upstream the Bulk Enroll API endpoint Brandon DeRosier 2017-03-31 14:36:55 -04:00
  • aeecf34387 Enable conditional pre-start-date access to courses Andy Armstrong 2017-07-12 16:33:50 -04:00
  • 28bdfd4fdf Merge pull request #15537 from edx/ari/node-6.11 Ari Rizzitano 2017-07-14 13:59:57 -04:00
  • 214018dfee Merge pull request #15572 from edx/yro/repair_signal_config Gregory Martin 2017-07-14 13:20:34 -04:00
  • 70169016e7 Merge pull request #15443 from edx/tuchfarber/password_reset_misaligned Matt Tuchfarber 2017-07-14 13:15:08 -04:00
  • b310fbbb03 Merge pull request #15571 from edx/jill/ora2-django-storage Ned Batchelder 2017-07-14 12:57:47 -04:00
  • b97f593402 Merge pull request #15573 from edx/release-mergeback-to-master edx-pipeline-bot 2017-07-14 12:56:04 -04:00
  • f3dd677fa9 Allow configuration of ECOMMERCE_SERVICE_WORKER_USERNAME Jesse Shapiro 2017-07-14 12:50:55 -04:00
  • 2c2aa903f0 Merge pull request #15562 from edx/LEARNER-1143 Matthew Piatetsky 2017-07-14 12:47:15 -04:00
  • 6fd51467c9 repair signal config Gregory Martin 2017-07-14 11:20:09 -04:00
  • 0fcdcb02bb Use ORA2 django storage on openstack and devstack. Jillian Vogel 2017-07-01 14:04:22 +09:30
  • 99994b0eb5 Merge pull request #15525 from open-craft/haikuginger/enterprise-0.38.0 Jesse Shapiro 2017-07-14 10:27:26 -04:00
  • edcd64e90f edx-videoi-id strip fix muhammad-ammar 2017-07-14 10:45:53 +05:00
  • b815f1df61 Upgrade edx-enterprise to 0.38.0, along with related dependencies Jesse Shapiro 2017-07-14 09:02:19 -04:00
  • b39d9e0b5b Merge pull request #15541 from edx/ahsan/LEARNER-1530-update-edx-search Ahsan Ul Haq 2017-07-14 18:00:48 +05:00
  • cbd3660cdc Merge pull request #15383 from edx/saleem-latif/ENT-367-updates Tim Krones 2017-07-14 14:57:46 +02:00
  • 48c6c17c3c Merge pull request #15548 from edx/robrap/LEARNER-613-handle-start-dates Robert Raposa 2017-07-14 08:50:14 -04:00
  • a0735ef230 Merge pull request #15567 from edx/ahsan/update-edx-packages Ahsan Ul Haq 2017-07-14 16:23:19 +05:00
  • d0a6f90522 Updated edx packages to the latest releases Ahsan Ulhaq 2017-07-14 15:22:27 +05:00
  • d6534c567b UPdate edx-search LEARNER-1530 Ahsan Ulhaq 2017-07-12 15:41:53 +05:00
  • 22c8e4c6ad Redirect Course Home for course that hasn't started. Robert Raposa 2017-07-12 11:58:18 -04:00
  • 4b733b5657 Fix video caption centering Joshua Spayd 2017-07-13 19:33:50 +00:00
  • 13e06a37a3 Merge pull request #15560 from edx/diana/deprecate-setting Diana Huang 2017-07-13 17:11:11 -04:00