keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
35774 commits 4 branches 0 tags 179 MiB
Commit graph

35774 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan
f2188835e7 Add logging and default value when JSON encode->decode fails in JsonLD::compact 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
 2022-12-19 10:22:05 -05:00
Hypolite Petovan
06ea61f0ed Provide default value for system.banner config key 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
 2022-12-19 10:17:57 -05:00
Hypolite Petovan
6a17223289 Ward against null value in language key of item array in Mastodon\Status object 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
 2022-12-19 10:11:12 -05:00
Hypolite Petovan
b1b0bfc280 Don't compute system.update_interval when it's -1 (disabled) 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
 2022-12-19 10:05:21 -05:00
Hypolite Petovan
f9dcb7c6d4
Merge pull request #12475 from annando/no-failed-delivery 
Don't perform a delivery to failing servers
 2022-12-19 09:26:00 -05:00
Michael Vogel
8f22b4f33d
Update src/Model/GServer.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-19 15:22:21 +01:00
Michael
feb74b4d9a Don't perform a delivery to failing servers 2022-12-19 09:30:56 +00:00
Tobias Diekershoff
86a486f62b
Merge pull request #12472 from MrPetovan/bug/12466-profile-photos-aside 
Remove VCard for owner in Profile\Photos module
 2022-12-19 07:38:13 +01:00
Tobias Diekershoff
9d38671ec9
Merge pull request #12471 from MrPetovan/bug/12468-bbcode-img-code 
Skip literal text in ActivityPub\Transmitter::removePictures
 2022-12-19 07:03:31 +01:00
Tobias Diekershoff
b4db8fe8d2
Merge pull request #12469 from MrPetovan/bug/12462-tos-rules 
Skip blank lines in Tos module
 2022-12-19 06:58:42 +01:00
Tobias Diekershoff
a522267c9d
Merge pull request #12470 from MrPetovan/bug/12452-profile-field-URL 
Convert custom profile field URL values to rel="me" links
 2022-12-19 06:57:56 +01:00
Hypolite Petovan
5392bafbb4 Remove VCard for owner in Profile\Photos module 
- Remove unused remote contact retrieval
- Remove contact list from aside for non-owner visitors
 2022-12-18 23:52:33 -05:00
Hypolite Petovan
2372e50e3b Skip literal text in ActivityPub\Transmitter::removePictures 2022-12-18 23:32:52 -05:00
Hypolite Petovan
39607b20e2 Convert custom profile field URL values to rel="me" links 2022-12-18 23:24:59 -05:00
Hypolite Petovan
76e9c4daa2 Fix link to profile page in custom profile fields settings 
- Previous link was leading to conversations
 2022-12-18 22:49:49 -05:00
Hypolite Petovan
07f7585e40 Remove DI dependency in Profile\Profile module 2022-12-18 22:49:18 -05:00
Hypolite Petovan
1cc0c1148e Skip blank lines in Tos module 2022-12-18 22:16:41 -05:00
Philipp
e28be36086
Merge pull request #12465 from annando/issue-12185 
Issue 12185: Problems adding contacts
 2022-12-19 01:32:02 +01:00
Tobias Diekershoff
0baff45243
Merge pull request #12467 from MarekBenjamin/patch-1 
Update CREDITS.txt
 2022-12-18 19:41:04 +01:00
MarekBenjamin
15f6031113
Update CREDITS.txt 
Marek Bachmann (real name) and MarrekBejamin (git name) is the same person. No need for double credit 👼
 2022-12-18 19:17:09 +01:00
Michael
e057b39f68 Issue 12185: Problems adding contacts 2022-12-18 15:43:35 +00:00
Hypolite Petovan
738e63f73e
Merge pull request #12464 from tobiasd/20221218-de 
DE translation updates
 2022-12-18 10:27:28 -05:00
Tobias Diekershoff
43fd9eb77c DE translation updates 2022-12-18 16:12:50 +01:00
Michael Vogel
8ac3f58a1c
Merge pull request #12461 from tobiasd/20221218-credits 
20221218 credits
 2022-12-18 12:04:11 +01:00
