mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-04-12 02:50:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,795 Commits 54 Branches 77 Tags
Style/SoleNestedConditional
Commit Graph

303 Commits

Author SHA1 Message Date
Daniel O'Connor
514b90c93a Fix #3676 2024-03-11 12:23:49 +00:00
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
49284eb169 Fix haml preview (#3610) 
* HAML

* rewrite

* Fix specs - but likely still wrong

* Return temple

* Trailing line

* Fix specs

* This was rearranged, apparently.

* Fix tests

* Retain escaping

* Fix specs

* Rubocop

* Attempt to fix rendering

* Fix output

* Move away from filter

* Move away from filter

* Fix spec

* Fix specs

* Fix structure to avoid nested paragraph tags
 2024-02-04 15:08:18 +10:30
Daniel O'Connor
a118a95b54 Update icons_helper.rb 2024-01-17 18:12:58 +10:30
Daniel O'Connor
33af3bae65 Update icons_helper.rb to render alt tag 2024-01-17 18:10:48 +10:30
Daniel O'Connor
b24b9f82e6 Rubocop - auto corrections 2022-11-06 16:34:36 +10:30
Daniel O'Connor
ded1e66d53 DEPRECATION WARNING: Time#to_s(:number) is deprecated. Please use Time#to_fs(:number) instead 2022-11-06 16:29:26 +10:30
Brenda Wallace
64ce6ef886 Align end 2020-08-26 12:36:58 +12:00
Brenda Wallace
9dbf8b7c8f New robocops 2020-08-26 12:36:58 +12:00
Awesome Code
c764b0a28f Auto corrected by following Lint Ruby Lint/RedundantCopDisableDirective 2020-04-14 10:49:54 +12:00
Brenda Wallace
a864a018d5 Fix icon images 2020-03-02 12:27:57 +13:00
Brenda Wallace
f4acbaa89a Use pokemon for plant parts 2020-02-29 19:53:39 +13:00
Brenda
fd80fc98f1 use a default icon if no plant_part icon 2020-02-29 13:26:20 +13:00
Brenda Wallace
d0154a8b60 Fall back on planting icon when plant part icon does not exist 2020-02-29 12:34:28 +13:00
Brenda Wallace
b2ff247a31 Apply suggestions from code review 
Co-Authored-By: Martina  <922964+simicic@users.noreply.github.com>
 2020-02-29 09:36:05 +13:00
Brenda
9abb84ccba Harvesting modal form 2020-02-24 11:51:37 +13:00
Brenda Wallace
abecbab6c5 Tidy up mobile display on homepage, including member cards changes (#2417) 
* Tidy up mobile display on homepage, including member cards changes
 2020-02-09 22:38:12 +13:00
Brenda Wallace
019d94f1cb Show the default photo for social media 2020-02-04 11:52:13 +13:00
codefactor-io
34ddf8e98f [CodeFactor] Apply fixes 2020-01-21 13:12:28 +13:00
Brenda Wallace
c6988e2189 Re-instate the plantings quick actions 2020-01-05 21:31:51 +13:00
Brenda Wallace
b9e9ce1439 index seed.active into ES 2019-12-28 09:33:36 +13:00
Brenda Wallace
2d7951d85f Update buttons_helper.rb 2019-12-27 00:15:05 +13:00
Brenda Wallace
929374f77a rubocop renamed : Metrics/LineLength to : Layout/LineLength 2019-12-22 17:00:30 +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
607eae2a43 Small improvements to crops controller to reduce query count 2019-12-04 21:02:33 +13:00
Brenda
c42fb5df51 Tell default photo to expire in 1 hour 2019-12-04 21:02:33 +13:00
Brenda Wallace
d22fb68eee Cache photos 2019-12-04 20:59:56 +13:00
Brenda Wallace
fdf5a59ffd Reduce the number of queries to find if member has seed of this crop 2019-12-04 20:59:56 +13:00
Brenda
89072bdb74 Marked icons to be ignored by screen readers 2019-11-30 21:56:53 +13:00
Brenda Wallace
0823e971ed Tidy up indexes and add links to data/api 2019-11-18 10:23:07 +13:00
Brenda Wallace
b2e90cddc6 Merge branch 'dev' into weeks 2019-10-25 13:41:30 +13:00
André Aubin
a3fa774d84 Force ssl on gravatar-ultimate gem 2019-10-24 23:51:52 +00:00
Brenda Wallace
2d6d02d0b3 added in_weeks helper 2019-10-24 21:03:30 +13:00
Brenda Wallace
1a0e30491f Removed unused methods 2019-10-24 19:04:37 +13:00
Brenda Wallace
38713af603 plantings timeline with icons 2019-10-24 16:36:16 +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
12c1002dc6 Removing unused notifications code 2019-08-08 09:31:53 +12:00
Brenda Wallace
ba1c3a7159 add the notifications helper back 2019-08-07 16:20:10 +12:00
Brenda Wallace
01b53a0e69 continuing to replace notifications with conversations 2019-07-23 09:37:57 +12:00
Brenda Wallace
af0d84d9f1 Updating likes js code 2019-07-12 09:28:45 +12:00
Brenda Wallace
3e4a9f0292 Ebay link using https 2019-07-10 09:03:05 +00:00
Brenda Wallace
ec974cdfee Merge branch 'dev' into following-page 2019-07-09 00:31:32 +12:00
Brenda Wallace
6ad694cf30 Tidy up member edit 2019-07-08 21:56:37 +12:00
Brenda Wallace
253c0cb939 Merge branch 'dev' into following-page 2019-07-08 16:44:03 +12:00
Brenda Wallace
f7af2bf816 Higher res photo placeholder 2019-07-08 04:43:03 +00:00
Brenda Wallace
c61f13625c Moved html into haml instead of html_safe in helper 2019-07-08 09:52:33 +12:00
Brenda Wallace
1c50d9e50d rename blog_icon to post_icon 2019-07-08 09:42:06 +12:00
Brenda Wallace
81723d99d9 make comment icon match other icons 2019-07-08 09:36:47 +12:00