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

17388 Commits

Author SHA1 Message Date
zubair-arbi
2ac544caeb Update account settings page for enterprise learners 
ENT-762
 2017-12-08 15:40:18 +05:00
Harry Rein
4c352e2f2b Merge pull request #16472 from edx/HarryRein/course-run-selection-dashboard 
Allow users to fulfill entitlements and change enrollments from the course dashboard.
 2017-12-07 16:39:04 -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
McKenzie Welter
5d1eecd43c python tests, quality, and html element type fix 2017-12-07 13:50:24 -05:00
Albert St. Aubin
28837c020f Allowing a user to fulfill their entitlement on the course dashboard. 
The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the course dashboard.
 2017-12-07 12:41:12 -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
Jeremy Bowman
df63e311d0 Merge pull request #16818 from edx/jmbowman/PLAT-1372 
PLAT-1372 Remove dead templates copying old admin HTML
 2017-12-07 10:26:31 -05:00
John Eskew
b14d2e9cf7 Fix video transcript model import before Django initialization occurs. 2017-12-07 09:56:44 -05:00
ayub-khan
96984aa3a4 updated translations 7 dec 2017-12-07 17:17:16 +05:00
Jeremy Bowman
3fe6ba59bc PLAT-1372 Remove dead templates copying old admin HTML 2017-12-06 17:11:52 -05:00
sandroroux
f365aa9b6a Deleted waffle-based tests. 2017-12-06 16:20:47 -05:00
Eric Fischer
35611e81ec Merge pull request #16769 from edx/dahlia/zendesk_proxy_client 
Zendesk proxy client
 2017-12-06 15:47:01 -05:00
Jeremy Bowman
0974e5b055 Merge pull request #16812 from edx/jmbowman/PLAT-1749 
PLAT-1749 Support Django 1.10+ CSRF tokens
 2017-12-06 15:31:16 -05:00
Eric Fischer
8743cda0d6 Zendesk Proxy 
This change creates a new lms/cms endpoint which accepts unauthenticated
requests to securely create zendesk tickets. This allows javascript code to
create tickets without exposing ZENDESK_OAUTH_ACCESS_TOKEN

EDUCATOR-1889
 2017-12-06 13:32:44 -05:00
Jeremy Bowman
19709cd36f PLAT-1749 Support Django 1.10+ CSRF tokens 2017-12-06 13:18:00 -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
AlasdairSwan
98b391a278 Merge pull request #16805 from edx/alasdair/LEARNER-3128-sequence-list-role-presentation-a11y-update 
LEARNER-3128 add role=presentation to sequence nav list items
 2017-12-06 11:16:46 -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
AlasdairSwan
acab64be4d LEARNER-3128 add role=presentation to sequence nav list items 2017-12-06 08:38:56 -05:00
John Eskew
0a341cf526 Merge pull request #16775 from edx/jeskew/test_migrations_in_d111 
Fix warnings/errors in Django 1.10
 2017-12-05 17:37:18 -05:00
Jeremy Bowman
54d14098c0 PLAT-1427 Adapt to build_attrs change in Django 1.11 2017-12-05 17:29:35 -05:00
edx-pipeline-bot
740268c668 Merge pull request #16792 from edx/release-mergeback-to-master 
Merge release back to master
 2017-12-05 17:02:08 -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
Diana Huang
366d0e1400 Fix more registration form bugs. 2017-12-05 11:10:35 -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
571be1f543 Merge pull request #16779 from edx/LEARNER-3399 
Learner-3399 fix for certificates
 2017-12-05 18:03:18 +05:00
Asad Iqbal
14cb287ed0 Merge pull request #16665 from edx/asadiqbal08/ENT-751 
[ENT-751] Update the SailThru var with Enterprise learner information
 2017-12-05 15:03:08 +05:00
ayub-khan
1b774d15aa -Allow staff to preview certificates before course end 2017-12-05 13:57:46 +05:00
Ayub khan
3fc45dcdba Merge pull request #16718 from edx/Update_translations_30_Nov 
updated translations
 2017-12-05 12:29:39 +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
Diana Huang
141bee3290 Merge pull request #16761 from edx/diana/hide-optional-fields-checkbox 
LEARNER-3406: Fix registration fields bugs.
 2017-12-04 13:14:15 -05:00
Eric Fischer
c08010e5db Merge pull request #16643 from edx/efischer/EDUCATOR-1773_revert 
EDUCATOR-1773 resolution
 2017-12-04 13:12:34 -05:00
asadiqbal
390c5368db Update the SailThru var with Enterprise learner information 2017-12-04 22:33:56 +05:00
Waheed Ahmed
bcccd48871 Merge pull request #16625 from edx/waheed/LEARNER-3206-dates-mobile-fragment-changes 
Course dates mobile fragment improvements.
 2017-12-04 22:14:57 +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