Commit graph

24378 commits

Author SHA1 Message Date
Michael
9bf065c9d8 Merge remote-tracking branch 'upstream/develop' into delivery-statistics 2019-06-28 14:08:54 +00:00
Hypolite Petovan
7b4bba66db
Merge pull request #7323 from annando/contact-discovery
Removing functionality from OnePoll.php
2019-06-28 07:08:57 -04:00
Michael
0a15222576 Collect data about used protocols for delivery 2019-06-28 09:03:58 +00:00
Michael
e48fbeda0a restore updating of the public contact 2019-06-28 04:34:01 +00:00
Michael
8838a1f2d1 Avoid overwriting of avatars for feeds 2019-06-28 04:26:49 +00:00
Michael
96651ae76d Fix a missing variable 2019-06-28 02:46:56 +00:00
Michael
d552db5c55 Polling functions are split into several functions 2019-06-27 20:38:09 +00:00
Michael
7e7acf5763 Last old query replaced in OnePoll.php 2019-06-27 16:21:23 +00:00
Michael
d4dc2a129e Replace old database queries 2019-06-27 13:30:26 +00:00
Michael
59b1a1aced Removing many now unused or duplicated tasks from OnePoll 2019-06-27 05:38:16 +00:00
Michael
4db3c79d04 Archive/unarchive the contacts 2019-06-27 05:03:58 +00:00
Michael
9caa8bae35 Unused parts removed, query refurbished 2019-06-26 05:18:11 +00:00
Michael
9b49fd7f3f Changed logging 2019-06-25 17:36:24 +00:00
Hypolite Petovan
8a1f31b322
Merge pull request #7318 from deantownsley/lessbubbles
Don't try to auth for public images
2019-06-24 23:09:41 -04:00
Dean Townsley
fdbd160141 Add spaces for standards compliance 2019-06-24 21:37:44 -05:00
Dean Townsley
59553ab978 Don't try to auth for public images 2019-06-24 19:45:50 -05:00
Michael Vogel
26accbe3ef
Merge pull request #7296 from MrPetovan/task/smilies-replace
Limit smilies replacement to BBCode::convert
2019-06-24 22:05:37 +02:00
Hypolite Petovan
8214aa287d
Merge pull request #7312 from nupplaphil/task/DBA_Wrapper
Creating Database class out of DBA (nearly 1:1 - copy)
2019-06-24 07:05:23 -04:00
Philipp Holzer
91c295b55f
Rebase type-hint based on af9ce6b92a 2019-06-24 09:36:07 +02:00
Philipp Holzer
082634adbc
Moving from DBA to Database 2019-06-24 09:36:07 +02:00
Michael
80f4214d91 Merge remote-tracking branch 'upstream/develop' into contact-discovery 2019-06-24 05:41:10 +00:00
Michael
bca1dc1ca4 Moving functionality to the contact model 2019-06-24 03:25:01 +00:00
Michael
037cf01a15 Merge remote-tracking branch 'upstream/master' into contact-discovery 2019-06-24 03:23:57 +00:00
Hypolite Petovan
2fb70bd5f2 Use Unicode to convert multiple hearts in Content\Smilies 2019-06-23 17:53:25 -04:00
Hypolite Petovan
b51fb8c994 Fix typo in docblock in include/text 2019-06-23 17:53:25 -04:00
Hypolite Petovan
19b7398c6a Update BBCode::convert test mock-ups 2019-06-23 17:53:25 -04:00
Hypolite Petovan
9545ff614b Limit smilies replacement to BBCode::convert 2019-06-23 17:53:25 -04:00
Hypolite Petovan
5e4ace271b Welcome 2019.09-dev! 2019-06-23 17:52:05 -04:00
Hypolite Petovan
b9ab613777 Merge branch 'master' into develop 2019-06-23 17:40:52 -04:00
Hypolite Petovan
f0c8543241 Update Composer archive settings 2019-06-23 17:38:12 -04:00
Hypolite Petovan
c1f99c70b1 Merge branch '2019.06-rc'
# Conflicts:
#	CHANGELOG
#	VERSION
#	boot.php
2019-06-23 15:30:44 -04:00
Hypolite Petovan
a25ed827c9 Updated version constants for 2019.06 release 2019-06-23 15:28:38 -04:00
Hypolite Petovan
e4714cc504 Updated CHANGELOG for 2019.06 release 2019-06-23 15:26:48 -04:00
Hypolite Petovan
fa191bd821
Merge pull request #7305 from deantownsley/imageauthfix
Make authentication work for local private images
2019-06-23 15:18:15 -04:00
Hypolite Petovan
2f42cb08fa
Merge pull request #7307 from annando/delete-events
Fix for distribution of event deletions
2019-06-23 09:53:35 -04:00
Michael Vogel
9559266075 todo added 2019-06-23 12:01:14 +02:00
Michael
857469d16a Constantly updating public contacts 2019-06-23 09:27:40 +00:00
Michael Vogel
f84e2e9d93 Fix for distribution of event deletions 2019-06-23 08:41:49 +02:00
Philipp
5306622225
Merge pull request #7304 from MrPetovan/bug/smilies-escape-code-blocks
Escape HTML pre-formatted blocks before converting smilies
2019-06-23 03:00:22 +02:00
Dean Townsley
0c6a0942cc Clarify comment and log message 2019-06-22 19:08:34 -05:00
Dean Townsley
9dff3d2b6d Use User:: API insteadd of direct database read 2019-06-22 18:56:33 -05:00
Hypolite Petovan
dc25355412
Merge pull request #7306 from annando/perform-activity
Fix the processing of event activities
2019-06-22 19:23:09 -04:00
Michael Vogel
449305e527 Fix the processing of event activities 2019-06-23 00:38:52 +02:00
Hypolite Petovan
cf11f57a5b Escape HTML pre-formatted blocks before converting smilies 2019-06-22 18:22:37 -04:00
Michael Vogel
daaf30e502
Merge pull request #7302 from friendica/revert-7286-bug/invading-smilies
Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray"
2019-06-22 22:09:09 +02:00
Michael Vogel
1883cfba24
Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray" 2019-06-22 22:06:43 +02:00
Dean Townsley
042fcfeb50 Enable multi-auth in dfrn autoRedir
Update checks to account for a user being authenticated to multiple
contacts on the local server at the same time.
It was also necessary to remove a looping procection to make this work
correcly with browsers that open multiple connections because the
information about what contacts are authenticated is stored in the PHP
session.
2019-06-22 12:34:54 -05:00
Dean Townsley
b5e195b415 Add auth to load sequence for photos
This allows private photos to load on any page.  Previously auth
depended on some other thing like the enclosing page triggering the
authentication of the specific contact for the photo owner.
2019-06-22 12:24:30 -05:00
Michael Vogel
cd2f390df6
Merge pull request #7291 from MrPetovan/bug/2209-update-default-log-location
Update default log location
2019-06-22 12:56:25 +02:00
Michael Vogel
85772f02ca
Merge pull request #7286 from MrPetovan/bug/invading-smilies
Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray
2019-06-22 12:51:49 +02:00