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

41643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
d311a83474 Merge pull request #15427 from edx/jmbowman/PLAT-1610 
PLAT-1610 Fix social auth config error in Docker bok-choy tests
 2017-06-29 10:32:48 -04:00
Jeremy Bowman
6080f76d19 Merge pull request #15426 from edx/jmbowman/PLAT-1323 
PLAT-1323 Remove older, slower code path for course export
 2017-06-29 10:30:28 -04:00
Ibrahim Ahmed
c26190a709 Merge pull request #15429 from edx/ibrahimahmed443/WL-1078-program-details-changes 
Ibrahimahmed443/wl 1078 program details changes
 2017-06-29 16:25:17 +05:00
Ibrahim
44f1f7f975 start button fix in mobile 2017-06-29 13:06:19 +05:00
Clinton Blackburn
beba48a5d4 Added model and API endpoints for experiment-scoped data 2017-06-28 16:25:39 -04:00
Clinton Blackburn
be51c71913 Added ExperimentData API endpoint for bulk upserts 
This endpoint allows the Rapid Experiments Team to quickly update data for multiple learners.
 2017-06-28 16:25:39 -04:00
Joel Barciauskas
89c4705234 Merge pull request #14847 from edx/jbarciauskas/refactor-heartbeat-extensible 
Refactor heartbeat endpoint for extensibility
 2017-06-28 15:59:26 -04:00
Jeremy Bowman
5cbdd5de61 PLAT-1323 Remove older, slower code path for course export 2017-06-28 14:55:19 -04:00
Jeremy Bowman
f1902f9e51 PLAT-1610 Fix social auth config error in Docker bok-choy tests 2017-06-28 13:28:22 -04:00
Brian Mesick
c8681746ad Merge pull request #15402 from edx/bmedx/django_1.11_upgrade_django_pyfs_PLAT-1594 
Upgrade django-pyfs to 1.0.6
 2017-06-28 13:25:44 -04:00
Clinton Blackburn
a42264715b Corrected create permissions for ExperimentData create endpoint 2017-06-27 19:35:31 -04:00
Brittney Exline
e71f1afdf3 Merge pull request #15408 from edx/bexline/send_to_registration_first 
ENT-447 Add flag to third party auth SAML provider to send to the registration page first
 2017-06-27 16:55:29 -04:00
Michael Frey
6f60d3b905 Merge pull request #15417 from edx/mjfrey/catch-exception 
catch InvalidKeyError
 2017-06-27 15:58:51 -04:00
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
Bill DeRusha
f920493b6a Merge pull request #14729 from OmarIthawi/omar/username-unicode 
Add optional support for Unicode usernames
 2017-06-27 12:11:52 -04:00
Joel Barciauskas
7895875559 Refactor the heartbeat djangoapp to be a bit more extensible 
We may want to add additional heartbeat checks, particularly depending
on the context (e.g. different environments). This is meant to be a
start at enabling a more plug-in style heartbeat check that provides
more detailed diagnostics if desired.
 2017-06-27 11:45:37 -04:00
Calen Pennington
29acb6c733 Merge pull request #15413 from cpennington/ret/fix-sock-pricing 
Use the right helper function for finding course upgrade price for th…
 2017-06-27 10:45:43 -04:00
Michael Frey
f92d02feae catch InvalidKeyError 2017-06-27 09:49:19 -04:00
Omar Al-Ithawi
1b46c3e646 Add optional support for Unicode usernames 
Refactoring: Use format with named variables
 2017-06-27 14:18:49 +03:00
Harry Rein
e6c94400d1 Merge pull request #15406 from edx/HarryRein/LEARNER-1534-no-updates-bug 
Only display updates course tool when updates exist.
 2017-06-26 17:27:00 -04:00
Michael Frey
330c4daa73 Merge pull request #15361 from edx/iivic/LEARNER-1523 
Created new embargo check api
 2017-06-26 16:29:52 -04:00
Calen Pennington
849f24ab13 Use the right helper function for finding course upgrade price for the sock 2017-06-26 16:24:45 -04:00
Feanil Patel
4dad21e3b8 Merge pull request #15412 from edx/revert-14327-mtyaka/problem-builder-2.6.6 
Revert "Bump problem builder to v2.6.9."
 2017-06-26 16:24:15 -04:00
Feanil Patel
64d5425209 Revert "Bump problem builder to v2.6.9." 2017-06-26 16:19:17 -04:00
Ivan Ivic
6e45f00041 Created new embargo check api 
LEARNER-1523
LEARNER-1524
 2017-06-26 15:02:04 -04:00
Harry Rein
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. 2017-06-26 14:47:27 -04:00
Feanil Patel
00ba9c7062 Merge pull request #14327 from open-craft/mtyaka/problem-builder-2.6.6 
Bump problem builder to v2.6.9.
 2017-06-26 12:51:34 -04:00
Gregory Martin
01abb6ba62 Merge pull request #15389 from edx/yro/fire_generate_certs_onwhitelist 
Add cert task fire on whitelist append
 2017-06-26 12:30:02 -04:00
Gregory Martin
3e805fa61b add cert task firing on whitelist append 2017-06-26 11:44:38 -04:00
Alex Dusenbery
95460dd143 EDUCATOR-514 | Hide the certificate_available_date field until we enable the feature. 2017-06-26 11:30:15 -04:00
Sven Marnach
3460adc824 Merge pull request #14831 from open-craft/smarnach/immutable-emails 
Add feature flag to disable email address changes.
 2017-06-26 16:49:52 +02: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
bmedx
26e2e9940e Upgrade django-pyfs to 1.0.6 
- PLAT-1594 upgrade to official Django 1.11 support version
 2017-06-23 15:26:00 -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