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

47368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edx-cache-uploader-bot
07eadd46e1 Updating migrations 2018-09-18 13:46:15 -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
Ned Batchelder
93d4af35bd No need for superstitious kwargs 2018-09-17 17:01:11 -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
Albert (AJ) St. Aubin
99eca7b2fa Merge pull request #18929 from edx/aj/LEARNER-6360 
Correcting bug where a user enrolled in a run that has left the upgrade
 2018-09-13 13:15:58 -04:00
Stu Young
0c2396a34b Merge pull request #18931 from edx/testeng/bokchoy_auto_cache_update_67075dab4603b6bf8974c4c8274c1e1afc7db301 
Bokchoy db cache update
 2018-09-13 11:46:29 -04:00
Dave St.Germain
864f59ed1e Added the ability to assign learners to a cohort in the enrollment API. 2018-09-13 11:15:08 -04:00
edx-cache-uploader-bot
b26863ce60 Updating migrations 2018-09-13 11:14:26 -04:00
Kevin Falcone
488c7f2d10 Merge pull request #18927 from edx/jibsheet/change-DOT-expiry-window 
Come down from 6 months to 3 months
 2018-09-13 11:08:44 -04:00
David Ormsbee
4057190435 Merge pull request #18808 from open-craft/opencraft/taranjeet/fix-child-course-display 
Fix incorrect course name displayed for CCX courses.
 2018-09-13 10:53:35 -04:00
Kevin Falcone
71859e8403 Come down from 6 months to 3 months 2018-09-13 10:39:22 -04:00
Calen Pennington
5b71d4408b Merge pull request #18902 from cpennington/fix-educator-3262-v3 
Load all webpack chunks into fragments as correctly-typed resources
 2018-09-13 10:11:26 -04:00
Albert St. Aubin
658b066cc0 Correcting bug where a user enrolled in a run that has left the upgrade 
window

[LEARNER-6360]

Correcting bug where a user enrolled in a run that has left the upgrade
window could not leave their session.  Now if a user has an enrolled
session it will always be present
 2018-09-13 10:11:09 -04:00
Kevin Falcone
bc082aa1ac Mark the interdependency between our code and DOT 
We need to drop the Foreign Keys, apply their two migrations and then
re-add the Foreign Keys but Django gets to decide on the apply order and
this helps ensure we get the one we want.
 2018-09-13 09:54:30 -04:00
Robert Raposa
9a7c224f18 Restore constraints after DOT upgrade. 
ARCH-180
 2018-09-13 09:54:30 -04:00
Robert Raposa
c7800acaa0 Restore "Upgrade DOT to 1.1.2." 
This upgrades DOT by reverting the revert.

This reverts commit 4d8b9c3

ARCH-180
 2018-09-13 09:54:30 -04:00
Robert Raposa
a31fca4e47 Drop constraints before DOT Upgrade. 
ARCH-180
 2018-09-13 09:54:29 -04:00
Waheed Ahmed
00c7cce1d8 Escape validation error messages on reset password page. 
Properly escape validation error messages on reset password page while
passing to reactJS.

LEARNER-6356
 2018-09-13 16:28:52 +05:00
Calen Pennington
461f35255c fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-12 21:54:19 -04:00
Michael Youngstrom
3c654234c9 Merge pull request #18922 from edx/youngstrom/timeout-test-change 
Bump timeout on sample_function_1 test
 2018-09-12 16:02:50 -04:00
J Eskew
7affa237df Merge pull request #18557 from mreyk/teltek/feature/improve-course-modes-configuration 
OSPR: Improve Course Modes configuration
 2018-09-12 15:52:48 -04:00
Robert Raposa
0cfda2d097 Merge pull request #18857 from edx/arch/consolidate-request-cached-decorator 
Cleanup and remove deprecated RequestCache Django app
 2018-09-12 15:11:29 -04:00