Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
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
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
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
Hamza Munir
97106e78b3 Account Page refreshes on autosave/combobox Language value change 
Passing the next field id to focus the next field automatically after the page
reload due to the language selection.

LEARNER-3832
 2018-09-18 14:47:19 +05: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
Squirrel18
7533fe92e1 Add dir attribute for xblock RTL support. 2018-09-17 11:07:40 -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
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
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
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
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
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
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
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
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
bmedx
405a8ada59 Add admin UI to cancel pending retirements 2018-09-10 16:37:13 -04:00
Robert Raposa
71161b8eda Merge pull request #18879 from edx/revert-revert-18861-robrap/ARCH-223-replace-request-cache 
ARCH-223: Revert the revert of Replace Request Cache
 2018-09-08 16:30:37 -04:00
Robert Raposa
ba4cc62ff8 Retire deprecated RequestCache (Take 2) 
ARCH-223
 2018-09-08 15:09:28 -04:00
Braden MacDonald
b603f3cf60 Merge pull request #18856: Convert DATA_DIR to a Path object 2018-09-07 15:26:31 -07:00
Alex Dusenbery
34199d9e98 Don't join to auth_user when getting verified user ids; use them in a set and not a list. 2018-09-07 11:59:46 -04:00
Brandon Baker
88c47561f2 Merge pull request #18885 from edx/bbaker/fix-pathway-eventing 
Fix event tracking for pathway buttons.
 2018-09-07 11:53:52 -04:00
Stuart Young
0dd13fad1b add paver timeout decorator and npm installation logs 2018-09-07 08:46:04 -04:00
Bill Filler
e14f70035e Merge pull request #18888 from edx/bfiller/journal-frontend-config 
Support for separate Journals frontend app
 2018-09-06 15:14:12 -04:00
Bill Filler
a8b1fee847 Add support for Journals frontend app 2018-09-06 14:20:45 -04:00
Michael Youngstrom
bc1d883e1a Dont let DarkLangConfig cache interfere with other tests 2018-09-06 10:33:54 -04:00
Brandon Baker
07ef68ef09 Fix event tracking for pathway buttons. 
Switches to tracking pathway_uuid to match the original event proposal.

LEARNER-6087
 2018-09-05 12:30:16 -04:00
rabiaiftikhar
f3cc1d83fc EDUCATOR-3385 fix attribute error in discussion response notification 2018-09-04 23:10:57 +05:00
Qubad786
89925a96dc use waffle_flags from video pipeline and fix tests 2018-09-04 19:07:03 +05:00
muhammad-ammar
809175d4cf add support to enable/disable hls as primary playback 
EDUCATOR-2714
 2018-09-04 19:07:03 +05:00
Brandon Baker
565670323d Merge pull request #18851 from edx/bbaker/reveal-industry-pathways 
Reveal industry pathways in program details sidebar
 2018-09-04 09:30:13 -04:00
David Ormsbee
ebbd262710 Modify forum roles query for Aurora performance. 
This is a fix for the performance issues in EDUCATOR-3374

AWS's Aurora backend for MySQL selects the wrong index on the
django_comment_client_role_users table, leading to performance issues.
This commit replaces that join with individual requests for permissions
for each role (of which there may be several for any given user).
It's dumber SQL, but Aurora will do the right thing.
 2018-08-31 16:34:53 -04:00
Brandon Baker
171e95f904 Reveal professional pathways in program sidebar. 
Professional pathways are referred to as industry pathways in the code
to help differentiate them from professional certificate programs.
 2018-08-31 12:57:50 -04:00
Alex Dusenbery
e707804670 Revert "EDUCATOR-3374 | Hacky query to fix inline discussions performance." 
This reverts commit 4a1caf6c03.
 2018-08-30 16:40:49 -04:00
Nimisha Asthagiri
ad5ed57160 Revert Quality fixes 2018-08-30 16:33:03 -04:00
Nimisha Asthagiri
4ca165f690 Revert "ARCH-223: Retire deprecated RequestCache." 2018-08-30 16:33:03 -04:00
Nimisha Asthagiri
8459982512 Merge pull request #18847 from edx/robrap/ARCH-223-replace-request-cache 
ARCH-223: Retire deprecated RequestCache
 2018-08-30 12:59:49 -04:00
Guruprasad Lakshmi Narayanan
a21d9bf381 Convert DATA_DIR to a Path object when fetching from ENV_TOKENS 
This fixes the exceptions raised by code that expects it to be a Path
object. For instance, the LMS sysadmin dashboard courses page expects
DATA_DIR to be a Path object and throws a 500 Internal Server error if
it isn't.
 2018-08-30 22:00:42 +05:30
Robert Raposa
3df339a56a Retire deprecated RequestCache. 
ARCH-223
 2018-08-30 08:55:19 -04:00
Alex Dusenbery
4a1caf6c03 EDUCATOR-3374 | Hacky query to fix inline discussions performance. 2018-08-29 20:17:54 -04:00
Rabia Iftikhar
39a4a396a8 Merge pull request #18834 from edx/ri/EDUCATOR-3030-donot-submit-completion-grader-response 
EDUCATOR-3030 don't submit completion for grader's response while updating problem score.
 2018-08-29 22:32:04 +05:00
rabiaiftikhar
72cba77bbb EDUCATOR-3030 donot submit completion for grader's response while updating problem score. 2018-08-29 16:04:28 +05:00
Jeremy Bowman
f2626c0d70 TE-2646 Use headless Chrome for a11y tests 2018-08-28 17:26:26 -04:00