friendica.git/.git
4 years agoCreated updatescript
Jeroen De Meerleer [Sun, 7 Jul 2019 21:06:37 +0000 (23:06 +0200)]
Created updatescript

4 years agochanged unavailable to In a relation, deleted available
Jeroen De meerleer [Sun, 7 Jul 2019 20:36:14 +0000 (22:36 +0200)]
changed unavailable to In a relation, deleted available

4 years agoMerge pull request #7339 from annando/gcontact-update
Hypolite Petovan [Sun, 7 Jul 2019 17:28:20 +0000 (13:28 -0400)]
Merge pull request #7339 from annando/gcontact-update

Restructured Contact/GContact handling

4 years agoMerge pull request #7343 from MrPetovan/bug/notices
Michael Vogel [Sat, 6 Jul 2019 06:19:42 +0000 (08:19 +0200)]
Merge pull request #7343 from MrPetovan/bug/notices

Various small fixes

4 years agoMerge pull request #7342 from MrPetovan/bug/fatal-errors
Michael Vogel [Sat, 6 Jul 2019 06:16:06 +0000 (08:16 +0200)]
Merge pull request #7342 from MrPetovan/bug/fatal-errors

Ensure $link_item variable type when calling get_responses() in mod/photos

4 years agoDisplay correct total blocked contact count in accordion header
Hypolite Petovan [Fri, 5 Jul 2019 17:42:22 +0000 (13:42 -0400)]
Display correct total blocked contact count in accordion header

4 years ago[frio] Add expected "none.png" background image
Hypolite Petovan [Fri, 5 Jul 2019 17:41:48 +0000 (13:41 -0400)]
[frio] Add expected "none.png" background image

4 years agoEnsure $link_item variable type when calling get_responses() in mod/photos
Hypolite Petovan [Fri, 5 Jul 2019 17:40:33 +0000 (13:40 -0400)]
Ensure $link_item variable type when calling get_responses() in mod/photos

- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-508622668

4 years agoBasepath function now uses the contact field
Michael [Fri, 5 Jul 2019 06:41:48 +0000 (06:41 +0000)]
Basepath function now uses the contact field

4 years agoSimplified the Contact update
Michael [Thu, 4 Jul 2019 21:19:23 +0000 (21:19 +0000)]
Simplified the Contact update

4 years agoWe don't update inside the probing anymore
Michael [Thu, 4 Jul 2019 19:40:48 +0000 (19:40 +0000)]
We don't update inside the probing anymore

4 years agoWe now handling the contact type
Michael [Thu, 4 Jul 2019 19:31:42 +0000 (19:31 +0000)]
We now handling the contact type

4 years agoNew fields in contact table / don't update on probe
Michael [Thu, 4 Jul 2019 04:08:55 +0000 (04:08 +0000)]
New fields in contact table / don't update on probe

4 years agoMerge pull request #7336 from MrPetovan/bug/globalcommunity-silence-getidforurl
Philipp [Wed, 3 Jul 2019 14:47:37 +0000 (16:47 +0200)]
Merge pull request #7336 from MrPetovan/bug/globalcommunity-silence-getidforurl

Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup

4 years agoUpdate gcontact when public contact is updated
Michael [Wed, 3 Jul 2019 05:46:35 +0000 (05:46 +0000)]
Update gcontact when public contact is updated

4 years agoUse Contact::getIdForURL instead of Probe::uri and manual contact table lookup
Hypolite Petovan [Tue, 2 Jul 2019 23:25:24 +0000 (19:25 -0400)]
Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup

- Address https://forum.friendi.ca/display/0b6b25a8-215d-1bab-29c9-77a221796252
- Normalize quote style
- Remove deprecated get_app() call

4 years agoUse the term-date as archive date
Michael [Tue, 2 Jul 2019 14:46:04 +0000 (14:46 +0000)]
Use the term-date as archive date

4 years agoUpdate the gcontact entry when the public contact entry has changed
Michael [Tue, 2 Jul 2019 09:06:48 +0000 (09:06 +0000)]
Update the gcontact entry when the public contact entry has changed

4 years agoMerge pull request #7334 from annando/federated-protocol
Hypolite Petovan [Tue, 2 Jul 2019 01:52:55 +0000 (21:52 -0400)]
Merge pull request #7334 from annando/federated-protocol

New constant for federated protocols

