friendica.git/.git
5 years agoMerge pull request #6752 from MrPetovan/bug/notices
Michael Vogel [Sun, 24 Feb 2019 20:30:07 +0000 (21:30 +0100)]
Merge pull request #6752 from MrPetovan/bug/notices

Fix various notices

5 years agoMerge pull request #6751 from MrPetovan/bug/fatal-errors
Michael Vogel [Sun, 24 Feb 2019 20:07:13 +0000 (21:07 +0100)]
Merge pull request #6751 from MrPetovan/bug/fatal-errors

Add missing use statement in Model\Term

5 years agoAdd scheme input protection in frio/config.php
Hypolite Petovan [Sun, 24 Feb 2019 19:32:51 +0000 (14:32 -0500)]
Add scheme input protection in frio/config.php

- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-464912016

5 years agoAdd empty entry author if contact query fails in DFRN
Hypolite Petovan [Sun, 24 Feb 2019 19:00:40 +0000 (14:00 -0500)]
Add empty entry author if contact query fails in DFRN

- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-462722599

5 years agoFix missing avatar key in DFRN
Hypolite Petovan [Sun, 24 Feb 2019 18:40:04 +0000 (13:40 -0500)]
Fix missing avatar key in DFRN

- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-456839092

5 years agoStop appending entry when parent is missing in OStatus
Hypolite Petovan [Sun, 24 Feb 2019 18:36:37 +0000 (13:36 -0500)]
Stop appending entry when parent is missing in OStatus

- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-455785854

5 years agoAdd missing use statement in Model\Term
Hypolite Petovan [Sun, 24 Feb 2019 18:33:11 +0000 (13:33 -0500)]
Add missing use statement in Model\Term

5 years agoMerge pull request #6749 from nupplaphil/6386-php_fatal
Hypolite Petovan [Sun, 24 Feb 2019 17:55:34 +0000 (12:55 -0500)]
Merge pull request #6749 from nupplaphil/6386-php_fatal

Fixing appending child at DFRN without a parent id.

5 years agoupdate phpdoc
Philipp Holzer [Sun, 24 Feb 2019 15:31:16 +0000 (16:31 +0100)]
update phpdoc

5 years agoMerge pull request #6747 from nupplaphil/issue/6677-frio_admin
Hypolite Petovan [Sun, 24 Feb 2019 15:30:37 +0000 (10:30 -0500)]
Merge pull request #6747 from nupplaphil/issue/6677-frio_admin

Fixing frio theme customization for admin

5 years agoFixing appending child at DFRN without a parent id.
Philipp Holzer [Sun, 24 Feb 2019 15:30:09 +0000 (16:30 +0100)]
Fixing appending child at DFRN without a parent id.

5 years agoempty is better than isset
Philipp Holzer [Sun, 24 Feb 2019 14:48:30 +0000 (15:48 +0100)]
empty is better than isset

5 years agoMerge pull request #6746 from nupplaphil/issue/6338-notices
Michael Vogel [Sun, 24 Feb 2019 14:44:54 +0000 (15:44 +0100)]
Merge pull request #6746 from nupplaphil/issue/6338-notices

Fixing notices

5 years agoMerge pull request #6726 from MrPetovan/task/6676-fix-implicit-mentions
Michael Vogel [Sun, 24 Feb 2019 14:40:11 +0000 (15:40 +0100)]
Merge pull request #6726 from MrPetovan/task/6676-fix-implicit-mentions

Fix last batch of implicit mentions issues

5 years agoFixing admin scheme-change in frio
Philipp Holzer [Sun, 24 Feb 2019 14:40:05 +0000 (15:40 +0100)]
Fixing admin scheme-change in frio

5 years agoFixing https://github.com/friendica/friendica/issues/6338#issuecomment-466749280
Philipp Holzer [Sun, 24 Feb 2019 14:22:14 +0000 (15:22 +0100)]
Fixing https://github.com/friendica/friendica/issues/6338#issuecomment-466749280

