1
0
Fork 0
Commit graph

37470 commits

Author SHA1 Message Date
Michael 5a18d06a93 Merge remote-tracking branch 'upstream/2023.05-rc' into quote-loop 2023-05-19 19:50:36 +00:00
Philipp 5e2953ff3f
Merge pull request #13139 from annando/receiver-exception
Logging for an exception when processing activities
2023-05-19 21:20:20 +02:00
Michael ebebd61343 Updated messages.po and database.sql - again 2023-05-19 17:47:50 +00:00
Michael 63436be80e Merge remote-tracking branch 'upstream/2023.05-rc' into receiver-exception 2023-05-19 17:44:01 +00:00
Michael aed94cbbe6 Updated messages.po and database.sql 2023-05-19 17:38:14 +00:00
Michael efb055f5d6 Updated messages.po and database.sql 2023-05-19 17:36:15 +00:00
Michael 1523fa2236 Fix: Prevent an endless loop when fetching quoted content 2023-05-19 17:28:29 +00:00
Tobias Diekershoff 14956244cc bump version 2023.05-rc 2023-05-18 15:55:42 +02:00
Hypolite Petovan e2e95f7d72
Merge pull request #13137 from tobiasd/20230518-pl
PL translation update THX tatonuta
2023-05-18 08:03:54 -04:00
Hypolite Petovan ccf94c5424
Merge pull request #13107 from annando/unify-link
Unifiy the creation of photo links
2023-05-18 08:01:56 -04:00
Tobias Diekershoff 7a098800c5 PL translation update THX tatonuta 2023-05-18 13:05:07 +02:00
Tobias Diekershoff d4d25c4e97
Merge pull request #13135 from MrPetovan/bug/13108-photomenu-redir
Fix magic links in contact photo menu
2023-05-18 12:09:17 +02:00
Michael 4e54b25b3e Logging for an exception when processing activities 2023-05-18 06:43:53 +00:00
Hypolite Petovan ff80e46eb0 Fix magic links in contact photo menu
- They were using a URL format obsolete for years
2023-05-17 19:53:22 -04:00
Michael 1010443031 Simplify image url 2023-05-17 20:30:45 +00:00
Michael 7c266be206 Merge remote-tracking branch 'upstream/develop' into unify-link 2023-05-17 20:03:57 +00:00
Hypolite Petovan 878f144bc1
Merge pull request #13131 from annando/supportsprobe
Replace "Probe::isProbable" with "Protocol::supportsProbe"
2023-05-17 15:44:21 -04:00
Hypolite Petovan 7248b6833a
Merge pull request #13133 from annando/start-header
Unify the heading levels
2023-05-17 15:42:51 -04:00
Hypolite Petovan 454f177831
Merge pull request #13115 from annando/search
Fix: Contacts can now be searched with a leading @ again.
2023-05-17 13:35:51 -04:00
Michael 3dbbbb69e4 Long refresh periods for connector networks 2023-05-17 14:28:40 +00:00
Michael a198108222 Fix tests 2023-05-17 09:01:52 +00:00
Michael 8b264c38fe Unify the heading levels 2023-05-17 08:17:23 +00:00
Michael 3f66ecf3be Reverted accidentally reversed parameter order 2023-05-17 02:38:47 +00:00
Michael e23a7383f8 Only probr when needed, search local if nothing was found 2023-05-17 02:23:56 +00:00
Michael 97456ff205 Merge remote-tracking branch 'upstream/develop' into search 2023-05-17 01:30:56 +00:00
Michael 2e46d64ea0 Replace "Probe::isProbable" with "Protocol::supportsProbe" 2023-05-17 01:28:10 +00:00
Michael Vogel a52c1cde9c
Merge pull request #13124 from ne20002/develop
fix for probe loop in case that network of contact has changed
2023-05-17 03:16:04 +02:00
Hypolite Petovan c58dd5b471
Merge pull request #13128 from annando/owa
OWA: reworked code
2023-05-16 08:09:23 -04:00
Michael Vogel f604ddacb5
Update src/Module/Magic.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-05-16 13:54:46 +02:00
Michael 5782caba92 OWA: reworked code 2023-05-15 20:46:05 +00:00
Hypolite Petovan 6e6814ef35
Merge pull request #13126 from nupplaphil/bug/increment_db
Fixup incrementQueue
2023-05-14 15:24:15 -04:00
Philipp Holzer c21e6ab952
Fixup incrementQueue 2023-05-14 20:52:07 +02:00
Hypolite Petovan 6d2ae6a9e3
Merge pull request #13125 from nupplaphil/bug/xss
Escape message for notifications
2023-05-14 14:37:41 -04:00
Philipp Holzer 07856ee6b4
PHP-CS 2023-05-14 20:34:42 +02:00
Philipp Holzer 10aec7120a
add license 2023-05-14 20:32:34 +02:00
Philipp Holzer e998c059b6
Escape message for notifications 2023-05-14 20:31:20 +02:00
S. Brusch 084cd955a2 fix for probe loop in case that network of contact has changed
This fixes a loop of probes / contact updates where the network has been apup and for whatever
reason is now feed. In this case the contact hasn't been updated and rescheduled with next_update as null resulting
in a huge number of queries.

The call to hasLocalData has been moved a bit up as it checks for values that otherwise would be emptied befare the call.

Fixes #13037
2023-05-14 15:38:47 +02:00
Philipp d272cecd55
Merge pull request #13123 from MrPetovan/bug/xss-notifications
Escape notification text in /notifications module
2023-05-14 15:25:28 +02:00
Hypolite Petovan 30c4883aa6 Escape notification text in /notifications module
- This was causing literal HTML display names to be interpreted in the page
2023-05-14 09:13:26 -04:00
Hypolite Petovan 89d57a3484
Merge pull request #13118 from nupplaphil/feat/db_refac
DB encapsulations
2023-05-14 08:46:39 -04:00
Philipp Holzer 8c2678c82f
fixups 2023-05-14 11:18:59 +02:00
Philipp Holzer a74c0e86c9
PHP-CS ... 2023-05-13 22:46:10 +02:00
Philipp Holzer 60ea36259e
PHP-CS ... 2023-05-13 22:42:56 +02:00
Philipp Holzer 8e208a0f41
adhere PHP CC 2023-05-13 22:36:18 +02:00
Philipp Holzer db4c9773b2
add license 2023-05-13 22:35:32 +02:00
Philipp Holzer 7f184bf6fa
Adapt & remove impossible code 2023-05-13 22:27:29 +02:00
Philipp Holzer 9386adb184
Update & fix 2023-05-13 22:18:11 +02:00
Philipp Holzer 7bf2606120
Update & fix 2023-05-13 22:18:00 +02:00
Philipp Holzer 5be9c9dbaf
Use optimized update statements 2023-05-13 22:14:52 +02:00
Philipp Holzer 557d0e3aeb
Add direct field possibility 2023-05-13 22:04:51 +02:00