Commit Graph

  • 3ec2206410 Merge pull request #8501 from mcgachey/lti-auth-fix David Ormsbee 2015-06-12 11:11:32 -04:00
  • d61cee95a8 Merge pull request #8500 from edx/renzo/commerce-cleanup Renzo Lucioni 2015-06-12 11:09:59 -04:00
  • 3de0af1616 Merge pull request #8498 from edx/release Renzo Lucioni 2015-06-12 11:09:16 -04:00
  • d96b581485 Fix flaky lettuce test. TNL-1452 Ben Patterson 2015-06-10 21:28:17 -04:00
  • 04e764d13d Make addCleanup idempotent. Ben Patterson 2015-06-11 18:43:00 -04:00
  • c3106bc4bd This change cleans up the work in progress request at #8176 Phil McGachey 2015-06-12 10:21:48 -04:00
  • 36d321c4e3 Merge pull request #8496 from edx/waheed/plat674-improve-test-with-ddt Waheed Ahmed 2015-06-12 19:14:41 +05:00
  • 04eff80065 Merge pull request #8495 from edx/shr/bug/tnl-2122-fix-show-enable-import-from-youtube-transcript-button Shrhawk 2015-06-12 19:07:41 +05:00
  • 79a63bbe0f Merge pull request #8488 from edx/patch/2015-06-11 Jim Abramson 2015-06-12 09:38:51 -04:00
  • 89ea8b31c6 MA-725 responsive_ui indication on responsive xBlocks. Nimisha Asthagiri 2015-05-26 23:20:39 -04:00
  • 4921ec48c8 MA-792 Course Blocks and Navigation API (user-specific) Nimisha Asthagiri 2015-06-05 14:52:02 -04:00
  • 037ef3be77 Video module support for student_view_json. Nimisha Asthagiri 2015-06-04 22:08:07 -04:00
  • 65e330e8b5 Make RequestCache reusable Nimisha Asthagiri 2015-05-18 12:50:42 -04:00
  • 4323109cad Specified number of mongo and split calls in xblock outline handler test with ddt. PLAT-674 Waheed Ahmed 2015-06-12 17:07:32 +05:00
  • c9778a5f57 add name param check_transcripts Syed Hassan Raza 2015-06-10 15:56:51 +05:00
  • f73b68d6f1 Merge pull request #8382 from edx/zub/story/ecom-1591-studio-display-credit-eligibility-table zubair-arbi 2015-06-12 15:41:58 +05:00
  • 3204c8b3fe show credit eligibility requirements in studio ECOM-1591 zubair-arbi 2015-06-10 19:10:12 +05:00
  • ef4836503f MIT CCX: Use CCX Keys - responses to code review cewing 2015-06-08 11:29:46 -07:00
  • 6a0c9aee9d MIT CCX: Use CCX Keys cewing 2015-05-20 19:41:25 -07:00
  • 233aba74a3 Merge pull request #8222 from Stanford-Online/giulio/font-awesome-icon-names Sarina Canelake 2015-06-12 00:02:36 -04:00
  • 32ab544b77 Merge pull request #8494 from edx/revert-8347-mcgachey-lti-authentication Ben Patterson 2015-06-11 21:12:05 -04:00
  • f8f2e2121a Revert "[LTI Provider] Basic LTI authentication" Ben Patterson 2015-06-11 21:06:02 -04:00
  • fb491bf265 Merge pull request #8347 from mcgachey/mcgachey-lti-authentication David Ormsbee 2015-06-11 19:51:57 -04:00
  • 2db79556bd Avoid POSTing unnecessary payment processor parameter Renzo Lucioni 2015-06-11 18:24:25 -04:00
  • 9d60b0e07a Merge pull request #8444 from edx/will/credit-provider-part-two Will Daly 2015-06-11 17:38:42 -04:00
  • a61b9106ef Merge pull request #8312 from open-craft/kelketek/fix-flaky-lib-test Kelketek 2015-06-11 15:25:35 -05:00
  • 203e512d4e Merge pull request #8487 from edx/clee/discussion-api-delete-comment-rebased Christopher Lee 2015-06-11 16:01:28 -04:00
  • 5ab2e86988 In bulk_operations() exit, emit signals at the end. Usman Khalid 2015-06-11 17:14:20 +05:00
  • 205c735865 Added comment deletion in the discussion API christopher lee 2015-06-08 16:56:58 -04:00
  • 41c5916408 Payment button UI modifications Renzo Lucioni 2015-06-09 17:51:38 -04:00
  • e1dfdc0811 Receipt page now also handles Cybersource payment failures. jsa 2015-06-10 10:57:54 -04:00
  • 7df880f514 Merge pull request #8483 from AkA84/update-authors Sarina Canelake 2015-06-11 12:44:18 -04:00
  • ef26e8e83f Add comment endorsement to discussion API Greg Price 2015-06-05 15:05:26 -04:00
  • 94c1bf495a Merge pull request #8437 from edx/gprice/discussion-api-edit-comment Greg Price 2015-06-11 12:28:23 -04:00
  • e25f62da6b Add myself to AUTHORS Alessandro Verdura 2015-06-11 18:05:32 +02:00
  • 895731f526 Add comment editing to discussion API Greg Price 2015-06-03 18:52:21 -04:00
  • 8988aa1c9e Credit provider integration Python API Will Daly 2015-05-29 08:13:01 -04:00
  • 26f1ecb6a5 Merge pull request #8458 from edx/will/remove-v2-footer Will Daly 2015-06-11 10:43:30 -04:00
  • ac6e259388 Merge pull request #8467 from edx/release-2015-06-10-conflict Edward Zarecor 2015-06-11 10:16:48 -04:00
  • 3706949eab Merge pull request #8432 from edx/muzaffar/bulk-emails Muzaffar yousaf 2015-06-11 18:10:00 +05:00
  • e99a56f3a4 Merge pull request #8470 from edx/benp/flag-flakies-jun2015 Ben Patterson 2015-06-11 06:18:47 -04:00
  • ce8550dba6 Merge pull request #8469 from edx/clintonb/course-structure-api-cleanup Clinton Blackburn 2015-06-10 21:27:36 -04:00
  • a9c9c15ced Merge pull request #8463 from edx/mattdrayer/SOL-449 Matt Drayer 2015-06-10 21:15:49 -04:00
  • 5977492867 Flag test as flaky. See SOL-975 Ben Patterson 2015-06-10 20:54:39 -04:00
  • d6a2bcfa69 Merge pull request #8465 from edx/talbs/SOL-973 Brian Talbot 2015-06-10 20:52:18 -04:00
  • 2da42d5efa Removed IsAuthenticatedOrDebug Clinton Blackburn 2015-06-10 18:55:27 -04:00
  • fbe09770a4 Web Certs: adjusting base/honor-code rendering to only hide staff signatures Brian Talbot 2015-06-10 14:26:21 -04:00
  • a7e49c2113 Merge pull request #8441 from edx/benmcmorran/team-api-membership Ben McMorran 2015-06-10 17:17:25 -04:00
  • c12c5c926d fixing post-release merge conflicts with DKH Edward Zarecor 2015-06-10 16:56:21 -04:00
  • 695f19c420 TNL-1907 Implement Course Team Membership API Ben McMorran 2015-06-09 17:02:47 +00:00
  • 5faaca0d01 Merge pull request #8464 from edx/talbs/fix-sass+css-compile Brian Talbot 2015-06-10 15:24:22 -04:00
  • 5198257cbe Merge pull request #8461 from edx/will/verify-student-cleanup Will Daly 2015-06-10 14:44:51 -04:00
  • 5ff2a3af3f tidying up loose ends from sass compilation to css dir change Brian Talbot 2015-06-10 14:23:13 -04:00
  • 4dd55609ab Merge pull request #8430 from edx/asadiqbal08/SOL-971 Matt Drayer 2015-06-10 14:21:42 -04:00
  • aadb902cc7 mattdrayer/SOL-449: Remove @skip decorator Matt Drayer 2015-06-10 14:20:39 -04:00
  • 0349090815 Merge pull request #8456 from edx/renzo/payment-button-ui Renzo Lucioni 2015-06-10 14:04:59 -04:00
  • 1b3efabaa0 Merge pull request #8457 from edx/waheed/tnl2425-fix-slow-transaction-xblock-outline Waheed Ahmed 2015-06-10 23:00:27 +05:00
  • 2374685dc5 Merge pull request #8462 from edx/awais786/ECOM-1644-message-format Awais Qureshi 2015-06-10 22:59:32 +05:00
  • 2092d732a7 Merge pull request #8460 from edx/alasdair/footer-mobile-app-link-bug AlasdairSwan 2015-06-10 13:38:41 -04:00
  • 1cc776ff19 Remove V2 of the EdX.org footer Will Daly 2015-06-10 12:01:14 -04:00
  • 69306da49a Remove unused code left over from ECOM-188. Will Daly 2015-06-10 12:52:38 -04:00
  • d5ca25e197 ECOM-1644 minor message updation. Awais 2015-06-10 22:08:23 +05:00
  • ff849d206a Fixes bug with app links in new footer AlasdairSwan 2015-06-10 12:41:49 -04:00
  • b328c0dcdc Fixed slow transaction on xblock outline handler. TNL-2425 Waheed Ahmed 2015-06-10 21:03:52 +05:00
  • a3976705ed Merge pull request #8453 from edx/peter-fogg/team-api-test-fix Peter Fogg 2015-06-10 11:57:24 -04:00
  • 2e9759ee43 Merge pull request #8451 from edx/benp/cohort-search-flakiness-jun2015 Ben Patterson 2015-06-10 11:46:08 -04:00
  • 35aed4bf87 Fix for flaky behavior in cohort search tests. TNL-2362 Ben Patterson 2015-06-10 07:46:35 -04:00
  • d6c0460483 Payment button UI modifications Renzo Lucioni 2015-06-09 17:51:38 -04:00
  • d74bb36634 Fix updating immutable request dictionary. Peter Fogg 2015-06-10 11:12:25 -04:00
  • 302d7a0152 SOL-971 asadiqbal 2015-06-09 17:49:43 +05:00
  • 3c2bfc70a3 Merge pull request #8259 from jazkarta/include-ccx-key-dependency Calen Pennington 2015-06-10 09:57:45 -04:00
  • 16bbdc7fca Merge pull request #8329 from edx/awais786/ECOM-1494-remove-midcourse-models Awais Qureshi 2015-06-10 18:24:39 +05:00
  • 767ccbd1e7 Merge pull request #8235 from edx/nickersoft-include-expired Tyler Nickerson 2015-06-10 09:01:04 -04:00
  • 40b4bc65f6 Merge pull request #8411 from open-craft/smarnach/bump-submissions-hash Sven Marnach 2015-06-10 11:51:59 +02:00
  • ed02d9cc5c ECOM-1494 removing models only. Awais 2015-06-03 15:43:53 +05:00
  • f39cef25be Merge pull request #8440 from Stanford-Online/giulio/font-awesome-icon-main-platform-fixes Marco Morales 2015-06-09 22:35:11 -07:00
  • cc85bfe81e Merge pull request #8019 from jazkarta/testjs Sarina Canelake 2015-06-09 21:36:08 -04:00
  • 71cdb8f0f8 Merge pull request #8447 from edx/talbs/fix-css-output-paths Brian Talbot 2015-06-09 19:33:27 -04:00
  • 85111ceb5a Add jasmine tests for ccx schedule code. Carlos de la Guardia 2015-04-30 07:31:22 -05:00
  • 387f7d149e revising expected output paths for Django Pipeline Brian Talbot 2015-06-09 17:25:57 -04:00
  • 8c1d3ae412 Added includes_expired parameter to enrollment API Nickersoft 2015-06-08 15:05:02 -04:00
  • 77facf13ba Merge pull request #8419 from edx/sass-output-to-css-dir David Baumgold 2015-06-09 17:00:15 -04:00
  • ae819b0ecb Merge pull request #8443 from edx/mattdrayer/SOL-952 Matt Drayer 2015-06-09 16:02:09 -04:00
  • e756685418 mattdrayer/SOL-952: Update default URLs and add backwards migration Matt Drayer 2015-06-09 14:55:21 -04:00
  • 85f5708d6b Merge pull request #8388 from edx/sarina/allow-preview-of-launched-langs Sarina Canelake 2015-06-09 15:04:46 -04:00
  • cd76b40542 BUGFIX: CCX icon FA4 conversion Giulio Gratta 2015-06-09 10:23:06 -07:00
  • 0b741aa3c4 BUGFIX: fix FA4 conversion for a few icons Giulio Gratta 2015-06-09 10:18:35 -07:00
  • 4a93d531c1 Merge pull request #8436 from edx/waheed/tnl2122-fix-download-transcript-error-youtube-server Adam 2015-06-09 13:02:09 -04:00
  • 7c2a4bc737 Merge pull request #8214 from edx/markhoeber-doc1987 Mark Hoeber 2015-06-09 12:51:58 -04:00
  • 65b4e33629 Merge pull request #8422 from edx/clytwynec/rebalance_bokchoy_shards Christine Lytwynec 2015-06-09 12:45:16 -04:00
  • 0df14f53d9 Profile Images API doc Mark Hoeber 2015-05-27 13:22:16 -04:00
  • 73b3af6c94 Merge pull request #8426 from mcgachey/mcgachey-lti-enrollment-fix David Ormsbee 2015-06-09 11:49:57 -04:00
  • dad7fb1c4a Merge pull request #8435 from edx/lliu/adding-author tlindaliu 2015-06-09 11:37:35 -04:00
  • 4eef610833 Merge pull request #8328 from edx/awais786/awais786/ECOM-1572-icrv-emails-format-new Awais Qureshi 2015-06-09 20:24:16 +05:00
  • 9bdf64d385 Merge pull request #8433 from edx/db/json-as-dicts David Baumgold 2015-06-09 11:15:56 -04:00
  • 36d1eb22cd Merge pull request #8338 from edx/will/credit-provider-integration Will Daly 2015-06-09 11:12:51 -04:00
  • 141892a9fd Move _creative-commons.scss into elements directory David Baumgold 2015-06-09 11:08:40 -04:00
  • ecc3473d36 transcript name param url Syed Hassan Raza 2015-05-21 13:23:03 +05:00
  • a7c710a0de Moved Creative Commons CSS into Sass David Baumgold 2015-06-08 14:39:19 -04:00
  • 242b3736a0 Merge pull request #8429 from edx/benp/fix-flaky-lms-answer-jun2015 Ben Patterson 2015-06-09 10:44:19 -04:00