Farhanah Sheets
|
3fb4ff346e
|
Merge pull request #17034 from edx/fsheets/EDUCATOR-1995
Pass ReadTheDocs path to studio-frontend
|
2017-12-27 12:47:27 -05:00 |
|
Sofiya Semenova
|
edbdb78902
|
Merge pull request #16943 from edx/sofiya/ora
Educator-1280 Force grade persist on changed enrollment track
|
2017-12-27 12:07:18 -05:00 |
|
Ayub khan
|
872f571baf
|
Merge pull request #17045 from edx/update-translations-26-dec
updated translations
|
2017-12-27 21:53:21 +05:00 |
|
Farhanah Sheets
|
cfdfec1d20
|
Add mako js filter
|
2017-12-27 11:25:36 -05:00 |
|
Michael Terry
|
dce5da581c
|
Merge pull request #17032 from edx/mikix/LEARNER-3709
Fix a11y issues on course dashboard
|
2017-12-27 10:51:47 -05:00 |
|
Farhanah Sheets
|
425e3208bb
|
Pass readthedocs course_author files path to studio-frontend assets page
|
2017-12-27 09:39:40 -05:00 |
|
Rabia Iftikhar
|
fcdead0c77
|
Merge pull request #17044 from edx/ri/EDUCATOR-1930-reposition-log-message
EDUCATOR-1930 change log message position in set_score method
|
2017-12-27 19:31:38 +05:00 |
|
rabia23
|
b22a656c53
|
EDUCATOR-1930 change log message position in set_score method
|
2017-12-27 13:28:49 +00:00 |
|
ayub-khan
|
f50af67f15
|
updated translations
|
2017-12-27 16:38:58 +05:00 |
|
Jillian Vogel
|
097c0665fc
|
Hides Video Auto Advance from Advanced Settings if disabled
and fixes affected tests.
|
2017-12-27 13:27:36 +10:30 |
|
David Ormsbee
|
c0d0acd335
|
Merge pull request #17012 from edx/ormsbee/symlink_purge_cms_coffee_fixtures
Remove cms/static/coffee/fixtures symlink.
|
2017-12-23 21:09:00 -05:00 |
|
David Ormsbee
|
3d5585bd31
|
Merge pull request #16849 from edx/ormsbee/smaller_commons_chunk
Reduce size of the commons.js bundle.
|
2017-12-23 21:08:05 -05:00 |
|
Gregory Martin
|
832a1f2e32
|
Merge pull request #16972 from edx/yro/add_discussions_tracking
Add Forum Notifications Email Tracking
|
2017-12-23 17:21:16 -05:00 |
|
Jesse Zoldak
|
4fc20cb291
|
Merge pull request #17028 from edx/zoldak/TE-2353
Paver commands for storing and retrieving bokchoy db caches from s3 TE-2353
|
2017-12-22 14:43:16 -08:00 |
|
Brian Mesick
|
1af17b9c55
|
Merge pull request #16890 from edx/bmedx/django111_httpretty_0814
Upgrade httpretty to fix test issues in Django 1.9+
|
2017-12-22 17:33:52 -05:00 |
|
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 |
|
Brian Mesick
|
4ceba7ad64
|
Merge branch 'master' into bmedx/django111_httpretty_0814
|
2017-12-22 16:25:25 -05:00 |
|
Jesse Zoldak
|
129bd7afdd
|
Paver commands for storing and retrieving bokchoy db caches from s3 TE-2353
|
2017-12-22 16:14:29 -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 |
|
bmedx
|
6ece1708a6
|
Make sure httpretty usage cleans up after itself
|
2017-12-22 15:36:46 -05:00 |
|
bmedx
|
23503f5226
|
Fix test issues with new httpretty
|
2017-12-22 15:36:45 -05:00 |
|
bmedx
|
a42b017a7a
|
Upgrade httpretty to fix test issues in Django 1.9+
|
2017-12-22 15:36:45 -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 |
|
Gregory Martin
|
455a13d1f5
|
Add Forum Notifications Email Tracking
|
2017-12-22 15:21:26 -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 |
|
Michael Terry
|
fe014690ef
|
Fix a11y issues on course dashboard
Remove a broken and unneeded aria-controls= attribute and make an
id= attribute unique.
LEARNER-3709
|
2017-12-22 13:11:32 -05: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 |
|
Sofiya Semenova
|
dd93e67b5d
|
Force regrade on enrollment track change.
|
2017-12-22 12:03:04 -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 |
|
Michael LoTurco
|
e4867d3841
|
Only upgrade active enrollments for entitlements
|
2017-12-22 11:22:55 -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 |
|