mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-29 19:26:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 61 Branches 82 Tags
Layout/HashAlignment
Commit Graph

112 Commits

Author SHA1 Message Date
google-labs-jules[bot]
a98990ccd2 Add transplant feature for plantings (#4133) 
* Add ability to transplant a planting

* Fix view tests

* Transplantable gardens

* Add spec

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
 2025-08-24 22:31:14 +09:30
Daniel O'Connor
1c97ba1495 Garden collaboration (small part of community gardens) (#3862) 
* Add collaboration model

* Permissions and garden show

* List by owner, or where I am a collaborator

* Add index

* Add permissions

* Typo

* Typo

* Add route

* Update schema

* Update schema

* Add CRUD

* Add CRUD

* Add CRUD

* Factory

* Add validations

* Rubocop

* Rubocop

* Rubocop

* Unique index

* Fix

* Make CI more fine grained for faster feedback

* Swap order

* Fix path, fail-fast

* Fix spec

* Remove 'significant drop in coverage' as not everything runs in one giant run

* Fix tests?
 2024-09-29 18:28:52 +09:30
Daniel O'Connor
57f1fd34c9 Update garden.rb 2024-07-02 23:08:29 +09:30
Daniel O'Connor
fa6df64221 Update garden.rb 2024-07-02 22:42:35 +09:30
Daniel O'Connor
3d524bb105 Update garden.rb 2024-07-02 17:37:17 +09:30
Daniel O'Connor
5be0153c74 Activities (#3646) 
* Implement activities

* Add activities to timeline

* Add factory

* Add coverage

* Fix misc issues

* Activities display

* Add activities to garden and plantings

* Add activities to garden and plantings

* Add planting

* Add to planting, harvest show

* More CRUD

* More CRUD

* index

* index

* Extract card view

* Permissions

* Add edit

* Remove workaround fro vs code

* Fix title

* CSV

* CSV

* Add RSS, ical

* Extend ical slightly

* Cleanup

* Rubocop

* Remove doubled form

* Change icon

* Fix short description

* Add menus

* Put homepage widget in

* Add activity icon - MIT licenced - https://www.svgrepo.com/svg/336823/plan

* Naming

* Missing files

* Revert VS Code lag induced change

* Update app/views/home/_harvests.html.haml

* Update activities_controller.rb

* Update activities_controller.rb

* Update app/controllers/activities_controller.rb

* Update index.html.haml

* Apply suggestions from code review

* Apply suggestions from code review

* Typo

* Translation

* Apply suggestions from code review

* Update app/views/plantings/index.ics.erb

* Update app/models/activity.rb

* Update plantings_spec.rb

* Update plantings_spec.rb

* We are now rendering an extra event, so check the next one for the old behaviour
 2024-03-10 11:36:24 +10:30
Daniel O'Connor
8593d2dfd9 Add rake task for clean up of old content (#3644) 2024-02-18 18:43:14 +10:30
Brenda Wallace
9dbf8b7c8f New robocops 2020-08-26 12:36:58 +12:00
codefactor-io
4ff95fbac9 [CodeFactor] Apply fixes 2020-01-21 22:26:08 +13:00
Brenda Wallace
5d8d159cc9 Update app/models/garden.rb 2020-01-12 10:20:21 +13:00
codefactor-io
1882c75941 [CodeFactor] Apply fixes 2019-12-20 20:37:33 +00:00
Brenda Wallace
cae9fffea6 Index crop as well on photo changes 2019-12-21 09:36:52 +13:00
codefactor-io
e8760f9c38 [CodeFactor] Apply fixes 2019-12-20 03:33:23 +00:00
Brenda Wallace
04fd1a343a Rubocop update (#2334) 
* Update rubocop config

* Rubocop update - for rubocop 0.77

* [CodeFactor] Apply fixes

* rubocop fixes

* [CodeFactor] Apply fixes to commit 2826c2e
 2019-12-16 22:35:33 +13:00
Brenda Wallace
09a70c4742 Predict month of harvest on perennials 2019-11-23 22:21:36 +13:00
Brenda Wallace
b8b579a5ba rubycop fix up 2019-11-11 17:45:37 +13:00
codefactor-io
e0ea039347 [CodeFactor] Apply fixes to commit a651f07 2019-11-11 04:42:30 +00:00
Brenda Wallace
a651f079d8 Simplify garden.name validation regexp 2019-11-11 17:41:46 +13:00
Brenda Wallace
777408a6dc Merge branch 'dev' into UTFGardenNames 2019-08-29 13:53:04 +12:00
Brenda Wallace
86540c3352 Removed feature plantings code and spec 
because it's not used
 2019-08-10 10:52:49 +12:00
Brenda Wallace
67ce5265b4 Migrate from paranoia to discard 
closes #1995
 2019-07-21 16:59:06 +12:00
Brenda Wallace
7d9cbe9bf7 Merge branch 'dev' into UTFGardenNames 2019-07-21 10:14:03 +12:00
Brenda Wallace
d8df4338a7 DRY garden model - get default photo from photo_capable concern 2019-07-15 11:58:46 +00:00
Brenda Wallace
5e7445f770 Merge branch 'dev' into UTFGardenNames 2019-07-04 10:56:46 +12:00
Brenda Wallace
73f2fd2323 fix another deprecation warning about rails 6 2019-06-26 09:07:03 +12:00
Brenda Wallace
e029425785 Lint 2019-05-13 07:58:05 +12:00
Brenda Wallace
7b56c7a6ab Merge branch 'dev' into UTFGardenNames 2019-04-20 20:17:52 +12:00
Brenda Wallace
ccb69c5f7d Style/lint tidy up models 2019-04-08 21:59:26 +12:00
Brenda Wallace
f3ae1a8ec3 Fix dangerous sql warning 2019-04-08 21:39:20 +12:00
Brenda Wallace
1e0f308db2 Merge branch 'dev' into UTFGardenNames 2019-03-26 22:43:56 +13:00
Brenda Wallace
55f6636da5 change "required" to "optional" 2019-03-26 22:06:41 +13:00
Brenda Wallace
721a8694a0 Removing plots 2019-03-26 21:09:26 +13:00
Brenda Wallace
5395aefa66 Rename containers to garden types 2019-03-26 20:56:11 +13:00
Brenda Wallace
8c03e3f4ab Merge branch 'dev' into bb-track-types-of-gardens 2019-01-30 16:45:14 +13:00
Brandon Baker
a00ed5a176 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-08 12:03:39 -05:00
Brenda Wallace
ffb87a4432 Validators of garden name uniquness, and slug name 2019-01-06 08:45:42 +13:00
Brenda Wallace
5a73f57454 Merge branch 'dev' into UTFGardenNames 2019-01-03 08:46:15 +13:00
Brenda Wallace
7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brandon Baker
45ba5ff48a creates containers, plots, and associations among gardens, plots, and containers 2018-11-29 10:54:04 -07:00
Brenda Wallace
de2175ce16 More inverse relationships defined 2018-10-16 13:20:03 +13:00
jenkr55
9e182b07aa Dont allow any kind of newline 2018-05-28 12:46:08 -05:00
jenkr55
f67e8ceb95 Dont allow newlines 2018-05-28 12:29:44 -05:00
jenkr55
a973485c4b Allow ascii 2018-05-28 12:04:44 -05:00
jenkr55
f1a4bd19aa New slug regex 2018-05-27 13:06:32 -05:00
jenkr55
2f5fa635c8 Validate for non-blank garden name 2018-05-20 14:57:57 -05:00
jenkr55
303e259fd4 Dont allow nil or blank names 2018-05-20 14:56:11 -05:00
jenkr55
3b5c953c57 Remove regex not letting utf-8 garden names save 2018-05-20 13:34:38 -05:00
Brenda Wallace
f8a404a88b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/crop.rb
	app/models/forum.rb
	app/models/photo.rb
	app/models/planting.rb
	app/models/seed.rb
	db/schema.rb
	spec/models/garden_spec.rb
	spec/models/planting_spec.rb
 2018-04-28 21:25:06 +12:00
Brenda Wallace
a00237dfcb Style fixes after rubocop upgrade 2018-04-02 15:48:16 +12:00
Brenda Wallace
e3bb43477b Adding counter caches and ownable concern 2018-04-02 10:13:19 +12:00