Commit Graph

  • 368402f115 Changed selectors' ng-repeat. Using existing variable instead of method call Rick Giner 2015-05-03 15:24:16 +10:00
  • 9e70c80d1d bind-once in product modal Rick Giner 2015-05-03 14:48:27 +10:00
  • 8fb11defdb bind-once in groups home page Rick Giner 2015-05-03 14:41:34 +10:00
  • 9c26b3ebb2 bind-once in partials Rick Giner 2015-05-03 14:34:42 +10:00
  • 3fc616cdff bind-once on hubs Rick Giner 2015-05-03 14:11:09 +10:00
  • 16e9f0545b bind-once in products Rick Giner 2015-05-03 14:02:33 +10:00
  • a3664d4448 Added bindonce and ng-if improvements to Producers templates Rick Giner 2015-05-03 12:51:59 +10:00
  • 36838ed457 Hubs signup page WIP styling summerscope 2015-05-02 21:49:01 +10:00
  • 9a0e9145ef Adding more logic to force padding for shopfront page whether populated with products or not. summerscope 2015-05-02 20:25:23 +10:00
  • 572ab14c0b Removing BG image from producers page. This isn't part of changing design per instance (for the moment at least) summerscope 2015-05-02 20:18:07 +10:00
  • 1090328a3c Adding padding class and apply to templates to have required padding for new footer. summerscope 2015-05-02 20:12:33 +10:00
  • 89a537c3f7 Image assets - removing old brand. Adding new versions for new look & feel. summerscope 2015-05-02 18:25:46 +10:00
  • e6d00e00c4 WIP button tweaks for new look & feel summerscope 2015-05-02 18:25:38 +10:00
  • ddde4e9dcb WIP producers signup page markup summerscope 2015-05-02 18:25:23 +10:00
  • 3dbe45172d Registration markup tweak with new icons summerscope 2015-05-02 18:24:55 +10:00
  • 2db6d5fe65 Registration styling tweak for new look & feel summerscope 2015-05-02 18:24:40 +10:00
  • 6d904b4700 Adding in styling for signup panes for Producers and Hubs summerscope 2015-05-02 18:24:18 +10:00
  • 4cb0158b21 Add in link for Regional founders user types - to send back to global site summerscope 2015-05-02 18:23:42 +10:00
  • 4f145104d2 Update mailer to new logo - should be instance specific (e.g. UK, AUS, etc.) summerscope 2015-05-02 17:58:35 +10:00
  • fd90da6868 Shops landing page - adding info pane and copy with Jay. summerscope 2015-05-02 16:02:18 +10:00
  • 330d23c606 Move alert for 'join now' off global template onto homepage template only. summerscope 2015-05-02 15:23:12 +10:00
  • 5f193bc9ae More styling for homepage panes. summerscope 2015-05-02 15:20:51 +10:00
  • 0086066ea5 WIP on How does it work pane on homepage summerscope 2015-05-02 13:58:57 +10:00
  • 5198d52f0d Design assets for new UI summerscope 2015-05-02 13:58:47 +10:00
  • 7b8b53854e More WIP on homepage layout etc. summerscope 2015-05-01 18:46:39 +10:00
  • 03508f98d8 Homepage tagline styling for mobile / responsive summerscope 2015-05-01 18:24:07 +10:00
  • 53e2bc823d WIP styling and content for homepage summerscope 2015-05-01 18:19:51 +10:00
  • 11acb3ba59 Allow to remove adjustments Maikel Linke 2015-05-01 15:59:46 +10:00
  • 2edf5aeccd Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit Maikel Linke 2015-05-01 15:05:14 +10:00
  • 993183f2f5 updating js spec: cloning product calls insertProductAfter now Maikel Linke 2015-05-01 15:04:12 +10:00
  • e91de69d5a Merge branch 'master' into pin-refunds Rohan Mitchell 2015-05-01 14:58:19 +10:00
  • 03ae740cd6 Revert "Display header for Xero invoices report" Rohan Mitchell 2015-05-01 14:55:26 +10:00
  • d9fd0b284d WIP on home panes and layout summerscope 2015-05-01 14:52:17 +10:00
  • 7c55285708 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches Maikel Linke 2015-05-01 14:50:51 +10:00
  • e6e063670c Allow managers to remove line items from order Maikel Linke 2015-05-01 14:49:34 +10:00
  • e1beae98ab WIP on redesign / layout job summerscope 2015-05-01 14:41:48 +10:00
  • 153604dd64 Merge branch 'single-order-patches' Rohan Mitchell 2015-05-01 14:39:17 +10:00
  • b7bac326bd admin order edit: re-label update button to "update and recalculate fees" Maikel Linke 2015-05-01 12:05:43 +10:00
  • a6cecdcc25 Display header for Xero invoices report Rohan Mitchell 2015-05-01 11:59:52 +10:00
  • baabb5c07f fixing BPE feature spec Maikel Linke 2015-05-01 11:30:26 +10:00
  • 91ca5f0213 Fix specs for receival_time / instructions Rohan Mitchell 2015-05-01 10:08:24 +10:00
  • f5b45fa0ba Merge branch 'master' into folklabs-producer-emails Rohan Mitchell 2015-05-01 09:51:01 +10:00
  • 427f535026 Redesign big chunk of work: summerscope 2015-04-30 18:20:17 +10:00
  • ae16589717 New version of logo sliced for OFN Australia summerscope 2015-04-30 17:55:18 +10:00
  • 66f847f673 showing save button at the bottom as well Maikel Linke 2015-04-30 17:22:54 +10:00
  • af78859db6 Merge remote-tracking branch 'origin/master' into single-order-patches Maikel Linke 2015-04-30 17:18:02 +10:00
  • 295da25dd2 insert clone after cloned product Maikel Linke 2015-04-30 17:17:28 +10:00
  • 5efc0a5110 quick fix: update fees after updating order Maikel Linke 2015-04-30 16:29:51 +10:00
  • 2c7a5c0656 Update Spree - fixes bug where Payment#method_missing depends on #provider already called. Rohan Mitchell 2015-04-30 15:38:17 +10:00
  • 0b652a2113 Add refund icon Rohan Mitchell 2015-04-30 15:38:12 +10:00
  • b498c28632 Payments can be refunded Rohan Mitchell 2015-04-30 15:38:01 +10:00
  • 8184a7c7b2 Pin payments can't void or credit, but they can refund Rohan Mitchell 2015-04-30 13:45:44 +10:00
  • b09ae550c8 Add spec for payment actions Rohan Mitchell 2015-04-30 10:52:29 +10:00
  • f4df227ef0 Buildkite should now support Fuubar Rohan Mitchell 2015-04-30 13:54:27 +10:00
  • a207f50aeb Merge branch 'master' into delay-devise-emails Rohan Mitchell 2015-04-30 12:29:06 +10:00
  • 73376b30e2 Convention Rohan Mitchell 2015-04-29 15:56:27 +10:00
  • 3565548e91 Extract data preparation into private methods Rohan Mitchell 2015-04-29 15:50:42 +10:00
  • 6999bcfd4e Only include complete orders in producer mailer report Rohan Mitchell 2015-04-29 15:43:50 +10:00
  • 2fe5d7c73f Remove commented code, use neater syntax for accessing Spree config var Rohan Mitchell 2015-04-29 15:33:39 +10:00
  • 3a3bf19cf8 Clean up duplication Rohan Mitchell 2015-04-29 15:31:42 +10:00
  • 30e04b509d Clean up routes Rohan Mitchell 2015-04-29 15:31:13 +10:00
  • 4279742de5 Avoid serialising entire order cycle when enqueuing OrderCycleNotificationJob Rohan Mitchell 2015-04-29 15:21:05 +10:00
  • 713c93a570 Fix OrderCycleFormApplicator specs Rohan Mitchell 2015-04-29 15:00:22 +10:00
  • 36584f0177 Remove puts from specs, fix failing controller spec Rohan Mitchell 2015-04-29 14:46:20 +10:00
  • 6b1c125b03 Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails Rohan Mitchell 2015-04-29 14:42:17 +10:00
  • ecf635e080 handle missing bill_address on admin order page Maikel Linke 2015-04-29 14:28:20 +10:00
  • 2e66a082eb add customer notes to admin order index page Maikel Linke 2015-04-29 14:14:18 +10:00
  • 992fb2347d Merging master branch into require_standard_variant Rob Harrington 2015-04-29 14:30:49 +10:00
  • 3b61d7a1e0 Add ref for country ISO codoes Rohan Mitchell 2015-04-29 14:12:08 +10:00
  • c3f99d7540 Merge branch '441-default-country' of https://github.com/folklabs/openfoodnetwork into folklabs-441-default-country Rohan Mitchell 2015-04-29 14:07:58 +10:00
  • f6d87eee87 Merge remote-tracking branch 'origin/master' into single-order-patches Maikel Linke 2015-04-29 13:20:44 +10:00
  • e82a3a9d82 add ship button to admin order index page Maikel Linke 2015-04-29 12:30:05 +10:00
  • 8511bd19ce add ship button to order edit page Maikel Linke 2015-04-29 12:03:49 +10:00
  • 1268108877 handle ship event on order Maikel Linke 2015-04-29 12:03:11 +10:00
  • 2b0f867ed8 new order method ready_to_ship? Maikel Linke 2015-04-29 11:42:35 +10:00
  • a253b88525 Fixing line item controller spec Rob Harrington 2015-04-29 10:42:38 +10:00
  • 0f1ec17698 #275: Use better path variable in test. Paul Mackay 2015-04-28 16:08:26 +01:00
  • 9e61a7d083 Adding report type drop down to order_cycle_management_report Lynne Davis 2015-04-26 11:03:32 +01:00
  • 6bbd3f7c13 Added auth for order_cycle_management_report. This report was breaking supplier enterprises reports due to incorrect authorization. Lynne Davis 2015-04-26 11:02:06 +01:00
  • d344c3dec8 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
  • 6045283549 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
  • 162a565140 Removing notes to myself from this file Lynne Davis 2015-04-24 16:14:24 +01:00
  • 6a4de7c7e2 Hiding filters on list views because styling is broken v0.8.1 Rob Harrington 2015-04-24 19:35:18 +10:00
  • 505fd8ff96 Merge branch 'properties' of github.com:openfoodfoundation/openfoodnetwork into properties Rob Harrington 2015-04-24 17:20:41 +10:00
  • b1b1bfd8f6 Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page Rob Harrington 2015-04-24 16:05:39 +10:00
  • f94a5a975a Edit Order: resend button uses new pretty template. Maikel Linke 2015-04-24 15:31:45 +10:00
  • 29faa5f3c6 Merge branch 'master' into properties Rohan Mitchell 2015-04-24 15:14:52 +10:00
  • 8e2c224d4d cd before sourcing includes Rohan Mitchell 2015-04-24 15:00:49 +10:00
  • bb2f2a6f54 Also stop delayed job before loading staging baseline Rohan Mitchell 2015-04-24 12:48:39 +10:00
  • dab3b59f6a Merge branch 'master' into properties Rob Harrington 2015-04-24 14:00:08 +10:00
  • bdf462926d Ensure that producer properties have a position Rob Harrington 2015-04-24 13:05:01 +10:00
  • 355221a273 Adding customer name to order edit page heading Maikel Linke 2015-04-24 12:32:45 +10:00
  • ad2df56bf1 Merge branch 'require_standard_variant' of github.com:openfoodfoundation/openfoodnetwork into require_standard_variant Rob Harrington 2015-04-24 12:19:27 +10:00
  • 9149276048 Kill any postgres connections before dropping and recreating database Rohan Mitchell 2015-04-24 12:17:39 +10:00
  • ed7b763ecf UnitsCtrl can interpret unit_value_with_description without a separating space Rob Harrington 2015-04-24 12:15:35 +10:00
  • 05c350b5ff Refactoring unitsCtrl Rob Harrington 2015-04-24 11:27:47 +10:00
  • c66a7e44b6 Updating product model specs to reflect changes to properties Rob Harrington 2015-04-23 15:37:41 +10:00
  • 9eb99d1c4a Merge branch 'master' into properties Rob Harrington 2015-04-23 14:18:30 +10:00
  • 57be445bd4 Merge branch 'master' into require_standard_variant Rob Harrington 2015-04-23 14:18:11 +10:00
  • 6cde1f7732 Add tooltip with value for selectors Rob Harrington 2015-04-23 14:11:50 +10:00