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

41981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
bc6d7980a4 Revert "Merge pull request #15593 from edx/efischer/edu-274_logging" 
This reverts commit 2d6b477e83, reversing
changes made to 7799c4adf4.
 2017-07-25 10:38:29 -04:00
John Eskew
fc11bdd72d Merge pull request #15604 from edx/jeskew/use_django111_compat_drf_oauth 
Shift to edx fork of drf-oauth module.
 2017-07-24 12:37:03 -04:00
Michael Frey
27cd3d199d Merge pull request #15645 from edx/mjfrey/vscode-gitignore 
Ignore Visual Studio Code directory.
 2017-07-24 09:23:08 -04:00
Michael Frey
0082f36002 Ignore Visual Studio Code directory. 2017-07-24 09:20:05 -04:00
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
John Eskew
4697aab443 Merge pull request #15634 from edx/jeskew/bump_submissions_version_for_logging 
Bump edx-submissions to v2.0.5 for better logging.
 2017-07-22 11:55:46 -04:00
John Eskew
6f79800d38 Merge pull request #15640 from ubc/ubcpi-0.6.3 
Update UBCPI to 0.6.3
 2017-07-22 11:48:56 -04:00
Pan Luo
4cc91daab4 Update UBCPI to 0.6.3 2017-07-21 16:26:42 -07: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
John Eskew
a8f032af8a Bump edx-ora2 to v1.4.8 2017-07-21 14:24:15 -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
John Eskew
ca900b65fd Bump edx-submissions to v2.0.5 for better logging. 2017-07-21 13:34:36 -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
Afzal Wali Naushahi
17d5386046 Merge pull request #15632 from edx/afzaledx/clear_cached_programs 
Clearing the cache if the site's configuration was removed.
 2017-07-21 21:23:18 +05:00
Ari Rizzitano
b524f0e15b Merge pull request #15610 from edx/ari/fix-webpack-failures 
catch WebpackLoaderBadStatsError in test runs
 2017-07-21 11:32:39 -04:00
Ari Rizzitano
038d5a1351 catch WebpackLoaderBadStatsError to prevent unittest concurrency errors 
[LEARNER-1938]

try also catching WebpackLoaderBadStatsError
[LEARNER-1938]

catch BaseWebpackLoaderException also

do i need to import the exception?

add better logging
 2017-07-21 10:17:55 -04:00
Brittney Exline
f86f599894 Merge pull request #15631 from open-craft/bdero/bulk-enroll-content-type 
Patch the bulk_enroll request to use a form content type
 2017-07-21 09:57:22 -04:00
Afzal Wali
e82053ee43 Clearing the cache if the site's configuration was removed. 
The site's configuration does not contain the API URL, it should not keep on displayed the old cached list of uuids.
LEARNER-1146
 2017-07-21 18:25:19 +05:00
John Eskew
aecb7ea309 Merge pull request #15626 from edx/jeskew/bump_submissions_version 
Although bokchoy reported failed, I looked at all output and all tests appeared to have passed - so merging.
Update ORA2 and submissions to include field error printing.
 2017-07-20 19:01:27 -04:00
John Eskew
bdc5c852b8 Update ORA2 and submissions to include field error printing. 2017-07-20 18:04:35 -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
John Eskew
1ecd1f38c1 Shift to edx fork of drf-oauth module. Add comments about forks. 2017-07-20 17:26:19 -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
George Song
af08729195 Merge pull request #15623 from edx/george/enrollments-prereq 
Fixed milestone issues
 2017-07-20 13:56:48 -07:00
Brittney Exline
abc503bad2 Merge pull request #15608 from edx/bexline/fix_auto_registration 
ENT-550 Display only TOS for enterprise's configured to skip registration
 2017-07-20 14:10:01 -04:00
Ahmed Jazzar
fc5716d9b1 Fixed milestone issues 
In settings_handler and any_unfulfilled_milestones (for mobile APIs)
 2017-07-20 10:55:44 -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
George Song
141c0af0eb Merge pull request #15586 from jspayd/hide-passwords-upstream 
Hide passwords in crash reports
 2017-07-20 08:59:12 -07:00
Christina Roberts
42fffdfa9a Merge pull request #15614 from edx/christina/ed-945 
Upgrade xblock-lti-consumer.
 2017-07-20 10:20:49 -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
cahrens
4f00b85d10 Upgrade xblock-lti-consumer. 
EDUCATOR-945
 2017-07-20 09:11:53 -04:00
Ned Batchelder
8702988000 Update translations (autogenerated message) 2017-07-20 11:52:03 +00:00
Christina Roberts
1922faf191 Merge pull request #15612 from edx/christina/fix-violations 
Fix safe lint violation.
 2017-07-19 20:43:03 -04:00
Douglas Hall
0b945270a3 Merge pull request #15601 from edx/asadiqbal08/ENT-508 
Updated the enterprise version
 2017-07-19 16:43:31 -04:00
cahrens
299fd0982f Fix safe lint violation. 2017-07-19 16:31:04 -04:00
asadiqbal
e604e66033 update version 2017-07-19 15:55:29 -04: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
3d610fd78d Merge pull request #15554 from edx/HarryRein/LEARNER-1652-course-tool-eventing 
Adding eventing to the course tools.
 2017-07-19 14:46:10 -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
Christina Roberts
e9e72aec89 Merge pull request #15596 from edx/christina/update-organizations 
Remove flaky wiki editing test
 2017-07-19 14:02:45 -04:00
Harry Rein
f2ef2b034a Adding eventing to the course tools. 
LEARNER-1652

We now send log events when the user clicks on the events in the course
toolbar, representing a change to the new page.
 2017-07-19 13:51:23 -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
Christina Roberts
eadc099512 Merge pull request #15597 from edx/christina/revert-ed-60 
Restore more specific error messages.
 2017-07-19 11:03:38 -04:00
cahrens
67e61e878a Remove flaky editing test. 
EDUCATOR-511
 2017-07-19 10:52:33 -04:00
Marko Jevtić
9cf2d7ea5a Merge pull request #15600 from edx/mjevtic/LEARNER-442 
[LEARNER-1104] Allow staff members to view enrollment for any user
 2017-07-19 15:50:33 +02:00