Commit graph

3595 commits

Author SHA1 Message Date
Philipp
5c2cca432f
Merge pull request #7170 from MrPetovan/bug/6981-contact-request-blocked
Contact requests blocked
2019-05-25 20:20:36 +02:00
Philipp
bd0c536736
Merge pull request #7156 from MrPetovan/task/add-relationship-filter
Add contact relationship filter
2019-05-25 20:17:05 +02:00
Hypolite Petovan
08d7d42f81 Ensures Search methods return an empty ResultList instead of null
- Addresses https://github.com/friendica/friendica/issues/6916#issuecomment-494876901
2019-05-24 08:13:36 -04:00
Hypolite Petovan
0dae4f9492
Fix typo in Module\Contact
Follow-up to #7154, thanks to @AlfredSK
2019-05-23 13:01:40 -04:00
Hypolite Petovan
40ca25f4f7 Fix SQL error in Module\Admin\Summary 2019-05-21 17:01:15 -04:00
Michael
30143aa5b1 Identifier have to be escaped different than values 2019-05-21 05:34:41 +00:00
Michael
1f6f588872 Fix table name sanitation / enable table schemes 2019-05-20 20:38:18 +00:00
Hypolite Petovan
14a78807d7 Use self::isBlocked and self:isBlockedByUser in Model\Contact::addRelationship 2019-05-20 16:34:17 -04:00
Hypolite Petovan
7bbaf0757f Revert sending ActivityPub follow reject on Model\Contact::addRelationship failure 2019-05-20 16:33:09 -04:00
Hypolite Petovan
62dfcbb074 Prevent contact relationships with node- or user-level blocked contacts 2019-05-20 15:29:20 -04:00
Hypolite Petovan
ea77f214d7 Add return value to Model\Contact::addRelationship to remove protocol-specific code from it 2019-05-20 15:29:20 -04:00
Hypolite Petovan
10dfe4347b Ensure follow reject/accept object IDs are strings to avoid JsonLD normalize errors in ActivityPub\Transmitter 2019-05-20 15:29:20 -04:00
Hypolite Petovan
3114754f4b Refactor Model\Contact::addRelationship
- Remove unused parameter $item
- Replace q() call with DBA::insert
- Update check on $contact that can only be an array now
- Add moethod doc block
2019-05-20 15:29:20 -04:00
Hypolite Petovan
956ae6241d Add exception message chain, string trace and original object to JsonLD normalize error logging 2019-05-20 15:28:54 -04:00
Hypolite Petovan
bebff3271b Remove obsolete TODO comment in Module\Profile\Contacts 2019-05-20 15:10:34 -04:00
Hypolite Petovan
c65faecc8c Add current tab parameter to Model\Profile::getTabs 2019-05-20 15:09:33 -04:00
Hypolite Petovan
709eba6ce3 Move /viewcontacts to /profile/{nickname}/contacts[/{type}]
- Add contact relationship filter to profile contacts page
- Include feed contacts in contacts page and contact widget
2019-05-20 14:50:09 -04:00
Hypolite Petovan
e6742af65c Add contact relationship filter to /contact module 2019-05-20 14:50:09 -04:00
Hypolite Petovan
862159c712
Merge pull request #7165 from nupplaphil/task/mod_dirfind
Move mod/dirfind to src/Module/Search/Directory
2019-05-20 14:45:19 -04:00
Hypolite Petovan
0c9b76a585
Merge pull request #7173 from nupplaphil/task/mod_newmember
Move mod/newmember to src/Module/Welcome
2019-05-20 14:14:58 -04:00
Philipp Holzer
f97b72eb9f
Move mod/newmember to src/Module/Welcome 2019-05-20 20:12:20 +02:00
Philipp Holzer
3d67987cbc
simplification 2019-05-20 19:27:53 +02:00
Philipp Holzer
5e79d3fc82
Fixing method signature 2019-05-20 19:19:57 +02:00
Philipp Holzer
2bb2bb19fd
refactor method signature 2019-05-20 19:15:47 +02:00
Philipp Holzer
059b813090
Add PhpDoc / Code Standards 2019-05-20 19:14:39 +02:00
Philipp Holzer
58c8959da0
Add search types 2019-05-20 19:13:37 +02:00
Philipp Holzer
83fd03b124
Add PhpDoc 2019-05-20 18:44:44 +02:00
Philipp Holzer
1e36c68e48
Moving Search to Core, Refactor Objects 2019-05-20 18:42:27 +02:00
Hypolite Petovan
1cd7d50939
Merge pull request #7172 from nupplaphil/task/mod_notice_rm
Remove src/Module/Notice
2019-05-20 12:26:28 -04:00
Philipp Holzer
853f5cb92f
Remove src/Module/Notice
see https://github.com/friendica/friendica/pull/7159#issuecomment-493744623
2019-05-20 18:22:34 +02:00
Hypolite Petovan
325ba20141 Improve Diaspora raw text support in /babel module 2019-05-19 18:52:01 -04:00
Hypolite Petovan
3395f56036 Add Unicode support to autolink regular expression
- Explicitly exclude non-breaking spaces from URLs as \s doesn't include them
2019-05-19 18:51:55 -04:00
Hypolite Petovan
6f0c6e8926
Merge pull request #7160 from nupplaphil/task/mod_probe
Move mod/probe to src/Module/Probe
2019-05-19 15:06:13 -04:00
Hypolite Petovan
3ca64185a6
Merge pull request #7169 from annando/send-suggest
Sending contact suggestions does work again
2019-05-19 14:59:28 -04:00
Hypolite Petovan
58d5c6610c
Merge pull request #7168 from annando/suggest-receive
Suggestions can be processed again
2019-05-19 14:58:30 -04:00
Philipp
a758671a1b
Merge pull request #7154 from MrPetovan/task/refactor-widgets
Refactor widgets
2019-05-19 20:52:00 +02:00
Michael
a6cf036db2 Sending contact suggestions does work again 2019-05-19 17:59:37 +00:00
Michael Vogel
a3c95eeaab Suggestions can be processed again 2019-05-19 19:58:20 +02:00
Michael
6f3019ecdd Revert PR 7158 since it breaks umlauts 2019-05-19 09:34:49 +00:00
Philipp Holzer
419cc81ef1
renaming 2019-05-19 05:13:06 +02:00
Philipp Holzer
a7aae9603a
Split Directory Search as a base for further changes 2019-05-19 05:06:02 +02:00
Philipp Holzer
5b44fdc202
Split Directory Search as a base for further changes 2019-05-19 05:01:46 +02:00
Philipp Holzer
2520286b1f
some small improvements 2019-05-19 04:43:09 +02:00
Philipp Holzer
34a1e923dd
dependency lowering 2019-05-19 04:38:35 +02:00
Philipp Holzer
e00f110ef1
Move mod/dirfind to src/Module/DirFind 2019-05-19 04:28:16 +02:00
Philipp Holzer
492d7abe92
Renamed Diagnostic to Debug and deleted ItemSource (already defined) 2019-05-19 04:24:56 +02:00
Philipp Holzer
48bba87abe
Move mod/probe to src/Module/Probe 2019-05-19 04:24:18 +02:00
Hypolite Petovan
7a13582c67
Merge pull request #7159 from nupplaphil/task/mod_notice
Move mod/notice to src/Module/Notice
2019-05-18 22:16:35 -04:00
Hypolite Petovan
ec5c123f41
Merge pull request #7163 from nupplaphil/task/mod_starred
Move mod/starred to src/Module/Starred
2019-05-18 22:16:21 -04:00
Hypolite Petovan
596e95917e
Merge pull request #7164 from nupplaphil/task/mod_randprof
Move mod/randprof to src/Module/RandomProfile
2019-05-18 22:16:06 -04:00
Philipp Holzer
5f068b07f9
some improvements 2019-05-19 03:12:22 +02:00
Philipp Holzer
82e271589f
Move mod/starred to src/Module/Starred 2019-05-19 03:07:44 +02:00
Hypolite Petovan
d3a4ed0111
Merge pull request #7162 from nupplaphil/task/mod_view
Move mod/view to src/Module/Theme
2019-05-18 21:07:27 -04:00
Philipp Holzer
725984eb08
change route 2019-05-19 03:05:21 +02:00
Philipp Holzer
d91b3bb59c
remove unused dependencies 2019-05-19 02:53:36 +02:00
Philipp Holzer
d81c1d81b3
correct notice redirect 2019-05-19 02:53:35 +02:00
Philipp Holzer
ce3b121064
rename rawContent() to content() 2019-05-19 02:53:35 +02:00
Philipp Holzer
9092cb1beb
Move mod/notice to src/Module/Notice 2019-05-19 02:53:31 +02:00
Hypolite Petovan
33ec3d8051
Merge pull request #7161 from nupplaphil/task/mod_toggle_mobile
Move mod/toggle_mobile to src/Module/ToggleMobile
2019-05-18 20:14:27 -04:00
Hypolite Petovan
30945784c3
Merge pull request #7157 from nupplaphil/task/mod_notify
Move mod/notify to src/Module/Notify
2019-05-18 17:49:01 -04:00
Philipp Holzer
8bb85b1da7
Move mod/randprof to src/Module/RandomProfile 2019-05-18 22:17:57 +02:00
Philipp Holzer
d1d7fa394a
Move mod/view to src/Module/View 2019-05-18 21:23:12 +02:00
Philipp Holzer
295d90d496
Move mod/toggle_mobile to src/Module/ToggleMobile 2019-05-18 21:13:19 +02:00
Philipp Holzer
1483cd3fb4
rearrange content/init 2019-05-18 20:34:11 +02:00
Philipp Holzer
68fdc7215e
rearrange rawContent / content 2019-05-18 20:16:08 +02:00
Philipp
67a4a80076
Merge pull request #7158 from MrPetovan/bug/7150-unescape-xml-entities
Replace htmlspecialchars_decode with html_entity_decode in XML::unescape
2019-05-18 19:53:25 +02:00
Hypolite Petovan
c3d545987a Remove /contact/all path 2019-05-18 13:18:47 -04:00
Hypolite Petovan
8fb9722cdc Replace htmlspecialchars_decode with html_entity_decode in XML::unescape
- Replace htmlspecialchars with htmlentities in XML::escape
- This allows for converting all entities from Diaspora messages to regular characters
2019-05-18 13:15:51 -04:00
Philipp Holzer
56bd395b8a
Move mod/notify to src/Module/Notify 2019-05-18 18:59:41 +02:00
Hypolite Petovan
cff4577cc5
Merge pull request #7155 from nupplaphil/task/mod_opensearch
Move mod/opensearch to src/Module/OpenSearch
2019-05-18 12:46:54 -04:00
Hypolite Petovan
fc312e4c98
Merge pull request #7153 from annando/ap-mail-delivery
Fix receiver list for mails
2019-05-18 11:50:10 -04:00
Philipp Holzer
9f13ae6e73
Move mod/opensearch to src/Module/OpenSearch 2019-05-18 17:43:58 +02:00
Michael Vogel
69e38c2bbd Missing arrrrr! 2019-05-18 17:34:44 +02:00
Hypolite Petovan
71ae8d07a6 Refactor widgets
- Move widget templates to subfolder
- Add new generic filter widget templates to replace category, network and filer filters
- Update styles
2019-05-18 11:33:35 -04:00
Michael Vogel
f3c2eb5b11 Fix receiver list for mails / only deliver mail via DFRN to legacy contacts 2019-05-18 11:09:13 +02:00
Michael
490e850b48 Fix for receiving direct messages from Mastodon 2019-05-18 07:00:57 +00:00
Michael
d81b7c840e Adding missing spaces 2019-05-17 18:00:00 +00:00
Michael
f6fc70c4e2 Make AP "direct messages" more compatible to Mastodon 2019-05-17 17:58:42 +00:00
Hypolite Petovan
1cf9a1ab7c Allow null $tags parameter in ActivityPub\Processor::constructTagString 2019-05-16 18:10:42 -04: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
bf82736522 Exclude /api and /proxy from 2fa check 2019-05-15 08:56:02 -04: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
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