Commit Graph

  • 69d9e1e76e Merge pull request #2271 from Br3nda/jump-to-garden Brenda Wallace 2019-11-15 12:16:39 +13:00
  • e127832d37 Merge pull request #2272 from Br3nda/ordering Brenda Wallace 2019-11-15 12:16:23 +13:00
  • cfef6f5eb2 Link to jump to garden Brenda Wallace 2019-11-15 11:43:51 +13:00
  • 75037c7e21 Order the garden names Brenda Wallace 2019-11-15 11:32:13 +13:00
  • 856d975551 Merge pull request #2269 from Growstuff/dev Brenda Wallace 2019-11-13 11:44:01 +13:00
  • a4659f141a Bump rake from 13.0.0 to 13.0.1 dependabot-preview[bot] 2019-11-12 07:14:25 +00:00
  • 476f068807 Bump omniauth-flickr from 0.0.19 to 0.0.20 dependabot-preview[bot] 2019-11-11 10:35:37 +00:00
  • 6bd53094ba Merge pull request #2267 from Growstuff/imgbot Brenda Wallace 2019-11-11 19:00:15 +13:00
  • be884ad1fb [ImgBot] Optimize images ImgBotApp 2019-11-11 05:00:09 +00:00
  • 130febb735 Change regex not letting utf-8 garden names save (#1641) Brenda Wallace 2019-11-11 17:59:41 +13:00
  • b8b579a5ba rubycop fix up Brenda Wallace 2019-11-11 17:45:37 +13:00
  • e0ea039347 [CodeFactor] Apply fixes to commit a651f07 codefactor-io 2019-11-11 04:42:30 +00:00
  • a651f079d8 Simplify garden.name validation regexp Brenda Wallace 2019-11-11 17:41:46 +13:00
  • cfaa18daaf Merge remote-tracking branch 'upstream/dev' into UTFGardenNames Brenda Wallace 2019-11-11 14:14:34 +13:00
  • 9b15b42cbd [Security] Bump chartkick from 3.2.2 to 3.3.0 dependabot-preview[bot] 2019-11-10 02:33:08 +00:00
  • 5cb00f4423 Bump puma from 4.2.1 to 4.3.0 dependabot-preview[bot] 2019-11-08 07:13:37 +00:00
  • e617d2aac9 Bump faker from 2.6.0 to 2.7.0 dependabot-preview[bot] 2019-11-06 08:50:05 +00:00
  • bdfce436b4 Bump scout_apm from 2.6.2 to 2.6.3 dependabot-preview[bot] 2019-11-06 07:14:48 +00:00
  • 74d4f19203 Merge pull request #2261 from Growstuff/dev Brenda Wallace 2019-11-05 13:16:29 +13:00
  • a4b7ded8a3 Merge pull request #2260 from Br3nda/all-varieties Brenda Wallace 2019-11-05 11:12:42 +13:00
  • 405de0fb18 Merge branch 'dev' into all-varieties Brenda Wallace 2019-11-02 13:21:30 +13:00
  • 1f8ef86053 Merge pull request #2258 from Growstuff/dev Brenda Wallace 2019-11-01 22:13:39 +13:00
  • 01d974f9ee Merge pull request #2259 from Br3nda/parent-seed Brenda Wallace 2019-11-01 22:13:20 +13:00
  • d0bee45c0c show all varieties (including grandchildren) Brenda Wallace 2019-11-01 17:21:55 +13:00
  • c27622803d Specs for linking plantings to seeds Brenda Wallace 2019-11-01 15:34:12 +13:00
  • b214f7ad8d linking existing plantings to their parent seeds Brenda Wallace 2019-11-01 13:24:13 +13:00
  • 2cb438f15d Bump rubocop from 0.75.1 to 0.76.0 dependabot-preview[bot] 2019-10-29 07:22:56 +00:00
  • 6b023de063 Merge pull request #2255 from Growstuff/dev Brenda Wallace 2019-10-29 13:26:43 +13:00
  • 91fa8e6a62 Merge pull request #2254 from Br3nda/seeds Brenda Wallace 2019-10-29 11:25:57 +13:00
  • 585406ad11 Merge branch 'dev' into seeds Brenda Wallace 2019-10-28 22:19:50 +13:00
  • 2f2169f89a tidy up display of seeds Brenda Wallace 2019-10-28 22:12:08 +13:00
  • b24beae9af Bump chartkick from 3.2.1 to 3.2.2 dependabot-preview[bot] 2019-10-28 08:35:45 +00:00
  • 42e4d24004 Bump sidekiq from 6.0.2 to 6.0.3 dependabot-preview[bot] 2019-10-28 08:01:28 +00:00
  • e472e1cd14 Merge pull request #2248 from Growstuff/dev Brenda Wallace 2019-10-27 14:09:44 +13:00
  • a9f3125191 Merge pull request #2249 from Br3nda/weeks Brenda Wallace 2019-10-27 13:22:48 +13:00
  • b2e90cddc6 Merge branch 'dev' into weeks Brenda Wallace 2019-10-25 13:41:30 +13:00
  • 279d85456b Switching gravatar urls to secure subdomain André Aubin 2019-10-25 01:39:59 +02:00
  • a3fa774d84 Force ssl on gravatar-ultimate gem André Aubin 2019-10-24 16:23:02 +02:00
  • 15608fc86a Update Contributors.md André Aubin 2019-10-23 17:36:48 +02:00
  • 66045866b3 Switch to HTTPS for Gravatar urls André Aubin 2019-10-23 17:30:41 +02:00
  • 8cf5acc30a Update spec to expect weeks to be rounded Brenda Wallace 2019-10-25 07:42:13 +13:00
  • 9d232e26cb Update app/views/crops/_predictions.html.haml Brenda Wallace 2019-10-25 06:42:00 +13:00
  • d96b30fff8 spec for in_weeks method Brenda Wallace 2019-10-24 21:05:03 +13:00
  • 2d6d02d0b3 added in_weeks helper Brenda Wallace 2019-10-24 21:03:30 +13:00
  • 358631d0f9 update spec to look for weeks Brenda Wallace 2019-10-24 20:58:27 +13:00
  • 95ae4d41ba rounding on weeks Brenda Wallace 2019-10-24 20:58:13 +13:00
  • 627d97155f Tidy up Brenda Wallace 2019-10-24 19:59:18 +13:00
  • 329262e2f5 show "finished" when planting is finished Brenda Wallace 2019-10-24 19:45:08 +13:00
  • 5d4f1abacd show unknown date when unknown finish date Brenda Wallace 2019-10-24 19:44:58 +13:00
  • f7f3ac695f better name for css class progress-fade Brenda Wallace 2019-10-24 19:16:41 +13:00
  • a1479c9126 fixed call to missing method Brenda Wallace 2019-10-24 19:13:41 +13:00
  • dfe533dda1 DRY and tidy Brenda Wallace 2019-10-24 19:13:20 +13:00
  • f4c4e1c93f Collapse crop card content Brenda Wallace 2019-10-24 19:10:44 +13:00
  • 1a0e30491f Removed unused methods Brenda Wallace 2019-10-24 19:04:37 +13:00
  • 053a33cd72 Removed commented out code Brenda Wallace 2019-10-24 18:58:50 +13:00
  • 0cc62c2b98 show planted_at, even when we can't predict finish Brenda Wallace 2019-10-24 18:57:16 +13:00
  • c094b5daf9 Update spec, to look for new emojii timeline Brenda Wallace 2019-10-24 18:55:47 +13:00
  • 38713af603 plantings timeline with icons Brenda Wallace 2019-10-23 22:28:50 +13:00
  • dc3a730064 update spec to use expect syntax Brenda Wallace 2019-10-21 14:42:35 +13:00
  • 85634fc43b Bump factory_bot_rails from 5.1.0 to 5.1.1 dependabot-preview[bot] 2019-10-23 08:29:26 +00:00
  • 9de1d02cb1 Bump loofah from 2.3.0 to 2.3.1 dependabot-preview[bot] 2019-10-23 08:08:04 +00:00
  • d5d0c9e132 Merge pull request #2224 from Br3nda/search Brenda Wallace 2019-10-23 21:06:10 +13:00
  • ae48844d87 Merge branch 'dev' into search Brenda Wallace 2019-10-23 15:55:27 +13:00
  • 3ef85ac2f6 Merge pull request #2221 from Br3nda/planting-reminders Brenda Wallace 2019-10-23 15:55:10 +13:00
  • 19cb89be1e Merge branch 'dev' into planting-reminders Brenda Wallace 2019-10-23 09:24:56 +13:00
  • 603251de75 Bump selenium-webdriver from 3.142.4 to 3.142.6 dependabot-preview[bot] 2019-10-22 18:45:24 +00:00
  • f4f9f8626c Merge branch 'dev' into search Brenda Wallace 2019-10-23 07:46:05 +13:00
  • 8b7697c6d6 Merge branch 'dev' into planting-reminders Brenda Wallace 2019-10-23 07:45:24 +13:00
  • b69baa8b22 Bump rspec-rails from 3.8.2 to 3.9.0 dependabot-preview[bot] 2019-10-22 14:58:43 +00:00
  • 9b4ead388b Bump rake from 12.3.3 to 13.0.0 dependabot-preview[bot] 2019-10-22 14:17:07 +00:00
  • 4fa803a40d Bump listen from 3.1.5 to 3.2.0 dependabot-preview[bot] 2019-10-22 13:06:53 +00:00
  • ebe3c9c0e6 Bump faker from 2.4.0 to 2.6.0 dependabot-preview[bot] 2019-10-22 12:28:29 +00:00
  • 9eff481606 Bump rubocop-rspec from 1.35.0 to 1.36.0 dependabot-preview[bot] 2019-10-22 11:08:44 +00:00
  • 9ae80fbf9d Bump oj from 3.9.1 to 3.9.2 dependabot-preview[bot] 2019-10-22 10:12:24 +00:00
  • f1cc01313f Bump puma from 4.2.0 to 4.2.1 dependabot-preview[bot] 2019-10-22 09:47:23 +00:00
  • 09f0ec1dc0 Bump rubocop from 0.74.0 to 0.75.1 dependabot-preview[bot] 2019-10-22 07:34:06 +00:00
  • e1dfd122d4 Merge pull request #2235 from Growstuff/dev Brenda Wallace 2019-10-22 22:44:55 +13:00
  • d49a4c8db0 Bump scout_apm from 2.6.1 to 2.6.2 dependabot-preview[bot] 2019-10-22 00:55:28 +00:00
  • 6d4e68f58d Bump newrelic_rpm from 6.6.0.358 to 6.7.0.359 dependabot-preview[bot] 2019-10-22 00:21:01 +00:00
  • bb18d1dea3 Bump sidekiq from 6.0.0 to 6.0.2 dependabot-preview[bot] 2019-10-22 00:06:37 +00:00
  • 00b8f72152 Bump faraday from 0.15.4 to 0.17.0 dependabot-preview[bot] 2019-10-21 21:43:19 +00:00
  • 55547d2916 Bump webdrivers from 4.1.2 to 4.1.3 dependabot-preview[bot] 2019-10-21 21:13:49 +00:00
  • 073cbeaab6 Bump loofah from 2.2.3 to 2.3.0 dependabot-preview[bot] 2019-10-21 20:36:33 +00:00
  • bdbe73ada2 Bump haml_lint from 0.33.0 to 0.34.0 dependabot-preview[bot] 2019-10-21 19:52:51 +00:00
  • b9738c8c0f Bump will_paginate from 3.1.8 to 3.2.1 dependabot-preview[bot] 2019-10-21 18:23:03 +00:00
  • a4e8cc2234 Bump bootstrap_form from 4.2.0 to 4.3.0 dependabot-preview[bot] 2019-10-21 08:14:56 +00:00
  • f471913b74 [Security] Bump rubyzip from 1.2.3 to 1.3.0 dependabot-preview[bot] 2019-10-21 08:09:46 +00:00
  • c6f4eef291 Show more results in searches Brenda Wallace 2019-10-21 16:22:43 +13:00
  • 440499530b Merge pull request #2223 from Growstuff/dev Brenda Wallace 2019-10-21 16:23:13 +13:00
  • 6d6d1930d1 Merge branch 'dev' into planting-reminders Brenda Wallace 2019-10-21 15:53:25 +13:00
  • 71e6ee98b9 Merge pull request #2202 from Br3nda/role-admin Brenda Wallace 2019-10-21 15:52:31 +13:00
  • d90a58218a Remove roles#show Brenda Wallace 2019-10-21 15:38:46 +13:00
  • 13c024fac9 Fixed typo in spec Brenda Wallace 2019-10-21 15:13:47 +13:00
  • 798883be1c Typo/spelling fix Brenda Wallace 2019-10-21 14:45:21 +13:00
  • abd91fa37b Use bang! to indicate method can explode Brenda Wallace 2019-10-21 14:43:46 +13:00
  • 498a754eea update specs for admin roles Brenda Wallace 2019-10-21 14:28:59 +13:00
  • 6280115055 Merge branch 'role-admin' of github.com:br3nda/growstuff into role-admin Brenda Wallace 2019-10-21 14:27:02 +13:00
  • 47be6ad631 Merge branch 'dev' into role-admin Brenda Wallace 2019-10-21 14:24:31 +13:00
  • 7517abd1f3 Merge remote-tracking branch 'origin/planting-reminders' into planting-reminders Brenda Wallace 2019-10-21 14:23:03 +13:00
  • 8cdae6647d Merge remote-tracking branch 'upstream/dev' into planting-reminders Brenda Wallace 2019-10-21 14:20:45 +13:00