Commit Graph

  • 705fa6999a Use a forked version of NLTK David Baumgold 2015-05-21 16:24:06 -04:00
  • 95ebf7f675 Upgrade distribute to the latest stable version of setuptools Régis Behmo 2015-03-24 15:27:10 +01:00
  • eddf83a48d Update AUTHORS Pan Luo 2015-07-09 10:01:40 -07:00
  • 1574650f28 Merge pull request #8845 from edx/tasawer/story/ecom-1651-on-demand-cert-download-update zubair-arbi 2015-07-09 21:08:47 +05:00
  • 472de1a5de Merge pull request #7288 from edx/ormsbee/grade_query_caching David Ormsbee 2015-07-09 12:07:52 -04:00
  • 85857e6729 Merge pull request #8831 from edx/andya/reenable-video-jasmine-tests Andy Armstrong 2015-07-09 11:47:00 -04:00
  • e51a54a93b Merge pull request #8797 from edx/clrux/ux-2323-ora-focus Chris 2015-07-09 11:44:22 -04:00
  • 3cdad4677f Merge pull request #8776 from edx/ahsan/ECOM-1578-Credit-Payment-Dashboard-States-update Ahsan Ulhaq 2015-07-09 20:17:48 +05:00
  • d2336ce767 Update edx-ora2 to release-2015-07-09T14.47. Usman Khalid 2015-07-09 19:58:35 +05:00
  • 5d086dab62 ORA2: Focus and outline styles Chris Rodriguez 2015-07-07 08:56:30 -04:00
  • b17ac38a7b Mark test as flaky TNL-2704 Jesse Zoldak 2015-07-09 10:50:44 -04:00
  • e0b90f3f8d Merge pull request #8816 from mitocw/bdero/fix-paver-run-all Andy Armstrong 2015-07-09 10:33:43 -04:00
  • 5489e0381b Merge pull request #8842 from edx/sarina/upgrade-django Sarina Canelake 2015-07-09 10:28:05 -04:00
  • c5293788e1 update bok choy to version 0.4.3 Christine Lytwynec 2015-07-09 10:14:13 -04:00
  • 79de77cf95 Optimize grading/progress page to reduce database queries (cache max scores). David Ormsbee 2015-02-26 18:11:34 -05:00
  • 14a9796cd4 Re-enable the video translation Jasmine tests Andy Armstrong 2015-07-08 13:28:37 -04:00
  • 87fb431be4 Custom error message for export course command vkaracic 2015-07-06 08:31:40 +00:00
  • c964b5cb5a Update copy for On Demand Cert Download ECOM-1651 Tasawer 2015-07-09 12:22:34 +05:00
  • 1e380815d9 Merge pull request #8846 from edx/zub/story/add-credit-provider-description zubair-arbi 2015-07-09 14:20:16 +05:00
  • c94f043c2b Credit Payment - Dashboard States Ahsan Ulhaq 2015-07-06 16:17:15 +05:00
  • 71ce4d071b add 'provider_description' field for CreditProvider model ECOM-1842 zubair-arbi 2015-07-09 13:09:43 +05:00
  • 8a65167d79 Merge pull request #8795 from edx/zub/story/ecom-1815-update-creditprovider-model zubair-arbi 2015-07-09 12:04:53 +05:00
  • db82cbdeb7 Merge pull request #8817 from edx/zub/story/ecom-1648-update-credit-eligibility-ui-text zubair-arbi 2015-07-09 12:03:06 +05:00
  • 2b29ad2066 Fix failed test_course_about_in_cart Pan Luo 2015-07-08 23:39:47 -07:00
  • cd60dd5606 Merge pull request #8771 from edx/clintonb/currency-comparison-fix Clinton Blackburn 2015-07-09 01:45:39 -04:00
  • 747c6b7413 Merge pull request #8716 from edx/ahodges/staff_labeling Alison Hodges 2015-07-08 17:34:29 -04:00
  • 9fcd8ffaae Upgrade Django 1.4 to the latest point release Sarina Canelake 2015-07-08 17:23:50 -04:00
  • 2bfbda3c1e Revert "edX Course/Library Import/Export API" Brandon DeRosier 2015-07-07 16:53:35 -04:00
  • 783e83deb0 Revert "Add feature flag for Import/Export API in LMS" Brandon DeRosier 2015-07-07 16:51:49 -04:00
  • e60ae31d84 Cherrypick hotfix-2015-07-07 into release candidate Will Daly 2015-07-07 12:10:25 -07:00
  • b0c1e962c7 rc/2015-07-08-mattdrayer: Hide button behind feature flag Matt Drayer 2015-07-07 14:14:09 -04:00
  • b3437b7278 Corrected path to Commerce API Clinton Blackburn 2015-07-07 11:47:45 -04:00
  • db7dea118c ECOM-1829 Removing the regen link. Awais 2015-07-07 19:53:53 +05:00
  • 4b64df74b1 Fix migrations 0012 and 0013 in the credit app Will Daly 2015-07-06 10:01:32 -07:00
  • 1ee782cefa Merge pull request #8826 from edx/will/fix-progress-credit-typo Will Daly 2015-07-08 13:40:14 -07:00
  • 146742ba07 Merge pull request #8828 from edx/db/remove-unused-gems David Baumgold 2015-07-08 16:18:25 -04:00
  • 82c96c87cb Update edx-oauth2-provider to 0.5.2 Renzo Lucioni 2015-07-08 14:47:11 -04:00
  • 9056052b09 Fix a small typo for credit requirements on the progress page. Will Daly 2015-07-08 08:53:48 -07:00
  • be5ae551b2 Mark a too-flaky Milestones acceptance test for skipping Jesse Zoldak 2015-07-08 14:41:58 -04:00
  • ab60b110af Merge pull request #8735 from edx/mushtaq/plat633-delete-case Mushtaq Ali 2015-07-08 23:07:46 +05:00
  • d07a2798a1 Merge pull request #8815 from open-craft/hinted-login-fix Braden MacDonald 2015-07-08 10:57:08 -07:00
  • ea36fcacea Merge pull request #8823 from edx/clee/add-better-email-message-in-release-script Christopher Lee 2015-07-08 14:49:46 -03:00
  • ccd602343f Remove unused Ruby gems David Baumgold 2015-07-08 12:22:25 -04:00
  • 9e5290c1a7 Merge pull request #8822 from edx/benmcmorran/taiwan-fix Ben McMorran 2015-07-08 13:26:17 -04:00
  • afa77db944 Merge pull request #8642 from edx/mekkz/course-overviews-dashboard Kyle McCormick 2015-07-08 13:06:36 -04:00
  • 7b33b73a8c Merge pull request #8824 from edx/zoldak/TNL-1475 Jesse Zoldak 2015-07-08 12:43:29 -04:00
  • 25434a03e0 Merge pull request #8827 from edx/revert-8818-tasawer/story/ecom-1651-on-demand-cert-download Ben Patterson 2015-07-08 12:34:57 -04:00
  • 080450d5b2 Added more descripted release script message christopher lee 2015-07-08 11:22:48 -04:00
  • 1dfe9ed9e8 MA-779 Update student dashboard to use CourseOverview Kyle McCormick 2015-07-07 11:29:37 -04:00
  • 5b630a7704 MA-779 Make has_access work on CourseOverview objects Kyle McCormick 2015-06-19 16:40:15 -04:00
  • a11275ee0d Disable flaky GroupConfigurationsPage JS test TNL-1475 Jesse Zoldak 2015-07-08 11:48:31 -04:00
  • ab74f64e85 update credit eligibility ui text ECOM-1648 zubair-arbi 2015-07-08 14:31:33 +05:00
  • 1058c36d94 Merge branch 'rc/2015-07-08' into release christopher lee 2015-07-08 10:50:18 -04:00
  • 6bd5eec18d TNL-2665 Prevent Taiwan from being translated Ben McMorran 2015-07-08 14:12:56 +00:00
  • cc7647571c Revert "Update copy for On Demand Cert Download" Ben Patterson 2015-07-08 07:59:39 -04:00
  • c64d58f234 Merge pull request #8818 from edx/tasawer/story/ecom-1651-on-demand-cert-download tasawernawaz 2015-07-08 20:18:08 +05:00
  • a118fd96c8 Merge pull request #8811 from edx/zoldak/fix-flaky-js-tests Jesse Zoldak 2015-07-08 11:16:30 -04:00
  • 658519d011 Merge branch 'master' of github.com:edx/edx-platform Ned Batchelder 2015-07-08 11:15:00 -04:00
  • ac6ab5da6e Fix a pep8 violation Ned Batchelder 2015-07-08 11:14:50 -04:00
  • a27865abb5 Merge pull request #8647 from mcgachey/lti-view-refactoring David Ormsbee 2015-07-08 11:01:04 -04:00
  • 43ba78bad7 Merge pull request #8807 from edx/ned/use-primary-emails Ned Batchelder 2015-07-08 10:43:00 -04:00
  • b7a90d6c7b Make the release script use the primary email from people.yaml Ned Batchelder 2015-07-07 13:33:46 -04:00
  • 375341b8a3 Merge pull request #8455 from edx/aj/tnl2165-play-video-emitted-with-wrong-params Awais Jibran 2015-07-08 19:00:26 +05:00
  • 99fbf4d6b2 [LTI Provider] Refactoring to remove the lti_run method Phil McGachey 2015-06-23 14:04:25 -04:00
  • de25880c10 Disable test specs that use old flaky sinon pattern Jesse Zoldak 2015-07-07 16:24:04 -04:00
  • 028ddefe4e Update copy for On Demand Cert Download ECOM-1651 Tasawer 2015-07-08 16:01:10 +05:00
  • 66e18eda56 add 'fulfillment_instructions' for 'CreditProvider' model + add api method to get credit provider data ECOM-1815 zubair-arbi 2015-07-07 16:10:38 +05:00
  • 989091d1ed TNL-2165 "play_video" event emitted after seeking forward in a video contains old position Awais Jibran 2015-06-10 20:26:15 +05:00
  • 9f0b5ed2cd Merge pull request #8720 from edx/ECOM-1601-credit-help-link Aamir 2015-07-08 11:55:11 +05:00
  • ef89c662f3 Merge pull request #8742 from edx/aj/tnl2551-randomized-problems-failing Awais Jibran 2015-07-08 11:49:23 +05:00
  • 58c7f43f61 Fix the Paver run_all_servers method. Brandon DeRosier 2015-07-07 23:08:29 -04:00
  • 8cde240dd8 Merge pull request #8805 from edx/cdodge/remove-profile-panel chrisndodge 2015-07-07 22:38:15 -04:00
  • f4c8d8fa86 Fix hinted login view to be compatible with secondary providers. Braden MacDonald 2015-07-07 16:42:12 -07:00
  • 0abc27eed8 Merge pull request #8814 from mitocw/bdero/revert-import-export Sarina Canelake 2015-07-07 17:50:18 -04:00
  • dbc470ab22 Merge pull request #8813 from edx/mattdrayer/num-queries-fix Matt Drayer 2015-07-07 17:39:13 -04:00
  • ae6baf2ac3 Revert "edX Course/Library Import/Export API" Brandon DeRosier 2015-07-07 16:53:35 -04:00
  • b4e8ab9084 Revert "Add feature flag for Import/Export API in LMS" Brandon DeRosier 2015-07-07 16:51:49 -04:00
  • fd7a99db0b mattdrayer/num-queries-fix: Update query value to reflect new reality Matt Drayer 2015-07-07 16:41:15 -04:00
  • 1e5fe3a3a7 Use the correct sinon request pattern to avoid flaky tests Jesse Zoldak 2015-07-07 16:07:56 -04:00
  • bd817bb41e Merge pull request #8784 from edx/clrux/ux-2337-a11y-calculator-contrast Chris 2015-07-07 16:07:14 -04:00
  • c219be5e75 Remove unused references to AjaxHelpers Jesse Zoldak 2015-07-07 16:06:41 -04:00
  • 0158ebca1f Merge pull request #8810 from edx/cherrypick-hotfix-2015-07-07-to-rc Will Daly 2015-07-07 13:05:14 -07:00
  • bd5c045102 Merge pull request #8801 from edx/awais786/ECOM-1829-regen-cert-link-bug Will Daly 2015-07-07 12:42:56 -07:00
  • c25e37ea93 Merge pull request #8734 from edx/ziafazal/SOL-1011 Matt Drayer 2015-07-07 15:40:34 -04:00
  • a31ae128ff Merge pull request #8808 from edx/rc/2015-07-08-mattdrayer Matt Drayer 2015-07-07 15:38:59 -04:00
  • 407e7f432c Cherrypick hotfix-2015-07-07 into release candidate Will Daly 2015-07-07 12:10:25 -07:00
  • 897fddba3e Merge pull request #8804 from edx/merge-release-into-master Will Daly 2015-07-07 12:06:25 -07:00
  • ba7422da87 rc/2015-07-08-mattdrayer: Hide button behind feature flag Matt Drayer 2015-07-07 14:14:09 -04:00
  • 8c6939d521 Remove the DjDT profiling panel from devstack.py. It appears to cause horrendeous performance issues, while offering very little benefit. Chris Dodge 2015-07-07 13:15:02 -04:00
  • 3309581a36 Adding uniqueness to some elements Chris Rodriguez 2015-07-07 13:45:44 -04:00
  • 104bcd5143 Merge remote-tracking branch 'origin/release' into merge-release-into-master Will Daly 2015-07-07 09:10:16 -07:00
  • 2ca9d4d070 Fix 'stuck in publish issue' when deleting an item after dicarding the changes mushtaqali 2015-06-29 23:43:29 +05:00
  • f9ce8264ed Merge pull request #8803 from edx/clintonb/commerce-api-fix Clinton Blackburn 2015-07-07 12:32:44 -04:00
  • dab96c5243 Merge pull request #8791 from edx/hotfix/2015-07-06 Will Daly 2015-07-07 08:52:41 -07:00
  • 5d356d29bd Corrected path to Commerce API Clinton Blackburn 2015-07-07 11:47:45 -04:00
  • e9756a9bc7 Merge pull request #8799 from edx/revert-8722-utkjad/injecting_callstackmanager Sarina Canelake 2015-07-07 11:21:19 -04:00
  • cc5d972c7d ECOM-1829 Removing the regen link. Awais 2015-07-07 19:53:53 +05:00
  • 7af1a44d73 Merge pull request #8792 from edx/clytwynec/flaky-test Christine Lytwynec 2015-07-07 10:08:25 -04:00
  • 935da3a12c ECOM-1601: Added the help link of credit info aamir-khan 2015-06-30 17:02:02 +05:00
  • b26f2af585 Revert "Adding entries of Call Stack Manager in StudentModule and StudentModuleHistory" Sarina Canelake 2015-07-07 05:45:23 -04:00