marcusxs/friendica
1
0
Fork 0
forked from friendica/friendica
Code Pull requests Activity
36,988 commits 3 branches 67 tags 205 MiB
Commit graph

36,988 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
c9b6da0127 Remoce test code 2023-01-08 19:01:12 +00:00
Michael
b0aa4eb4b7 Update routine to transfer the blockem list to collapsed 2023-01-08 18:59:07 +00:00
Michael
5738d480da Changed messages.po 2023-01-08 18:28:34 +00:00
Michael
480d9f53c3 Added "collapsed" list 2023-01-08 18:28:19 +00:00
Michael
50746bad55 Merge remote-tracking branch 'upstream/develop' into collapse 2023-01-08 17:47:21 +00:00
Michael
50e43c530e Posts from contacts can now be collapsed 2023-01-08 17:40:05 +00:00
Hypolite Petovan
0ae7a53daa
 		Merge pull request #12637 from annando/ostatus-subscription 
OStatus: Fix PubSubHubBub subscription
 2023-01-08 07:58:22 -05:00
Michael Vogel
1ef9768b98
 		Apply suggestions from code review 
Co-authored-by: Philipp <admin+Github@philipp.info>
 2023-01-08 13:00:58 +01:00
Philipp
1f0eae998e
 		Merge pull request #12636 from MrPetovan/bug/12625-api-not-implemented 
Update API unsupported test
 2023-01-08 11:03:06 +01:00
Michael
c074da2b87 Fix test 2023-01-08 10:00:25 +00:00
Michael
c3d836db63 OStatus: Fix PubSubHubBub subscription 2023-01-08 09:41:54 +00:00
Hypolite Petovan
8547014735 Update API unsupported test 2023-01-08 02:36:26 -05:00
Tobias Diekershoff
6bf670f64e
 		Merge pull request #12633 from MrPetovan/bug/12624-api-thumbnail 
Change "thumbnail" for default Friendica banner image in Api\Mastodon\Instance
 2023-01-08 08:28:24 +01:00
Tobias Diekershoff
ec408f4500
 		Merge pull request #12634 from MrPetovan/bug/12625-api-not-implemented 
Treat unsupported API call as HTTP error
 2023-01-08 08:24:05 +01:00
Hypolite Petovan
6c379610dc Update main translation file after removing a string 2023-01-07 22:48:31 -05:00
Hypolite Petovan
97642e770b Treat unsupported API call as HTTP error 2023-01-07 22:47:52 -05:00
Hypolite Petovan
8ad94fef9b Change "thumbnail" for default Friendica banner image in Api\Mastodon\Instance 2023-01-07 22:39:07 -05:00
Hypolite Petovan
11558d0cc5
 		Merge pull request #12632 from nupplaphil/bug/more_config 
Fix loading empty node.config.php
 2023-01-07 22:32:11 -05:00
Philipp
979672a3c1
 		Filter disabled addons with "null" 2023-01-08 02:49:56 +01:00
Philipp
5ea50a9e81
 		Fix "null" addon list 2023-01-08 02:49:56 +01:00
Philipp
2293ff6206
 		Add test for Addon failures 2023-01-08 02:49:56 +01:00
Philipp
0429a4e429
 		Fix loading empty node.config.php 2023-01-08 02:49:56 +01:00
Hypolite Petovan
91bd03a75f
 		Merge pull request #12630 from annando/diaspora-item 
Diaspora: Support for native photos
 2023-01-07 17:19:42 -05:00
Michael
aa3dc7c40c Add configuration 2023-01-07 21:28:21 +00:00
Michael
49c1ad2cc0 Merge remote-tracking branch 'upstream/develop' into diaspora-item 2023-01-07 21:21:51 +00:00
Hypolite Petovan
5fd3d4bda3
 		Merge pull request #12628 from nupplaphil/bug/typeerror 
Don't ksort() or loop without an addon array
 2023-01-07 15:06:28 -05:00
Michael
24c32cff0d Merge remote-tracking branch 'upstream/develop' into diaspora-item 2023-01-07 19:52:23 +00:00
Philipp
6aaf1ea5d4
 		Fix addons problem more elegant 2023-01-07 20:49:29 +01:00
Hypolite Petovan
f37edc06e1
 		Merge pull request #12609 from annando/mod-item 
Code cleanup for mod/item.php
 2023-01-07 14:03:00 -05:00
Philipp
9fb5b95b5e
 		Fix other foreach() troubles at Addon.php 2023-01-07 19:54:59 +01:00
Michael Vogel
d5bc6d0006
 		Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-01-07 19:54:13 +01:00
Philipp
6454c1dee7
 		Don't ksort() on null 2023-01-07 19:52:43 +01:00
Michael
f5fd99f7ea Unbneeded strlen removed 2023-01-07 18:51:28 +00:00
Michael
900e0d46d3 Changes after review 2023-01-07 18:46:10 +00:00
Michael
6a0a13855f More simplifications 2023-01-07 18:19:04 +00:00
Michael
8654b39e98 Simplified code 2023-01-07 18:07:54 +00:00
Michael
d22712956b Updated messages.po 2023-01-07 17:16:44 +00:00
Michael
4e4eab7548 Merge remote-tracking branch 'upstream/develop' into mod-item 2023-01-07 17:14:40 +00:00
Hypolite Petovan
450dd433a3
 		Merge pull request #12627 from nupplaphil/feat/config_warning 
Check `node.config.php` file permission
 2023-01-07 11:41:44 -05:00
Michael
d86045058e Diaspora: Photos are now transmitted separately 2023-01-07 15:11:34 +00:00
Philipp
7b30c44b60
 		Update messages.po 2023-01-07 15:50:03 +01:00
Philipp
6bd1740a94
 		omg .. wrong assertion .. 2023-01-07 15:49:55 +01:00
Philipp
6e4e2c4a82
 		Fix warning text 2023-01-07 15:30:45 +01:00
Philipp
b7a2b6b352
 		Update src/Module/Admin/Summary.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-01-07 15:28:49 +01:00
Philipp
f2253991e7
 		Update messages.po 2023-01-07 15:18:23 +01:00
Philipp
6e0d16f22b
 		Add warning message in case node.config.php isn't writable 2023-01-07 15:16:55 +01:00
Hypolite Petovan
308618b559
 		Merge pull request #12622 from nupplaphil/bug/config 
`node.config.php` bugfixings
 2023-01-07 08:45:53 -05:00
Philipp
80e8f4aa34
 		Execute critical worker tasks, even if we're in daemon mode 2023-01-07 13:43:16 +01:00
Philipp
abd3b2180f
 		Merge pull request #12619 from MrPetovan/task/12617-remove-no_auto_update 
Remove system.no_auto_update personal config key and assume default value of true
 2023-01-06 17:54:36 +01:00
Philipp
5b2e02889e
 		Fix Update::run() 2023-01-06 17:50:56 +01:00