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

8204 Commits

Author SHA1 Message Date
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
Michael Roytman
41f6bbbb97 Merge pull request #18466 from edx/mroytman/EDUCATOR-3026-add-links-to-course-checklist 
pass relevant links to studio-frontend checklist
 2018-06-28 10:37:08 -04:00
Douglas Hall
db22939193 Add OAuth2 Scopes and Filters to JWTs. 2018-06-28 10:30:09 -04:00
Qubad786
c444a51af8 Resolve transcript migrations issues resulted from running it on stage 2018-06-28 18:47:40 +05: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
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
Michael Roytman
d6a3ce9b67 pass relevant links to studio-frontend checklist 2018-06-26 15:34:25 -04:00
rabiaiftikhar
c6ce34314c EDUCATOR-3055 clear the enrollment date fields for the rerun of the course 2018-06-26 15:27:02 +05:00
Michael Roytman
7748a0fbd4 Merge pull request #18460 from edx/mroytman/fix-missing-checklist-stylesheets 
add missing stylesheets from studio-frontend
 2018-06-25 17:38:22 -04:00
Michael Roytman
c25faeb660 add missing stylesheets from studio-frontend 2018-06-25 16:50:26 -04:00
Qubad786
aa2afd8c0b Video status improvements 2018-06-25 20:43:21 +05:00
Qubad786
c7c2f808e7 Add a field to transcript migration data model to track number of runs 
include command run tracking information in logging
 2018-06-25 20:42:23 +05:00
Qubad786
5b49f17dfe migrate video transcripts for both published and draft structure 2018-06-25 16:16:59 +05:00
Qubad786
6f5fa33d97 Fix celery chord issues, improve logging for splunk reports generations. 2018-06-25 16:16:59 +05:00
Michael Roytman
f0b18a7a2d first attempt at adding checklists to tools dropdown in studio 2018-06-21 17:17:30 -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
Farhanah Sheets
f4ebe13015 Merge pull request #18422 from edx/fsheets/sfe-headings-fix 
Fix for header level in new SFE pages
 2018-06-21 10:58:54 -04:00
Robert Raposa
59d0ada7aa Use EnsureJWTAuthSettingsMiddleware middleware. 2018-06-21 09:30:15 -04:00
Farhanah Sheets
9087cd4a09 Fix for header level in new SFE pages 2018-06-20 15:28:16 -04:00
Ayub-khan
aa4fcdd84f Merge pull request #18418 from edx/update-translations-20-june 
translations update
 2018-06-20 22:12:30 +05:00
ayub-khan
17e78d85c1 -updated-translations 2018-06-20 21:32:16 +05:00
Dennis Jen
9b228ada89 Add Checklists to new page and to course outline view 2018-06-19 17:25:41 -04: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
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
Nimisha Asthagiri
8db2dd47dd Course Validation and Course Quality APIs 2018-06-13 20:33:45 -04:00
Calen Pennington
9a70ca78a5 Merge pull request #18340 from cpennington/fix-studio-xblock-rendering 
Fix studio xblock failing renders (due to asset hashing loop)
 2018-06-13 15:58:34 -04:00
Sylvia Pearce
02b29d4bde Update export page to have same text as import page 2018-06-13 12:04:22 -04:00
Calen Pennington
b735a127b9 Fix assorted linting errors 2018-06-13 10:00:13 -04:00
Calen Pennington
5a5b73dcfa Load xblock resources into studio *before* the corresponding xblock html 2018-06-13 10:00:11 -04:00
Calen Pennington
8b35756699 Fix studio xblock failing renders (due to asset hashing loop) 2018-06-07 15:52:26 -04:00
Calen Pennington
be3c7e05c5 Reapply "Switch container factory to webpack" 
This reverts commit 18d93b00ba.
 2018-06-07 15:52:05 -04:00
Calen Pennington
18d93b00ba Revert "Switch container factory to webpack" 2018-06-07 13:46:47 -04:00
Qubad786
9f820c9e71 Fix tests 2018-06-07 15:57:45 +05:00
Qubad786
981be5db57 Fix migrations of external video component transcripts and beautify/refatoring 2018-06-07 15:57:45 +05:00
irfanuddinahmad
2146d7219c fixed migrate command's aws settings issues 2018-06-07 15:57:45 +05:00
Calen Pennington
f7038db3a3 Merge pull request #18290 from cpennington/switch-container-factory-to-webpack 
Switch container factory to webpack
 2018-06-06 14:42:57 -04:00
Brian Mesick
3eb5e432e5 Merge pull request #18322 from edx/bmedx/remove_sessionauthenticationmiddleware 
Remove SessionAuthenticationMiddleware from INSTALLED_APPS
 2018-06-06 14:09:20 -04:00
Calen Pennington
ec8d4cea29 Fix errant javascript test 2018-06-06 12:52:12 -04:00
Calen Pennington
0abe75a7c6 Re-apply the changes to convert XBlocks to Webpack 
Reapplies edx/edx-platform#17509

This reverts commit 0f7e2373d0.
 2018-06-06 12:52:12 -04:00
Michael Youngstrom
f4dc2ca000 Merge pull request #18314 from edx/youngstrom/remove_django_18_shim 
Remove temp django upgrade logic
 2018-06-06 11:09:17 -04:00
bmedx
2ca632aec9 Remove SessionAuthenticationMiddleware from INSTALLED_APPS 
It is always on now, and this is just a deprecated stub which will be
removed in Django 2.0.
 2018-06-06 10:47:57 -04:00
Tyler Hallada
1f42d1b384 Merge pull request #18316 from edx/thallada/PLAT-1524-on-delete 
PLAT-1524: Add on_delete kwarg to ForeignKey & OneToOneFields
 2018-06-06 10:38:15 -04:00
Michael Youngstrom
26b4e30833 Remove django 1.8 shim 2018-06-06 10:34:56 -04:00
Tyler Hallada
1540f9ec72 Add on_delete kwarg to ForeignKey & OneToOneFields 
Django 2.0 will make this field required for `ForeignKey` and `OneToOneFields`.
In previous versions the option defaulted to `models.CASCADE` when not
specified. This change should make the deprecation warnings in the current
Django version go away.

The migrations where also modified, but the changes should not cause a change in
the database schema since `models.CASCADE` was already the old default.
 2018-06-05 17:05:12 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g 
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
 2018-06-05 13:59:09 -04:00
Giulio Gratta
56ac149962 Add custom HTML to Course About page sidebar 
This allows course staff to add arbitrary HTML to the sidebar on the About page.

A waffle switch has been added in the course_experience app to allow enabling and disabling of this feature.
 2018-06-01 14:26:05 -04:00
Zia Fazal
90633c0956 Merge pull request #17974 from edx/ziafazal/WL-1239 
WL-1239: Ability to gate section based on completion percentage
 2018-05-30 12:52:43 +05:00
Zia Fazal
53cf5638b6 added radio input fields to pre-requisite selection 
Initial changes to gate section based on completion percentage

code refactoring and added evaluation of completion milestone

Fixed broken unit tests and added new tests

Fixed broken tests and quality violations

Fixed Pep8 violation

Fixed eslint quality violations

Test changes as suggested by reviewer

changes after feedbacy from reviewer

Update the docstring with suggested changes

excluding chapter from the blocks

Disallow empty values for min score and min completion

Changes afte feedback from UX/Accessibility

removed blank line
 2018-05-30 11:25:59 +05:00