Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 9d2fad7144 fix course staff ability to perform operations on instructor dashboard noraiz-anwar 2017-12-28 16:43:53 +05:00
• 81b200ae9e Merge pull request #17043 from edx/saleem-latif/ENT-829 Saleem Latif 2018-01-01 17:29:10 +05:00
• 7504be1c67 Remove username from force syncing in third party auth pipeline zubair-arbi 2018-01-01 16:24:03 +05:00
• 26cc70a7bc Move enterprise specific code in student_account views to enterprise_support Saleem Latif 2017-12-26 15:05:08 +05:00
• 96977fe2de Merge pull request #17058 from edx/clee/LEARNER-2353 Christopher Lee 2017-12-29 14:18:49 -05:00
• 02a98a7232 Use user's language preference on bookmark page christopher lee 2017-12-29 09:43:38 -05:00
• d75bbf05e4 Merge pull request #17053 from edx/estute/bokchoy-option-to-load-data-without-migrations Stu Young 2017-12-29 12:03:12 -05:00
• 4e05d43345 Fix login box alignment in IE Michael Terry 2017-12-29 11:36:49 -05:00
• 454e5a3b55 bokchoy option for explicitly running migrations Stuart Young 2017-12-28 09:20:35 -05:00
• cc229ebb65 Merge pull request #17031 from edx/ormsbee/collectstatic_ignore David Ormsbee 2017-12-28 20:42:12 -05:00
• 0d23d39341 Merge pull request #16966 from edx/thallada/upgrade-xblock-dnd Tyler Hallada 2017-12-28 15:39:13 -05:00
• 4029ee1837 Ignore certain patterns during collectstatic. David Ormsbee 2017-12-22 12:35:25 -05:00
• e14c3faed6 Merge pull request #17056 from edx/gbabey/enterprise-0.59.0 George Babey 2017-12-28 15:04:39 -05:00
• bd36504584 Fix the tag for xblock-drag-and-drop-v2 2.1.5 Tyler Hallada 2017-12-28 14:24:06 -05:00
• 864d5fc418 Merge pull request #17049 from edx/improve-logging-over-generate-cert-btn Awais Jibran 2017-12-28 23:16:35 +05:00
• f2881bd91f Upgrade edx-enterprise package to 0.59.0 George Babey 2017-12-28 13:13:58 -05:00
• 8240920aa3 Merge pull request #17002 from edx/thallada/upgrade-proctoring Tyler Hallada 2017-12-28 10:25:52 -05:00
• b716798d13 Merge pull request #17050 from edx/tasawer/learner-3649/exclude-enterprise-learners-from-the-welcome-email Tasawer Nawaz 2017-12-28 19:39:33 +05:00
• 18530c31ba Merge pull request #16994 from edx/asad/educator-1958-publish-courserun-multiple-courseaccesrole AsadAzam 2017-12-28 17:41:42 +05:00
• abf7b26b32 Exclude enterprise learners from the welcome email LEARNER-3649 Tasawer Nawaz 2017-12-28 15:39:48 +05:00
• 1f5134b5ef Fixed multiple CourseAccessRole error on publish Asad Azam 2017-12-21 16:05:33 +05:00
• 584dee107e Merge pull request #17019 from open-craft/jill/hide-auto-advance-if-disabled M. Rehan 2017-12-28 15:34:03 +05:00
• 13d738fbb6 Improving logging over generate cert button on progress page. EDUCATOR-2017. Awais Jibran 2017-12-28 12:19:08 +05:00
• 2fcd2830a0 Merge pull request #16993 from edx/LEARNER-3352/GA-event Uzair Rasheed 2017-12-28 13:59:29 +05:00
• e67171b880 Merge pull request #16944 from edx/jmbowman/PLAT-1859 John Eskew 2017-12-27 16:22:36 -05:00
• 523b46962c Merge pull request #17037 from edx/bmedx/django111_fix_teams_tests John Eskew 2017-12-27 15:03:38 -05:00
• 1aebe11afc PLAT-1859 Fix LMS shard 1 tests under Django 1.9 Jeremy Bowman 2017-12-18 16:33:34 -05:00
• c7671b75e5 Merge pull request #17036 from edx/jmbowman/PLAT-1863 John Eskew 2017-12-27 14:26:50 -05:00
• da0858bbdf Add fixes for shoppingcart and discussions test failures bmedx 2017-12-26 20:53:45 -05:00
• 39ad7efcbf Add a fix to CourseOverviews::pre_requisite_courses bmedx 2017-12-26 19:07:25 -05:00
• 0f897a7b3f Fixes to teams tests in Django 1.9+ bmedx 2017-12-22 17:32:48 -05:00
• 72c834ed12 Send student course goal event to GA uzairr 2017-12-21 15:27:15 +05:00
• 2c633f1ed6 Merge pull request #17035 from edx/release-mergeback-to-master edx-pipeline-bot 2017-12-27 12:49:21 -05:00
• 3fb4ff346e Merge pull request #17034 from edx/fsheets/EDUCATOR-1995 Farhanah Sheets 2017-12-27 12:47:27 -05:00
• edbdb78902 Merge pull request #16943 from edx/sofiya/ora Sofiya Semenova 2017-12-27 12:07:18 -05:00
• 872f571baf Merge pull request #17045 from edx/update-translations-26-dec Ayub khan 2017-12-27 21:53:21 +05:00
• cfdfec1d20 Add mako js filter Farhanah Sheets 2017-12-27 11:25:36 -05:00
• dce5da581c Merge pull request #17032 from edx/mikix/LEARNER-3709 Michael Terry 2017-12-27 10:51:47 -05:00
• 425e3208bb Pass readthedocs course_author files path to studio-frontend assets page Farhanah Sheets 2017-12-22 14:02:39 -05:00
• fcdead0c77 Merge pull request #17044 from edx/ri/EDUCATOR-1930-reposition-log-message Rabia Iftikhar 2017-12-27 19:31:38 +05:00
• b22a656c53 EDUCATOR-1930 change log message position in set_score method rabia23 2017-12-27 10:47:11 +00:00
• f50af67f15 updated translations ayub-khan 2017-12-27 16:38:58 +05:00
• 097c0665fc Hides Video Auto Advance from Advanced Settings if disabled Jillian Vogel 2017-12-23 00:34:06 +10:30
• c0d0acd335 Merge pull request #17012 from edx/ormsbee/symlink_purge_cms_coffee_fixtures David Ormsbee 2017-12-23 21:09:00 -05:00
• 3d5585bd31 Merge pull request #16849 from edx/ormsbee/smaller_commons_chunk David Ormsbee 2017-12-23 21:08:05 -05:00
• 832a1f2e32 Merge pull request #16972 from edx/yro/add_discussions_tracking Gregory Martin 2017-12-23 17:21:16 -05:00
• 4fc20cb291 Merge pull request #17028 from edx/zoldak/TE-2353 Jesse Zoldak 2017-12-22 14:43:16 -08:00
• 1af17b9c55 Merge pull request #16890 from edx/bmedx/django111_httpretty_0814 Brian Mesick 2017-12-22 17:33:52 -05:00
• bd9c7a082e PLAT-1863 Fixes for LMS shards 2 and 3 tests under Django 1.9 Jeremy Bowman 2017-12-22 14:32:13 -05:00
• 4ceba7ad64 Merge branch 'master' into bmedx/django111_httpretty_0814 Brian Mesick 2017-12-22 16:25:25 -05:00
• 129bd7afdd Paver commands for storing and retrieving bokchoy db caches from s3 TE-2353 Jesse Zoldak 2017-12-18 15:37:24 -05:00
• e98420dd8d Merge pull request #16979 from edx/jmbowman/PLAT-1861 Jeremy Bowman 2017-12-22 15:48:48 -05:00
• 5acb0f989b Merge pull request #16989 from edx/bmedx/django111_update_is_authenticated Brian Mesick 2017-12-22 15:39:23 -05:00
• 6ece1708a6 Make sure httpretty usage cleans up after itself bmedx 2017-12-15 14:33:45 -05:00
• 23503f5226 Fix test issues with new httpretty bmedx 2017-12-15 12:26:44 -05:00
• a42b017a7a Upgrade httpretty to fix test issues in Django 1.9+ bmedx 2017-12-12 16:05:07 -05:00
• 82f1d1b9a6 Merge pull request #17016 from edx/MLoTurco/learner-filter-for-isactive Michael LoTurco 2017-12-22 15:34:17 -05:00
• 455a13d1f5 Add Forum Notifications Email Tracking Gregory Martin 2017-12-19 16:01:07 -05:00
• 65472399df PLAT-1861 Upgrade to pyfilesystem2 Jeremy Bowman 2017-12-20 11:21:23 -05:00
• 1e5b7c0b3e Merge pull request #16964 from edx/jeskew/sqlite_crash_during_testing_fix John Eskew 2017-12-22 14:17:46 -05:00
• 5e56c0a105 Make module loading for cms/static/js/base.js sychronous to ease transition to webpack Calen Pennington 2017-12-21 14:58:20 -05:00
• b5d6fca44e Update is_authenticated patches to work with Django 1.10+ bmedx 2017-12-21 13:21:06 -05:00
• 48f2431618 Merge pull request #17014 from edx/release-mergeback-to-master edx-pipeline-bot 2017-12-22 13:16:39 -05:00
• 6a0e17c183 Merge pull request #17026 from edx/mikix/fix-view-align Michael Terry 2017-12-22 13:14:16 -05:00
• ed509966f2 Merge pull request #17027 from edx/zoldak/TE-2352 Jesse Zoldak 2017-12-22 10:13:51 -08:00
• fe014690ef Fix a11y issues on course dashboard Michael Terry 2017-12-22 13:11:32 -05:00
• 30eafbff65 fixup! Install recent version of sqlite/pysqlite to fix crashes in tests. John Eskew 2017-12-22 13:05:47 -05:00
• 7ec06503b9 Install recent version of sqlite/pysqlite to fix crashes in tests. John Eskew 2017-12-19 13:59:48 -05:00
• 2c3afb232b ENT-779 Remove ProviderConfig.drop_existing_session field from DB. Douglas Hall 2017-12-22 12:34:29 -05:00
• ce15435ec2 Merge pull request #17024 from edx/douglashall/upgrade_enterprise_0_58_0 Douglas Hall 2017-12-22 12:07:14 -05:00
• dd93e67b5d Force regrade on enrollment track change. Sofiya Semenova 2017-12-18 16:30:27 -05:00
• 00f6b36a49 Refactor reset-test-db.sh script and allow for an option to rebuild the cache Jesse Zoldak 2017-12-22 11:33:57 -05:00
• bc72c28a03 Remove unnecessary patches to User::is_authenticated bmedx 2017-12-20 16:36:26 -05:00
• e4867d3841 Only upgrade active enrollments for entitlements Michael LoTurco 2017-12-21 17:21:59 -05:00
• f9d50526e3 Merge pull request #17022 from edx/estute/fix-paver-six-issues-for-tox Stu Young 2017-12-22 11:18:32 -05:00
• c065707e5d Fix button alignment on program dash Michael Terry 2017-12-22 11:12:24 -05:00
• f5bc89f1b5 Only upgrade active enrollments for entitlements Michael LoTurco 2017-12-21 17:21:59 -05:00
• c3c21b514d Merge pull request #16730 from edx/estute/run-coverage-against-target-branch Stu Young 2017-12-22 10:23:21 -05:00
• dda48451ff Upgrade edx-enterprise package to 0.58.0. Douglas Hall 2017-12-22 10:10:30 -05:00
• 471f914f00 install paver after other requirements Stuart Young 2017-12-22 09:55:59 -05:00
• 486f9578b7 Merge pull request #16856 from open-craft/mtyaka/template-block-overrides Matt Tuchfarber 2017-12-22 09:14:02 -05:00
• f6e0c70232 Merge pull request #16987 from edx/douglashall/ENT-779_remove_tpa_flag_refs Douglas Hall 2017-12-22 09:07:08 -05:00
• beff9f42ee Merge pull request #16919 from edx/zub/ENT-768-display-friendly-error-message-for-saml Zubair Afzal 2017-12-22 18:33:30 +05:00
• 2e517ac095 run coverage against target branch Stuart Young 2017-11-30 14:18:02 -05:00
• 37dc15779a Merge pull request #17013 from edx/McKenzieW/learner-3704 Fred Smith 2017-12-22 08:08:57 -05:00
• d7502acc5b ENT-768 display friendly error message for saml rejection zubair-arbi 2017-12-15 15:09:47 +05:00
• f6f29ca49e Allow theme template block overrides. Chandrakant Gopalan 2017-08-31 13:37:05 -04:00
• 579435bcd7 Merge branch 'master' into release-mergeback-to-master Harry Rein 2017-12-21 16:50:24 -05:00
• 4e7fffa70f Remove cms/static/coffee/fixtures symlink. David Ormsbee 2017-12-21 16:40:18 -05:00
• 9cc4b4b609 fix entitlement eemail settings list item class McKenzie Welter 2017-12-21 16:40:09 -05:00
• 0d2921bf23 Merge pull request #17011 from edx/McKenzieW/revertlearner-3407 Feanil Patel 2017-12-21 16:37:01 -05:00
• a422190ec9 Revert "fix list item class" McKenzie Welter 2017-12-21 16:36:04 -05:00
• 42143114a5 fix list item class McKenzie Welter 2017-12-21 16:32:03 -05:00
• 62b025e889 Merge pull request #17008 from edx/HarryRein/entitlements-without-sessions Harry Rein 2017-12-21 15:40:49 -05:00
• b09f4fabf1 Show more sessions coming soon for entitlements without sessions. Harry Rein 2017-12-21 15:29:53 -05:00
• b6f45955f5 Merge pull request #15803 from open-craft/replaceafill/OC-2594 Muhammad Ammar 2017-12-22 01:29:24 +05:00
• 35373db222 Upgrade edx-proctoring to 1.3.4 Tyler Hallada 2017-12-21 14:46:30 -05:00
• d8494483c1 ENT-779 Remove code references to ProviderConfig.drop_existing_session. Douglas Hall 2017-12-20 15:46:39 -05:00
• 29bacacaa3 Merge pull request #17000 from edx/mikix/LEARNER-3665 Michael Terry 2017-12-21 14:14:18 -05:00
• 09468f3f0e Merge pull request #16999 from edx/mikix/LEARNER-3668 Michael Terry 2017-12-21 14:14:03 -05:00