Commit graph

883 commits

Author SHA1 Message Date
Hypolite Petovan
6de3449cae Add new fileToArray and arrayToFile methods to Module\FileTag 2019-05-27 17:38:36 -04:00
Hypolite Petovan
96402e306a Fix formatting of Model\FileTag
- Normalize indent style
- Remove extraneous new lines after ifs/foreachs
2019-05-27 17:38:32 -04:00
Philipp
5c2cca432f
Merge pull request #7170 from MrPetovan/bug/6981-contact-request-blocked
Contact requests blocked
2019-05-25 20:20:36 +02:00
Hypolite Petovan
14a78807d7 Use self::isBlocked and self:isBlockedByUser in Model\Contact::addRelationship 2019-05-20 16:34:17 -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
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
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
Philipp Holzer
5f068b07f9
some improvements 2019-05-19 03:12:22 +02:00
Philipp Holzer
8bb85b1da7
Move mod/randprof to src/Module/RandomProfile 2019-05-18 22:17:57 +02:00
Hypolite Petovan
79cb5b1bae Add block reason editing in Model\Contact 2019-05-15 19:28:00 -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
a7feb4bf9f Add Two-factor recovery code model
- [DBA] Add NULL value handling in condition array
2019-05-13 01:52:00 -04:00
Michael
f04bb820ad Magic links should work again 2019-05-10 07:38:10 +00:00
Michael
d9f6a58229 Mail: Set the "reply" value when it is a reply 2019-05-09 20:52:52 +00:00
Michael
b8a23369b6 Mail storing is now centralized 2019-05-08 05:44:22 +00:00
Michael
626709159f Some cleaning up 2019-05-06 18:46:30 +00:00
Hypolite Petovan
bb8d297ae4
Merge pull request #7097 from nupplaphil/task/mod_after_PR_fixing
Fixings for Mod-Refactorings
2019-05-05 20:28:57 -04:00
Hypolite Petovan
8af0ae171e
Merge pull request #7083 from nupplaphil/task/mod_friendica
Move mod/friendica to src/Module/Friendica
2019-05-05 14:19:57 -04:00
Philipp Holzer
039f9490dd
Optimized Profile::searchProfiles & Bugfix Contact::getProbeDataFromDatabase 2019-05-05 18:40:36 +02:00
Michael
0244a231d5 Fixes "parent-guid" notice - finally 2019-05-05 15:48:57 +00:00
Michael
f3cae4bf0c Fixes notices 2019-05-05 14:12:43 +00:00
Hypolite Petovan
e17db489ee
Merge pull request #7095 from annando/ap-connect
Switching from legacy DFRN connect to ActivityPub
2019-05-05 09:37:43 -04:00
Michael
0efab157c4 Reverted storing the protocol at all the time 2019-05-05 10:36:51 +00:00
Michael Vogel
2365193691 AP: Support of request messages 2019-05-05 11:17:45 +02:00
Philipp Holzer
9123361d61
added feedback 2019-05-05 10:00:28 +02:00
Philipp Holzer
6f787f2422
Move mod/friendica to src/Module/Friendica 2019-05-04 10:14:29 +02:00
Philipp
c9cce8492e
Merge pull request #7000 from MrPetovan/task/6999-no-probe-magic-link
Remove probing in magic link construction
2019-05-03 08:43:26 +02:00
Michael Vogel
33931ff15e Corrected order 2019-05-03 08:13:02 +02:00
Michael
b1222e174e Ensure that an existing contact isn't archived or pending 2019-05-03 05:54:40 +00:00
Michael Vogel
949fd1e8bf Fixes undefined variable 2019-05-03 06:01:01 +02:00
Hypolite Petovan
8010ccdc21
Merge pull request #7072 from nupplaphil/task/mod_directory
Move mod/directory to src/Module/Directory
2019-05-02 20:03:13 -04:00
Hypolite Petovan
d48b100f78
Merge pull request #7069 from nupplaphil/task/mod_allfriends
Move mod/allfriends to src/Module/AllFriends
2019-05-02 20:03:05 -04:00
Philipp Holzer
47d03058d1
Added feedback 2019-05-02 23:26:02 +02:00
Hypolite Petovan
e6bf97777f Remove /display/{nick}/{id} URL structure publishing
- Remove support for defunct Friendica F-Droid app
2019-05-02 17:04:17 -04:00
Philipp Holzer
2e9b2d72be
Move mod/directory to src/Module/Directory 2019-05-02 22:49:33 +02:00
Philipp Holzer
c5e7abf9c5
Move mod/allfriends to src/Module/AllFriends 2019-05-02 22:03:27 +02:00
Michael
a4dffee5f4 Fix wrong error message when updated a contact 2019-05-02 19:22:43 +00:00
Philipp
2628da422a
Merge pull request #7068 from MrPetovan/task/7047-theme-error-page
Themed error page redux
2019-05-02 21:15:29 +02:00
Philipp
774d04cd2f
Merge pull request #7044 from MrPetovan/task/router
Move mod/admin to src/Module/Admin
2019-05-02 18:26:30 +02:00
Hypolite Petovan
41f781c52a Replace System::httpExit() by HTTPException throwing 2019-05-02 11:37:09 -04:00
Philipp
07cb887885
Merge pull request #7067 from MrPetovan/task/remove-app-error
Remove App->error
2019-05-02 17:24:56 +02:00
Hypolite Petovan
71546705f8 Add Model\Contact::select method 2019-05-02 09:55:49 -04:00
Hypolite Petovan
9774c95b80 Remove duplicate $baseurl template variable
- Remove unused $overwriteURL parameter in Renderer::replaceMacros
2019-05-02 09:55:48 -04:00
Michael
28f316b7e4 Replace the legacy DFRN connection process with AP 2019-05-02 13:05:31 +00:00
Hypolite Petovan
7b1ea6cad6 Remove App->error 2019-05-01 21:17:03 -04:00
Philipp Holzer
90248f6bb7
Move .well-known, webfinger, xrd to src/Module/ 2019-05-01 18:25:04 +02:00
Michael
eef85584c2 AP: Parsing of messages from Pleroma should work now again 2019-04-26 06:17:37 +00:00
Michael
0e29ec200f Follow up to #7036: Automatically update AP contacts 2019-04-25 05:24:53 +00:00