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

47386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
f878d731e3 Merge pull request #18875 from shadinaif/edx-django-oauth2-provider-upgrade-INCR-8 
Upgrade the edx-django-oauth2-provider package to a version Supports Python 3
 2018-09-20 13:23:23 -04:00
Shadi Naif
09e36b9784 Upgrade the edx-django-oauth2-provider package to the latest version that supports Python3 
(version 1.3.4 as of this commit)

This commit is intended to close INCR-8 issue (see https://openedx.atlassian.net/browse/INCR-8 )
 2018-09-20 12:59:11 +03:00
Calen Pennington
44c6936ecb Merge pull request #18950 from cpennington/fix-educator-3262-v4 
Return an unresolved promise when loading javascript resource urls in…
 2018-09-19 19:14:15 -04:00
Calen Pennington
5b7e59e02b Return an unresolved promise when loading javascript resource urls in ConditionalModule 2018-09-19 15:00:51 -04:00
Cory Lee
3c129e9104 Revert "small change to test PR messaging on deployment" 
This reverts commit 7f11a8bfa1.
 2018-09-19 14:28:04 -04:00
Cliff Dyer
1a9ad318e4 Merge pull request #18966 from edx/cliff/completion-tests 
Fix query counts on completion tests.
 2018-09-19 12:27:27 -04:00
J. Cliff Dyer
1f45a7e934 Fix query counts on completion tests and update requirements. 
Update requirements
 2018-09-19 11:16:12 -04:00
Ned Batchelder
784594b41b Merge pull request #18961 from edx/nedbat/simplify-a-mixin 
No need to keep self.tracker here
 2018-09-18 18:32:30 -04:00
Michael Youngstrom
e20c6cf5d6 Merge pull request #18967 from edx/youngstrom/xdist-flaky-fixes 
Ignore errors in paver test cleanup
 2018-09-18 18:03:39 -04:00
Cali
920f3c7e99 Merge pull request #18972 from edx/cstenson/update_password_urls 
Override change password urls in django admin.
 2018-09-18 17:56:26 -04:00
Cali Stenson
46a4bdb115 Override change password urls in django admin. 
LEARNER-4928
 2018-09-18 17:11:49 -04:00
Michael Youngstrom
5d10dbad4a Handle issues with delete_quality_junit_xml 2018-09-18 16:26:27 -04:00
Stu Young
7701b28097 Merge pull request #18969 from edx/testeng/bokchoy_auto_cache_update_b480b115d499240404ff58542305060895d74c9a 
Bokchoy db cache update
 2018-09-18 14:54:43 -04:00
Diana Huang
f88415f89a Merge pull request #18970 from edx/diana/override-admin-templates 
Override admin templates to remove links that allow admin users to change passwords
 2018-09-18 14:53:22 -04:00
edx-cache-uploader-bot
07eadd46e1 Updating migrations 2018-09-18 13:46:15 -04:00
Diana Huang
0fb8f08d2e Override admin templates to remove links that allow admin users to change 
passwords.

LEARNER-4928
 2018-09-18 13:43:30 -04:00
Peter Pinch
204a08271c Merge pull request #18158 from mitodl/pdpinch/undefined-var-error 
More descriptive error messages for UndefinedVariable
 2018-09-18 13:23:47 -04:00
edx-pipeline-bot
89963efd3a Merge pull request #18968 from edx/release-mergeback-to-master 
Merge release back to master
 2018-09-18 12:56:07 -04:00
Ned Batchelder
0dcd1b3339 Merge pull request #18962 from edx/nedbat/remove-setup-args 
No need for superstitious kwargs
 2018-09-18 12:07:58 -04:00
Michael Youngstrom
b1e31a7080 Merge pull request #18957 from edx/youngstrom/refactor-unittests 
Refactor PipelineRenderTest to avoid npm install
 2018-09-18 11:20:43 -04:00
David Ormsbee
3deb7f280b Merge pull request #18964 from open-craft/opencraft/taranjeet/handle-ccx-display-name-exception 
Handle exception while saving course display name.
 2018-09-18 10:18:53 -04:00
Michael Youngstrom
e614b96082 Refactor PipelineRenderTest to avoid npm install 2018-09-18 10:08:00 -04:00
Taranjeet Singh
b06b2136a8 Update log message. 2018-09-18 17:46:44 +05:30
Taranjeet Singh
02be16dff8 Handle exception while saving course display name. 
This commit introduces error check for a special case
where the root course does not exists and a data migration
is attempting to save it.
 2018-09-18 16:06:53 +05:30
Robert Raposa
27cf027a79 Merge pull request #18915 from edx/arch/jwt-cookie-decision 
JWT Cookie decision record
 2018-09-17 20:29:46 -04:00
Peter Pinch
b43f2242ad more descriptive error messages for UndefinedVariable 2018-09-17 17:14:25 -04:00
Ned Batchelder
93d4af35bd No need for superstitious kwargs 2018-09-17 17:01:11 -04:00
Ned Batchelder
6a48195908 No need to keep self.tracker here 2018-09-17 16:48:14 -04:00
Kevin Falcone
4e8b179ac2 Merge pull request #18651 from edx/robrap/ARCH-180-dot-upgrade-all-steps 
ARCH-180: Upgrade DOT to 1.1.2
 2018-09-17 16:00:20 -04:00
Robert Raposa
861796d6b7 Merge pull request #18960 from edx/robrap/add-authn-readme 
Add README for user_authn.
 2018-09-17 15:33:15 -04:00
Nimisha Asthagiri
1376409351 Decision: Transport JWT in HTTP Cookies 2018-09-17 14:44:01 -04:00
Robert Raposa
b4a2207a7a Add README for user_authn. 2018-09-17 14:37:05 -04:00
Robert Raposa
68beb6f665 Merge pull request #18949 from edx/robrap/add-flag 
Add JWT_COOKIES_FLAG feature toggle.
 2018-09-17 14:08:29 -04:00
Robert Raposa
c91f1fdfc5 Add JWT_COOKIES_FLAG feature toggle. 
This is intended to be a temporary flag for rollout of the JWT Cookies
feature.

ARCH-235
 2018-09-17 12:24:11 -04:00
Awais Jibran
a0d8601ba8 Merge pull request #18951 from edx/aj/bump-studio-frontend 
bump studio-frontend package to 1.16.9
 2018-09-17 11:36:36 -04:00
Ayub
20f0ccbe00 Merge pull request #18954 from edx/update-js-translations-17-sept 
updated-translations
 2018-09-17 15:41:35 +05:00
ayub-khan
92b78e1dec updated-translations 2018-09-17 15:03:48 +05:00
Nimisha Asthagiri
e2ff1ec537 Merge pull request #18917 from edx/arch/user-authn-app 
Consolidate user login and authentication code
 2018-09-15 10:00:51 -04:00
Nimisha Asthagiri
8cf44283c9 Consolidate user login and authentication code 2018-09-15 03:21:39 -04:00
Matthew Piatetsky
69afeaacb2 Merge pull request #18948 from cpennington/tag-graded-scored-content 
Mark xblocks with data-graded and data-has-score
 2018-09-14 16:05:33 -04:00
Calen Pennington
cc7f692c09 Mark xblocks with data-graded and data-has-score 2018-09-14 15:05:22 -04:00
Awais Jibran
9e56a2cfa6 Bump studio-frontend version 2018-09-14 23:55:02 +05:00
Zubair Afzal
522028b0da Merge pull request #18946 from edx/iahmad/ENT-1197-Version-bump-for-edx-enterprise 
Version bumped for edx-enterprise to 0-73-3
 2018-09-14 21:12:17 +05:00
irfanuddinahmad
c06bab6e55 Version bumped for edx-enterprise to 0-73-3 2018-09-14 19:08:12 +05:00
Qubad786
a457c7c81a bump val 2018-09-14 19:06:40 +05:00
Peter Pinch
20e2f4e38d Merge pull request #18840 from mitodl/add_run_course_export 
OLX export: Reverted url_name from a constant to course run

closes CRI-102
closes OSPR-2570
 2018-09-14 10:00:49 -04:00
Waheed Ahmed
32c29b0d8f Merge pull request #18924 from edx/waheed/LEARNER-6356-escape-reset-password-error-msgs 
Escape validation error messages on reset password page.
 2018-09-14 15:06:00 +05:00
Amir Qayyum Khan
0e2febbce2 OLX export: Reverted url_name from a constant to course run 
- New exported courses include course run information in:
  - `url_name` of root course node
  - file name of root node in course folder
  - root key name in policy.json
  - directory name inside policies folder

- when imported via management command, the OLX will overwrite an
available existing course with the same course key (i.e. same org,
course number and course run)
  - if there is no matching course, one will be created

- when imported via the studio web ui (or import API), the OLX will
replace the current course (no change in behavior)

- courses exported with this commit have been tested to import via
management command and studio web UI in hawthorn and ginkgo releases.
They should also work in prior releases, but have not been tested.
 2018-09-14 14:50:40 +05:00
Ned Batchelder
b30e46a2e3 Merge pull request #18880 from edx/nedbat/coverage-parallel-everywhere 
Make coverage parallel everywhere
 2018-09-13 21:44:17 -04:00
Dave St.Germain
a020c897e8 Merge pull request #18912 from edx/dcs/enroll-cohorts 
Added the ability to assign learners to a cohort in the enrollment API.
 2018-09-13 13:37:19 -04:00