Commit Graph

  • ca0c3a028d Add name to customers Bing Xie 2016-07-13 11:36:22 +10:00
  • b08a642377 Add billing_address and shipping_address to Customer Bing Xie 2016-07-13 11:25:23 +10:00
  • 37ace77734 Add bill_address_id and ship_address_id to customers Bing Xie 2016-07-13 10:55:17 +10:00
  • 8645144231 Merge remote-tracking branch 'origin/master' into transifex Maikel Linke 2016-08-10 21:01:12 +10:00
  • 47df8d6d8e Refactoring AngularJS Shop Variant filtering logic for improved speed v1.8.4 Rob Harrington 2016-08-05 16:13:46 +10:00
  • f9b58b7b90 Ensure bill is > 0 for spec Rob Harrington 2016-08-03 16:08:31 +10:00
  • b957555c82 Adding infinite-scroll to the shopfront Rob Harrington 2016-08-03 12:45:45 +10:00
  • d40733d447 Add redirects to global site for /connect, /learn Maikel Linke 2016-08-07 10:24:07 +10:00
  • 1f5da8699d Build plz Rohan Mitchell 2016-08-05 15:58:00 +10:00
  • fcd422c6ce Fix path helper fail in footer Rohan Mitchell 2016-08-05 15:18:29 +10:00
  • 5eecdb8c9c Update footer: Link to sell instead of individual register links Rohan Mitchell 2016-08-05 15:03:07 +10:00
  • 3b0084025a Add copy for home page learn and connect panes Rohan Mitchell 2016-08-05 15:02:44 +10:00
  • 8f4cbf1d9f Update page alert label and background colour Rohan Mitchell 2016-08-05 15:02:10 +10:00
  • 0dba54a4b8 Update page alert text Rohan Mitchell 2016-08-05 14:43:44 +10:00
  • 61c9355ffb Fill in sell page copy Rohan Mitchell 2016-08-05 14:40:42 +10:00
  • 0830a5bd85 Add basic sell page Rohan Mitchell 2016-07-07 14:58:07 +10:00
  • 1054fd2d05 View closed shops by URL Rohan Mitchell 2016-08-03 15:41:31 +10:00
  • f03839b70c Update shopping header Rohan Mitchell 2016-08-03 15:11:36 +10:00
  • 0076b1b9a0 Add connect and learn panes to home page Rohan Mitchell 2016-08-03 15:09:01 +10:00
  • d3ab9faede Show registration CTA in footer rather than connect and learn CTA Rohan Mitchell 2016-08-03 15:03:14 +10:00
  • ee2c1ef195 Extract home page tagline to partial Rohan Mitchell 2016-08-03 14:59:28 +10:00
  • 57a2f1b339 Simplify, simplify Rohan Mitchell 2016-08-03 14:42:09 +10:00
  • d93d1653db Add directive for smooth scrolling to anchor Rohan Mitchell 2016-07-29 10:11:37 +10:00
  • 140589fc2d Extract classical backgrounds to mixins Rohan Mitchell 2016-07-29 10:11:04 +10:00
  • 1216da38d1 Update menu: [Groups, About] -> [Connect, Learn] Rohan Mitchell 2016-08-03 14:38:29 +10:00
  • 5b43d7a87a Add connect and learn links to page alert Rohan Mitchell 2016-08-03 12:52:05 +10:00
  • 87e063593a Add feature toggle helper, allow hash or string queries Rohan Mitchell 2016-08-03 12:50:26 +10:00
  • 23827d6c57 Add feature toggle for Connect+Learn homepage Rohan Mitchell 2016-08-03 12:14:52 +10:00
  • e966b474b4 Remove order cycles feature toggle Rohan Mitchell 2016-08-03 12:11:52 +10:00
  • 1388c077ea Remove unused feature toggles Rohan Mitchell 2016-08-03 12:08:51 +10:00
  • 4d1a5c6ffc Updating translations for config/locales/en_GB.yml [skip ci] Transifex-Openfoodnetwork 2016-08-01 21:47:34 +10:00
  • 1586cd3992 Uncache enterprise producer properties - we have no cache invalidation for this Rohan Mitchell 2016-07-29 15:39:08 +10:00
  • 4db29ce322 Update css_splitter, fixes problem with keyframes spanning limit Rohan Mitchell 2016-07-29 11:53:45 +10:00
  • 243dfa7a93 Add retry for intermittently failing spec in variant overrides Rohan Mitchell 2016-07-08 14:52:25 +10:00
  • d9d3a4a645 Set up producer filters on group producers page Rohan Mitchell 2016-07-07 10:40:31 +10:00
  • b13360d2d0 Extract filter helpers from individual spec to spec helper Rohan Mitchell 2016-07-07 10:39:35 +10:00
  • 13cf5d29de Add guard for selector overflow (only seen in phantom, not selenium/firefox or dev server/chrome) Rohan Mitchell 2016-07-07 10:04:11 +10:00
  • 1257ee09f2 Reorder methods for clarity Rohan Mitchell 2016-06-24 12:56:16 +10:00
  • e3173c955d Refit filters when box opens Rohan Mitchell 2016-06-24 12:47:52 +10:00
  • 69382c4c13 Move properties filter dropdown in front of search results Rohan Mitchell 2016-06-24 12:35:35 +10:00
  • 0b84afd67a Display property filters for producers Rohan Mitchell 2016-06-24 12:13:29 +10:00
  • 6f947380cb Remove unused overrides and views Rohan Mitchell 2016-07-07 13:58:54 +10:00
  • 160c535fd7 Update knapsack report Rohan Mitchell 2016-07-07 13:47:26 +10:00
  • 377074416e Remove CMS tables. Adds migration helper: drop_table_cascade Rohan Mitchell 2016-07-07 12:45:48 +10:00
  • 932edeb1c1 Remove CMS style shim - Spree/CMS compatibility Rohan Mitchell 2016-07-07 12:36:33 +10:00
  • d3ad823d97 Remove CMS configuration, gem. Fix permalink check dependent on CMS glob path. Rohan Mitchell 2016-07-07 12:34:12 +10:00
  • b637b5b75a Remove CMS helper: home_page_cms_content Rohan Mitchell 2016-07-07 12:28:27 +10:00
  • eb8cedc497 Remove CMS views and overrides Rohan Mitchell 2016-07-07 12:26:34 +10:00
  • ba854d12c8 Remove CMS specs Rohan Mitchell 2016-07-07 12:16:31 +10:00
  • 9e03a130c2 Updating GB translation, from transifex Lynne Davis 2016-07-27 18:40:28 +01:00
  • dee0fa6724 Trigger checkout click more reliably in specs Maikel Linke 2016-07-22 14:10:16 +10:00
  • 84c434c279 Remove unused/broken multi-cart feature and views Maikel Linke 2016-07-22 11:25:49 +10:00
  • f8898bc722 Updating translations for config/locales/nb.yml [skip ci] Transifex-Openfoodnetwork 2016-07-22 01:04:58 +10:00
  • 2b7da4738c Updating translations for config/locales/nb.yml [skip ci] Transifex-Openfoodnetwork 2016-07-22 00:59:57 +10:00
  • 11a702667d Merge branch 'transifex' into HEAD Maikel Linke 2016-07-20 17:12:59 +10:00
  • 11ec903131 Merge tag 'v1.8.3' into transifex Maikel Linke 2016-07-20 17:11:42 +10:00
  • e57c06c610 Use require_relative introduced in Ruby 1.9.2 Maikel Linke 2016-07-20 16:07:35 +10:00
  • 984641e46c Merge remote-tracking branch 'origin/master' into uk/trial-length v1.8.3 Maikel Linke 2016-07-20 11:40:52 +10:00
  • 477d48e9da Updating translations for config/locales/nb.yml [skip ci] Transifex-Openfoodnetwork 2016-07-15 19:46:47 +10:00
  • ddb54d1924 Delete fee on payment method if payment invalid Maikel Linke 2016-07-15 17:43:26 +10:00
  • c6bd548413 Don't trigger deployment for transifex branch Maikel Linke 2016-07-15 11:19:19 +10:00
  • af6d0ec107 Remove unused code from order confirmation page Maikel Linke 2016-07-13 13:54:55 +10:00
  • e693f71775 Inject only needed enterprises into order confirmation page Maikel Linke 2016-07-13 13:54:32 +10:00
  • 0ff1c95c3d Keep unreferenced entries when dereferencing in js Maikel Linke 2016-07-13 12:08:11 +10:00
  • b5bc3a4ca3 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load Maikel Linke 2016-07-13 10:01:16 +10:00
  • b587a72eb6 Auto-merged master into transifex on deployment. Maikel 2016-07-12 17:44:55 +10:00
  • 8e73a2e0d6 Dereference enterprises and taxons later Maikel Linke 2016-07-06 16:20:07 +10:00
  • e373284934 Fix intermittent spec failure Rohan Mitchell 2016-07-06 16:14:32 +10:00
  • b5a9a1b6bf Add translation for business_model_configuration Rohan Mitchell 2016-07-06 16:14:25 +10:00
  • 13c8f0a230 Improve spec reliability Rohan Mitchell 2016-07-06 15:29:04 +10:00
  • f733c7f207 Include shop enterprise on shop front Maikel Linke 2016-07-06 12:45:12 +10:00
  • d3c423f7ce Only perform URL search once, not every time map tiles change Rohan Mitchell 2016-07-06 11:56:41 +10:00
  • 52f68dac33 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load Maikel Linke 2016-07-06 11:35:26 +10:00
  • f984871b23 Inject only needed enterprises into cart and checkout Maikel Linke 2016-07-06 11:14:13 +10:00
  • f09cd9e477 Allow groups to be searched by URL Rohan Mitchell 2016-07-06 11:04:53 +10:00
  • d6f21b24da Add specs for producers and shops search by URL Rohan Mitchell 2016-07-06 11:04:36 +10:00
  • 34b2f72ae8 When query changed (typing or autocomplete), update URL. When page loads, perform query search. Rohan Mitchell 2016-07-01 15:30:55 +10:00
  • e6bdd2303d Extract showing search result Rohan Mitchell 2016-07-01 13:32:14 +10:00
  • a9a68151ec Syntax Rohan Mitchell 2016-06-30 12:15:40 +10:00
  • f586dbc3e1 Extract OSM tile setup to own directive Rohan Mitchell 2016-06-30 12:14:47 +10:00
  • 5fb5ef1974 Auto-merge from CI [skip ci] Continuous Integration 2016-07-02 00:58:27 +10:00
  • 54028f4e7e Split directive into functions Rohan Mitchell 2016-06-30 12:03:48 +10:00
  • e8b83bef41 Simplify responding to search Rohan Mitchell 2016-06-30 11:54:59 +10:00
  • 78b22c4a82 Fix incorrectly aligned columns Bing Xie 2016-06-22 14:54:06 +10:00
  • e252414263 Auto-merge from CI [skip ci] Continuous Integration 2016-06-30 01:30:53 +10:00
  • 320db21d5c Updating spec with $ (not £) for automated testing Lynne Davis 2016-06-29 16:30:11 +01:00
  • c253d73d11 Refactoring with feedback on pr #1073 Maikel Linke 2016-06-29 15:46:51 +10:00
  • 08fdc8a5bd Load producers of all or selected order cycles into shop Maikel Linke 2016-06-29 12:30:43 +10:00
  • 9cc0bb831a Show properties alongside taxons on producer fat view v1.8.2 Rohan Mitchell 2016-06-17 17:44:46 +10:00
  • a5a00e9cef Show taxons and properties on producer modal (seen on map, shop producer info) Rohan Mitchell 2016-06-17 11:53:58 +10:00
  • 4134cbfc9c Include producer properties on producer listing Rohan Mitchell 2016-06-17 11:19:06 +10:00
  • 58379a5e28 Extract property merging to lib class Rohan Mitchell 2016-06-17 11:14:39 +10:00
  • aae1689a27 Show product properties on producers page Rohan Mitchell 2016-06-16 11:00:20 +10:00
  • 4338f632f6 Add scope: Spree::Property.applied_by Rohan Mitchell 2016-06-16 10:43:53 +10:00
  • fa0cc6f2c8 Add spec for filtering producers by taxon Rohan Mitchell 2016-06-15 10:10:40 +10:00
  • 12df5de43c Auto-merged master into sign_up_email_i18n on deployment. Maikel 2016-06-24 00:45:34 +10:00
  • 4da7668dfc Merge pull request #1048 from lin-d-hop/sign_up_email_i18n Lynne 2016-06-23 15:30:42 +01:00
  • 9c29e56fc3 More typo Lynne Davis 2016-06-21 17:44:45 +01:00
  • e253590c1c code cleanup Lynne Davis 2016-06-21 17:07:42 +01:00
  • 43b5216002 Merge pull request #1046 from lin-d-hop/sign_up_email_i18n Lynne 2016-06-20 18:45:31 +01:00