Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
24977 commits 2 branches 0 tags 132 MiB
Commit graph

1103 commits

Author SHA1 Message Date
Michael 8cbdc7939e Fetch more comtact data from probing, remove duplicated contacts 2019-07-12 14:55:23 +00:00
Michael 6bb418c5a7 Use "received" instead of "created" when displaying posts in creation order 2019-07-07 21:30:33 +00:00
Michael dda86f6dfc Basepath function now uses the contact field 2019-07-05 06:41:48 +00:00
Michael be0a102333 Simplified the Contact update 2019-07-04 21:19:23 +00:00
Michael c9666a9f1d We don't update inside the probing anymore 2019-07-04 19:40:48 +00:00
Michael 8d6aa9914c We now handling the contact type 2019-07-04 19:31:42 +00:00
Michael ef5be9668f New fields in contact table / don't update on probe 2019-07-04 04:08:55 +00:00
Michael 7b0a9ffd89 Update gcontact when public contact is updated 2019-07-03 05:46:35 +00:00
Michael 80c3a81618 Use the term-date as archive date 2019-07-02 14:46:04 +00:00
Michael 1d7154a7d1 Update the gcontact entry when the public contact entry has changed 2019-07-02 09:06:48 +00:00
Michael ee8baf00ce Now without array_merge 2019-07-01 22:14:34 +00:00
Michael 9e3aff9ade Removed comment line 2019-07-01 18:09:40 +00:00
Michael 6041f74df6 New constant for federated protocols 2019-07-01 18:00:55 +00:00
Michael 3121d967c5 Item delivery data must only be stored when there is data 2019-06-29 08:30:48 +00:00
Michael 9bf065c9d8 Merge remote-tracking branch 'upstream/develop' into delivery-statistics 2019-06-28 14:08:54 +00:00
Hypolite Petovan 7b4bba66db
Merge pull request #7323 from annando/contact-discovery 
Removing functionality from OnePoll.php
 2019-06-28 07:08:57 -04:00
Michael 0a15222576 Collect data about used protocols for delivery 2019-06-28 09:03:58 +00:00
Michael 8838a1f2d1 Avoid overwriting of avatars for feeds 2019-06-28 04:26:49 +00:00
Michael 4db3c79d04 Archive/unarchive the contacts 2019-06-27 05:03:58 +00:00
Dean Townsley fdbd160141 Add spaces for standards compliance 2019-06-24 21:37:44 -05:00
Dean Townsley 59553ab978 Don't try to auth for public images 2019-06-24 19:45:50 -05:00
Michael bca1dc1ca4 Moving functionality to the contact model 2019-06-24 03:25:01 +00:00
Michael 037cf01a15 Merge remote-tracking branch 'upstream/master' into contact-discovery 2019-06-24 03:23:57 +00:00
Hypolite Petovan fa191bd821
Merge pull request #7305 from deantownsley/imageauthfix 
Make authentication work for local private images
 2019-06-23 15:18:15 -04:00
Michael Vogel 9559266075 todo added 2019-06-23 12:01:14 +02:00
Michael 857469d16a Constantly updating public contacts 2019-06-23 09:27:40 +00:00
Michael Vogel f84e2e9d93 Fix for distribution of event deletions 2019-06-23 08:41:49 +02:00
Dean Townsley b5e195b415 Add auth to load sequence for photos 
This allows private photos to load on any page.  Previously auth
depended on some other thing like the enclosing page triggering the
authentication of the specific contact for the photo owner.
 2019-06-22 12:24:30 -05:00
Michael 14c28868eb Issue 6477: Use the correct content-type to resize the images 2019-06-20 20:09:33 +00:00
Hypolite Petovan f0849b0a93
Merge pull request #7284 from annando/fix-fatal 
Don't send activities to "null" endpoints
 2019-06-19 23:42:21 -04:00
Michael 2e4e8bdf0a Don't send activities to "null" endpoints 2019-06-20 03:06:34 +00:00
Hypolite Petovan 2ba4116118
Merge pull request #7282 from annando/issue-6477 
Issue 6477: Automatically repair self contact avatar
 2019-06-19 16:12:56 -04:00
