Commit Graph

  • 5fe31e6333 Added asterisks to required fields in new enterprise creation form. Liv Galendez 2015-06-02 18:03:16 +10:00
  • fee854a3f8 Merge branch 'master' into redesign Rohan Mitchell 2015-05-29 17:37:18 +10:00
  • e3085d9224 Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails Rohan Mitchell 2015-05-29 17:36:56 +10:00
  • 3dbc2e0382 Merge branch 'master' into folklabs-producer-emails Rohan Mitchell 2015-05-29 17:36:11 +10:00
  • a22da1ae51 Merge branch 'ng-cloak' into combined/bulk-product-edit-and-ng-cloak Rohan Mitchell 2015-05-29 16:54:01 +10:00
  • 159b33e2db Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit Maikel Linke 2015-05-29 16:52:18 +10:00
  • 0d3cdb9c69 Expand All button to show all variants in BPE Maikel Linke 2015-05-29 16:51:55 +10:00
  • 5c3a59acab ng-cloak order cycles selector, tabs and shopfront Rohan Mitchell 2015-05-29 16:39:41 +10:00
  • 50ae331d94 ng-cloak mobile menu Rohan Mitchell 2015-05-29 16:03:16 +10:00
  • fe27b1d446 text changes to the registration wizard Maikel Linke 2015-05-29 13:46:16 +10:00
  • bf935623dc changing default mailer url in development from test.com to 0.0.0.0:3000 Maikel Linke 2015-05-29 13:44:53 +10:00
  • 678b591c18 Explain how to disable delayed jobs to send emails again Maikel Linke 2015-05-29 12:43:11 +10:00
  • 6f513fee77 Merge branch 'master' into redesign Rohan Mitchell 2015-05-29 15:20:21 +10:00
  • 7f73a4cc9b Fix column/row mixup Rohan Mitchell 2015-05-29 15:19:35 +10:00
  • 503b687ed1 Display distributor banner only if current_distributor is present Maikel Linke 2015-05-29 15:19:05 +10:00
  • 952353da8c Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit Rohan Mitchell 2015-05-29 15:08:30 +10:00
  • e5b3736e86 Merge branch 'single-order-patches' into combined/single-order-patches-and-bulk-product-edit Rohan Mitchell 2015-05-29 14:36:51 +10:00
  • c14de4e97f Auto-merge from CI [skip ci] Continuous Integration 2015-05-29 14:29:23 +10:00
  • d478cc1f69 Serialize taxons and relatives in expected format Rohan Mitchell 2015-05-29 14:03:44 +10:00
  • dccc9fb479 Auto-merge from CI [skip ci] Continuous Integration 2015-05-29 12:44:44 +10:00
  • 3f4f8afacd EnterpriseRelationship.relatives does not show duplicates Rohan Mitchell 2015-05-29 12:19:38 +10:00
  • 69c54e1d70 Only load activated relatives for EnterpriseInjectionData Rohan Mitchell 2015-05-29 12:08:21 +10:00
  • cdbf02ca20 EnterpriseRelationship.relatives can find activated enterprises only Rohan Mitchell 2015-05-29 12:07:43 +10:00
  • 4ce9ea05f0 Merge branch 'master' into require_standard_variant Rohan Mitchell 2015-05-29 10:12:14 +10:00
  • c75e14b383 Small edits Rohan Mitchell 2015-05-29 09:55:40 +10:00
  • 32b140ac88 Revert "Update group signup header copy" Rohan Mitchell 2015-05-29 09:54:09 +10:00
  • 835b56b222 Attempt to fix intermittent failures in spec/features/consumer/authentication_spec.rb Rohan Mitchell 2015-05-29 09:44:57 +10:00
  • 7486daa2a3 Merge branch 'master' into require_standard_variant Rohan Mitchell 2015-05-28 15:08:13 +10:00
  • 8a79741c0e Update pricing tables and detail formatting Rohan Mitchell 2015-05-28 14:51:36 +10:00
  • 1d08ae89da Auto-merge from CI [skip ci] Continuous Integration 2015-05-28 14:31:25 +10:00
  • 1cf62e01e9 Edit case study text Rohan Mitchell 2015-05-28 14:27:36 +10:00
  • 0a8bfdb872 Update group signup header copy Rohan Mitchell 2015-05-28 14:08:55 +10:00
  • 92d67327dd Add groups case studies Rohan Mitchell 2015-05-28 14:07:17 +10:00
  • acc976f44a Add hub case studies Rohan Mitchell 2015-05-28 14:00:04 +10:00
  • bf9addfa42 Merge branch 'group-custom-url' into group-pages Maikel Linke 2015-05-28 13:27:48 +10:00
  • 31caf278d7 Add producer case studies Rohan Mitchell 2015-05-28 12:39:40 +10:00
  • e81a955827 Add detail to hubs and producers signup pages Rohan Mitchell 2015-05-28 12:21:25 +10:00
  • eb0e8dcd9c Copy changes to home page and link fix in footer Rohan Mitchell 2015-05-28 12:21:08 +10:00
  • ff2eed7760 Using permalink in URLs pointing to groups Maikel Linke 2015-05-28 11:27:06 +10:00
  • e4f93863fd Finding unique permalink before validation. Maikel Linke 2015-05-28 10:17:09 +10:00
  • aef128f2c9 permalink editable Maikel Linke 2015-05-27 12:20:54 +10:00
  • 19448a182e Add permalink field to enterprise groups Maikel Linke 2015-05-27 11:54:13 +10:00
  • a01a53caea Auto-merge from CI [skip ci] Continuous Integration 2015-05-28 11:05:07 +10:00
  • 7f43dbf9bb Fix further intermittent failures in permissions spec Rohan Mitchell 2015-05-28 10:58:12 +10:00
  • 97e49c2bdb Replace 'array.sort.should == expected.sort' pattern with match_array Rohan Mitchell 2015-05-28 10:46:08 +10:00
  • ccf1e2951c Fix intermittent failure in permissions spec Rohan Mitchell 2015-05-28 10:45:47 +10:00
  • 3ab7df88e6 Allow serialization of nil enterprise Rohan Mitchell 2015-05-27 16:26:40 +10:00
  • 75f1f673ad Update spec for EnterpriseSerializer Rohan Mitchell 2015-05-27 16:26:31 +10:00
  • e74390a013 Remove controller specs for @active_distributors, now set via helper Rohan Mitchell 2015-05-27 16:26:08 +10:00
  • 41bc67e2d8 Add benchmark for product serialisation Rohan Mitchell 2015-05-22 14:46:33 +10:00
  • e1b4c3b1e4 Add benchmarking test for inject_enterprises Rohan Mitchell 2015-05-22 13:47:24 +10:00
  • 31b726613d Avoid loading enterprise injection data when it's not be needed due to caching Rohan Mitchell 2015-05-22 12:17:09 +10:00
  • dd761719ee Fix undefined Api::IdSerializer error Rohan Mitchell 2015-05-22 11:27:47 +10:00
  • 1a887df412 Pull taxon computation out of the serialization loop Rohan Mitchell 2015-05-22 11:03:53 +10:00
  • 2c92b5a751 Find all supplied and distributed taxons Rohan Mitchell 2015-05-22 10:57:14 +10:00
  • 3afd636577 Pull relatives computation out of the serialization loop Rohan Mitchell 2015-05-21 16:25:05 +10:00
  • cf79b90044 Load relatives of all enterprises in one go Rohan Mitchell 2015-05-21 16:24:13 +10:00
  • 4a59c85b3e Inject current hub from AMS rather than RABL Rohan Mitchell 2015-05-21 15:48:40 +10:00
  • 704955a185 Load active distributors where they're needed rather than in most controllers Rohan Mitchell 2015-05-21 15:47:52 +10:00
  • ee8db23fd9 Pull shipping method service computations out of the serialization loop Rohan Mitchell 2015-05-21 12:40:04 +10:00
  • f0e909c92b Look up the shipping services (pickup, delivery) that different hubs provide Rohan Mitchell 2015-05-21 12:38:33 +10:00
  • f940984ca3 Pull earliest closing time computations out of the serialization loop Rohan Mitchell 2015-05-21 12:07:11 +10:00
  • 769edbe9d5 Find the earliest closing times for each distributor in an active order cycle Rohan Mitchell 2015-05-21 12:04:59 +10:00
  • c5f00d87bd When loading products for shopfront, load all master variants in one go Rohan Mitchell 2015-05-20 15:22:01 +10:00
  • 99cb09c6f7 When loading products for shopfront, load all variants in one go Rohan Mitchell 2015-05-20 14:05:41 +10:00
  • c8f14f1ee9 Fetch fonts through https, fixes mixed-security error that prevents fonts loading Rohan Mitchell 2015-05-26 10:29:20 +10:00
  • baaa192967 #275: Code cleanup. Paul Mackay 2015-05-24 10:44:39 +01:00
  • 2f05fc3824 #275: Insert receival time and instructions into email. Paul Mackay 2015-05-24 10:38:49 +01:00
  • 5377af9cf9 Auto-merge from CI [skip ci] Continuous Integration 2015-05-24 09:52:53 +10:00
  • a5482c269f #541 Fixed issue of showing negative 'more' numbers, and only working for current Hub Rick Giner 2015-05-24 09:52:34 +10:00
  • 5a43ed2046 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit Maikel Linke 2015-05-22 18:17:20 +10:00
  • 28dae3c6c6 Enterprises cannot add themselves to Groups Maikel Linke 2015-05-22 15:23:19 +10:00
  • 5d47dc2fdb Sort array so that order doesn't cause spec fail Rob Harrington 2015-05-22 15:03:21 +10:00
  • 5b65f67737 Amending spec expect after_create when we want after_save Rob Harrington 2015-05-22 15:02:49 +10:00
  • e931f4b31f Merge branch 'master' into require_standard_variant Rob Harrington 2015-05-22 12:22:54 +10:00
  • 63f3ede766 Prepare master variants for duplication as standard variant by ensuring they have a unit value and that the product has a variant unit Rob Harrington 2015-05-22 12:22:05 +10:00
  • d43df86201 Moving conditional logic into ensure_standard_variant Rob Harrington 2015-05-22 12:20:31 +10:00
  • 9c137ccf0f provide tax_categories in spec Maikel Linke 2015-05-22 11:03:21 +10:00
  • 7e4751cb3a updating bulk product js spec Maikel Linke 2015-05-21 22:30:23 +10:00
  • e6b6303f5e Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit Maikel Linke 2015-05-21 18:03:11 +10:00
  • 9c884b31a3 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches Maikel Linke 2015-05-21 18:01:16 +10:00
  • f017197221 orders list: filter by distributor and order cycle Maikel Linke 2015-05-21 18:00:14 +10:00
  • cd44d43b3e Adding price to line_item serializer (oops, forgot to include when merging in master) Rob Harrington 2015-05-21 17:48:35 +10:00
  • 903ed7e507 Merge branch 'master' into variable_weights Rob Harrington 2015-05-21 17:31:33 +10:00
  • 79a59e2e81 Add order_with_distributor factory Rob Harrington 2015-05-21 13:34:32 +10:00
  • 73884d4f01 BPE: Display notice about variant overrides Maikel Linke 2015-05-21 13:01:28 +10:00
  • 2ed519ef50 on_demand checkbox for variants Maikel Linke 2015-05-21 12:37:10 +10:00
  • 1936767084 BPE: new col for tax category Maikel Linke 2015-05-21 11:06:08 +10:00
  • 0b28771364 Removing unrequired specs for variant/product 'units_show' Rob Harrington 2015-05-20 21:06:20 +10:00
  • 1aca4657d9 Oops, switch managed_products to editable_products for Api::ProductsController Rob Harrington 2015-05-20 20:59:06 +10:00
  • 3431c687b8 Making sure every created by factories has a distributor Rob Harrington 2015-05-20 20:54:27 +10:00
  • 65a6329132 Products and inventory reports scopes products to visible in permissions Rob Harrington 2015-05-20 16:19:08 +10:00
  • 8132f07d88 Adding visible products method to permissions Rob Harrington 2015-05-20 15:53:10 +10:00
  • 1e26466d11 bulk product edit: "on demand" for new product Maikel Linke 2015-05-20 15:29:35 +10:00
  • 6953f61939 bulk product edit: new col "on demand" Maikel Linke 2015-05-20 15:07:22 +10:00
  • 01d4cf6ecf Renaming managed_products permissions method to editable_products Rob Harrington 2015-05-20 15:02:36 +10:00
  • 05131de1ad Use full_name on BOM instead of options_text Rob Harrington 2015-05-20 14:11:31 +10:00
  • 0a0bb67277 No SKU for cloned products. Community topic 175 Maikel Linke 2015-05-20 14:05:14 +10:00
  • 8d73b2f532 involving... order cycle scopes return distinct OCs Rob Harrington 2015-05-20 13:47:01 +10:00
  • c56efabfbe Removing obsolete rabl templates Rob Harrington 2015-05-20 11:52:49 +10:00