clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,444 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

38444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jakobus Schürz fc3dad8cea fix missing blank; translations 2023-10-07 00:10:15 +02:00
Jakobus Schürz 099141e0e5 translations update 2023-10-07 00:09:58 +02:00
Jakobus Schürz f1f92ccc29 use scrollToItem instead of own function 
rename isanswerto and "Is answer to" to isreplyto and "is reply to"
 2023-10-07 00:09:38 +02:00
Jakobus Schürz 3c7725183e change logic in if clause in case of codereview 2023-10-07 00:09:38 +02:00
Jakobus Schürz f42861c58d better display of parent-link 2023-10-07 00:09:38 +02:00
Jakobus Schürz 5747518ada update translations 2023-10-07 00:09:36 +02:00
Jakobus Schürz 4796bafafe add link to parent of comment 2023-10-07 00:09:06 +02:00
Michael b5df3cb104 Unneeded constructors removed 2023-10-06 21:08:33 +00:00
Tobias Diekershoff b3097da6f9 update translations 
DE, FR and HU translations
 2023-10-06 16:13:53 +02:00
Philipp 31c8256bc6 Update messages.po 2023-10-06 16:13:52 +02:00
Michael 97fbf70fa6 Fix: The calculation of unseen circles can now be deactivated again 2023-10-06 16:13:19 +02:00
Michael 3f6480c127 Clean channel confusion 2023-10-06 11:38:29 +00:00
Michael 134cbacf31 Updates messages.po 2023-10-06 10:02:27 +00:00
Michael 36a83d13f8 Merge remote-tracking branch 'upstream/2023.09-rc' into user-defined-channels 2023-10-06 10:00:09 +00:00
Jakobus Schürz 428884c621 translations update 2023-10-06 10:28:09 +02:00
Michael 22e0bb58d9 Channel class confusion solved 2023-10-06 08:20:17 +00:00
Michael Vogel 7e0923d53f
Merge pull request #13504 from tobiasd/20231006-lng 
update DE, FR, HU translations
 2023-10-06 10:08:43 +02:00
Tobias Diekershoff 3e7c1f0bd7 update translations 
DE, FR and HU translations
 2023-10-06 07:50:12 +02:00
Philipp 5b6e29b70a
Merge pull request #13502 from nupplaphil/fix/messages.po 
Update messages.po
 2023-10-05 22:27:35 +02:00
Philipp 9003bcf981
Update messages.po 2023-10-05 22:03:31 +02:00