Michael f878cc2623 Fix for PR 7280 2019-06-19 18:38:22 +00:00
Michael b55546b726 Merge remote-tracking branch 'upstream/2019.06-rc' into issue-6477 2019-06-19 18:26:59 +00:00
Michael 6bd5be281e Normalise it 2019-06-19 17:21:35 +00:00
Michael 4ab772ed67 Issue 6477: Automatically repair self contact avatar 2019-06-19 17:05:29 +00:00
Michael b48a49b0f5 Added timeout 2019-06-18 08:05:45 +00:00
Michael ea90554e7f Fix the base url detection of AP profiles 2019-06-18 07:47:21 +00:00
Michael 496910e750 Issue #5983: Ignore reshares from blocked and ignored contacts 2019-06-17 11:55:19 +00:00
Hypolite Petovan 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
Michael f6f22378f1 Ignored stuff must be stored. 2019-06-14 18:34:17 +00:00
Michael 2482072457 Issue 5983: Central check for blocked and ignored contacts added 2019-06-14 05:25:10 +00:00
Hypolite Petovan 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
Michael 20eb7ae73f Empty dates are now set to today as well 2019-06-13 05:43:00 +00:00
Michael 6970fb2862 Issue 7142: Prevent respawn of "remote self" items 2019-06-13 05:06:52 +00:00
Michael 2ae4371606 Sanitize the date for mails 2019-06-13 03:22:15 +00:00
Michael 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
Hypolite Petovan 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
Michael 76a420fbe9 Avoid fatal error when AP contact has no photo 2019-06-11 05:26:16 +00:00
Hypolite Petovan 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
Hypolite Petovan 61c79ce9ee Add new Model\Contact::canReceivePrivateMessages method 2019-06-10 21:29:11 -04:00
Hypolite Petovan 0fbfb7c970 Prevents an endless loop when only the non-public contact is available in Contact::magicLinkByContact 2019-06-10 19:10:39 -04:00
Hypolite Petovan 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
Michael 41dc243186 Fix delivery counter for poking / unify delivery commands 2019-06-10 14:19:24 +00:00
Hypolite Petovan 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
Hypolite Petovan 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
Michael 44a49a8d7d Ensure that pokes are always send only via DFRN 2019-06-06 04:26:02 +00:00
Hypolite Petovan 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
Michael ae940755c7 Fix Issue 7196 2019-05-28 17:39:26 +00:00
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
Michael 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
Michael dd7406f285 API: Fix the displaying of reshared posts 2019-04-24 04:26:23 +00:00
Philipp Holzer 5233434d94
proper split cronjob functions 2019-04-22 14:22:00 +02:00
Philipp Holzer 6056081d5a
Move mod/nodeinfo to src/Module/Nodeinfo 2019-04-22 14:00:17 +02:00
Hypolite Petovan 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
Hypolite Petovan 6a2c0b3cc7
Merge pull request #6989 from nupplaphil/task/basePath_baseUrl_fix 
Automatic BaseURL determination fix
 2019-04-11 04:07:20 -04:00
Michael 4e9316fc15 Fix warnings 2019-04-09 17:58:28 +00:00
Michael 8748aff110 Avoid some more warning 2019-04-09 11:44:35 +00:00
Michael d58147413f Avoid update of non native contacts, fix most warnings 2019-04-09 11:28:45 +00:00
Michael 84a6e390ab Fetch data from the given contact number, if already present 2019-04-09 08:47:57 +00:00
Michael bca7419987 Avoid overwriting existing contacts with bad data 2019-04-09 08:35:29 +00:00
Philipp Holzer 318a3ca785
Create own base URL class which holds the whole base url business logic 2019-04-09 08:31:16 +02:00
Michael 90eea919a4 New contact field "updated", fix warnings 2019-04-09 05:15:23 +00:00
Michael a2ca14def4 Removed a worker call - this needs more work 2019-04-08 21:35:00 +00:00
Michael c088249e1b Update the contact in the background 2019-04-08 21:05:33 +00:00
Michael f387d85cdb Fetch profile data from different contact tables when we won't or can't probe via network 2019-04-08 20:41:18 +00:00
Michael 46a99a05a1 Remove the queue from the core 2019-04-05 18:04:39 +00:00
Michael cbe574f6f6 Preparation to be able to store "announce" activities 2019-03-28 05:45:50 +00:00
Michael 2df2f623e1 Store the follow activity in the "item-activity" table 2019-03-27 21:46:32 +00:00
Michael 55325f191b Merge remote-tracking branch 'upstream/develop' into ap-delivery-failure 2019-03-26 21:36:46 +00:00
Michael fe0c516c3f Added field for "shared" inbox 2019-03-26 05:14:47 +00:00
Michael 18f3ff7b8e Unarchive inboxes on profile update 2019-03-25 22:43:00 +00:00
Philipp Holzer 6473e5a069 typo 2019-03-22 22:56:57 -04:00
Philipp Holzer 8237e73e26 Adding REAMDEs to directories 2019-03-22 22:56:57 -04:00
Philipp Holzer 083820b107 Moving mod/feedtest to src/Module/Feedtest 2019-03-22 22:55:49 -04:00
Michael dbfb0b6cff Added app class variable 2019-03-19 06:57:37 +00:00
Michael 0aab620d32 Enable remote authentication with HTTP Signatures 2019-03-19 06:44:51 +00:00
Michael cd0d6cb626 Forums now are working with AP as well 2019-03-14 18:44:41 +00:00
Michael 35ff932613 Follow up to 6834: Don't store item when the server is blocked 2019-03-10 21:19:21 +00:00
Hypolite Petovan 6f07bfb772 Add missing fields to Register::getPending() 
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-470882973
 2019-03-08 21:57:18 -05:00
