mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-28 19:51:57 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,369 Commits 54 Branches 76 Tags
cf60a75480dfe4fbbfbd2d1affff0d70266d9910
Commit Graph

8369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
cf60a75480 Merge pull request #2426 from Growstuff/dev 
Production release
 2020-02-15 10:46:35 +13:00
Brenda
88615a55f4 CSS for seeds cards 2020-02-15 10:05:14 +13:00
Brenda Wallace
2eaf8ac215 Merge branch 'dev' of github.com:Growstuff/growstuff into dev 2020-02-15 10:05:03 +13:00
Brenda Wallace
7472bceeb3 install postgresql from addonns 2020-02-15 09:54:00 +13:00
Brenda Wallace
eb749c02fd Turning off postgresql service on travis-ci 
see if this fixes the build
 2020-02-15 09:54:00 +13:00
Brenda Wallace
9853d931c6 Shrink seed card and fix links 2020-02-15 09:54:00 +13:00
Brenda Wallace
c12580ed8d Shrink seed card and fix links 2020-02-14 10:07:26 +13:00
Brenda Wallace
4c603f0cc9 Merge pull request #2422 from Growstuff/dependabot/bundler/rubocop-rspec-1.38.0 
Bump rubocop-rspec from 1.37.1 to 1.38.0
 2020-02-13 21:33:30 +13:00
dependabot-preview[bot]
6e930976cb Bump rubocop-rspec from 1.37.1 to 1.38.0 
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.37.1 to 1.38.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.37.1...v1.38.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-12 07:51:54 +00:00
Brenda Wallace
35094561ce Merge remote-tracking branch 'upstream/dev' 2020-02-12 16:42:30 +13:00
Brenda Wallace
9a6c6e73f1 Bump posts and members count to 6 2020-02-12 14:02:14 +13:00
Brenda Wallace
d6e4ab5fab Merge branch 'index-pages' into dev 2020-02-10 21:49:58 +13:00
Brenda
24ae63a339 add link to gardens for members#show 2020-02-10 21:49:38 +13:00
Brenda
20e878e9fe style "inactive" checkbox on gardens#index 2020-02-10 21:49:27 +13:00
Brenda Wallace
cb0a545358 Merge pull request #2421 from Growstuff/dev 
production release
 2020-02-10 14:57:35 +13:00
dependabot-preview[bot]
b5946b5c81 Bump haml_lint from 0.34.1 to 0.34.2 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.34.1 to 0.34.2.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.34.1...v0.34.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 14:21:19 +13:00
Brenda
821ddd90cb fix specs 2020-02-10 14:21:03 +13:00
Brenda
dcb05c2e1e tidy up posts on crops page 2020-02-10 14:21:03 +13:00
Brenda
9dfd6dbc73 Tidy up index pages 2020-02-10 14:21:03 +13:00
Brenda
3a1f6c9d0b fix specs 2020-02-10 11:12:44 +13:00
Brenda
f7f62bb7dc tidy up posts on crops page 2020-02-10 10:03:49 +13:00
Brenda
12db6b5fa0 Tidy up index pages 2020-02-10 09:47:37 +13:00
Brenda Wallace
4543a64e3b Merge pull request #2418 from Growstuff/dev 
Production release
 2020-02-09 23:20:09 +13:00
Brenda Wallace
abecbab6c5 Tidy up mobile display on homepage, including member cards changes (#2417) 
* Tidy up mobile display on homepage, including member cards changes
 2020-02-09 22:38:12 +13:00
Brenda Wallace
b4a5c5d0ad Merge pull request #2416 from Growstuff/dev 
production deploy
 2020-02-07 22:01:18 +13:00
Brenda Wallace
4f5245f7e7 Show all of a harvest's photos on harvest#show 2020-02-07 08:02:20 +13:00
Brenda Wallace
d515aba4b5 Merge pull request #2414 from Growstuff/dev 
Production deploy
 2020-02-05 11:40:01 +13:00
Brenda Wallace
1d0a1baa2d Merge pull request #2413 from Growstuff/dependabot/bundler/unicorn-5.5.3 
Bump unicorn from 5.5.2 to 5.5.3
 2020-02-05 10:37:10 +13:00
Brenda Wallace
cde46ed14a Merge pull request #2411 from Growstuff/feature/photo-for-socmed 
Feature/photo for socmed
 2020-02-05 10:36:57 +13:00
dependabot-preview[bot]
697631dcce Bump unicorn from 5.5.2 to 5.5.3 
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.5.2 to 5.5.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 07:50:58 +00:00
Brenda Wallace
30f2d2c590 Merge branch 'dev' into feature/photo-for-socmed 2020-02-04 16:21:22 +13:00
Brenda Wallace
906f44ac66 Merge pull request #2412 from Growstuff/dev 
production release
 2020-02-04 16:21:11 +13:00
Brenda Wallace
5a3c06f490 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	Gemfile.lock
 2020-02-04 12:44:28 +13:00
Brenda Wallace
019d94f1cb Show the default photo for social media 2020-02-04 11:52:13 +13:00
dependabot-preview[bot]
8dd70486c7 Bump unicorn from 5.5.2 to 5.5.3 
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.5.2 to 5.5.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 10:51:12 +13:00
dependabot-preview[bot]
425f801033 Bump database_cleaner from 1.8.1 to 1.8.2 
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases)
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc)
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.1...v1.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 10:50:52 +13:00
dependabot-preview[bot]
cce29dabbb Bump oj from 3.10.1 to 3.10.2 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.1 to 3.10.2.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 10:50:17 +13:00
Martina Simicic
b0a5223d97 Account for finished planting when counting days of life 2020-02-04 10:50:00 +13:00
Martina Simicic
10008ca30d Removing method since it is defined in predict planting 2020-02-04 10:50:00 +13:00
Brenda Wallace
d15df948ff Added perennial to plantings 2020-02-03 16:28:57 +13:00
Brenda Wallace
5fbdd577d6 One per person on home page 2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
42cce210c0 Bump database_cleaner from 1.7.0 to 1.8.1 
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 1.7.0 to 1.8.1.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases)
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc)
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
42aeba9eeb Bump searchkick from 4.2.0 to 4.2.1 
Bumps [searchkick](https://github.com/ankane/searchkick) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/ankane/searchkick/releases)
- [Changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/searchkick/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
a0e1184cda Bump bootstrap-datepicker-rails from 1.8.0.1 to 1.9.0.1 
Bumps [bootstrap-datepicker-rails](https://github.com/Nerian/bootstrap-datepicker-rails) from 1.8.0.1 to 1.9.0.1.
- [Release notes](https://github.com/Nerian/bootstrap-datepicker-rails/releases)
- [Commits](https://github.com/Nerian/bootstrap-datepicker-rails/compare/1.8.0.1...1.9.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
530217552e Bump capybara from 3.30.0 to 3.31.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.30.0 to 3.31.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.30.0...3.31.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-03 16:28:57 +13:00
dependabot-preview[bot]
1d710abb77 Bump rubocop-rails from 2.4.1 to 2.4.2 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.1...v2.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-03 16:28:57 +13:00
Brenda Wallace
929049abad Note about tech used 2020-02-03 16:28:57 +13:00
Brenda Wallace
fc1bd1893c Added perennial to plantings 2020-02-03 15:06:45 +13:00
Brenda Wallace
7bf5ab2df3 One per person on home page 2020-02-03 11:54:26 +13:00
dependabot-preview[bot]
2c40027cb5 Bump database_cleaner from 1.7.0 to 1.8.1 
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 1.7.0 to 1.8.1.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases)
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc)
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-02 11:29:30 +13:00