1
0
Fork 0
Commit graph

972 commits

Author SHA1 Message Date
2ba4116118
Merge pull request #7282 from annando/issue-6477
Issue 6477: Automatically repair self contact avatar
2019-06-19 16:12:56 -04:00
f878cc2623 Fix for PR 7280 2019-06-19 18:38:22 +00:00
b55546b726 Merge remote-tracking branch 'upstream/2019.06-rc' into issue-6477 2019-06-19 18:26:59 +00:00
6bd5be281e Normalise it 2019-06-19 17:21:35 +00:00
4ab772ed67 Issue 6477: Automatically repair self contact avatar 2019-06-19 17:05:29 +00:00
b48a49b0f5 Added timeout 2019-06-18 08:05:45 +00:00
ea90554e7f Fix the base url detection of AP profiles 2019-06-18 07:47:21 +00:00
496910e750 Issue #5983: Ignore reshares from blocked and ignored contacts 2019-06-17 11:55:19 +00:00
14725bbd6a Fix undefined index addr notices in Model\Contact::getIdForURL
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502393030
2019-06-15 17:16:10 -04:00
f6f22378f1 Ignored stuff must be stored. 2019-06-14 18:34:17 +00:00
2482072457 Issue 5983: Central check for blocked and ignored contacts added 2019-06-14 05:25:10 +00:00
5b291abc7f Restore show_connect flag in Model\Profile::sidebar 2019-06-13 03:26:42 -04:00
Philipp
6c6e3058f2
Merge pull request #7260 from annando/sanitize-input
Sanitize the date for mails
2019-06-13 09:11:41 +02:00
20eb7ae73f Empty dates are now set to today as well 2019-06-13 05:43:00 +00:00
6970fb2862 Issue 7142: Prevent respawn of "remote self" items 2019-06-13 05:06:52 +00:00
2ae4371606 Sanitize the date for mails 2019-06-13 03:22:15 +00:00
422ebb5d58 Fix notice in Model\Profile 2019-06-12 19:41:15 +00:00
Philipp
fb63274aaf
Merge pull request #7250 from MrPetovan/bug/6410-normalize-message-button
Normalize message button in profile sidebar
2019-06-12 17:56:05 +02:00
304c144bc2
Use App::getBaseURL instead of System::getBaseURL in Model\Profile::load
Co-Authored-By: Philipp <admin+Github@philipp.info>
2019-06-12 10:56:41 -04:00
76a420fbe9 Avoid fatal error when AP contact has no photo 2019-06-11 05:26:16 +00:00
3aebb92cf3 Rework Profile::sidebar profile link conditions
- Now show Follow, Unfollow, Atom Feed and Message in profile sidebar more consistently with the status of the current visitor
- Remove pseudo-field contact.remoteconnect
2019-06-10 21:56:03 -04:00
61c79ce9ee Add new Model\Contact::canReceivePrivateMessages method 2019-06-10 21:29:11 -04:00
0fbfb7c970 Prevents an endless loop when only the non-public contact is available in Contact::magicLinkByContact 2019-06-10 19:10:39 -04:00
d7d44e1af7
Merge pull request #7245 from annando/unify-constants
Fix delivery counter for poking / unify delivery commands
2019-06-10 11:59:40 -04:00
41dc243186 Fix delivery counter for poking / unify delivery commands 2019-06-10 14:19:24 +00:00
165607ffe7
Merge pull request #7242 from nupplaphil/bugs/6917-php_warning
Add typed parameter for methods in `Friendica\Util\Network`
2019-06-10 09:22:27 -04:00
Philipp Holzer
cc7444d84d
Move internal recursion-counter to the end of all cur/fetchUrl parameters 2019-06-10 14:34:54 +02:00
1c6bf7d25a Add App parameter to Module\Profile::sidebar method prototype 2019-06-10 08:21:06 -04:00
Philipp Holzer
236c0dc248
Check $contact['id']
- see https://github.com/friendica/friendica/issues/6918#issuecomment-498043313
2019-06-10 12:36:42 +02:00
44a49a8d7d Ensure that pokes are always send only via DFRN 2019-06-06 04:26:02 +00:00
f0de19dd8a
Merge pull request #7208 from nupplaphil/bug/6916-filetag
Adding null checks before FileTag method (fix fatal)
2019-05-31 01:47:52 -04:00
Philipp Holzer
c76258c370
catching nulls for FileTag 2019-05-30 13:54:35 +02:00
Philipp Holzer
694cd82d0e
Bugfix - author-network (adding to unset list during insert) 2019-05-29 21:48:03 +02:00
Philipp Holzer
7334be803d
Bugfix - item_id 2019-05-29 21:40:21 +02:00
Philipp Holzer
766a10b3b6
Adding author-network to ITEM::ITEM_FIELDLIST
see https://github.com/friendica/friendica/issues/6918#issuecomment-493515358
2019-05-29 20:09:20 +02:00
Philipp Holzer
15ffb70c5f
Adding item_id to Item::ITEM_FIELDLIST
see https://github.com/friendica/friendica/issues/6918#issuecomment-493515358
2019-05-29 20:08:21 +02:00
Philipp
9245942a0c
Merge pull request #7199 from MrPetovan/bug/7171-filer-network
Allow commas in saved folder names
2019-05-29 07:03:44 +02:00
Philipp
e557457158
Merge pull request #7201 from annando/mail-db-error
Fix Issue 7196
2019-05-28 20:02:39 +02:00
ae940755c7 Fix Issue 7196 2019-05-28 17:39:26 +00:00
6de3449cae Add new fileToArray and arrayToFile methods to Module\FileTag 2019-05-27 17:38:36 -04:00
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
14a78807d7 Use self::isBlocked and self:isBlockedByUser in Model\Contact::addRelationship 2019-05-20 16:34:17 -04:00
62dfcbb074 Prevent contact relationships with node- or user-level blocked contacts 2019-05-20 15:29:20 -04:00
ea77f214d7 Add return value to Model\Contact::addRelationship to remove protocol-specific code from it 2019-05-20 15:29:20 -04:00
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
c65faecc8c Add current tab parameter to Model\Profile::getTabs 2019-05-20 15:09:33 -04:00
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
79cb5b1bae Add block reason editing in Model\Contact 2019-05-15 19:28:00 -04:00
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
a7feb4bf9f Add Two-factor recovery code model
- [DBA] Add NULL value handling in condition array
2019-05-13 01:52:00 -04:00
f04bb820ad Magic links should work again 2019-05-10 07:38:10 +00:00
d9f6a58229 Mail: Set the "reply" value when it is a reply 2019-05-09 20:52:52 +00:00
b8a23369b6 Mail storing is now centralized 2019-05-08 05:44:22 +00:00
626709159f Some cleaning up 2019-05-06 18:46:30 +00:00
bb8d297ae4
Merge pull request #7097 from nupplaphil/task/mod_after_PR_fixing
Fixings for Mod-Refactorings
2019-05-05 20:28:57 -04:00
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
039f9490dd
Optimized Profile::searchProfiles & Bugfix Contact::getProbeDataFromDatabase 2019-05-05 18:40:36 +02:00
0244a231d5 Fixes "parent-guid" notice - finally 2019-05-05 15:48:57 +00:00
f3cae4bf0c Fixes notices 2019-05-05 14:12:43 +00:00
e17db489ee
Merge pull request #7095 from annando/ap-connect
Switching from legacy DFRN connect to ActivityPub
2019-05-05 09:37:43 -04:00
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
9123361d61
added feedback 2019-05-05 10:00:28 +02:00
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
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
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
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
47d03058d1
Added feedback 2019-05-02 23:26:02 +02:00
e6bf97777f Remove /display/{nick}/{id} URL structure publishing
- Remove support for defunct Friendica F-Droid app
2019-05-02 17:04:17 -04:00
2e9b2d72be
Move mod/directory to src/Module/Directory 2019-05-02 22:49:33 +02:00
c5e7abf9c5
Move mod/allfriends to src/Module/AllFriends 2019-05-02 22:03:27 +02:00
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
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
71546705f8 Add Model\Contact::select method 2019-05-02 09:55:49 -04:00
9774c95b80 Remove duplicate $baseurl template variable
- Remove unused $overwriteURL parameter in Renderer::replaceMacros
2019-05-02 09:55:48 -04:00
28f316b7e4 Replace the legacy DFRN connection process with AP 2019-05-02 13:05:31 +00:00
7b1ea6cad6 Remove App->error 2019-05-01 21:17:03 -04:00
90248f6bb7
Move .well-known, webfinger, xrd to src/Module/ 2019-05-01 18:25:04 +02:00
eef85584c2 AP: Parsing of messages from Pleroma should work now again 2019-04-26 06:17:37 +00:00
0e29ec200f Follow up to #7036: Automatically update AP contacts 2019-04-25 05:24:53 +00:00
ffd6896bd2 Probing of Pleroma contacts does work again 2019-04-24 20:08:43 +00:00
Philipp
2376399168
Merge pull request #7034 from annando/api-announce
API: Fix the displaying of reshared posts
2019-04-24 09:07:52 +02:00
dd7406f285 API: Fix the displaying of reshared posts 2019-04-24 04:26:23 +00:00
5233434d94
proper split cronjob functions 2019-04-22 14:22:00 +02:00
6056081d5a
Move mod/nodeinfo to src/Module/Nodeinfo 2019-04-22 14:00:17 +02:00
49d12b5fae Remove probing in magic link construction
- Use Contact::getProbeDataFromDatabase and Contact::magicLinkByContact instead of Contact::getIdForURL and Contact::magicLinkbyId in Contact::magicLink
- Add default value for $cid parameter in Contact::getProbeDataFromDatabase
2019-04-12 08:50:44 -04:00
6a2c0b3cc7
Merge pull request #6989 from nupplaphil/task/basePath_baseUrl_fix
Automatic BaseURL determination fix
2019-04-11 04:07:20 -04:00
4e9316fc15 Fix warnings 2019-04-09 17:58:28 +00:00
8748aff110 Avoid some more warning 2019-04-09 11:44:35 +00:00
d58147413f Avoid update of non native contacts, fix most warnings 2019-04-09 11:28:45 +00:00
84a6e390ab Fetch data from the given contact number, if already present 2019-04-09 08:47:57 +00:00