5 years agoFixing https://github.com/friendica/friendica/issues/6338#issuecomment-458030934
Philipp Holzer [Sun, 24 Feb 2019 14:15:25 +0000 (15:15 +0100)]
Fixing https://github.com/friendica/friendica/issues/6338#issuecomment-458030934

5 years agoMerge pull request #6732 from MrPetovan/bug/1777-fix-blocked-contact-group
Michael Vogel [Sun, 24 Feb 2019 13:30:36 +0000 (14:30 +0100)]
Merge pull request #6732 from MrPetovan/bug/1777-fix-blocked-contact-group

Allow to remove blocked contact from groups

5 years agoMerge pull request #6744 from nupplaphil/task/namespace_to_class
Michael Vogel [Sun, 24 Feb 2019 13:27:48 +0000 (14:27 +0100)]
Merge pull request #6744 from nupplaphil/task/namespace_to_class

Replace string namespace with *::class

5 years agoremoved silent fail of logfile permission (should get fixed with #6745 )
Philipp Holzer [Sun, 24 Feb 2019 12:57:17 +0000 (13:57 +0100)]
removed silent fail of logfile permission (should get fixed with #6745 )

5 years agoReplace string namespaces with ::class
Philipp Holzer [Sun, 24 Feb 2019 12:40:54 +0000 (13:40 +0100)]
Replace string namespaces with ::class

5 years agoMerge pull request #6740 from nupplaphil/issue/6503-force_update
Hypolite Petovan [Sun, 24 Feb 2019 12:04:54 +0000 (07:04 -0500)]
Merge pull request #6740 from nupplaphil/issue/6503-force_update

Fixing force-flag for lock-release

5 years agoadded whitespace
Philipp Holzer [Sun, 24 Feb 2019 11:51:46 +0000 (12:51 +0100)]
added whitespace

5 years agoMerge pull request #6741 from annando/worker-db-update
Tobias Diekershoff [Sun, 24 Feb 2019 11:24:11 +0000 (12:24 +0100)]
Merge pull request #6741 from annando/worker-db-update

Ensure that the database update will be processed anyway

5 years agoAdjust update parameters:
Philipp Holzer [Sun, 24 Feb 2019 11:24:09 +0000 (12:24 +0100)]
Adjust update parameters:
-f|--force         Force the update command (Even if the database structure matches)
-o|--override      Override running or stalling updates

5 years agoWe should execute the worker job for normal situations ;-)
Michael [Sun, 24 Feb 2019 10:52:40 +0000 (10:52 +0000)]
We should execute the worker job for normal situations ;-)

5 years agoEnsure that the database update will be processed anyway
Michael [Sun, 24 Feb 2019 10:43:29 +0000 (10:43 +0000)]
Ensure that the database update will be processed anyway

5 years agofixing delete
Philipp Holzer [Sun, 24 Feb 2019 09:27:56 +0000 (10:27 +0100)]
fixing delete

5 years agoFixing force-flag for lock-releasing
Philipp Holzer [Sun, 24 Feb 2019 09:08:28 +0000 (10:08 +0100)]
Fixing force-flag for lock-releasing

5 years agoMerge pull request #6737 from MrPetovan/bug/6630-fix-empty-label-profile
Michael Vogel [Sun, 24 Feb 2019 05:34:48 +0000 (06:34 +0100)]
Merge pull request #6737 from MrPetovan/bug/6630-fix-empty-label-profile

Fix "EMPTY" label in profile

5 years agoUpdate base translation strings
Hypolite Petovan [Sun, 24 Feb 2019 00:40:05 +0000 (19:40 -0500)]
Update base translation strings

5 years agoHide "never" on profile
Hypolite Petovan [Sat, 23 Feb 2019 23:30:05 +0000 (18:30 -0500)]
Hide "never" on profile

