friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-23 15:04:59 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
38208 commits 2 branches 63 tags 241 MiB
Commit graph

38208 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hypolite Petovan 0a91484fa0 Move jsonError out of Factory\Api\Mastodon\Error->InternalError 2023-10-11 09:44:03 -04:00
Hypolite Petovan 696c56b6be Move jsonError out of Factory\Api\Mastodon\Error->Forbidden 2023-10-11 09:44:03 -04:00
Hypolite Petovan 6a2ca1a6b6 Move jsonError out of Factory\Api\Mastodon\Error->Unauthorized 2023-10-11 09:44:03 -04:00
Hypolite Petovan 7486ebdc10 Move jsonError out of Factory\Api\Mastodon\Error->UnprocessableEntity 2023-10-11 09:44:03 -04:00
Hypolite Petovan 7f846f153d Move jsonError out of Factory\Api\Mastodon\Error->RecordNotFound 2023-10-11 09:44:02 -04:00
Hypolite Petovan 9e71610711 Make BaseApi->checkAllowedScope into an object method 
- It isn't called from static contexts anymore
 2023-10-11 09:43:57 -04:00
Hypolite Petovan f70a64891c Add Factory\Api\Mastodon\Error dependency to BaseApi 
- Copy Factory\Api\Mastodon\Error->logError functionality to BaseApi
 2023-10-11 09:43:54 -04:00
Hypolite Petovan 48be5a534d
Merge pull request #13529 from xundeenergie/send-with-ctrlenter 
[frio] fix commenting on 1st comment level
 2023-10-11 07:42:50 -04:00
Jakobus Schürz dd851c8eeb fix commenting on 1st comment level 2023-10-11 08:38:05 +02:00
Tobias Diekershoff ee6061d3dd
Merge pull request #13528 from xundeenergie/send-with-ctrlenter 
send on ctrl+enter - resolves #13039
 2023-10-11 06:52:12 +02:00
Jakobus Schürz 67a6899ed7 send on ctrl+enter 
in
* comments
* prv_messages
* composer
* jot
 2023-10-11 04:09:44 +02:00
Hypolite Petovan 1723aa0697
Merge pull request #13525 from annando/api-pictures 
Fix images in the API
 2023-10-10 09:16:31 -04:00
Michael Vogel 947ad55185
Merge pull request #13518 from MrPetovan/bug/warnings 
Normalize template variables in Widget\VCard
 2023-10-09 05:29:06 +02:00
Michael cd9fc0ddec Fix images in the API 2023-10-08 19:49:18 +00:00
Tobias Diekershoff bffbde4639
Merge pull request #13522 from MrPetovan/task/expose-image-description 
Add caption display for described images in Fancybox gallery
 2023-10-08 18:38:59 +02:00
Hypolite Petovan 36eced28b8 Add caption display for described images in Fancybox gallery 2023-10-08 10:29:09 -04:00
Hypolite Petovan 2eab25e7c1 Add caption to described images without a preview 2023-10-08 10:28:17 -04:00
Hypolite Petovan 298973a7e3 Add a couple of missing fields in Content\Item->localize 
- Address "Undefined array key "author-alias"" in Content\Item->localize:323
 2023-10-08 08:55:48 -04:00
Hypolite Petovan 1506068f7c Add callstack to log messages to better troubleshoot warning messages 2023-10-08 08:37:41 -04:00
Hypolite Petovan c31c264b0b Normalize template variables in Widget\VCard 
- Display new links in vier
- Address https://github.com/friendica/friendica/issues/13157#issuecomment-1751750581
 2023-10-08 08:37:40 -04:00
Tobias Diekershoff 2c297da755
Merge pull request #13519 from annando/language 
Check more fields for the language
 2023-10-08 11:38:48 +02:00
Michael f37dd2cbc6 Messages.po again 2023-10-08 07:42:39 +00:00
Michael 51ad2f522a Messages.po updated 2023-10-08 07:26:24 +00:00
Michael 0c82974986 Check more fields for the language 2023-10-08 06:44:37 +00:00
Michael Vogel 8968c63fcc
Merge pull request #13517 from MrPetovan/bug/13506-inline-image-width-allocation 
Set allocated max width for inline images we have dimensions of
 2023-10-08 08:35:57 +02:00
