Commit Graph

  • c5746e6db9 Merge pull request #6071 from edx/muhhshoaib/WL-135-add-expiration-dates-to-Coupon-codes chrisndodge 2015-01-09 09:19:17 -05:00
  • 17c2af2325 Merge pull request #6513 from edx/release Dennis Jen 2015-01-09 09:15:57 -05:00
  • d244b13445 Merge remote-tracking branch 'origin/aamir-khan/ECOM-528-donation-verified-courses' into aamir-khan/ECOM-528-donation-verified-courses arbisoft 2015-01-09 17:56:32 +05:00
  • 36626a2b8b ECOM-528 added test cases arbisoft 2015-01-09 17:55:22 +05:00
  • d29127055e Merge pull request #6509 from edx/zoldak/fix-textbook-test Jesse Zoldak 2015-01-09 07:45:05 -05:00
  • 72a2998ed5 Merge pull request #6475 from edx/waheed/tnl1070-Ordering-is-not-enforced Waheed Ahmed 2015-01-09 17:25:48 +05:00
  • 82eed83f64 In inline discussion two discussion module override actions Waqas Khalid 2014-11-24 16:30:45 +05:00
  • 18f3221dcf Enforced '000' prefix for xmodule.js and added unit test. TNL-1070 Waheed Ahmed 2015-01-08 12:36:29 +05:00
  • fd76f3754c ECOM-528 added test cases arbisoft 2015-01-09 16:29:35 +05:00
  • 507d7b1a1f ECOM-528 refactor the code. Awais 2015-01-09 16:26:35 +05:00
  • 10f8d8c097 WL-135 added the migration for the expiration_date field in the coupons model Muhammad Shoaib 2014-11-19 14:39:32 +05:00
  • 866ddc22e9 ECOM-528 refactor the code. Awais 2015-01-09 15:17:27 +05:00
  • 7eb8195c23 ECOM-528 added donation support for verified courses arbisoft 2015-01-09 12:31:33 +05:00
  • 3aa547db33 Minor fixes to the schoolyourself xblock, including: John Lee 2015-01-08 20:47:53 -05:00
  • 63431d1ffd fix studio templating errors Adam Palay 2015-01-08 19:47:15 -05:00
  • 240c2953e7 Merge pull request #6507 from edx/hotfix/2015-01-09 Adam 2015-01-08 19:45:43 -05:00
  • 3efb377d1c Fix flaky textbook upload lettuce tests Jesse Zoldak 2015-01-08 16:52:55 -05:00
  • 30b572b1b1 Merge pull request #6489 from edx/replace-edx-platform-name David Baumgold 2015-01-08 16:36:54 -05:00
  • 62157f3725 set studio_name in aws.py (TNL-1138) Adam Palay 2015-01-08 16:27:23 -05:00
  • d6b187d147 Update pylint to 1.4.0 David Baumgold 2014-07-01 16:19:45 -04:00
  • 4a37648f36 Merge pull request #6504 from edx/release-merge-test Dennis Jen 2015-01-08 16:16:03 -05:00
  • d2660e530f Merge branch 'release' Dennis Jen 2015-01-08 15:02:26 -05:00
  • 8fa00ea54c update studio footer copyright date Adam Palay 2015-01-08 13:14:01 -05:00
  • 66228224c0 Merge pull request #6403 from edx/clytwynec/remove_lynx_from_bulk_email Christine Lytwynec 2015-01-08 14:10:12 -05:00
  • 7bdbf8f17c ECOM-528 added donation support for verified courses arbisoft 2015-01-09 00:02:04 +05:00
  • c44fe73686 Add sjackso to AUTHORS Steve Jackson 2014-12-27 22:08:54 -09:00
  • 531dbbe3b9 [TNL-140] Fix unresponsive Studio login error message Steve Jackson 2014-12-23 13:23:42 -09:00
  • 1b02ed5d95 Merge pull request #6252 from edx/studio-move-branded David Baumgold 2015-01-08 12:42:40 -05:00
  • 96d86e4e17 Placeholder image for Open edX Studio logo, when not running on edx.org David Baumgold 2014-12-15 10:57:37 -05:00
  • 44b792ab26 Replace "edX" with {platform_name} David Baumgold 2015-01-07 14:36:36 -05:00
  • f7e1bfe732 Merge pull request #6491 from edx/benp/add-cleanup-paver-tests Ben Patterson 2015-01-08 11:14:21 -05:00
  • a54bff2992 Merge pull request #6487 from edx/remove-linkedin-integration David Baumgold 2015-01-08 10:18:25 -05:00
  • 3498eeb1f6 MA-212 Mobile API support for backward compatibility of course updates. Nimisha Asthagiri 2015-01-07 22:19:14 -05:00
  • ed2afa8aaf Merge pull request #6486 from edx/emails-remove-edx David Baumgold 2015-01-08 09:59:49 -05:00
  • 6efe0ac382 Merge pull request #6485 from edx/discussion-platform-name David Baumgold 2015-01-08 09:34:25 -05:00
  • a7339ce734 Merge pull request #6214 from edx/ammar/tnl498 Muhammad Ammar 2015-01-08 15:14:54 +05:00
  • 99659ce3d4 ECOM-528 added donation support for verified courses arbisoft 2015-01-08 14:52:31 +05:00
  • 5ba492ecf3 Get students experiments, groups, and cohorts TNL-498 muhammad-ammar 2014-12-10 21:00:08 +05:00
  • 58fd7a92c3 Merge pull request #6193 from Shrhawk/shr/bug/TNL-952-customresponse-sorting_issue Shrhawk 2015-01-08 12:46:41 +05:00
  • 3c274e2847 Merge pull request #6398 from edx/mobile/MA-199 Nimisha Asthagiri 2015-01-07 20:19:27 -05:00
  • 5349b55bd0 MA-199 Course Authorization framework in mobile API. Nimisha Asthagiri 2014-12-11 10:37:54 -05:00
  • d256c82582 Stop mocks after test. Ben Patterson 2015-01-07 17:07:34 -05:00
  • e95f2aeeed Remove LinkedIn integration David Baumgold 2015-01-07 13:56:41 -05:00
  • 0ec4855909 clean up reject_name_change email template a bit David Baumgold 2015-01-07 13:38:38 -05:00
  • a750e43828 Use {platform_name} in discussions header David Baumgold 2015-01-07 13:32:28 -05:00
  • 47f02ec4d2 Merge pull request #6483 from edx/hotfix/ecom-876 Will Daly 2015-01-07 13:07:39 -05:00
  • 897c96dda7 Merge pull request #6482 from edx/ned/enable-schoolyourself Ned Batchelder 2015-01-07 12:11:15 -05:00
  • bea5a3ce64 Fix for ECOM-876 Will Daly 2015-01-07 12:06:36 -05:00
  • 82d02851a7 Merge pull request #6468 from edx/studio-name-by-default David Baumgold 2015-01-07 12:04:49 -05:00
  • 36e879a4f0 Need to add new XBlocks to the ADVANCED_COMPONENTS list Ned Batchelder 2015-01-07 11:21:27 -05:00
  • 1b7d5f347d Test pagination reposition test is failing Waqas Khalid 2015-01-07 17:20:10 +05:00
  • 13332b6d40 Merge pull request #6474 from edx/awais786/course_info_api Aamir 2015-01-07 21:04:46 +05:00
  • dd2d191285 Merge pull request #6472 from edx/cdodge/fix-pylint-error-in-rc chrisndodge 2015-01-07 10:10:28 -05:00
  • 1e7d567b58 Initial framework for the Course About API. stephensanchez 2014-12-18 20:01:56 +00:00
  • ed812f1ca8 Merge pull request #6476 from mlkwaqas/waqas/fix-discussion-flaky-test Waqas Khalid 2015-01-07 19:53:42 +05:00
  • 2077d4dc6d Merge pull request #6439 from edx/improve-shoppingcart-tests David Baumgold 2015-01-07 09:12:24 -05:00
  • e39be585ab Test pagination reposition test is failing Waqas Khalid 2015-01-07 17:20:10 +05:00
  • ee39957101 Fix sorting issue TNL-952 Syed Hassan Raza 2014-12-09 18:02:49 +05:00
  • 8af54943e1 Merge pull request #6243 from edx/sarina/default-edx-UI Sarina Canelake 2015-01-06 21:58:56 -05:00
  • 443a552d5f remove unused variable Chris Dodge 2015-01-06 19:24:39 -05:00
  • 9dd22206ae Merge pull request #6055 from edx/clrux/update-font-awesome-4.2.0-v2 Brian Talbot 2015-01-06 18:36:44 -05:00
  • 4fcbcaa09b Clean up default Open edX pages Sarina Canelake 2015-01-06 17:15:33 -05:00
  • 61e02fab87 Hide Honor Code mentions if site does not have an Honor Code Sarina Canelake 2015-01-06 14:04:40 -05:00
  • 3a3ab76261 Change Open edX index page bright blue to grey Sarina Canelake 2015-01-05 15:32:22 -05:00
  • 682d3d0eae Organize logic on Find Courses view. Sarina Canelake 2014-12-19 08:26:16 -08:00
  • b7a1de1ab0 Abstract references to social media accounts Sarina Canelake 2014-12-16 17:46:23 -08:00
  • 4a2253a07a Remove no-longer-used template Sarina Canelake 2014-12-13 19:24:49 -08:00
  • d6741c7700 Clean up default pages for Open edX instances Sarina Canelake 2014-12-13 19:24:31 -08:00
  • aa8b895aea Remove "legacy" footer now that new edx footer in place Sarina Canelake 2014-12-13 19:12:42 -08:00
  • 6c5542cd24 Change default welcome from mktg text to Open edX text Sarina Canelake 2014-12-13 18:55:31 -08:00
  • ec87a14a8d Turn off welcome video by default on Open edX LMS index page Sarina Canelake 2014-12-13 13:50:23 -08:00
  • a8be702136 Merge pull request #6469 from edx/release Dennis Jen 2015-01-06 17:16:32 -05:00
  • 0f66b7552f Merge pull request #6458 from edx/sarina/variablize-copyright-date Sarina Canelake 2015-01-06 17:15:59 -05:00
  • 2ff8f2faea Merge branch 'release' into rc/2015-01-07 Dennis Jen 2015-01-06 16:30:11 -05:00
  • 260962e06c Use "Studio" name by default (instead of "edX Studio") David Baumgold 2015-01-06 16:07:57 -05:00
  • 7e506d421f Merge pull request #6457 from edx/jsa/bulk-ops-forums Jim Abramson 2015-01-06 15:56:54 -05:00
  • 66b1778481 Merge pull request #6353 from rocha/set-revision-to-unknown-if-not-on-git-repo Carlos Andrés Rocha 2015-01-06 15:39:40 -05:00
  • 05afa2da17 Variablize copyright year for LMS footer Sarina Canelake 2015-01-05 21:30:44 -05:00
  • c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0 Chris 2014-11-14 12:44:23 -05:00
  • f91c5ffd1f Merge pull request #6099 from edx/marco/sass-variable-patterns-cleanup Marco Morales 2015-01-06 14:47:24 -05:00
  • 9d7c90bee8 Merge pull request #6466 from edx/alasdair/logistration-history-query-params-fix AlasdairSwan 2015-01-06 13:01:23 -05:00
  • a8a8cfd534 Updated after Will's comments AlasdairSwan 2015-01-06 11:48:05 -05:00
  • 93a2e080e8 Merge pull request #6465 from edx/renzo/update-split-payment-verification-copy Renzo Lucioni 2015-01-06 11:46:14 -05:00
  • a1104ceb6b Merge pull request #6464 from edx/alasdair/logistration-history-query-params-fix AlasdairSwan 2015-01-06 11:40:18 -05:00
  • 1d928379a1 Updated history.push to include any query params AlasdairSwan 2015-01-06 11:16:59 -05:00
  • fe691b051b Apply most important copy changes from docs Renzo Lucioni 2015-01-06 11:31:12 -05:00
  • ce3c650cf9 use modulestore bulk ops in forum views. jsa 2015-01-05 20:04:44 -05:00
  • 72bdd48fa5 Merge pull request #6460 from edx/muhhshoaib/rc-hotfix-redemption-page-css chrisndodge 2015-01-06 09:48:16 -05:00
  • cb6a4db1d0 Merge pull request #6430 from edx/awais786/ECOM-662-decline-error Awais Qureshi 2015-01-06 19:31:05 +05:00
  • adcfaaefd1 Merge pull request #6463 from edx/hotfix/ecom-872 Will Daly 2015-01-06 09:25:27 -05:00
  • f6186aeda4 Merge pull request #6357 from Shrhawk/shr/bug/TNL-997-aria-disabled-need-to-added Shrhawk 2015-01-06 19:07:46 +05:00
  • af7620a1c3 Merge pull request #6454 from edx/alasdair/not-activated-decoupled-verification-update Renzo Lucioni 2015-01-06 08:30:02 -05:00
  • dfb366afb9 ECOM-662 Raise exception in case of DECLINE response. Adding decline button in fake payment page. In of case ERROR, CANCEL, and DECLINE removing auth_amount from test cybersource2 and payment fake. Awais 2015-01-01 11:54:39 +05:00
  • 6f593222c4 Fix ECOM-872 Will Daly 2015-01-06 07:58:25 -05:00
  • 3fafc65c33 Merge pull request #5278 from edx/benp/improve-paver-bokchoy-modulestore Ben Patterson 2015-01-06 07:38:34 -05:00
  • 1e11baede4 Add aria-disabled attribute TNL-997 Syed Hassan Raza 2014-12-23 16:10:31 +05:00
  • 96d782f2d0 fix the redemption page css. div selector is not closed properly in the redemption page html Muhammad Shoaib 2015-01-06 13:59:26 +05:00
  • a129c4d2da Merge pull request #6435 from edx/markhoeber-remove-unused-files Mark Hoeber 2015-01-05 20:35:25 -05:00
  • 7d110a86d4 cleanup to PR feedback for shoppingcart and instructor2 scss partials Marco Morales 2015-01-05 18:17:10 -05:00
  • 9dc85bf10d PR updates Christine Lytwynec 2015-01-05 17:38:18 -05:00