4 years agoNow without array_merge
Michael [Mon, 1 Jul 2019 22:14:34 +0000 (22:14 +0000)]
Now without array_merge

4 years agoRemoved comment line
Michael [Mon, 1 Jul 2019 18:09:40 +0000 (18:09 +0000)]
Removed comment line

4 years agoNew constant for federated protocols
Michael [Mon, 1 Jul 2019 18:00:55 +0000 (18:00 +0000)]
New constant for federated protocols

4 years agoMerge pull request #7332 from MrPetovan/bug/fatal-errors
Michael Vogel [Sun, 30 Jun 2019 16:23:33 +0000 (18:23 +0200)]
Merge pull request #7332 from MrPetovan/bug/fatal-errors

Fix missing App object in Worker\OnePoll

4 years agoFix missing App object in Worker\OnePoll
Hypolite Petovan [Sun, 30 Jun 2019 16:16:18 +0000 (12:16 -0400)]
Fix missing App object in Worker\OnePoll

4 years agoMerge pull request #7329 from annando/issue-4815
Hypolite Petovan [Sat, 29 Jun 2019 20:56:49 +0000 (16:56 -0400)]
Merge pull request #7329 from annando/issue-4815

Issue 4815: Silently ignoring trailing @ at follow requests

4 years agoleading, trailing, all the same :-)
Michael [Sat, 29 Jun 2019 20:09:23 +0000 (20:09 +0000)]
leading, trailing, all the same :-)

4 years agoIssue 4815: Silently ignoring trailing @ at follow requests
Michael [Sat, 29 Jun 2019 19:01:07 +0000 (19:01 +0000)]
Issue 4815: Silently ignoring trailing @ at follow requests

4 years agoMerge pull request #7328 from annando/fix-delivery
Hypolite Petovan [Sat, 29 Jun 2019 09:01:29 +0000 (05:01 -0400)]
Merge pull request #7328 from annando/fix-delivery

Item delivery data must only be stored when there is data

4 years agoItem delivery data must only be stored when there is data
Michael [Sat, 29 Jun 2019 08:30:48 +0000 (08:30 +0000)]
Item delivery data must only be stored when there is data

4 years agoMerge pull request #7324 from annando/delivery-statistics
Hypolite Petovan [Fri, 28 Jun 2019 23:03:15 +0000 (19:03 -0400)]
Merge pull request #7324 from annando/delivery-statistics

Collect data about used protocols for delivery

4 years agoMerge remote-tracking branch 'upstream/develop' into delivery-statistics
Michael [Fri, 28 Jun 2019 14:08:54 +0000 (14:08 +0000)]
Merge remote-tracking branch 'upstream/develop' into delivery-statistics

4 years agoMerge pull request #7323 from annando/contact-discovery
Hypolite Petovan [Fri, 28 Jun 2019 11:08:57 +0000 (07:08 -0400)]
Merge pull request #7323 from annando/contact-discovery

Removing functionality from OnePoll.php

4 years agoCollect data about used protocols for delivery
Michael [Fri, 28 Jun 2019 09:03:58 +0000 (09:03 +0000)]
Collect data about used protocols for delivery

4 years agorestore updating of the public contact
Michael [Fri, 28 Jun 2019 04:34:01 +0000 (04:34 +0000)]
restore updating of the public contact

4 years agoAvoid overwriting of avatars for feeds
Michael [Fri, 28 Jun 2019 04:26:49 +0000 (04:26 +0000)]
Avoid overwriting of avatars for feeds

4 years agoFix a missing variable
Michael [Fri, 28 Jun 2019 02:46:56 +0000 (02:46 +0000)]
Fix a missing variable

4 years agoPolling functions are split into several functions
Michael [Thu, 27 Jun 2019 20:38:09 +0000 (20:38 +0000)]
Polling functions are split into several functions

4 years agoLast old query replaced in OnePoll.php
Michael [Thu, 27 Jun 2019 16:21:23 +0000 (16:21 +0000)]
Last old query replaced in OnePoll.php

4 years agoReplace old database queries
Michael [Thu, 27 Jun 2019 13:30:26 +0000 (13:30 +0000)]
Replace old database queries

4 years agoRemoving many now unused or duplicated tasks from OnePoll
Michael [Thu, 27 Jun 2019 05:38:16 +0000 (05:38 +0000)]
Removing many now unused or duplicated tasks from OnePoll

