Commit Graph

  • 9ee6ef06da Return logo to smaller size Rohan Mitchell 2015-05-11 16:14:30 +10:00
  • 460d0c9907 Increase size of logo to fill page above the fold. Remove cta1 pane. Rohan Mitchell 2015-05-11 15:53:36 +10:00
  • 14afe932c1 Resize menu logo, make it always fully opaque Rohan Mitchell 2015-05-11 14:39:53 +10:00
  • 978c176cf6 Remove filter on hero image, set up superimposed logo and shop now CTA Rohan Mitchell 2015-05-11 14:37:28 +10:00
  • 3e82deb1f5 Add new home hero images Rohan Mitchell 2015-05-11 14:32:07 +10:00
  • b7c1a43125 Issue #540 Fix up hub list navigation Rick Giner 2015-05-10 18:13:30 +10:00
  • 98c1a95bd1 Issue #531 remove Google map road markers Rick Giner 2015-05-10 16:51:56 +10:00
  • 9c3ec950fc Revert "ginerr_#531_remove Google map road markers" Rick Giner 2015-05-10 16:50:58 +10:00
  • 3e2117134f ginerr_#531_remove Google map road markers Rick Giner 2015-05-10 16:50:00 +10:00
  • 90dd1ea4a2 Merge pull request #1 from openfoodfoundation/variable_weights Lynne 2015-05-09 19:25:30 +01:00
  • 26ee5c49b2 Fixing merge conflicts Lynne Davis 2015-05-09 19:14:50 +01:00
  • 3179887842 Do not allow line_item.unit_value to be updated if the variant.unit_value is zero Lynne Davis 2015-05-09 19:03:06 +01:00
  • 4d025ee7a9 Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work. Lynne Davis 2015-04-24 16:22:17 +01:00
  • 521834bd76 Populate the line item unit value, when line_item created and update old data in migration Lynne Davis 2015-04-24 16:17:00 +01:00
  • 662c7fe368 Removing notes to myself from this file Lynne Davis 2015-04-24 16:14:24 +01:00
  • 54da7ae241 Adding additional logic for if the line_item unit_value is nil Lynne Davis 2015-04-14 17:29:56 +01:00
  • 2a991ad130 Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight. Lynne Davis 2015-04-04 17:52:31 +01:00
  • 2f463474fb Adding specs for variable weight adjustment via builk order management Lynne Davis 2015-04-04 17:44:02 +01:00
  • f7ade48e86 Update DB schema to store updatable weight on items sold Lynne Davis 2015-04-04 17:06:26 +01:00
  • fd37324359 #536: Add permissions checking for Notify producers action. Paul Mackay 2015-05-09 11:02:25 +01:00
  • 3d0880857a Auto-merge from CI [skip ci] Continuous Integration 2015-05-08 16:24:39 +10:00
  • 8cb8aacefe Switch logo for white menu Rohan Mitchell 2015-05-08 16:07:59 +10:00
  • 6fc9789477 Invert colours on top menu Rohan Mitchell 2015-05-08 15:11:54 +10:00
  • 6322fdc1f0 Disable top alert Rohan Mitchell 2015-05-08 15:03:37 +10:00
  • df14c10608 Auto-merge from CI [skip ci] Continuous Integration 2015-05-08 13:45:56 +10:00
  • 1531c476e3 Merge branch 'master' into require_standard_variant Rohan Mitchell 2015-05-08 13:45:31 +10:00
  • e8c8d8885c Merge branch 'master' into single-order-patches Rohan Mitchell 2015-05-08 12:42:56 +10:00
  • 768c9f24a2 Make topbar height configurable Rohan Mitchell 2015-05-08 11:16:57 +10:00
  • a450d3af81 Variables can now be used to override foundation vars Rohan Mitchell 2015-05-08 11:15:27 +10:00
  • f6c1be97a8 WIP: Fix apostrophes, add TODO Rohan Mitchell 2015-05-07 15:03:27 +10:00
  • 6fb3fa55a1 Allow extended time for all parts of this spec to fix intermittent fails Rohan Mitchell 2015-05-07 14:23:58 +10:00
  • f3f0766279 Adding a distributor to order cycle to fix broken feature spec Rob Harrington 2015-05-07 12:48:31 +10:00
  • 0d5ce5ff57 Fixing issues with reports controller spec Rob Harrington 2015-05-06 15:19:48 +10:00
  • 68b4cb59be Fixing bulk management specs broken by making order_cycles filter update dates Rob Harrington 2015-05-06 14:46:23 +10:00
  • f88fdac710 Adding module - doh! Rob Harrington 2015-05-06 13:53:59 +10:00
  • a7019e7e78 Adding permissions method for order report enterprises Rob Harrington 2015-05-06 13:00:36 +10:00
  • bd66091d75 Push logic for checking of user super admin status down into private method Rob Harrington 2015-05-06 12:49:07 +10:00
  • d8f5669fbb Renaming granted > related_enterprises_granted Rob Harrington 2015-05-06 12:18:15 +10:00
  • 5806f50a84 Renaming granting > related_enterprises_granting Rob Harrington 2015-05-06 12:14:23 +10:00
  • 5cd528a87d Removing obsolete related_enterprises_with permission method Rob Harrington 2015-05-06 12:09:54 +10:00
  • f0f7e0ee2f Making permissions method managed_and_related_enterprise_with method more specific Rob Harrington 2015-05-06 12:03:52 +10:00
  • 7ffe0f042e Moving accessible_by scope on Enterprise to permissions Rob Harrington 2015-05-06 11:48:39 +10:00
  • f79fba52be Hiding personal details of customers, where the user does not manage the distributor of the order or the coordinator of the order cycle Rob Harrington 2015-05-02 17:43:21 +10:00
  • 4259b466f5 Using new order and line item permissions to fetch items to display in Orders and Fullfillment reports Rob Harrington 2015-05-02 17:41:18 +10:00
  • 0a03483e36 Adding permissions methods for visible and editable orders and line_items Rob Harrington 2015-05-01 12:46:20 +10:00
  • 28bf7037db Updating methods for retrieving allowed producers, distributors and order cycles for order and fulfillment reports Rob Harrington 2015-04-30 16:20:15 +10:00
  • ed9bbe2c45 Sorting Hub and Producer filter selectors by name Rob Harrington 2015-04-30 15:26:54 +10:00
  • b5c7607d67 Order cycle filter resets date filters on BOM Rob Harrington 2015-04-30 15:15:05 +10:00
  • e640376d63 Don't load cancelled orders into bulk order management Rob Harrington 2015-04-30 10:52:34 +10:00
  • 9ab16d8cec Allowing calls to Api::OrderCyclesController#accessible to specify :as => 'distributor' or 'producer' Rob Harrington 2015-04-30 10:09:51 +10:00
  • d8c23d37ac Update accessible_by scope on enterprise, to read from permissions Rob Harrington 2015-04-29 13:44:00 +10:00
  • 89b153dc2c Update AJAX request to use sells instead of deprecated is_distributor attribute Rob Harrington 2015-04-29 13:43:11 +10:00
  • bd6bac8874 Display deployment output in real time Rohan Mitchell 2015-05-06 20:02:03 +10:00
  • 50d2ddc05f Add progress comments Rohan Mitchell 2015-05-06 20:00:50 +10:00
  • 10b7a86745 Add debugging to merge script Rohan Mitchell 2015-05-06 19:50:06 +10:00
  • 6d33dc5070 Add script to merge master into the current branch if required before running specs Rohan Mitchell 2015-05-06 19:41:36 +10:00
  • d109e898d2 Preserve newlines when displaying deploy script output Rohan Mitchell 2015-05-06 19:38:20 +10:00
  • 3dee29cd12 Remove build badge - master branch is always green Rohan Mitchell 2015-05-06 19:37:21 +10:00
  • 0921cd2dfa Merge branch 'master' into single-order-patches Rohan Mitchell 2015-05-06 18:13:55 +10:00
  • 7b4130972b Fix first feature spec sometimes timing out Rohan Mitchell 2015-05-06 18:12:17 +10:00
  • 485eee4bdd Deploy scripts display their output Rohan Mitchell 2015-05-06 18:07:50 +10:00
  • f84e704d99 Retry simple push-to-master script Rohan Mitchell 2015-05-06 17:59:36 +10:00
  • ad7e5a45bb Add updated merge script Rohan Mitchell 2015-05-06 17:58:36 +10:00
  • d9404d3332 Merge branch 'master' into single-order-patches Rohan Mitchell 2015-05-06 17:29:23 +10:00
  • f024f62970 Content-manage footer fields Rohan Mitchell 2015-05-06 16:36:10 +10:00
  • bf435a8f3d Make home page what's happening text and about URL configurable Rohan Mitchell 2015-05-06 15:17:28 +10:00
  • 01d1e84f85 Update global links Rohan Mitchell 2015-05-06 15:15:09 +10:00
  • e43d726b97 Merge branch 'master' into payments-report-fix Rohan Mitchell 2015-05-06 14:55:10 +10:00
  • b5a6f9c1bc Add infrastructure so admin can configure content. Make homepage tagline CTA configurable. Rohan Mitchell 2015-05-06 14:17:57 +10:00
  • 1ffba674b3 Show real stats on home page Rohan Mitchell 2015-05-06 11:31:32 +10:00
  • e662aab004 Brand story can be expanded and contracted Rohan Mitchell 2015-05-06 11:16:18 +10:00
  • abee9c8198 Update security text and licensing Rohan Mitchell 2015-05-06 10:58:54 +10:00
  • 3bca1f2070 Tweaks to homepage styling summerscope 2015-05-06 11:32:47 +10:00
  • 8788322492 Alllowing payments in payment reports to access soft-deleted payment methods Rob Harrington 2015-05-06 11:10:50 +10:00
  • 808979a8e0 Add a to do note for Rohan in css summerscope 2015-05-06 09:44:45 +10:00
  • b0f76330b7 Changing order of events on homepage to make shopping the most obvious thing on homepage. summerscope 2015-05-06 09:38:49 +10:00
  • 216f99d1c7 New link for footer - updated URL summerscope 2015-05-05 16:14:18 +10:00
  • 31c4af154e Applying Jay's copy to homepage summerscope 2015-05-05 15:44:36 +10:00
  • e7d09f1b55 Change copy as supplied by Jay summerscope 2015-05-05 15:32:04 +10:00
  • 62a39af975 Make assets for home even smaller summerscope 2015-05-05 15:11:52 +10:00
  • c0b12e39a8 Tweaking styling on shopfront header summerscope 2015-05-05 14:59:37 +10:00
  • 75055300e3 Adding comments into Footer for CMS implementation stuff with Rohan summerscope 2015-05-05 14:56:11 +10:00
  • af4fe27f31 Adding comments for CMS implementation stuff with Rohan summerscope 2015-05-05 14:53:25 +10:00
  • faa490b093 Reslice to optimise for web & reduce file size summerscope 2015-05-05 14:53:07 +10:00
  • 4da6bef639 Removing unused assets. Adding some todo notes. Optimising PNG assets to reduce file size. summerscope 2015-05-05 13:35:51 +10:00
  • 63ec0d7dcf Merge branch 'master' into folklabs-producer-emails Rohan Mitchell 2015-05-05 11:48:31 +10:00
  • ae221f0416 Remove clashing padding classes summerscope 2015-05-04 23:02:33 +10:00
  • 924efec49c Add animation class to make consistent with Hubs and Producers. Remove class .animate-repeat summerscope 2015-05-04 22:59:48 +10:00
  • 9082da6d5e Remove animation from search field, add to group nodes summerscope 2015-05-04 22:57:07 +10:00
  • eabe0e43e2 Fix the big input styling to work better with new typography summerscope 2015-05-04 22:55:57 +10:00
  • 91afbaca4b Fixing name-space clash in footer summerscope 2015-05-04 22:49:10 +10:00
  • 2736421460 First cut at Groups landing page for sign up. summerscope 2015-05-04 22:42:14 +10:00
  • 84c2faddd5 Adding new link to footer summerscope 2015-05-04 22:19:33 +10:00
  • 9ebbdd8dc7 Adding route for groups/signup Rob Harrington 2015-05-04 22:09:35 +10:00
  • 0510fa27e6 More design tweaks for homepage and conversion pages summerscope 2015-05-04 18:23:04 +10:00
  • b483afe7f7 Styling Producers page - simpler and to be more in-line with Shops page summerscope 2015-05-04 14:36:12 +10:00
  • 41fb44c19b More styling on pricing table summerscope 2015-05-04 14:33:03 +10:00
  • 938358007a > More styling for landing pages for signup > Add signup page for groups / food systems partners > Change link in footer summerscope 2015-05-04 13:44:35 +10:00
  • 503c483acd Tweak language summerscope 2015-05-04 13:16:18 +10:00
  • 3091b365ec Adding in logos for case studies summerscope 2015-05-04 13:15:18 +10:00