friendica.git/.git
5 years agorearrange content/init
Philipp Holzer [Sat, 18 May 2019 18:34:11 +0000 (20:34 +0200)]
rearrange content/init

5 years agorearrange rawContent / content
Philipp Holzer [Sat, 18 May 2019 18:07:56 +0000 (20:07 +0200)]
rearrange rawContent / content

5 years agoRemoved mod/notify
Philipp Holzer [Sat, 18 May 2019 17:04:33 +0000 (19:04 +0200)]
Removed mod/notify

5 years agoMove mod/notify to src/Module/Notify
Philipp Holzer [Sat, 18 May 2019 16:59:41 +0000 (18:59 +0200)]
Move mod/notify to src/Module/Notify

5 years agoMerge pull request #7152 from annando/fix-ap-mail
Hypolite Petovan [Sat, 18 May 2019 12:28:51 +0000 (08:28 -0400)]
Merge pull request #7152 from annando/fix-ap-mail

Fix for receiving direct messages from Mastodon

5 years agoFix for receiving direct messages from Mastodon
Michael [Sat, 18 May 2019 07:00:57 +0000 (07:00 +0000)]
Fix for receiving direct messages from Mastodon

5 years agoMerge pull request #7151 from annando/ap-mail-mastodon
Hypolite Petovan [Fri, 17 May 2019 18:59:07 +0000 (14:59 -0400)]
Merge pull request #7151 from annando/ap-mail-mastodon

Make AP "direct messages" more compatible to Mastodon

5 years agoAdding missing spaces
Michael [Fri, 17 May 2019 18:00:00 +0000 (18:00 +0000)]
Adding missing spaces

5 years agoMake AP "direct messages" more compatible to Mastodon
Michael [Fri, 17 May 2019 17:58:42 +0000 (17:58 +0000)]
Make AP "direct messages" more compatible to Mastodon

5 years agoMerge pull request #7147 from annando/fix-structure
Hypolite Petovan [Fri, 17 May 2019 12:22:42 +0000 (08:22 -0400)]
Merge pull request #7147 from annando/fix-structure

Fix database structure definition, primary keys must be marked as this

5 years agoMerge pull request #7148 from MrPetovan/bug/fatal-errors
Philipp [Fri, 17 May 2019 11:19:58 +0000 (13:19 +0200)]
Merge pull request #7148 from MrPetovan/bug/fatal-errors

Allow null $tags parameter in ActivityPub\Processor::constructTagString

5 years agoMerge pull request #7149 from tobiasd/20190517-cs
Hypolite Petovan [Fri, 17 May 2019 04:44:15 +0000 (00:44 -0400)]
Merge pull request #7149 from tobiasd/20190517-cs

CS translation update THX Aditoo

5 years agoCS translation update THX Aditoo
Tobias Diekershoff [Fri, 17 May 2019 04:42:29 +0000 (06:42 +0200)]
CS translation update THX Aditoo

5 years agoAllow null $tags parameter in ActivityPub\Processor::constructTagString
Hypolite Petovan [Thu, 16 May 2019 22:10:42 +0000 (18:10 -0400)]
Allow null $tags parameter in ActivityPub\Processor::constructTagString

5 years agoFix database structure definition, primary keys must be marked as this
Michael [Thu, 16 May 2019 19:53:07 +0000 (19:53 +0000)]
Fix database structure definition, primary keys must be marked as this

5 years agoMerge pull request #7145 from MrPetovan/task/7141-contact-block-reason
Philipp [Thu, 16 May 2019 13:39:11 +0000 (15:39 +0200)]
Merge pull request #7145 from MrPetovan/task/7141-contact-block-reason

Add node-wide contact block reason

5 years agoRevert renaming variable in Console\GlobalCommunityBlock
Hypolite Petovan [Thu, 16 May 2019 12:42:07 +0000 (08:42 -0400)]
Revert renaming variable in Console\GlobalCommunityBlock

5 years agoMerge pull request #7146 from annando/ap-mail2
Hypolite Petovan [Thu, 16 May 2019 12:06:06 +0000 (08:06 -0400)]
Merge pull request #7146 from annando/ap-mail2

