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

1852 Commits

Author SHA1 Message Date
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
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
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
Nimisha Asthagiri
61f4ceca5b Schedules: Emulate HTTP request needs to include host information 2017-12-03 23:57:12 -05:00
Tyler Hallada
3425502a23 Schedules: change logging from DEBUG to INFO/EXCEPTION 2017-12-03 22:34:33 -05:00
Jeremy Bowman
67b877cb6c PLAT-1428 Removed unused cache_relation function 2017-12-01 18:00:04 -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
Jesse Zoldak
9c49c10b27 Revert "Allow theme template block override" 2017-11-30 17:09:13 -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
Tyler Hallada
989c3a30d7 Merge pull request #16618 from edx/mulby/schedules-analytics 
update readme with analytics information
 2017-11-30 16:14:36 -05:00
Brian Mesick
3951b7527c Merge pull request #16658 from edx/bmedx/django111_tag_test_failures_lms_3 
Tag LMS Unit 3 tests that fail in Django 1.11
 2017-11-30 16:14:18 -05:00
Anthony Mangano
f72cf800e1 Consider user entitlements and use entitlement products in bundle one-click purchase 2017-11-30 13:59:46 -05:00
Calen Pennington
2ad918c126 Merge pull request #16707 from cpennington/cale/improve-schedule-admin-filtering 
Use a dropdown to filter schedules by course_id, rather than forcing …
 2017-11-30 12:49:06 -05:00
Calen Pennington
1f23b08fb1 Use a dropdown to filter schedules by course_id, rather than forcing the use of search 2017-11-30 10:53:08 -05:00
Nimisha Asthagiri
7a6805b261 Merge pull request #16714 from edx/pacing/spanish-language-issue 
Schedules: course language -> closest released language
 2017-11-30 10:47:53 -05:00
Awais Jibran
e3c4b9f096 Merge pull request #16717 from edx/aj/update-course-start-date-change-log 
Add Course ID in logging
 2017-11-30 15:05:37 +05:00
Awais Jibran
f72d44d38a Add Course ID in logging 2017-11-30 13:48:06 +05:00
Nimisha Asthagiri
38cfadeb20 Schedules: convert course language to supported released language 2017-11-29 20:08:33 -05:00
Alessandro Roux
7463356c7f Merge pull request #16706 from edx/pacing/readme-with-a-system-diagram 
Dynamic Pacing: Incorporate handoff feedback in the README
 2017-11-29 16:42:34 -05:00
sandroroux
f2a1d8a78c Renamed the section that contains the diagram. Deleted description 2017-11-29 12:39:58 -05:00
sandroroux
873f86e5f3 Paired the system diagram with a quick description. 2017-11-29 12:35:15 -05:00
Uman Shahzad
37844fd927 Merge pull request #15947 from open-craft/allow-theme-template-block-override 
Allow theme template block override
 2017-11-29 22:25:27 +05:00
sandroroux
859958f059 Fixed some rendering issues. 2017-11-29 11:51:10 -05:00
Brian Mesick
167b28302c Merge pull request #16704 from edx/revert-15511-proversity/add-recover-password-endpoint 
Revert "Add recover password endpoint"
 2017-11-29 11:49:15 -05:00
sandroroux
fb100796d3 Included system diagram in README. 2017-11-29 11:47:08 -05:00
Diana Huang
8693f2fd38 UX updates to registration form. 
- hide optional fields by default.
- instructions only shown when focused in.
- removed header
- Terms of service link and checkbox on same line.
 2017-11-29 09:46:54 -05:00
Brian Beggs
845e64cd78 Revert "Add recover password endpoint" 2017-11-29 09:44:10 -05:00
Qubad786
dc335a2215 EDUCATOR-1628 
Enable Video Uploads by default with course rollout flag.
 2017-11-29 12:27:20 +05:00
Jose Antonio Gonzlez
9cf0b335aa Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip] 2017-11-28 08:08:25 -06:00
Tyler Hallada
9f74e70589 Course Highlights Setting in Studio Course Outline 
fixup! trying to "fix" underscore syntax error

add cancel modal test

Fix quality issues.

Apply Nimisha's suggestions for my quality fixes.

Skip test_drop_unit_in_collapsed_subsection

Fix quality error
 2017-11-27 17:23:55 -05:00
sandroroux
13edb0b03e Updated course_has_highlights and get_week_highlights. Methods ensure that a course has highlights_enabled_for_messaging 
Responded to Nimisha's review feedback.
 2017-11-27 17:23:29 -05:00