Commit Graph

  • c689cc40e0 Merge pull request #8766 from edx/dan-f/update-test-docs-common-requirejs Daniel Friedman 2015-07-07 09:37:15 -04:00
  • 1c161ffc5f Merge pull request #8793 from edx/mjevtic/env-devstack-fix Marko Jevtić 2015-07-07 15:14:24 +02:00
  • d09bfa5e99 Fixed misordered settings for devstack environment Marko Jevtic 2015-07-07 12:01:12 +02:00
  • 301a874c5c Enforcing lowercase currency for CourseMode Clinton Blackburn 2015-07-02 19:16:08 -04:00
  • 96ee90d567 Merge pull request #8772 from edx/clintonb/refund-notification Clinton Blackburn 2015-07-06 20:26:01 -04:00
  • ad5a98e40a Merge pull request #8282 from Stanford-Online/giulio/default-course-about-images Davorin Šego 2015-07-07 00:24:54 +02:00
  • 40282316d0 Creating Zendesk refund notifications via API Clinton Blackburn 2015-07-02 19:14:00 -04:00
  • 796e4cb5e6 Merge pull request #8580 from edx/ahsan/ECOM-1719-LMS-Modification-enrollment-API-update Ahsan Ulhaq 2015-07-07 02:32:53 +05:00
  • db516a9b4c flag test as flaky Christine Lytwynec 2015-07-06 16:51:03 -04:00
  • a8f909fe77 Merge pull request #8659 from edx/ziafazal/SOL-1006 Matt Drayer 2015-07-06 16:45:24 -04:00
  • d3a5bc32b3 Merge pull request #8780 from edx/db/mention-confluence-in-readme David Baumgold 2015-07-06 16:40:49 -04:00
  • 685a2d31b3 Merge pull request #8774 from edx/ziafazal/SOL-1008 Matt Drayer 2015-07-06 15:57:28 -04:00
  • 669b5d2b1b Merge pull request #8789 from edx/carol/doc/SOL-1014_test Matt Drayer 2015-07-06 15:57:06 -04:00
  • e67975b275 Feature flag credit provider messaging on the dashboard. Will Daly 2015-07-06 12:56:15 -07:00
  • 8d9d4b85d5 LMS: Modification in enrollment API Ahsan Ulhaq 2015-06-19 16:02:33 +05:00
  • 2e4f1225ea Improved text in Studio Certificate Configuration asadiqbal 2015-07-02 13:26:56 +05:00
  • 07ce76b3f9 Merge pull request #8722 from edx/utkjad/injecting_callstackmanager Utkarsh 2015-07-06 15:06:06 -04:00
  • 10a3863832 Enable CallStackManager on StudentModule and StudentModuleHistory to capture any use outside of DjangoXBlockUserStateClient utkjad 2015-06-30 15:45:19 +00:00
  • 45c1f28d5f Fixing aria values and contrast for accessibility Chris Rodriguez 2015-07-06 12:04:13 -04:00
  • 84f7aef917 Default "Course About" image Giulio Gratta 2015-05-29 14:43:43 -07:00
  • 47002ff785 Merge pull request #8785 from edx/will/fix-credit-migrations Will Daly 2015-07-06 10:20:02 -07:00
  • f3caef9b8f Merge pull request #8762 from edx/clytwynec/TE-965 Christine Lytwynec 2015-07-06 13:07:18 -04:00
  • dcfd70b922 Fix migrations 0012 and 0013 in the credit app Will Daly 2015-07-06 10:01:32 -07:00
  • f0b52c698d Merge pull request #8739 from edx/aleffert/remove-chromeless-xblock-border Akiva Leffert 2015-07-06 11:37:29 -04:00
  • ab79b0dd1a add coveralls Christine Lytwynec 2015-07-02 10:53:19 -04:00
  • 8d5c1a055c Mention Confluence in the README David Baumgold 2015-07-06 10:00:05 -04:00
  • 770b3e807e Merge pull request #8499 from edx/aj/tnl2435-broken-page-for-schedule-details-cms Awais Jibran 2015-07-06 19:50:21 +05:00
  • e7f7bdaed9 Merge pull request #8738 from edx/dsego/SOL-734-addendum Davorin Šego 2015-07-06 16:18:00 +02:00
  • a67d80c232 Merge pull request #8702 from edx/shr/bug/TNL-2592-problem-release-date-error Shrhawk 2015-07-06 06:39:11 -07:00
  • ded7682090 Studio "Schedule & Details" page is broken in IDBx+IDB9x+2015_T2 Awais Jibran 2015-06-12 18:57:13 +05:00
  • c4004e1113 Merge pull request #8593 from edx/dan-f/topic-list-2 Daniel Friedman 2015-07-06 09:23:31 -04:00
  • bc4479a118 Merge pull request #8778 from edx/sarina/20150706-update-translations Sarina Canelake 2015-07-06 09:17:18 -04:00
  • b45b122c18 fixed pagination styles in teams and studio Frances Botsford 2015-07-02 17:15:38 -04:00
  • 3b55d88283 Implement paginated Team Topics UI Daniel Friedman 2015-07-02 17:53:02 -04:00
  • 351e491c82 Add generic paging framework Ben McMorran 2015-07-02 15:59:26 -04:00
  • 1cc7ea2a37 Update translations (autogenerated message) Sarina Canelake 2015-07-06 08:14:16 -04:00
  • a14a562ed6 Fixed randomized problems which were not appearing to work. Awais Jibran 2015-07-01 23:09:48 +05:00
  • 9711cd5fc3 certificate add/update/delete operations permission check Zia Fazal 2015-07-03 15:59:23 +05:00
  • 65a36a64df Merge pull request #8686 from edx/benp/3bok-choy-check-invisible Ben Patterson 2015-07-03 17:36:09 -07:00
  • e086bb4ddc Merge pull request #8704 from edx/usman/tnl2305-disable-ora Usman Khalid 2015-07-04 00:35:05 +05:00
  • 64ff890ff8 Disable ORA 1 tabs in LMS if combinedopeneded is disabled in LMS. Usman Khalid 2015-07-01 20:57:16 +05:00
  • fe54b085c6 Added ability to disable xblock types in LMS. Usman Khalid 2015-07-01 20:55:59 +05:00
  • 83d920ecba Merge pull request #8759 from edx/dsego/SOL-958 Davorin Šego 2015-07-03 16:20:21 +02:00
  • 8d9c16ba6e Update comment to match method name. Ben Patterson 2015-07-03 06:54:56 -07:00
  • d8a649ae36 Use new bok-choy with invisible property. Ben Patterson 2015-06-26 12:43:07 -04:00
  • c39ebf1bc8 Wait for element to not be present. (Compatible with minor bok-choy upgrade.) Ben Patterson 2015-06-22 21:47:36 -04:00
  • 7374624b3c Add feature flag to skip enrollment start date filtering for course search Davorin Sego 2015-07-02 14:18:33 +02:00
  • 8934818381 Merge pull request #8753 from edx/zub/bugfix/ecom-1734-change-login-redirect-url zubair-arbi 2015-07-03 16:19:24 +05:00
  • b1e0ceb34f Merge pull request #8634 from edx/asadiqbal08/SOL-766 Matt Drayer 2015-07-03 06:47:58 -04:00
  • 07da7657b3 Merge pull request #7354 from edx/ned/clean-test-turds Ned Batchelder 2015-07-02 20:20:41 -04:00
  • 514d85c183 Fix other temp dirs that are not cleaned up properly Ned Batchelder 2015-07-02 19:31:26 -04:00
  • e6e5a8d812 Convert some try/finally to addCleanup Ned Batchelder 2015-03-22 07:26:21 -04:00
  • cb0624bfa1 Correct parent references in one test. Ned Batchelder 2015-03-21 19:24:56 -04:00
  • 8c8810ee2c Put gitignores for test_root/uploads in one place Ned Batchelder 2015-03-21 17:26:25 -04:00
  • 593ee74073 Merge pull request #8770 from edx/mattdrayer/update-num-queries-check Matt Drayer 2015-07-02 18:56:51 -04:00
  • 57d5de5d14 asadiqbal08/SOL-766: Add Facebook sharing to certificate view asadiqbal 2015-06-23 13:24:38 +05:00
  • 289ec980a5 mattdrayer/update-num-queries-check: Modify value to reflect improved workflow(s) Matt Drayer 2015-07-02 18:03:57 -04:00
  • db3de51ad4 Merge pull request #6190 from mitocw/bdero/import-export-api David Ormsbee 2015-07-02 16:29:41 -04:00
  • 1ca37737e9 Merge pull request #8566 from edx/ziafazal/SOL-980 Matt Drayer 2015-07-02 16:07:33 -04:00
  • 8824d032d4 Merge pull request #8767 from edx/will/optimize-credit-reqs-update Will Daly 2015-07-02 12:37:26 -07:00
  • bfe01605b4 Merge pull request #8700 from edx/will/remove-provider-course-m2m-relation Will Daly 2015-07-02 12:36:37 -07:00
  • 85b3bfe4f6 Add feature flag for Import/Export API in LMS Brandon DeRosier 2015-06-26 15:24:30 -04:00
  • c94abd2705 edX Course/Library Import/Export API Brandon DeRosier 2015-06-09 15:58:42 -04:00
  • 06ddb2f359 Credit requirement optimizations Will Daly 2015-07-02 10:32:51 -07:00
  • 611d16b25a ziafazal/SOL-980: Generate certificates from instructor dashboard Zia Fazal 2015-06-16 20:19:51 +05:00
  • d87a0f146b Update docs for testing common requirejs tests Daniel Friedman 2015-07-02 14:12:32 -04:00
  • 4526b929b0 Merge pull request #8491 from edx/mattdrayer/fix-progress-template Matt Drayer 2015-07-02 13:51:49 -04:00
  • 012a3c7540 Merge pull request #8725 from openfun/regisb/fix_xblock_class_loading Calen Pennington 2015-07-02 13:37:03 -04:00
  • eb70f2303c Merge pull request #8749 from edx/rc/2015-06-29 Ali Mohammad 2015-07-02 13:34:42 -04:00
  • 8ef05e0484 Carol's edits Alison Hodges 2015-07-02 13:29:35 -04:00
  • e2acf3ab87 Credit eligibility/provider refactor Will Daly 2015-06-25 14:49:31 -07:00
  • 0bb519c2a0 Merge pull request #8727 from edx/clytwynec/TE-878 Christine Lytwynec 2015-07-02 12:13:59 -04:00
  • 64a142d0e6 Merge pull request #8763 from edx/sarina/mark-tests-as-flaky Sarina Canelake 2015-07-02 12:08:27 -04:00
  • 05249d590f Merge pull request #8697 from edx/frances/fix/lmsbigwindow frances botsford 2015-07-02 11:40:20 -04:00
  • 281ebaa3b3 Merge pull request #8683 from edx/andya/run-optimized-devstack Andy Armstrong 2015-07-02 11:39:37 -04:00
  • d5b26c7f8c Mark test as flaky; TNL-2647 Sarina Canelake 2015-07-02 11:16:10 -04:00
  • 39334db4a4 Merge pull request #8707 from edx/rc/2015-06-29 Sarina Canelake 2015-07-02 11:08:11 -04:00
  • 9f08e78705 fixed trailing white space errors Alison Hodges 2015-07-02 10:52:37 -04:00
  • 3de778b78c Merge pull request #8757 from edx/zoldak/7000 Jesse Zoldak 2015-07-02 10:43:27 -04:00
  • e369939b4b change redirect url from '/accounts/login' to '/login' ECOM-1734 zubair-arbi 2015-07-02 15:20:22 +05:00
  • 8ccc27b427 fix pep8 violations Alison Hodges 2015-07-02 09:15:05 -04:00
  • 7a852b0b1c Lower pylint threshold to 7000! Jesse Zoldak 2015-07-02 09:04:23 -04:00
  • 85814f0bbf Support running Studio with optimized assets Andy Armstrong 2015-06-25 18:03:01 -04:00
  • 9d5b5658a4 Merge pull request #8552 from edx/ned/smarter-mako-caching Ned Batchelder 2015-07-01 17:47:04 -04:00
  • 10c9912b47 Merge pull request #8740 from edx/revert-8672-aj/tnl2551-randomized-problems-not-working Adam 2015-07-01 16:27:24 -04:00
  • e9e4e3cf65 use 1 coveragerc file to generate 1 coverage report per build Christine Lytwynec 2015-06-30 14:18:28 -04:00
  • c93d48249d Fixed quality report Awais Jibran 2015-07-02 00:29:50 +05:00
  • 5306ac02b0 Revert "Fixed randomized problems which were not appearing to work." Awais Jibran 2015-07-02 02:35:54 +05:00
  • 7410286104 Fixed pylint line-too-long violations Alison Hodges 2015-07-01 15:23:15 -04:00
  • 4f991ebaab Merge pull request #8718 from open-craft/smarnach/add-poll-xblock Sarina Canelake 2015-07-01 14:00:42 -04:00
  • e473022c91 Additional references to "Pending Instructor Tasks" changed Alison Hodges 2015-07-01 12:49:59 -04:00
  • e8398b571e Add the Poll XBlock to the requirements and ADVANCED_COMPONENT_TYPES. Sven Marnach 2015-06-30 11:19:57 +02:00
  • cd3abf37cd Merge pull request #8733 from open-craft/fix-shibboleth-fetch Braden MacDonald 2015-07-01 09:17:52 -07:00
  • 07fda73ffa Remove border from chromeless xblock Akiva Leffert 2015-07-01 11:24:04 -04:00
  • e171d8842f Fixes header styling issue introduced in SOL-734 (#8389) by reverting heights to what they were before that PR Davorin Sego 2015-07-01 17:29:25 +02:00
  • c676bf0460 Merge pull request #8679 from open-craft/recursive_state_reset Kelketek 2015-07-01 10:05:42 -05:00
  • b127bfe0c7 Merge pull request #8468 from edx/frances/teams-listings frances botsford 2015-07-01 11:04:10 -04:00
  • 473b43cba0 missing quote catch by Christine Alison Hodges 2015-07-01 10:38:42 -04:00
  • 9e0ed9b759 Merge pull request #8672 from edx/aj/tnl2551-randomized-problems-not-working Awais Jibran 2015-07-01 19:04:36 +05:00
  • 91955d43bf Mark's edits Alison Hodges 2015-07-01 10:00:38 -04:00