Commit Graph

  • 73b90dba10 Shift legacy redirect further down routes to avoid stomping /enterprises/check_permalink Rohan Mitchell 2015-07-10 09:40:42 +10:00
  • 4cc8eb90fc Refactor code for brevity Rohan Mitchell 2015-06-30 12:54:03 +10:00
  • 8deb4ef9d4 When encountering StaleObjectError when checking out, retry Rohan Mitchell 2015-06-30 12:50:52 +10:00
  • d0b7a0795d Fix 500 when bulk updating order cycles with no data Rohan Mitchell 2015-06-30 11:23:13 +10:00
  • d67b34c2bd Remove deprecated about_us page and add redirect Rohan Mitchell 2015-06-26 16:33:29 +10:00
  • 3f8235593a When enterprise is deleted, delete relationships Rohan Mitchell 2015-06-26 16:27:14 +10:00
  • c5c3051f98 Re-enable future spec Rohan Mitchell 2015-06-26 12:06:18 +10:00
  • 4f2389e257 Remove legacy enterprises views - index, suppliers, distributors, show Rohan Mitchell 2015-06-26 12:01:47 +10:00
  • fc4cd517fd Redirect legacy enterprise path to home #571 Rohan Mitchell 2015-06-26 12:00:13 +10:00
  • 361f7e3432 Remove double-output on push to production. Add script to archive old branches. Rohan Mitchell 2015-07-02 09:39:49 +10:00
  • 213242627e Merge branch 'master' into redesign-phase-2 Rohan Mitchell 2015-07-01 15:44:36 +10:00
  • 960e4d3015 Scale logo down when display is very short (ie. iPhone 4) Rohan Mitchell 2015-07-01 15:38:50 +10:00
  • c3097cac70 Auto-merge from CI [skip ci] Continuous Integration 2015-07-01 10:57:01 +10:00
  • b991f6c228 Add angular-slideables to js test include Rohan Mitchell 2015-06-26 16:07:23 +10:00
  • 918889a572 Make subject more friendly for groups enquiry email Rohan Mitchell 2015-06-26 15:53:10 +10:00
  • 7e685b646f Fine-tune header sizes on home page and cutover point for page_alert responsiveness Rohan Mitchell 2015-06-26 15:24:49 +10:00
  • eef302635b Fix alert overflow on mobile Rohan Mitchell 2015-06-26 13:18:47 +10:00
  • 6105d008df Show CTA above the fold on iPhone 5 Rohan Mitchell 2015-06-26 13:18:32 +10:00
  • dd04afe8f8 Make alert box more legible Rohan Mitchell 2015-06-26 13:03:22 +10:00
  • 5a9101e303 Display HTML special chars correctly in title Rohan Mitchell 2015-06-26 10:49:22 +10:00
  • c97ed026d0 Make room in menu for shopping@ text Rohan Mitchell 2015-06-26 10:49:02 +10:00
  • ce46cb0956 Add subject to group enquiries Rohan Mitchell 2015-06-25 16:22:34 +10:00
  • 9f8fa575b3 Scroll past header on shops page if user is logged in Rohan Mitchell 2015-06-25 12:24:13 +10:00
  • 4da367a94b Put OFN logo in top bar of mobile site Rohan Mitchell 2015-06-25 11:05:32 +10:00
  • 6197dfe403 Make brand story animate slide down/up Rohan Mitchell 2015-06-25 10:36:19 +10:00
  • 1363daae3c When fetching ofn commit, if it is not found, return a sentinal value to avoid a wayward git push Rohan Mitchell 2015-06-26 11:22:19 +10:00
  • d9f4a92648 Do not use with_products_require_tax_category in around filters - Spree::Config has caching which isn't shared between contexts Rohan Mitchell 2015-06-24 14:52:17 +10:00
  • bc11140a40 Make config reset for all tests more robust. Add cache isolation for parallel specs. Rohan Mitchell 2015-06-24 14:02:45 +10:00
  • 7a36e92592 Merge branch 'unique-enterprise-names' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes_optimise-shopfront Rohan Mitchell 2015-06-24 10:09:35 +10:00
  • 2d79177bb5 When a registering an enterprise with a non-unique name, display an error message. Rohan Mitchell 2015-06-24 10:08:34 +10:00
  • f51a9679f2 Merge branch 'optimise-shopfront' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes Rohan Mitchell 2015-06-19 11:34:41 +10:00
  • 173f4c0f03 Merge branch 'rob-github-fixes' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes Rohan Mitchell 2015-06-19 11:32:55 +10:00
  • 116565fa0f Merge branch 'parallel-fuubars' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes Rohan Mitchell 2015-06-19 11:32:44 +10:00
  • 52887dc699 Merge branch 'unique-enterprise-names' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes Rohan Mitchell 2015-06-19 11:32:25 +10:00
  • 89a571d497 Fix spec coupled to variant overrides Rohan Mitchell 2015-06-18 16:05:35 +10:00
  • ff4ee16f06 Fix currency issues, changed logo path Rohan Mitchell 2015-06-18 15:38:37 +10:00
  • ae3a69c1af Put in debugging for failing push-to-prod step (sigh) Rohan Mitchell 2015-06-18 15:29:05 +10:00
  • 6d423ac990 Auto-merge from CI [skip ci] Continuous Integration 2015-06-18 15:20:12 +10:00
  • aa0a031fa0 Fetch indexed variant overrides in one go Rohan Mitchell 2015-06-18 15:03:24 +10:00
  • dd2f6d6430 Extract VariantOverride fetching into ScopeVariantToHub#scope Rohan Mitchell 2015-06-18 14:45:40 +10:00
  • ce0de6e1dc Fix push to production - needs includes for get_ofn_commit Rohan Mitchell 2015-06-18 14:25:48 +10:00
  • 7cc2bc4fde Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go. Rohan Mitchell 2015-06-18 13:11:11 +10:00
  • 6ed9a2620c Use indexed_fees_for for product price Rohan Mitchell 2015-06-18 11:12:10 +10:00
  • 860183e675 Do not double-display deployment output Rohan Mitchell 2015-06-18 12:41:47 +10:00
  • 1cd9ee399f Cloak shops page Rohan Mitchell 2015-06-18 10:19:18 +10:00
  • b5d841562d Getting OFN commit should retrieve from meta-data Rohan Mitchell 2015-06-18 10:02:15 +10:00
  • 9f883db25b Really show deploy output in real time Rohan Mitchell 2015-06-18 09:57:21 +10:00
  • 389ac07bd7 Store commit at start of build process and use it throughout Rohan Mitchell 2015-06-17 16:25:34 +10:00
  • 4da69f78cb Use fuubar with parallel specs for advance notice of failures Rohan Mitchell 2015-06-17 15:22:08 +10:00
  • c5526c78d9 Make enterprise name unique Rohan Mitchell 2015-06-17 15:01:46 +10:00
  • 470f10a828 Merge branch 'master' into rob-github-fixes Rohan Mitchell 2015-06-16 19:00:54 +10:00
  • bf953f8987 Undo last change, it broke asset precompilation. Rename style.css to scss for inclusion and force recompilation of all assets. 1.1.0 Rohan Mitchell 2015-06-16 18:25:44 +10:00
  • 0ade5ee3a8 Import style.css file also (not included by default by @import) Rohan Mitchell 2015-06-16 18:00:35 +10:00
  • 0dbecce65d Optimise relatives including self - minor improvement Rohan Mitchell 2015-06-16 17:43:13 +10:00
  • faee88c404 Merge branch 'master' into redesign Rohan Mitchell 2015-06-16 16:57:09 +10:00
  • bf2a7f12e0 Fix interaction between alert and mobile menu. A bit hack-ish, needs some more love. Rohan Mitchell 2015-06-16 16:28:45 +10:00
  • 02d68c662b Add titles to all darkswarm pages Rohan Mitchell 2015-06-16 15:31:35 +10:00
  • 387021929e Merge branch 'master' into rob-github-fixes v1.0 1.0.0 Rohan Mitchell 2015-06-16 15:05:01 +10:00
  • 301a3ac090 Rename Blog link to News for consistency with global site Rohan Mitchell 2015-06-16 14:53:54 +10:00
  • fd41003fb7 Change all global links to www Rohan Mitchell 2015-06-16 14:47:40 +10:00
  • c76021462c Auto-merge from CI [skip ci] Continuous Integration 2015-06-16 14:12:16 +10:00
  • 846f4bb4b1 Tweak menu responsiveness: Fix items covering country name, fix ul.right dropping down to next line Rohan Mitchell 2015-06-16 13:02:43 +10:00
  • b540f645c3 Split CSS to overcome IE9's 4096 rule limit Rohan Mitchell 2015-06-16 11:57:50 +10:00
  • 30af5d4278 Enterprise relatives include self where appropriate for serialized injection data Rob Harrington 2015-06-15 19:45:29 +08:00
  • 92082ce95c Adding filter back on producers page Rob Harrington 2015-06-15 16:35:41 +08:00
  • 1558ddb1eb Fixing index enterprise serializer so that payment methods issue displays when no payment methods are present Rob Harrington 2015-06-15 16:15:06 +08:00
  • 0038ebaa1f Fix styling issue for full sixteen column enterprise index panel Rob Harrington 2015-06-15 16:10:33 +08:00
  • 943c702e88 Hiding 'more' list if there are no overflow filter selectors Rob Harrington 2015-06-15 15:54:55 +08:00
  • fb19feb357 Adding filters back to the hub page Rob Harrington 2015-06-15 15:43:43 +08:00
  • e09431fa20 Styling tweaks Rob Harrington 2015-06-15 15:43:19 +08:00
  • fb11c93943 Making ul element the root of filter_selectors directive, so resolve issue with using ng-repeat element as root of a replacement directive Rob Harrington 2015-06-15 15:43:01 +08:00
  • 727e8a81d6 Making sure enterprise serializer serializes no taxons as an empty array Rob Harrington 2015-06-15 15:41:25 +08:00
  • 0e96a23a52 Fixing filters selector directive to that an allSelector watcher isn't required for generation on selectors to work Rob Harrington 2015-06-15 12:06:23 +08:00
  • 80bf6e61ad redirect /t/products/:id to / Maikel Linke 2015-06-13 11:59:52 +10:00
  • c6d01055d6 updating relationship spec Maikel Linke 2015-06-12 19:32:56 +10:00
  • 82d31b908f More styling tweaks Rob Harrington 2015-06-12 16:09:53 +08:00
  • 066c8876ff Only serializing unresolved enterprise issues, styling tweaks and fixes for index Rob Harrington 2015-06-12 15:49:01 +08:00
  • de1971072e update relationship js spec Maikel Linke 2015-06-12 17:09:04 +10:00
  • f44ac5b27b Merge branch 'url-redirects' into e2e-links Maikel Linke 2015-06-12 17:03:31 +10:00
  • d717c38f6d Filter relationships by permission Maikel Linke 2015-06-12 17:02:40 +10:00
  • 61effc03c1 add "Enterprise Relationships" tab for non-admins Maikel Linke 2015-06-12 14:59:32 +10:00
  • f2bc98e812 E2E: select all permissions Maikel Linke 2015-06-10 15:28:53 +10:00
  • 795b2700b4 Merge branch 'master' into enterprise-index-revamp Rob Harrington 2015-06-12 12:47:58 +08:00
  • 6ab5efbe02 Last minute styling adjustments Rob Harrington 2015-06-12 12:40:24 +08:00
  • 59d5ebe9d4 Changes to copy Rob Harrington 2015-06-12 12:32:17 +08:00
  • 1fb1733644 Adding link to user guide to enterprises index and dashboard Rob Harrington 2015-06-12 12:31:57 +08:00
  • 775718c776 Adding status panel on enterprise index Rob Harrington 2015-06-12 12:09:00 +08:00
  • 2b763271a7 Merge branch 'master' into optimise-shopfront Rohan Mitchell 2015-06-12 12:15:20 +10:00
  • d61073f08d redirect /enterprises to / Maikel Linke 2015-06-12 10:47:31 +10:00
  • 2fb8f9f8a3 Redirect /products to / Maikel Linke 2015-06-04 11:35:30 +10:00
  • 4f311543ae Merge branch 'master' into enterprise-index-revamp Rohan Mitchell 2015-06-12 10:26:11 +10:00
  • eed27ceb31 Shipping Method feature specs work with new enteprise user enterprise index Rob Harrington 2015-06-12 03:10:50 +08:00
  • 77432ffc41 Payment Method feature specs work with new enteprise user enterprise index Rob Harrington 2015-06-12 03:10:37 +08:00
  • 5d2b36c667 Enterprise Fee feature specs work with new enteprise user enterprise index Rob Harrington 2015-06-12 03:10:14 +08:00
  • 61beb38e9c Bringing back delayed_job on enterprise emails - acctidentally took it out earlier Rob Harrington 2015-06-12 03:09:40 +08:00
  • efca4dde10 Fixing enterprises feature spec Rob Harrington 2015-06-12 01:46:52 +08:00
  • d0b7550629 Removing screenshot from spec Rob Harrington 2015-06-12 01:45:04 +08:00
  • 6f975593fe Splitting enterprise index feature specs into their own file, reinstating old enterprise index for super admin users Rob Harrington 2015-06-12 00:56:52 +08:00
  • 64ed80f845 Enterprise index action load enterprise_set for super admin Rob Harrington 2015-06-12 00:56:10 +08:00
  • f80a5fe558 Fixing reference to change_type_form partial from single enterprise dashboard Rob Harrington 2015-06-12 00:49:35 +08:00