AP: We can now receive "direct messages" (aka "mails") as well

5 years agoAP: We can now receive "direct messages" (aka "mails") as well
Michael [Thu, 16 May 2019 05:44:59 +0000 (05:44 +0000)]
AP: We can now receive "direct messages" (aka "mails") as well

5 years agoAdd reason editing to console globalcommunityblock command
Hypolite Petovan [Wed, 15 May 2019 23:30:48 +0000 (19:30 -0400)]
Add reason editing to console globalcommunityblock command

5 years agoAdd contact block reason form and display in admin page
Hypolite Petovan [Wed, 15 May 2019 23:30:13 +0000 (19:30 -0400)]
Add contact block reason form and display in admin page

5 years agoAdd block reason editing in Model\Contact
Hypolite Petovan [Wed, 15 May 2019 23:28:00 +0000 (19:28 -0400)]
Add block reason editing in Model\Contact

5 years agoDatabase Structure Version 1313
Hypolite Petovan [Wed, 15 May 2019 23:27:36 +0000 (19:27 -0400)]
Database Structure Version 1313

5 years agoMerge pull request #7144 from MrPetovan/task/two-factor-authentication
Tobias Diekershoff [Wed, 15 May 2019 14:21:05 +0000 (16:21 +0200)]
Merge pull request #7144 from MrPetovan/task/two-factor-authentication

Exclude /api and /proxy from 2fa check

5 years agoMerge pull request #7143 from ben-utzer/patch-1
Tobias Diekershoff [Wed, 15 May 2019 13:06:34 +0000 (15:06 +0200)]
Merge pull request #7143 from ben-utzer/patch-1

Update paths to images in README.md

5 years agoUpdate translation strings
Hypolite Petovan [Wed, 15 May 2019 12:56:24 +0000 (08:56 -0400)]
Update translation strings

5 years agoExclude /api and /proxy from 2fa check
Hypolite Petovan [Wed, 15 May 2019 12:56:02 +0000 (08:56 -0400)]
Exclude /api and /proxy from 2fa check

5 years agoUpdate paths to images in README.md
utzer [Wed, 15 May 2019 12:28:44 +0000 (14:28 +0200)]
Update paths to images in README.md

Removing the leading slash will cause the images to be loaded via the relative path, so it would work on git.friendi.ca.

Please compare https://git.friendi.ca/friendica/friendica/src/branch/develop/README.md with https://git.friendi.ca/utzer/friendica/src/branch/develop/README.md to see the difference (for the first two images).

5 years agoMerge pull request #7139 from annando/ap-mail
Hypolite Petovan [Tue, 14 May 2019 18:38:42 +0000 (14:38 -0400)]
Merge pull request #7139 from annando/ap-mail

Sending direct messages via AP does work now - receiving is pending

5 years agoSending direct messages via AP does work now - receiving is pending
Michael [Tue, 14 May 2019 17:50:45 +0000 (17:50 +0000)]
Sending direct messages via AP does work now - receiving is pending

5 years agoMerge pull request #7135 from MrPetovan/task/two-factor-authentication
Philipp [Tue, 14 May 2019 05:07:03 +0000 (07:07 +0200)]
Merge pull request #7135 from MrPetovan/task/two-factor-authentication

Add native two-factor authentication support

5 years agoMerge pull request #7136 from nupplaphil/bug/7112-missing_basepath
Hypolite Petovan [Mon, 13 May 2019 20:27:31 +0000 (16:27 -0400)]
Merge pull request #7136 from nupplaphil/bug/7112-missing_basepath

Missing basepath fix

5 years agoMerge pull request #7137 from annando/ap-attach
Hypolite Petovan [Mon, 13 May 2019 20:27:15 +0000 (16:27 -0400)]
Merge pull request #7137 from annando/ap-attach

Don't attach images to the body if it was from a Friendica system

