Commit Graph

  • e7adacc541 Typo Lynne Davis 2016-06-20 18:34:54 +01:00
  • fa52712e35 More syntax fixes Lynne Davis 2016-06-20 18:32:32 +01:00
  • 36093c0f64 Merge pull request #1045 from lin-d-hop/sign_up_email_i18n Lynne 2016-06-20 17:29:37 +01:00
  • 02d8f52426 Fixing syntax Lynne Davis 2016-06-20 17:02:10 +01:00
  • 5b22e19ec9 Undoing locale changes accidentally committed Lynne Davis 2016-06-20 15:24:24 +01:00
  • 99d22649a2 Undoing this change, shouldn't be on this branch Lynne Davis 2016-06-20 15:21:34 +01:00
  • 98548e15c5 I18n of enterprise emails Lynne Davis 2016-06-20 15:18:25 +01:00
  • f37f89dd07 Adding Community forum to ContentConfig Lynne Davis 2016-06-20 15:13:49 +01:00
  • ed37604bc2 Update from address in notification emails Lynne Davis 2016-06-18 09:09:43 +01:00
  • e284ad62b2 Inject only relative enterprises into shopfront Maikel Linke 2016-06-17 17:03:47 +10:00
  • d28c0159ab Use have_selector x, count: y; instead of all(x).count.should == y Rob Harrington 2016-06-17 12:06:01 +10:00
  • e40ecae681 Removing inline styles for links dropdown Rob Harrington 2016-06-17 11:51:27 +10:00
  • 1e142aa628 Refactoring OrderCycleFormApplicator logic for improved update speed Rob Harrington 2016-06-17 10:48:18 +10:00
  • 6586e67a5c Better messaging around deletion of customers Rob Harrington 2016-06-17 14:47:04 +10:00
  • d9b3366a5c Auto-select shop on customers index when only one available Rob Harrington 2016-06-17 11:28:20 +10:00
  • 61969f5c84 Ensure CustomersController#update.json gives an appropriate response Rob Harrington 2016-06-16 22:42:53 +10:00
  • 2a4737147f Tweaking the way new customer form error messages are display for latest version of AngularJS Rob Harrington 2016-06-16 16:32:10 +10:00
  • a909f0ddb8 Merge remote-tracking branch 'origin/master' into pr/1033 Rob Harrington 2016-06-16 15:12:30 +10:00
  • 25cdd4af8e Preventing shop from being changed when unsaved customer changes exist Rob Harrington 2016-06-16 15:10:16 +10:00
  • be7e46300c Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into prod-log-warn Maikel Linke 2016-06-15 11:56:29 +10:00
  • 9ba07a2afb Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-06-15 11:26:02 +10:00
  • a39d15d685 Fix failed adds a new tag rule js test Bing Xie 2016-06-01 16:02:12 +10:00
  • d424c2eb20 Enterprise form SaveBar becomes available when adding a new rule Rob Harrington 2016-06-01 13:36:18 +10:00
  • c8c8f0d02d Removing old cancel button from bottom of OC forms Rob Harrington 2016-06-01 13:27:04 +10:00
  • 8221f1f193 Use scope. to ensure that tag rule sorting is applied Rob Harrington 2016-06-01 13:21:13 +10:00
  • c83952571f Fix failed test Bing Xie 2016-05-31 10:50:28 +10:00
  • 18a8efed5f Resize window to fix failed test Bing Xie 2016-05-27 12:21:14 +10:00
  • 82dc2a8c98 Update bulk products editing page Bing Xie 2016-05-27 12:04:34 +10:00
  • 001ae19b26 Update create and update order cycle page save-bar Bing Xie 2016-05-27 11:46:23 +10:00
  • c003dcded9 Update editing enterprise page save-bar Bing Xie 2016-05-27 11:22:23 +10:00
  • 7aa8f2c73c Fix failed tests Bing Xie 2016-05-25 15:15:02 +10:00
  • 41837eb31d Tweak create order cycle spec Bing Xie 2016-05-25 14:55:00 +10:00
  • 860a537f30 Add save bar to bulk editing product page Bing Xie 2016-05-25 14:36:37 +10:00
  • 33fd88507d Fix failed tests Bing Xie 2016-05-25 11:26:15 +10:00
  • d8bf66a6c9 Use save bar on enterprise editing page Bing Xie 2016-05-13 15:12:21 +10:00
  • 2065d81bb4 Use save bar directive in enterprise editing page Bing Xie 2016-05-12 09:47:11 +10:00
  • 7994e2594a Update create order cycle feature test Bing Xie 2016-05-04 15:46:25 +10:00
  • baa6fda3e0 Use save bar in create order cycle page Bing Xie 2016-05-04 15:22:52 +10:00
  • fb33be78dd #591 show selected hub dropdown on customers page and enable easy switch to different hub David Ajnered 2016-06-10 15:42:40 +02:00
  • db3637fe84 Allow removing customer codes Maikel Linke 2016-06-10 18:14:19 +10:00
  • ee0a226388 Try to remove random failure from spec Maikel Linke 2016-06-10 10:06:35 +10:00
  • 5cd269411d Trigger order button instead of click Maikel Linke 2016-06-10 09:46:56 +10:00
  • cb679a6aba Remove duplicate "What's this?" from order cycles overview Maikel Linke 2016-06-10 09:18:26 +10:00
  • ad1ef877c0 Warn about duplicate customer codes Maikel Linke 2016-06-08 17:07:44 +10:00
  • c5ba0b8f8c Merge branch 'master' into 1014-image-diet v1.8.1 Rob Harrington 2016-06-08 15:12:33 +10:00
  • 365c6b3a83 Streamlining button clicking on registration spec Rob Harrington 2016-06-08 13:06:57 +10:00
  • a504a10b52 Change to explicitly check complete state (default Spree::Order.complete scope checks only for presence of 'completed_at' timestamp) Steve Pettitt 2016-05-21 13:32:25 +01:00
  • caf35d0ad7 Add a spec to exclude canceled orders (failing) Steve Pettitt 2016-05-21 11:15:45 +01:00
  • b718cf729a Set production log level to warn Paul Mackay 2016-06-01 20:51:31 +01:00
  • 489feb4e01 Longer default page size for feature specs Maikel Linke 2016-06-01 14:40:56 +10:00
  • 89c3758bae Avoid race conditions in feature specs Maikel Linke 2016-06-01 16:15:44 +10:00
  • 4bde890eaa Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into error-pages Maikel Linke 2016-06-01 15:22:34 +10:00
  • ee10a4b173 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-06-01 12:16:10 +10:00
  • 6f375306c2 Some US-Specific copy. (#1018) Mike iLL Kilmer 2016-05-31 21:13:03 -05:00
  • 98f8f7b89f Adding new help-modal dialog, use for explaining tag rule UI v1.8.0 Rob Harrington 2016-05-28 01:16:07 +10:00
  • 7028fbe288 Find current_customer via current_distributor and current_user rather than current_order Rob Harrington 2016-05-27 23:26:31 +10:00
  • 07384edb2d Can delete default tag rules Rob Harrington 2016-05-27 22:00:08 +10:00
  • 12e685bd92 Restricting number of tags for tag rules to one Rob Harrington 2016-05-27 16:22:11 +10:00
  • 6dd05ca4da Intermittent fail hunting Rob Harrington 2016-05-27 15:04:43 +10:00
  • a1c7a44fa0 Tag Rules can be rearranged in UI to set priority Rob Harrington 2016-05-27 13:53:25 +10:00
  • cb9e3b43f9 Tag attributes are auto-initialized via directive if not present on object Rob Harrington 2016-05-26 23:54:54 +10:00
  • 011c8c74d9 Updating remove button character for tags in ngTagsInput Rob Harrington 2016-05-26 23:25:00 +10:00
  • 38e37a4dfa Using new jasmine2 syntax in variant override spec Rob Harrington 2016-05-26 23:02:05 +10:00
  • 607b674c57 Refactoring tag rule logic, placing in TagRuleApplicator lib class Rob Harrington 2016-05-26 13:46:54 +10:00
  • fa3b43a970 Adding default tag rules Rob Harrington 2016-05-23 10:19:21 +10:00
  • bf0db2287b More structured layout for Tag Rules UI Rob Harrington 2016-05-20 15:15:26 +10:00
  • 339074a66e Making templates available to paymentMethods module Rob Harrington 2016-05-19 11:28:24 +10:00
  • c568ac4d64 Re-adding button clicks removed in 885d489bc3 Rob Harrington 2016-05-19 11:11:50 +10:00
  • 3d7786e185 Optional autocomplete for tag rules directive Rob Harrington 2016-05-19 11:10:20 +10:00
  • 9b12b86053 Simplifying supplier and distributor row counts Rob Harrington 2016-05-19 10:05:40 +10:00
  • 84817b0124 Fixing specs broken by faster PhantomJS Rob Harrington 2016-05-05 13:50:58 +10:00
  • 5624fa0c5e Adding FilterOrderCycles tag rules to UI Rob Harrington 2016-05-18 17:59:46 +10:00
  • 10434f5ee3 Renaming class Rob Harrington 2016-05-18 17:07:28 +10:00
  • e32e3ddf70 Applying FilterOrderCycles rules in the frontend Rob Harrington 2016-05-18 17:07:09 +10:00
  • 70e6428c1f Adding FilterOrderCycle tag rule Rob Harrington 2016-05-18 15:52:58 +10:00
  • 9dc1294ec5 Outgoing exchanges can be tagged Rob Harrington 2016-05-01 14:08:55 +10:00
  • e81858c0dc Renaming PanelToggleRow to PanelCtrl Rob Harrington 2016-05-01 12:13:17 +10:00
  • 8035b3f24a Refactoring admin table panels infrastructure Rob Harrington 2016-05-01 09:38:41 +10:00
  • d201e4a039 Tweaking styling for JQuery Dialog box in admin section Rob Harrington 2016-04-27 15:34:07 +10:00
  • e999b5715a Adding FilterPaymentMethods rules to tag rule UI Rob Harrington 2016-04-27 15:33:45 +10:00
  • 3fb6fba0f0 Adding payment method tag rule logic to Spree::Order.available_payment_methods Rob Harrington 2016-04-27 14:39:49 +10:00
  • e21735b037 Removing naughty save_screenshot call from payment method spec Rob Harrington 2016-04-27 14:39:09 +10:00
  • e553b8c590 Adding filter payment method tag rule logic Rob Harrington 2016-04-27 13:40:29 +10:00
  • 4d83bf2135 Payment methods can be tagged Rob Harrington 2016-04-27 13:36:49 +10:00
  • 385fd91e70 Adding angularjs payment method controller, updating payment method edit form Rob Harrington 2016-04-22 13:31:37 +10:00
  • 2d666caaf2 Nitpicking Rob Harrington 2016-04-22 12:32:36 +10:00
  • c61cb1bdcd Renaming paymentMethodCtrl to paymentMethodsCtrl Rob Harrington 2016-04-22 12:31:52 +10:00
  • eedb2854ec Adding FilterProducts rules to tag rule UI Rob Harrington 2016-04-27 15:01:52 +10:00
  • 1cb51b5c71 CodeClimate fixes for filter-products branch Rob Harrington 2016-04-22 16:14:05 +10:00
  • 48d4c8733d When we load up incomplete orders, make sure that they have a user associated if the user is logged in Rob Harrington 2016-04-21 14:42:34 +10:00
  • 302bdfd628 Implementing FilterProducts rules in the frontend Rob Harrington 2016-04-21 14:40:52 +10:00
  • cc6ef7b8f5 Load uncached products json into shop when in testing or development environment Rob Harrington 2016-04-21 14:26:26 +10:00
  • 50738f28e9 Refactoring tag rule application Rob Harrington 2016-04-21 14:17:44 +10:00
  • 8b8da33ffc Further refinements to FilterProducts tag rule Rob Harrington 2016-04-21 14:12:06 +10:00
  • 17fa0d2baf Adding tag rule logic for filtering products Rob Harrington 2016-04-15 13:42:18 +10:00
  • 3f8420b0e9 Adding tags to variant overrides Rob Harrington 2016-04-15 11:44:19 +10:00
  • ddc7e86e6c Update xero report spec Maikel Linke 2016-05-27 15:00:54 +10:00
  • 8a77062888 Include transaction fees in reports Maikel Linke 2016-05-27 14:40:22 +10:00
  • e3b43243cc Add line_items getter to Payment Maikel Linke 2016-05-27 11:30:07 +10:00
  • 61a4228e6b Auto-merged master into uk/trial-length on deployment. Maikel 2016-05-25 18:56:17 +10:00