5 years agoReplace EMPTY value by empty value in profile selectors
Hypolite Petovan [Sat, 23 Feb 2019 23:29:54 +0000 (18:29 -0500)]
Replace EMPTY value by empty value in profile selectors

5 years agoMerge pull request #6735 from annando/install
Hypolite Petovan [Sat, 23 Feb 2019 23:17:28 +0000 (18:17 -0500)]
Merge pull request #6735 from annando/install

Don't allow calling the install page after the install

5 years agoFix typo in mod/profiles
Hypolite Petovan [Sat, 23 Feb 2019 23:11:48 +0000 (18:11 -0500)]
Fix typo in mod/profiles

5 years agoDelete mod/contactgroup and mod/group files
Hypolite Petovan [Sat, 23 Feb 2019 20:36:27 +0000 (15:36 -0500)]
Delete mod/contactgroup and mod/group files

5 years agoImprove contactgroupChangeMember() javascript function
Hypolite Petovan [Sat, 23 Feb 2019 20:36:06 +0000 (15:36 -0500)]
Improve contactgroupChangeMember() javascript function

- Add usage of new /group/123/add|remove/123 URL
- Add checkbox revert in case of error

5 years agoMerge /contactgroup module with Group module
Hypolite Petovan [Sat, 23 Feb 2019 20:34:45 +0000 (15:34 -0500)]
Merge /contactgroup module with Group module

5 years agoMove group module to src/
Hypolite Petovan [Sat, 23 Feb 2019 20:33:55 +0000 (15:33 -0500)]
Move group module to src/

5 years agoAdd contact removal from all groups when blocked
Hypolite Petovan [Sat, 23 Feb 2019 20:26:06 +0000 (15:26 -0500)]
Add contact removal from all groups when blocked

5 years agoAdd System::jsonError method for ajax call returns
Hypolite Petovan [Sat, 23 Feb 2019 20:25:41 +0000 (15:25 -0500)]
Add System::jsonError method for ajax call returns

5 years agoAdd doc to Model\Term
Hypolite Petovan [Sat, 23 Feb 2019 14:25:37 +0000 (09:25 -0500)]
Add doc to Model\Term

5 years agoImprove Logger calls
Hypolite Petovan [Sat, 23 Feb 2019 14:25:21 +0000 (09:25 -0500)]
Improve Logger calls

- Add context in various calls
- Remove deprecated Logger::log call in Processor

5 years agoFix implicit mentions in outgoing ActivityPub posts
Hypolite Petovan [Sat, 23 Feb 2019 04:43:32 +0000 (23:43 -0500)]
Fix implicit mentions in outgoing ActivityPub posts

- Add usage of system.disable_implicit_mentions to disable implicit mention behavior
- Add usage of item own implicit mentions to be prepended to the outgoing body

5 years agoFix implicit mentions in incoming ActivityPub posts
Hypolite Petovan [Sat, 23 Feb 2019 04:42:04 +0000 (23:42 -0500)]
Fix implicit mentions in incoming ActivityPub posts

- Use thr-parent instead of parent-uri to retrieve implicit mentions to remove from body
- Add potential implicit mentions to 'tags' array for storage in Processor::convertImplicitMentionsInTags()
- Add usage of system.disable_implicit_mentions to disable implicit mention behavior

5 years agoFix Diaspora outgoing implicit mention
Hypolite Petovan [Sat, 23 Feb 2019 04:38:59 +0000 (23:38 -0500)]
Fix Diaspora outgoing implicit mention

- Use name instead of nick for implicit mention
- Rename $parent to $toplevel_item in Diaspora::constructComment
- Use thread parent to retrieve the expected mention instead of the top level item

5 years agoAdd implicit mentions to explicit mentions default text
Hypolite Petovan [Sat, 23 Feb 2019 04:36:06 +0000 (23:36 -0500)]
Add implicit mentions to explicit mentions default text

