Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• be14aef51c Add tox.ini to enable tox testing. John Eskew 2017-09-12 16:09:32 -04:00
• 4de2ad4c25 Upgrade lxml to use pre-built pkg - no longer requires Cython. John Eskew 2017-09-14 11:14:33 -04:00
• 617085b5d1 Move psutil req from paver to base - used in non-test code. John Eskew 2017-09-14 11:13:22 -04:00
• 550c1e0725 Use simpler contract spec to fix parsing error. John Eskew 2017-09-14 10:45:11 -04:00
• 2194d390c8 Remove memory dump signal until meliae packaging issues are resolved. John Eskew 2017-09-12 16:01:20 -04:00
• 9d93c75089 Remove unused EASE requirement. John Eskew 2017-09-12 15:58:24 -04:00
• 8eb5945e39 Move Django requirement into separate file to enable tox testing. John Eskew 2017-09-12 15:57:48 -04:00
• 167472da84 Merge pull request #16072 from open-craft/uman/ent-0.46.8 Douglas Hall 2017-09-25 10:09:35 -04:00
• 2d19136beb Merge pull request #16009 from edx/jmbowman/pytest_unit_tests Brian Beggs 2017-09-25 08:57:01 -04:00
• eb463bbd0d Merge branch 'master' into cliff/pb-v2.7.7 Cliff Dyer 2017-09-22 16:29:08 -04:00
• c1bdc75c0c Merge pull request #16080 from edx/HarryRein/profile-section-stacking-issue Diana Huang 2017-09-22 16:11:52 -04:00
• ca97e946a6 Switch to pytest for unit tests Jeremy Bowman 2017-09-12 17:21:26 -04:00
• ab44ea2b26 Merge pull request #16079 from edx/HarryRein/messaging-within-messaging-bug Diana Huang 2017-09-22 16:01:41 -04:00
• 2ed389c7b0 Fix issue with stacking on learner profile. Harry Rein 2017-09-22 15:00:51 -04:00
• 925cc7b850 Merge pull request #16078 from edx/diana/hide-explore-courses Diana Huang 2017-09-22 14:44:51 -04:00
• fcf5f03b2d Fix issue with course message classes. Harry Rein 2017-09-22 14:38:04 -04:00
• 56676d821d Merge pull request #16077 from edx/naa/grades-refactor Nimisha Asthagiri 2017-09-22 14:03:05 -04:00
• f7b5066bf9 Only show 'Explore New Courses' button when courses are browsable. Diana Huang 2017-09-22 12:10:49 -04:00
• 75c22f563b Merge pull request #16071 from edx/HarryRein/LEARNER-2471-safari-sock-issue Harry Rein 2017-09-22 13:09:54 -04:00
• 3088c70f25 only override the upgrade deadline in self-paced courses Gabe Mulley 2017-09-12 08:28:07 -04:00
• 2fa8fa2249 Merge branch 'master' into HarryRein/LEARNER-2471-safari-sock-issue Harry Rein 2017-09-22 12:17:15 -04:00
• 990a8cbfe6 Merge pull request #16008 from edx/HarryRein/LEARNER-2307-course-goal-messaging Harry Rein 2017-09-22 11:53:11 -04:00
• 22edaf7d24 Grades: move out of temporary new folder EDUCATOR-1400 Nimisha Asthagiri 2017-09-21 21:05:00 -04:00
• bdb078d027 Merge pull request #16075 from edx/naa/grades-remove-old-commands Nimisha Asthagiri 2017-09-22 11:43:02 -04:00
• afe35acf80 Fixing sock issue on master in safari. Harry Rein 2017-09-21 16:03:07 -04:00
• 00dadc3a3a EDUCATOR-1402 | Fix flaky generate_course_overview test. Alex Dusenbery 2017-09-22 09:27:35 -04:00
• bc76ffe5dc Add message for setting course goal. Harry Rein 2017-09-11 10:43:24 -04:00
• b2c6a53448 Grades cleanup: remove no longer needed management commands EDUCATOR-178 Nimisha Asthagiri 2017-09-22 09:18:43 -04:00
• a58df6c0fa Merge pull request #16027 from edx/dahlia/waffle Eric Fischer 2017-09-22 08:06:12 -04:00
• a8df3d8844 Bump edx-enterprise to 0.46.8. Uman Shahzad 2017-09-22 04:40:33 +05:00
• 10a065990b Merge pull request #16064 from open-craft/uman/ent-0.46.5 Douglas Hall 2017-09-22 05:47:16 -04:00
• 6355604b51 Ignore pending migrations for edx-enterprise temporarily. Uman Shahzad 2017-09-22 02:30:04 +05:00
• 5c88600fbf Merge pull request #16048 from edx/sstudent/EDUCATOR-1288 sanfordstudent 2017-09-21 16:48:46 -04:00
• ac80183343 Add studio-frontend to studio, if waffle flag set Eric Fischer 2017-09-21 16:32:06 -04:00
• a830073bb2 Add waffle flag for NewAssetsPage Eric Fischer 2017-09-21 16:31:46 -04:00
• d0e68f2d24 recalculate course grade on user partition change Sanford Student 2017-09-18 14:28:05 -04:00
• cc15081399 Merge pull request #16068 from edx/McKenzieW/learner-2457 McKenzie Welter 2017-09-21 14:27:05 -04:00
• fab1769be4 update nudge templates Gabe Mulley 2017-09-20 08:01:17 -04:00
• f846442233 language --> content_language and get_fields() actually returns McKenzie Welter 2017-09-06 09:03:43 -04:00
• c1150578b7 Fix flaky test: J. Cliff Dyer 2017-09-21 12:20:25 -04:00
• de0380ca0e Merge pull request #16017 from edx/diana/profile-messaging Andy Armstrong 2017-09-21 11:35:42 -04:00
• e99c4c4d3a Bump problem-builder requirement to 2.7.7. J. Cliff Dyer 2017-09-21 11:33:11 -04:00
• d89afa0832 EDUCATOR-1207 | Run generate_course_overview command via celery task, in batches. Alex Dusenbery 2017-09-19 11:05:31 -04:00
• 74f1975afb Merge pull request #16063 from edx/release-mergeback-to-master Fred Smith 2017-09-21 11:19:48 -04:00
• c66c04d937 Merge pull request #16059 from open-craft/cliff/pb-v2.7.6 Feanil Patel 2017-09-21 11:00:50 -04:00
• cbfea6515d Add new info message to profile page. Diana Huang 2017-09-12 11:15:35 -04:00
• 69a875a0de Bump edx-enterprise to 0.46.7. Uman Shahzad 2017-09-21 14:06:19 +05:00
• 39cf0b44b5 Merge pull request #16056 from edx/tasawer/learner-2580/add-single-support-form Tasawer Nawaz 2017-09-21 16:48:55 +05:00
• 07db2613d7 add single support form for contact us, html and css only LEARNER-2580 tasawernawaz 2017-09-19 19:29:52 +05:00
• e785074560 Merge pull request #16053 from open-craft/uman/ent-0.46.4 Uman Shahzad 2017-09-21 13:51:32 +05:00
• c68ad09773 Merge pull request #16002 from edx/andya/studio-sass-linting Andy Armstrong 2017-09-20 20:57:37 -04:00
• 673c60d4b0 Merge pull request #16051 from edx/efischer/build_on_bbeggs Eric Fischer 2017-09-20 15:43:48 -04:00
• 2faf3b1dfe Merge pull request #16052 from edx/ssemenova/flakey-test Sofiya Semenova 2017-09-20 14:59:14 -04:00
• f7a7fbd39b Merge pull request #16006 from edx/mroytman/EDU-1165 Michael Roytman 2017-09-20 14:41:25 -04:00
• 0971a2784a Allow watch_assets observer to use custom timeout value Brian Beggs 2017-09-18 19:14:35 -04:00
• 282220dae5 refactor and add multiple filter functionality Michael Roytman 2017-09-12 10:58:52 -04:00
• bf3ecc6715 Revert "Initialize enterprise api client with provided user" Douglas Hall 2017-09-20 09:55:02 -04:00
• 247f2835c1 Merge pull request #16060 from edx/revert-16001-zub/ENT-624-access-enterprise-api-with-request-user Douglas Hall 2017-09-20 11:04:10 -04:00
• b40ba4437b Merge pull request #16042 from edx/ssemenova/ed-1233 Sofiya Semenova 2017-09-20 10:22:11 -04:00
• bf47ba855f Merge pull request #16014 from edx/bmedx/upgrade_django_openid_auth Brian Mesick 2017-09-20 09:56:19 -04:00
• 610a4100af Revert "Initialize enterprise api client with provided user" Douglas Hall 2017-09-20 09:55:02 -04:00
• 3e06d68112 Merge pull request #16025 from edx/aj/handle-rate-limit-s3 Awais Jibran 2017-09-20 18:47:50 +05:00
• c25925c0e4 Merge pull request #16055 from edx/noraiz/EDUCATOR-1218 Noraiz Anwar 2017-09-20 16:04:32 +05:00
• 6f5a4d54c2 upgrade lti-consumer xblock noraiz-anwar 2017-09-20 14:43:05 +05:00
• 0ffac802e8 Bump edx-enterprise to 0.46.4. Uman Shahzad 2017-09-20 05:16:52 +05:00
• b6aff95ab1 Removed flakey test Sofiya Semenova 2017-09-19 16:36:03 -04:00
• 19e7d1e0cf Ed-1233 replace flaky bokchoy test with python test Sofiya Semenova 2017-09-18 17:25:25 -04:00
• 42829bd272 EDUCATOR-1103 | Restrict the number of courses to run a single opt-in query for. Alex Dusenbery 2017-09-18 12:13:11 -04:00
• 7a87509660 Merge pull request #16050 from edx/nedbat/fix-early-translation Ned Batchelder 2017-09-19 15:17:02 -04:00
• 9a2d2931a8 Merge pull request #16049 from edx/tuchfarber/update_enterprise_version Matt Tuchfarber 2017-09-19 15:00:19 -04:00
• 253c6fba24 Have to use ugettext_lazy for import-time translations Ned Batchelder 2017-09-19 14:11:05 -04:00
• b55525eb76 Bump edx-enterprise version Matt Tuchfarber 2017-09-19 14:04:31 -04:00
• ab71318104 EDUCATOR-1316 | Refactor courseware.views.views._get_cert_data and related functions. Alex Dusenbery 2017-09-11 11:32:07 -04:00
• 9fe4d09c94 Bump problem-builder to 2.7.6. J. Cliff Dyer 2017-09-19 10:20:39 -04:00
• fd07dea0e8 Merge pull request #16001 from edx/zub/ENT-624-access-enterprise-api-with-request-user Zubair Afzal 2017-09-19 18:14:06 +05:00
• 16120efaeb Initialize enterprise api client with provided user ENT-624 zubair-arbi 2017-09-12 14:32:59 +05:00
• 8fb993dcca Fix validation issues with Studio Sass files Andy Armstrong 2017-09-12 07:30:36 -04:00
• d62e249834 Merge pull request #15996 from edx/ssemenova/ed-1319 Sofiya Semenova 2017-09-18 13:09:36 -04:00
• 84c8fa3072 EDUCATOR-1371 | Turn off excessive SubsectionGradeFactory logging. Alex Dusenbery 2017-09-15 16:21:30 -04:00
• 3b34db29ff ED-1319 Cert not accessible by learner Sofiya Semenova 2017-09-11 13:27:02 -04:00
• 64e1b201e6 Merge pull request #16037 from edx/douglashall/ENT=640 Douglas Hall 2017-09-18 11:25:26 -04:00
• 3828f31c74 Upgrade edx-enterprise to version 0.46.1. Douglas Hall 2017-09-18 10:04:45 -04:00
• 89656d08fc Merge pull request #16036 from edx/tasawer/learner-2555-change-django-admin-titles-in-cms-and-lms Tasawer Nawaz 2017-09-18 18:19:53 +05:00
• 3d15bdca58 Merge pull request #16028 from edx/ret/log-level-per-message Nimisha Asthagiri 2017-09-18 08:51:56 -04:00
• ef5e656094 Merge pull request #16034 from edx/tasawer/learner-2450/translate-validation-message Tasawer Nawaz 2017-09-18 17:42:23 +05:00
• 8218d8265d change django admin titles in CMS and LMS LEARNER-2555 tasawernawaz 2017-09-18 15:23:08 +05:00
• 79915b3704 BOTO:S3 handle rate limit exceed and do not expose 500 errors Awais Jibran 2017-09-15 18:01:40 +05:00
• 510dcd14ed fix untranslated validation message on course grader LEARNER-2450 tasawernawaz 2017-09-18 14:51:53 +05:00
• f2d51639ba FIX: course enrollment search, FIX: hidden tabs on instructor dashboard Nico van Niekerk 2017-09-18 09:34:46 +02:00
• 813007bb49 Schedules/ACE - support debug logging via waffle Nimisha Asthagiri 2017-09-15 14:08:55 -04:00
• 468fd9991c Merge pull request #16029 from edx/aj/up-proctoring-to-1.2.1 Awais Jibran 2017-09-16 12:58:55 +05:00
• be68ae21e6 Merge pull request #16031 from edx/douglashall/ENT-610 Douglas Hall 2017-09-15 19:21:37 -04:00
• 5b1c3f4906 Merge pull request #16033 from edx/bfiller/WL-1221 Bill Filler 2017-09-15 17:05:40 -04:00
• efa0ef4ae8 Upgrade edx-enterprise to 0.46.0 Bill Filler 2017-09-15 16:33:16 -04:00
• cafef98aa4 ENT-610 Convert CourseKey to string before passing to data sharing consent check function. Douglas Hall 2017-09-15 15:58:39 -04:00
• bbe18f0dc5 Merge pull request #16011 from edx/McKenzieW/learner-2457 McKenzie Welter 2017-09-15 15:57:19 -04:00
• ee6899592a Upgrade proctoring to 1.2.1 Awais Jibran 2017-09-16 00:17:52 +05:00
• 531a51f75c Added util method to retrieve individual course_run data from Catalog McKenzie Welter 2017-09-06 09:03:43 -04:00
• 53d52964ba Merge pull request #15952 from edx/McKenzieW/learner-1994 McKenzie Welter 2017-09-15 10:15:47 -04:00
• f2ad2601f7 Upgrade edx-django-openid-auth to 0.14 bmedx 2017-09-15 09:18:44 -04:00