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

16517 Commits

Author SHA1 Message Date
Jesse Shapiro
91752ad98a Merge pull request #15624 from open-craft/haikuginger/remove-sso-consent 
[ENT-491] Remove SSO consent features; verify fully-populated consent URL generation
 2017-07-24 07:43:16 -04:00
Jesse Shapiro
fa9c09f9fe Remove Enterprise SSO hooks 2017-07-21 18:24:09 -04:00
Matthew Piatetsky
7452456986 Merge pull request #15616 from edx/LEARNER-1726 
LEARNER-1726 Track Selection V3
 2017-07-21 14:46:31 -04:00
sanfordstudent
7d9cc90cab Merge pull request #15627 from edx/sstudent/compute_grades_fix 
force subsection grades to update when course grade updates
 2017-07-21 14:03:52 -04:00
Matthew Piatetsky
c8250fd573 Implement track selection v3 test 
LEARNER-1726
 2017-07-21 13:17:24 -04:00
Sanford Student
66fdd2fbd3 EDUCATOR-915: force subsection grades to update when course grade updates 2017-07-21 13:07:21 -04:00
Brandon DeRosier
1990dc7fd8 Patch the bulk_enroll request to use a form content type 
Setting the content type to be form data makes Django Rest Framework v3.6.3 treat all passed JSON data as
POST parameters. This is necessary because this request is forwarded on to the student_update_enrollment
view, which requires all of the parameters to be passed in via POST parameters.
 2017-07-20 17:56:56 -04:00
George Song
8ec6039766 Merge pull request #15557 from edx/george/cookie-consent-message 
Improve cookie consent message
 2017-07-20 13:59:31 -07:00
mrey
040dfd698f Improve cookie consent message 2017-07-20 10:43:29 -07:00
Brittney Exline
6439020815 ENT-550 Display only TOS for enterprise's configured to skip registration 
We have recently discovered that for any SSO Provider configured to skip
the registration form, we were auto checking the terms of service box,
which is a legal faux pas. Since IBM is planning to launch imminently and
is depending on this feature, we need to remedy this situation for enterprises
whose SSO Provider is configured to skip registration.

This PR hides all of the registration fields except TOS for this scenario
and disables the autoSubmit functionality that typically happens when skipping
registration.
 2017-07-20 12:53:20 -04:00
Ned Batchelder
8ce7d86471 Merge pull request #15620 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-07-20 12:45:05 -04:00
Harry Rein
ce87896fb6 Merge pull request #15609 from edx/HarryRein/LEARNER-1879-updates-image-styling 
Update Image Styling on Welcome Message and Updates
 2017-07-20 09:34:35 -04:00
Ned Batchelder
8702988000 Update translations (autogenerated message) 2017-07-20 11:52:03 +00:00
Jeff LaJoie
aa5b8bed11 Merge pull request #15289 from edx/jlajoie/EDUCATOR-434 
EDUCATOR-434: Unit Group Access
 2017-07-19 15:32:02 -04:00
Harry Rein
2658646e1e Fixing styling on updates. 
LEARNER-1879

Issues with images overflowing over their container divs and images being too large for the containing div. Also did a bit of cleanup to improve scss quality.
 2017-07-19 14:33:47 -04:00
Jeff LaJoie
1c90220462 EDUCATOR-434: Extends Course Outline Unit settings to allow Group Access configuration 2017-07-19 14:17:38 -04:00
Clinton Blackburn
2eea7606a3 Exposed ExperimentKeyValue model in Django admin 
The model data can now be viewed/managed via Django admin. Additionally, the verbose name of the model has been corrected.
 2017-07-19 12:27:51 -04:00
Awais Jibran
125552f204 Switching course view to specific student retains the profile language setting 
https://openedx.atlassian.net/browse/EDUCATOR-891
 2017-07-19 16:48:18 +05:00
Gregory Martin
7799c4adf4 Merge pull request #15592 from edx/yro-cert-pacing-signal 
Course/Certificates Pacing Signal Registration
 2017-07-18 15:36:39 -04:00
sanfordstudent
07ad189b9d Merge pull request #15263 from edx/sstudent/grade-override 
Learner grade override
 2017-07-18 14:33:27 -04:00
Sanford Student
932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. 2017-07-18 13:51:56 -04:00
Andy Armstrong
33bee3f70b Refactor learner profile into openedx/features directory 
LEARNER-1855
 2017-07-18 12:30:12 -04:00
Brittney Exline
583719cce1 Merge pull request #15579 from open-craft/bdero/bulk-enroll 
Fix the BulkEnrollSerializer courses field to internally behave with strings and lists
 2017-07-18 11:32:08 -04:00
