mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-09 08:36:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,967 Commits 60 Branches 82 Tags
RSpec/IncludeExamples
Commit Graph

11967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bestest-mensch
1e1b9f5ef5 scope conversations delete multiple to current user 2019-10-07 21:38:19 +00:00
bestest-mensch
9f8e2e65be update/add specs 2019-10-07 21:38:19 +00:00
bestest-mensch
80fb4f5fe6 add ability to delete multiple conversations at once 2019-10-07 21:38:19 +00:00
bestest-mensch
01df35e5a6 update contributors 2019-10-06 04:08:09 +00:00
bestest-mensch
d39dc65c4e small ui tweak 2019-10-06 04:08:09 +00:00
Brenda Wallace
3422a0d899 Administer member's roles 2019-10-06 14:19:39 +13:00
Brenda Wallace
f297fdc677 Inline editing and display tidy ups 2019-10-05 20:58:00 +13:00
Brenda Wallace
0a71807237 Stop using rails-assets.org (#2194) 2019-09-28 18:38:58 +12:00
Brenda Wallace
3eb30a5555 Removed duplicate crop info 2019-09-28 17:44:37 +12:00
Brenda Wallace
7b5698f977 👩‍🌾 Import openfarm data (#2177) 
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
 2019-09-28 17:23:25 +12:00
Brenda Wallace
6a4158ae04 👭 Crop companions (#2176) 
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
 2019-09-28 10:38:01 +12:00
dependabot-preview[bot]
e043199866 Bump uglifier from 4.1.20 to 4.2.0 
Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.20 to 4.2.0.
- [Release notes](https://github.com/lautis/uglifier/releases)
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lautis/uglifier/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-27 16:20:37 +00:00
Brenda Wallace
eaa6ecec98 Merge pull request #2179 from Br3nda/post-comments 
🚝 Crop to post relationship made more rails standard
 2019-09-27 08:14:47 +12:00
Brenda Wallace
9c0c0eeb18 Merge branch 'dev' into post-comments 2019-09-27 08:13:33 +12:00
Brenda Wallace
66a3b2c52b If we delete a photo, delete the associations records 2019-09-27 08:13:07 +12:00
Brenda Wallace
99e2ca4920 If a crop is deleted, delete association (gerund) records too 2019-09-27 08:13:07 +12:00
Brenda Wallace
719fec24d0 if someone is destroy, delete all likes 2019-09-27 08:13:07 +12:00
Brenda Wallace
f7f7638540 Merge branch 'dev' into post-comments 2019-09-26 21:52:47 +12:00
dependabot-preview[bot]
8dc56c48e2 Bump scout_apm from 2.6.0 to 2.6.1 
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-26 21:51:55 +12:00
Brenda Wallace
e08daa0b2b Merge branch 'dev' into post-comments 2019-09-26 21:51:17 +12:00