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

3647 Commits

Author SHA1 Message Date
aghaawais01
f4e4f7c96f bokchoy conversion of advanced settings 2018-07-02 13:56:01 +00: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
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
rabiaiftikhar
c6ce34314c EDUCATOR-3055 clear the enrollment date fields for the rerun of the course 2018-06-26 15:27:02 +05: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
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
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
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
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
Calen Pennington
0f7e2373d0 Revert "Switch container factory to webpack" 2018-05-29 16:01:38 -04:00
Calen Pennington
3315a503b3 Ignore specific non-member pylint errors 2018-05-29 12:28:19 -04:00
Calen Pennington
28166f037c Delete flakey lettuce tests< 2018-05-29 12:21:47 -04:00
Calen Pennington
2895362718 Retry opening advanced settings if it fails the first time 2018-05-29 12:21:47 -04:00
Calen Pennington
3c85de030d Wait for js to finish loading before trying to click on advanced settings 2018-05-29 12:21:47 -04:00
Calen Pennington
d08e199f79 Load XBlocks with webpack rather than RequireJS 2018-05-29 12:19:05 -04:00
Calen Pennington
389f4fcec9 Switch container.js to bundle using webpack 2018-05-29 12:19:05 -04:00
Feanil Patel
82a7106e60 Merge pull request #18259 from edx/feanil/update_rfc6266_parser 
Feanil/update rfc6266 parser
 2018-05-23 13:53:04 -04:00
Feanil Patel
0872d2b591 Move off of our fork onto a published fork of the rfc6266. 
The published fork seems to be getting updates more regularly than the original project
and has the bugfix we forked for.
 2018-05-23 09:28:03 -04:00
Farhanah Sheets
9f0e99d549 Fix test 2018-05-22 09:44:24 -04:00
Douglas Hall
c6ec5edbf7 Add API documentation with django-rest-swagger. 2018-05-08 14:38:33 -04:00
Mushtaq Ali
70dc0eed1c Merge pull request #18118 from edx/mushtaq/rerun-exclude-video-uploads-token 
Exclude video upload token
 2018-05-07 15:55:09 +05:00
Mushtaq Ali
dd8a9b018e Exclude video upload token - EDUCATOR-2532 2018-05-07 15:53:12 +05:00
Mushtaq Ali
f4b1da1f42 Merge pull request #17718 from edx/transcripts-phase-2 
Transcripts phase 2
 2018-05-07 12:42:50 +05:00
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -04:00
Eric Fischer
e18448e27d Silence deprecation warnings 
https://docs.djangoproject.com/en/1.11/releases/1.10/#using-user-is-authenticated-and-user-is-anonymous-as-methods
 2018-05-02 10:03:50 -04:00
muhammad-ammar
1c53360206 basic tab attach uploads with edx_video_id 
EDUCATOR-2761
 2018-05-02 18:25:43 +05:00
muhammad-ammar
c02955d025 add check transcript ajax for edx_video_id 2018-05-02 18:23:46 +05:00
Muhammad Ammar
16b0070982 Merge pull request #17923 from edx/ammar/remove-video-transcript-enabled-flag 
remove video transcript enabled flag
 2018-04-30 17:35:14 +05:00
muhammad-ammar
aaaafee2b2 remove video transcript enabled flag 2018-04-30 15:59:32 +05:00
Feanil Patel
2c7dd7b97c Remove these tests because they are flaky. 
They all rely on modifying the handout which can sometimes fail.
 2018-04-27 10:48:04 -04:00
irfanuddinahmad
bfbeeb1d84 added exception decorator 2018-04-26 16:02:09 +05:00