Commit Graph

  • 3dbe04811a Merge pull request #15518 from edx/HarryRein/updating-bootstrap-theming Harry Rein 2017-07-13 16:56:28 -04:00
  • a0da9b895c Turn down course_grade_factory.py logging. Alex Dusenbery 2017-07-13 13:27:06 -04:00
  • b63e5fa098 Merge pull request #15559 from edx/bmedx/pyinotify_for_dev Brian Mesick 2017-07-13 15:42:14 -04:00
  • 6d89cc1bd1 Updating themes for bootstrap. Harry Rein 2017-07-10 15:21:05 -04:00
  • de3c802700 Do not count programs with no courses as completed Matthew Piatetsky 2017-07-13 14:34:50 -04:00
  • 6f24c5a234 Deprecate the Course Home Sidebar setting. Diana Huang 2017-07-13 13:05:19 -04:00
  • 52197fba88 Add TODO for duplicate email/username inconsistency Po Tsui 2017-07-13 11:08:15 -07:00
  • 8d184480ea Update comment in development.txt to be more correct bmedx 2017-07-13 13:09:28 -04:00
  • 390ba5c86c Add pyinotify to development requirements for docker devstack perf bmedx 2017-07-13 12:40:59 -04:00
  • cdd0e945bd Merge pull request #15551 from edx/christina/update-organizations Christina Roberts 2017-07-13 10:13:43 -04:00
  • be3c29b006 Merge pull request #15550 from edx/LEARNER-683 Simon Chen 2017-07-13 09:04:08 -04:00
  • 06c9826904 Merge pull request #14845 from Salomari1987/salah/password_reset_email_subject George Song 2017-07-13 05:52:21 -07:00
  • 2ffabe6333 Merge pull request #15539 from edx/vkaracic/update-settings Vedran Karačić 2017-07-13 06:51:56 +02:00
  • af96ad260f Add tests for duplicate email/username error catching Po Tsui 2017-07-12 17:03:20 -07:00
  • c78b84ca3f Merge pull request #15480 from edx/staubina/ed-592 Albert (AJ) St. Aubin 2017-07-12 17:24:53 -04:00
  • 1f6a4f22d1 Merge pull request #15549 from edx/george/git-import-sysadmin George Song 2017-07-12 13:20:15 -07:00
  • a3d511926f Allow enrollment into expired seats if the api is called by ecom service Simon Chen 2017-07-12 14:24:29 -04:00
  • 6b7d0a7f1b Upgrade djangorestframework-jwt to 1.11.0 bmedx 2017-07-12 15:49:18 -04:00
  • 0e9f5b3d24 Merge pull request #15553 from edx/release-mergeback-to-master edx-pipeline-bot 2017-07-12 15:39:36 -04:00
  • c1cebb1674 Update version of edx-organizations. cahrens 2017-07-12 14:32:56 -04:00
  • 59794ea9c9 Merge pull request #15338 from ravi-ojha/educator_269 George Song 2017-07-12 10:50:55 -07:00
  • d682802f58 Disable view of Git Import when user is professor of course but not staff user Reason: Before this fix, if the user is not staff (user.is_staff=0) and ENABLE_SYSADMIN_DASHBOARD=True happens that the user can access the Git Import in Sysadmin dashboard and get to see the links in the menu of the sysadmin dashboard (Users, Courses, Staffing and enrollment). When this user clicks on one of these links, it gets an error from the server. mrey 2017-06-02 14:23:09 +02:00
  • 72c9d58ae1 Merge pull request #14899 from edx/jbarciauskas/import-rest-api-2 Joel Barciauskas 2017-07-12 13:02:30 -04:00
  • 04f9db20c0 Merge pull request #15533 from edx/christina/remove-mustache Christina Roberts 2017-07-12 12:58:21 -04:00
  • 6919fc8ce8 Use kwargs right. Alex Dusenbery 2017-07-12 11:09:31 -04:00
  • b8b0110d15 Ui updates, Error messaging shown when discussion scheme is not selected Albert St. Aubin 2017-07-07 19:58:16 +00:00
  • 039afc2517 Merge pull request #15534 from edx/jibsheet/quiet-requests-logging Kevin Falcone 2017-07-12 12:49:18 -04:00
  • 267968b029 Merge pull request #15542 from edx/diana/update-naming Diana Huang 2017-07-12 12:27:33 -04:00
  • bddc29a850 Remove last Mustache usage. cahrens 2017-07-11 16:19:44 -04:00
  • 01db7a7d74 Add course import REST API to Studio Joel Barciauskas 2017-04-14 10:07:18 -04:00
  • fdaf1b4c9a Merge pull request #15472 from edx/bmedx/django_1.11_upgrade_help_tokens_PLAT-1441 Brian Mesick 2017-07-12 11:14:10 -04:00
  • ef0e15af74 Merge pull request #15439 from edx/bmedx/django_1.11_upgrade_crum_PLAT-1478 Brian Mesick 2017-07-12 11:13:49 -04:00
  • fc9737581e Update names to be more consistent. Diana Huang 2017-07-12 10:55:31 -04:00
  • 3be1da942d Center password reset page Matt Tuchfarber 2017-06-30 05:36:35 +00:00
  • 9c7043c226 Merge pull request #15532 from edx/mroytman/PLAT_1487_django_1.11_upgrade_edx-django-sites-extensions Michael Roytman 2017-07-12 10:35:13 -04:00
  • da32c5af56 Merge pull request #15531 from edx/jmbowman/PLAT-1629 Jeremy Bowman 2017-07-12 10:24:20 -04:00
  • c3e1d59237 Merge pull request #15528 from edx/mrehan/fix-noisy-ajax-captions M. Rehan 2017-07-12 18:24:11 +05:00
  • d8133c3aa1 Merge pull request #15523 from edx/ibrahimahmed443/WL-1079-minor-styling-issues Ibrahim Ahmed 2017-07-12 18:14:48 +05:00
  • 3916759ded Add COURSE_CATALOG_API_URL setting to devstack_docker. Vedran Karacic 2017-07-12 11:14:29 +02:00
  • c9bbc0b68a Dont fetch caption on getting translations This fixes the endless loop of fetchCaptions ajax requests. fetchCaption on error calls fetchAvailableTranslations which again calls fetchCaption on success and so on. We don't see any significance for calling fetchCaption in fetchAvailableTranslations. Qubad786 2017-07-11 23:50:32 +05:00
  • beba07efd4 Fix string formatting. Vedran Karacic 2017-07-12 11:14:06 +02:00
  • aee1b7f412 Merge pull request #15510 from edx/ri/EDUCATOR-810-unicode-decode-error Rabia Iftikhar 2017-07-12 14:13:54 +05:00
  • 6e873a4838 EDUCATOR-810 fix UnicodeDecodeError rabiaiftikhar 2017-07-10 15:40:24 +05:00
  • dd5e8d072c Fix PEP8 issues Po Tsui 2017-07-11 17:47:40 -07:00
  • a807aa041e Add myself to authors Po Tsui 2017-07-11 16:28:16 -07:00
  • 6ea2ed929b upgrade jenkins node version to 6.11.1 Ari Rizzitano 2017-07-11 18:08:27 -04:00
  • 6e617fe2a6 Catch exception with duplicate username/email Nishant Karandikar 2017-02-10 13:48:26 -08:00
  • ead5e9f919 Merge pull request #15498 from edx/HarryRein/LEARNER-1628-write-reviews Harry Rein 2017-07-11 17:07:22 -04:00
  • ee5b8db538 This logs for every API call to an external service Kevin Falcone 2017-07-11 16:29:53 -04:00
  • 5a2998fb5b Allowing writing of reviews on reviews page. Harry Rein 2017-07-06 16:48:57 -04:00
  • b4fe08742a upgrade edx-django-sites-extensions from 2.1.1 to 2.3.0 Michael Roytman 2017-07-11 15:44:14 -04:00
  • c0f81cc85c PLAT-1629 Retry abspath() failures Jeremy Bowman 2017-07-11 15:29:22 -04:00
  • 165c0aae85 Merge pull request #15465 from edx/andya/ccx-redirect Diana Huang 2017-07-11 15:18:56 -04:00
  • 1d04f60b77 Merge pull request #15527 from edx/sylvia/video_link_fix Sylvia Pearce 2017-07-11 15:04:34 -04:00
  • 398fd19ba5 Merge pull request #15502 from edx/LEARNER-1298-LEARNER-1299-send-ui-lang-to-sailthru Anthony Mangano 2017-07-11 14:35:06 -04:00
  • 13854fb8ab Handle anonymous and unenrolled users on the new course home page Andy Armstrong 2017-07-03 13:16:22 -04:00
  • 121ef86fa1 Fix Studio context-sensitive help link to video documentation Sylvia Pearce 2017-07-11 14:08:23 -04:00
  • 6dfa47b2fc EDUCATOR-565 | Add POLICY_CHANGE_GRADES_ROUTING_KEY, fix errors in compute_all_grades_for_course circuitry. Alex Dusenbery 2017-06-21 15:29:22 -04:00
  • b14b951122 Merge pull request #15524 from edx/christina/remove-mustache Christina Roberts 2017-07-11 13:28:06 -04:00
  • fade4a10af Implement event for forum thread views Kyle McCormick 2017-06-02 13:25:51 -04:00
  • 21bcf02d97 Remove unneeded mustache references. cahrens 2017-07-11 12:06:27 -04:00
  • 4f4f25b432 Set ui_lang in Sailthru when creating and updating users Anthony Mangano 2017-07-10 15:11:15 -04:00
  • 1b14d301d9 fix styling issues in program details page WL-1079 Ibrahim 2017-07-11 20:14:36 +05:00
  • 4d157db6f1 Merge pull request #15521 from edx/ret/cleanup-planning-prompts Nimisha Asthagiri 2017-07-11 11:06:33 -04:00
  • 81c70be87e Merge pull request #15520 from edx/PLAT_1486_djano_1.11_upgrade_edx-django-release-util Michael Roytman 2017-07-11 11:00:44 -04:00
  • 4efa47ba4d Merge pull request #15522 from edx/adeel/LEARNER-1188_Setting_connection_timeout_value_for_sailthru_api_call adeel khan 2017-07-11 19:28:28 +05:00
  • 0afd3bad3f Merge pull request #15513 from edx/christina/milestones-upgrade Christina Roberts 2017-07-11 09:28:28 -04:00
  • a879ad201b Increased timeout value for sailthru api call. LEARNER-1186 Adeel Khan 2017-07-11 14:16:09 +05:00
  • 66bbe9023b RET: Cleanup Planning Prompts experimental code Nimisha Asthagiri 2017-07-10 20:55:00 -04:00
  • 120c62b3ab Merge pull request #15494 from edx/LEARNER-1499 Steven Zheng 2017-07-11 08:19:01 -04:00
  • 447bee2e75 Merge pull request #15456 from edx/andya/anonymous-course-access Andy Armstrong 2017-07-10 19:58:01 -04:00
  • a815003b3b Handle anonymous and unenrolled users on the new course home page Andy Armstrong 2017-07-03 13:16:22 -04:00
  • 65f876d728 Merge pull request #15473 from edx/bmedx/django_1.11_remove_django-mako_PLAT-1568 Brian Mesick 2017-07-10 16:59:25 -04:00
  • d020d7a2f9 Merge pull request #15474 from open-craft/mtyaka/chromeless-class George Song 2017-07-10 13:32:31 -07:00
  • 6f71fb4599 upgrade edx-django-release-util to 0.3.1 Michael Roytman 2017-07-10 16:19:30 -04:00
  • 6ec21c0cd9 Merge pull request #15466 from OmarIthawi/omar/deprecate-lettuce George Song 2017-07-10 13:19:00 -07:00
  • e340b2431e Add django management command to create course from json Steven Zheng 2017-07-07 10:35:46 -04:00
  • a97425ee85 Merge pull request #15343 from edx/jbarciauskas/disable-creator-group-default George Song 2017-07-10 12:48:32 -07:00
  • 6b08528193 Don't allow any user to create courses by default Joel Barciauskas 2017-06-16 10:10:23 -04:00
  • e162759a17 Upgrade version of milestones. cahrens 2017-07-10 10:03:56 -04:00
  • d01d165e4c Merge pull request #15386 from edx/sofiya/ed-378 Sofiya Semenova 2017-07-10 14:13:09 -04:00
  • 05cdc60226 Merge pull request #15501 from edx/efischer/limit_libraries Eric Fischer 2017-07-10 12:57:38 -04:00
  • 012064ccfb Merge pull request #15514 from edx/sarahkf/translation-jsx-files sarahkf 2017-07-10 12:51:28 -04:00
  • 7ed9ba1934 Update webpack config and translation tools to translate .jsx files Sarah Fischmann 2017-07-06 10:06:45 -04:00
  • d613f37dad Merge pull request #15503 from edx/schen/LEARNER-1787 Simon Chen 2017-07-10 11:13:35 -04:00
  • f0c694e562 Review round 1 Sofiya Semenova 2017-07-07 19:58:16 +00:00
  • 8816b85464 Use the marketing contact us page in email confirm change message Omar Al-Ithawi 2017-04-06 10:39:32 +03:00
  • 071f35ba12 Deleted unused template: emails_change_successful.html Omar Al-Ithawi 2017-04-06 10:39:09 +03:00
  • 425d0b3bd4 Merge pull request #15512 from edx/mushtaq/val-version-bump Mushtaq Ali 2017-07-10 19:19:17 +05:00
  • 00eb5a996b edx-val version bump from 0.16 to 0.17 Mushtaq Ali 2017-07-10 18:12:56 +05:00
  • 4fb972432a Merge pull request #15506 from edx/ormsbee/fix_inline_discussions_asset_caching David Ormsbee 2017-07-09 22:42:33 -04:00
  • 1720bcf356 Merge pull request #15345 from edx/bbeggs/host_fixes Brian Beggs 2017-07-09 12:11:42 -04:00
  • 6af5cf08f1 Merge pull request #15444 from edx/yro/emit-certsignal-trackchange Gregory Martin 2017-07-07 17:49:30 -04:00
  • 978e9fe656 Fix inline discussions to use cached static assets. David Ormsbee 2017-07-07 17:22:52 -04:00
  • 83e52905cf ADD LMS_BASE and CMS_BASE to devstack_docker config files Brian Beggs 2017-06-16 13:20:53 -04:00
  • dcd385df6a Include libraries in optimized studio home Eric Fischer 2017-07-07 16:11:12 -04:00
  • 82a7a79264 Update the admin table to allow the insert of course cert settings LEARNER-1787 Simon Chen 2017-07-07 16:05:26 -04:00
  • 16f06bf651 Generate eligible certificates on learner track change Gregory Martin 2017-06-30 11:34:41 -04:00
  • 32618fa0f5 Merge pull request #15495 from edx/bmedx/admin-site-register-PLAT-1631 Brian Mesick 2017-07-07 14:36:10 -04:00
  • 292502babf Switch to forks of certain third-party repos Renzo Lucioni 2017-07-07 11:58:08 -04:00