Hypolite Petovan e22df99abd Set allocated max width for inline images we have dimensions of 2023-10-07 17:13:36 -04:00
Hypolite Petovan 6ec6c6e317
Merge pull request #13508 from xundeenergie/move-mentionbutton-to-navbar 
[frio] move mention-button to navbar
 2023-10-07 13:28:43 -04:00
Jakobus Schürz c4870a16d4 Merge branch '2023.09-rc' into move-mentionbutton-to-navbar 2023-10-07 19:01:07 +02:00
Jakobus Schürz 302eed95f7 add margin top to separate buttons, move button to navbar 2023-10-07 18:50:06 +02:00
Hypolite Petovan 560e297274
Merge pull request #13516 from MrPetovan/2023.09-rc 
Revert "Merge pull request #13512 from MrPetovan/bug/13506-allocated-width"
 2023-10-07 12:48:13 -04:00
Hypolite Petovan 35e15a13fb Revert "Merge pull request #13512 from MrPetovan/bug/13506-allocated-width" 
This reverts commit d1e6a16cde, reversing
changes made to 6c9d3d42d3.
 2023-10-07 12:46:20 -04:00
Tobias Diekershoff d1e6a16cde
Merge pull request #13512 from MrPetovan/bug/13506-allocated-width 
Fix wrong template variable name when using content/image/single_with_height_allocation.tpl
 2023-10-07 14:26:43 +02:00
Hypolite Petovan b8ead0539f Limit width of height allocated image to parent width 2023-10-07 06:09:52 -04:00
Hypolite Petovan 182a3a4663 Fix wrong template variable name when using content/image/single_with_height_allocation.tpl 2023-10-07 06:07:07 -04:00
Michael Vogel 6c9d3d42d3
Merge pull request #13514 from MrPetovan/bug/channel-classes 
User Repository\UserDefinedChannel->selectByUid instead of Factory\UserDefinedChannel->getForUser
 2023-10-07 12:03:02 +02:00
Hypolite Petovan 710f9eecb2 User Repository\UserDefinedChannel->selectByUid instead of Factory\UserDefinedChannel->getForUser 
- Rename Repository\Channel to Repository\UserDefinedChannel
- Add new Collection\UserDefinedChannels class
- Move Factory\Timeline->createFromTableRow to Factory\UserDefinedChannel
 2023-10-07 05:48:23 -04:00
Jakobus Schürz df48ae8e00 translations 2023-10-07 11:28:29 +02:00
Hypolite Petovan 8ac6d0ef04
Merge pull request #13507 from xundeenergie/finalize-mention-buttons 
Finalize mention buttons
 2023-10-07 05:23:19 -04:00
Hypolite Petovan ee0f8cd3c9
Merge pull request #13510 from annando/fix-thread-parent 
Fix for the display of the thread parent
 2023-10-07 05:22:40 -04:00
Jakobus Schürz e63092c708 translations 2023-10-07 11:07:41 +02:00
Jakobus Schürz 2636b19171 add blanks, suggested from codereview 2023-10-07 11:06:51 +02:00
Michael 30587f09b5 Fix for the display of the thread parent 2023-10-07 08:51:47 +00:00
Michael Vogel dd504f522f
Merge pull request #13509 from MrPetovan/bug/in-reply-to 
Fix typo in "in reply to" base translation string
 2023-10-07 09:34:18 +02:00
Hypolite Petovan af3151d4db Fix typo in "in reply to" base translation string 2023-10-07 02:31:56 -04:00
Hypolite Petovan ec9345efa6
Merge pull request #13448 from annando/user-defined-channels 
Channels can now be created by users
 2023-10-07 02:09:19 -04:00
Hypolite Petovan 5bc466de55
Merge pull request #13499 from xundeenergie/reference-links 
add link to parent of comment
 2023-10-06 23:40:13 -04:00
Jakobus Schürz 695fc58187 move mention-button to navbar 
translations
 2023-10-07 01:33:45 +02:00
Jakobus Schürz c6af5266cd add mention-/showgroup button also to profile/vcard.tpl 
update translations
 2023-10-07 01:28:23 +02:00
Jakobus Schürz 02b26f5969 put group-logic for "widget" to php-file 2023-10-07 01:23:29 +02:00
Jakobus Schürz 4ab03594cb Merge commit 'b3097da6f' into reference-links 2023-10-07 00:40:02 +02:00