5 years agoDon't attach images to the body if it was from a Friendica system
Michael [Mon, 13 May 2019 19:56:46 +0000 (19:56 +0000)]
Don't attach images to the body if it was from a Friendica system

5 years agoRevert Use Contact::select() instead of DBA::select(‘contact) in Core\Session
Hypolite Petovan [Mon, 13 May 2019 18:07:02 +0000 (14:07 -0400)]
Revert Use Contact::select() instead of DBA::select(‘contact) in Core\Session

5 years agoUse Contact::select() instead of DBA::select(‘contact) in Core\Session
Hypolite Petovan [Mon, 13 May 2019 17:33:20 +0000 (13:33 -0400)]
Use Contact::select() instead of DBA::select(‘contact) in Core\Session

- Replace remaining occurrences of $_SESSION with Session methods

5 years agoMake Module\TwoFactorRecoveryCode::markUsedForUser return false for already used...
Hypolite Petovan [Mon, 13 May 2019 17:32:21 +0000 (13:32 -0400)]
Make Module\TwoFactorRecoveryCode::markUsedForUser return false for already used code

- Add PHP Doc in Module\TwoFactorRecoveryCode

5 years agoImprove template args visual alignment in two-factor modules
Hypolite Petovan [Mon, 13 May 2019 17:31:08 +0000 (13:31 -0400)]
Improve template args visual alignment in two-factor modules

5 years agoFriendica-7112 - Missing basepath fix
Philipp Holzer [Mon, 13 May 2019 17:30:03 +0000 (19:30 +0200)]
Friendica-7112 - Missing basepath fix

5 years agoAdd two-factor authentication settings
Hypolite Petovan [Mon, 13 May 2019 05:38:15 +0000 (01:38 -0400)]
Add two-factor authentication settings

- Add settings aside menu entry
- Add two-factor authentication documentation

5 years agoAdd two-factor authentication
Hypolite Petovan [Mon, 13 May 2019 05:36:09 +0000 (01:36 -0400)]
Add two-factor authentication

- Add 2FA login interception in Session::setAuthenticatedForUser
- Add 2fa session variable holding the last auth code

5 years agoAdd Two-factor recovery code model
Hypolite Petovan [Mon, 13 May 2019 05:34:40 +0000 (01:34 -0400)]
Add Two-factor recovery code model

- [DBA] Add NULL value handling in condition array

5 years agoDatabase Structure version 1312
Hypolite Petovan [Mon, 13 May 2019 05:19:05 +0000 (01:19 -0400)]
Database Structure version 1312

- Add "2fa_recovery_codes" table

5 years ago[Composer] Update composer.lock
Hypolite Petovan [Mon, 13 May 2019 05:18:09 +0000 (01:18 -0400)]
[Composer] Update composer.lock

5 years ago[Composer} Add two-factor authentication dependencies
Hypolite Petovan [Mon, 13 May 2019 05:07:38 +0000 (01:07 -0400)]
[Composer} Add two-factor authentication dependencies

- Add bacon/bacon-qr-code dependency
- Add pragmarx/google2fa dependency
- Add pragmarx/recovery dependency

5 years ago[Composer] Bump minimum PHP version to 7
Hypolite Petovan [Mon, 13 May 2019 04:58:02 +0000 (00:58 -0400)]
[Composer] Bump minimum PHP version to 7

- Remove paragonie/random_compat dependency

5 years agoFix undefined $a variable in Module\Help
Hypolite Petovan [Mon, 13 May 2019 04:55:49 +0000 (00:55 -0400)]
Fix undefined $a variable in Module\Help

5 years agoMove Authentication::setAuthenticatedSessionForUser to Session::setAuthenticatedForUser
Hypolite Petovan [Mon, 13 May 2019 04:55:26 +0000 (00:55 -0400)]
Move Authentication::setAuthenticatedSessionForUser to Session::setAuthenticatedForUser

5 years agoMerge pull request #7133 from tobiasd/20190512-it
Hypolite Petovan [Sun, 12 May 2019 12:50:35 +0000 (08:50 -0400)]
Merge pull request #7133 from tobiasd/20190512-it

