mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-14 03:05:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,667 Commits 59 Branches 82 Tags
bdbe73ada2baff8f329fbd9f3dcea63803fd2152
Commit Graph

7667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
bdbe73ada2 Bump haml_lint from 0.33.0 to 0.34.0 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.33.0 to 0.34.0.
- [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.33.0...v0.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 20:34:39 +00:00
dependabot-preview[bot]
b9738c8c0f Bump will_paginate from 3.1.8 to 3.2.1 
Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.1.8 to 3.2.1.
- [Release notes](https://github.com/mislav/will_paginate/releases)
- [Commits](https://github.com/mislav/will_paginate/compare/v3.1.8...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 19:50:51 +00:00
dependabot-preview[bot]
a4e8cc2234 Bump bootstrap_form from 4.2.0 to 4.3.0 
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases)
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.2.0...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 18:21:16 +00:00
dependabot-preview[bot]
f471913b74 [Security] Bump rubyzip from 1.2.3 to 1.3.0 
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.3 to 1.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.3...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 17:58:12 +00:00
Brenda Wallace
71e6ee98b9 Merge pull request #2202 from Br3nda/role-admin 
Administer member's roles
 2019-10-21 15:52:31 +13:00
Brenda Wallace
d90a58218a Remove roles#show 2019-10-21 15:38:46 +13:00
Brenda Wallace
13c024fac9 Fixed typo in spec 2019-10-21 15:13:47 +13:00
Brenda Wallace
abd91fa37b Use bang! to indicate method can explode 2019-10-21 14:43:46 +13:00
Brenda Wallace
498a754eea update specs for admin roles 2019-10-21 14:32:23 +13:00
Brenda Wallace
6280115055 Merge branch 'role-admin' of github.com:br3nda/growstuff into role-admin 2019-10-21 14:27:02 +13:00
Brenda Wallace
47be6ad631 Merge branch 'dev' into role-admin 2019-10-21 14:24:31 +13:00
Brenda Wallace
4a1e57e42a Merge remote-tracking branch 'upstream/dev' into dev 2019-10-21 14:20:23 +13:00
Brenda Wallace
9efd9d0544 Merge remote-tracking branch 'upstream/dev' into dev 2019-10-21 14:19:57 +13:00
Brenda Wallace
8c694b3dca Only show companions of active plantings 2019-10-21 14:19:47 +13:00
Brenda Wallace
fb5b17741d Merge pull request #2222 from Br3nda/puma 
Switch from unicorn to puma
 2019-10-21 12:30:16 +13:00
Brenda Wallace
ca11792286 Only show companions of active plantings 2019-10-20 14:13:30 +13:00
Brenda Wallace
c19d09bb37 Switch from unicorn to puma 2019-10-19 18:47:28 +13:00
Brenda Wallace
7f0113a188 Merge remote-tracking branch 'upstream/master' into dev 2019-10-19 18:46:53 +13:00
Brenda Wallace
d81df50dc5 Suggest companions for a garden based on existing crops 2019-10-19 18:45:11 +13:00
Brenda Wallace
a75803d456 Merge branch 'dev' 2019-10-19 18:20:20 +13:00
Brenda Wallace
bb72d2b974 Fix bug showing plantings with no planted_at 2019-10-19 18:20:01 +13:00
Brenda Wallace
3c50705d5f Merge pull request #2220 from Growstuff/dev 
production release
 2019-10-19 16:43:10 +13:00
Brenda Wallace
c26cec4868 Merge pull request #2219 from Br3nda/feature-2207 
Group previous plantings by year
 2019-10-19 16:42:55 +13:00
Brenda Wallace
6bd7e139a6 Move views specs to admin 2019-10-19 16:04:16 +13:00
Brenda Wallace
f2dc2aeaa0 Merge branch 'dev' into feature-2207 2019-10-19 16:01:11 +13:00
Brenda Wallace
95ec89f6a0 Merge branch 'dev' into role-admin 2019-10-19 13:23:25 +13:00
Brenda Wallace
1d97250726 Merge pull request #2216 from Br3nda/wider-gardens 
Widen gardens on gardens#index
 2019-10-19 13:23:00 +13:00
Brenda Wallace
ecb0c53c80 Merge branch 'dev' into feature-2207 2019-10-19 13:22:19 +13:00
Brenda Wallace
0965168750 Group previous plantings by year 2019-10-19 11:25:19 +13:00
Brenda Wallace
dc909132ef Merge branch 'dev' into role-admin 2019-10-19 10:52:18 +13:00
Brenda Wallace
95affc8ca8 Merge branch 'dev' into wider-gardens 2019-10-19 10:50:16 +13:00
Brenda Wallace
f50417cc04 Merge pull request #2218 from Br3nda/gem-asset-fix 
Add source for leaflet
 2019-10-19 10:49:50 +13:00
Brenda Wallace
75897bad51 Update routing specs for admin roles 2019-10-19 10:28:24 +13:00
Brenda Wallace
fc07571ee1 Rename is_admin? to admin?. 2019-10-19 10:25:17 +13:00
Brenda Wallace
35c9b70bc9 Remove email from display in admin/members 2019-10-19 10:23:39 +13:00
Brenda Wallace
5a6d0f6342 Check admin before roles controller runs 2019-10-19 10:22:27 +13:00
Brenda Wallace
2ddddb1652 Updated specs for admin editing roles 2019-10-19 10:16:02 +13:00
Brenda Wallace
c940ba447e Add source for leaflet, fixes #2217 2019-10-19 09:47:29 +13:00
Brenda Wallace
dc3bc85777 Remove comments 2019-10-19 09:44:05 +13:00
Brenda Wallace
1a34bfb9a2 Merge remote-tracking branch 'origin/role-admin' into role-admin 2019-10-19 09:43:12 +13:00
Brenda Wallace
21848bf5b4 Merge branch 'dev' into role-admin 2019-10-19 09:42:49 +13:00
Brenda Wallace
a6cb81f4d1 Widen gardens on gardens#index 2019-10-19 09:41:43 +13:00
Brenda Wallace
80b82a99fe Fix broken spec on dev 2019-10-19 09:41:09 +13:00
Brenda Wallace
88a771459c Merge branch 'dev' into role-admin 2019-10-18 09:43:44 +13:00
Brenda Wallace
fd39d6ef8c More per page 2019-10-08 15:54:53 +13:00
codefactor-io
6d472c5d66 [CodeFactor] Apply fixes 2019-10-07 23:35:39 +00:00
Brenda Wallace
f77a0e37b9 Merge branch 'dev' into role-admin 2019-10-08 11:22:13 +13:00
Brenda Wallace
ca0915585c Merge pull request #2193 from Growstuff/dev 
Production release
 2019-10-08 11:21:18 +13:00
Brenda Wallace
b0c8b11246 📝 Inline editing and display tidy ups (#2200) 
* Inline editing and display tidy ups
 2019-10-08 11:06:53 +13:00
bestest-mensch
d72ec5890a address code climate issues 2019-10-07 21:38:19 +00:00