mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-02 14:37:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,795 Commits 56 Branches 76 Tags
Style/SoleNestedConditional
Commit Graph

181 Commits

Author SHA1 Message Date
Daniel O'Connor
4ed7ea32b5 Merge branch 'dev' into ruby32 2024-07-13 13:04:28 +09:30
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
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
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
56348b1a8e Merge branch 'dev' into ruby32 2024-01-21 19:06: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
78eaf0b4c9 Address minor accessibility issues: Image elements do not have [alt] attributes (#3561) 
* Add alt tags

* Update app/views/members/_tiny.haml

* Update app/views/home/_plantings.html.haml

* Use crop_name as this is a searchkick record
 2024-01-17 22:02:09 +10:30
Daniel O'Connor
2bfd077190 Fix deprecation warning by explicitly calling to_fs 2023-08-20 02:23:01 +00:00
Daniel O'Connor
67857f23d6 Update _summary.html.haml 2023-08-09 23:55:55 +09:30
Daniel O'Connor
e557695b37 Update _summary.html.haml 
Fix issue #3410
 2023-08-09 23:52:24 +09:30
Daniel O'Connor
955dbcba08 Fix the layout of the tables (#3194) 2023-03-13 13:00:50 +10:30
Daniel O'Connor
06c5e4b8e8 to_s 2022-11-07 23:20:49 +10:30
Brenda
821ddd90cb fix specs 2020-02-10 14:21:03 +13:00
Brenda
9dfd6dbc73 Tidy up index pages 2020-02-10 14:21:03 +13:00
Brenda Wallace
019d94f1cb Show the default photo for social media 2020-02-04 11:52:13 +13:00
Brenda Wallace
6017c04b5f don't check if post is liked by member, unless the member is signed in 2020-01-01 15:54:52 +13:00
Brenda Wallace
6e81f2966d fixed colouring of likes button 2020-01-01 09:24:47 +13:00
Brenda Wallace
54778d9884 Likes popuplating from elastic, no more extra look ups 2020-01-01 08:38:27 +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
57ca80f0eb line up display of posts 2019-07-21 20:26:04 +12:00
Brenda Wallace
c9f9315d8d specs for liking photos from photos#show 2019-07-12 11:29:47 +12:00
Brenda Wallace
9686305857 The like icons are now the buttons 2019-07-12 10:13:24 +12:00
Brenda Wallace
a87248a43e DRY up detecting if photo/post already liked 2019-07-12 09:42:45 +12:00
Brenda Wallace
af0d84d9f1 Updating likes js code 2019-07-12 09:28:45 +12:00
Brenda Wallace
61047df429 Merge branch 'dev' into following-page 2019-07-08 20:02:47 +12:00
Brenda Wallace
253c0cb939 Merge branch 'dev' into following-page 2019-07-08 16:44:03 +12:00
Daniel O'Connor
cf0d648b31 Merge branch 'dev' into post-photos 2019-07-08 13:45:26 +09:30
Brenda Wallace
bbd43f57bc Prevent post images going off screen 2019-07-08 04:08:58 +00:00
Brenda Wallace
5cef4d728c Adding photos directly to a post 2019-07-08 13:20:57 +12:00
Brenda Wallace
3859122fa5 tidy 2019-07-08 10:04:08 +12:00
Brenda Wallace
c61f13625c Moved html into haml instead of html_safe in helper 2019-07-08 09:52:33 +12:00
Brenda Wallace
1d98668ac4 scss lint 2019-06-26 16:21:59 +12:00
Brenda Wallace
b176ba59dc removed byline method 
avoiding use of htmlseafe
 2019-06-26 11:21:40 +12:00
Brenda Wallace
c540bd88fc add back a div the specs look for 2019-06-26 10:51:10 +12:00
Brenda Wallace
7f00a5063b view spec updates 2019-06-25 21:06:32 +12:00
Brenda Wallace
8eb299c146 only show actions menu if you can do the actions 2019-06-14 16:36:04 +12:00
Brenda Wallace
e0b9acc27d Tidier link to member posts 2019-06-14 11:27:43 +12:00
Brenda Wallace
6086a1aaa5 strip tags on subjects 2019-06-14 11:26:29 +12:00
Brenda Wallace
c0b2a8431b Reinstate likes 2019-06-14 11:01:16 +12:00
Brenda Wallace
878c692b27 posts display 2019-06-12 14:48:00 +12:00
Brenda Wallace
fad43f18c8 missing titles, icons, and breadcrumps 2019-06-05 22:46:41 +12:00
Brenda Wallace
70afa97b80 only shrink the member card on the homepage 2019-06-05 08:35:39 +12:00
Brenda Wallace
75b04ffe04 attempting to make posts appear nice on mobile 2019-06-04 20:02:28 +12:00
Brenda Wallace
ac52fb743c tidy post display on small screens 2019-05-25 17:02:16 +12:00
Brenda Wallace
1e03d15434 Move post actions to own file 2019-05-25 15:18:58 +12:00
Brenda Wallace
3ec0294565 post body 2019-05-24 20:47:18 +12:00
Brenda Wallace
95ed451c21 post header 2019-05-24 20:46:54 +12:00
Brenda Wallace
334037ed1e form tidy 2019-05-24 20:43:00 +12:00
Brenda Wallace
20fbec96d4 Tidying up forms 2019-05-24 20:14:24 +12:00