1
1
Fork 0
Commit graph

36144 commits

Author SHA1 Message Date
e4ac3c7922
Merge pull request #12510 from MarekBenjamin/email-notification_like-in-subject
Change email subject to "(...)like in conversation(...)" for likes in…
2022-12-23 07:57:28 -05:00
MarekBenjamin
3061cee083
Update src/Navigation/Notifications/Repository/Notify.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-23 11:14:38 +01:00
b2f2fbc4d4 Flatten conditions and add call to HTML::checkRelMeLink in Worker\CheckRelMeProfileLink 2022-12-23 02:44:49 -05:00
91c4ab2359 Add new xpathQuote and checkRelMeLink methods to Content\Text\HTML class
- Add tests for both methods
2022-12-23 02:41:22 -05:00
Philipp
e5e4d142ce
Merge pull request #12512 from annando/available
A server is only reachable when the network can be detected
2022-12-23 08:28:34 +01:00
998b05095b A server is only reachable when the network can be detected 2022-12-23 06:48:53 +00:00
b898dd1c00
Merge pull request #12511 from annando/only-active
Only check the homepage for active users with a homepage
2022-12-23 01:29:20 -05:00
1e888ad6a4 Always check whe verified 2022-12-23 06:26:58 +00:00
179d776d0a Only check the homepage for active users with a homepage 2022-12-23 06:22:12 +00:00
Marek Bachmann
8393975cbc Merge remote-tracking branch 'origin/email-notification_like-in-subject' into email-notification_like-in-subject 2022-12-23 02:38:15 +01:00
Marek Bachmann
b876a9efcd Distinguish between comment likes and post likes. 2022-12-23 02:38:00 +01:00
MarekBenjamin
d52c988ebc
Update src/Navigation/Notifications/Repository/Notify.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-12-23 01:22:21 +01:00
Marek Bachmann
ef4f508f9b messages.po and and corrected typo in comment 2022-12-23 01:06:21 +01:00
Marek Bachmann
82eec270fa Change email subject to "(...)like in conversation(...)" for likes instead of "(...)new comment(...)" 2022-12-23 00:56:26 +01:00
520cb824ec
Merge pull request #12508 from annando/more-acrivities
AP: Support for "move" and "accept" from gup.pe
2022-12-22 17:18:18 -05:00
99284222c1 Remove the activity 2022-12-22 22:08:42 +00:00
9fe70af85a AP: Support for "move" and "accept" from gup.pe 2022-12-22 21:58:51 +00:00
02bca72de3
Merge pull request #12502 from annando/no-gs-import
The GNU-Social import is removed
2022-12-21 17:52:17 -05:00
d75cd8a00a The GNU-Social import is removed 2022-12-21 22:21:22 +00:00
07162e557d
Merge pull request #12501 from MarekBenjamin/improve-registraiton-text-input
Changed registration text input to text area since BBcode is allowed …
2022-12-21 14:15:53 -05:00
Marek Bachmann
90d99bc3e8 Changed registration text input to text area since BBcode is allowed there (was single line input) 2022-12-21 20:05:35 +01:00
31e8574006
Merge pull request #12494 from annando/blurhash-fix
Don't calculate the blurhash on images without a size
2022-12-20 20:19:32 -05:00
fec2fb81c9
Merge pull request #12493 from annando/new-stats
Three systems added to the federation statistics
2022-12-20 20:19:08 -05:00
e6f0e3c23e Don't calculate the blurhash on images without a size 2022-12-20 22:32:24 +00:00
69a9f9033d Three systems added to the federation statistics 2022-12-20 22:29:53 +00:00
8e25660616
Merge pull request #12409 from annando/diaspora-reshare
Use reshare with Diaspora like with ActivityPub
2022-12-20 16:11:21 -05:00
de1c0f4c13 Don't display Diaspora reshares 2022-12-20 19:25:57 +00:00
Michael Vogel
316d50cf7a
Merge pull request #12491 from MarekBenjamin/patch-1
Update CHANGELOG
2022-12-20 13:54:38 +01:00
MarekBenjamin
d95fe1c41f
Update CHANGELOG
Typo
2022-12-20 12:47:05 +01:00
a0faca9eaf Updated database version 2022-12-20 07:00:10 +00:00
4db4d1843d Merge remote-tracking branch 'upstream/develop' into diaspora-reshare 2022-12-20 06:58:36 +00:00
Philipp
8b3a9fc58a
Merge pull request #12485 from annando/errors-warnings
Measures against several warnings and errors in the log
2022-12-20 07:48:59 +01:00
bdc865afae Measures against several warnings and errors in the log 2022-12-20 06:22:11 +00:00
1ed5fb3499 renewed the expiration date for the security.txt file 2022-12-20 06:53:14 +01:00
c84f18ef66 bump VERSION to 2023.03-dev 2022-12-20 06:52:15 +01:00
6e6c9314af prepare the CHANGELOG for 2023.03 2022-12-20 06:50:37 +01:00
eeadc00e83 bump VERSION to 2022.12 2022-12-20 06:48:39 +01:00
e54267e0cf set the release date for the 2022.12 release in the CHANGELOG 2022-12-20 06:48:23 +01:00
1f889b6086
Merge pull request #12453 from tobiasd/2022.12-CHANGELOG
CHANGELOG updates for 2022.12
2022-12-20 06:31:53 +01:00
3f9b8ec1e5
Merge pull request #12484 from tobiasd/20221220-credits
foss to foss- in the CREDITS
2022-12-20 06:16:56 +01:00
b6cc2ddc48 foss to foss- in the CREDITS 2022-12-20 06:12:44 +01:00
455b3faa14 some last update to the CHANGELOG 2022-12-20 06:04:37 +01:00
0d4ea4b7f0
Merge pull request #12483 from annando/issue-12419
Issue 12419: Quickhack to make GoToSocial work
2022-12-19 16:24:58 -05:00
e733adcaae Issue 12419: Quickhack to make GoToSocial work 2022-12-19 21:21:06 +00:00
45ee7d55f0
Merge pull request #12482 from annando/fix-reachable
Fix delivery problems with "reachable" test
2022-12-19 14:48:45 -05:00
d39f4014e4 Fix delivery problems with "reachable" test 2022-12-19 19:41:04 +00:00
5110c11885
Merge pull request #12480 from foss-/patch-5
update FAQ client list: remove Fedi from iOS apps
2022-12-19 14:18:00 -05:00
0fee47e0c6
update FAQ client list: remove Fedi from iOS apps
Their github https://github.com/Big-Fig/Fediverse.app links to a dead website https://fedi.app/fediapp and no updates for over a year. iOS App Store won't load app at https://apps.apple.com/us/app/fedi-for-pleroma-and-mastodon/id1478806281
2022-12-19 20:04:21 +01:00
Philipp
20374ab5a2
Merge pull request #12447 from MrPetovan/bug/12441-profile-contacts
Retrieve contact records for the page visitor in several modules
2022-12-19 17:14:43 +01:00
Philipp
c9f92f41fb
Merge pull request #12479 from MrPetovan/bug/deprecated
Fix several Deprecated notices
2022-12-19 17:13:12 +01:00