IT translations update THX Sylke Vicious

5 years agoIT translations THX Sylke Vicious
Tobias Diekershoff [Sun, 12 May 2019 05:27:15 +0000 (07:27 +0200)]
IT translations THX Sylke Vicious

5 years agoMerge pull request #7129 from annando/ap-delivery
Hypolite Petovan [Sat, 11 May 2019 18:10:45 +0000 (14:10 -0400)]
Merge pull request #7129 from annando/ap-delivery

Contacts with protocol = AP are now delivered only via AP

5 years agoContacts with protocol = AP are now delivered only via AP
Michael [Sat, 11 May 2019 05:58:22 +0000 (05:58 +0000)]
Contacts with protocol = AP are now delivered only via AP

5 years agoMerge pull request #7127 from tobiasd/20190510-pwdresetescape
Philipp [Fri, 10 May 2019 09:37:12 +0000 (11:37 +0200)]
Merge pull request #7127 from tobiasd/20190510-pwdresetescape

pwdreset templated fixed HTML escaping

5 years agoMerge pull request #7126 from tobiasd/20190510-fixadminpanel
Michael Vogel [Fri, 10 May 2019 09:23:58 +0000 (11:23 +0200)]
Merge pull request #7126 from tobiasd/20190510-fixadminpanel

make the addon listing in the admin panel aside working again

5 years agoHTML escaping
Tobias Diekershoff [Fri, 10 May 2019 08:52:53 +0000 (10:52 +0200)]
HTML escaping

5 years agomake the addon listing in the admin panel aside working again
Tobias Diekershoff [Fri, 10 May 2019 08:38:09 +0000 (10:38 +0200)]
make the addon listing in the admin panel aside working again

5 years agoMerge pull request #7125 from annando/magic
Philipp [Fri, 10 May 2019 08:37:56 +0000 (10:37 +0200)]
Merge pull request #7125 from annando/magic

Magic links should work again

5 years agoMagic links should work again
Michael [Fri, 10 May 2019 07:38:10 +0000 (07:38 +0000)]
Magic links should work again

5 years agoMerge pull request #7124 from annando/mail-reply
Hypolite Petovan [Thu, 9 May 2019 20:57:19 +0000 (16:57 -0400)]
Merge pull request #7124 from annando/mail-reply

Mail: Set the "reply" value when it is a reply

5 years agoMail: Set the "reply" value when it is a reply
Michael [Thu, 9 May 2019 20:52:52 +0000 (20:52 +0000)]
Mail: Set the "reply" value when it is a reply

5 years agoMerge pull request #7116 from MrPetovan/task/improve-addon-admin
Philipp [Thu, 9 May 2019 14:49:38 +0000 (16:49 +0200)]
Merge pull request #7116 from MrPetovan/task/improve-addon-admin

Improve addon admin

5 years agoMerge pull request #7122 from friendica/MrPetovan-addon-doc
Philipp [Thu, 9 May 2019 14:10:16 +0000 (16:10 +0200)]
Merge pull request #7122 from friendica/MrPetovan-addon-doc

Improve addon documentation

5 years agoImprove addon documentation
Hypolite Petovan [Wed, 8 May 2019 15:14:57 +0000 (11:14 -0400)]
Improve addon documentation

- Enforce naming standards for <addon>
- Add info about automatic hook remove on uninstall
- Add info about admin settings

5 years agoMerge pull request #7120 from friendica/MrPetovan-patch-7119
Philipp [Wed, 8 May 2019 13:51:17 +0000 (15:51 +0200)]
Merge pull request #7120 from friendica/MrPetovan-patch-7119

Break redirection loop during install

5 years agoMerge pull request #7118 from valvin1/patch-1
Hypolite Petovan [Wed, 8 May 2019 13:19:09 +0000 (09:19 -0400)]
Merge pull request #7118 from valvin1/patch-1

add new disallowed path for robots.txt

5 years agoMerge pull request #7117 from annando/mail
Hypolite Petovan [Wed, 8 May 2019 13:17:22 +0000 (09:17 -0400)]
Merge pull request #7117 from annando/mail