5 years agoAdd implicit mention gathering in local posts
Hypolite Petovan [Sat, 23 Feb 2019 04:28:39 +0000 (23:28 -0500)]
Add implicit mention gathering in local posts

- Rename $parent_item to $toplevel_item in item_post()
- Add $thread_parent_id variable to distinguish from $parent_item
- Add item_add_implicit_mentions() function

5 years agoRename system.disable_mentions_removal config key to system.disable_implicit_mentions
Hypolite Petovan [Sat, 23 Feb 2019 04:23:05 +0000 (23:23 -0500)]
Rename system.disable_mentions_removal config key to system.disable_implicit_mentions

- Update configuration key description

5 years agoAdd potential debug display of implicit mentions in frio
Hypolite Petovan [Sat, 23 Feb 2019 04:03:32 +0000 (23:03 -0500)]
Add potential debug display of implicit mentions in frio

- Refactored conversation() by removing extraneous intermediary variables

5 years agoImprove Logger calls
Hypolite Petovan [Sat, 23 Feb 2019 04:00:16 +0000 (23:00 -0500)]
Improve Logger calls

- Replace various deprecated Logger::log calls
- Reassign log level for verbose log calls

5 years agoRewrite Term class
Hypolite Petovan [Sat, 23 Feb 2019 00:15:35 +0000 (19:15 -0500)]
Rewrite Term class

- Move term type constants from TERM_* to Term::*
- Move term object type constants from TERM_OBJ_* to Term::OBJECT_TYPE_*
- Add Term::isType() method
- Add Strings::startsWith()  method

5 years agoImprove /itemsource display
Hypolite Petovan [Fri, 22 Feb 2019 02:37:23 +0000 (21:37 -0500)]
Improve /itemsource display

- Add Item Id
- Add Item Terms

5 years agoNormalize Contact::magicLinkByContact method name
Hypolite Petovan [Fri, 22 Feb 2019 02:29:22 +0000 (21:29 -0500)]
Normalize Contact::magicLinkByContact method name

5 years agoOnly check once
Michael [Sat, 23 Feb 2019 22:27:03 +0000 (22:27 +0000)]
Only check once

5 years agoDon't allow calling the install page after the install had been processed
Michael [Sat, 23 Feb 2019 21:58:35 +0000 (21:58 +0000)]
Don't allow calling the install page after the install had been processed

5 years agoMerge pull request #6734 from annando/fix-follow
Hypolite Petovan [Sat, 23 Feb 2019 21:49:19 +0000 (16:49 -0500)]
Merge pull request #6734 from annando/fix-follow

Fix: Following url with html entities now works again

5 years agoFix: Following url with html entities now works again
Michael [Sat, 23 Feb 2019 21:20:56 +0000 (21:20 +0000)]
Fix: Following url with html entities now works again

5 years agoMerge pull request #6731 from annando/undefined-property
Hypolite Petovan [Sat, 23 Feb 2019 17:04:12 +0000 (12:04 -0500)]
Merge pull request #6731 from annando/undefined-property

Fixes "Undefined property: Friendica\App::$queue"

5 years agoFixes "Undefined property: Friendica\App::$queue"
Michael [Sat, 23 Feb 2019 16:08:02 +0000 (16:08 +0000)]
Fixes "Undefined property: Friendica\App::$queue"

5 years agoMerge pull request #6730 from nupplaphil/dba_reconnect
Hypolite Petovan [Sat, 23 Feb 2019 13:45:31 +0000 (08:45 -0500)]
Merge pull request #6730 from nupplaphil/dba_reconnect

DBA::(re-)connect fix for basePath

5 years agoMerge pull request #6723 from nupplaphil/issue/6658-worker_id
Hypolite Petovan [Sat, 23 Feb 2019 13:38:08 +0000 (08:38 -0500)]
Merge pull request #6723 from nupplaphil/issue/6658-worker_id

Adding worker ID to log