4 years agoArchive/unarchive the contacts
Michael [Thu, 27 Jun 2019 05:03:58 +0000 (05:03 +0000)]
Archive/unarchive the contacts

4 years agoUnused parts removed, query refurbished
Michael [Wed, 26 Jun 2019 05:18:11 +0000 (05:18 +0000)]
Unused parts removed, query refurbished

4 years agoChanged logging
Michael [Tue, 25 Jun 2019 17:36:24 +0000 (17:36 +0000)]
Changed logging

4 years agoMerge pull request #7318 from deantownsley/lessbubbles
Hypolite Petovan [Tue, 25 Jun 2019 03:09:41 +0000 (23:09 -0400)]
Merge pull request #7318 from deantownsley/lessbubbles

Don't try to auth for public images

4 years agoAdd spaces for standards compliance
Dean Townsley [Tue, 25 Jun 2019 02:37:44 +0000 (21:37 -0500)]
Add spaces for standards compliance

4 years agoDon't try to auth for public images
Dean Townsley [Tue, 25 Jun 2019 00:45:50 +0000 (19:45 -0500)]
Don't try to auth for public images

4 years agoMerge pull request #7296 from MrPetovan/task/smilies-replace
Michael Vogel [Mon, 24 Jun 2019 20:05:37 +0000 (22:05 +0200)]
Merge pull request #7296 from MrPetovan/task/smilies-replace

Limit smilies replacement to BBCode::convert

4 years agoMerge pull request #7312 from nupplaphil/task/DBA_Wrapper
Hypolite Petovan [Mon, 24 Jun 2019 11:05:23 +0000 (07:05 -0400)]
Merge pull request #7312 from nupplaphil/task/DBA_Wrapper

Creating Database class out of DBA (nearly 1:1 - copy)

4 years agoRebase type-hint based on https://github.com/friendica/friendica/pull/7266/commits...
Philipp Holzer [Sat, 15 Jun 2019 11:11:12 +0000 (13:11 +0200)]
Rebase type-hint based on https://github.com/friendica/friendica/pull/7266/commits/af9ce6b92acde542419e2b5fed7c73f3f7a87472

4 years agoMoving from DBA to Database
Philipp Holzer [Thu, 6 Jun 2019 22:10:45 +0000 (00:10 +0200)]
Moving from DBA to Database

4 years agoMerge remote-tracking branch 'upstream/develop' into contact-discovery
Michael [Mon, 24 Jun 2019 05:41:10 +0000 (05:41 +0000)]
Merge remote-tracking branch 'upstream/develop' into contact-discovery

4 years agoMoving functionality to the contact model
Michael [Mon, 24 Jun 2019 03:25:01 +0000 (03:25 +0000)]
Moving functionality to the contact model

4 years agoMerge remote-tracking branch 'upstream/master' into contact-discovery
Michael [Mon, 24 Jun 2019 03:23:57 +0000 (03:23 +0000)]
Merge remote-tracking branch 'upstream/master' into contact-discovery

4 years agoUse Unicode to convert multiple hearts in Content\Smilies
Hypolite Petovan [Fri, 21 Jun 2019 00:25:14 +0000 (20:25 -0400)]
Use Unicode to convert multiple hearts in Content\Smilies

4 years agoFix typo in docblock in include/text
Hypolite Petovan [Thu, 20 Jun 2019 23:31:47 +0000 (19:31 -0400)]
Fix typo in docblock in include/text

4 years agoUpdate BBCode::convert test mock-ups
Hypolite Petovan [Thu, 20 Jun 2019 20:14:05 +0000 (16:14 -0400)]
Update BBCode::convert test mock-ups

4 years agoLimit smilies replacement to BBCode::convert
Hypolite Petovan [Thu, 20 Jun 2019 19:00:33 +0000 (15:00 -0400)]
Limit smilies replacement to BBCode::convert

4 years agoWelcome 2019.09-dev!
Hypolite Petovan [Sun, 23 Jun 2019 21:52:05 +0000 (17:52 -0400)]
Welcome 2019.09-dev!

4 years agoMerge branch 'master' into develop
Hypolite Petovan [Sun, 23 Jun 2019 21:40:52 +0000 (17:40 -0400)]
Merge branch 'master' into develop

4 years agoUpdate Composer archive settings
Hypolite Petovan [Sun, 23 Jun 2019 21:38:12 +0000 (17:38 -0400)]
Update Composer archive settings

