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

2151 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Diana Huang
0ecc0558a3 More registration form cleanup. 2017-12-08 09:39:01 -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
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
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
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
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
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
Uzair Rasheed
6b146db12b Merge pull request #16690 from edx/LEARNER-3337/validate-username-field 
Verify 'Full Name' field does not allow HTML.
 2017-12-06 14:29:57 +05:00
Jeremy Bowman
54d14098c0 PLAT-1427 Adapt to build_attrs change in Django 1.11 2017-12-05 17:29:35 -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
7245f7696e Fix quality issues in ace_common 2017-12-05 11:38:16 -05:00
Nimisha Asthagiri
7ef443f7ce Update usages to ace_common 2017-12-05 11:38:16 -05:00
Nimisha Asthagiri
c6ee8eb68d Move ACE Common code out of Schedules 2017-12-05 11:36:14 -05:00
Tyler Hallada
26d42de464 Merge pull request #16773 from edx/thallada/schedules-no-escape-txt 
Schedules: turn off HTML escaping for email text fields
 2017-12-05 11:07:09 -05:00
Jeremy Bowman
103c723c6d PLAT-1801 Preserve new user login behavior under Django 1.10+ 2017-12-05 10:20:25 -05:00
uzairr
333e3315cb Verify 'Full Name' field does not allow HTML. 
'Full Name' field in the student account settings is allowing HTML
as an input which makes spoofing easily.To avoid it, validation is
added that ensures 'Full Name' field does not allow HTML as input.

LEARNER-3337
 2017-12-05 13:33:30 +00: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
Clinton Blackburn
1540d3c8a4 Using standard JWT issuer for calls to Credentials Service 
The client-specific JWT doesn't really make any sense and only causes issues due to needing to configure both. This change updates LMS to use the standard issuer.

LEARNER-3441
 2017-12-05 01:15:15 -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
Tyler Hallada
144859cdf2 Turn off HTML escaping for email text fields 2017-12-04 17:47:50 -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
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
Eric Fischer
34db1269c8 Merge pull request #16601 from edx/efischer/EDU-1731_memoize 
Memoize common lookups during request
 2017-12-04 13:12:09 -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
Eric Fischer
2e3f871c12 Memoize common lookups during request 
Prevents repeated memcached lookups on functions whose values should
remain static for the lifetime of a request.

EDUCATOR-1731
 2017-12-04 11:54:50 -05:00
Tyler Hallada
f5d2741c34 Merge pull request #16744 from edx/thallada/highlights-logging 
Schedules: more info logging and add exception logging
 2017-12-04 11:32:43 -05:00
Nimisha Asthagiri
de74279d78 Merge pull request #16755 from edx/pacing/fake-request-issue 
Schedules: Emulate HTTP request needs to include host information
 2017-12-04 11:31:58 -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
Waheed Ahmed
d7d310bc4f Course dates mobile fragment improvments. 
Added new mobile css entry in css pipline and removed
dates heading for mobile view.

LEARNER-3206
 2017-12-04 15:16:06 +05:00
Nimisha Asthagiri
61f4ceca5b Schedules: Emulate HTTP request needs to include host information 2017-12-03 23:57:12 -05:00