Tobias Diekershoff
a96a8de651 removed double entry 2022-12-18 10:06:18 +01:00
Philipp
40777d08c1
Merge pull request #12459 from MrPetovan/bug/12454-link-preview-translation 
Add missing t() call in Settings\Display module
 2022-12-18 09:26:04 +01:00
Tobias Diekershoff
18f69f6f73 some more corrections 2022-12-18 09:20:12 +01:00
Tobias Diekershoff
fb2d193a6c some more corrections 2022-12-18 09:19:11 +01:00
Tobias Diekershoff
aa94a131b8 fix 2022-12-18 09:17:09 +01:00
Tobias Diekershoff
e1b45c7fba fix 2022-12-18 09:16:46 +01:00
Tobias Diekershoff
7beee99f31 regen CREDITS.txt 2022-12-18 09:15:31 +01:00
Tobias Diekershoff
b3504dfdee
Merge pull request #12460 from annando/photo-api 
API: Fix interoperability between Friendica and Mastodon part
 2022-12-18 08:15:49 +01:00
Michael
1899c53516 API: Fix interoperability between Friendica and Mastodon part 2022-12-18 06:30:32 +00:00
Michael Vogel
49078069f9
Merge pull request #12442 from MrPetovan/bug/warnings 
Use account-user-view entry to instantiate Api\Mastodon\FollowRequestobjects
 2022-12-18 07:06:59 +01:00
Hypolite Petovan
f7a8c109e9 Updated main translation file after adding a string 2022-12-18 01:04:04 -05:00
Hypolite Petovan
52e3126cba Add missing t() call in Settings\Display module 2022-12-18 01:04:04 -05:00
Hypolite Petovan
9718484f9e Remove DI dependency in Settings\Display module 2022-12-18 01:04:04 -05:00
Hypolite Petovan
c7e53cb9b4 Use account-user-view entry to instantiate Api\Mastodon\FollowRequest objects 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1354395861
 2022-12-18 01:03:37 -05:00
Michael Vogel
af4164b86a
Merge pull request #12458 from MrPetovan/bug/12456-tos-rules 
Trim terms of service rules before turning them to an array
 2022-12-18 06:23:55 +01:00
Hypolite Petovan
43aa9cddc5 Trim terms of service rules before turning them to an array 2022-12-17 21:13:52 -05:00
Philipp
9a8f6f2150
Merge pull request #12457 from annando/image-grid-shared 
Fix image grid in shared Friendica posts
 2022-12-17 23:30:10 +01:00
Michael
ed520a3f39 Fix image grid in shared Friendica posts 2022-12-17 22:07:14 +00:00
Philipp
d25fc9de9b
Merge pull request #12359 from matthiasmoritz/calendar_default_view 
Calendar default view
 2022-12-17 19:05:57 +01:00
Hypolite Petovan
3756f933a6 Update main translation file after adding strings 2022-12-17 12:20:49 -05:00
Hypolite Petovan
cdf180c58d Add new calendar.default_view pconfig key 2022-12-17 12:20:43 -05:00
Hypolite Petovan
83e34ef8e7 Move first_day_of_week pconfig key to calendar category 2022-12-17 12:20:14 -05:00
Matthias Moritz
5817709562 Move vier version of calendat/calendar_head template to base 
- With the support for the remaining themes dropped, the base template wasn't used anymore
 2022-12-17 12:20:13 -05:00
Hypolite Petovan
60dd9bed5e
Merge pull request #12455 from tobiasd/20221217-security 
renewed the expiration date for the security.txt file
 2022-12-17 10:52:46 -05:00
Tobias Diekershoff
704cc34981 renewed the expiration date for the security.txt file 2022-12-17 16:46:46 +01:00
Philipp
057eefcbe2
Merge pull request #12451 from tobiasd/20221217-ru 
RU translation update THX SpcCw
 2022-12-17 15:37:55 +01:00