Commit graph

35671 commits

Author SHA1 Message Date
Michael
5041e92937 Merge remote-tracking branch 'upstream/2022.12-rc' into diaspora-reshare 2022-12-14 09:19:41 +00:00
Michael
f013c92487 Only search for empty quoted reshares (Diaspora type) 2022-12-13 23:26:58 +00:00
Michael
ca8a89ed1c Use reshare with Diaspora like with ActivityPub 2022-12-13 23:19:19 +00:00
Hypolite Petovan
d26b0ed5a2
Merge pull request #12407 from HankG/friendica-api-photo-endpoint-updates
Friendica api photo endpoint updates
2022-12-13 17:14:48 -05:00
Hank G
7072a71788
Update src/Module/Api/Friendica/Photoalbum/Index.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-13 16:52:28 -05:00
Hank G
2338a268d3
Update src/Module/Api/Friendica/Photoalbum/Show.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-13 16:52:21 -05:00
Hank G
6af4bfae21
Update src/Module/Api/Friendica/Photoalbum/Show.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-13 16:46:16 -05:00
Hank G
ae8f1a1c5b
Update src/Module/Api/Friendica/Photoalbum/Show.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-13 16:45:56 -05:00
Hank G
7bb60776c6
Update src/Module/Api/Friendica/Photoalbum/Show.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-13 16:45:49 -05:00
Hank G
d74345782a
Update src/Module/Api/Friendica/Photoalbum/Index.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-13 16:45:34 -05:00
Hank Grabowski
5288ed46d4 Remove extraneous comment and fix whitespace between lines for style 2022-12-13 16:04:03 -05:00
Hank Grabowski
0b2c013db4 Fix space missing after if style error in src/Module/Api/Friendica/Photoalbum/Show.php 2022-12-13 15:59:45 -05:00
Hank Grabowski
8576610c54 Fix copyright header issues... 2022-12-13 15:58:03 -05:00
Hank Grabowski
991c5fa6de Add latest_first parameter to photo gallery listing Friendica API endpoint 2022-12-13 15:41:24 -05:00
Hank Grabowski
4fc01c93ce Add photo album show endpoint that lists photos in an album 2022-12-13 14:16:08 -05:00
Hank Grabowski
5b52533749 Fix Friendica API Photo Album list documentation to reflect endpoint 2022-12-13 14:14:58 -05:00
Hank Grabowski
951b221e21 Fix Friendica API Photo Album list documentation to reflect endpoint 2022-12-13 13:31:10 -05:00
Hank Grabowski
e1823c7138 Add Photo Album index endpoint to Friendica API 2022-12-13 13:28:34 -05:00
Hank Grabowski
800f94495b Add Photo album cache flushes to Friendica Photo endpoints 2022-12-13 13:27:23 -05:00
Hank Grabowski
8f56aa316b Allow album to be empty string thus defaulting to i10n "Wall Photos" like in UI 2022-12-13 12:48:50 -05:00
Michael Vogel
846709eba8
Merge pull request #12400 from MrPetovan/task/image-grid
Normalize padding in image grid
2022-12-13 16:21:06 +01:00
Hypolite Petovan
d9361f2b81 Improve code standards in Model\Item 2022-12-13 09:33:01 -05:00
Hypolite Petovan
2fa9d49632 Normalize padding in image grid
- Remove outside padding, vertical and horizontal
- Remove artificial padding with <br> in content/image.tpl
2022-12-12 21:56:23 -05:00
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
d05910a6e5 API: Allow permissions for status posts 2022-12-11 22:48:43 +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