5 years agoFixing DBA::(re-)connect()
Philipp Holzer [Sat, 23 Feb 2019 11:50:52 +0000 (12:50 +0100)]
Fixing DBA::(re-)connect()

5 years agoFixing DBA::(re-)connect()
Philipp Holzer [Sat, 23 Feb 2019 11:49:56 +0000 (12:49 +0100)]
Fixing DBA::(re-)connect()

5 years agoFixing DBA::reconnect()
Philipp Holzer [Sat, 23 Feb 2019 11:48:39 +0000 (12:48 +0100)]
Fixing DBA::reconnect()

5 years agoreverting back workerLogger to Logger
Philipp Holzer [Sat, 23 Feb 2019 09:24:22 +0000 (10:24 +0100)]
reverting back workerLogger to Logger

5 years agoMerge pull request #6727 from nupplaphil/issue/6472-nodeinfo
Tobias Diekershoff [Sat, 23 Feb 2019 09:24:16 +0000 (10:24 +0100)]
Merge pull request #6727 from nupplaphil/issue/6472-nodeinfo

Returning 404 if nodeinfo isn't enabled

5 years agoMerge pull request #6728 from nupplaphil/issue/6337-warnings
Tobias Diekershoff [Sat, 23 Feb 2019 09:23:46 +0000 (10:23 +0100)]
Merge pull request #6728 from nupplaphil/issue/6337-warnings

Fixing Update retval warning

5 years agoFixing #issuecomment-456403983
Philipp Holzer [Sat, 23 Feb 2019 09:16:07 +0000 (10:16 +0100)]
Fixing #issuecomment-456403983

5 years agoReturn 404 if nodeinfo isn't enabled.
Philipp Holzer [Sat, 23 Feb 2019 09:10:33 +0000 (10:10 +0100)]
Return 404 if nodeinfo isn't enabled.

5 years agoMerge pull request #6725 from nupplaphil/6691-rendertime-fix
Hypolite Petovan [Sat, 23 Feb 2019 04:53:11 +0000 (23:53 -0500)]
Merge pull request #6725 from nupplaphil/6691-rendertime-fix

Addon loading fix

5 years agoMerge pull request #6724 from nupplaphil/issue/config_set
Hypolite Petovan [Sat, 23 Feb 2019 02:29:26 +0000 (21:29 -0500)]
Merge pull request #6724 from nupplaphil/issue/config_set

Config Set Bugfix

5 years agoimprove tests
Philipp Holzer [Sat, 23 Feb 2019 00:37:29 +0000 (01:37 +0100)]
improve tests

5 years ago[rendertime] Timing problem during addon config read
Philipp Holzer [Sat, 23 Feb 2019 00:24:08 +0000 (01:24 +0100)]
[rendertime] Timing problem during addon config read

5 years agocleanup
Philipp Holzer [Fri, 22 Feb 2019 23:53:31 +0000 (00:53 +0100)]
cleanup

5 years agobugfixing test
Philipp Holzer [Fri, 22 Feb 2019 23:51:08 +0000 (00:51 +0100)]
bugfixing test

5 years agofixing preload adapter
Philipp Holzer [Fri, 22 Feb 2019 23:23:41 +0000 (00:23 +0100)]
fixing preload adapter

5 years agofixing tests and preload config
Philipp Holzer [Fri, 22 Feb 2019 23:09:57 +0000 (00:09 +0100)]
fixing tests and preload config

5 years agobugfix marking of db-values
Philipp Holzer [Fri, 22 Feb 2019 22:57:04 +0000 (23:57 +0100)]
bugfix marking of db-values

5 years agoreadded note
Philipp Holzer [Fri, 22 Feb 2019 22:55:13 +0000 (23:55 +0100)]
readded note

5 years agoswitched back to logger
Philipp Holzer [Fri, 22 Feb 2019 22:53:20 +0000 (23:53 +0100)]
switched back to logger

5 years agoBugfixings in Config
Philipp Holzer [Fri, 22 Feb 2019 22:51:13 +0000 (23:51 +0100)]
Bugfixings in Config

