Commit Graph

  • d9de52751d Merge remote-tracking branch 'origin/release' into bbeggs/2015-09-22-release-to-master Brian Beggs 2015-09-28 20:58:34 -04:00
  • cebc4ae0f8 Merge pull request #9936 from edx/revert-9929-bbeggs/merge-DRF-3.1 Ben Patterson 2015-09-28 19:19:19 -04:00
  • 2fd6add524 Revert "Merge DRF 3.1 in to master" Ben Patterson 2015-09-28 17:12:43 -04:00
  • 00473d44ac Merge pull request #9929 from edx/bbeggs/merge-DRF-3.1 Brian Beggs 2015-09-28 11:56:18 -04:00
  • 53524efbd8 Fixes for rebasing of the release on 2015-09-23 Brian Beggs 2015-09-22 20:26:07 -04:00
  • 322db6de7a TNL-3316: Error on Insights performance report Will Daly 2015-09-18 10:40:53 -07:00
  • d11ccad0fc Upgrade djangorestframework to v3.1 Will Daly 2015-08-31 08:15:12 -07:00
  • 78f8fc39e8 Merge pull request #9922 from edx/cdodge/proctoring-2015-10-01 David Baumgold 2015-09-28 11:37:11 -04:00
  • 7bac818395 Merge pull request #9831 from edx/patch/2015-09-22 Brian Beggs 2015-09-28 11:17:01 -04:00
  • fd7fe3d04d Merge pull request #9915 from edx/release Brian Beggs 2015-09-28 11:11:41 -04:00
  • 63ac2f1457 Merge pull request #9860 from edx/saleem-latif/SOL-1189 Matt Drayer 2015-09-28 10:05:28 -04:00
  • 5374f10daa Merge pull request #9925 from edx/saleem-latif/MAYN-131 Matt Drayer 2015-09-28 10:01:44 -04:00
  • ad5aab4cc1 Merge pull request #9666 from edx/marco/UX-2586/discussions-profile-photos Marco Morales 2015-09-28 09:12:42 -04:00
  • 5b985a5914 updated error message Saleem Latif 2015-09-28 15:38:13 +05:00
  • d570866c69 Merge pull request #9432 from edx/shr/bug/PLAT-799-prevent-published-orphan-creation Syed Hasan raza 2015-09-28 02:16:25 -07:00
  • 3b650133bf bump version of edx-proctoring to 0.9.11 Chris Dodge 2015-09-27 14:52:03 -04:00
  • ca595deea5 A script to extract useful information from nosetests.xml files Ned Batchelder 2015-09-27 09:34:10 -04:00
  • e58fe799d8 Merge pull request #9917 from edx/cdodge/put-back-icon-indicator chrisndodge 2015-09-25 20:16:28 -04:00
  • 8a796675c9 bump edx-proctoring to 0.9.10 Chris Dodge 2015-09-22 19:47:32 -04:00
  • 144c347387 Fixes for rebasing of the release on 2015-09-23 Brian Beggs 2015-09-22 20:26:07 -04:00
  • d6c7d8d383 TNL-3316: Error on Insights performance report Will Daly 2015-09-18 10:40:53 -07:00
  • 8555630df7 Upgrade djangorestframework to v3.1 Will Daly 2015-08-31 08:15:12 -07:00
  • 7b980b82e8 edx-procoting will be passing back which font-awesome icon to use Chris Dodge 2015-09-25 12:13:34 -04:00
  • 80dafc2133 Merge pull request #9506 from edx/clytwynec/AC-157 Christine Lytwynec 2015-09-25 08:58:26 -04:00
  • b98956bdf6 Merge pull request #9672 from open-craft/tpa-providers-api Braden MacDonald 2015-09-24 15:52:52 -07:00
  • 9fbb280a9c Don't repeat the word 'standard' David Baumgold 2015-09-24 17:10:00 -04:00
  • 2dc5b8e89c make verifyElementInFocus a ViewHelpers method Christine Lytwynec 2015-09-24 16:25:49 -04:00
  • 5ad3ed4d38 Merge pull request #9899 from edx/clrux/ac-76-fixup clrux 2015-09-24 14:59:01 -04:00
  • b49f9104b8 LMS: replacing proctoring markup from accordion Chris Rodriguez 2015-09-23 16:13:32 -04:00
  • 5316cbee02 Merge pull request #8809 from edx/zoldak/update-sinon Andy Armstrong 2015-09-24 13:17:03 -04:00
  • 858ad528f1 Merge pull request #9906 from edx/markhoeber-add-api-doc-label Mark Hoeber 2015-09-24 12:46:28 -04:00
  • 8076da139c Merge pull request #9775 from edx/clrux/ac-147 clrux 2015-09-24 12:08:14 -04:00
  • 60c439c93b Merge pull request #9898 from edx/benp/fix-jshint-report-diff-qual Ben Patterson 2015-09-24 11:59:23 -04:00
  • c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY Bill DeRusha 2015-09-22 17:23:01 -04:00
  • a57802ebc7 Flag test as flaky. Ben Patterson 2015-09-24 11:36:41 -04:00
  • 4f14d4f75b Bump version of segemnt's analytics-python package to 1.1.0 Bill DeRusha 2015-09-22 10:56:49 -04:00
  • c2c665cbf7 Merge pull request #9894 from edx/benp/diff-cover-js Ben Patterson 2015-09-24 11:14:57 -04:00
  • e3035a8fab LMS: a11y contrast fixes for find course page Chris Rodriguez 2015-09-15 15:55:47 -04:00
  • cf5d5666a3 Merge pull request #9794 from edx/efischer/prevent_doubleclick Eric Fischer 2015-09-24 11:01:43 -04:00
  • 56dae32308 Merge pull request #9773 from edx/clrux/ac-173 clrux 2015-09-24 10:57:58 -04:00
  • 29a7db12c3 Merge pull request #9772 from edx/clrux/ac-172 clrux 2015-09-24 10:57:03 -04:00
  • 1aa181c90a Update sinon to version 1.17.0 Jesse Zoldak 2015-07-07 14:41:03 -04:00
  • 45176c7254 Merge pull request #9868 from louyihua/i18n_fix Ned Batchelder 2015-09-24 10:23:58 -04:00
  • e51c4f23d3 Merge pull request #9822 from edx/saleem-latif/SOL-565 Matt Drayer 2015-09-24 10:19:43 -04:00
  • 02b72abccb Disable button while running Eric Fischer 2015-09-17 14:14:59 -04:00
  • 334999180f Add main index api doc label for inter sphinx Mark Hoeber 2015-09-24 09:52:28 -04:00
  • c608c6bdd3 Fix library error dialog link in Import/Export API Brandon DeRosier 2015-07-15 16:12:42 -04:00
  • 3ff344559c Revert "Revert "Add feature flag for Import/Export API in LMS"" Brandon DeRosier 2015-07-15 16:31:59 -04:00
  • edf7d9965e Revert "Revert "edX Course/Library Import/Export API"" Brandon DeRosier 2015-07-15 16:31:40 -04:00
  • 66678c103f i18n fix louyihua 2015-09-24 13:02:12 +08:00
  • decdb11710 Merge pull request #9858 from edx/andya/improve-sinon-ajax-handling Andy Armstrong 2015-09-23 21:26:58 -04:00
  • b2a0b2f728 Improve response handling in AjaxHelpers Andy Armstrong 2015-09-21 17:21:44 -04:00
  • 7280a58711 Merge pull request #9885 from edx/andya/teams-router-testing Andy Armstrong 2015-09-23 19:53:30 -04:00
  • 5e2290f9ed Merge pull request #9726 from edx/aleffert/all-responsive Akiva Leffert 2015-09-23 19:10:50 -04:00
  • a5a575a056 Merge pull request #9887 from edx/ned/faster-pyc-cleaning Ned Batchelder 2015-09-23 19:04:52 -04:00
  • a9643c6723 Merge pull request #9896 from edx/mattdrayer/release/SOL-1230 Brian Beggs 2015-09-23 18:49:32 -04:00
  • 969cf76630 Merge pull request #9895 from edx/frances/ondemand-progress-bug Brian Beggs 2015-09-23 18:49:20 -04:00
  • e9fceb8bc2 Merge pull request #9891 from edx/release Brian Beggs 2015-09-23 18:09:01 -04:00
  • 06998ead16 Merge pull request #9867 from edx/feanil/update_requests Feanil Patel 2015-09-23 17:09:07 -04:00
  • 9b758379d8 i18n course browse copy David Baumgold 2015-09-23 16:19:42 -04:00
  • 4acde8e1fc Use correct reports for jshint diff-quality. Ben Patterson 2015-09-23 16:13:57 -04:00
  • 73e976ae85 Remove "responsive" check before deciding whether to add a viewport tag. Akiva Leffert 2015-09-11 14:06:58 -04:00
  • a6ad7c1c2b Merge pull request #9897 from edx/revert-9803-usman/use-included-staticfiles-app Brian Beggs 2015-09-23 15:52:51 -04:00
  • c26bb9188a Revert "Upgrade django-pipeline and staticfiles" Brian Beggs 2015-09-23 15:52:24 -04:00
  • 4c05fa4f49 Merge pull request #9803 from edx/usman/use-included-staticfiles-app Brian Beggs 2015-09-23 15:50:39 -04:00
  • 2bd26fc0e4 fixed bug in certificate html view Zia Fazal 2015-09-22 16:08:56 +05:00
  • 0b64f2d612 Merge pull request #9525 from edx/clrux/ac-76 clrux 2015-09-23 14:26:10 -04:00
  • 23dfcf1bb3 TE-1042 include diff-cover for js. Ben Patterson 2015-09-23 14:16:35 -04:00
  • 210be884bf A faster way to clean the .pyc files Ned Batchelder 2015-09-23 10:23:44 -04:00
  • 508ded2673 LMS: course navigation menu refactor Ahsan Ulhaq 2015-04-22 16:16:06 +05:00
  • d09034e065 Improve team testing of routers Andy Armstrong 2015-09-23 09:08:53 -04:00
  • b7a432c2eb Merge pull request #9786 from OmarIthawi/edraak/descriptive-dashboard-title Sarina Canelake 2015-09-23 13:05:08 -04:00
  • d75a36a347 Merge pull request #9853 from edx/bderusha/mailchimp-sync Bill DeRusha 2015-09-23 12:44:57 -04:00
  • 55e2a326cb Merge pull request #9835 from edx/rc/2015-09-22 Brian Beggs 2015-09-23 12:39:23 -04:00
  • a53903c46a Add team column to grade reports. Diana Huang 2015-09-14 09:49:18 -04:00
  • 3849a8fa81 prevent delete public oprhans Syed Hassan Raza 2015-09-09 11:20:27 -07:00
  • 10e07d0f3e Merge branch 'hotfix/2015-09-21' into rc/2015-09-22 Brian 2015-09-23 08:40:22 -04:00
  • ad7db1b5db Merge pull request #9883 from edx/hotfix/2015-09-21 Brian Beggs 2015-09-23 08:31:18 -04:00
  • 05a72486f3 date format "Monday at 3pm UTC" added for courses starting with-in 5 days Saleem Latif 2015-09-17 17:22:15 +05:00
  • 5a740961a4 override wrapper-msg styles for auto-cert Frances Botsford 2015-09-22 16:27:46 -04:00
  • d8d49f7544 Merge pull request #9606 from Colin-Fredericks/ColinF-PC-not-dropdown Sarina Canelake 2015-09-22 15:10:13 -04:00
  • 779861550f Upgrade to the latest version of requests. Feanil Patel 2015-09-22 13:33:35 -04:00
  • 358f8056dd Merge pull request #9345 from open-craft/smarnach/enrollment-api Jim Abramson 2015-09-22 13:22:50 -04:00
  • 350387c0a9 TNL-3197 Partial Credit (not Dropdown) Colin-Fredericks 2015-09-02 14:35:47 -04:00
  • fac7b24872 Merge pull request #9863 from edx/ziafazal/SOL-1230 Matt Drayer 2015-09-22 12:30:21 -04:00
  • 028c0fa4f7 Merge pull request #9802 from edx/asadiqbal08/SOL-1212 Matt Drayer 2015-09-22 11:41:35 -04:00
  • 158bdf4d09 Use django.contrib.staticfiles instead of django-staticfiles. Usman Khalid 2015-09-08 01:47:11 +05:00
  • 1e799eb508 Upgrade to django-pipeline v.1.5.3. Usman Khalid 2015-09-03 22:14:34 +05:00
  • 5de93a3ad1 Merge pull request #9850 from edx/asadiqbal08/SOL-1188-fix Matt Drayer 2015-09-22 11:38:00 -04:00
  • 242c4c83f6 Merge pull request #9759 from edx/jia/MA-1212 wajeeha-khalid 2015-09-22 19:43:05 +05:00
  • ccc43cfe98 Add mailchimp list fields and config for new users Bill DeRusha 2015-09-18 17:19:59 -04:00
  • 8e9e94df43 Merge pull request #9847 from edx/jia/MA-1305 wajeeha-khalid 2015-09-22 18:45:25 +05:00
  • d9dbc1f24b Merge pull request #9793 from edx/zoldak/django-session-cookie Jesse Zoldak 2015-09-22 09:28:42 -04:00
  • 396beadd97 SOL-1122 update github.txt reference asadiqbal 2015-09-17 11:24:53 +05:00
  • ab4d85a5d1 MA-1305 - formatted author label to Staff & Community TA wajeeha-khalid 2015-09-21 11:44:17 +05:00
  • 3f453e892d added response count in thread wajeeha-khalid 2015-09-10 17:42:58 +05:00
  • 2a523848b9 fixed bug in certificate html view Zia Fazal 2015-09-22 16:08:56 +05:00
  • 66283252e6 image stretched issue resolved in signatories Saleem Latif 2015-09-22 11:41:52 +05:00
  • 8b39e1bf2b Merge pull request #9857 from edx/cdodge/proctoring-0.9.6e Brian Beggs 2015-09-21 17:03:09 -04:00
  • 946102a3e0 Merge pull request #9823 from edx/mobile/xblock-rendering-api Nimisha Asthagiri 2015-09-21 17:00:05 -04:00