Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 947e814216 Remove deprecated django.utils.importlib. John Eskew 2017-06-29 12:08:21 -04:00
• b673ceee5d Merge pull request #15300 from edx/sarahkf/fix-color-contrast sarahkf 2017-06-29 12:00:30 -04:00
• d48b237c6f Merge pull request #15414 from edx/jmbowman/PLAT-1597 Jeremy Bowman 2017-06-29 11:57:16 -04:00
• 2e80c1e66b Refactor, enhance, and adjust unified_course_view flag. Robert Raposa 2017-06-26 17:30:00 -04:00
• d311a83474 Merge pull request #15427 from edx/jmbowman/PLAT-1610 Jeremy Bowman 2017-06-29 10:32:48 -04:00
• 6080f76d19 Merge pull request #15426 from edx/jmbowman/PLAT-1323 Jeremy Bowman 2017-06-29 10:30:28 -04:00
• 01018ec418 Correct spelling of 'Open edX', and pedantic typography in the copyright footer Ned Batchelder 2017-06-29 07:10:05 -04:00
• aca096138b add invitation_only field to course serializer Jose Antonio Gonzalez 2017-06-01 09:43:07 +02:00
• 78ef8db40a Fixing color contrast issues in Studio Sarah Fischmann 2017-06-12 17:57:42 -04:00
• ed784d9609 Keep button shape for long strings jportela 2017-06-29 13:53:36 +00:00
• c26190a709 Merge pull request #15429 from edx/ibrahimahmed443/WL-1078-program-details-changes Ibrahim Ahmed 2017-06-29 16:25:17 +05:00
• 032f62e560 Remove enterprise cookie when it is not needed any further. Saleem Latif 2017-06-22 12:11:00 +05:00
• 44f1f7f975 start button fix in mobile Ibrahim 2017-06-21 19:55:05 +05:00
• beba48a5d4 Added model and API endpoints for experiment-scoped data Clinton Blackburn 2017-06-27 14:05:43 -04:00
• be51c71913 Added ExperimentData API endpoint for bulk upserts Clinton Blackburn 2017-06-27 12:47:18 -04:00
• 89c4705234 Merge pull request #14847 from edx/jbarciauskas/refactor-heartbeat-extensible Joel Barciauskas 2017-06-28 15:59:26 -04:00
• 5cbdd5de61 PLAT-1323 Remove older, slower code path for course export Jeremy Bowman 2017-06-28 13:04:49 -04:00
• f1902f9e51 PLAT-1610 Fix social auth config error in Docker bok-choy tests Jeremy Bowman 2017-06-28 13:28:22 -04:00
• c8681746ad Merge pull request #15402 from edx/bmedx/django_1.11_upgrade_django_pyfs_PLAT-1594 Brian Mesick 2017-06-28 13:25:44 -04:00
• a42264715b Corrected create permissions for ExperimentData create endpoint Clinton Blackburn 2017-06-23 18:28:19 -04:00
• 8dba6c49a6 Use platform_name instead of site_name in password reset email subject Salah Alomari 2017-04-09 19:50:23 +03:00
• d1ede533e6 Add Salah Alomari to AUTHORS Salah Alomari 2017-04-09 15:21:59 +03:00
• 4f6eaa59d1 Use platform_name instead of site_name in password reset email Salah Alomari 2017-04-09 14:11:47 +03:00
• e71f1afdf3 Merge pull request #15408 from edx/bexline/send_to_registration_first Brittney Exline 2017-06-27 16:55:29 -04:00
• 6f60d3b905 Merge pull request #15417 from edx/mjfrey/catch-exception Michael Frey 2017-06-27 15:58:51 -04:00
• ae8a5f2bf7 ENT-447 Add flag to third party auth SAML provider to send to the registration page first Brittney Exline 2017-06-26 10:45:56 -04:00
• f920493b6a Merge pull request #14729 from OmarIthawi/omar/username-unicode Bill DeRusha 2017-06-27 12:11:52 -04:00
• 7895875559 Refactor the heartbeat djangoapp to be a bit more extensible Joel Barciauskas 2017-04-08 21:49:18 -04:00
• 29acb6c733 Merge pull request #15413 from cpennington/ret/fix-sock-pricing Calen Pennington 2017-06-27 10:45:43 -04:00
• f92d02feae catch InvalidKeyError Michael Frey 2017-06-27 08:25:08 -04:00
• 1b46c3e646 Add optional support for Unicode usernames Omar Al-Ithawi 2017-03-20 19:13:28 +02:00
• e6c94400d1 Merge pull request #15406 from edx/HarryRein/LEARNER-1534-no-updates-bug Harry Rein 2017-06-26 17:27:00 -04:00
• 84201666ae PLAT-1597 Fix test mongo cleanup hostname in Docker devstack Jeremy Bowman 2017-06-26 16:37:32 -04:00
• 330c4daa73 Merge pull request #15361 from edx/iivic/LEARNER-1523 Michael Frey 2017-06-26 16:29:52 -04:00
• 849f24ab13 Use the right helper function for finding course upgrade price for the sock Calen Pennington 2017-06-26 16:24:45 -04:00
• 4dad21e3b8 Merge pull request #15412 from edx/revert-14327-mtyaka/problem-builder-2.6.6 Feanil Patel 2017-06-26 16:24:15 -04:00
• 64d5425209 Revert "Bump problem builder to v2.6.9." Feanil Patel 2017-06-26 16:19:17 -04:00
• a88361f177 eslint config edx v3 Ari Rizzitano 2017-06-26 15:56:24 -04:00
• 6e45f00041 Created new embargo check api Ivan Ivic 2017-06-20 12:59:54 +02:00
• a34081c24b Assuring that courses without updates cannot see the updates link from the home page and that the update message does not throw an error upon loading from a direct URL without any updates. Added test to assure this behavior and fixed up welcome message tests. Harry Rein 2017-06-23 11:07:41 -04:00
• 00ba9c7062 Merge pull request #14327 from open-craft/mtyaka/problem-builder-2.6.6 Feanil Patel 2017-06-26 12:51:34 -04:00
• 01abb6ba62 Merge pull request #15389 from edx/yro/fire_generate_certs_onwhitelist Gregory Martin 2017-06-26 12:30:02 -04:00
• 3e805fa61b add cert task firing on whitelist append Gregory Martin 2017-06-22 15:01:03 -04:00
• 95460dd143 EDUCATOR-514 | Hide the certificate_available_date field until we enable the feature. Alex Dusenbery 2017-06-22 17:53:45 -04:00
• 3460adc824 Merge pull request #14831 from open-craft/smarnach/immutable-emails Sven Marnach 2017-06-26 16:49:52 +02:00
• f99fbaeaa8 Merge pull request #15398 from edx/jmbowman/PLAT-1229 Jeremy Bowman 2017-06-26 10:45:11 -04:00
• 32deb6a66a Merge pull request #15258 from mreyk/teltek/bugfix/sysadmin-csv-download George Song 2017-06-26 06:41:39 -07:00
• 30385697a1 Merge pull request #15382 from edx/ormsbee/webpack_common_chunk_vagrant David Ormsbee 2017-06-26 09:37:43 -04:00
• c567add628 Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module Douglas Cerna 2017-06-25 19:47:39 -06:00
• f9216656fc Merge pull request #15393 from edx/bmedx/django_1.11_upgrade_mock_django_PLAT_1494 Brian Mesick 2017-06-23 16:36:50 -04:00
• 7b439d020b Merge pull request #15401 from edx/bmedx/django_1.11_upgrade_statici18n_PLAT-1572 Brian Mesick 2017-06-23 16:34:03 -04:00
• 7074e3abba Merge pull request #14902 from Salomari1987/salah/copyright-year Brian Beggs 2017-06-23 16:06:35 -04:00
• cc460bbb0d Merge pull request #15391 from edx/bexline/ent_authentication_flow Brittney Exline 2017-06-23 15:55:03 -04:00
• 4766d18a4c Merge pull request #15403 from edx/andya/pluggable-course-tools-quality-fix Harry Rein 2017-06-23 15:51:48 -04:00
• a7e4a87b66 Fixing quality issue with recent merge. Harry Rein 2017-06-23 15:27:33 -04:00
• 26e2e9940e Upgrade django-pyfs to 1.0.6 bmedx 2017-06-23 15:26:00 -04:00
• e0ff40c0fc Merge pull request #15372 from edx/andya/pluggable-course-tools Harry Rein 2017-06-23 15:13:51 -04:00
• 60982e5a59 Merge pull request #15387 from cpennington/ret/optimizely-sock Calen Pennington 2017-06-23 15:13:15 -04:00
• 2842533eb4 Introduce a course_tool plugin entry point and migrate the updates, bookmarks and reviews tools into plugins. Andy Armstrong 2017-06-20 19:03:37 -04:00
• e76936561b Upgrade django-statici18n to 1.4.0 bmedx 2017-06-23 14:19:06 -04:00
• 611af39d53 ENT-447 Add ability to hide auth warnings for enterprise context. Brittney Exline 2017-06-22 14:18:18 -04:00
• 6ff027ab01 Merge pull request #15395 from open-craft/haikuginger/case-insensitive-country-code Douglas Hall 2017-06-23 13:47:09 -04:00
• 6dc5cb498e Put the verification-sock html on the page all the time so that we can easily experiment on it with optimizely Calen Pennington 2017-06-22 11:08:54 -04:00
• aea407b13e Merge pull request #15355 from edx/HarryRein/LEARNER-1485-course-reviews-tool Harry Rein 2017-06-23 13:09:13 -04:00
• 34567d8cca Merge pull request #15303 from edx/mjevtic/LEARNER-437 Marko Jevtić 2017-06-23 18:34:40 +02:00
• 0a3647848e PLAT-1229 Support for JS tests in Docker devstack Jeremy Bowman 2017-06-23 10:20:34 -04:00
• 75531b2fef [LEARNER-437] Reflect discount on the Program About Page (WL) Marko Jevtic 2017-06-13 11:07:05 +00:00
• 5d363df5f5 Allow lower- and mixed-case country default values Jesse Shapiro 2017-06-23 10:16:46 -04:00
• 82daaa5ad3 Adding a reviews page to the course and updating the reviews module on the course about page. Removed the existing coursetalk implementation and put it in a fragment, removed the tests as well. Added configuration settings to specify the reviews template as well as the reviews provider. This is all protected by a waffle flag. Harry Rein 2017-06-19 16:06:00 -04:00
• 5a919f2c1c Merge pull request #15295 from edx/mjevtic/LEARNER-1367 Marko Jevtić 2017-06-23 17:25:42 +02:00
• d48100d386 [LEARNER-1367] Move Program Marketing page from private themes repo to edx platform repo [LEARNER-311] Enable a purchase button on the Program page - platform (WL) Marko Jevtic 2017-06-12 13:34:24 +00:00
• b68a481432 Merge pull request #15396 from edx/bbeggs/dummy Brian Beggs 2017-06-23 10:25:58 -04:00
• e25553b64b Revert "Test out DRF 3.6" Brian Beggs 2017-06-23 10:24:04 -04:00
• f8d3f88956 Test out DRF 3.6 Brian Beggs 2017-06-23 10:21:06 -04:00
• 41def5c938 Remove mock-django dependency bmedx 2017-06-23 09:22:11 -04:00
• 4622b24ab4 Merge pull request #15385 from edx/ammar/fix-video-flaky-test Muhammad Ammar 2017-06-23 17:10:15 +05:00
• 4d609f80ea fix video flaky test muhammad-ammar 2017-06-22 16:16:06 +05:00
• 962b09f73c Add support for CommonsChunkPlugin for Webpack. David Ormsbee 2017-06-21 21:46:59 -04:00
• b26630028e Merge pull request #15182 from edx/diana/dismiss-button Andy Armstrong 2017-06-22 20:05:21 -04:00
• 3d09290c14 Add a dismiss button to welcome message. Diana Huang 2017-05-24 13:27:28 -04:00
• 72fb972288 Merge pull request #15358 from edx/LEARNER-1312b Matthew Piatetsky 2017-06-22 17:17:20 -04:00
• 5c7e67e919 Create test for new version of track selection page Matthew Piatetsky 2017-06-19 17:51:10 -04:00
• 03e724c0bc Merge pull request #15354 from edx/jmbowman/PLAT-1228 Brian Beggs 2017-06-22 15:55:02 -04:00
• 5a6b8cd35b PLAT-1228 Support bok-choy in Docker Devstack Jeremy Bowman 2017-06-16 16:52:45 -04:00
• 1ad2b66e14 Merge pull request #15381 from edx/bexline/fix_enterprise_catalog_api Brittney Exline 2017-06-21 17:07:44 -04:00
• d80be3add0 Increments the enterprise version to include a change that will restore the ability to create clients for the catalog api. Brittney Exline 2017-06-21 16:06:34 -04:00
• f7f6ac15ca Have TestWelcomeMessageView runs succeed deterministically when test order is shuffled. Alex Dusenbery 2017-06-21 14:27:29 -04:00
• b1e3a45461 Merge pull request #15377 from edx/efischer/ora2_1.4.3 Eric Fischer 2017-06-21 14:34:25 -04:00
• 7b52767f9f Merge pull request #15376 from edx/douglashall/edx-enteprise_0_36_2 Douglas Hall 2017-06-21 13:31:50 -04:00
• 582e71e8b7 edx-ora2 update Eric Fischer 2017-06-21 13:29:03 -04:00
• fb36c7df6c EDUCATOR-514 | Add certificate_available_date field to CourseFields Alex Dusenbery 2017-06-14 14:11:02 -04:00
• 89831f063f Merge pull request #15374 from edx/nedbat/update-translations Ned Batchelder 2017-06-21 11:28:07 -04:00
• 8dab37122c Update translations (autogenerated message) Ned Batchelder 2017-06-21 14:36:35 +00:00
• f5758e00f3 Upgrading edx-enteprise package to 0.36.2 Douglas Hall 2017-06-21 09:43:16 -04:00
• 6a4461b002 Simplify CSS for read-only fields. Sven Marnach 2017-04-07 11:37:26 +02:00
• f127a29d62 Add feature flag to disable email address changes. Sven Marnach 2017-04-05 21:25:04 +02:00
• 2b4fb4fd95 Merge pull request #15180 from edx/clintonb/multi-tenant-catalog-integration Afzal Wali Naushahi 2017-06-21 15:31:53 +05:00
• 8173182c86 Taking the url change behind the waffle switch. Required for the Learner-1146 Afzal Wali 2017-06-20 13:46:36 +05:00
• dd1f834697 Displaying verification denial reasons on dashboard Clinton Blackburn 2017-06-15 20:27:36 -04:00
• f5769959dd Merge pull request #15135 from open-craft/uman/OC-2606 Jesse Shapiro 2017-06-20 17:04:20 -04:00