Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
41,609 Commits 1 Branch 0 Tags
ae8a5f2bf7ace2a6993d7c2e333daa09beafae98
Commit Graph

41609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brittney Exline
ae8a5f2bf7 ENT-447 Add flag to third party auth SAML provider to send to the registration page first 2017-06-27 13:12:00 -04:00
Jeremy Bowman
f99fbaeaa8 Merge pull request #15398 from edx/jmbowman/PLAT-1229 
PLAT-1229 Support for JS tests in Docker devstack
 2017-06-26 10:45:11 -04:00
George Song
32deb6a66a Merge pull request #15258 from mreyk/teltek/bugfix/sysadmin-csv-download 
Fix sysadmin csv download as unicode
 2017-06-26 06:41:39 -07:00
David Ormsbee
30385697a1 Merge pull request #15382 from edx/ormsbee/webpack_common_chunk_vagrant 
Add support for CommonsChunkPlugin for Webpack.
 2017-06-26 09:37:43 -04:00
Brian Mesick
f9216656fc Merge pull request #15393 from edx/bmedx/django_1.11_upgrade_mock_django_PLAT_1494 
Remove mock-django dependency
 2017-06-23 16:36:50 -04:00
Brian Mesick
7b439d020b Merge pull request #15401 from edx/bmedx/django_1.11_upgrade_statici18n_PLAT-1572 
Upgrade django-statici18n to 1.4.0
 2017-06-23 16:34:03 -04:00
Brian Beggs
7074e3abba Merge pull request #14902 from Salomari1987/salah/copyright-year 
Set COPYRIGHT_YEAR dynamically
 2017-06-23 16:06:35 -04:00
Brittney Exline
cc460bbb0d Merge pull request #15391 from edx/bexline/ent_authentication_flow 
ENT-447 Add ability to hide auth warnings for enterprise context.
 2017-06-23 15:55:03 -04:00
Harry Rein
4766d18a4c Merge pull request #15403 from edx/andya/pluggable-course-tools-quality-fix 
Fixing quality issue with recent merge.
 2017-06-23 15:51:48 -04:00
Harry Rein
a7e4a87b66 Fixing quality issue with recent merge. 2017-06-23 15:27:33 -04:00
Harry Rein
e0ff40c0fc Merge pull request #15372 from edx/andya/pluggable-course-tools 
Introduce a course_tool plugin entry point and convert Updates, Bookmarks and Reviews into entry points.
 2017-06-23 15:13:51 -04:00
Calen Pennington
60982e5a59 Merge pull request #15387 from cpennington/ret/optimizely-sock 
Put the verification-sock html on the page all the time so that we can easily experiment on it with optimizely
 2017-06-23 15:13:15 -04:00
Andy Armstrong
2842533eb4 Introduce a course_tool plugin entry point and migrate the updates, bookmarks and reviews tools into plugins. 2017-06-23 15:11:28 -04:00
bmedx
e76936561b Upgrade django-statici18n to 1.4.0 
- PLAT-1572 upgrade to official Django 1.11 support version
 2017-06-23 14:19:06 -04:00
Brittney Exline
611af39d53 ENT-447 Add ability to hide auth warnings for enterprise context. 
When a user comes in through an sso provider and arrives at the login
or registration page, there is a warning message that comes up to indicate
that the user has to take an action to sign in and register and thus
link their sso account to their edx account. However, it is confusing,
particularly for the enterpise context. This diff disables these messages
from being rendered if these pages are being shown in an enterprise context.
 2017-06-23 14:03:53 -04:00
Douglas Hall
6ff027ab01 Merge pull request #15395 from open-craft/haikuginger/case-insensitive-country-code 
Allow lower- and mixed-case country default values on registration form
 2017-06-23 13:47:09 -04:00
Calen Pennington
6dc5cb498e Put the verification-sock html on the page all the time so that we can easily experiment on it with optimizely 2017-06-23 13:14:03 -04:00
Harry Rein
aea407b13e Merge pull request #15355 from edx/HarryRein/LEARNER-1485-course-reviews-tool 
LEARNER-1485: Adding a reviews page and link from the course tool bar
 2017-06-23 13:09:13 -04:00
Marko Jevtić
34567d8cca Merge pull request #15303 from edx/mjevtic/LEARNER-437 
[LEARNER-437] Reflect discount on the Program About Page (WL)
 2017-06-23 18:34:40 +02:00
Jeremy Bowman
0a3647848e PLAT-1229 Support for JS tests in Docker devstack 2017-06-23 12:27:39 -04:00
Marko Jevtic
75531b2fef [LEARNER-437] Reflect discount on the Program About Page (WL) 2017-06-23 17:34:06 +02:00
Jesse Shapiro
5d363df5f5 Allow lower- and mixed-case country default values 2017-06-23 11:29:11 -04:00
Harry Rein
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. 2017-06-23 11:27:48 -04:00
Marko Jevtić
5a919f2c1c Merge pull request #15295 from edx/mjevtic/LEARNER-1367 
[LEARNER-1367] Move Program Marketing page from private themes repo to edx platform repo
 2017-06-23 17:25:42 +02:00
