Commit Graph

  • 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
  • 495b52c2ef Merge remote-tracking branch 'upstream/dev' Brenda Wallace 2020-02-19 16:26:29 +13:00
  • a60a1ded32 Nine seeds on home page Brenda Wallace 2020-02-19 16:25:36 +13:00
  • b56cc37991 Merge pull request #2427 from Growstuff/dependabot/bundler/rubocop-rspec-1.38.1 dependabot-preview[bot] 2020-02-18 10:17:05 +00:00
  • 899419a89f Bump rubocop-rspec from 1.38.0 to 1.38.1 dependabot-preview[bot] 2020-02-18 09:50:25 +00:00
  • ae581d5361 Merge pull request #2428 from Growstuff/dependabot/bundler/faker-2.10.2 dependabot-preview[bot] 2020-02-18 09:48:00 +00:00
  • 44e684611b Bump faker from 2.10.1 to 2.10.2 dependabot-preview[bot] 2020-02-18 09:24:21 +00:00
  • b6ec583b0f Bump discard from 1.1.0 to 1.2.0 dependabot-preview[bot] 2020-02-18 07:56:30 +00:00
  • 94e06e4148 Bump sidekiq from 6.0.4 to 6.0.5 dependabot-preview[bot] 2020-02-14 21:07:25 +00:00
  • cf60a75480 Merge pull request #2426 from Growstuff/dev Brenda Wallace 2020-02-15 10:46:35 +13:00
  • 88615a55f4 CSS for seeds cards Brenda 2020-02-15 10:05:14 +13:00
  • 2eaf8ac215 Merge branch 'dev' of github.com:Growstuff/growstuff into dev Brenda Wallace 2020-02-15 10:05:03 +13:00
  • 7472bceeb3 install postgresql from addonns Brenda Wallace 2020-02-15 09:28:39 +13:00
  • eb749c02fd Turning off postgresql service on travis-ci Brenda Wallace 2020-02-15 08:46:33 +13:00
  • 9853d931c6 Shrink seed card and fix links Brenda Wallace 2020-02-14 10:07:26 +13:00
  • c12580ed8d Shrink seed card and fix links Brenda Wallace 2020-02-14 10:07:26 +13:00
  • 4c603f0cc9 Merge pull request #2422 from Growstuff/dependabot/bundler/rubocop-rspec-1.38.0 Brenda Wallace 2020-02-13 21:33:30 +13:00
  • 6e930976cb Bump rubocop-rspec from 1.37.1 to 1.38.0 dependabot-preview[bot] 2020-02-12 07:51:54 +00:00
  • 35094561ce Merge remote-tracking branch 'upstream/dev' Brenda Wallace 2020-02-12 16:42:30 +13:00
  • 9a6c6e73f1 Bump posts and members count to 6 Brenda Wallace 2020-02-12 14:02:14 +13:00
  • d6e4ab5fab Merge branch 'index-pages' into dev Brenda Wallace 2020-02-10 21:49:58 +13:00
  • 24ae63a339 add link to gardens for members#show Brenda 2020-02-10 21:49:38 +13:00
  • 20e878e9fe style "inactive" checkbox on gardens#index Brenda 2020-02-10 21:49:27 +13:00
  • cb0a545358 Merge pull request #2421 from Growstuff/dev Brenda Wallace 2020-02-10 14:57:35 +13:00
  • b5946b5c81 Bump haml_lint from 0.34.1 to 0.34.2 dependabot-preview[bot] 2020-02-09 09:40:04 +00:00
  • 821ddd90cb fix specs Brenda 2020-02-10 11:02:16 +13:00
  • dcb05c2e1e tidy up posts on crops page Brenda 2020-02-10 10:03:49 +13:00
  • 9dfd6dbc73 Tidy up index pages Brenda 2020-02-10 09:47:37 +13:00
  • 3a1f6c9d0b fix specs Brenda 2020-02-10 11:02:16 +13:00
  • f7f62bb7dc tidy up posts on crops page Brenda 2020-02-10 10:03:49 +13:00
  • 12db6b5fa0 Tidy up index pages Brenda 2020-02-10 09:47:37 +13:00
  • 4543a64e3b Merge pull request #2418 from Growstuff/dev Brenda Wallace 2020-02-09 23:20:09 +13:00
  • abecbab6c5 Tidy up mobile display on homepage, including member cards changes (#2417) Brenda Wallace 2020-02-09 22:38:12 +13:00
  • b4a5c5d0ad Merge pull request #2416 from Growstuff/dev Brenda Wallace 2020-02-07 22:01:18 +13:00
  • 4f5245f7e7 Show all of a harvest's photos on harvest#show Brenda Wallace 2020-02-07 08:02:20 +13:00
  • d515aba4b5 Merge pull request #2414 from Growstuff/dev Brenda Wallace 2020-02-05 11:40:01 +13:00
  • 1d0a1baa2d Merge pull request #2413 from Growstuff/dependabot/bundler/unicorn-5.5.3 Brenda Wallace 2020-02-05 10:37:10 +13:00
  • cde46ed14a Merge pull request #2411 from Growstuff/feature/photo-for-socmed Brenda Wallace 2020-02-05 10:36:57 +13:00
  • 697631dcce Bump unicorn from 5.5.2 to 5.5.3 dependabot-preview[bot] 2020-02-04 07:50:58 +00:00
  • 30f2d2c590 Merge branch 'dev' into feature/photo-for-socmed Brenda Wallace 2020-02-04 16:21:22 +13:00
  • 906f44ac66 Merge pull request #2412 from Growstuff/dev Brenda Wallace 2020-02-04 16:21:11 +13:00
  • 5a3c06f490 Merge remote-tracking branch 'upstream/master' into dev Brenda Wallace 2020-02-04 12:44:28 +13:00
  • 019d94f1cb Show the default photo for social media Brenda Wallace 2020-02-04 10:07:08 +13:00
  • 8dd70486c7 Bump unicorn from 5.5.2 to 5.5.3 dependabot-preview[bot] 2020-02-03 08:40:47 +00:00
  • 425f801033 Bump database_cleaner from 1.8.1 to 1.8.2 dependabot-preview[bot] 2020-02-03 08:39:43 +00:00
  • cce29dabbb Bump oj from 3.10.1 to 3.10.2 dependabot-preview[bot] 2020-02-01 22:31:11 +00:00
  • b0a5223d97 Account for finished planting when counting days of life Martina Simicic 2020-02-03 20:00:52 +01:00
  • 10008ca30d Removing method since it is defined in predict planting Martina Simicic 2020-02-03 19:59:49 +01:00
  • d15df948ff Added perennial to plantings Brenda Wallace 2020-02-03 15:06:45 +13:00
  • 5fbdd577d6 One per person on home page Brenda Wallace 2020-02-03 11:54:26 +13:00
  • 42cce210c0 Bump database_cleaner from 1.7.0 to 1.8.1 dependabot-preview[bot] 2020-01-31 07:58:17 +00:00
  • 42aeba9eeb Bump searchkick from 4.2.0 to 4.2.1 dependabot-preview[bot] 2020-01-29 18:33:46 +00:00
  • a0e1184cda Bump bootstrap-datepicker-rails from 1.8.0.1 to 1.9.0.1 dependabot-preview[bot] 2020-01-28 21:50:24 +00:00
  • 530217552e Bump capybara from 3.30.0 to 3.31.0 dependabot-preview[bot] 2020-01-28 07:20:12 +00:00
  • 1d710abb77 Bump rubocop-rails from 2.4.1 to 2.4.2 dependabot-preview[bot] 2020-01-27 08:12:30 +00:00
  • 929049abad Note about tech used Brenda Wallace 2020-01-25 18:57:32 +13:00
  • fc1bd1893c Added perennial to plantings Brenda Wallace 2020-02-03 15:06:45 +13:00
  • 7bf5ab2df3 One per person on home page Brenda Wallace 2020-02-03 11:54:26 +13:00
  • 2c40027cb5 Bump database_cleaner from 1.7.0 to 1.8.1 dependabot-preview[bot] 2020-01-31 07:58:17 +00:00
  • e1b57b8619 Merge pull request #2402 from Growstuff/dependabot/bundler/searchkick-4.2.1 dependabot-preview[bot] 2020-01-29 19:04:32 +00:00
  • c3190866b9 Bump searchkick from 4.2.0 to 4.2.1 dependabot-preview[bot] 2020-01-29 18:33:46 +00:00
  • c546c0ad81 Bump bootstrap-datepicker-rails from 1.8.0.1 to 1.9.0.1 dependabot-preview[bot] 2020-01-28 21:50:24 +00:00
  • a19a2a6925 Merge pull request #2400 from Growstuff/dependabot/bundler/capybara-3.31.0 Brenda Wallace 2020-01-29 10:48:33 +13:00
  • 1975087611 Bump capybara from 3.30.0 to 3.31.0 dependabot-preview[bot] 2020-01-28 07:20:12 +00:00
  • 1be2f342ba Merge pull request #2399 from Growstuff/dependabot/bundler/rubocop-rails-2.4.2 Brenda Wallace 2020-01-28 20:18:21 +13:00
  • 827dda79d7 Bump rubocop-rails from 2.4.1 to 2.4.2 dependabot-preview[bot] 2020-01-27 08:12:30 +00:00
  • dfdbfbc118 Note about tech used Brenda Wallace 2020-01-25 18:57:32 +13:00
  • 253f7a66b1 Merge pull request #2398 from Growstuff/dev Brenda Wallace 2020-01-25 10:33:10 +13:00
  • 10c7f7eccb Merge remote-tracking branch 'upstream/master' into dev Brenda Wallace 2020-01-25 10:09:03 +13:00
  • 793bc17692 Fix owner name in harvests on homepage Brenda Wallace 2020-01-25 08:12:21 +13:00
  • d2d2c5f685 Fixed planting owner name on homepage Brenda Wallace 2020-01-25 08:11:41 +13:00
  • 9f3d59e0e4 Merge pull request #2397 from Growstuff/dependabot/bundler/byebug-11.1.1 dependabot-preview[bot] 2020-01-24 08:01:09 +00:00
  • 944ff39d95 Bump byebug from 11.1.0 to 11.1.1 dependabot-preview[bot] 2020-01-24 07:41:00 +00:00
  • 1e9914dd0b Merge pull request #2396 from Growstuff/dependabot/bundler/elasticsearch-6.8.1 dependabot-preview[bot] 2020-01-23 07:58:26 +00:00
  • 5ffcb93807 Bump elasticsearch from 6.8.0 to 6.8.1 dependabot-preview[bot] 2020-01-23 07:38:11 +00:00
  • 8601b8d269 Bump faraday_middleware from 0.13.1 to 0.14.0 dependabot-preview[bot] 2020-01-21 03:49:30 +00:00
  • 777262097a Bump cancancan from 3.0.1 to 3.0.2 dependabot-preview[bot] 2020-01-21 03:28:18 +00:00
  • 4ff95fbac9 [CodeFactor] Apply fixes codefactor-io 2020-01-20 12:50:14 +00:00
  • 46b612c15f Bump byebug from 11.0.1 to 11.1.0 dependabot-preview[bot] 2020-01-20 08:23:04 +00:00
  • a6c4ae32da Merge pull request #2390 from Growstuff/dependabot/bundler/faraday_middleware-0.14.0 dependabot-preview[bot] 2020-01-21 04:10:15 +00:00
  • bad93ed40d Bump faraday_middleware from 0.13.1 to 0.14.0 dependabot-preview[bot] 2020-01-21 03:49:30 +00:00
  • 61a96420ea Merge pull request #2391 from Growstuff/dependabot/bundler/cancancan-3.0.2 dependabot-preview[bot] 2020-01-21 03:47:33 +00:00
  • 3316e68eb6 Bump cancancan from 3.0.1 to 3.0.2 dependabot-preview[bot] 2020-01-21 03:28:18 +00:00
  • 34ddf8e98f [CodeFactor] Apply fixes codefactor-io 2020-01-20 12:50:14 +00:00
  • c4f30736db Bump byebug from 11.0.1 to 11.1.0 dependabot-preview[bot] 2020-01-20 08:23:04 +00:00
  • 8bf990f729 Merge pull request #2389 from Growstuff/dev Brenda Wallace 2020-01-20 14:30:36 +13:00
  • a5fa21269f Remove Elasticsearch 6 config from travis Brenda Wallace 2020-01-20 13:34:55 +13:00
  • 029a703c2a Remove Elasticsearch 6 config from travis Brenda Wallace 2020-01-20 13:34:43 +13:00
  • f1b5eb1fdd Turn off Replicas (#2388) Brenda Wallace 2020-01-20 13:29:19 +13:00
  • 51e69d79b2 Turn on elastic search 7 tests (#2386) Brenda Wallace 2020-01-19 20:22:07 +13:00
  • 17e0aa8580 Merge pull request #2380 from Growstuff/dependabot/bundler/faker-2.10.1 dependabot-preview[bot] 2020-01-18 06:25:17 +00:00
  • e64e78646c Merge pull request #2382 from Growstuff/dev Brenda Wallace 2020-01-18 19:25:07 +13:00
  • 6cb0f275d0 Bump faker from 2.10.0 to 2.10.1 dependabot-preview[bot] 2020-01-18 05:34:40 +00:00
  • f508139c36 Merge pull request #2381 from Growstuff/dependabot/bundler/oj-3.10.1 dependabot-preview[bot] 2020-01-18 05:32:55 +00:00
  • a866032fdf Bump oj from 3.10.0 to 3.10.1 dependabot-preview[bot] 2020-01-18 05:13:37 +00:00
  • 6279e169de approved crops only, and only 1 shard (#2385) Brenda Wallace 2020-01-18 18:11:24 +13:00
  • 08be5a7de6 Fix/travis ci (#2384) Brenda Wallace 2020-01-18 17:41:48 +13:00