Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,790 Commits 1 Branch 0 Tags
cf6e2d9f894dd2aa6c367bda02fd9f9e4784bba4
Commit Graph

18376 Commits

Author SHA1 Message Date
Ayub-khan
cf6e2d9f89 Merge pull request #18469 from edx/LEARNER-4384 
LEARNER-4384 Update intructor unenroll task
 2018-07-13 09:53:16 +05:00
Robert Raposa
4d8b9c36ae Revert "Upgrade DOT to 1.1.2." 
There was an issue with migrations on sandboxes.

This reverts commit 58f6e92
 2018-07-12 14:45:39 -04:00
Robert Raposa
c0de877266 Merge pull request #18532 from edx/robrap/upgrade-dot 
Upgrade DOT to 1.1.2 and add paver warning.
 2018-07-12 12:02:41 -04:00
ayub-khan
d0d3e3427e Updated intructor unenroll 
If student is in refund window, refund student,
update mode to audit, and set is_active false. if
student is not in refund window, do not refund student
do not change mode, and set is_active to false.
If professional do not change mode after refund just
change is_active to false.

-
 2018-07-12 16:01:12 +05:00
Mushtaq Ali
12011bf191 Change default content filter to include only courses 
- ENT-1070
 2018-07-12 13:01:58 +05:00
Robert Raposa
58f6e92522 Upgrade DOT to 1.1.2. 2018-07-11 17:36:56 -04:00
Marco Morales
464b364c70 Merge pull request #18552 from edx/marco/learner-profile/learner-menu-styling 
updated vertical alignment for learner profile menu
 2018-07-11 10:46:10 -04:00
Uzair Rasheed
edfdbc7aee Merge pull request #18482 from edx/LEARNER-5257/update-sailthru-audit-purchase 
Update sailthru audit purchase calls
 2018-07-11 12:01:22 +05:00
Kevin Falcone
069307c925 Update token expiration for DOT tokens 
This will retire a refresh token and access token pair in the DOT tables
if the access token is 6 months expired (prior to that, the refresh
token still works).
 2018-07-10 13:36:48 -04:00
marcotuts
6b876a573a updated vertical alignment for learner profile menu 2018-07-10 12:11:35 -04:00
ayub-khan
bab3802137 updated-translations 2018-07-10 12:56:47 +05:00
ayub-khan
168ba70d96 fix-i18n-issues 2018-07-10 11:00:12 +05:00
Kshitij Sobti
c7f980c9de Add correct answer to response 2018-07-09 23:57:14 +05:30
Kshitij Sobti
491532c2db Update report generation code to include old state for backwards compatibility 
Include report data generated by blocks as columns instead of a json dict
 2018-07-09 23:56:51 +05:30
Awais Jibran
0d5c660d8a Merge pull request #18520 from edx/aj/fix-display-inline-on-course-outline 
Display check-marks inline.
 2018-07-09 22:31:16 +05:00
uzairr
d84d47f32c Update sailthru audit purchase calls 
Currently, there are two purchase calls are occurring for each audit
purchase on sail-thru.To avoid it,code is updated so that a single
call will occur for each purchase.

LEARNER-5257
 2018-07-09 01:09:27 +05:00
Nimisha Asthagiri
8ac2dea0c2 Merge pull request #18501 from edx/arch/remove-course-structures-part3 
Remove course_structures app (part 3)
 2018-07-06 15:14:07 -04:00
Jeremy Bowman
d2f442e19b Merge pull request #18523 from edx/jmbowman/TE-2631 
TE-2631 Fix notes bok-choy tests in devstack
 2018-07-06 12:50:13 -04:00
marcotuts
d7ab8327cb updated header active tab border color 2018-07-06 10:51:57 -04:00
Nimisha Asthagiri
73e8828f65 course_structures: Remove app completely 2018-07-05 13:08:31 -04:00
Jeremy Bowman
c962e7914c TE-2631 Fix notes bok-choy tests in devstack 2018-07-05 11:55:24 -04:00
Jeremy Bowman
127b1049ff Merge pull request #18511 from edx/jmbowman/TE-2630 
TE-2630 Fix discussions bok-choy tests in devstack
 2018-07-05 11:06:38 -04:00
Awais Jibran
41aa1fd426 Display check-marks inline. 
EDUCATOR-3149
 2018-07-05 11:32:39 +05:00
marcotuts
07718b90ab updated subsection styling to show label on same line as icon, meant to complete EDUCATOR-2535 2018-07-04 13:42:44 -04:00
irfanuddinahmad
65ce6f0d4b updated effective date 2018-07-04 15:15:18 +05:00
Jeremy Bowman
b74131a726 TE-2630 Fix discussions bok-choy tests in devstack 2018-07-03 14:33:54 -04:00
Zubair Afzal
831e7621e1 Merge pull request #18508 from edx/zub/ENT-1052-rename-enterprise-customer-catalog-uuid-queryparam 
ENT-1052 Rename enterprise customer catalog uuid in queryparam to catalog
 2018-07-03 18:02:50 +05:00
