Commit Graph

  • c514a57f47 Apply suggestions from code review Brenda Wallace 2019-11-30 16:34:12 +13:00
  • cdc87b5511 Tidy up mobile view of logo/nav Brenda Wallace 2019-11-30 16:21:44 +13:00
  • 057e6f3069 Change fonts, tidy up navbar, and use text for site name Brenda Wallace 2019-11-30 16:15:05 +13:00
  • 1570717152 Bump oj from 3.9.2 to 3.10.0 dependabot-preview[bot] 2019-11-29 07:14:36 +00:00
  • d06f511536 Bump rubocop-rails from 2.3.2 to 2.4.0 dependabot-preview[bot] 2019-11-28 10:47:25 +00:00
  • fd0e91c8d5 Bump faraday from 0.17.0 to 0.17.1 dependabot-preview[bot] 2019-11-28 10:31:33 +00:00
  • 4b2f9d4d8f Update rubocop on codeclimate to match gem bundle Brenda Wallace 2019-11-28 22:28:03 +13:00
  • 9ee416ddd4 Bump rubocop from 0.76.0 to 0.77.0 dependabot-preview[bot] 2019-11-28 07:16:54 +00:00
  • 7a6d54c088 Bump rubocop-rspec from 1.36.0 to 1.37.0 dependabot-preview[bot] 2019-11-26 08:09:16 +00:00
  • 887c2498a2 Bump loofah from 2.3.1 to 2.4.0 dependabot-preview[bot] 2019-11-26 07:14:00 +00:00
  • 0fb5e06ac4 Bump capybara-screenshot from 1.0.23 to 1.0.24 dependabot-preview[bot] 2019-11-25 07:39:43 +00:00
  • d26af32c32 Merge pull request #2290 from Growstuff/dev Brenda Wallace 2019-11-25 15:40:19 +13:00
  • e2dcd72472 Merge pull request #2286 from Br3nda/predict-perenial-harvest Brenda Wallace 2019-11-25 14:56:13 +13:00
  • 82e2734caa USe the codeclimate gem Brenda Wallace 2019-11-25 14:03:59 +13:00
  • 5ae4dbaa73 Fix coverage reporter Brenda Wallace 2019-11-25 13:33:47 +13:00
  • faf375c932 Feature spec for month by month harvest Brenda Wallace 2019-11-25 13:25:05 +13:00
  • ace0f0ac16 stub the neighbours variable on planting views spec Brenda Wallace 2019-11-24 12:46:03 +13:00
  • cf2c42a7e0 Only display location if we have a location Brenda Wallace 2019-11-24 12:21:37 +13:00
  • e7c30ef448 Wrapped long lines Brenda Wallace 2019-11-24 12:17:40 +13:00
  • 1e663fc3df Layout tidy to cope with neighbours on page Brenda Wallace 2019-11-24 12:13:48 +13:00
  • bcbee5831f Everyone gets harvest months, not just perennials Brenda Wallace 2019-11-24 11:42:10 +13:00
  • 2538b71225 Planting model spec for perenial harvests Brenda Wallace 2019-11-24 11:37:33 +13:00
  • fd1a608e4c Elaborated comment Brenda Wallace 2019-11-24 11:37:18 +13:00
  • 9aae07b8df Screen reader niceness Brenda Wallace 2019-11-24 11:37:07 +13:00
  • 6325df25b8 Make the month an int Brenda Wallace 2019-11-24 11:36:55 +13:00
  • b8c1f10907 Merge remote-tracking branch 'origin/predict-perenial-harvest' into predict-perenial-harvest Brenda Wallace 2019-11-24 10:46:07 +13:00
  • 83f0182551 rubocop lint Brenda Wallace 2019-11-24 10:41:20 +13:00
  • 0f73c13622 Merge branch 'dev' into predict-perenial-harvest Brenda Wallace 2019-11-24 10:40:22 +13:00
  • 8a81daf7cf Merge pull request #2288 from Growstuff/dev Brenda Wallace 2019-11-24 10:39:57 +13:00
  • 5b7de1ae7a Added location Brenda Wallace 2019-11-24 10:39:06 +13:00
  • 554adf234e Allow chaining on Harvest predictions method returns Brenda Wallace 2019-11-24 10:30:56 +13:00
  • e3b01cdca0 Merge pull request #2287 from Br3nda/homepage-caching Brenda Wallace 2019-11-24 10:19:17 +13:00
  • a8a522d09e rubocop style fix Brenda Wallace 2019-11-24 10:17:55 +13:00
  • bd2b5c6448 Merge remote-tracking branch 'origin/predict-perenial-harvest' into predict-perenial-harvest Brenda Wallace 2019-11-24 10:15:53 +13:00
  • 0bb4dbec10 Display of planting neighbours Brenda Wallace 2019-11-24 10:15:11 +13:00
  • e40cca806c World neighbours Brenda Wallace 2019-11-24 09:44:35 +13:00
  • fd744cf67a [CodeFactor] Apply fixes codefactor-io 2019-11-23 20:44:19 +00:00
  • 70565c7202 show neighbouring plantings same crop Brenda Wallace 2019-11-24 09:43:25 +13:00
  • a23963ba96 [CodeFactor] Apply fixes codefactor-io 2019-11-23 19:58:22 +00:00
  • c0fabc7002 Reducing unnecesary and extra queries Brenda Wallace 2019-11-24 08:57:34 +13:00
  • c3d626636b Added icons so sections line up Brenda Wallace 2019-11-24 08:49:00 +13:00
  • 1c2a88da55 Added lots of caching Brenda Wallace 2019-11-24 08:45:23 +13:00
  • 5793f26b6f stub tests Brenda Wallace 2019-11-24 08:41:12 +13:00
  • 09a70c4742 Predict month of harvest on perennials Brenda Wallace 2019-11-23 22:21:36 +13:00
  • bc31151105 Merge pull request #2283 from Growstuff/dev Brenda Wallace 2019-11-23 08:39:51 +13:00
  • ab1b77ede8 Updated gemlock for ruby version Brenda Wallace 2019-11-23 08:19:21 +13:00
  • a645c696f3 Bump ruby version to 2.6.5 Brenda Wallace 2019-11-23 07:59:59 +13:00
  • 9246176ecf Merge remote-tracking branch 'upstream/dev' into dev Brenda Wallace 2019-11-23 07:56:17 +13:00
  • 712184fb6e Bump ruby version to 2.6.5 Brenda Wallace 2019-11-23 07:54:22 +13:00
  • ab9cf4f3fa Fix gemfile, so rspec isn't expected in production Brenda Wallace 2019-11-23 07:52:22 +13:00
  • 7130679744 Added node buildback to heroku config Brenda Wallace 2019-11-23 07:46:34 +13:00
  • 8449308f41 Set node and yarn versions, so heroku picks good ones Brenda Wallace 2019-11-23 07:44:06 +13:00
  • 95e2ca9ce0 Bump searchkick from 4.1.0 to 4.1.1 dependabot-preview[bot] 2019-11-20 07:14:12 +00:00
  • a92710eab7 Update schema Brenda Wallace 2019-11-19 21:08:47 +13:00
  • 93be74af08 Merge pull request #2278 from Br3nda/api-docs Brenda Wallace 2019-11-19 17:42:45 +13:00
  • 43440657b6 Merge pull request #2281 from Growstuff/dev Brenda Wallace 2019-11-19 17:04:33 +13:00
  • e986b1c60c Merge branch 'dev' into api-docs Brenda Wallace 2019-11-19 16:18:24 +13:00
  • 6c35c44786 Merge remote-tracking branch 'upstream/dev' into dev Brenda Wallace 2019-11-19 16:09:51 +13:00
  • 363d39705a migration goes up only Brenda Wallace 2019-11-19 16:09:01 +13:00
  • 5b6bd4e198 Merge pull request #2282 from Br3nda/cms-upgrade Brenda Wallace 2019-11-19 16:08:37 +13:00
  • 327014ba73 Migrate CMS tags Brenda Wallace 2019-11-19 16:04:11 +13:00
  • 1eca0de6d9 Merge branch 'dev' into api-docs Brenda Wallace 2019-11-19 15:36:39 +13:00
  • 1023409f5e Merge pull request #2280 from Br3nda/cms-upgrade Brenda Wallace 2019-11-19 15:34:55 +13:00
  • 0ece05ca6b [CodeFactor] Apply fixes to commit 0958a13 codefactor-io 2019-11-19 02:15:15 +00:00
  • 0958a134ed Finish the CMS upgrade and fix #2098 Brenda Wallace 2019-11-19 15:14:08 +13:00
  • cf0485c448 fix mobile display Brenda Wallace 2019-11-19 14:25:14 +13:00
  • 72e348cdf6 Fix up specs Brenda Wallace 2019-11-19 14:16:50 +13:00
  • b1bb1a4b95 Corrected path in swagger config Brenda Wallace 2019-11-19 14:02:03 +13:00
  • 76ee0c1cd8 rubocop lint Brenda Wallace 2019-11-19 13:55:53 +13:00
  • 6bb7cec35b Merge remote-tracking branch 'upstream/dev' into api-docs Brenda Wallace 2019-11-19 13:53:38 +13:00
  • 5db98b5d5b Merge remote-tracking branch 'origin/api-docs' into api-docs Brenda Wallace 2019-11-19 13:53:25 +13:00
  • 0c3149205b Put resources back into namespaces Brenda Wallace 2019-11-19 13:50:17 +13:00
  • 35c2073bd8 [Security] Bump https-proxy-agent from 2.2.1 to 2.2.4 dependabot-preview[bot] 2019-11-18 19:29:11 +00:00
  • bcc4b51713 Merge branch 'dev' into api-docs Brenda Wallace 2019-11-18 19:09:22 +13:00
  • fa1e70036a Fix name of spec Brenda Wallace 2019-11-18 16:06:57 +13:00
  • 46f6cd4fd9 [Security] Bump nokogiri from 1.10.4 to 1.10.5 dependabot-preview[bot] 2019-11-17 20:47:58 +00:00
  • be4a250c63 renamed files to please rubocop Brenda Wallace 2019-11-18 11:08:23 +13:00
  • c6fffebb28 Update specs for new index layout with api docs Brenda Wallace 2019-11-18 10:50:13 +13:00
  • 8fb4725f46 Merge remote-tracking branch 'upstream/dev' into api-docs Brenda Wallace 2019-11-18 10:26:05 +13:00
  • 0823e971ed Tidy up indexes and add links to data/api Brenda Wallace 2019-11-18 10:23:07 +13:00
  • 4f8830676e Swagger docs Brenda Wallace 2019-11-18 10:15:06 +13:00
  • 818a980f6d Move jsonapi resources files Brenda Wallace 2019-11-18 10:11:53 +13:00
  • 0e8a085cce Bump scout_apm from 2.6.3 to 2.6.4 dependabot-preview[bot] 2019-11-15 07:18:43 +00:00
  • e096d2be93 Merge pull request #2276 from Growstuff/dev Brenda Wallace 2019-11-17 17:11:43 +13:00
  • 0bc128b01d Merge pull request #2275 from Br3nda/fix-map-markers Brenda Wallace 2019-11-17 14:00:09 +13:00
  • 140f625c48 Add new planting api attributes to test Brenda Wallace 2019-11-16 22:40:06 +13:00
  • 7ea14bccfe Fix alt on img tag Brenda Wallace 2019-11-16 22:32:45 +13:00
  • 8d87f3c982 Remove console debug statement Brenda Wallace 2019-11-16 20:38:43 +13:00
  • 4c82adc612 Added new api items to controller spec Brenda Wallace 2019-11-16 20:38:15 +13:00
  • 24f970f4f4 Added alt tag Brenda Wallace 2019-11-16 13:21:42 +13:00
  • c87ae7be29 add photo to the map, if we have one Brenda Wallace 2019-11-16 13:20:38 +13:00
  • 1697f3e758 Update model spec for location Brenda Wallace 2019-11-16 13:07:38 +13:00
  • df5b0499e4 Update spec for api resource Brenda Wallace 2019-11-16 13:05:40 +13:00
  • 535ddcdcff Added plantings to places map Brenda Wallace 2019-11-16 12:16:18 +13:00
  • a437338961 Fix markers on crops#show map Brenda Wallace 2019-11-16 11:35:45 +13:00
  • 66fae333a9 Rename crops js file so it gets included correctly Brenda Wallace 2019-11-16 11:21:40 +13:00
  • 2b7c21bf2e Fix marker on member map too Brenda Wallace 2019-11-16 11:16:53 +13:00
  • f27cf0caf6 Added link to icon documentation Brenda Wallace 2019-11-16 11:11:41 +13:00
  • df55a5b0a8 Add marker for leaflet maps, and use asset pipeline to serve file Brenda Wallace 2019-11-16 10:37:40 +13:00
  • 1dec690951 Merge pull request #2273 from Growstuff/dev Brenda Wallace 2019-11-15 12:55:19 +13:00