Commit graph

35853 commits

Author SHA1 Message Date
Hypolite Petovan
ed805d1af2
Merge pull request #12398 from MarekBenjamin/image-grid-fixes
Fixed image grid when exactly ONE portrait and ONE landscape is attached
2022-12-12 19:15:00 -05:00
Marek Bachmann
290b14a000 Fixed image grid when exactly ONE portrait and ONE landscape is attached 2022-12-13 00:39:39 +01:00
Hypolite Petovan
c38dcc2f41
Merge pull request #12334 from MarekBenjamin/new_image_presentation
Show Images in posts in an image grid
2022-12-12 17:24:40 -05:00
Marek Bachmann
8690b311a8 Moved image_grid.css content to global.css and use unique class names for imagegrid style classes, removed id for div 2022-12-12 22:58:50 +01:00
MarekBenjamin
86b9cef273
Update image_grid.css
Removed fall back to one column
2022-12-12 21:56:42 +01:00
MarekBenjamin
bc70bc23a4
Update image_grid.css 2022-12-12 21:45:57 +01:00
MarekBenjamin
c554af9c30
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-12 19:07:09 +01:00
Hypolite Petovan
94801986b6
Merge pull request #12397 from HankG/fix-photo-get-without-scale-arg
Fix photo get without scale arg
2022-12-12 13:01:03 -05:00
Hypolite Petovan
27c738f90f
Merge pull request #12395 from HankG/fix-photo-get-without-scale-arg
Fix Friendica Photo GET API endpoint to work without explicit scale term
2022-12-12 13:00:19 -05:00
Hank Grabowski
a8428264f0 Use is_int not intval to return Photo->createFromId back to original version 2022-12-12 12:38:45 -05:00
Hank Grabowski
4e5794c99d Update Friendica Photo API endpoint fix to pass null for scale when not applied 2022-12-12 12:37:01 -05:00
MarekBenjamin
d2b23d57e4
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-12 17:59:42 +01:00
Hank Grabowski
46607598f3 Fix Friendica Photo GET API endpoint to work without explicit scale term 2022-12-12 11:27:59 -05:00
Hypolite Petovan
d60c405390
Merge pull request #12393 from annando/api-permissions
API: Allow permissions for status posts
2022-12-12 10:20:28 -05:00
Michael Vogel
0209c39e0a
Update src/Module/Api/Twitter/Statuses/Update.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-12 15:51:14 +01:00
Hypolite Petovan
c8d4b73871
Merge pull request #12391 from annando/issue-12338
Issue 12338: Use redirect for "about" and "about/more"
2022-12-12 09:39:12 -05:00
Michael
7dfe517c77 Redirect in a different way 2022-12-12 11:24:20 +00:00
Michael
5312b23f03 Don't send the header 2022-12-12 03:13:24 +00:00
Michael
a2f386cd2f Transmit header before creating user list 2022-12-12 02:43:32 +00:00
Michael
cfd09663e7 Don't display pending requests 2022-12-12 02:33:57 +00:00
Michael
89efa73195 Fix tests 2022-12-11 22:56:56 +00:00
Michael
d05910a6e5 API: Allow permissions for status posts 2022-12-11 22:48:43 +00:00
Michael
ff5da9bc71 API: Use "contact" for own relations 2022-12-11 22:26:30 +00:00
MarekBenjamin
e4702ed464
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-11 22:25:47 +01:00
Hypolite Petovan
baf2f7565a
Merge pull request #12390 from annando/fixes
Only reshare the author's posts on `MIRROR_NATIVE_RESHARE`
2022-12-11 15:05:47 -05:00
Hypolite Petovan
0d95535137
Merge pull request #12389 from annando/fatal
Handle some fatal errors
2022-12-11 15:04:54 -05:00
Michael
afd1dba774 Issue 12338: Use redirect for "about" and "about/more" 2022-12-11 19:50:10 +00:00
Michael
2f3f41ed9c Merge remote-tracking branch 'origin/2022.12-rc' into fixes 2022-12-11 19:00:59 +00:00
Marek Bachmann
eb1cfd09a9 added more sophisticated column balancing logic for portraits and landscapes 2022-12-11 18:25:19 +01:00
MarekBenjamin
a5aa44f189
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-11 18:24:27 +01:00
Philipp
e72d17c3af
Merge pull request #12388 from MrPetovan/task/psr-20
Add Clock classes to deal with "now" times in tests
2022-12-11 18:21:20 +01:00
Michael
5d3248d57b Handle some fatal errors 2022-12-11 16:48:36 +00:00
Marek Bachmann
58cc270da8 fixed bug in portrait iteration
shortened var names

added some comments
2022-12-11 17:09:28 +01:00
MarekBenjamin
23f31883f5
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-11 16:56:33 +01:00
Hypolite Petovan
a79be5e697 Add Clock classes to deal with "now" times in tests
- [Composer] Add psr/clock dependency
2022-12-11 10:12:23 -05:00
Hypolite Petovan
35ce394948
Merge pull request #12385 from annando/more-blurhash
Add more BlurHash to avoid not being able to display some picture
2022-12-11 09:24:49 -05:00
Michael Vogel
884a265c5a Some small fixes 2022-12-11 11:21:02 +01:00
Michael
3ce4a1fee4 Avoid error when image couldn't be fetched 2022-12-11 10:12:20 +00:00
Michael
bf7df13855 Add more BlurHash to avoid not being able to display some picture 2022-12-11 09:56:30 +00:00
Hypolite Petovan
183e9dc7b2
Merge pull request #12383 from annando/issue-12367
Issue 12367: Calculate relative date on "date" level instead of "datetime"
2022-12-10 23:55:05 -05:00
Hypolite Petovan
84fc8973e7
Merge pull request #12384 from annando/issue-12285
Issue 12285: Show sharing notification only once
2022-12-10 23:54:39 -05:00
Michael
fc1ef084f4 Simplify variable name 2022-12-11 04:16:58 +00:00
Michael
5e176b52a5 Issue 12285: Show sharing notification only once 2022-12-11 04:11:29 +00:00
Michael
62376d2e62 Only calculate the last login on a "date" level 2022-12-11 03:26:45 +00:00
Michael
a65aa75234 Issue 12367: Calculate relative date on "date" level instead of "datetime" 2022-12-11 03:24:36 +00:00
MarekBenjamin
1454f3bc2a
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-10 23:59:51 +01:00
Marek Bachmann
fe2c4f7c4b Restored $s = $hook_data['html']; call which was removed on error 2022-12-10 23:47:37 +01:00
Marek Bachmann
412ba461e7 Removed unused imports 2022-12-10 23:45:42 +01:00
Marek Bachmann
236a4c819b Removed not needed image_grid_column.tpl 2022-12-10 23:44:23 +01:00
Marek Bachmann
2eb170bdbd Added some logic for image grid column balancing 2022-12-10 23:37:03 +01:00