Marko Jevtic
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)
 2017-06-23 16:27:37 +02:00
Brian Beggs
b68a481432 Merge pull request #15396 from edx/bbeggs/dummy 
Revert "Test out DRF 3.6"
 2017-06-23 10:25:58 -04:00
Brian Beggs
e25553b64b Revert "Test out DRF 3.6" 
This reverts commit f8d3f88956.
 2017-06-23 10:24:04 -04:00
Brian Beggs
f8d3f88956 Test out DRF 3.6 2017-06-23 10:21:06 -04:00
bmedx
41def5c938 Remove mock-django dependency 
- PLAT-1494 since mock-django only seems to support up to Django 1.9a1, and is only used in one file we're opting to try to simplify and remove the dependency.
 2017-06-23 09:22:11 -04:00
Muhammad Ammar
4622b24ab4 Merge pull request #15385 from edx/ammar/fix-video-flaky-test 
fix video flaky test
 2017-06-23 17:10:15 +05:00
muhammad-ammar
4d609f80ea fix video flaky test 
EDUCATOR-607
 2017-06-23 15:57:27 +05:00
David Ormsbee
962b09f73c Add support for CommonsChunkPlugin for Webpack. 
This lets us consolidate chunks of JavaScript that are common to
multiple bundles, so that they can live in their own shared file. This
will be more relevant when we have UI components -- there's actually
very little shared code right now.
 2017-06-22 21:14:13 -04:00
Andy Armstrong
b26630028e Merge pull request #15182 from edx/diana/dismiss-button 
Add a dismiss button to welcome message.
 2017-06-22 20:05:21 -04:00
Diana Huang
3d09290c14 Add a dismiss button to welcome message. 
Store user's preference indefinitely.
 2017-06-22 18:26:50 -04:00
Matthew Piatetsky
72fb972288 Merge pull request #15358 from edx/LEARNER-1312b 
LEARNER-1312 Track Selection Choice (v2)
 2017-06-22 17:17:20 -04:00
Matthew Piatetsky
5c7e67e919 Create test for new version of track selection page 
LEARNER-1312
 2017-06-22 16:28:00 -04:00
Brian Beggs
03e724c0bc Merge pull request #15354 from edx/jmbowman/PLAT-1228 
PLAT-1228 Support bok-choy in Docker Devstack
 2017-06-22 15:55:02 -04:00
Jeremy Bowman
5a6b8cd35b PLAT-1228 Support bok-choy in Docker Devstack 2017-06-22 15:03:12 -04:00
Brittney Exline
1ad2b66e14 Merge pull request #15381 from edx/bexline/fix_enterprise_catalog_api 
Increments the enterprise version to include a change that will restore
 2017-06-21 17:07:44 -04:00
Brittney Exline
d80be3add0 Increments the enterprise version to include a change that will restore 
the ability to create clients for the catalog api.
 2017-06-21 16:06:34 -04:00
Alex Dusenbery
f7f6ac15ca Have TestWelcomeMessageView runs succeed deterministically when test order is shuffled. 2017-06-21 15:00:29 -04:00
Eric Fischer
b1e3a45461 Merge pull request #15377 from edx/efischer/ora2_1.4.3 
edx-ora2 update
 2017-06-21 14:34:25 -04:00
Douglas Hall
7b52767f9f Merge pull request #15376 from edx/douglashall/edx-enteprise_0_36_2 
Upgrading edx-enteprise package to 0.36.2
 2017-06-21 13:31:50 -04:00
Eric Fischer
582e71e8b7 edx-ora2 update 2017-06-21 13:29:03 -04:00
Alex Dusenbery
fb36c7df6c EDUCATOR-514 | Add certificate_available_date field to CourseFields 2017-06-21 11:57:38 -04:00
Ned Batchelder
89831f063f Merge pull request #15374 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-06-21 11:28:07 -04:00
Ned Batchelder
8dab37122c Update translations (autogenerated message) 2017-06-21 14:36:35 +00:00
Douglas Hall
f5758e00f3 Upgrading edx-enteprise package to 0.36.2 2017-06-21 09:43:16 -04:00
Afzal Wali Naushahi
2b4fb4fd95 Merge pull request #15180 from edx/clintonb/multi-tenant-catalog-integration 
Updated CatalogIntegration to use a site-specific URL
 2017-06-21 15:31:53 +05:00
Afzal Wali
8173182c86 Taking the url change behind the waffle switch. Required for the Learner-1146 
Learner-1111
 2017-06-21 14:02:14 +05:00