Gregory Martin
5189f2524d remove dupe 2017-07-18 11:19:26 -04:00
Gregory Martin
8b3f285d04 fix tests 2017-07-18 11:13:01 -04:00
Andy Armstrong
3e786ec6c5 Show page banner for anonymous and unenrolled users 
LEARNER-1697
 2017-07-17 22:19:40 -04:00
Gregory Martin
7df91841ee cleanup 2017-07-17 15:44:29 -04:00
John Eskew
0365712b96 Merge pull request #15584 from edx/jeskew/fix_drf_upgrade_incompat 
Remove request.POST save - incompatible with DRF v3.6.3.
 2017-07-17 13:54:06 -04:00
John Eskew
d003765047 Remove request.POST save - incompatible with DRF v3.6.3. 2017-07-17 13:05:39 -04:00
Andy Armstrong
a077a5e364 Add support for page banner status messages 
LEARNER-1890
 2017-07-17 12:17:32 -04:00
John Eskew
febf2a07ae Merge pull request #15373 from edx/jeskew/drf_upgrade_django_1.11 
Bump DRF version to 3.6.3 for eventual Django 1.11 compatibility.
 2017-07-17 11:19:56 -04:00
Albert (AJ) St. Aubin
2e140a6a5f Merge pull request #15569 from edx/staubina/ed-592_tests 
Staubina/ed 592 tests
 2017-07-17 07:24:16 -04:00
Douglas Hall
bff39b034e Merge pull request #15575 from open-craft/configure-ecommerce-service-worker-username 
[ENT-503] Allow configuration of ECOMMERCE_SERVICE_WORKER_USERNAME
 2017-07-15 07:49:42 -04:00
Brandon DeRosier
43e161f66b Fix the BulkEnrollSerializer courses field to internally behave with strings and lists 2017-07-14 19:17:16 -04:00
George Song
a45ae04e8b Merge pull request #15006 from open-craft/bdero/bulk-enroll 
Upstream the Bulk Enroll API endpoint
 2017-07-14 14:20:23 -07:00
John Eskew
2cd62c7bfb Upgrade django-rest-framework version to edX fork, which is DRF v3.6.3 
with a custom patch needed by edx-platform.
Upgrade django-filter as well to v1.0.4
Import DjangoFilterBackend from the correct module - django_filter.
Add django-filter to INSTALLED_APPS.
 2017-07-14 16:05:13 -04:00
Albert St. Aubin
427967ea83 Working tests for the new Group moderator error messaging 2017-07-14 15:48:12 -04:00
Andy Armstrong
0c72a62ad8 Merge pull request #15556 from edx/andya/pre-start-date-access 
Enable conditional pre-start-date access to courses
 2017-07-14 15:46:25 -04:00
Gregory Martin
921950d7eb update 2017-07-14 15:12:51 -04:00
Brandon DeRosier
a31855c935 Upstream the Bulk Enroll API endpoint 2017-07-14 14:01:16 -04:00
Andy Armstrong
aeecf34387 Enable conditional pre-start-date access to courses 
LEARNER-1854
 2017-07-14 14:00:48 -04:00
Gregory Martin
214018dfee Merge pull request #15572 from edx/yro/repair_signal_config 
Repair signal config, certs
 2017-07-14 13:20:34 -04:00
Matt Tuchfarber
70169016e7 Merge pull request #15443 from edx/tuchfarber/password_reset_misaligned 
WL-1086 Center password reset page
 2017-07-14 13:15:08 -04:00
Ned Batchelder
b310fbbb03 Merge pull request #15571 from edx/jill/ora2-django-storage 
Use ORA2 django storage on openstack and devstack.
 2017-07-14 12:57:47 -04:00
edx-pipeline-bot
b97f593402 Merge pull request #15573 from edx/release-mergeback-to-master 
Merge release back to master
 2017-07-14 12:56:04 -04:00
Jesse Shapiro
f3dd677fa9 Allow configuration of ECOMMERCE_SERVICE_WORKER_USERNAME 2017-07-14 12:50:55 -04:00
Gregory Martin
6fd51467c9 repair signal config 2017-07-14 12:14:53 -04:00
Jillian Vogel
0fcdcb02bb Use ORA2 django storage on openstack and devstack. 
Default ORA2 storage settings use AWS, so no change required to aws envs.
 2017-07-14 11:23:15 -04:00
muhammad-ammar
edcd64e90f edx-videoi-id strip fix 
LEARNER-1871
 2017-07-14 19:17:16 +05:00
Tim Krones
cbd3660cdc Merge pull request #15383 from edx/saleem-latif/ENT-367-updates 
ENT-367: Remove enterprise cookie when it is not needed any further.
 2017-07-14 14:57:46 +02:00