Commit Graph

8392 Commits

Author SHA1 Message Date
Brenda Wallace
b72e866362 Remove reference to current member 2020-02-21 14:40:53 +13:00
Brenda
d3cdaea218 Show member plantings summary on member page 2020-02-20 23:01:04 +13:00
Brenda
3ab67786e0 Wrapping the whole layout, to center the page 2020-02-20 22:39:12 +13:00
Brenda Wallace
e986eafc0b Move search bar to middle, hide sitename on small screens 2020-02-20 16:04:09 +13:00
Brenda Wallace
d4517bf298 Fix spec 2020-02-20 15:03:35 +13:00
Brenda Wallace
fe1eda3f30 Fixed menu link label in another spec 2020-02-20 15:03:35 +13:00
Brenda Wallace
0ca529ea8f Fix menu link label in spec 2020-02-20 15:03:35 +13:00
Brenda Wallace
aa2893f666 Added breadcrumbs to members 2020-02-20 15:03:35 +13:00
Brenda Wallace
2006210d4e Fix wrapping of admin menu, and put profile link (with image) last 2020-02-20 15:03:35 +13:00
Brenda Wallace
b208850b7d Full width on mobile 2020-02-19 20:25:06 +13:00
Brenda Wallace
724ba246a3 More crops 2020-02-19 17:00:06 +13:00
Brenda Wallace
00a984a3a5 Removed cute icon that was making sections not line up 2020-02-19 16:59:13 +13:00
Brenda Wallace
bc59827009 Col for recent crops 2020-02-19 16:45:45 +13:00
Brenda Wallace
2208a35b2f More space on home 2020-02-19 16:43:33 +13:00
Brenda Wallace
3764544965 Ten crops on home page 2020-02-19 16:27:03 +13:00
Brenda Wallace
495b52c2ef Merge remote-tracking branch 'upstream/dev' 2020-02-19 16:26:29 +13:00
Brenda Wallace
a60a1ded32 Nine seeds on home page 2020-02-19 16:25:36 +13:00
dependabot-preview[bot]
b56cc37991 Merge pull request #2427 from Growstuff/dependabot/bundler/rubocop-rspec-1.38.1 2020-02-18 10:17:05 +00:00
dependabot-preview[bot]
899419a89f Bump rubocop-rspec from 1.38.0 to 1.38.1
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.38.0 to 1.38.1.
- [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.38.0...v1.38.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-18 09:50:25 +00:00
dependabot-preview[bot]
ae581d5361 Merge pull request #2428 from Growstuff/dependabot/bundler/faker-2.10.2 2020-02-18 09:48:00 +00:00
dependabot-preview[bot]
44e684611b Bump faker from 2.10.1 to 2.10.2
Bumps [faker](https://github.com/faker-ruby/faker) from 2.10.1 to 2.10.2.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/commits/v2.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-18 09:24:21 +00:00
dependabot-preview[bot]
b6ec583b0f Bump discard from 1.1.0 to 1.2.0
Bumps [discard](https://github.com/jhawthorn/discard) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/jhawthorn/discard/releases)
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhawthorn/discard/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-18 22:21:58 +13:00
dependabot-preview[bot]
94e06e4148 Bump sidekiq from 6.0.4 to 6.0.5
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.0.4 to 6.0.5.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.0.4...v6.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-17 07:13:16 +13:00
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