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

19868 Commits

Author SHA1 Message Date
Farhanah Sheets
e009d5e4db bump studio-frontend to 1.16.12 and update bokchoy tests 2018-10-03 09:36:55 -04:00
John Eskew
aacdce17d4 Check for retired usernames as well as existing ones in validation. 2018-10-02 17:23:11 -04:00
Robert Raposa
4a0bda7690 Merge pull request #18988 from edx/robrap/ARCH-238-login-redirect 
ARCH-238: Add ability to redirect to subdomain for login.
 2018-10-02 16:34:13 -04:00
Robert Raposa
23b9cfd76c Add whitelist for login redirect. 
Use LOGIN_REDIRECT_WHITELIST to provide a whitelist of
additional domains to which login will now redirect.

ARCH-238
 2018-10-02 16:00:55 -04:00
J Eskew
873eb40896 Revert "Check for username retirement in validation endpoint." 2018-10-02 11:10:21 -04:00
J Eskew
8dc4900eb0 Merge pull request #18990 from edx/jeskew/PLAT_2146_add_username_retirement_check 
Check for username retirement in validation endpoint.
 2018-10-01 15:04:46 -04:00
John Eskew
fba2a8b5dc Check for retired usernames as well as existing ones in validation. 2018-10-01 11:00:19 -04:00
Ahsan Ulhaq
ee7555e85f update usage of SessionAuthenticationAllowInactiveUser 
LEARNER-6469
 2018-10-01 17:52:52 +05:00
Matthew Piatetsky
ed6b27ff83 Merge pull request #19007 from edx/bundles_on_track_selection 
bundles on track selection
 2018-09-28 08:26:35 -04:00
Ned Batchelder
f2dac46681 Merge pull request #18475 from appsembler/omar/ace-enroll-email 
Convert instructor email messages to ACE
 2018-09-27 16:44:08 -04:00
Matthew Piatetsky
30c14b36ba bundles on track selection 2018-09-27 14:45:32 -04:00
Diana Huang
deb8bd47d9 Switch existing tests to use the newer endpoint. 2018-09-27 13:33:42 -04:00
Omar Al-Ithawi
6ff3235f84 Convert instructor email messages to ACE 2018-09-25 17:51:10 +03:00
Nimisha Asthagiri
0a88746aef Merge pull request #18980 from edx/arch/jwt-http-cookies 
Refactor Login Cookies
 2018-09-25 09:46:37 -04:00
Nimisha Asthagiri
b7deedfb36 Refactor Login Cookies 2018-09-25 09:12:08 -04:00
Stu Young
a531953543 Merge pull request #18984 from edx/testeng/bokchoy_auto_cache_update_5f06ea40003105ed26d042509c33f30d67aa5e6e 
Bokchoy db cache update
 2018-09-24 15:16:08 -04:00
edx-pipeline-bot
007869836c Merge pull request #18995 from edx/private_to_public_7a92944 
Mergeback PR from private to public.
 2018-09-24 12:07:56 -04:00
edx-cache-uploader-bot
5ca3418d9f Updating migrations 2018-09-24 11:54:27 -04: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
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
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
Michael Youngstrom
e614b96082 Refactor PipelineRenderTest to avoid npm install 2018-09-18 10:08:00 -04:00
Peter Pinch
b43f2242ad more descriptive error messages for UndefinedVariable 2018-09-17 17:14:25 -04:00
Ned Batchelder
6a48195908 No need to keep self.tracker here 2018-09-17 16:48:14 -04:00
Agha Awais
dd610ac3e4 HTML editor bokchoy tests I 2018-09-17 08:21:52 +00: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
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
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
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
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
Calen Pennington
461f35255c fixup! Load all webpack chunks into fragments as correctly-typed resources 2018-09-12 21:54:19 -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
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
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
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
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
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
asadazam93
0ec8e38422 Fixed download transcript 500 error 2018-09-11 16:04:35 +05:00