Commit Graph

  • 1c6c1654be Add the creator of a team to that team. Diana Huang 2015-07-31 15:35:17 -04:00
  • 2e3242eec9 Merge pull request #9165 from edx/vkaracic/TNL-394-confirmation-msg Vedran Karačić 2015-08-04 21:39:43 +02:00
  • 69e9ac1a40 Exposing course verification deadline via Commerce API Clinton Blackburn 2015-08-03 15:13:15 -04:00
  • 38d7a12f63 Exposing course name via Commerce API Clinton Blackburn 2015-08-03 08:48:34 -04:00
  • f273c5a7e6 Merge pull request #9175 from edx/clintonb/commerce-api-course-verification-deadline Clinton Blackburn 2015-08-04 14:34:01 -04:00
  • ff243eaa70 Merge pull request #9187 from edx/release Ned Batchelder 2015-08-04 14:18:50 -04:00
  • 6d16da7339 Merge pull request #9015 from edx/aj/tnl2857-mathjax-probelm-in-problem-hints Awais Jibran 2015-08-04 23:12:03 +05:00
  • 99cd48c858 Merge pull request #9179 from edx/aj/tnl2855-depricated-blocks-in-edge Awais Jibran 2015-08-04 23:09:00 +05:00
  • b2b40e2770 Exposing course verification deadline via Commerce API Clinton Blackburn 2015-08-03 15:13:15 -04:00
  • ba5da45141 Add circle configuration Bertrand Marron 2015-06-27 14:55:45 +02:00
  • 8477146ca8 Merge pull request #9189 from edx/ned/fix-django-debug-toolbar-settings Ned Batchelder 2015-08-04 12:56:29 -04:00
  • 8476baf4dd We should only add the DjDT urls if it is enabled. Ned Batchelder 2015-08-04 11:01:45 -04:00
  • 69be9000ab Merge pull request #9153 from edx/rc/2015-08-04 Ned Batchelder 2015-08-04 10:38:49 -04:00
  • 009e8a1050 Merge pull request #9085 from edx/dsjen/return-courses-via-roles Dennis Jen 2015-08-04 09:37:23 -04:00
  • ceb5655b2d Merge pull request #9171 from edx/ned/update-pylint Ned Batchelder 2015-08-04 09:28:35 -04:00
  • 10d4d0ba06 SOL-1035 asadiqbal 2015-08-04 18:23:21 +05:00
  • 1ac90573ae Fixed ORA1 deprecated warning message when a component does not have a display_name TNL-2855 Awais Jibran 2015-08-04 14:43:42 +05:00
  • 0fb1bf6ff9 Fixed confirmation message display for StaffDebug actions vkaracic 2015-07-24 08:17:57 +00:00
  • f54fe787c6 Remove needless 'disable=no-member' pragmas Ned Batchelder 2015-08-03 16:59:57 -04:00
  • 0e3be9de80 Merge pull request #9123 from edx/jsa/xcom-442 Jim Abramson 2015-08-03 17:06:24 -04:00
  • f0d1772da3 Optimize OpenID Course Claims for non-global-staff users. Dennis Jen 2015-07-27 11:38:02 -04:00
  • 6e0013c4cc Merge pull request #9174 from edx/clintonb/commerce-api-course-name Clinton Blackburn 2015-08-03 16:02:18 -04:00
  • ee0f4b2594 Remove 'pylint: disable=no-value-for-parameter' that we no longer need. Ned Batchelder 2015-08-03 15:44:29 -04:00
  • 880da5a09d Exposing course name via Commerce API Clinton Blackburn 2015-08-03 08:48:34 -04:00
  • 53db053c18 Merge pull request #8986 from jazkarta/remove-ccx-enrollment Peter Pinch 2015-08-03 13:18:41 -04:00
  • 386a8a27dd Merge pull request #8936 from edx/db/remove-unneeded-template-block David Baumgold 2015-08-03 13:13:58 -04:00
  • a9de5c90a4 Merge pull request #9050 from edx/christina/tnl-2677 Diana Huang 2015-08-03 12:56:35 -04:00
  • ffc8a11789 Merge pull request #9092 from cpennington/user-state-client-tests John Eskew 2015-08-03 12:25:05 -04:00
  • 25ff53539d Merge pull request #9168 from edx/marco/TNL-2946/capa/styling-fixes Marco Morales 2015-08-03 11:50:05 -04:00
  • 52acdae60c Update pylint and astroid, reduces pylint count by 400 Ned Batchelder 2015-08-03 11:49:54 -04:00
  • eaeb3256ab Merge pull request #9158 from edx/release Will Daly 2015-08-03 08:42:28 -07:00
  • 051e838ffb Merge pull request #9166 from edx/peter-fogg/team-chat-icon Peter Fogg 2015-08-03 11:09:39 -04:00
  • d3986c88f1 Merge pull request #9161 from edx/andya/fix-forums-bug Ned Batchelder 2015-08-03 10:58:13 -04:00
  • 90fcf4646a adds back in correct and incorrect styling for annotations problems Marco Morales 2015-07-31 15:48:25 -04:00
  • b47922cea0 Make team chat icon appear. Peter Fogg 2015-08-03 10:06:38 -04:00
  • 7adaa22186 Remove unneeded block from courses.html template David Baumgold 2015-07-15 14:42:11 -04:00
  • d98354d05d Merge pull request #9133 from edx/andya/remove-mustache-from-discussions Andy Armstrong 2015-08-01 20:48:50 -04:00
  • 540e8464d9 Remove Mustache usage from discussions Andy Armstrong 2015-07-30 11:02:06 -04:00
  • 8aa2d67b6d Merge pull request #8946 from edx/lliu/view-course-access Linda Liu 2015-08-01 13:55:25 -04:00
  • 83c10331fa Add a test of submission history display Calen Pennington 2015-07-29 16:03:05 -04:00
  • 6ba611cb5f Remove remove_input_state.py, as it was one-time fix code, and is not worth porting to the new interface Calen Pennington 2015-07-28 14:43:27 -04:00
  • aa374ca12a Make DjangoXBlockUserStateClient pass semantic tests Calen Pennington 2015-07-27 14:36:02 -04:00
  • 53b37e7412 Remove extraneous documentation, contracts, and method definitions Calen Pennington 2015-07-27 14:31:47 -04:00
  • 704ae7139a Add a subclass-implementation of the UserStateClient tests Calen Pennington 2015-07-27 14:31:06 -04:00
  • 458ed0a64e Use the standard enrollment table instead of a custom CCX table for CCX enrollments. Carlos de la Guardia 2015-07-13 06:16:15 -05:00
  • 6530d5e3ec Merge pull request #9160 from edx/benmcmorran/dont-cohort-teams Ben McMorran 2015-07-31 21:46:56 -04:00
  • 96e14e3f8b Fix forums escaping bug Andy Armstrong 2015-07-31 19:40:04 -04:00
  • 3de9a9b44a Merge pull request #9156 from edx/utkjad/Removing_@contract_from_DXUSC_inuser_state_client.py Utkarsh 2015-07-31 16:34:41 -04:00
  • 6d48e1360d Extend is_commentable_cohorted to support teams Ben McMorran 2015-07-31 20:22:31 +00:00
  • f286152f5a ECOM-1947: updated the middleware to exclude the password strings from event logging aamir-khan 2015-07-29 18:49:33 +05:00
  • b85b50d11a Removing @contract utkjad 2015-07-31 17:44:16 +00:00
  • b06e46c1db Merge pull request #9113 from edx/christina/team-discussion-permissions Christina Roberts 2015-07-31 12:32:30 -04:00
  • 614a92957c Correct email settings URL and rename variable. cahrens 2015-07-24 11:29:54 -04:00
  • 2e53b9e82c Merge pull request #9126 from edx/kyle/course-overviews-versioning Kyle McCormick 2015-07-31 11:22:58 -04:00
  • 337024bd98 Merge pull request #9150 from edx/ned/remove-changelog Ned Batchelder 2015-07-31 11:15:43 -04:00
  • 663b7b9c14 Merge pull request #23 from edx/hotfix/2015-07-30 Will Daly 2015-07-31 07:58:43 -07:00
  • 3a70b87787 Merge pull request #9143 from edx/benmcmorran/move-is-commentable-cohorted Ben McMorran 2015-07-31 10:43:53 -04:00
  • bc2892f2d3 Merge pull request #9142 from edx/diana/context-aware-comment-client Diana Huang 2015-07-31 10:29:29 -04:00
  • 10aae0d480 MA-1063 Add versioning and timestamping to CourseOverview Kyle McCormick 2015-07-30 11:13:00 -04:00
  • 848e72c770 Merge pull request #9134 from edx/sarina/allow-logistration-in-microsites Sarina Canelake 2015-07-31 10:26:19 -04:00
  • 1922980657 CHANGELOG is dead. Ned Batchelder 2015-07-31 10:17:50 -04:00
  • 7041b497b2 Merge branch 'derf/pymongo_2.8' of github.com:edx/edx-platform into derf/pymongo_2.8 Fred Smith 2015-07-31 10:07:12 -04:00
  • 10a0bc6f1d Merge pull request #9122 from jolyonb/questionfix Marco Morales 2015-07-31 09:52:02 -04:00
  • 2afc586a91 Merge pull request #8934 from edx/db/fix-python-saml-compile-issue David Baumgold 2015-07-31 09:43:23 -04:00
  • db2d8f6594 Allow microsites to use logistration page (ECOM-1976) Sarina Canelake 2015-07-30 11:20:59 -04:00
  • 3b483d14bc MA-851: Add access response information into view_course_access tlindaliu 2015-07-15 17:30:25 -04:00
  • e93462c73f Merge pull request #9148 from edx/sarina/20150731-translations-update Sarina Canelake 2015-07-31 09:26:35 -04:00
  • 50f920be3c Merge pull request #9135 from edx/renzo/always-allow-unenrollment Renzo Lucioni 2015-07-31 09:23:34 -04:00
  • c12c2933a7 Make context for threads more implicit. Diana Huang 2015-07-30 16:19:12 -04:00
  • a169b47c48 remove certificates menu if html certs not enabled Zia Fazal 2015-07-31 17:37:20 +05:00
  • 00af8222f6 Update translations (autogenerated message) Sarina Canelake 2015-07-31 08:23:49 -04:00
  • 050b747b1d Display start date, end date, and number of sections (weeks) on "Course Info" tab of instructor dashboard. Tim Krones 2015-07-24 20:50:33 +02:00
  • 614baab35a Merge pull request #9111 from edx/ziafazal/SOL-1077 Zia Fazal 2015-07-31 11:12:24 +05:00
  • 99f4ec210e Merge pull request #9145 from open-craft/bump-problem-builder Braden MacDonald 2015-07-30 15:20:53 -07:00
  • 7aa7664ea9 Bump problem builder version to avoid 500 error from PLAT-772 Braden MacDonald 2015-07-30 14:10:29 -07:00
  • 0662f12743 Merge pull request #9139 from edx/merge-release-into-master Will Daly 2015-07-30 14:07:14 -07:00
  • 9d3e2c1a08 Ignore team membership for privileged users. cahrens 2015-07-30 17:06:40 -04:00
  • 659db2eb7d Merge pull request #9125 from open-craft/sso-metadata-email-config Braden MacDonald 2015-07-30 13:59:49 -07:00
  • 4a78271851 Move is_commentable_cohorted to django_comment_client Ben McMorran 2015-07-30 20:23:42 +00:00
  • afeef4cb9e Fix setuptools infinite loop bug triggered by python-saml David Baumgold 2015-07-15 10:58:01 -04:00
  • 957c8144ca Upgrade MySQL-python to 1.2.5 David Baumgold 2015-07-15 11:17:17 -04:00
  • ebe8b25210 Upgrade setuptools to 18.0.1 David Baumgold 2015-07-15 11:16:17 -04:00
  • 46434582c8 Deactivate HTTPS on dev and devstack Albert Liang 2015-07-30 12:46:59 -07:00
  • b2545ce8a8 Merge pull request #9137 from edx/peter-fogg/test-team-list-fix Peter Fogg 2015-07-30 15:38:07 -04:00
  • 4848086175 Merge pull request #9130 from edx/clytwynec/js-diff-coverage Christine Lytwynec 2015-07-30 15:16:10 -04:00
  • a59be0f7f4 ECOM-1947: updated the middleware to exclude the password strings from event logging aamir-khan 2015-07-29 18:49:33 +05:00
  • 3e8eac90d2 Merge remote-tracking branch 'origin/release' into merge-release-into-master Will Daly 2015-07-30 11:43:19 -07:00
  • 50247472f0 Merge pull request #9136 from edx/patch/2015-07-29 Will Daly 2015-07-30 11:38:07 -07:00
  • 01c22531d7 Add team permission check on commentable_id. cahrens 2015-07-22 17:24:07 -04:00
  • 4131aa4d38 Allow enrollments in expired modes to be deactivated Renzo Lucioni 2015-07-29 15:53:18 -04:00
  • c9b65b0c2e Merge pull request #9131 from edx/revert-9037-vkaracic/TNL-394-confirmation-msg Vedran Karačić 2015-07-30 17:53:22 +02:00
  • 65eb26b7b4 Merge pull request #9004 from edx/dsego/discovery-ui-improvements Davorin Šego 2015-07-30 17:34:39 +02:00
  • 95b8d72347 Revert "Remove unnecessary DB call in team pagination." Peter Fogg 2015-07-30 10:52:13 -04:00
  • bf00fe0ecb Merge pull request #9124 from edx/jsa/no-course-discovery-in-devstack Jim Abramson 2015-07-30 10:33:06 -04:00
  • 7b01ed6171 Merge pull request #9102 from edx/peter-fogg/indices-teams Peter Fogg 2015-07-30 10:32:31 -04:00
  • 9ddf5c2e1e Revert "TNL-394: Fixed the confirmation message" Vedran Karačić 2015-07-30 16:09:48 +02:00
  • bb3a281a2b generate diff-coverage report in JS jenkins build Christine Lytwynec 2015-07-30 09:30:25 -04:00
  • a7f2b025a9 Delete null_handler.py Davorin Šego 2015-07-30 16:00:31 +02:00
  • ea183283bb Merge pull request #9073 from edx/ahsan/ECOM-1917-Copy-styling-for-credit-messages-on-dashboard Ahsan Ulhaq 2015-07-30 15:30:34 +05:00
  • 08165e8823 Update ICRV version Ahsan Ulhaq 2015-07-30 14:35:11 +05:00