Commit graph

34677 commits

Author SHA1 Message Date
Michael 1cf66ba0cc Merge remote-tracking branch 'upstream/develop' into quote-uri-id 2022-10-14 22:03:32 +00:00
Michael 3e868416c7 Check for post existence 2022-10-14 22:02:25 +00:00
Michael 88aceeb27f Merge remote-tracking branch 'upstream/2022.09-rc' into quote-uri-id 2022-10-14 19:11:15 +00:00
Tobias Diekershoff e5ae5c7e67 renewed the expiration date for the security.txt file 2022-10-14 20:54:05 +02:00
Tobias Diekershoff 5a800e2d09 prepare the CHANGELOG for 2022.12 2022-10-14 20:52:58 +02:00
Tobias Diekershoff b5d3651f3f bump version to 2022.12-dev 2022-10-14 20:52:38 +02:00
Tobias Diekershoff 7109d2a6a8 Friendica version 2022.10 2022-10-14 20:49:17 +02:00
Tobias Diekershoff 99b09858d2 set the release date for the 2022.10 release in the CHANGELOG 2022-10-14 20:48:08 +02:00
Tobias Diekershoff d989602c1c
Merge pull request #11913 from tobiasd/2022.09-CHANGELOG
Updates for the CHANGELOG for 2022.09
2022-10-14 20:40:31 +02:00
Tobias Diekershoff 1fd9558e60
Merge pull request #11990 from annando/share-feed
Return the pageinfo when feed is shared
2022-10-14 08:01:09 +02:00
Michael c2e57c5c0e Return the pageinfo when feed is shared 2022-10-14 04:43:46 +00:00
Tobias Diekershoff 8936ae26fd added fix for quoted shares from Twitter to the CHANGELOG 2022-10-13 09:53:58 +02:00
Philipp 1cc3fa6d77
Merge pull request #11989 from annando/quote-again
Only add images for non-federated quote shares
2022-10-12 08:27:17 +02:00
Michael da2afbeae3 Merge remote-tracking branch 'upstream/2022.09-rc' into quote-again 2022-10-12 05:36:00 +00:00
Michael e69b04d2df Only add the media for non federated posts 2022-10-12 05:34:55 +00:00
Michael Vogel b1364a2327
Merge pull request #11988 from MrPetovan/bug/notices
Add missing post keys to retrieve pLink in Model\Event::prepareListForTemplate()
2022-10-12 07:26:15 +02:00
Hypolite Petovan 0480d9aebd Add missing post keys to retrieve pLink in Model\Event::prepareListForTemplate()
- Address https://github.com/friendica/friendica/issues/11632#issuecomment-1275117722
2022-10-11 22:18:52 -04:00
Hypolite Petovan ec9059c395
Merge pull request #11987 from annando/quoted-media
Fix attached media in quoted posts
2022-10-11 19:54:44 -04:00
Michael 0e82f64d71 Only attach images 2022-10-11 21:39:28 +00:00
Michael f1f13db24f Simplified code 2022-10-11 20:48:47 +00:00
Michael 68d6e11d83 Fix attached media in quoted posts 2022-10-11 20:10:39 +00:00
Philipp 04564f0320
Merge pull request #11983 from MrPetovan/bug/fatal-errors
Contact array can be empty in Model\Contact::getAvatarPath
2022-10-11 17:52:17 +02:00
Hypolite Petovan 9e74a1bd06 Contact array can be empty in Model\Contact::getAvatarPath
- Address https://github.com/friendica/friendica/issues/11630#issuecomment-1274195844
2022-10-11 08:26:00 -04:00
Michael a67a364b91 Merge remote-tracking branch 'upstream/2022.09-rc' into quote-uri-id 2022-10-11 05:19:21 +00:00
Hypolite Petovan ec1da90094
Merge pull request #11982 from annando/fix-quote
Quoted posts from Twitter now contain media again
2022-10-10 21:53:19 -04:00
Michael 747139d186 Quoted posts from Twitter now contain media again 2022-10-10 23:18:58 +00:00
Michael aeb4645ba6 New field "quote-uri-id" for quoted posts 2022-10-10 22:39:30 +00:00
Hypolite Petovan 0b0567081a
Merge pull request #11981 from annando/better-quote
Quote of quotes are visually improved
2022-10-10 09:46:47 -04:00
Michael 028de0e228 Quote of quotes are visually improved 2022-10-10 12:30:07 +00:00
Tobias Diekershoff c8406f6cd0
Merge pull request #11980 from annando/cooldown
Use "maxloadavg" when "worker_load_cooldown" is not defined
2022-10-10 12:17:45 +02:00
Michael a21c04d55d Use "maxloadavg" when "worker_load_cooldown" is not defined 2022-10-10 06:01:07 +00:00
Tobias Diekershoff 7e8c48a539 added new API endpoint for events to the CHANGELOG 2022-10-10 07:57:12 +02:00
Tobias Diekershoff 656e74605f typo 2022-10-10 07:36:43 +02:00
Hypolite Petovan a10f55bb85
Merge pull request #11979 from annando/issue-11853
Notices
2022-10-09 17:45:33 -04:00
Hypolite Petovan 424dad886f
Merge pull request #11978 from annando/quote-simplified
The quote functionality is simplified
2022-10-09 17:26:22 -04:00
Michael 0d3aa681b4 The quote functionality is simplified 2022-10-09 21:16:36 +00:00
Michael Vogel 2b03edd59e
Merge pull request #11977 from MrPetovan/bug/11938-exotic-date-time-formats
Add a couple new cases to DateTimeFormat::fix()
2022-10-09 17:16:01 +02:00
Tobias Diekershoff b56a9cf419 some updates for the CHANGELOG 2022-10-09 16:01:02 +02:00
Hypolite Petovan a4b0ebf160 Add a couple of cases to DateTimeFormat::fix()
- Reworked method to perform more string replacements and fewer regular expression matches
2022-10-09 09:34:38 -04:00
Hypolite Petovan bee6506d33 Only call DateTimeFormat::fix() when there's an Exception
- This prevents valid date/time strings to be mangled by fix()
2022-10-09 09:34:30 -04:00
Michael Vogel b5ad8c3e15
Merge pull request #11973 from MrPetovan/task/test-fixDateFormat
Add tests for DateTimeFormat::fix()
2022-10-08 17:11:10 +02:00
Hypolite Petovan a36ea64bb4
Merge pull request #11976 from annando/issue-11975
Issue 11975: Don't call the postupdate if the table is missing
2022-10-08 10:48:57 -04:00
Michael 4552d36373 Issue 11975: Don't call the postupdate if the table is missing 2022-10-08 14:42:11 +00:00
Hypolite Petovan 47dd19ab95
Merge pull request #11974 from annando/issue-11969
Issue 11969: Simplified share
2022-10-08 10:04:07 -04:00
Michael 4a37c978c2 Issue 11969: Simplified share 2022-10-08 09:36:35 +00:00
Hypolite Petovan 345d307ae0 Add tests for DateTimeFormat::fix() 2022-10-07 23:10:50 -04:00
Hypolite Petovan c0447ced48 Simplify method name for DateTimeFormat::fix 2022-10-07 23:10:50 -04:00
Hypolite Petovan 9d2edcf0e1
Merge pull request #11972 from annando/issue-11969
Issue 11969: Only use the simple share with federated posts
2022-10-07 17:35:26 -04:00
Michael Vogel 49c5d62530
Merge pull request #11970 from MrPetovan/bug/marcor-newapi
Fix parameter names before being passed to Model\Event::store
2022-10-07 23:32:21 +02:00
Hypolite Petovan 2cbc11403e Fix parameter names before being passed to Model\Event::store
- Partial revert of 946db2ab45
2022-10-07 17:20:22 -04:00