Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
44,149 Commits 1 Branch 0 Tags
98456e11a1f7eed324f2eaed31aedbcbb266dcaa
Commit Graph

8871 Commits

Author SHA1 Message Date
Eric Fischer
25eb31877b Merge pull request #16843 from edx/why_did_we_not_do_this_sooner 
fix some eslint ish
 2017-12-11 12:08:21 -05:00
Jillian Vogel
b43ac4e80e Merge pull request #16590 from open-craft/jill/video-block-all-sources 
Adds all HTML5 sources to the returned video API data
 2017-12-12 02:19:02 +10:30
Jillian Vogel
cdcb4be077 Adds "all_sources" field to Mobile API and video module Course Blocks 
student_view_data.

Added to both places because the iOS app uses both APIs data to provide
downloadable videos.
 2017-12-11 23:59:52 +10:30
Eric Fischer
5bc6b31e29 eslint --fix 2017-12-08 14:38:41 -05:00
zubair-arbi
2ac544caeb Update account settings page for enterprise learners 
ENT-762
 2017-12-08 15:40:18 +05:00
John Eskew
254aa84f9d Merge pull request #16815 from edx/jeskew/fix_model_import_for_video_transcripts 
Fix video transcript model import before Django initialization occurs.
 2017-12-07 13:58:06 -05:00
Alessandro Roux
f7ea33351b Merge pull request #16809 from edx/discussions/remove-roll-out-waffles 
EDUCATOR-1577: Removed roll-out flags.
 2017-12-07 11:32:08 -05:00
John Eskew
b14d2e9cf7 Fix video transcript model import before Django initialization occurs. 2017-12-07 09:56:44 -05:00
sandroroux
f365aa9b6a Deleted waffle-based tests. 2017-12-06 16:20:47 -05:00
Nimisha Asthagiri
8acf3434c0 Revert "Merge pull request #16728 from edx/pacing/remove-create-schedules-from-course-waffle-flag" 
This reverts commit 8b652ad352, reversing
changes made to b212af2488.
 2017-12-06 11:58:39 -05:00
sandroroux
4d948672cd Brought SiteConfig checks back. 2017-12-06 11:43:29 -05:00
Jeremy Bowman
9b92a3b73a Merge pull request #16800 from edx/jmbowman/PLAT-1427 
PLAT-1427 Adapt to build_attrs change in Django 1.11
 2017-12-06 10:40:57 -05:00
sandroroux
f52f0914fa Removed enable_forum_notifications 2017-12-06 10:12:29 -05:00
sandroroux
b3bbc159a0 Removed discussions.forum_response_notifications and discussions.send_notifications_for_course 2017-12-06 09:29:15 -05:00
Jeremy Bowman
54d14098c0 PLAT-1427 Adapt to build_attrs change in Django 1.11 2017-12-05 17:29:35 -05:00
John Eskew
f5a83d5d6c Fix URLs that generate warnings in Django 1.10. 2017-12-05 16:46:33 -05:00
Jeremy Bowman
811f313c5e Merge pull request #16791 from edx/jmbowman/PLAT-1382 
PLAT-1382 Populate ALLOWED_HOSTS for tests
 2017-12-05 16:36:56 -05:00
Dennis Jen
aca284b744 Remove zendesk access token from support view 2017-12-05 15:35:57 -05:00
Jeremy Bowman
da8cf6b528 PLAT-1382 Populate ALLOWED_HOSTS for tests 2017-12-05 14:22:30 -05:00
Jeremy Bowman
cc6e3219ed Merge pull request #16774 from edx/jmbowman/PLAT-1801 
PLAT-1801 Preserve new user login behavior under Django 1.10+
 2017-12-05 14:16:35 -05:00
Nimisha Asthagiri
7ef443f7ce Update usages to ace_common 2017-12-05 11:38:16 -05:00
Jeremy Bowman
103c723c6d PLAT-1801 Preserve new user login behavior under Django 1.10+ 2017-12-05 10:20:25 -05:00
Awais Jibran
08ca211017 Merge pull request #16782 from edx/aj/fix-unicode-error 
Handle Unicode chars with AlreadyRunningError exception
 2017-12-05 19:43:21 +05:00
Awais Jibran
4431cec4d0 Handle Unicode chars with AlreadyRunningError exception 
Changed AlreadyRunningError to be able to throw unicode error message, in case of accented characters resulted from language translation
EDUCATOR-1730
 2017-12-05 18:13:25 +05:00
ayub-khan
1b774d15aa -Allow staff to preview certificates before course end 2017-12-05 13:57:46 +05:00
Nimisha Asthagiri
e8cb8bba31 Merge pull request #16756 from edx/pacing/log-on-failure 
Schedules: Add celery task logging
 2017-12-04 20:21:41 -05:00