Mail storing is now centralized

5 years agoBreak redirection loop during install
Hypolite Petovan [Wed, 8 May 2019 12:30:59 +0000 (08:30 -0400)]
Break redirection loop during install

5 years agoadd new disallowed path for robots.txt
Valvin [Wed, 8 May 2019 11:08:34 +0000 (13:08 +0200)]
add new disallowed path for robots.txt

5 years agoMail storing is now centralized
Michael [Wed, 8 May 2019 05:44:22 +0000 (05:44 +0000)]
Mail storing is now centralized

5 years agoUninstall addon when it wasn't found when accessed from admin aside
Hypolite Petovan [Wed, 8 May 2019 04:46:42 +0000 (00:46 -0400)]
Uninstall addon when it wasn't found when accessed from admin aside

5 years agoDelete all addon hooks by default on uninstall
Hypolite Petovan [Wed, 8 May 2019 04:46:13 +0000 (00:46 -0400)]
Delete all addon hooks by default on uninstall

5 years agoMerge pull request #7115 from nupplaphil/bug/mod_contact_batch
Hypolite Petovan [Tue, 7 May 2019 19:22:46 +0000 (15:22 -0400)]
Merge pull request #7115 from nupplaphil/bug/mod_contact_batch

Add contact/batch route

5 years agoAdd contact/batch route
Philipp Holzer [Tue, 7 May 2019 19:15:22 +0000 (21:15 +0200)]
Add contact/batch route

5 years ago[hotfix] Fix wrong Exception namespace
Hypolite Petovan [Tue, 7 May 2019 15:56:25 +0000 (11:56 -0400)]
[hotfix] Fix wrong Exception namespace

5 years agoMerge pull request #7114 from annando/update-ap
Hypolite Petovan [Mon, 6 May 2019 20:57:52 +0000 (16:57 -0400)]
Merge pull request #7114 from annando/update-ap

Make 7113 really work - now the query does contain AP

5 years agoMake 7113 really work - now the query does contain AP
Michael [Mon, 6 May 2019 20:53:22 +0000 (20:53 +0000)]
Make 7113 really work - now the query does contain AP

5 years agoMerge pull request #7113 from annando/update-ap
Hypolite Petovan [Mon, 6 May 2019 20:39:25 +0000 (16:39 -0400)]
Merge pull request #7113 from annando/update-ap

Update every AP contact once a week

5 years agoUpdate every AP contact once a week
Michael [Mon, 6 May 2019 20:28:40 +0000 (20:28 +0000)]
Update every AP contact once a week

5 years agoMerge pull request #7104 from annando/separated-confirm
Philipp [Mon, 6 May 2019 19:40:11 +0000 (21:40 +0200)]
Merge pull request #7104 from annando/separated-confirm

 The follow confirmation process is now separated

5 years agoSome cleaning up
Michael [Mon, 6 May 2019 18:46:30 +0000 (18:46 +0000)]
Some cleaning up

5 years agoMerge pull request #7111 from nupplaphil/bug/admin_loglevel_tpl
Hypolite Petovan [Mon, 6 May 2019 18:44:34 +0000 (14:44 -0400)]
Merge pull request #7111 from nupplaphil/bug/admin_loglevel_tpl

remove superfluous tpl action

5 years agoremove superfluous tpl action
Philipp Holzer [Mon, 6 May 2019 18:40:53 +0000 (20:40 +0200)]
remove superfluous tpl action

5 years agoMerge pull request #7108 from friendica/MrPetovan-router-vertical-bar
Philipp [Mon, 6 May 2019 17:51:12 +0000 (19:51 +0200)]
Merge pull request #7108 from friendica/MrPetovan-router-vertical-bar

Remove remaining disallowed vertical bar in Router

5 years agoRemove remaining disallowed vertical bar in Router
Hypolite Petovan [Mon, 6 May 2019 17:41:48 +0000 (13:41 -0400)]
Remove remaining disallowed vertical bar in Router

