mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-04-11 18:38:50 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,698 Commits 54 Branches 77 Tags
release59
Commit Graph

4305 Commits

Author SHA1 Message Date
Daniel O'Connor
e435d21bd9 Merge branch 'dev' into add-noseed-ux 2024-04-09 22:17:31 +09:30
Daniel O'Connor
559e272347 Merge branch 'dev' into add-noseed-ux 2024-04-09 21:51:14 +09:30
Daniel O'Connor
e334fc449e Merge branch 'dev' into trade-seeds 2024-04-09 21:51:04 +09:30
Bennett Zink
9a0a5935d2 change seed wording 2024-04-07 11:06:43 -04:00
Bennett Zink
41446f281e change plantings wording 2024-04-07 11:06:09 -04:00
Bennett Zink
d149e25aec change harvest wording 
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
 2024-04-07 11:05:35 -04:00
Bennett Zink
637aba85bf Merge branch 'dev' into add-noseed-ux 2024-04-07 11:04:21 -04:00
Daniel O'Connor
b213647a43 Merge branch 'dev' into trade-seeds 2024-04-07 22:17:37 +09:30
Daniel O'Connor
ded6aca4b1 Merge branch 'dev' into footer 2024-04-07 22:17:30 +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
7f16f51a47 Fix https://github.com/Growstuff/growstuff/issues/3632 2024-04-07 12:45:50 +00:00
Daniel O'Connor
f23289ec6e Improve header, footer 2024-04-07 12:31:07 +00:00
Daniel O'Connor
725c146e2d Improve profile page on mobile (#3711) 
* Avoid showing when there are 0 things

* Styling

* Styling

* Collapse stats by default on small screens

* Add ARIA skip links

* Refactoring out of partial, and use CSS to set order on mobile

* Remove partial

* Update expectations

* Fix visual appearance on Ban button on your own profile for admins

* Typo

* Stale expectation
 2024-04-07 21:43:52 +09:30
Daniel O'Connor
e3bb749e6d Fix activities (#3710) 
* Clean up activities display

* Clean up activities display

* Fix display
 2024-04-07 20:10:29 +09:30
Daniel O'Connor
dea254c658 Merge branch 'dev' into add-noseed-ux 2024-04-07 17:54:56 +09:30
bennett-zink
c408687e36 added ux when none logged #3618 2024-04-06 20:08:31 +00:00
bennett-zink
b5bab8bd0b fixed Bug: 404 on "add a bio" #3667 2024-04-04 23:41:41 +00:00
Daniel O'Connor
eb6f032272 Attempt to fix inbox (#3687) 
* Move delete button

* Swap for different displays

* Swap for different displays

* Reorganise

* Reorganise

* Update spec

* Update spec
 2024-03-24 22:19:30 +10:30
Daniel O'Connor
c7de9a4d91 Improve readibility 2024-03-24 09:50:56 +00:00
Daniel O'Connor
7c6508e387 Overflow of location badges (#3685) 
* Swap to CSS for truncation

* Adjust styling on mobile

* Contain more

* Contain more

* All badges clip

* Adjust badges to truncate again

* Adjust badges to truncate again

* Apply suggestions from code review
 2024-03-24 20:16:56 +10:30
Daniel O'Connor
84809d0490 Merge pull request #3681 from Growstuff/bs-5-minor 
Add bootstrap 5 fixes which weren't in the activities branch
 2024-03-23 16:56:05 +10:30
Daniel O'Connor
da37fd854d Add bootstrap 5 fixes which weren't in the activities branch 2024-03-23 05:49:06 +00:00
Daniel O'Connor
47ad915ab3 Remove sort form (#3679) 
* Remove sort form

* Remove stale test
 2024-03-17 21:56:36 +10:30
Daniel O'Connor
d30854dd51 Merge pull request #3677 from Growstuff/labelling 
Use correct translation for buttons
 2024-03-12 00:52:14 +10:30
Daniel O'Connor
514b90c93a Fix #3676 2024-03-11 12:23:49 +00:00
Awesome Code
4d25de4663 Auto corrected by following Lint Javascript unicorn/prefer-prototype-methods 2024-03-10 01:19:43 +00:00
Daniel O'Connor
7d63234841 Upgrade to bootstrap 5 (#3605) 
* Upgrade boostrap

* Remove deprecated bootstrap toggles

* Migrate other details

* Avoid accidentally including bootstrap twice

* Avoid accidentally including bootstrap twice

* Avoid accidentally including bootstrap twice

* Fix spec

* Fix spec, where the size of the screen has gone to a partial breakpoint/you can't click on your own name in tablet view

* Fix spec

* Cleanup

* Cleanup
 2024-03-10 11:49:22 +10: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
cb670191d6 Merge pull request #3645 from Growstuff/planning 
Planning future plantings - Minor UX changes
 2024-03-01 06:27:32 +10:30
Daniel O'Connor
8593d2dfd9 Add rake task for clean up of old content (#3644) 2024-02-18 18:43:14 +10:30
Daniel O'Connor
e486db26db Fix icons 2024-02-18 03:40:27 +00:00
Daniel O'Connor
c0bcafdf51 Deal with future plantings 2024-02-18 03:33:34 +00:00
Daniel O'Connor
db71544a76 Explain you can plan out what you want to plant 2024-02-18 03:27:57 +00:00
Daniel O'Connor
f010320e51 Explain you can plan out what you want to plant 2024-02-18 03:27:47 +00:00
Daniel O'Connor
7b68e51328 Explain you can plan out what you want to plant 2024-02-18 03:26:46 +00:00
Daniel O'Connor
42e1dbb4da Rearrange member profile so that current progress is reported first, harvests second 2024-02-18 03:23:30 +00:00
Daniel O'Connor
1d1eddb228 Merge pull request #3625 from Growstuff/issue/3404 
Flex into column mode on medium screens
 2024-02-04 16:16:21 +10:30
Daniel O'Connor
c0dbe9616a Flex into column mode on medium screens 2024-02-04 05:37:12 +00:00
Daniel O'Connor
e2bdbeff23 Parse date 2024-02-04 05:18:57 +00:00
Daniel O'Connor
50ba0f08b1 Fix Plantings > CSV output (#3616) 
* Fix crash

* Add test coverage and index more

* Fix test
 2024-02-04 15:09:30 +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
3738d7cc21 Seeds > Photos - Fix tests not running and fix tests (#3621) 
* Rename, so it runs in CI

* Fix specs slightly

* Fix tests
 2024-02-04 15:05:43 +10:30
Daniel O'Connor
6102f0629b Revert 140fe7a (#3612) 
* Revert 140fe7a

* Split rendering behaviour
 2024-02-04 10:25:41 +10:30
Daniel O'Connor
fb86448061 HAML 6 (#3607) 
* 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

* Apparently the escaped filter doesn't work with interpolation. Swap to our implementation
 2024-02-03 17:33:39 +10:30
Daniel O'Connor
ad4a6e17e2 iCalendar feed of plantings (#3588) 
* Register mime type

* Add rough first pass

* Index predictions, and add links

* Trailing space

* Fix implementation

* Fix names, make public

* Fix names, make public

* Fix

* Fix tyyos

* Add date

* If there are no predictions, keep growing

* Add a todo

* Fix factories

* Specs
 2024-01-27 00:38:33 +10:30
Brenda Wallace
30626859c3 Auto corrected by following Format Css Code (#3594) 
Co-authored-by: Awesome Code <team@xinminlabs.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
 2024-01-26 23:01:55 +10:30
Daniel O'Connor
140fe7a087 Bump searchkick, elasticsearch (#3602) 
* Bump searchkick

* Bump to 7.0.0

* Fix

* Fix crop search
 2024-01-26 23:01:39 +10:30
Daniel O'Connor
12ff09ad51 Add Accessibility assertions to rspec, replacing accessbility-lint + fixes (#3573) 
* Add dep

* Add tests around accessibility

* Add examples in a few places

* Try to fix screenshots

* Remove redundant role

* Adjust rules, colors, etc so tests pass

* Update app/assets/stylesheets/overrides.scss

* Wrap in label

* Omit rule, which is failing with a false positive

* Update index.haml

* Update _blurb.html.haml
 2024-01-22 22:09:27 +10:30
Daniel O'Connor
196b8078e6 Posts - Ensure responsive (#3584) 
* Fix model validations and responsiveness

* Fix model validations and responsiveness

* Update app/models/post.rb
 2024-01-21 16:05:14 +10:30
Daniel O'Connor
91f8c2e0b3 Harvests - Compare dates to dates when determing how long ago something was (#3585) 
* Compare dates to dates

* Adjust timeline display to check if Date or Time
 2024-01-21 15:20:32 +10:30