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

47347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Michael Youngstrom
d5f9f2b35c Bump timeout on sample_function_1 test 2018-09-12 15:03:55 -04:00
Michael Youngstrom
0b94a373a5 Merge pull request #18919 from edx/youngstrom/paver-db-flakiness 
Subclass PaverTestCase in flaky paver db tests
 2018-09-12 14:44:14 -04:00
Nimisha Asthagiri
700a902b68 Cleanup and remove deprecated RequestCache Django app 
ARCH-223
 2018-09-12 14:39:11 -04:00
Calen Pennington
db2078ed2f fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-12 14:27:54 -04:00
Stu Young
53d8a04b88 Merge pull request #18921 from edx/estute/bump-npm-installation-timeouts 
increase npm installation timeouts
 2018-09-12 14:27:14 -04:00
Stuart Young
c7ece71142 increase npm installation timeouts 2018-09-12 14:20:12 -04:00
Brian Mesick
f9de1f1927 Merge pull request #18911 from edx/bmedx/add_unretire_button 
Add admin UI to cancel pending retirements
 2018-09-12 13:38:44 -04:00
AsadAzam
3c04f41de4 Merge pull request #18877 from edx/asad/educator-3335-fix-download-transcript-500-error 
Fixed download transcript 500 error
 2018-09-12 22:02:09 +05:00
Michael Youngstrom
ff7431a161 Add in PaverTestCase to flaky paver db test class 2018-09-12 12:15:48 -04:00
Stu Young
bbc1cc9fcb Merge pull request #18878 from edx/testeng/bokchoy_auto_cache_update_4b964c58e34263236d695b1e89e8ea1941e5e87e 
Bokchoy db cache update
 2018-09-12 11:54:09 -04:00
mrey
9003a2dcde Allow to override COURSE_ENROLLMENT_MODES in AWS environment 
Add more parameters to COURSE_ENROLLMENT_MODES to allow to display friendly mode name and more options

Fix python tests of PR #18557

PR #18557: Fix Diff Quality test line too long

PR #18557: Fix Diff Quality test unused-variable

Use six.iteritems() in COURSE_MODE_SLUG_CHOICES for future Python 3 compatibility
 2018-09-12 17:35:57 +02:00
edx-cache-uploader-bot
33e2e943bc Updating migrations 2018-09-12 11:20:37 -04:00
Taranjeet Singh
6931c3b7e1 Fix incorrect course name displayed for CCX courses. 
This commit updates the course name for CCX course at Info, Course
and Instructor tabs.
 2018-09-12 18:49:21 +05:30
Bill Filler
3e146b7af3 Merge pull request #18738 from edx/hasnain-naveed/WL-1687 
WL-1687 | Added access check for journal xblock videos
 2018-09-11 15:44:32 -04:00
Cory Lee
88e32c57b2 Merge pull request #18914 from edx/bjh/test-PR-messaging 
small change to test PR messaging on deployment
 2018-09-11 14:14:59 -04:00
Awais Jibran
9cec43afb7 Merge pull request #18842 from edx/aj/fix-checklist-for-edge 
Fix edge checklist 500 error.
 2018-09-11 23:05:41 +05:00
Calen Pennington
9c32073e9b fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-11 13:56:05 -04:00
Ben Holt
7f11a8bfa1 small change to test PR messaging on deployment 2018-09-11 13:41:22 -04:00
Qubad786
71e40eb798 dont stop loading on pause 2018-09-11 19:33:25 +05:00
muhammad-ammar
d23e8a3ed8 fix poster display issue with hls 
EDUCATOR-2606
 2018-09-11 19:33:25 +05:00
Farhanah Sheets
fa9c4ca31d Merge pull request #18910 from edx/fsheets/recommender-3 
Bump RecommenderXBlock version
 2018-09-11 10:25:33 -04:00