bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
23975 commits 4 branches 62 tags 178 MiB
Commit graph

23975 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan f0c1f3e7f1
Merge pull request #7149 from tobiasd/20190517-cs 
CS translation update THX Aditoo
 2019-05-17 00:44:15 -04:00
Tobias Diekershoff dd08a6432c CS translation update THX Aditoo 2019-05-17 06:42:29 +02:00
Hypolite Petovan 1cf9a1ab7c Allow null $tags parameter in ActivityPub\Processor::constructTagString 2019-05-16 18:10:42 -04:00
Michael 48ffed78d7 Fix database structure definition, primary keys must be marked as this 2019-05-16 19:53:07 +00:00
Philipp 9519ad2174
Merge pull request #7145 from MrPetovan/task/7141-contact-block-reason 
Add node-wide contact block reason
 2019-05-16 15:39:11 +02:00
Hypolite Petovan 8b3592b08c Revert renaming variable in Console\GlobalCommunityBlock 2019-05-16 08:42:07 -04:00
Hypolite Petovan 064c0cd5ff
Merge pull request #7146 from annando/ap-mail2 
AP: We can now receive "direct messages" (aka "mails") as well
 2019-05-16 08:06:06 -04:00
Michael 3f55f93606 AP: We can now receive "direct messages" (aka "mails") as well 2019-05-16 05:44:59 +00:00
Hypolite Petovan dbedcdbf69 Add reason editing to console globalcommunityblock command 2019-05-15 19:30:48 -04:00
Hypolite Petovan 0c63f8aa42 Add contact block reason form and display in admin page 2019-05-15 19:30:13 -04:00
Hypolite Petovan 79cb5b1bae Add block reason editing in Model\Contact 2019-05-15 19:28:00 -04:00
Hypolite Petovan dd90fa9789 Database Structure Version 1313 2019-05-15 19:27:36 -04:00
Tobias Diekershoff 2caf95f481
Merge pull request #7144 from MrPetovan/task/two-factor-authentication 
Exclude /api and /proxy from 2fa check
 2019-05-15 16:21:05 +02:00
Tobias Diekershoff 8fe3c57015
Merge pull request #7143 from ben-utzer/patch-1 
Update paths to images in README.md
 2019-05-15 15:06:34 +02:00
Hypolite Petovan 7f0036239f Update translation strings 2019-05-15 08:56:24 -04:00
Hypolite Petovan bf82736522 Exclude /api and /proxy from 2fa check 2019-05-15 08:56:02 -04:00
utzer a21a0c8b38
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).
 2019-05-15 14:28:44 +02:00
Hypolite Petovan 969b7744c9
Merge pull request #7139 from annando/ap-mail 
Sending direct messages via AP does work now - receiving is pending
 2019-05-14 14:38:42 -04:00
Michael 87b98b8249 Sending direct messages via AP does work now - receiving is pending 2019-05-14 17:50:45 +00:00
Philipp 5e85bdecd0
Merge pull request #7135 from MrPetovan/task/two-factor-authentication 
Add native two-factor authentication support
 2019-05-14 07:07:03 +02:00
Hypolite Petovan 4161f5ebe0
Merge pull request #7136 from nupplaphil/bug/7112-missing_basepath 
Missing basepath fix
 2019-05-13 16:27:31 -04:00
Hypolite Petovan 7e2dc03a36
Merge pull request #7137 from annando/ap-attach 
Don't attach images to the body if it was from a Friendica system
 2019-05-13 16:27:15 -04:00
Michael 9e31b1b486 Don't attach images to the body if it was from a Friendica system 2019-05-13 19:56:46 +00:00
Hypolite Petovan 78b651d2e8 Revert Use Contact::select() instead of DBA::select(‘contact) in Core\Session 2019-05-13 14:07:02 -04:00
Hypolite Petovan e077f30d51 Use Contact::select() instead of DBA::select(‘contact) in Core\Session 
- Replace remaining occurrences of $_SESSION with Session methods
 2019-05-13 13:33:20 -04:00