5 years agoMerge pull request #7107 from nupplaphil/bug/mod_fix_routes
Hypolite Petovan [Mon, 6 May 2019 17:15:29 +0000 (13:15 -0400)]
Merge pull request #7107 from nupplaphil/bug/mod_fix_routes

Fix contact/group routes

5 years agoadded 'updateprofile'
Philipp Holzer [Mon, 6 May 2019 17:08:15 +0000 (19:08 +0200)]
added 'updateprofile'

5 years agoFix contact routes
Philipp Holzer [Mon, 6 May 2019 16:57:50 +0000 (18:57 +0200)]
Fix contact routes

5 years agoMerge pull request #7103 from nupplaphil/task/mod_smilies
Hypolite Petovan [Mon, 6 May 2019 16:53:45 +0000 (12:53 -0400)]
Merge pull request #7103 from nupplaphil/task/mod_smilies

Move mod/smilies to src/Module/Smilies

5 years agoMove Smilies::getList() into if
Philipp Holzer [Mon, 6 May 2019 16:46:37 +0000 (18:46 +0200)]
Move Smilies::getList() into if

5 years agoMerge pull request #7105 from tobiasd/missingSubject
Philipp [Mon, 6 May 2019 10:00:12 +0000 (12:00 +0200)]
Merge pull request #7105 from tobiasd/missingSubject

The email for a successful DB structure update was missing a subject line as well

5 years agoAdd subject to DB Update email
Tobias Diekershoff [Mon, 6 May 2019 09:13:38 +0000 (11:13 +0200)]
Add subject to DB Update email

5 years agoadd feedback
Philipp Holzer [Mon, 6 May 2019 06:27:57 +0000 (08:27 +0200)]
add feedback

5 years agoMerge remote-tracking branch 'upstream/develop' into separated-confirm
Michael [Mon, 6 May 2019 05:54:51 +0000 (05:54 +0000)]
Merge remote-tracking branch 'upstream/develop' into separated-confirm

5 years agoThe follow confirmation process is now separated between DFRN and the rest
Michael [Mon, 6 May 2019 05:46:13 +0000 (05:46 +0000)]
The follow confirmation process is now separated between DFRN and the rest

5 years agoMerge pull request #7092 from MrPetovan/task/7047-theme-error-page
Philipp [Mon, 6 May 2019 05:33:42 +0000 (07:33 +0200)]
Merge pull request #7092 from MrPetovan/task/7047-theme-error-page

Add style to exception page

5 years agoMerge pull request #7084 from nupplaphil/task/mod_removetag
Hypolite Petovan [Mon, 6 May 2019 00:36:38 +0000 (20:36 -0400)]
Merge pull request #7084 from nupplaphil/task/mod_removetag

Move mod/filerm to src/Module/Filer/RemoveTag

5 years agoMerge pull request #7086 from nupplaphil/task/mod_maintenance
Hypolite Petovan [Mon, 6 May 2019 00:36:12 +0000 (20:36 -0400)]
Merge pull request #7086 from nupplaphil/task/mod_maintenance

Move mod/maintenance to src/Module/Maintenance

5 years agoMerge pull request #7102 from nupplaphil/task/mod_pretheme
Hypolite Petovan [Mon, 6 May 2019 00:33:21 +0000 (20:33 -0400)]
Merge pull request #7102 from nupplaphil/task/mod_pretheme

Move mod/pretheme to src/Module/ThemeDetails

5 years agoMerge pull request #7101 from nupplaphil/task/mod_viewsrc
Hypolite Petovan [Mon, 6 May 2019 00:32:42 +0000 (20:32 -0400)]
Merge pull request #7101 from nupplaphil/task/mod_viewsrc

Move mod/viewsrc to src/Module/ItemBody

5 years agoMerge pull request #7097 from nupplaphil/task/mod_after_PR_fixing
Hypolite Petovan [Mon, 6 May 2019 00:28:57 +0000 (20:28 -0400)]
Merge pull request #7097 from nupplaphil/task/mod_after_PR_fixing

Fixings for Mod-Refactorings