Commit Graph

  • 7077ea0601 Merge pull request #15497 from edx/andya/fix-styling-bug Andy Armstrong 2017-07-07 13:30:41 -04:00
  • f137c75ed5 Merge pull request #15496 from edx/andya/fix-modal-issue Andy Armstrong 2017-07-07 12:36:23 -04:00
  • 71baa6af0e Fix styling on non-Bootstrap pages Andy Armstrong 2017-07-07 12:12:35 -04:00
  • 2b261b5ca7 Merge pull request #15458 from edx/dsjen/upgrade-proctoring-django-111 Dennis Jen 2017-07-07 12:05:03 -04:00
  • 94f5ccbb85 Merge pull request #15488 from edx/edx-ora2/rc Eric Fischer 2017-07-07 11:48:46 -04:00
  • a113ab51d9 Removed unused accessible_modal template Andy Armstrong 2017-07-07 11:35:21 -04:00
  • cfb53a3526 Ensure User model is unregistered before registering with Django admin bmedx 2017-07-07 11:02:53 -04:00
  • f111655484 Test Sofiya Semenova 2017-07-07 14:37:54 +00:00
  • 48767b31c5 Merge pull request #15492 from edx/nedbat/use-hashes Ned Batchelder 2017-07-07 09:47:21 -04:00
  • 0f759e1c01 Merge pull request #15491 from edx/revert-15462-ibrahimahmed443/WL-1083-remove-institutions Ibrahim Ahmed 2017-07-07 17:01:35 +05:00
  • fdd974ddbd Use commit hashes for certain third-party repos Ned Batchelder 2017-07-07 07:15:04 -04:00
  • 4ec9563806 Revert "remove the word Institutions if there is no authoring organization" Ibrahim Ahmed 2017-07-07 15:45:26 +05:00
  • 577d44b0db edx-ora2 1.4.4 Eric Fischer 2017-07-06 16:41:31 -04:00
  • 19c4d799e1 Upgrade proctoring (supports django 1.11) Dennis Jen 2017-07-03 16:50:34 -04:00
  • 15e66949b9 Merge pull request #15487 from edx/revert-15469-bmedx/django_1.11_upgrade_ratelimit_backend_PLAT-1482 Brian Mesick 2017-07-06 16:21:28 -04:00
  • af43d08b22 Revert "Upgrade django-ratelimit-backend to 1.1.1" Brian Mesick 2017-07-06 16:18:02 -04:00
  • 0023986551 Merge pull request #15481 from edx/nedbat/update-translations Ned Batchelder 2017-07-06 15:00:59 -04:00
  • b979c871a7 Merge pull request #15486 from edx/HarryRein/LEARNER-1783 Harry Rein 2017-07-06 14:13:15 -04:00
  • a00d9ad37c Merge pull request #15484 from edx/afzaledx/LEARNER-1146-patch Douglas Hall 2017-07-06 13:58:43 -04:00
  • 6cdcf8e9b8 Discussion group moderation Albert St. Aubin 2017-06-13 14:43:54 -04:00
  • b8a310d54b Put the program_types filter under the waffle switch Afzal Wali 2017-07-06 20:29:23 +05:00
  • 17fc310026 Fixing naming issue in edx.org theme. Harry Rein 2017-07-06 13:02:40 -04:00
  • 8fb8647473 Merge pull request #15360 from open-craft/replaceafill/aws_with_filesystem_storage_tested Christina Roberts 2017-07-06 12:36:56 -04:00
  • 0b7ace2952 Merge pull request #15478 from edx/ubc-add-lti-consumer-module-to-rest-endpoints Robert Raposa 2017-07-06 11:47:37 -04:00
  • 5c4ece2968 Update translations (autogenerated message) Ned Batchelder 2017-07-06 15:17:35 +00:00
  • 4db8c7a758 Add lti consumer xblock modules to LTI REST endpoints Pan Luo 2016-10-03 18:02:56 -07:00
  • f6ad15bb59 Merge pull request #15462 from edx/ibrahimahmed443/WL-1083-remove-institutions Ibrahim Ahmed 2017-07-06 17:53:42 +05:00
  • 487895fb21 Merge pull request #14862 from replaceafill/default_discussion_topic George Song 2017-07-06 05:25:43 -07:00
  • ec787a9963 Merge pull request #15332 from edx/adeel/LEARNER-1188_Setting_connection_timeout_value_for_sailthru_api_call adeel khan 2017-07-06 15:58:23 +05:00
  • 52e28d91fa Implementing connection timeout for sailthru api call. LEARNER-1186 Adeel Khan 2017-06-15 01:48:08 +05:00
  • 95b3055f66 Merge pull request #15178 from edx/course-video-image Mushtaq Ali 2017-07-06 13:38:18 +05:00
  • d2b420a9a5 Change opacity and user messages Mushtaq Ali 2017-07-04 10:09:19 +05:00
  • 556213659b Add waffle switch to toggle video thumbnail feature. Qubad786 2017-06-30 13:21:05 +05:00
  • eabfba48a2 Change video image requirements text hover - EDUCATOR-577 Mushtaq Ali 2017-06-20 17:05:23 +05:00
  • 9750cd2ab1 Video Uploads Cleanup - Replace table grid layout with div grid layout and do related adjustments - EDUCATOR-562 Mushtaq Ali 2017-06-15 12:12:06 +05:00
  • 7bf717f75d Add video image settings to aws settings so that lms can pull values from lms.env.json Mushtaq Ali 2017-06-08 17:32:09 +05:00
  • cf6200cbb3 Add frontend video image validations - EDUCATOR-447 Mushtaq Ali 2017-05-19 16:29:50 +05:00
  • e8fee2e09a Add backend video image validations - EDUCATOR-45 Mushtaq Ali 2017-05-19 16:26:21 +05:00
  • 626f2896a0 add video poster support muhammad-ammar 2017-05-11 17:47:53 +05:00
  • 763f0051bd video thumbnail ui muhammad-ammar 2017-04-07 20:05:19 +05:00
  • dca12d65c2 Save or update course video image - TNL-6762 Muhammad Ammar 2017-04-11 14:11:42 +05:00
  • c448426cd3 Add chromeless class to the wrapper when in chromeless mode. Matjaz Gregoric 2017-07-06 09:18:54 +02:00
  • 7b91095398 Merge pull request #15467 from edx/aamishbaloch/YONK-691 Aamish Baloch 2017-07-06 12:09:16 +05:00
  • bba596728a Merge pull request #15450 from edx/tasawer/learner-1710-fix-dashboard-HttPClientError Tasawer Nawaz 2017-07-06 08:29:10 +05:00
  • eacc4bc138 Allow to set the default topic for new Discussion posts Douglas Cerna 2017-07-05 20:26:32 -06:00
  • 692f7ae158 Remove django-mako requirement bmedx 2017-07-05 17:33:15 -04:00
  • bc485ea580 Merge pull request #15469 from edx/bmedx/django_1.11_upgrade_ratelimit_backend_PLAT-1482 Brian Mesick 2017-07-05 16:54:49 -04:00
  • 89f03ff5d9 Upgrade help-tokens to 1.0.3 bmedx 2017-07-05 16:24:57 -04:00
  • e4c8ff3aa4 Merge pull request #15445 from edx/jmbowman/PLAT-1499 Jeremy Bowman 2017-07-05 13:22:14 -04:00
  • a7b2009566 Fix 500 error on learner dashboard LEARNER-1710 tasawernawaz 2017-07-03 15:35:48 +05:00
  • d6d7fcaf4f Fix NotRegistered error when running makemigrations bmedx 2017-07-05 12:28:22 -04:00
  • eff621b7ba Merge pull request #15468 from edx/robrap/reduce-thresholds Robert Raposa 2017-07-05 11:56:37 -04:00
  • 224606bd97 Merge pull request #15392 from open-craft/smarnach/notify-default Christina Roberts 2017-07-05 11:32:39 -04:00
  • e1312b3812 Updated Django Waffle to 0.12.0 Clinton Blackburn 2017-06-27 22:26:17 -04:00
  • bcb610f7dd Merge pull request #15434 from pepeportela/teltek/external_help_button_shape Christina Roberts 2017-07-05 11:28:59 -04:00
  • 705a68b212 Upgrade django-ratelimit-backend to 1.1.1 bmedx 2017-07-05 10:14:59 -04:00
  • cbcc8d4d18 Reduce xss thresholds. Robert Raposa 2017-07-05 10:12:26 -04:00
  • ac45850d15 YONK-691: Configurable profile image sizes Aamish Baloch 2017-07-05 18:50:01 +05:00
  • b0abd5b02a Merge pull request #15461 from edx/ormsbee/snb_devplus David Ormsbee 2017-07-05 09:19:24 -04:00
  • 378f05622b Merge pull request #15463 from edx/mrehan/set-val-yt-id-on-save M. Rehan 2017-07-05 18:08:26 +05:00
  • e6140cbbe9 Deprecate lettuce in testing.rst document Omar Al-Ithawi 2017-07-05 15:09:31 +03:00
  • acfa80a663 Override video's youtube_id_1_0 with val yt id on save. Qubad786 2017-07-04 16:59:55 +05:00
  • 7ac436c28e Add flag to configure whether "Notify users by email" is checked by default. Sven Marnach 2017-06-23 13:45:46 +02:00
  • a6392e514a Merge pull request #15415 from edx/andya/use-edx-bootstrap Andy Armstrong 2017-07-04 18:29:13 -04:00
  • 7ea3b013ad Style LMS header, footer and nav for Bootstrap. Harry Rein 2017-06-27 16:12:34 -04:00
  • 3cd985da20 Implement a skeleton page with Bootstrap Andy Armstrong 2017-06-26 17:06:14 -04:00
  • 4d95ea30a6 Fix EDUCATOR-269: Don't show "Issue Open Badges" if the feature is disabled Ravi Ojha 2017-06-14 22:34:38 +05:30
  • d3b68dc173 remove the word Institutions if there is no authoring organization WL-1083 Ibrahim 2017-07-04 17:02:15 +05:00
  • 3e2520396d Removed old (unused) devplus.py env for LMS. David Ormsbee 2017-07-04 08:00:02 -04:00
  • c6e085173d Merge pull request #15460 from edx/ibrahimahmed443/WL-1088 Ibrahim Ahmed 2017-07-04 15:53:49 +05:00
  • f4da106e36 Merge pull request #15334 from edx/afzaledx/Learner-1146 Afzal Wali Naushahi 2017-07-04 15:17:38 +05:00
  • 90d0a3637c Do not capitalize words in start button Ibrahim 2017-07-04 14:59:39 +05:00
  • 383208c4c8 multitenant Program cache. Fetched Programs and Program details from Course Discovery service for all sites and stored the uuids in cache with site-specfic keys. Learner-1146 Afzal Wali 2017-06-14 15:13:16 +05:00
  • 51fc7b73bf Merge pull request #15457 from edx/diana/replace-updates-urls Diana Huang 2017-07-03 16:05:51 -04:00
  • ea7b14eba3 Merge pull request #15455 from edx/jibsheet/bump-newrelic Kevin Falcone 2017-07-03 15:20:25 -04:00
  • 378b1f86c6 Replace urls in plan html updates. Diana Huang 2017-07-03 14:23:13 -04:00
  • 0c4fa745bd Bump up the NewRelic plugin version Kevin Falcone 2017-07-03 12:55:54 -04:00
  • 353b4c4f67 PLAT-1499 Use appropriate default settings in Docker devstack Jeremy Bowman 2017-06-30 18:28:40 -04:00
  • 8838162abb Merge pull request #15453 from open-craft/haikuginger/fix-failing-catalog-integration-tests Jesse Shapiro 2017-07-03 12:03:07 -04:00
  • add01fdfab Specify catalog URL to configure Jesse Shapiro 2017-07-03 10:48:11 -04:00
  • 2bb7a9fdb9 Merge pull request #15442 from edx/ibrahimahmed443/WL-1087-video-issue Ibrahim Ahmed 2017-07-03 19:26:43 +05:00
  • 33f9c46e1b fix issue where video modal is not closed by clicking outside the video Ibrahim 2017-06-30 18:39:00 +05:00
  • a864b450a8 Merge pull request #15436 from edx/robrap/rename-xss-linter Robert Raposa 2017-06-30 16:22:38 -04:00
  • 9329a5e3f0 Merge pull request #15440 from edx/jibsheet/tweak-video-upload-pipeline-s3-access Kevin Falcone 2017-06-30 14:19:23 -04:00
  • e408feffb8 Merge pull request #15400 from open-craft/haikuginger/enterprise_audit_enrollment Jesse Shapiro 2017-06-30 13:22:17 -04:00
  • b370fe2314 Part II: Rename xss linter. Robert Raposa 2017-06-29 14:49:02 -04:00
  • 168a45b482 Part I: Rename xss-linter (files only). Robert Raposa 2017-06-30 11:12:49 -04:00
  • d940bbfd09 Create EnterpriseCourseEnrollment when enrolling via Track Selection page Jesse Shapiro 2017-06-30 12:39:14 -04:00
  • 76c958dd14 Merge pull request #15438 from edx/ari/eslint-config-edx-3.0.0 Ari Rizzitano 2017-06-30 11:28:36 -04:00
  • f6827a9a8e Change to validate=False which emulates django-storages Kevin Falcone 2017-06-29 16:30:56 -04:00
  • a45ac2f45d Merge pull request #15437 from edx/jlajoie/EDUCATOR-793 Jeff LaJoie 2017-06-29 16:12:09 -04:00
  • 3e74212979 Upgrade django-crum to 0.7.2 bmedx 2017-06-29 15:48:11 -04:00
  • a087ce4854 Merge pull request #15416 from edx/robrap/LEARNER-1604-waffle-default Robert Raposa 2017-06-29 15:37:38 -04:00
  • 8543a7504f Merge pull request #15411 from edx/yro/fire-certs-on-pass Gregory Martin 2017-06-29 15:29:26 -04:00
  • 5160909d3b EDUCATOR-793: converts TypeError,NotFoundError logging to debug only Jeff LaJoie 2017-06-29 15:17:45 -04:00
  • 1d8d44eedb Merge pull request #15223 from proversity-org/proversity/pr-add-invitation-only-field-to-course-serializer Sven Marnach 2017-06-29 20:32:56 +02:00
  • b9425c5b5c Implement signal/handler for learner passing grades Gregory Martin 2017-06-23 13:56:49 -04:00
  • fd2efcba7a Merge pull request #15435 from edx/jeskew/remove_another_1.9_deprecation_warning John Eskew 2017-06-29 13:58:05 -04:00
  • bf0f7ce704 Merge pull request #15433 from edx/nedbat/pedantic-footer-2 Ned Batchelder 2017-06-29 12:15:14 -04:00
  • 86eca26aa0 EDUCATOR-778: prefetched visible blocks Sanford Student 2017-06-28 12:15:27 -04:00