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

78 Commits

Author SHA1 Message Date
Daniel O'Connor
bd4dd3cc45 Rubocop 2025-09-20 10:18:24 +00:00
Daniel O'Connor
b3ba05d834 Fix crash on adding Flickr photo (#4198) 
* Update photo.rb

* Update photo.rb

* Update app/models/photo.rb

* Update app/models/photo.rb
 2025-09-02 02:17:28 +09:30
google-labs-jules[bot]
8564ec7a7c Add comments to photos (#4130) 
* Add comments to photos

Extend the photo show page to support comments by logged in users.

- Make the Comment model polymorphic.
- Update the Photo and Post models to have comments.
- Update the comments controller to handle the polymorphic association.
- Update the photo show page to display comments and a comment form.
- Create a reusable comments partial.

* Add migration

* Fix tests

* Fix tests

* Slightly fix tests

* Fix variables

* Add field

* Refactor slightly

* Refactor slightly

* Refactor slightly

* Refactor

* Photos respond to this as well

* Refactor to polymorphic_url

* Rename

* Wrong relationship

* Refactor and fix tests

* Fix relationships

* Fix rendering

* Fix tests

* Fix model tests

* Fix test

* Fix test

* Fix test

* Fix test

* Fix controller spec

* Fix view tests

---------

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 21:10:16 +09:30
Daniel O'Connor
26189855cc Reduce visual impact of hover, and make snappier (#3712) 
* Reduce visual impact of hover, and make snappier

* Better seed

* Improve seeding

* Fix codespaces login
 2024-04-07 22:17:16 +09:30
Daniel O'Connor
1f0cfa9b6c Add GBIF to our scientific names, so that our crops can associate creative commons photos (#3559) 
* Add GBIF cient

* Add lookup

* Add autocomplete for GBIF lookup

* Add extra detail to scientific names

* Autocomplete

* Add routes

* Rmeove mapping

* Add autocomplete

* Update GBIF data on save

* db/schema

* Style

* Extract service

* Add concern

* Add concern

* Save photos

* Initial coverage

* Coverage

* Add coverage

* Shut up, codeclimate

* Shut up, codeclimate

* Unused

* Shut up, codeclimate

* Apply suggestions from code review

* Remove localhost

* Fix rubocop

* Fix rubocop

* Add UI links

* Add rake

* Indent

* Update Gemfile.lock

* Update lib/tasks/gbif.rake

* Update app/views/crops/_scientific_names.html.haml

* Rubocop

* Expand edit photo form

* Fix error

* Add model validations

* Skip photos without backlinks

* Fix tests

* Add photo words

* Allow blank

* Rubocop and handle invalid legacy data

* Apply suggestions from code review

* Update lib/tasks/gbif.rake
 2024-01-21 13:22:25 +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
Brenda Wallace
9fa3f36436 BUGFUX: member slug needed on photos, to make link 2020-03-02 15:01:34 +13:00
codefactor-io
4ff95fbac9 [CodeFactor] Apply fixes 2020-01-21 22:26:08 +13:00
Brenda Wallace
ae26965144 Merge remote-tracking branch 'upstream/master' into dev 2020-01-14 10:37:13 +13:00
Brenda
aab345cf09 Adding more counter caches 2020-01-10 16:50:52 +13:00
Brenda
7257b2ada1 Update with frozen literals 2020-01-10 16:50:52 +13:00
codefactor-io
7e30b6b6e0 [CodeFactor] Apply fixes 2020-01-03 11:28:51 +00:00
Brenda Wallace
676345815c tests for photos searching 2019-12-31 21:02:38 +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
b0c8b11246 📝 Inline editing and display tidy ups (#2200) 
* Inline editing and display tidy ups
 2019-10-08 11:06:53 +13: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
66a3b2c52b If we delete a photo, delete the associations records 2019-09-27 08:13:07 +12:00
Brenda Wallace
b7321ed46f Add source to photos 2019-09-20 22:26:39 +12:00
Brenda Wallace
67ce5265b4 Migrate from paranoia to discard 
closes #1995
 2019-07-21 16:59:06 +12:00
Brenda Wallace
e0e10c29dc Renaming photographings to photo associations 
now it matches the name of its controller, and it is clearer to understand
 2019-07-13 16:13:37 +12:00
Brenda Wallace
6fc9a858a9 Merge branch 'dev' into likeable-photos 2019-07-08 20:03:41 +12:00
Brenda Wallace
cbed8cc259 likes for photos 2019-07-08 20:00:55 +12:00
Brenda Wallace
5cef4d728c Adding photos directly to a post 2019-07-08 13:20:57 +12:00
Brenda Wallace
92ae1a7bd2 Merge branch 'dev' into upgrade/bootstrap 2019-06-13 20:52:25 +12:00
Daniel O'Connor
949c57bf7d Line length 2019-06-13 07:58:52 +00:00
Brenda Wallace
e029425785 Lint 2019-05-13 07:58:05 +12:00
Brenda Wallace
6167af700d Rubocop lint tidy 2019-02-05 12:37:09 +13:00
Brenda Wallace
9c4e649c5d Split up photos on crops#show by model type 2019-02-05 12:31:59 +13:00
Brenda Wallace
f1ad9cc3c7 Rubocop fix up 2019-02-04 20:55:04 +13:00
Brenda Wallace
ab880514c2 Further tidy of photo display 2019-02-04 20:43:52 +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
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
fa32537c3b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	.rubocop_todo.yml
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/members.js.erb
	app/assets/stylesheets/predictions.sass
	app/controllers/crops_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/plantings_controller.rb
	app/models/account.rb
	app/models/account_type.rb
	app/models/member.rb
	app/models/order.rb
	app/models/order_item.rb
	app/models/product.rb
	app/views/gardens/show.html.haml
	app/views/layouts/application.html.haml
	config/initializers/assets.rb
	config/routes.rb
	db/schema.rb
	package-lock.json
	spec/controllers/account_types_controller_spec.rb
	spec/controllers/admin/orders_controller_spec.rb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/gardens_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/member_controller_spec.rb
	spec/controllers/order_items_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/controllers/photo_associations_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/controllers/seeds_controller_spec.rb
	spec/controllers/shop_controller_spec.rb
	spec/features/crops/crop_detail_page_spec.rb
	spec/models/member_spec.rb
	spec/models/post_spec.rb
	spec/views/crops/_planting_advice.html.haml_spec.rb
	spec/views/home/_crops.html.haml_spec.rb
	spec/views/orders/show.html.haml_spec.rb
	spec/views/posts/show.html.haml_spec.rb
	spec/views/shop/index_spec.rb
 2018-04-02 10:59:13 +12:00
Brenda Wallace
e3bb43477b Adding counter caches and ownable concern 2018-04-02 10:13:19 +12:00
Brenda Wallace
88da0da616 Re-fetches from flickr 2018-02-05 12:52:59 +13:00
Meir Taffel
a69afd87e7 Add date_taken to photos 2018-02-05 12:52:59 +13:00
Brenda Wallace
b6c9b13d4d Models inherit from application record 2018-01-03 17:16:14 +13:00
Brenda Wallace
ff57176d60 Simplified the photos controller a bit 2017-11-29 22:13:03 +13:00
Brenda Wallace
12700d6268 Added polymorphic relationship to photos 2017-11-29 21:41:22 +13:00
Brenda Wallace
7719d1f896 Remote default ordering scopes, and clean up models 2017-11-29 20:59:37 +13:00
Brenda Wallace
17fd6f61a5 Added polymorphic relationship to photos 2017-11-29 20:14:27 +13:00
Brenda Wallace
8076e58a97 Owner must exist so we can see photos 2017-05-28 19:32:34 +12:00