- replaced usage of "!<unset>!" with null-returns
- fixed bool settings (0/1)
- fixed overriding config-values
- fixed basepath problems

5 years agoskip WorkerLogger for Logging
Philipp Holzer [Fri, 22 Feb 2019 19:45:13 +0000 (20:45 +0100)]
skip WorkerLogger for Logging

5 years agoFormatting logger to new style
Philipp Holzer [Fri, 22 Feb 2019 19:41:13 +0000 (20:41 +0100)]
Formatting logger to new style

5 years agoRemoved unused code
Philipp Holzer [Fri, 22 Feb 2019 19:24:10 +0000 (20:24 +0100)]
Removed unused code

5 years agoAdding worker id & functionname to worker logs
Philipp Holzer [Fri, 22 Feb 2019 19:10:27 +0000 (20:10 +0100)]
Adding worker id & functionname to worker logs

5 years agoMerge pull request #6717 from annando/network-mentions
Hypolite Petovan [Fri, 22 Feb 2019 02:14:23 +0000 (21:14 -0500)]
Merge pull request #6717 from annando/network-mentions

Automatically adding mentions in the network stream hadn't really worked

5 years agoMerge pull request #6719 from annando/worker-scheduler
Hypolite Petovan [Thu, 21 Feb 2019 21:12:19 +0000 (16:12 -0500)]
Merge pull request #6719 from annando/worker-scheduler

 New scheduler mechanism - now to the correct branch

5 years agoAutomatically adding mentions in the network stream hadn't really worked
Michael [Thu, 21 Feb 2019 20:42:00 +0000 (20:42 +0000)]
Automatically adding mentions in the network stream hadn't really worked

5 years agoReverted test stuff
Michael [Thu, 21 Feb 2019 19:34:12 +0000 (19:34 +0000)]
Reverted test stuff

5 years agoChanged log calls
Michael [Thu, 21 Feb 2019 19:32:31 +0000 (19:32 +0000)]
Changed log calls

5 years agoMerge pull request #6715 from tobiasd/20190221-cs
Michael Vogel [Thu, 21 Feb 2019 08:49:08 +0000 (09:49 +0100)]
Merge pull request #6715 from tobiasd/20190221-cs

CS translation update THX Aditoo

5 years agoCS translation update THX Aditoo
Tobias Diekershoff [Thu, 21 Feb 2019 05:52:36 +0000 (06:52 +0100)]
CS translation update THX Aditoo

5 years agoMerge pull request #6713 from annando/composer
Hypolite Petovan [Wed, 20 Feb 2019 23:56:40 +0000 (18:56 -0500)]
Merge pull request #6713 from annando/composer

Updated composer lockfile

5 years agoUpdated composer lockfile
Michael [Wed, 20 Feb 2019 23:16:36 +0000 (23:16 +0000)]
Updated composer lockfile

5 years agoMerge pull request #6709 from annando/urlpath
Hypolite Petovan [Wed, 20 Feb 2019 21:40:06 +0000 (16:40 -0500)]
Merge pull request #6709 from annando/urlpath

Issue 6679: Quick fix

5 years agoIssue 6679: Quick fix
Michael [Wed, 20 Feb 2019 21:06:52 +0000 (21:06 +0000)]
Issue 6679: Quick fix

5 years agoMerge pull request #6708 from Aditoo17/develop
Hypolite Petovan [Wed, 20 Feb 2019 19:38:23 +0000 (14:38 -0500)]
Merge pull request #6708 from Aditoo17/develop

Change iframe address

5 years agoChange iframe address
Aditoo17 [Wed, 20 Feb 2019 19:32:19 +0000 (20:32 +0100)]
Change iframe address

5 years agoChange iframe address
Aditoo17 [Wed, 20 Feb 2019 19:32:01 +0000 (20:32 +0100)]
Change iframe address