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

18336 Commits

Author SHA1 Message Date
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
Feanil Patel
4e76a5d025 Merge pull request #18462 from edx/feanil/remove_beacon 
Get rid of all code related to the CDN Experiments.
 2018-06-26 10:47:38 -04:00
Squirrel18
4f12be0894 Files changed by modernize and new gitignore type file. 2018-06-25 17:27:51 -05:00
Feanil Patel
cd47b28339 Get rid of all code related to the CDN Experiments. 
These were very early experiments by the old performance team
on using CDNs for videos and logging performance data.  No one
is looking at this data and it's just extra cruft on every page.
 2018-06-25 18:03:33 -04:00
Matt Tuchfarber
aab971ed7e Merge pull request #18419 from edx/tuchfarber/fix_program_course_order 
Change program's course runs to be oldest with open enrollment
 2018-06-25 15:37:04 -04:00
Noraiz Anwar
18f0c59f1a Merge pull request #18436 from edx/noraiz/EDUCATOR-2773 
add delay in score recalculation on enrollment update
 2018-06-25 22:06:30 +05:00
Michael Terry
fd33130d73 Add initial grade signaling 
Tells the Credential service about user grades when a cert is awarded
or a grade for a course with an awarded cert changes.

LEARNER-5051
 2018-06-25 11:42:08 -04:00
Alessandro Roux
32649f91d5 Merge pull request #18440 from edx/roux/multiple-toolbars 
EDUCATOR-3042: Fixes bug where inline discussion's comment editor has multiple toolbars.
 2018-06-25 09:49:30 -04:00
Hamza Munir
46ea7834d5 Adjust default of Course Landing Experience to use expected platform defaults 
Setting defaults for waffle flags to true.
default=true for use_bootstrap in discussions app
default=true for show_achievements in learner profile app

LEARNER-5509
 2018-06-25 15:13:39 +05:00
noraiz-anwar
06780b2ded add delay in score recalculation on enrollment update 2018-06-25 14:59:09 +05:00
irfanuddinahmad
a46a28e983 incorporated manual verification 2018-06-25 12:08:54 +05:00
sandroroux
92bd1648ee Fixes EDUCATOR-3042. 2018-06-22 16:41:33 -04:00
Usman Khalid
8b1aad080a Add complete on view support to render_xblock view. 2018-06-22 14:46:03 -04:00
Matthew Piatetsky
5b167e6b1f Merge pull request #18439 from edx/add_forum_roles_to_metadata 
add forum roles to metadata
 2018-06-22 13:17:30 -04:00
Matthew Piatetsky
95ccc30594 add forum roles to metadata 2018-06-22 12:49:10 -04:00
Ned Batchelder
a570eb500b Use context help in the LMS for Open edX 2018-06-22 11:10:57 -04:00
Albert (AJ) St. Aubin
85ab2e4036 Merge pull request #18443 from edx/LEARNER-5275 
Update the entitlement fulfilment logic to work with enrollment end
 2018-06-22 09:59:36 -04:00
Albert St. Aubin
06af818322 Update the entitlement fulfilment logic to work with enrollment end 
[LEARNER-5275]

Update the endtitlement fulfillment logic to work for users who have
enrolled, enrollment window has closed, but upgrade window is still
open. These users should be able to use that enrollment on their course
run that they are enrolled in.
 2018-06-22 07:48:35 -04:00
J Eskew
fe82954835 Merge pull request #18397 from edx/jeskew/perpare_hawthorn_retirement_states 
Use correct default user retirement states.
 2018-06-21 15:35:59 -04:00
J Eskew
df16836a8f Merge pull request #18427 from edx/jeskew/fix_some_deprecation_warnings 
Fix some deprecation warnings.
 2018-06-21 12:24:19 -04:00
John Eskew
b94ea6b4b1 Import XBlockMixin from the correct location. 2018-06-21 11:41:06 -04:00
Robert Raposa
be22529028 Merge pull request #18434 from edx/robrap/clean-up-imports 
Remove unused imports.
 2018-06-21 10:46:28 -04:00
Robert Raposa
59d0ada7aa Use EnsureJWTAuthSettingsMiddleware middleware. 2018-06-21 09:30:15 -04:00
Robert Raposa
92283a33b9 Remove unused imports. 2018-06-21 08:55:23 -04:00
Matt Tuchfarber
1eb4d21350 Change program's course runs to be oldest with open enrollment 
Currently the program page shows the newest course run, but
in cases where there is a new run created prior to the old one closing,
we want to show the almost closing one instead.
 2018-06-20 13:28:01 -04:00
ayub-khan
17e78d85c1 -updated-translations 2018-06-20 21:32:16 +05:00
christopher lee
939c7f4857 Set max page size for get courses 2018-06-19 15:39:50 -04:00
christopher lee
48b5485be1 Set max page size for get courses 
LEARNER-5566
 2018-06-19 13:07:04 -04:00
John Eskew
dd688d508a PLAT-2193: Use correct default user retirement states. 2018-06-18 17:17:33 -04:00
Braden MacDonald
b12346f390 Merge pull request #18170 from open-craft/eugeny/instructor_report_popup_backend 
Answers report: Return task ID and generated filename for frontend to consume
 2018-06-18 13:26:27 -07:00
Jeff LaJoie
b07374ed39 LEARNER-5050: Adds award course cert job to post to Credentials 2018-06-18 08:54:58 -04:00
Eugeny Kolpakov
d058aacca9 Return task ID and generated filename from backend 2018-06-17 17:22:12 +08:00
Eric Fischer
e72549cdbe Revert "Merge pull request #18340 from cpennington/fix-studio-xblock-rendering" 
This reverts commit 9a70ca78a5, reversing
changes made to efd5b9abbd.

Hopefully fixes EDUCATOR-3053
 2018-06-15 13:18:27 -04:00
uzairr
e77a19a4a3 Update UTM params of social sharing buttons 
To improve Customer experience small changes have done in the
Google Analytics so that incoming stats are organized efficiently.

LEARNER-5360
 2018-06-14 12:38:01 +00:00
Awais Jibran
d7e29c210e Merge pull request #18354 from edx/EDUCATOR-3004/add-10s-delay 
Add 10 seconds delay to avoid exception
 2018-06-14 12:55:55 +05:00
Nimisha Asthagiri
62266fd936 Merge pull request #18325 from edx/hack/course-validation-api 
Course Validation and Course Quality APIs
 2018-06-13 21:33:22 -04:00