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

44384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
bd9c7a082e PLAT-1863 Fixes for LMS shards 2 and 3 tests under Django 1.9 2017-12-22 16:53:01 -05:00
Jeremy Bowman
e98420dd8d Merge pull request #16979 from edx/jmbowman/PLAT-1861 
PLAT-1861 Upgrade to pyfilesystem2
 2017-12-22 15:48:48 -05:00
Brian Mesick
5acb0f989b Merge pull request #16989 from edx/bmedx/django111_update_is_authenticated 
Remove unnecessary patches to User::is_authenticated
 2017-12-22 15:39:23 -05:00
Michael LoTurco
82f1d1b9a6 Merge pull request #17016 from edx/MLoTurco/learner-filter-for-isactive 
Only upgrade active enrollments for entitlements
 2017-12-22 15:34:17 -05:00
Jeremy Bowman
65472399df PLAT-1861 Upgrade to pyfilesystem2 2017-12-22 14:44:24 -05:00
John Eskew
1e5b7c0b3e Merge pull request #16964 from edx/jeskew/sqlite_crash_during_testing_fix 
Install recent version of sqlite/pysqlite to fix crashes in tests.
 2017-12-22 14:17:46 -05:00
bmedx
b5d6fca44e Update is_authenticated patches to work with Django 1.10+ 2017-12-22 13:22:49 -05:00
edx-pipeline-bot
48f2431618 Merge pull request #17014 from edx/release-mergeback-to-master 
Merge release back to master
 2017-12-22 13:16:39 -05:00
Michael Terry
6a0e17c183 Merge pull request #17026 from edx/mikix/fix-view-align 
Fix button alignment on program dash
 2017-12-22 13:14:16 -05:00
Jesse Zoldak
ed509966f2 Merge pull request #17027 from edx/zoldak/TE-2352 
Refactor reset-test-db.sh and allow for an option to rebuild the cache
 2017-12-22 10:13:51 -08:00
John Eskew
30eafbff65 fixup! Install recent version of sqlite/pysqlite to fix crashes in tests. 2017-12-22 13:08:33 -05:00
John Eskew
7ec06503b9 Install recent version of sqlite/pysqlite to fix crashes in tests. 2017-12-22 13:08:33 -05:00
Douglas Hall
ce15435ec2 Merge pull request #17024 from edx/douglashall/upgrade_enterprise_0_58_0 
Upgrade edx-enterprise package to 0.58.0.
 2017-12-22 12:07:14 -05:00
Jesse Zoldak
00f6b36a49 Refactor reset-test-db.sh script and allow for an option to rebuild the cache 2017-12-22 11:33:57 -05:00
bmedx
bc72c28a03 Remove unnecessary patches to User::is_authenticated 2017-12-22 11:33:35 -05:00
Stu Young
f9d50526e3 Merge pull request #17022 from edx/estute/fix-paver-six-issues-for-tox 
install paver after other requirements
 2017-12-22 11:18:32 -05:00
Michael Terry
c065707e5d Fix button alignment on program dash 
The View Course button on the program dashboard was not right-aligned
with the rest of the UI. Now it is.

LEARNER-3733
 2017-12-22 11:17:58 -05:00
Michael LoTurco
f5bc89f1b5 Only upgrade active enrollments for entitlements 2017-12-22 10:25:07 -05:00
Stu Young
c3c21b514d Merge pull request #16730 from edx/estute/run-coverage-against-target-branch 
run coverage against target branch
 2017-12-22 10:23:21 -05:00
Douglas Hall
dda48451ff Upgrade edx-enterprise package to 0.58.0. 
https://github.com/edx/edx-enterprise/compare/0.57.0...0.58.0
 2017-12-22 10:10:30 -05:00
Stuart Young
471f914f00 install paver after other requirements 2017-12-22 09:55:59 -05:00
Matt Tuchfarber
486f9578b7 Merge pull request #16856 from open-craft/mtyaka/template-block-overrides 
Allow theme template block overrides.
 2017-12-22 09:14:02 -05:00
Douglas Hall
f6e0c70232 Merge pull request #16987 from edx/douglashall/ENT-779_remove_tpa_flag_refs 
ENT-779 Remove code references to ProviderConfig.drop_existing_session.
 2017-12-22 09:07:08 -05:00
Zubair Afzal
beff9f42ee Merge pull request #16919 from edx/zub/ENT-768-display-friendly-error-message-for-saml 
ENT-768 Display friendly error message for SAML rejection
 2017-12-22 18:33:30 +05:00
Stuart Young
2e517ac095 run coverage against target branch 2017-12-22 08:17:05 -05:00
Fred Smith
37dc15779a Merge pull request #17013 from edx/McKenzieW/learner-3704 
fix entitlement email settings list item class
 2017-12-22 08:08:57 -05:00
zubair-arbi
d7502acc5b ENT-768 
display friendly error message for saml rejection
 2017-12-22 15:12:11 +05:00
Chandrakant Gopalan
f6f29ca49e Allow theme template block overrides. 
This allows an overridding template from a theme to inherit from the
same corresponding standard template.

This is useful when you only want to override one or more named blocks,
but otherwise make no modifications to the standard template.
 2017-12-22 09:41:35 +01:00
Harry Rein
579435bcd7 Merge branch 'master' into release-mergeback-to-master 2017-12-21 16:50:24 -05:00
McKenzie Welter
9cc4b4b609 fix entitlement eemail settings list item class 2017-12-21 16:40:09 -05:00
Feanil Patel
0d2921bf23 Merge pull request #17011 from edx/McKenzieW/revertlearner-3407 
Revert "fix list item class"
 2017-12-21 16:37:01 -05:00
McKenzie Welter
a422190ec9 Revert "fix list item class" 
This reverts commit 42143114a5.
 2017-12-21 16:36:04 -05:00
McKenzie Welter
42143114a5 fix list item class 2017-12-21 16:32:03 -05:00
Harry Rein
62b025e889 Merge pull request #17008 from edx/HarryRein/entitlements-without-sessions 
Show more sessions coming soon for entitlements without sessions.
 2017-12-21 15:40:49 -05:00
Harry Rein
b09f4fabf1 Show more sessions coming soon for entitlements without sessions. 2017-12-21 15:38:45 -05:00
Muhammad Ammar
b6f45955f5 Merge pull request #15803 from open-craft/replaceafill/OC-2594 
Auto-advance video toggle
 2017-12-22 01:29:24 +05:00
Douglas Hall
d8494483c1 ENT-779 Remove code references to ProviderConfig.drop_existing_session. 
We no longer need the drop_existing_session flag on IdP configurations
because dropping the existing session should actually be the only
behavior for certain view in the edx-enterprise code.
 2017-12-21 14:39:46 -05:00
Michael Terry
29bacacaa3 Merge pull request #17000 from edx/mikix/LEARNER-3665 
Correctly align Verify Now button
 2017-12-21 14:14:18 -05:00
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
Michael Terry
484cdbde6b Correctly align Verify Now button 
LEARNER-3665
 2017-12-21 13:05:38 -05:00
Tyler Hallada
08da08a105 Upgrade edx-proctoring to 1.3.3 
The patch contains a possible fix for LEARNER-3705.
 2017-12-21 13:05:28 -05:00
Harry Rein
55c740cb01 Don't show unpulished or un-upgradable seats in available sessions. 2017-12-21 13:04:58 -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