4 years agoMerge branch '2019.06-rc' 2019.06
Hypolite Petovan [Sun, 23 Jun 2019 19:30:44 +0000 (15:30 -0400)]
Merge branch '2019.06-rc'

# Conflicts:
# CHANGELOG
# VERSION
# boot.php

4 years agoUpdated version constants for 2019.06 release
Hypolite Petovan [Sun, 23 Jun 2019 19:28:38 +0000 (15:28 -0400)]
Updated version constants for 2019.06 release

4 years agoUpdated CHANGELOG for 2019.06 release
Hypolite Petovan [Sun, 23 Jun 2019 19:26:48 +0000 (15:26 -0400)]
Updated CHANGELOG for 2019.06 release

4 years agoMerge pull request #7305 from deantownsley/imageauthfix
Hypolite Petovan [Sun, 23 Jun 2019 19:18:15 +0000 (15:18 -0400)]
Merge pull request #7305 from deantownsley/imageauthfix

Make authentication work for local private images

4 years agoMerge pull request #7307 from annando/delete-events
Hypolite Petovan [Sun, 23 Jun 2019 13:53:35 +0000 (09:53 -0400)]
Merge pull request #7307 from annando/delete-events

Fix for distribution of event deletions

4 years agotodo added
Michael Vogel [Sun, 23 Jun 2019 10:01:14 +0000 (12:01 +0200)]
todo added

4 years agoConstantly updating public contacts
Michael [Sun, 23 Jun 2019 09:27:40 +0000 (09:27 +0000)]
Constantly updating public contacts

4 years agoFix for distribution of event deletions
Michael Vogel [Sun, 23 Jun 2019 06:41:49 +0000 (08:41 +0200)]
Fix for distribution of event deletions

4 years agoMerge pull request #7304 from MrPetovan/bug/smilies-escape-code-blocks
Philipp [Sun, 23 Jun 2019 01:00:22 +0000 (03:00 +0200)]
Merge pull request #7304 from MrPetovan/bug/smilies-escape-code-blocks

Escape HTML pre-formatted blocks before converting smilies

4 years agoClarify comment and log message
Dean Townsley [Sun, 23 Jun 2019 00:08:34 +0000 (19:08 -0500)]
Clarify comment and log message

4 years agoUse User:: API insteadd of direct database read
Dean Townsley [Sat, 22 Jun 2019 23:56:33 +0000 (18:56 -0500)]
Use User:: API insteadd of direct database read

4 years agoMerge pull request #7306 from annando/perform-activity
Hypolite Petovan [Sat, 22 Jun 2019 23:23:09 +0000 (19:23 -0400)]
Merge pull request #7306 from annando/perform-activity

Fix the processing of event activities

4 years agoFix the processing of event activities
Michael Vogel [Sat, 22 Jun 2019 22:38:52 +0000 (00:38 +0200)]
Fix the processing of event activities

4 years agoEscape HTML pre-formatted blocks before converting smilies
Hypolite Petovan [Sat, 22 Jun 2019 22:20:43 +0000 (18:20 -0400)]
Escape HTML pre-formatted blocks before converting smilies

4 years agoMerge pull request #7302 from friendica/revert-7286-bug/invading-smilies
Michael Vogel [Sat, 22 Jun 2019 20:09:09 +0000 (22:09 +0200)]
Merge pull request #7302 from friendica/revert-7286-bug/invading-smilies

Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray"

4 years agoRevert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray"
Michael Vogel [Sat, 22 Jun 2019 20:06:43 +0000 (22:06 +0200)]
Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray"

4 years agoEnable multi-auth in dfrn autoRedir
Dean Townsley [Sat, 22 Jun 2019 17:34:54 +0000 (12:34 -0500)]
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.

4 years agoAdd auth to load sequence for photos
Dean Townsley [Sat, 22 Jun 2019 17:24:30 +0000 (12:24 -0500)]
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.

4 years agoMerge pull request #7291 from MrPetovan/bug/2209-update-default-log-location
Michael Vogel [Sat, 22 Jun 2019 10:56:25 +0000 (12:56 +0200)]
Merge pull request #7291 from MrPetovan/bug/2209-update-default-log-location

Update default log location

4 years agoMerge pull request #7286 from MrPetovan/bug/invading-smilies
Michael Vogel [Sat, 22 Jun 2019 10:51:49 +0000 (12:51 +0200)]
Merge pull request #7286 from MrPetovan/bug/invading-smilies

Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray

