Commit Graph

  • a864a018d5 Fix icon images Brenda Wallace 2020-03-02 12:27:57 +13:00
  • 9594c2a63f Always show photos on harvests Brenda Wallace 2020-03-02 12:22:48 +13:00
  • bb7a9b17c6 Merge remote-tracking branch 'upstream/dev' Brenda Wallace 2020-03-02 12:22:15 +13:00
  • 3c14496936 BUGFIX - caching on harvest form Brenda Wallace 2020-03-02 12:22:00 +13:00
  • f4a39b1fd4 Merge pull request #2450 from Growstuff/dev Brenda Wallace 2020-03-02 12:16:03 +13:00
  • 7a48b099aa Merge pull request #2449 from Growstuff/imgbot Brenda Wallace 2020-03-02 11:52:12 +13:00
  • d33db24f3c [ImgBot] Optimize images ImgBotApp 2020-03-01 22:50:49 +00:00
  • 8e7ae445d7 Merge pull request #2442 from Growstuff/dependabot/bundler/active_utils-3.3.17 Brenda Wallace 2020-03-02 11:50:30 +13:00
  • bf4d1afe99 Merge pull request #2443 from Br3nda/feature/crop-action-modals Brenda Wallace 2020-03-02 11:50:11 +13:00
  • 85d473d65c Adding descriptions Brenda Wallace 2020-03-02 11:49:50 +13:00
  • 4a23bcefd1 Tests tradeable and not tradeable seed saving Brenda Wallace 2020-03-02 10:21:54 +13:00
  • 9955d26c1b Added options from seed saving form to spec Brenda Wallace 2020-03-01 08:48:21 +13:00
  • f13bc44e7e update link labels in spec Brenda 2020-03-01 08:33:04 +13:00
  • 5c7b8254b0 plant_part is on harvest not planting Brenda 2020-03-01 08:32:53 +13:00
  • 7039240bdc always show photos section on harvests Brenda 2020-03-01 07:57:19 +13:00
  • cc83cb23bc fix plant part selection bug on editing harvests Brenda 2020-03-01 07:57:04 +13:00
  • 88ac147dda Restore old labels on buttons Brenda 2020-03-01 07:56:27 +13:00
  • ef2820eb8c fix deprecation warning from faker Brenda 2020-03-01 07:56:02 +13:00
  • 7e42d84a21 group crop actions in to button bar Brenda 2020-03-01 07:55:47 +13:00
  • 0fdbac5bc3 Update plant_parts.rb Brenda Wallace 2020-02-29 23:01:00 +13:00
  • 46220b8275 Update plant_parts.rb Brenda Wallace 2020-02-29 22:01:02 +13:00
  • 4e093716f2 Add number on the end Brenda Wallace 2020-02-29 21:30:08 +13:00
  • 52e28f4ae2 Link new harvest to planting Brenda Wallace 2020-02-29 20:07:30 +13:00
  • f4acbaa89a Use pokemon for plant parts Brenda Wallace 2020-02-29 19:51:53 +13:00
  • c099580b70 Update link in spec Brenda 2020-02-29 19:49:57 +13:00
  • 3c392d43ee Crop#show with seeds modal Brenda 2020-02-29 19:49:49 +13:00
  • bb400dabda Add new garden button on modal planting form Brenda 2020-02-29 13:37:27 +13:00
  • 43180bd6cb unique plantpart names in factory bot Brenda 2020-02-29 13:26:51 +13:00
  • f3cd341659 add an id to the harvest modal so the test can find it Brenda 2020-02-29 13:26:36 +13:00
  • fd80fc98f1 use a default icon if no plant_part icon Brenda 2020-02-29 13:26:20 +13:00
  • d0154a8b60 Fall back on planting icon when plant part icon does not exist Brenda Wallace 2020-02-29 12:34:28 +13:00
  • cbec6b2743 Remove harvest button from crop info card until we can distinguish between it and the planting crop button Brenda 2020-02-29 12:20:53 +13:00
  • b5f7156677 Makes sure factorybot plant names point to images that exist Brenda Wallace 2020-02-29 12:09:26 +13:00
  • 1503b39ad3 Seed saving modal Brenda 2020-02-29 11:19:19 +13:00
  • 97208b99c5 Plantings modal form on crops#show Brenda Wallace 2020-02-29 10:28:32 +13:00
  • 777877ab06 Added plantings modal button to crop info card Brenda Wallace 2020-02-29 10:25:45 +13:00
  • 6c94337047 Added Plantings modal form Brenda Wallace 2020-02-29 10:23:00 +13:00
  • 68d157b048 Removed extra harvest button on plantings#show Brenda Wallace 2020-02-29 10:22:46 +13:00
  • 8dd47e0639 Added harvest button to crop info card Brenda Wallace 2020-02-29 10:09:06 +13:00
  • 952a97f5a5 Bump puma from 4.3.1 to 4.3.2 dependabot-preview[bot] 2020-02-28 08:07:56 +00:00
  • f58732bcab Bump will_paginate from 3.2.1 to 3.3.0 dependabot-preview[bot] 2020-02-27 18:18:34 +00:00
  • 720a0fa645 Bump better_errors from 2.5.1 to 2.6.0 dependabot-preview[bot] 2020-02-26 08:08:52 +00:00
  • af1948f95c [Security] Bump nokogiri from 1.10.7 to 1.10.8 dependabot-preview[bot] 2020-02-24 19:47:44 +00:00
  • f7013658a5 Bump database_cleaner from 1.8.2 to 1.8.3 dependabot-preview[bot] 2020-02-23 04:05:47 +00:00
  • a6ce1e05cf Lower case in form title Brenda Wallace 2020-02-29 10:02:47 +13:00
  • 8955aab2bb caching plant parts Brenda 2020-02-29 09:59:44 +13:00
  • 5d43575eae Merge branch 'feature/crop-action-modals' of github.com:Br3nda/growstuff into feature/crop-action-modals Brenda Wallace 2020-02-29 09:38:21 +13:00
  • 5444d15242 Merge branch 'dev' into feature/crop-action-modals Brenda Wallace 2020-02-29 09:36:36 +13:00
  • 63c28b3b18 Bump active_utils from 3.3.16 to 3.3.17 dependabot-preview[bot] 2020-02-28 20:36:24 +00:00
  • b2ff247a31 Apply suggestions from code review Brenda Wallace 2020-02-29 09:36:05 +13:00
  • 011ce39edb Bump puma from 4.3.1 to 4.3.2 dependabot-preview[bot] 2020-02-28 08:07:56 +00:00
  • d2509afca2 Harvest button on plantings Brenda 2020-02-29 09:33:40 +13:00
  • 236caa0d32 Bump will_paginate from 3.2.1 to 3.3.0 dependabot-preview[bot] 2020-02-27 18:18:34 +00:00
  • 1c57e5266f Bump better_errors from 2.5.1 to 2.6.0 dependabot-preview[bot] 2020-02-26 08:08:52 +00:00
  • a5c770c2b5 Update app/views/crops/_thumbnail.html.haml Brenda Wallace 2020-02-27 09:42:09 +13:00
  • 33091fbadc Merge branch 'dev' into feature/crop-action-modals Brenda Wallace 2020-02-26 11:38:38 +13:00
  • 94d92f8748 Merge pull request #2441 from Growstuff/dependabot/bundler/nokogiri-1.10.8 Brenda Wallace 2020-02-25 11:40:26 +13:00
  • e54330a4d7 [Security] Bump nokogiri from 1.10.7 to 1.10.8 dependabot-preview[bot] 2020-02-24 19:47:44 +00:00
  • 9abb84ccba Harvesting modal form Brenda 2020-02-24 11:51:04 +13:00
  • 9eba58839d Merge pull request #2431 from Growstuff/dependabot/bundler/database_cleaner-1.8.3 Brenda Wallace 2020-02-23 20:01:34 +13:00
  • 92aa827df9 Merge pull request #2440 from Growstuff/dev Brenda Wallace 2020-02-23 20:01:10 +13:00
  • a4a3745d90 Merge branch 'master' into dev Brenda Wallace 2020-02-23 17:12:18 +13:00
  • 5bd97902da Bump database_cleaner from 1.8.2 to 1.8.3 dependabot-preview[bot] 2020-02-23 04:05:47 +00:00
  • edb3529d2d Merge pull request #2430 from Growstuff/dependabot/bundler/rubocop-0.80.0 Brenda Wallace 2020-02-23 17:04:23 +13:00
  • 676596191d Merge pull request #2439 from Br3nda/tidy-members Brenda Wallace 2020-02-23 17:03:58 +13:00
  • 435c164e15 Fixed typo error in view Brenda 2020-02-23 15:47:23 +13:00
  • 28ff058366 [CodeFactor] Apply fixes codefactor-io 2020-02-22 23:04:59 +00:00
  • 7e13431c27 Merge remote-tracking branch 'upstream/dev' into tidy-members Brenda Wallace 2020-02-23 12:04:20 +13:00
  • 71ccd52c59 Fix harvest thumbnails Brenda Wallace 2020-02-23 12:03:14 +13:00
  • 36bad1cda0 Fix mobile display of member profiles Brenda 2020-02-23 11:42:07 +13:00
  • bb13bbf27e Bump rubocop from 0.79.0 to 0.80.0 dependabot-preview[bot] 2020-02-22 00:15:34 +00:00
  • cf440b444c Bump searchkick from 4.2.1 to 4.3.0 dependabot-preview[bot] 2020-02-20 07:57:03 +00:00
  • c85abe0bd1 Member planting progress (#2437) Brenda Wallace 2020-02-22 12:29:02 +13:00
  • 0177b872db Member planting progress (#2437) Brenda Wallace 2020-02-22 12:29:02 +13:00
  • 9df084a859 Merge branch 'dev' into member-planting-progress Brenda Wallace 2020-02-22 07:51:30 +13:00
  • 878ae9073c Tidy up member planting progress section Brenda Wallace 2020-02-22 07:49:56 +13:00
  • 6c9f6b7520 Merge pull request #2436 from Growstuff/dev Brenda Wallace 2020-02-21 16:38:04 +13:00
  • c71e9b01de Remove reference to current member Brenda Wallace 2020-02-21 14:40:53 +13:00
  • e3594eee02 Show member plantings summary on member page Brenda 2020-02-20 22:49:33 +13:00
  • b72e866362 Remove reference to current member Brenda Wallace 2020-02-21 14:40:53 +13:00
  • d3cdaea218 Show member plantings summary on member page Brenda 2020-02-20 22:49:33 +13:00
  • 3ab67786e0 Wrapping the whole layout, to center the page Brenda 2020-02-20 22:39:12 +13:00
  • 325729751a Move search bar to middle, hide sitename on small screens Brenda Wallace 2020-02-20 16:04:09 +13:00
  • 07a9891ec4 Fix spec Brenda Wallace 2020-02-20 14:35:32 +13:00
  • e8c7a9e1f5 Fixed menu link label in another spec Brenda Wallace 2020-02-20 12:57:48 +13:00
  • 155f2ed548 Fix menu link label in spec Brenda Wallace 2020-02-20 12:34:08 +13:00
  • 76a3dcfc93 Added breadcrumbs to members Brenda Wallace 2020-02-20 11:09:19 +13:00
  • 63af7eca9f Fix wrapping of admin menu, and put profile link (with image) last Brenda Wallace 2020-02-20 10:58:52 +13:00
  • e986eafc0b Move search bar to middle, hide sitename on small screens Brenda Wallace 2020-02-20 16:04:09 +13:00
  • d4517bf298 Fix spec Brenda Wallace 2020-02-20 14:35:32 +13:00
  • fe1eda3f30 Fixed menu link label in another spec Brenda Wallace 2020-02-20 12:57:48 +13:00
  • 0ca529ea8f Fix menu link label in spec Brenda Wallace 2020-02-20 12:34:08 +13:00
  • aa2893f666 Added breadcrumbs to members Brenda Wallace 2020-02-20 11:09:19 +13:00
  • 2006210d4e Fix wrapping of admin menu, and put profile link (with image) last Brenda Wallace 2020-02-20 10:58:52 +13:00
  • b208850b7d Full width on mobile Brenda Wallace 2020-02-19 20:25:06 +13:00
  • 724ba246a3 More crops Brenda Wallace 2020-02-19 17:00:06 +13:00
  • 00a984a3a5 Removed cute icon that was making sections not line up Brenda Wallace 2020-02-19 16:59:13 +13:00
  • bc59827009 Col for recent crops Brenda Wallace 2020-02-19 16:45:36 +13:00
  • 2208a35b2f More space on home Brenda Wallace 2020-02-19 16:43:33 +13:00
  • 3764544965 Ten crops on home page Brenda Wallace 2020-02-19 16:27:03 +13:00