Michael e89d56be6d Improved contact update from probe 2019-03-07 00:13:39 +00:00
Hypolite Petovan 7217d24a97 Replace isset by array_key_exists on array class constant in Model\Term 
- Addresses https://github.com/friendica/friendica/issues/6386#issuecomment-467835406
 2019-02-27 08:00:04 -05:00
Tobias Diekershoff bd7aaacfb0 fixing links in photoMenu 2019-02-26 10:19:08 +01:00
Hypolite Petovan 82072bae46 Add missing use statement in Model\Term 2019-02-24 13:33:11 -05:00
Michael Vogel fa5525d084
Merge pull request #6726 from MrPetovan/task/6676-fix-implicit-mentions 
Fix last batch of implicit mentions issues
 2019-02-24 15:40:11 +01:00
Michael Vogel df5ea1fab0
Merge pull request #6732 from MrPetovan/bug/1777-fix-blocked-contact-group 
Allow to remove blocked contact from groups
 2019-02-24 14:30:36 +01:00
Hypolite Petovan dbcca9cfac Hide "never" on profile 2019-02-23 18:37:51 -05:00
Hypolite Petovan 7ab986bc97 Move group module to src/ 2019-02-23 17:32:40 -05:00
Hypolite Petovan b939faf4ef Add contact removal from all groups when blocked 2019-02-23 17:32:40 -05:00
Hypolite Petovan f4745c5936 Add doc to Model\Term 2019-02-23 17:32:13 -05:00
Hypolite Petovan 67aa188830 Improve Logger calls 
- Add context in various calls
- Remove deprecated Logger::log call in Processor
 2019-02-23 17:32:13 -05:00
Hypolite Petovan 8c1db51a76 Improve Logger calls 
- Replace various deprecated Logger::log calls
- Reassign log level for verbose log calls
 2019-02-23 17:32:11 -05:00
Hypolite Petovan 1917f04153 Rewrite Term class 
- Move term type constants from TERM_* to Term::*
- Move term object type constants from TERM_OBJ_* to Term::OBJECT_TYPE_*
- Add Term::isType() method
- Add Strings::startsWith()  method
 2019-02-23 17:32:11 -05:00
Hypolite Petovan 7320c5e8e8 Normalize Contact::magicLinkByContact method name 2019-02-23 17:32:10 -05:00
Philipp Holzer 8c3aebc376
Bugfixings in Config 
- replaced usage of "!<unset>!" with null-returns
- fixed bool settings (0/1)
- fixed overriding config-values
- fixed basepath problems
 2019-02-22 23:51:13 +01:00
Hypolite Petovan 4375edd63e
Merge pull request #6719 from annando/worker-scheduler 
New scheduler mechanism - now to the correct branch
 2019-02-21 16:12:19 -05:00
Michael 3450f12cba Changed log calls 2019-02-21 19:32:31 +00:00
Roland Häder 9fa812b35d
Rewrites: 
- converted single-line if() block to multi-line and with curly braces
- "imported" SPL classes to have unified code style
- always initialize your variables ... :-/
- added some empty lines/spaces for better readability

Signed-off-by: Roland Häder <roland@mxchange.org>
 2019-02-19 01:56:41 +01:00
