Daniel O'Connor
13e8e2747b
Merge branch 'dev' into Style/SoleNestedConditional
2024-07-13 15:14:57 +09:30
Daniel O'Connor
d542326047
Ruby 3.2: Rubocop - Rails/FilePath ( #3783 )
...
* Rails/FilePath
2024-07-13 15:13:56 +09:30
Daniel O'Connor
1176d18918
Ruby 3.2: Rubocop - Fix Lint/symbol conversion ( #3781 )
...
* Lint/SymbolConversion: Unnecessary symbol conversion; use error: instead.
2024-07-13 15:11:49 +09:30
Daniel O'Connor
de6241b728
Style/SoleNestedConditional
2024-07-13 05:19:31 +00:00
Daniel O'Connor
000f4979db
Trial Ruby32 ( #3418 )
...
* Ruby 3.2/Bundler 2.4
* Fix creation
* Upgrade to js-routes 2. Put all js routes into a global namespace.
* Remove js-routes
* Remove
* Adjust ownership
* Appease codeclimate for the nth time
* Fix deprecation warning by explicitly calling to_fs
* Fix deprecation warning by explicitly calling to_fs
* Fix deprecation warning by explicitly calling to_fs
* Swap to will paginate successor for bootstrap
* Update app/views/members/show.html.haml
* Update app/views/plantings/index.rss.haml
* Update .env
* Update .devcontainer/.env
* Fix spec
* Update spec
* Fix spec
* Pin to 2.4.22
* 3 space indent
* Regenerate
* Update rubocop
2024-07-13 14:45:33 +09:30
Daniel O'Connor
4ed7ea32b5
Merge branch 'dev' into ruby32
2024-07-13 13:04:28 +09:30
Daniel O'Connor
57f1fd34c9
Update garden.rb
2024-07-02 23:08:29 +09:30
Daniel O'Connor
067fb1671b
Update predict_planting.rb
2024-07-02 23:07:48 +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
domthor
88ad6d8de9
fix space in "function ()"
2024-04-26 18:08:03 -04:00
domthor
c5df760ce4
change double quotes to single quotes
2024-04-26 18:04:13 -04:00
domthor
d9500eff16
fix let in js
2024-04-26 17:59:34 -04:00
domthor
31fafe6a74
fix unexpected function() token
2024-04-26 17:57:37 -04:00
domthor
f87b83bdd1
fix const error
2024-04-26 17:56:06 -04:00
domthor
88e458077b
fix unexpected token linting error
2024-04-26 17:54:12 -04:00
domthor
a713d2936c
fix linting errors
2024-04-26 17:48:09 -04:00
domthor
9fd7e145b5
Added javascript to fix edit profile tab issue. Fixes #497
2024-04-26 21:35:34 +00:00
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
