mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-28 11:41:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,434 Commits 54 Branches 76 Tags
6c943370475ea4e50cbcbede67659918be2fbf5c
Commit Graph

8434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
6c94337047 Added Plantings modal form 2020-02-29 10:23:00 +13:00
Brenda Wallace
68d157b048 Removed extra harvest button on plantings#show 2020-02-29 10:22:46 +13:00
Brenda Wallace
8dd47e0639 Added harvest button to crop info card 2020-02-29 10:09:06 +13:00
Brenda Wallace
a6ce1e05cf Lower case in form title 2020-02-29 10:02:47 +13:00
Brenda
8955aab2bb caching plant parts 2020-02-29 09:59:44 +13:00
Brenda Wallace
5d43575eae Merge branch 'feature/crop-action-modals' of github.com:Br3nda/growstuff into feature/crop-action-modals 
Conflicts:
app/views/harvests/_modal.html.haml
 2020-02-29 09:38:21 +13:00
Brenda Wallace
5444d15242 Merge branch 'dev' into feature/crop-action-modals 2020-02-29 09:36:36 +13:00
Brenda Wallace
b2ff247a31 Apply suggestions from code review 
Co-Authored-By: Martina  <922964+simicic@users.noreply.github.com>
 2020-02-29 09:36:05 +13:00
dependabot-preview[bot]
011ce39edb Bump puma from 4.3.1 to 4.3.2 
Bumps [puma](https://github.com/puma/puma) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.1...v4.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-29 09:34:25 +13:00
Brenda
d2509afca2 Harvest button on plantings 2020-02-29 09:33:40 +13:00
dependabot-preview[bot]
236caa0d32 Bump will_paginate from 3.2.1 to 3.3.0 
Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.2.1 to 3.3.0.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v3.2.1...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-28 10:21:28 +13:00
dependabot-preview[bot]
1c57e5266f Bump better_errors from 2.5.1 to 2.6.0 
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.1...v2.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-28 07:16:42 +13:00
Brenda Wallace
a5c770c2b5 Update app/views/crops/_thumbnail.html.haml 
Co-Authored-By: Martina  <922964+simicic@users.noreply.github.com>
 2020-02-27 09:42:09 +13:00
Brenda Wallace
33091fbadc Merge branch 'dev' into feature/crop-action-modals 2020-02-26 11:38:38 +13:00
Brenda Wallace
94d92f8748 Merge pull request #2441 from Growstuff/dependabot/bundler/nokogiri-1.10.8 
[Security] Bump nokogiri from 1.10.7 to 1.10.8
 2020-02-25 11:40:26 +13:00
dependabot-preview[bot]
e54330a4d7 [Security] Bump nokogiri from 1.10.7 to 1.10.8 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.10.8. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.10.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 19:47:44 +00:00
Brenda
9abb84ccba Harvesting modal form 2020-02-24 11:51:37 +13:00
Brenda Wallace
9eba58839d Merge pull request #2431 from Growstuff/dependabot/bundler/database_cleaner-1.8.3 
Bump database_cleaner from 1.8.2 to 1.8.3
 2020-02-23 20:01:34 +13:00
Brenda Wallace
a4a3745d90 Merge branch 'master' into dev 2020-02-23 17:12:18 +13:00
dependabot-preview[bot]
5bd97902da Bump database_cleaner from 1.8.2 to 1.8.3 
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases)
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/v1.8.3/History.rdoc)
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.8.2...v1.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-23 04:05:47 +00:00
Brenda Wallace
edb3529d2d Merge pull request #2430 from Growstuff/dependabot/bundler/rubocop-0.80.0 
Bump rubocop from 0.79.0 to 0.80.0
 2020-02-23 17:04:23 +13:00
Brenda Wallace
676596191d Merge pull request #2439 from Br3nda/tidy-members 
Tidy members profile page
 2020-02-23 17:03:58 +13:00
Brenda
435c164e15 Fixed typo error in view 2020-02-23 15:47:23 +13:00
codefactor-io
28ff058366 [CodeFactor] Apply fixes 2020-02-22 23:04:59 +00:00
Brenda Wallace
7e13431c27 Merge remote-tracking branch 'upstream/dev' into tidy-members 
Conflicts:
	app/views/members/_full_summary.html.haml
 2020-02-23 12:04:20 +13:00
Brenda Wallace
71ccd52c59 Fix harvest thumbnails 2020-02-23 12:03:14 +13:00
Brenda
36bad1cda0 Fix mobile display of member profiles 2020-02-23 11:42:07 +13:00
dependabot-preview[bot]
bb13bbf27e Bump rubocop from 0.79.0 to 0.80.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.79.0 to 0.80.0.
- [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.79.0...v0.80.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-22 00:15:34 +00:00
dependabot-preview[bot]
cf440b444c Bump searchkick from 4.2.1 to 4.3.0 
Bumps [searchkick](https://github.com/ankane/searchkick) from 4.2.1 to 4.3.0.
- [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.1...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-22 13:13:29 +13:00
Brenda Wallace
c85abe0bd1 Member planting progress (#2437) 
* Show member plantings summary on member page

* Remove reference to current member

* Tidy up member planting progress section
 2020-02-22 13:13:07 +13:00
Brenda Wallace
0177b872db Member planting progress (#2437) 
* Show member plantings summary on member page

* Remove reference to current member

* Tidy up member planting progress section
 2020-02-22 12:29:02 +13:00
Brenda Wallace
9df084a859 Merge branch 'dev' into member-planting-progress 2020-02-22 07:51:30 +13:00
Brenda Wallace
878ae9073c Tidy up member planting progress section 2020-02-22 07:49:56 +13:00
Brenda Wallace
6c9f6b7520 Merge pull request #2436 from Growstuff/dev 
Production release
 2020-02-21 16:38:04 +13:00
Brenda Wallace
c71e9b01de Remove reference to current member 2020-02-21 15:56:59 +13:00
Brenda
e3594eee02 Show member plantings summary on member page 2020-02-21 15:56:59 +13:00
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
325729751a Move search bar to middle, hide sitename on small screens 2020-02-20 19:29:35 +13:00
Brenda Wallace
07a9891ec4 Fix spec 2020-02-20 19:29:35 +13:00
Brenda Wallace
e8c7a9e1f5 Fixed menu link label in another spec 2020-02-20 19:29:35 +13:00
Brenda Wallace
155f2ed548 Fix menu link label in spec 2020-02-20 19:29:35 +13:00
Brenda Wallace
76a3dcfc93 Added breadcrumbs to members 2020-02-20 19:29:35 +13:00
Brenda Wallace
63af7eca9f Fix wrapping of admin menu, and put profile link (with image) last 2020-02-20 19:29:35 +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