rabuzarus c59ba94648 fix magic links for item mentions 2019-02-17 17:19:57 +01:00
Michael 73ecf2100e Indentions 2019-02-13 10:22:36 +00:00
Michael 44ac0275ab Issue 6603: Events are now fetchable via AP 2019-02-13 07:17:19 +00:00
Michael 8cb2ab2a90 Should fix "DB Error 1205: Lock wait timeout exceeded; try restarting transaction" 2019-02-12 21:10:45 +00:00
Michael 6fd8b5f365 Don't send single item delete commands to protocols that support account removal 2019-02-11 20:30:08 +00:00
Michael 7939cacc44 The function moved from the user to the contact class 2019-02-10 17:19:10 +00:00
Michael 758eabd2f6 Removed test output 2019-02-10 12:21:16 +00:00
Michael f88a1c0b51 Merge branch 'check-follow' of github.com:annando/friendica into develop 2019-02-10 11:29:58 +00:00
Michael cf3a46b126 Don't store multiple follow request from a single person 2019-02-10 11:28:17 +00:00
Tobias Diekershoff b6e2c254fb
Merge pull request #6616 from m4sk1n/patch-1 
fix typo
 2019-02-10 08:12:58 +01:00
marcin mikołajczak 12a44c7bb9
fix typo 2019-02-09 08:42:55 +01:00
Hypolite Petovan e6a75b2609 Add alias field to ActivityPub contacts 2019-02-08 22:32:50 -05:00
Hypolite Petovan 7572843083
Merge pull request #6601 from annando/false-notifications 
Hopefully final fix for false notifications
 2019-02-07 08:41:56 -05:00
Michael ebe767b290 Hopefully final fix for false notifications 2019-02-07 05:38:43 +00:00
Hypolite Petovan a0b14a46cb
Merge pull request #6581 from nupplaphil/config_refact 
Config Refactoring
 2019-02-06 09:57:41 -05:00
Michael 633d04049b Lower priority for removing users 2019-02-03 23:55:46 +00:00
Philipp Holzer 1e0e1674f2
4) Adding Factories to other entrypoints 2019-02-03 22:46:50 +01:00
Hypolite Petovan 9525e07971 Fix greedy regular expression and move code block escaping after tag extraction in Model\Item 2019-01-29 20:25:51 -05:00
Hypolite Petovan 2bd62bfdea
Merge pull request #6554 from Ixiter/develop-bbcode-tags 
Fixed some bugs with weird tagging in [code] blocks and tagging of multiple ##
 2019-01-29 17:11:54 -05:00
Peter Liebetrau c3e5c77eb3 BBcode, Tags - changes for #pullrequestreview-197771905 2019-01-29 22:34:28 +01:00
Peter Liebetrau 5080778ea6 BBcode, Tags - moved [code] escaping before BBCode::getTags() call 2019-01-29 21:54:20 +01:00
Peter Liebetrau 87b1d0a4d7 BBcode, Tags - fixed doubbbllee trroubbllee 2019-01-29 21:35:11 +01:00
Peter Liebetrau d8bd1921ee BBcode, Tags - fix BBCode created tags in [code] blocks, fix usage of multiple ## created tags 2019-01-29 21:17:11 +01:00
Hypolite Petovan 8d84f33f15
Merge pull request #6541 from annando/mentions 
Display mentioned users and in the comment box by default
 2019-01-29 07:56:30 -05:00
fabrixxm a7d45682e7 Filesystem storage: handle basepath with trailing slash 2019-01-29 12:36:23 +01:00
fabrixxm ec94318a35 Filesystem storage: set permission on folders and files 
files are set 0660 and folders 0770.
fix #6545
 2019-01-29 12:35:30 +01:00
Michael d40b2792b6 Display mentioned users and in the comment box by default 2019-01-28 21:22:03 +00:00
Michael 7cba8942c7 Fix: Connector posts now do work again (postopts hadn't been stored) 2019-01-24 21:06:53 +00:00
Hypolite Petovan 49c9b6f9ff Fix possibly undefined variables 2019-01-23 09:06:59 -05:00
Hypolite Petovan 64847e7cc8 Fix types in doc blocks/prototypes 2019-01-23 09:06:58 -05:00
Hypolite Petovan 5ea033db33 Remove unused variable in Model\Item 2019-01-23 09:06:58 -05:00