Alessandro Roux
8b652ad352 Merge pull request #16728 from edx/pacing/remove-create-schedules-from-course-waffle-flag 
Dynamic Pacing: Removed references to CREATE_SCHEDULE_WAFFLE_FLAG.
 2017-12-04 16:11:27 -05:00
sanfordstudent
ccf344714e Merge pull request #16763 from edx/sstudent/remove_broken_admin 
remove broken subsection grade override admin
 2017-12-04 14:32:37 -05:00
Nimisha Asthagiri
549f4b661e Schedules: Add celery task logging 2017-12-04 14:16:27 -05:00
sandroroux
4dbb935ca7 Removed references to CREATE_SCHEDULE_WAFFLE_FLAG. 2017-12-04 14:10:29 -05:00
Sanford Student
174d0393fa remove broken subsection grade override admin 2017-12-04 12:02:23 -05:00
Eric Fischer
3312939703 Revert "Merge pull request #16635 from edx/efischer/EDUCATOR-1773" 
This reverts commit 3e9e97e6d8, reversing
changes made to 0d931107aa.
 2017-12-04 11:55:09 -05:00
Jeremy Bowman
067785dbfd Merge pull request #16710 from edx/jmbowman/PLAT-1419 
PLAT-1419 Make edxmako a proper template backend
 2017-12-04 11:07:30 -05:00
Jeremy Bowman
fdc50c3aa8 PLAT-1419 Make edxmako a proper template backend 2017-12-01 17:01:52 -05:00
Tyler Hallada
c397840d74 Merge pull request #16598 from edx/thallada/ret-emulate-request-default-middleware 
Default middleware_classes in emulate_http_request
 2017-12-01 16:33:21 -05:00
Tyler Hallada
fd5c5acc28 Add emulate_http_request contextmanager for tasks 
remove explicit middleware from resolver task

Address Gabe's comment

Add TODO to define middleware_classes in settings
 2017-11-30 16:40:20 -05:00
Brian Mesick
3951b7527c Merge pull request #16658 from edx/bmedx/django111_tag_test_failures_lms_3 
Tag LMS Unit 3 tests that fail in Django 1.11
 2017-11-30 16:14:18 -05:00
Nimisha Asthagiri
7a6805b261 Merge pull request #16714 from edx/pacing/spanish-language-issue 
Schedules: course language -> closest released language
 2017-11-30 10:47:53 -05:00
Nimisha Asthagiri
38cfadeb20 Schedules: convert course language to supported released language 2017-11-29 20:08:33 -05:00
Brian Mesick
167b28302c Merge pull request #16704 from edx/revert-15511-proversity/add-recover-password-endpoint 
Revert "Add recover password endpoint"
 2017-11-29 11:49:15 -05:00
Sofiya Semenova
2fca453fcd Merge pull request #16656 from edx/sofiya/notifications-followup 
Follow-up to email template for forum notifications after testing in stage
 2017-11-29 11:01:13 -05:00
Brian Beggs
845e64cd78 Revert "Add recover password endpoint" 2017-11-29 09:44:10 -05:00
Tasawer Nawaz
8a78daa8c8 update design of support form + form will be shown only to logged in users 
LEARNER-3288
 2017-11-29 10:20:01 +05:00
J. Cliff Dyer
f76a099e2d Skip completion of non-default scorable blocks. 
If a scorable block either has a custom completion strategy, or is
marked as excluded from completion, don't record a completion when its
score is updated.
 2017-11-28 18:04:28 -05:00
Sofiya Semenova
1ef5cf9f7a Preformatted styling for post content 2017-11-28 15:19:17 -05:00
J. Cliff Dyer
b8202e40de Handle default complete-by-viewing completion method. 
* Vertical marks blocks completed when viewed.
* Functionality is hidden behind a waffle switch
* Submissions from front-end are limited to known-incomplete blocks
* Upgrades xblock to version 1.1.1
* Related future requirements listed in TODO tagged with EDUCATOR-1778
  and relevant opencraft OC-* ticket IDs.

OC-3088
 2017-11-28 15:07:06 -05:00
Jose Antonio Gonzalez
93464298e4 Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip] 2017-11-27 10:28:32 -06:00
sanfordstudent
b6d9dfb2ab Merge pull request #16652 from edx/add-persistent-grade-override-table-in-admin 
Add `PersistentSubsectionGradeOverride` table in django admin
 2017-11-27 11:12:34 -05:00
Jeremy Bowman
139fa895d1 Merge pull request #16662 from edx/jmbowman/more_ssencrypt_tests 
Add more ssencrypt tests
 2017-11-27 10:29:41 -05:00
Awais Jibran
baa967ca66 Add PersistentSubsectionGradeOverride table in django admin 
EDUCATOR-1624
 2017-11-27 10:11:57 -05:00