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

3988 Commits

Author SHA1 Message Date
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
Jose Antonio Gonzalez
93464298e4 Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip] 2017-11-27 10:28:32 -06:00
Matt Tuchfarber
1d8613f34e Merge pull request #16602 from edx/tuchfarber/fix_instructor_ordering 
Fix instructors ordering on program marketing page
 2017-11-27 09:52:23 -05:00
Brian Mesick
4a938c1496 Merge pull request #16645 from edx/bmedx/django111_fix_cms_failures 
Fixes to common/openedx tests that reference apps CMS doesn't use
 2017-11-27 09:16:19 -05:00
Jose Antonio Gonzalez
2e45a9b136 Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip] 2017-11-24 13:13:44 +02:00
bmedx
ace88e7d5a Tag LMS Unit 3 tests that fail in Django 1.11 
Fixed some url reverse errors instead of marking since they were trivial
 2017-11-22 15:48:00 -05:00
bmedx
d827d47b48 Tag LMS Unit 2 tests that fail in Django 1.11 2017-11-22 15:47:22 -05:00
bmedx
d3e6836d9e Fixes to common/openedx tests that reference apps CMS doesn't use 2017-11-22 15:46:06 -05:00
Calen Pennington
48abc492ae Fix linting errors from https://github.com/edx/edx-platform/pull/16615 2017-11-22 14:47:49 -05:00
Ned Batchelder
a2e2aace82 Merge pull request #16650 from edx/nedbat/fix-unused-imports 
Fix a number of unused-import pylint violations
 2017-11-22 11:17:07 -05:00
Calen Pennington
7aa1a3460b Merge pull request #16615 from edx/cale/schedules-admin-improvements 
Cale/schedules admin improvements
 2017-11-21 22:06:37 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00
Calen Pennington
10970f3034 Allow searching for schedules with known errors in the admin site 2017-11-21 16:08:24 -05:00
Calen Pennington
3ff118eaac Dynamically generate the actions to update to specific experiences 2017-11-21 16:08:23 -05:00
Brian Mesick
c9c67e0827 Merge pull request #16644 from edx/bmedx/django111_fix_startup 
Fix Django 1.11 startup
 2017-11-21 15:36:07 -05:00
Calen Pennington
6756f97d0c Limit schedule resolvers to active schedules 2017-11-21 14:25:57 -05:00
Calen Pennington
fabad1de4d Add actions and filtering to schedules admin page to allow it to function better as a support tool 2017-11-21 14:25:57 -05:00
Calen Pennington
45bbc2daa3 Allow searching by course_id in the schedules django admin page 2017-11-21 14:25:55 -05:00
sandroroux
98233c0a84 New management command for setting up a test environment. The command creates a ScheduleConfig and schedules if they don't exist (the schedule starts three days before the time the command is run). If a schedule already exists, the command updates the schedule's start time and upgrade deadline. The values set by the command will allow send_recurring_nudge to send three-day nudges. 2017-11-21 14:25:55 -05:00
bmedx
048b609f87 Fix Django 1.11 startup 2017-11-21 11:58:38 -05:00
Jeremy Bowman
43a11af735 PLAT-1199 Stop using pycrypto 2017-11-21 11:25:48 -05:00
Jose Antonio Gonzalez
0b460bea38 Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip] 2017-11-21 09:15:09 +02:00
Matt Tuchfarber
2c67f9647b Fix instructors ordering on program marketing page 
Changed to hold the instructors in a list instead of a dict
because a dict does not keep ordering.
 2017-11-20 11:25:19 -05:00
Gabe Mulley
7dbe2cd89d ensure landing page for scheduled emails is not a redirect 2017-11-20 07:12:31 -05:00
Hasnain Naveed
e1bf86226a Merge pull request #16608 from edx/hasnain-naveed/WL-1257 
WL-1257 | Removed the hard-coded "edX" related strings from nudges em…
 2017-11-20 15:56:14 +05:00
Jose Antonio Gonzalez
bc16a70c63 Add recover password endpoint 2017-11-18 09:37:42 +02:00
Gabe Mulley
efc814bcc9 update readme with analytics information 2017-11-17 16:58:57 -05:00
Gabe Mulley
1f3085b2bc rename test methods 2017-11-17 14:05:15 -05:00
Gabe Mulley
a6387c0e5f log changes to the start date 2017-11-17 13:34:15 -05:00