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

44342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Terry
09468f3f0e Merge pull request #16999 from edx/mikix/LEARNER-3668 
Don't wrap enroll button text
 2017-12-21 14:14:03 -05:00
Harry Rein
173e7675bc Merge pull request #16990 from edx/HarryRein/upgrade-or-unpublished-runs-only 
Don't show unpublished or un-upgradable seats in available sessions.
 2017-12-21 12:58:56 -05:00
Michael Terry
f722ae22fe Merge pull request #16998 from edx/mikix/LEARNER-3717 
Keep related programs when unenrolling
 2017-12-21 12:47:36 -05:00
Michael Terry
f630848bef Don't wrap enroll button text 
The "Leave Current/Switch/Select" Session button was sometimes
wrapping its text if it wasn't given enough horizontal space.
Now it should never wrap, instead stealing space from the
dropdown next to it (or being bumped to a line below the dropdown).

LEARNER-3668
 2017-12-21 12:44:07 -05:00
Simon Chen
4a95c9699c Merge pull request #16983 from edx/schen/EDUCATOR-1549 
Fix breadcrumb display so it does not include parent node texts
 2017-12-21 12:24:53 -05:00
Harry Rein
cd892e51d2 Don't show unpulished or un-upgradable seats in available sessions. 2017-12-21 11:35:19 -05:00
Michael Terry
4a6048e3c7 Keep related programs when unenrolling 
When unenrolling, let's not remove the related programs div
permanently from the page, since it should always be visible.

LEARNER-3717
 2017-12-21 11:21:12 -05:00
Jeff LaJoie
0183913fa4 Merge pull request #16996 from edx/jlajoie/LEARNER-3638 
LEARNER-3638: Fixes expiration issues for learners who upgrade late
 2017-12-21 11:18:59 -05:00
Michael Terry
f303fd3f5c Merge pull request #16817 from mikix/mikix/entitlement-expiration 
Add expire_old_entitlements command
 2017-12-21 11:04:10 -05:00
Jeff LaJoie
14986264d9 LEARNER-3638: Fixes expiration issues for learners who upgrade late into a course 2017-12-21 10:44:02 -05:00
Michael Youngstrom
6ad748b42a Merge pull request #16986 from edx/youngstrom/update_paver_to_fork 
Move paver version to fork
 2017-12-21 10:38:47 -05:00
Jose Antonio Gonzalez
623c945bb2 change default article name to be course name instead of slug 2017-12-21 10:14:32 -05:00
Tyler Hallada
131875d1ad Merge pull request #16991 from edx/thallada/upgrade-proctoring 
Upgrade edx-proctoring to 1.3.3
 2017-12-21 10:06:04 -05:00
Simon Chen
2bccfb9376 Fix breadcrumb display so it does not include parent node texts 
EDUCATOR-1549
 2017-12-21 09:28:30 -05:00
Matt Tuchfarber
d64f42edd9 Merge pull request #16988 from edx/tuchfarber/update_enterprise_0_56_5 
Update edx-enterprise to 0.56.5
 2017-12-21 09:25:23 -05:00
Waheed Ahmed
5d086e658d Merge pull request #16995 from edx/waheed/LEARNER-3066-fix-optout-email-checkbox 
Fix optout email settings checkbox.
 2017-12-21 18:43:03 +05:00
Waheed Ahmed
45272811c4 Fix optout email settings checkbox. 
Course optouts value list was returning opaque_key objects and
during rendering unicode object was used to generate the
optout settings bool value.

LEARNER-3066
 2017-12-21 17:28:40 +05:00
Tyler Hallada
4369f4d4dd Upgrade edx-proctoring to 1.3.3 
The patch contains a possible fix for LEARNER-3705.
 2017-12-20 17:40:29 -05:00
Matt Tuchfarber
b9815b32d0 Update edx-enterprise to 0.56.5 2017-12-20 16:13:20 -05:00
edx-pipeline-bot
72bb440dc5 Merge pull request #16985 from edx/release-mergeback-to-master 
Merge release back to master
 2017-12-20 16:10:13 -05:00
Harry Rein
98d550336f Merge pull request #16982 from edx/HarryRein/hide-policy-on-leave-session 
Hide policy information when leaving a session.
 2017-12-20 15:22:17 -05:00
Michael Youngstrom
95be2091c9 Move paver version to fork 2017-12-20 15:05:33 -05:00
Harry Rein
0d1558237f Hide policy information when leaving a session. 
LEARNER-3692
 2017-12-20 14:02:04 -05:00
Tasawer Nawaz
d00697f592 Merge pull request #16949 from edx/tasawer/learner-3594/update-zendesk-proxy-and-frontend-jsx 
zendesk proxy and front end of support form updated
 2017-12-20 23:25:42 +05:00
Michael Terry
f7237cf659 Avoid a dropdown for course runs 
Entitlement detail pages in django admin normally show a dropdown
button for the enrollment_course_run field. But on stage, that can
cause a timeout because the enrollment database is so large.
So instead, just show it as a raw id field.
 2017-12-20 12:34:48 -05:00
