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

44138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Eskew
831eae6255 Merge pull request #16830 from edx/jeskew/remove_double_opaque_keys_req 
Remove added reqs that are already in base.txt.
 2017-12-11 10:58:27 -05:00
John Eskew
a42698a7ed Use a common base req file to avoid tox double requirements. 2017-12-11 10:56:17 -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
Farhanah Sheets
9b3aad31cc Merge pull request #16852 from edx/dahlia/sfe_bump 
Update studio-frontend to 0.6.1
 2017-12-11 09:31:51 -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
Tasawer Nawaz
e7ff0230c6 Merge pull request #16822 from edx/tasawer/learner-3165/fix-error-logging-on-program-certificate-error 
update logging in award program certificate task
 2017-12-11 18:26:16 +05:00
Sven Marnach
02ddf4d321 Merge pull request #16166 from open-craft/smarnach/filter-course-enrollment-allowed 
Add search box to CourseEnrollmentAllowed admin interface.
 2017-12-11 13:57:24 +01:00
Tasawer Nawaz
a6f4f1762b update logging in award program certiicate task LEARNER-3165 2017-12-11 17:16:25 +05:00
Dillon-Dumesnil
bb9e5922e1 Merge pull request #16853 from edx/ddumesnil/xblock 
Removing debugging
 2017-12-08 16:40:45 -05:00
Dillon Dumesnil
a03ce146a0 Removing debugging 2017-12-08 15:35:29 -05:00
Farhanah Sheets
78d61c1ad9 Bump to SFE v0.6.1 2017-12-08 15:08:41 -05:00
Dillon-Dumesnil
e61af093a6 Merge pull request #16846 from edx/ddumesnil/xblock 
Updating xblock-review version to include commit for being more defen…
 2017-12-08 14:57:16 -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
Dillon Dumesnil
aa8b7ab2ec Fixing correctness text so it doesn't match 'correct' in the word 'correctness' causing my tests to fail. This should be improved soon 2017-12-08 13:34:44 -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
Dillon Dumesnil
0def70e725 Updating xblock-review version to include commit for being more defensive about score field in the state of a problem 2017-12-08 13:03:05 -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
Eric Fischer
171e671577 Merge pull request #16838 from edx/dahlia/sfe_bump 
Update studio-frontend to 0.6.0
 2017-12-08 12:00:10 -05:00
Uzair Rasheed
1225bde736 Merge pull request #16807 from edx/LEARNER-3385/content-injection-on-registration 
Verify 'Full Name' field does not allow HTML in Signup form
 2017-12-08 21:34:09 +05:00
Sofiya Semenova
a1f0679f3a Educator 1552 - Implement roving tabindex for WYSIWYG editor for discussions 2017-12-08 11:18:11 -05:00
Eric Fischer
25498df8e3 remove placeholder heading 2017-12-08 10:41:21 -05:00
Eric Fischer
648bfeae37 Merge pull request #16832 from edx/dahlia/raise_zendesk_rate_limit 
raise zendesk_proxy rate limit
 2017-12-08 09:43:00 -05:00
Eric Fischer
9bd75eaad1 Update studio-frontend to 0.6.0 2017-12-08 09:40:58 -05:00
Diana Huang
0ecc0558a3 More registration form cleanup. 2017-12-08 09:39:01 -05:00
Waheed Ahmed
3fc788286b Merge pull request #16823 from edx/waheed/LEARNER-2731-implement-journeys-app-banner 
Implement journeys app banner.
 2017-12-08 19:37:47 +05:00
uzairr
8ffac2061d Verify 'Full Name' field does not allow HTML in Signup form 
'Full Name' field in the signup form is allowing HTML as an input
which makes spoofing easily.To avoid it, validation is added
that will ensure 'Full Name' field does not allow HTML.

LEARNER-3385
 2017-12-08 19:18:18 +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 Afzal
979c7cd1f0 Merge pull request #16703 from edx/zub/ENT-762-update-account-settings-page-for-enterprise-sso 
Update account settings page for enterprise learners
 2017-12-08 17:56:19 +05:00
zubair-arbi
2ac544caeb Update account settings page for enterprise learners 
ENT-762
 2017-12-08 15:40:18 +05:00
Rabia Iftikhar
17c889b7dd Merge pull request #16835 from edx/ri/update-edx-organizations-version-0.4.9 
update edx-organizations version to 0.4.9
 2017-12-08 15:00:12 +05:00
rabia23
eceacb491b update edx-organizations version to 0.4.9 2017-12-08 08:08:52 +00: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
Eric Fischer
1a7ffc73c2 raise zendesk_proxy rate limit 2017-12-07 16:04:01 -05:00
Tyler Hallada
f9623fc96a Merge pull request #16796 from edx/thallada/schedules-hold-back-fix 
Schedules: Fix hold back error
 2017-12-07 15:10:05 -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
Tyler Hallada
95bb6e3db0 Use pytest-style asserts in test_signals.py 2017-12-07 13:43:49 -05:00
Tyler Hallada
6e791c58ea Fix hold back error 
Also add try/except that prevents enroll failure caused by Schedule creation
exception in the future.

Address PR comments

Split one-line docstrings on their own line

Add period to the end of docstring summaries

Use kwargs.get to be more defensive

Disable pylint unused-argument about sender param
 2017-12-07 13:43:47 -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
Albert (AJ) St. Aubin
292848cfe7 Merge pull request #16617 from edx/aj/entitlement_session_backend 
Aj/entitlement session backend
 2017-12-07 12:05:17 -05:00
Calen Pennington
d1630a5871 Merge pull request #16808 from edx/adjust-max-pylint 
Lower pylint threshold to just above what it is on master
 2017-12-07 11:54:49 -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
Albert St. Aubin
0ea3753d94 Added Entitlement enroll and unenroll logic to the Enrollment API 
[LEARNER-3136]

This commit containts the logic and API endpoint for a user to Enroll,
Unenroll, and switch-session on a Course Entitlement.
 2017-12-07 10:54:59 -05:00
Calen Pennington
4ff39cf51f Merge pull request #16819 from edx/cale/remove-studio-dynamic-asset-dir 
Don't use the edx-platform revision as the studio assets base url
 2017-12-07 10:49:34 -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
7d28b41bc8 Merge pull request #16825 from edx/update_translations_dec_7 
updated translations
 2017-12-07 18:25:12 +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