Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-15 01:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
37696 commits 3 branches 64 tags 246 MiB
Commit graph

37696 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
07856ee6b4
PHP-CS 2023-05-14 20:34:42 +02:00
Philipp
10aec7120a
add license 2023-05-14 20:32:34 +02:00
Philipp
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
8c2678c82f
fixups 2023-05-14 11:18:59 +02:00
Philipp
a74c0e86c9
PHP-CS ... 2023-05-13 22:46:10 +02:00
Philipp
60ea36259e
PHP-CS ... 2023-05-13 22:42:56 +02:00
Philipp
8e208a0f41
adhere PHP CC 2023-05-13 22:36:18 +02:00
Philipp
db4c9773b2
add license 2023-05-13 22:35:32 +02:00
Philipp
7f184bf6fa
Adapt & remove impossible code 2023-05-13 22:27:29 +02:00
Philipp
9386adb184
Update & fix 2023-05-13 22:18:11 +02:00
Philipp
7bf2606120
Update & fix 2023-05-13 22:18:00 +02:00
Philipp
5be9c9dbaf
Use optimized update statements 2023-05-13 22:14:52 +02:00
Philipp
557d0e3aeb
Add direct field possibility 2023-05-13 22:04:51 +02:00
Philipp
db5078d51c
Move "OPTIMIZE TABLE" to own Database function 2023-05-13 21:05:22 +02:00
Michael Vogel
32f322a4c1
Merge pull request #13116 from MrPetovan/bug/warnings 
Remove misleading concatenation in XPath expression in Protocol\Feed
 2023-05-13 07:22:19 +02:00
Hypolite Petovan
add913da27 Remove misleading concatenation in XPath expression in Protocol\Feed 
- Variable could be directly interpolated
- Address https://github.com/friendica/friendica/issues/13025#issuecomment-1543335001
- Address https://github.com/friendica/friendica/issues/13025#issuecomment-1545074703
 2023-05-12 06:06:34 -04:00
Michael
f709ef96f7 Updated messages.po 2023-05-12 07:58:28 +00:00
Michael
f45dbf8b01 Fix: Contacts can now be searched with a leading @ again. 2023-05-12 07:00:02 +00:00
Hypolite Petovan
725f99c813
Merge pull request #13113 from annando/baseurl 
Ensure that the baseurl return value is a string
 2023-05-11 05:05:16 -04:00
Michael
e13a31c4fe Ensure that the baseurl return value is a string 2023-05-11 08:13:19 +00:00
Hypolite Petovan
be8251ef0c
Merge pull request #13110 from anubis2814/develop 
[frio] Changed mobile icon for sidebar
 2023-05-10 17:19:29 -04:00
Michael
2b3c1972db Differentiate between no description or an empty description 2023-05-10 17:59:25 +00:00
Michael
992b6eed1d Fixed test - again 2023-05-10 16:57:08 +00:00
Michael Vogel
45dda2c064
Update src/Util/Images.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-05-10 17:06:16 +02:00
Michael
3554b61508 Fix tests 2023-05-10 08:48:21 +00:00
Michael
c5ca5bfdf8 Function renamed 2023-05-10 07:54:15 +00:00
Michael
7d91cc73de Unifiy the creation of photo links 2023-05-09 20:44:58 +00:00
Hypolite Petovan
4c40bc164d
Merge pull request #13103 from annando/better-preview 
Improved preview size
 2023-05-09 03:43:58 -04:00
Michael
cf74016077 Updated messages.po 2023-05-09 06:35:21 +00:00
Michael
76ccc52406 Improved variable naming 2023-05-09 06:32:16 +00:00
Michael
91a12295ff Calculate image size if not provided 2023-05-09 05:59:07 +00:00
Michael
b692146533 Remove unwanted stuff 2023-05-09 05:34:56 +00:00
Michael
d20cae82ad Use old error message when storing fails 2023-05-09 05:32:52 +00:00
Michael
d83073f2a2 Unifiy storing of photos with previews 2023-05-09 05:29:05 +00:00
Michael
1789266859 Improved preview size 2023-05-08 21:32:38 +00:00
Michael Vogel
b5de664ef6
Merge pull request #13100 from MrPetovan/bug/fatal-errors 
Wrap HTTP client call in try catch in Network\Probe
 2023-05-07 12:27:27 +02:00
Michael Vogel
46d3778ee8
Merge pull request #13099 from MrPetovan/bug/warnings 
Address several warnings
 2023-05-07 08:25:44 +02:00