Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
Douglas Hall
ede8ee4a5b Fix optional registration fields toggle. 
We need to account for optional fields that may get rendered
as hidden input elements due to the configuration of the
registration form when deciding whether or not to display
the optional registration fields toggle checkbox.

ENT-796
 2017-12-11 16:14:18 -05:00
Michael Terry
15d80c7bb3 Merge pull request #16854 from edx/mikix/LEARNER-3504 
Show related programs when unenrolled
 2017-12-11 16:12:12 -05:00
Harry Rein
c734058cd7 Merge pull request #16862 from edx/HarryRein/temp-patch-dashboard-entitlements 
Load popper and bootstrap through a script tag to reduce stage flakiness
 2017-12-11 15:16:00 -05:00
Michael Terry
25076e6a92 Show related programs when unenrolled 
On the course dashboard, show related programs to your course
even if you are not enrolled in a current session.

LEARNER-3504
 2017-12-11 14:52:36 -05:00
Brian Mesick
98456e11a1 Merge pull request #16840 from edx/bmedx/django111_conditional_birdcage 
Make all uses of birdcage conditional, should fix 1.11 errors
 2017-12-11 14:51:48 -05:00
Harry Rein
a9a255e3c8 Load popper and bootstrap through a script tag to reduce flakiness on stage. 2017-12-11 13:23:29 -05:00
David Ormsbee
8844f9662b Merge pull request #16850 from edx/ormsbee/remove_old_lms_cms_envs 
Remove old Preview config files (not used).
 2017-12-11 13:22:39 -05:00
bmedx
2579785a54 Make all uses of birdcage conditional, should fix 1.11 errors 2017-12-11 13:21:06 -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
jaebradley
1736371b6c add analytics api env variables 
use auth tokens instead of env tokens

use default values from common
 2017-12-11 09:23:21 -05:00
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
f63cf61a9d cleanup regex 2017-12-08 14:39:02 -05:00
Eric Fischer
5bc6b31e29 eslint --fix 2017-12-08 14:38:41 -05:00
Michael Frey
e0112d18e3 Merge pull request #16842 from edx/HarryRein/popover-styling 
Fix styling on the popover.
 2017-12-08 14:18:28 -05:00
David Ormsbee
3e09b2d09d Remove old Preview config files (not used). 2017-12-08 13:43:32 -05:00
Sofiya Semenova
b4a4318d1a Merge pull request #16705 from edx/sofiya/1552 
Educator 1552 Implement roving tabindex for WYSIWYG editor for discussions
 2017-12-08 13:24:07 -05:00
Diana Huang
8752480aac Merge pull request #16829 from edx/diana/registration-form-improvements 
LEARNER-3469 - More registration form cleanup.
 2017-12-08 13:00:20 -05:00
Harry Rein
2162b966d0 Fix styling on the popover. 2017-12-08 12:28:06 -05:00
Sofiya Semenova
a1f0679f3a Educator 1552 - Implement roving tabindex for WYSIWYG editor for discussions 2017-12-08 11:18:11 -05:00
Diana Huang
0ecc0558a3 More registration form cleanup. 2017-12-08 09:39:01 -05:00
Waheed Ahmed
3ed08e3b35 Implement journeys app banner. 
Banners will enable the deep linking functionality for
mobile apps.

LEARNER-2731
 2017-12-08 18:33:47 +05:00
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
mrey
033645758d Use single quotes on aws.py 2017-12-07 08:54:55 +01: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