Nimisha Asthagiri
c1bb585aea Merge pull request #18499 from edx/arch/remove-course-structures-usage 
Remove course_structures app (part 1)
 2018-07-03 08:58:32 -04:00
zubair-arbi
66937b2cdf ENT-1052 Rename enterprise customer catalog uuid in queryparam to catalog 2018-07-03 17:09:56 +05:00
Nimisha Asthagiri
77bf86fb73 Fix unclearly related test failure 2018-07-03 07:37:57 -04:00
Tasawer Nawaz
6a4924f9d4 Merge pull request #18478 from edx/tasawer/LEARNER-4744/inactive-enrollments-in-support-tool 
inactive enrollments in support tool
 2018-07-03 15:55:34 +05:00
Robert Raposa
df94c82a04 Merge pull request #17332 from open-craft/john/improve-search-error-messages 
Improve search error messages
 2018-07-02 16:53:20 -04:00
Nimisha Asthagiri
4a9063d83b course_structures: remove usages 2018-07-02 12:36:34 -04:00
Nimisha Asthagiri
066b24a6a3 CourseStructure: remove from Discussions 2018-07-02 12:32:21 -04:00
Tasawer Nawaz
8868f07394 inactive enrollments in support tool 
LEARNER-4744
 2018-07-02 19:02:43 +05:00
ayub-khan
0ba3d602a1 -updated js translations 2018-07-02 11:33:58 +05:00
Kevin Falcone
9aff2fdf9f Merge pull request #18476 from edx/jibsheet/make-DATA_DIR-configurable 
This resolves VPC-122 and OPS-56
 2018-06-29 12:59:57 -04:00
zubair-arbi
bbdcf6de7a ENT-1052 discount by enterprise catalog 2018-06-29 16:04:06 +05:00
Nimisha Asthagiri
ce4cb53672 Update Permissions to use latest edx-drf-extensions and rest_condition 2018-06-28 18:37:53 -04:00
Nimisha Asthagiri
b203e8a13b Enable OAuth Scopes for Grades API 2018-06-28 18:37:52 -04:00
Nimisha Asthagiri
3a45bab57c Enable OAuth Scopes for Certificates API 2018-06-28 18:37:52 -04:00
Douglas Hall
195676d539 Override DEFAULT_JWT_ISSUER and RESTRICTED_APPLICATION_JWT_ISSUER settings. 2018-06-28 17:10:18 -04:00
Calen Pennington
b85d6f031c Merge pull request #18417 from cpennington/cale/fix-ora-webpack 
Cale/fix ora webpack
 2018-06-28 12:47:53 -04:00
Douglas Hall
2a77710e10 Merge pull request #18429 from edx/douglashall/oauth_scopes_part2 
ARCH-116 OAuth2 Scopes Implementation
 2018-06-28 11:17:17 -04:00
Douglas Hall
db22939193 Add OAuth2 Scopes and Filters to JWTs. 2018-06-28 10:30:09 -04:00
Ned Batchelder
8631b23a86 Merge pull request #18444 from edx/nedbat/restore-context-help 
Use context help in the LMS for Open edX
 2018-06-27 22:35:07 -04:00
Calen Pennington
07a15c681f Reapply the XBlock RequireJS -> Webpack changes 
This reverts commit 105db2cf59, reversing
changes made to 447457594f.
 2018-06-27 22:27:07 -04:00
Kevin Falcone
ae39e6fa85 This resolves VPC-122 and OPS-56 
I'll put it in configuration later, but why didn't we allow this years
ago?  The goal is to store the data dir in /edx/var/edxapp not in
/edx/app/edxapp.
 2018-06-27 15:26:51 -04:00
bmedx
f3a9e508a0 Refactor retirement endpoints to isolate Sailthru and respect boundaries 
- Change retire mailings endpoint to use new USER_RETIRE_THIRD_PARTY_MAILINGS signal, currently only used by Sailthru retirement
- Move USER_RETIRE_MAILINGS signal firing to the LMS misc endpoint
- Remove duplicate clearing of UserOrgTags
- Remove LMS imports in openedx/core and update usage to use new USER_RETIRE_LMS_CRITICAL and USER_RETIRE_LMS_MISC signals
- Add testing for new signal handlers and app registration for the LMS survey app
 2018-06-27 10:23:49 -04:00
Jeremy Bowman
9375bda9ec Merge pull request #18461 from eduNEXT/dqe/Try-out-python-modernize 
Add python-modernize INCR-3
 2018-06-26 10:57:46 -04:00