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

204 Commits

Author SHA1 Message Date
Daniel O'Connor
488e402a3a Adjust copy of activities and prompts (#4260) 
* Adjust copy

* Adjust copy

* Move repeat prompt

* Improve prompts

* Clean up schema

* Fix spec
 2025-09-21 14:58:13 +09:30
Daniel O'Connor
c189e3b01a Merge pull request #4062 from Growstuff/feature/planting-rating 
Add overall_rating to Plantings
 2025-09-01 23:56:13 +09:30
google-labs-jules[bot]
ba6ec689c5 Merge pull request #4150 from Growstuff/feature/failed-plantings 
Add failed status to plantings
 2025-08-27 23:42:53 +09:30
Daniel O'Connor
2484bd39ed Render where a planting is in card view (#3882) 
* Render where a planting is in card view

* Update app/assets/stylesheets/_plantings.scss
 2024-10-13 14:25:46 +10: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
c28b2c0c38 Likes: Add capability to Activities, Plantings, Harvests (#3805) 
* Ability to like activities

* Ability to like activities

* Add likeable everywhere

* Refactor

* Remove extra newline

* Typo

* Use classes, not IDs

* Explicitly wait for ajax

* Fix tests

* Move likes under owner

* Add separation

* Move harvest likes near actions

* Rearrange harvests

* Render likes under owner

* Make harvest consistent with other views

* Move planting detail into header

* Move detail into header

* Move detail into header

* Revert

* Fix header

* Move likes into jumotrons

* Fix name

* Change all actions to be after likes and a span

* Cleanup

* Cleanup

* Cleanup

* Cleanup

* i18n and accessibility

* Fix name

* Temporarily make ack into a div

* Update app/views/photos/_actions.html.haml
 2024-07-24 17:07:56 +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
b24b9f82e6 Rubocop - auto corrections 2022-11-06 16:34:36 +10:30
Brenda
5573fbfbb6 foreign key declarations not needed anymore 2020-08-26 12:36:58 +12:00
Martina Simicic
10008ca30d Removing method since it is defined in predict planting 2020-02-04 10:50:00 +13:00
Brenda Wallace
fc1bd1893c Added perennial to plantings 2020-02-03 15:06:45 +13:00
codefactor-io
34ddf8e98f [CodeFactor] Apply fixes 2020-01-21 13:12:28 +13:00
Brenda Wallace
cd344c2605 Fix error when no latitude or longitude 2020-01-17 18:00:45 +13:00
Brenda Wallace
38c7bdd7c2 likes count and sorted es search data config 2019-12-30 09:51:10 +13:00
Brenda Wallace
ace0977c75 plantings view using object instead of hash 2019-12-25 16:18:34 +13:00
Brenda Wallace
39d208dec1 Rename the search concens 2019-12-25 14:26:50 +13:00
codefactor-io
e8760f9c38 [CodeFactor] Apply fixes 2019-12-20 03:33:23 +00:00
Brenda Wallace
38e36c4a2c Merge remote-tracking branch 'upstream/dev' into cache/harvests 
Conflicts:
	.rubocop_todo.yml
	app/controllers/likes_controller.rb
	app/models/concerns/crop_search.rb
	app/services/crop_search_service.rb
 2019-12-19 10:28:17 +13: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
b343f89997 Photos indexed in elastic search 2019-12-11 11:42:34 +13:00
Brenda Wallace
5afe3e1c1e Pulling plantings from elastic search too 2019-12-10 13:36:23 +13:00
Brenda Wallace
554adf234e Allow chaining on Harvest predictions method returns 2019-11-24 10:30:56 +13:00
Brenda Wallace
0bb4dbec10 Display of planting neighbours 2019-11-24 10:15:11 +13:00
Brenda Wallace
70565c7202 show neighbouring plantings same crop 
also helps see where the prediction came from
 2019-11-24 09:43:25 +13:00
Brenda Wallace
09a70c4742 Predict month of harvest on perennials 2019-11-23 22:21:36 +13:00
Brenda Wallace
df5b0499e4 Update spec for api resource 2019-11-16 13:05:40 +13:00
Brenda Wallace
535ddcdcff Added plantings to places map 2019-11-16 12:16: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
Brenda Wallace
bf77f31777 don't show progress bars on annuals 2019-07-28 14:28:08 +12:00
Brenda Wallace
17e3998261 Move from tables to lists 2019-07-23 11:27:53 +12:00
Brenda Wallace
67ce5265b4 Migrate from paranoia to discard 
closes #1995
 2019-07-21 16:59:06 +12:00
Brenda Wallace
e5e54d651b Remove duplicate and unused photo methods 2019-07-15 11:58:46 +00:00
Brenda Wallace
eb628635e2 fix logic on planting.active 2019-06-08 15:39:14 +12:00
Brenda Wallace
06650a790d active scopes on plantings and seeds 2019-06-07 20:36:02 +12:00
Brenda Wallace
6c41b52cb1 Fix - planting.active scope to not show finished 2019-06-03 23:01:57 +12:00
Brenda Wallace
e029425785 Lint 2019-05-13 07:58:05 +12:00
Brenda Wallace
ccb69c5f7d Style/lint tidy up models 2019-04-08 21:59:26 +12:00
Brenda Wallace
55f6636da5 change "required" to "optional" 2019-03-26 22:06:41 +13:00
Brenda Wallace
106497c841 Rubocop fix ups 2019-01-06 08:45:42 +13:00
Brenda Wallace
e313a7160f Active plantings option on plantings#index 2019-01-06 08:45:42 +13:00
Brenda Wallace
7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brenda Wallace
de2175ce16 More inverse relationships defined 2018-10-16 13:20:03 +13:00
Brenda Wallace
3ad048b7e8 Fixed linter issue, empty line after guard clause 2018-09-13 23:10:43 +12:00
Brenda Wallace
a590b89302 Photos in spec needs to have same owner as item they link to 2018-06-04 15:29:59 +12: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
f8b76e9c84 Reducing complexity in planting predictions 2018-04-21 11:12:25 +12:00
Brenda Wallace
b7d4781aef Split the planting&harvest predictions into files 2018-04-21 10:18:18 +12:00
Brenda Wallace
3ed90b8d04 Moving predictions to own file 2018-04-19 13:44:39 +12:00
Brenda Wallace
d1603a6e7f Badges showing finished and harvest status 2018-04-16 21:06:20 +12:00
Brenda Wallace
a00237dfcb Style fixes after rubocop upgrade 2018-04-02 15:48:16 +12:00