1
1
Fork 0
Commit graph

36305 commits

Author SHA1 Message Date
b77f3a7525 Check for URI ID existence in Post\Media::insert
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1374538325
2023-01-09 16:06:22 -05:00
4d5d8e5b64 Add line number to output in System::callstack 2023-01-09 16:06:22 -05:00
670b518875 Include other unique key column in condition in Model\Tag:store
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1372640002
2023-01-09 16:06:22 -05:00
194b84141d Updated messages.po 2023-01-09 17:29:42 +00:00
4e0da578fa Merge remote-tracking branch 'upstream/develop' into improve-ignore 2023-01-09 17:23:10 +00:00
Michael Vogel
69a9c2c618
Merge pull request #12641 from MrPetovan/bug/warnings
Add yet another case to DateTimeFormat::fix
2023-01-09 18:20:58 +01:00
6bee344681 Add yet another case to DateTimeFormat::fix
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1372637862
2023-01-09 11:38:25 -05:00
79a646550f
Merge pull request #12643 from annando/item-origin
Fix some warnings on item creation
2023-01-09 11:34:56 -05:00
ee8ae5796a Updated messages.po again 2023-01-09 16:25:02 +00:00
840f25cc5c Improve ignoring of messages 2023-01-09 16:23:39 +00:00
214838ea3b Updated messages.po 2023-01-09 16:18:35 +00:00
cd3dbad2a8 Fix some warnings on item creation 2023-01-09 15:55:35 +00:00
e6f6087cac
Merge pull request #12638 from annando/collapse
Posts from contacts can now be collapsed
2023-01-08 19:23:57 -05:00
83dd49a43c Updated "messages.po" again 2023-01-08 23:26:26 +00:00
eb2c42a9fb Merge branch 'collapse' of github.com:annando/friendica into collapse 2023-01-08 23:15:35 +00:00
82b28e173b Updated mesages.po 2023-01-08 23:15:15 +00:00
Michael Vogel
c1f9c1aaa5
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-08 23:13:31 +01:00
c9b6da0127 Remoce test code 2023-01-08 19:01:12 +00:00
b0aa4eb4b7 Update routine to transfer the blockem list to collapsed 2023-01-08 18:59:07 +00:00
5738d480da Changed messages.po 2023-01-08 18:28:34 +00:00
480d9f53c3 Added "collapsed" list 2023-01-08 18:28:19 +00:00
50746bad55 Merge remote-tracking branch 'upstream/develop' into collapse 2023-01-08 17:47:21 +00:00
50e43c530e Posts from contacts can now be collapsed 2023-01-08 17:40:05 +00:00
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
c074da2b87 Fix test 2023-01-08 10:00:25 +00:00
c3d836db63 OStatus: Fix PubSubHubBub subscription 2023-01-08 09:41:54 +00:00
8547014735 Update API unsupported test 2023-01-08 02:36:26 -05:00
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
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
6c379610dc Update main translation file after removing a string 2023-01-07 22:48:31 -05:00
97642e770b Treat unsupported API call as HTTP error 2023-01-07 22:47:52 -05:00
8ad94fef9b Change "thumbnail" for default Friendica banner image in Api\Mastodon\Instance 2023-01-07 22:39:07 -05:00
11558d0cc5
Merge pull request #12632 from nupplaphil/bug/more_config
Fix loading empty node.config.php
2023-01-07 22:32:11 -05:00
979672a3c1
Filter disabled addons with "null" 2023-01-08 02:49:56 +01:00
5ea50a9e81
Fix "null" addon list 2023-01-08 02:49:56 +01:00
2293ff6206
Add test for Addon failures 2023-01-08 02:49:56 +01:00
0429a4e429
Fix loading empty node.config.php 2023-01-08 02:49:56 +01:00
91bd03a75f
Merge pull request #12630 from annando/diaspora-item
Diaspora: Support for native photos
2023-01-07 17:19:42 -05:00
aa3dc7c40c Add configuration 2023-01-07 21:28:21 +00:00
49c1ad2cc0 Merge remote-tracking branch 'upstream/develop' into diaspora-item 2023-01-07 21:21:51 +00:00
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
24c32cff0d Merge remote-tracking branch 'upstream/develop' into diaspora-item 2023-01-07 19:52:23 +00:00
6aaf1ea5d4
Fix addons problem more elegant 2023-01-07 20:49:29 +01:00
f37edc06e1
Merge pull request #12609 from annando/mod-item
Code cleanup for mod/item.php
2023-01-07 14:03:00 -05:00
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
6454c1dee7
Don't ksort() on null 2023-01-07 19:52:43 +01:00
f5fd99f7ea Unbneeded strlen removed 2023-01-07 18:51:28 +00:00