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

8885 Commits

Author SHA1 Message Date
Cliff Dyer
ca46bfcf06 Merge pull request #16688 from open-craft/cornwell/rest-endpoint 
MCKIN-5896 - Create a REST endpoint for batch-uploading offline completions.
 2017-12-18 11:37:24 -05:00
Saleem Latif
86da9c1c63 Disable linking of personal accounts to enterprise customers via SSO 2017-12-18 15:12:42 +05:00
Nimisha Asthagiri
7fda9bd60c Merge pull request #16859 from open-craft/tomaszgy/completion_in_blocks_api_read_1 
Bump READ_VERSION of BlockCompletionTransformer to 1
 2017-12-15 13:32:03 -05:00
rabia23
dbd0468a6e EDUCATOR-1930 resolve Integrity Error exception in set score method for student module table's duplicate entry 2017-12-15 16:57:10 +00:00
Michael Cornwell
fae695884b Added urls and built endpoint. 2017-12-14 16:40:15 -06:00
Albert (AJ) St. Aubin
8c205ad84c Merge pull request #16877 from edx/aj/LEARNER-2668_api_changes 
Entitlement API Changes to support User Revoke and Refund
 2017-12-14 07:16:01 -05:00
Albert St. Aubin
1d7443221d Entitlement API Changes to support User Revoke and Refund 
[LEARNER-2668]

These changes will support a user intiated Revoke and Refund of
an Entitlement. This includes unenrolling the User from
any related Course Runs they are currently enrolled in.
 2017-12-13 13:37:14 -05:00
Tomasz Gargas
73f86006f7 Bump READ_VERSION of BlockCompletionTransformer to 1. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2017-12-13 17:11:36 +01:00
Nimisha Asthagiri
c1d0252999 Merge pull request #16674 from open-craft/tomaszgy/completion_in_blocks_api 
Add block completion value as optional field in course_blocks.api.
 2017-12-13 10:38:36 -05:00
Bill Filler
dd4d13af5f Merge pull request #16611 from edx/afzaledx/WL-1219 
Added extended profile fields to the Account settings page.
 2017-12-13 08:48:06 -05:00
Ahsan Ulhaq
50c8a80f32 Show white listed ceretificates on progress page 
White listed certificates should appear on the progress page
even if the user has not passed the course
LEARNER-3546
 2017-12-13 10:06:37 +05:00
Tomasz Gargas
64c4ae4a7a Add block completion value as optional field in course_blocks.api. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2017-12-12 14:22:10 +01:00
noraiz-anwar
e7c0f36148 temporary logs to check if anonymous user is accessing courseware 2017-12-12 12:25:17 +05:00
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
Afzal Wali
f589dc9d29 WL-1219 
Added extended profile fields to the Account settings page.
 2017-12-11 18:42:59 +05:00
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