4 years agoEscape all the HTML pre-formatted blocks in Smilies::replaceFromArray
Hypolite Petovan [Fri, 21 Jun 2019 00:22:26 +0000 (20:22 -0400)]
Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray

4 years agoAdd log folder to project gitignore
Hypolite Petovan [Sat, 22 Jun 2019 07:49:58 +0000 (03:49 -0400)]
Add log folder to project gitignore

4 years agoMerge pull request #7294 from annando/public-dfrn
Hypolite Petovan [Sat, 22 Jun 2019 07:28:51 +0000 (03:28 -0400)]
Merge pull request #7294 from annando/public-dfrn

Fix receiving of DFRN posts with public envelope

4 years agoMerge pull request #7295 from tobiasd/20190622-lang
Michael Vogel [Sat, 22 Jun 2019 06:56:36 +0000 (08:56 +0200)]
Merge pull request #7295 from tobiasd/20190622-lang

core translation update

4 years agoEN US translation update THX AndyH3
Tobias Diekershoff [Sat, 22 Jun 2019 06:04:46 +0000 (08:04 +0200)]
EN US translation update THX AndyH3

4 years agoEN GB translation update THX AndyH3
Tobias Diekershoff [Sat, 22 Jun 2019 05:43:24 +0000 (07:43 +0200)]
EN GB translation update THX AndyH3

4 years agoupdate FR translations THX Valvin A.
Tobias Diekershoff [Sat, 22 Jun 2019 05:40:10 +0000 (07:40 +0200)]
update FR translations THX Valvin A.

4 years agoDE translation update THX Copis
Tobias Diekershoff [Sat, 22 Jun 2019 05:29:52 +0000 (07:29 +0200)]
DE translation update THX Copis

4 years agoPL translation update THX waldis
Tobias Diekershoff [Sat, 22 Jun 2019 05:29:03 +0000 (07:29 +0200)]
PL translation update THX waldis

4 years agoCS translation update THX Aditoo
Tobias Diekershoff [Sat, 22 Jun 2019 05:23:39 +0000 (07:23 +0200)]
CS translation update THX Aditoo

4 years agoFix receiving of DFRN posts with public envelope
Michael [Sat, 22 Jun 2019 04:17:38 +0000 (04:17 +0000)]
Fix receiving of DFRN posts with public envelope

4 years agoMerge pull request #7292 from annando/notice
Hypolite Petovan [Fri, 21 Jun 2019 19:42:27 +0000 (15:42 -0400)]
Merge pull request #7292 from annando/notice

Fix a notice when the author is missing

4 years agoFix a notice when the author is missing
Michael [Fri, 21 Jun 2019 17:57:26 +0000 (17:57 +0000)]
Fix a notice when the author is missing

4 years agoUpdate default log location
Hypolite Petovan [Fri, 21 Jun 2019 12:52:22 +0000 (08:52 -0400)]
Update default log location

- Prevents conflict with /friendica module

4 years agoMerge pull request #7289 from tobiasd/20190621-credits
Philipp [Fri, 21 Jun 2019 06:56:03 +0000 (08:56 +0200)]
Merge pull request #7289 from tobiasd/20190621-credits

updated the credits for 2019.06

4 years agoupdated the credits for 2019.06
Tobias Diekershoff [Fri, 21 Jun 2019 04:45:20 +0000 (06:45 +0200)]
updated the credits for 2019.06

4 years agoMerge pull request #7288 from annando/fix-search
Hypolite Petovan [Thu, 20 Jun 2019 23:33:00 +0000 (19:33 -0400)]
Merge pull request #7288 from annando/fix-search

Fix searching for contacts

4 years agoMerge pull request #7287 from annando/issue-6477
Hypolite Petovan [Thu, 20 Jun 2019 23:32:02 +0000 (19:32 -0400)]
Merge pull request #7287 from annando/issue-6477

Issue 6477: Use the correct content-type to resize the images

4 years agoFix searching for contacts
Michael [Thu, 20 Jun 2019 21:56:18 +0000 (21:56 +0000)]
Fix searching for contacts

4 years agoIssue 6477: Use the correct content-type to resize the images
Michael [Thu, 20 Jun 2019 20:09:33 +0000 (20:09 +0000)]
Issue 6477: Use the correct content-type to resize the images