McKenzie Welter
b177f3daab include email settings in fulfilled entitlement action items 2017-12-20 12:34:09 -05:00
Michael LoTurco
128486d79a Upgrade audit enrollments on entitlement purchase 
Adds check for existing upgradeable enrollment on user entitlement
creation, if single upgradeable enrollment is present, upgrades enrollment
to entitlement mode and links the entitlement to the upgraded enrollment

LEARNER-3579
 2017-12-20 12:33:50 -05:00
Anthony Mangano
2c984719e9 ensure enrollment_end is parsed to datetime prior to making comparisons 2017-12-20 12:33:38 -05:00
Tasawer Nawaz
82051d0312 zendesk proxy and front end of support form updated + filuploading is disbaled 
LEARNER-3594
 2017-12-20 22:16:31 +05:00
Michael Terry
dbc7b89452 Merge pull request #16978 from edx/mikix/editable-course-run 
Avoid a dropdown for course runs
 2017-12-20 11:33:43 -05:00
Ayub khan
5406e14e17 Merge pull request #16975 from edx/update-translations-18-DEC 
updated translations
 2017-12-20 21:23:31 +05:00
Anthony Mangano
0cb6bad7ca Merge pull request #16971 from edx/fix-for-LEARNER-3482 
Ensure enrollment_end is parsed to datetime prior to making comparisons
 2017-12-20 10:52:57 -05:00
Gabe Mulley
0efc376488 Merge pull request #16976 from edx/mulby/fix-ace-ga-tracking 
fix GA tracking of ACE emails
 2017-12-20 10:32:42 -05:00
Michael Terry
1650813d17 Avoid a dropdown for course runs 
Entitlement detail pages in django admin normally show a dropdown
button for the enrollment_course_run field. But on stage, that can
cause a timeout because the enrollment database is so large.
So instead, just show it as a raw id field.
 2017-12-20 10:26:46 -05:00
McKenzie Welter
8279b77c2a Merge pull request #16940 from edx/McKenzieW/learner-3612 
Add email settings to the gear icon drop down for fulfilled entitlements and fix a11y issues
 2017-12-20 10:22:24 -05:00
Gabe Mulley
b118f0633c fix GA tracking of ACE emails 2017-12-20 08:59:06 -05:00
McKenzie Welter
a4d23eaea9 include email settings in fulfilled entitlement action items 2017-12-20 08:57:27 -05:00
ayub-khan
fcac9ad1e9 updated translations 2017-12-20 17:03:51 +05:00
Hasnain Naveed
9f921bf618 Merge pull request #16227 from edx/hasnain-naveed/WL-1282 
(WIP) WL-1282 | Created management command for automation of theme setup.
 2017-12-20 14:58:08 +05:00
Anthony Mangano
47287de409 ensure enrollment_end is parsed to datetime prior to making comparisons 2017-12-19 16:22:25 -05:00
Michael LoTurco
98fd05b4ee Merge pull request #16959 from edx/MLoTurco/learner-3579 
MLoTurco/learner 3579 Upgrade audit enrollments on entitlement purchase
 2017-12-19 16:21:21 -05:00
Robert Raposa
a0bf63a1da Merge pull request #16967 from edx/robrap/remove-flaky-timing-assertions 
PLAT-1864: Fix test_course_listing_performance flaky test.
 2017-12-19 16:12:16 -05:00
Cliff Dyer
82ad9295da Merge pull request #16569 from open-craft/cliff/video-completion 
Define custom completion for VideoModule
 2017-12-19 15:27:40 -05:00
Michael LoTurco
f0ab07a154 Upgrade audit enrollments on entitlement purchase 
Adds check for existing upgradeable enrollment on user entitlement
creation, if single upgradeable enrollment is present, upgrades enrollment
to entitlement mode and links the entitlement to the upgraded enrollment

LEARNER-3579
 2017-12-19 14:54:10 -05:00
Sylvia Pearce
2c4a52075e Merge pull request #16914 from edx/sylvia/proctoringRC 
Update requirements file to use version 1.3.2 of edx proctoring
 2017-12-19 14:43:15 -05:00
Robert Raposa
d2b0d0cd0e Fix test_course_listing_performance flaky test. 
Fix test by removing timers and leaving other assertions.
 2017-12-19 14:40:09 -05:00
J. Cliff Dyer
1fc43bf60d Define custom completion for VideoModule 
Update the VideoModule to publish a completion event when the player
reaches 95% complete, and submit a BlockCompletion when that event
occurs.

OC-3091
MCKIN-5897
 2017-12-19 14:12:28 -05:00
Douglas Hall
5a8579d387 Merge pull request #16956 from edx/douglashall/update_enterprise_0_56_4 
Updating edx-enterprise package to 0.56.4.
 2017-12-19 13:52:22 -05:00
Simon Chen
131b14b111 Merge pull request #16961 from edx/schen/EDUCATOR-1549 
Programmatically indicate nested discussions in filter
 2017-12-19 13:40:05 -05:00
Jeff LaJoie
e063a8bdd8 Merge pull request #16952 from edx/jlajoie/LEARNER-3482 
LEARNER-3482: Do not show sessions past their enrollment end
 2017-12-19 12:53:12 -05:00