mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-06 21:22:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 102 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace ad90dd6dfa Fixes wrong host name in emails 2019-04-08 14:23:34 +12:00
dependabot[bot] a48acc0253 Bump rubocop from 0.66.0 to 0.67.2 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.66.0 to 0.67.2.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.66.0...v0.67.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-08 14:16:02 +12:00
dependabot[bot] 7ca263aa64 Bump capybara from 3.16.0 to 3.16.1 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.0 to 3.16.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.16.0...3.16.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-06 09:18:12 +13:00
dependabot[bot] d8b70a927a Bump js-routes from 1.4.5 to 1.4.6 
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.5 to 1.4.6.
- [Release notes](https://github.com/railsware/js-routes/releases)
- [Changelog](https://github.com/railsware/js-routes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/railsware/js-routes/compare/v1.4.5...v1.4.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-05 22:41:23 +13:00
dependabot[bot] 7c6a76b41c Bump cancancan from 2.3.0 to 3.0.0 
Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 2.3.0 to 3.0.0.
- [Release notes](https://github.com/CanCanCommunity/cancancan/releases)
- [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/CanCanCommunity/cancancan/compare/2.3.0...3.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-05 10:14:18 +13:00
dependabot[bot] b43b8f5868 Bump js-routes from 1.4.4 to 1.4.5 
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/railsware/js-routes/releases)
- [Changelog](https://github.com/railsware/js-routes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/railsware/js-routes/compare/v1.4.4...v1.4.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-03 03:52:09 +13:00
Brenda Wallace c89682792c Merge branch 'dev' into feature/memcachier 2019-04-02 22:22:00 +13:00
Awesome Code a2fd0f0ae2 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-04-01 10:15:18 +00:00
Brenda Wallace 6ef3b02764 Remove commented out code 2019-04-01 23:02:50 +13:00
Brenda Wallace 495002d8b9 Change "background" to "before" 2019-04-01 23:02:50 +13:00
Awesome Code 4ba5319ba8 Auto corrected by following Lint Ruby Capybara/FeatureMethods 2019-04-01 23:02:50 +13:00
dependabot[bot] 71ab33d20c Bump i18n-tasks from 0.9.28 to 0.9.29 
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.28 to 0.9.29.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.28...v0.9.29)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-01 22:26:08 +13:00
Brenda Wallace ff22adfd76 Merge branch 'dev' into feature/memcachier 2019-03-31 10:21:27 +13:00
Brenda Wallace a62c268dda Merge branch 'dev' into plantings-show 2019-03-31 10:20:57 +13:00
Awesome Code 6e10dc2a2b Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-03-31 10:20:08 +13:00
Awesome Code 4dcb420534 Auto corrected by following Lint Ruby RSpec/HookArgument 2019-03-31 10:19:51 +13:00
Awesome Code fb243c1f8d Auto corrected by following Lint Ruby RSpec/ExpectChange 2019-03-31 09:24:13 +13:00
Awesome Code 837ae8cb8e Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-03-30 18:09:37 +13:00
Awesome Code f48e131e14 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-03-30 18:07:30 +13:00
Brenda Wallace 5e51c4ab9b Merge branch 'dev' into plantings-show 2019-03-30 18:03:31 +13:00
Brenda Wallace a58ce0f6a2 Tidy up mobile 2019-03-30 18:01:55 +13:00
Brenda Wallace 2e91a3f381 Merge branch 'dev' into feature/memcachier 2019-03-30 16:52:50 +13:00
dependabot[bot] 30b5c0ce9d Bump capybara from 3.15.0 to 3.16.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.15.0 to 3.16.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.15.0...3.16.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-30 10:11:58 +13:00
Brenda Wallace 6cf60afec4 Don't check for markasinished on plantings#index 2019-03-29 15:49:11 +13:00
Brenda Wallace 4d95130216 Move phtos to a gallery 2019-03-29 15:48:57 +13:00
Brenda Wallace 43bb606a2b Cleaning up small screen presentation 2019-03-29 15:48:47 +13:00
Brenda Wallace 830b554dc9 Test updates 2019-03-29 11:28:17 +13:00
Brenda Wallace e4d4cdc3fa Fix up seed description helper 2019-03-29 10:45:51 +13:00
Brenda Wallace cb91b43d25 Fix deprecation warning 2019-03-29 10:29:05 +13:00
Brenda Wallace bab9c01bf5 Updating tests 2019-03-29 10:25:30 +13:00
Brenda Wallace 9be4c4179f Updating specs 2019-03-28 15:49:39 +13:00
Brenda Wallace 5722859a24 Move notes higher 2019-03-28 10:01:05 +13:00
Brenda Wallace 2bc12570c4 Consistent display of seeds/harvests 2019-03-27 22:38:28 +13:00
Brenda Wallace 0c9702e1a4 Move photo query, so we use eager loading 2019-03-27 22:28:06 +13:00
Brenda Wallace 562a7b1a10 Merge remote-tracking branch 'origin/plantings-show' into plantings-show 2019-03-27 21:19:43 +13:00
Brenda Wallace 626d5f8d7c Move harvest and seeds to the right on plantings#show 2019-03-27 21:19:35 +13:00
Brenda Wallace d35dfeea21 Show date taken, not data the database record was created 2019-03-27 21:19:22 +13:00
Brenda Wallace 984da54534 Merge branch 'dev' into plantings-show 2019-03-27 21:13:28 +13:00
Brenda Wallace 3ced3da682 Merge branch 'dev' into feature/memcachier 2019-03-27 21:06:23 +13:00
Brenda Wallace 9c231703ab Merge pull request #1888 from Growstuff/dependabot/bundler/devise-4.6.2 
Bump devise from 4.6.1 to 4.6.2
 2019-03-27 21:06:00 +13:00
Brenda Wallace e7b0b6f18e Remove table display on plantings#show, replace with boxes 2019-03-27 21:04:56 +13:00
dependabot[bot] 2126863632 Bump devise from 4.6.1 to 4.6.2 
Bumps [devise](https://github.com/plataformatec/devise) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.6.1...v4.6.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-27 07:46:45 +00:00
dependabot[bot] 566308a49d Merge pull request #1887 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.6 2019-03-26 10:00:26 +00:00
Brenda Wallace 1e0f308db2 Merge branch 'dev' into UTFGardenNames 2019-03-26 22:43:56 +13:00
Brenda Wallace 0717e0a00d Merge branch 'dev' into feature/memcachier 2019-03-26 22:42:45 +13:00
dependabot[bot] 9222782808 Bump jsonapi-resources from 0.9.5 to 0.9.6 
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.9.5 to 0.9.6.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases)
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.5...v0.9.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-26 09:39:24 +00:00
Brenda Wallace dcbc0ecdff Merge branch 'master' into dev 2019-03-26 22:36:54 +13:00
Brenda Wallace c059c46833 Merge pull request #1747 from brandonbaker40/bb-track-types-of-gardens 
tracks types of gardens
 2019-03-26 22:34:48 +13:00
Brenda Wallace 8d579a4616 Gardens have descriptions 2019-03-26 22:27:10 +13:00
Brenda Wallace 1e240cf4b8 replace a rubocop ignore 2019-03-26 22:12:09 +13:00