Hypolite Petovan a14f868134 Make Module\TwoFactorRecoveryCode::markUsedForUser return false for already used code 
- Add PHP Doc in Module\TwoFactorRecoveryCode
 2019-05-13 13:32:21 -04:00
Hypolite Petovan 5c59c57b14 Improve template args visual alignment in two-factor modules 2019-05-13 13:31:08 -04:00
Philipp Holzer 076370631f
Friendica-7112 - Missing basepath fix 2019-05-13 19:30:03 +02:00
Hypolite Petovan 8e885f5b97 Add two-factor authentication settings 
- Add settings aside menu entry
- Add two-factor authentication documentation
 2019-05-13 01:52:01 -04:00
Hypolite Petovan d7e9b91181 Add two-factor authentication 
- Add 2FA login interception in Session::setAuthenticatedForUser
- Add 2fa session variable holding the last auth code
 2019-05-13 01:52:01 -04:00
Hypolite Petovan a7feb4bf9f Add Two-factor recovery code model 
- [DBA] Add NULL value handling in condition array
 2019-05-13 01:52:00 -04:00
Hypolite Petovan c6ef7f5965 Database Structure version 1312 
- Add "2fa_recovery_codes" table
 2019-05-13 01:52:00 -04:00
Hypolite Petovan f4f5f56ec3 [Composer] Update composer.lock 2019-05-13 01:52:00 -04:00
Hypolite Petovan c2b7ccb5b0 [Composer} Add two-factor authentication dependencies 
- Add bacon/bacon-qr-code dependency
- Add pragmarx/google2fa dependency
- Add pragmarx/recovery dependency
 2019-05-13 01:52:00 -04:00
Hypolite Petovan f2e5b29974 [Composer] Bump minimum PHP version to 7 
- Remove paragonie/random_compat dependency
 2019-05-13 01:51:59 -04:00
Hypolite Petovan c2062fe594 Fix undefined $a variable in Module\Help 2019-05-13 01:51:59 -04:00
Hypolite Petovan 6071fe81b4 Move Authentication::setAuthenticatedSessionForUser to Session::setAuthenticatedForUser 2019-05-13 01:51:59 -04:00
Hypolite Petovan 34360ca46d
Merge pull request #7133 from tobiasd/20190512-it 
IT translations update THX Sylke Vicious
 2019-05-12 08:50:35 -04:00
Tobias Diekershoff 0a1c34b60c IT translations THX Sylke Vicious 2019-05-12 07:27:15 +02:00
Hypolite Petovan 2d48b40f17
Merge pull request #7129 from annando/ap-delivery 
Contacts with protocol = AP are now delivered only via AP
 2019-05-11 14:10:45 -04:00
Michael 55557a8f18 Contacts with protocol = AP are now delivered only via AP 2019-05-11 05:58:22 +00:00
Philipp 2a2b147758
Merge pull request #7127 from tobiasd/20190510-pwdresetescape 
pwdreset templated fixed HTML escaping
 2019-05-10 11:37:12 +02:00
Michael Vogel 9aa9187ecb
Merge pull request #7126 from tobiasd/20190510-fixadminpanel 
make the addon listing in the admin panel aside working again
 2019-05-10 11:23:58 +02:00
Tobias Diekershoff 782037a611 HTML escaping 2019-05-10 10:52:53 +02:00
Tobias Diekershoff 3812cdf123 make the addon listing in the admin panel aside working again 2019-05-10 10:38:09 +02:00
Philipp f840da5dc7
Merge pull request #7125 from annando/magic 
Magic links should work again
 2019-05-10 10:37:56 +02:00
Michael f04bb820ad Magic links should work again 2019-05-10 07:38:10 +00:00
Hypolite Petovan 860338a675
Merge pull request #7124 from annando/mail-reply 
Mail: Set the "reply" value when it is a reply
 2019-05-09 16:57:19 -04:00
Michael d9f6a58229 Mail: Set the "reply" value when it is a reply 2019-05-09 20:52:52 +00:00
Philipp 7bd1a34bf8
Merge pull request #7116 from MrPetovan/task/improve-addon-admin 
Improve addon admin
 2019-05-09 16:49:38 +02:00