clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
25,120 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

4281 Commits

Author SHA1 Message Date
Hypolite Petovan 9d20705700 Improve compose page template 
- Update title and description of the limited/private panel
- Move CC email addresses outside of the visibility panels
 2019-07-29 20:31:49 -04:00
Hypolite Petovan 3e6018b3f2 Add meta protocol group for private post support 2019-07-29 20:31:48 -04:00
Hypolite Petovan 4e427f615b Only include natively supported protocol contacts in meta-groups 2019-07-29 20:31:48 -04:00
Hypolite Petovan 4f4b538bcf [frio] Add jotnet fields to compose page 
- Move hardcoded descriptions to translation strings
 2019-07-29 20:31:47 -04:00
Hypolite Petovan c24ca57f21 Add frio-specific /compose module 2019-07-29 20:31:46 -04:00
Hypolite Petovan 0579252362 Add user meta-groups for followers and mutual contacts 
- Both Group::expand and Item::enumeratePermissions now have a user id parameter to expand meta-groups
 2019-07-29 20:31:46 -04:00
Philipp 70ba9e5e0c
Merge pull request #7174 from MrPetovan/task/dba-quote-identifiers 
DBA: Correctly escape identifier names
 2019-07-29 14:37:09 +02:00
Hypolite Petovan b876a339ff
Merge pull request #7447 from annando/ap-alt-outgoing 
ActivityPub: We now support transmitting alternative image descriptions
 2019-07-29 01:20:05 -04:00
Michael bcc8ed378c ActivityPub: We now do support transmitting alternative image descriptions 2019-07-29 05:09:11 +00:00
Hypolite Petovan 1ccc1efdcf
Merge pull request #7446 from annando/alt-text 
ActivityPub: Support for incoming picture descriptions
 2019-07-29 00:57:14 -04:00
Michael ab7db9944d ActivityPub: Support for incoming picture descriptions 2019-07-29 04:35:13 +00:00
Hypolite Petovan 0e0fff3324 Correctly escape identifier names 
- Add support for schema, multiple tables in $table parameters
- Remove Database->formatTableName method
 2019-07-29 00:23:40 -04:00
Michael e556dfd475 Don't deliver nested comments to Diaspora if the previous comment wasn't from Diaspora 2019-07-28 19:13:17 +00:00
Hypolite Petovan 50f3098495 Revert adding DBA::toArray to Item::selectToArray 2019-07-28 00:12:49 -04:00
Hypolite Petovan 3334a3d497 Fix indent in Model\Item 2019-07-28 00:06:05 -04:00
Hypolite Petovan a61ce4fed0 Ensure *toArray returns an array 2019-07-28 00:03:42 -04:00
Philipp Holzer 2f5928f43a
Refactoring Profile:: selectors 2019-07-28 00:19:38 +02:00
Philipp Holzer 51d2db3998
merge DBA::selectToArray 2019-07-27 23:57:38 +02:00
Philipp Holzer 7613704d2f
improve Profile model 2019-07-27 23:56:54 +02:00
Philipp Holzer 37d03bbeae
Introduce test optimization 
- Add static connection for whole tests
- Introduce ExtendedPDO class to enable nested transactions
- Add rollback logic for tests to ensure reliability and increase speed
 2019-07-27 23:54:13 +02:00
Philipp Holzer 07aaf292ec
Fix tests 2019-07-27 23:54:13 +02:00
Philipp Holzer 2a87464c97
Replace q() call with Profile::get() method 2019-07-27 23:54:12 +02:00
Philipp Holzer 6c2cf494b5
Remove DependencyFactory 
- Include all necessary classes in `dependencies.config.php`
- Add DI-reference to BaseObject (acts as a global registry)
- Refactor all static "init()" methods to use the global registry

- Refactor Logging for Worker-Logger a little bit
 2019-07-27 23:54:12 +02:00
Hypolite Petovan 8b344141da
Merge pull request #7434 from annando/contact-protocol 
New functions to check if a contact supports that protocol
 2019-07-27 17:47:54 -04:00
Michael f5cb6148cf Improved documentation 2019-07-27 21:45:36 +00:00
Philipp b5a9a1f1d3
Merge pull request #7435 from annando/select-to-array 
Added "selectToArray" functions in DBA and Item
 2019-07-27 19:45:32 +02:00
Michael 5d9472dccf Type hints 2019-07-27 17:00:06 +00:00
Michael f48452dd29 Some more 2019-07-27 16:57:00 +00:00
Michael 580f9cf6c7 Replaced some " with ' 2019-07-27 16:53:48 +00:00
Michael 555c444b4e Moved function to Database.php 2019-07-27 16:08:48 +00:00
Michael 1a3bf05dfb Changed "Contact::select" to "Contact::selectToArray" 2019-07-27 15:57:23 +00:00
Michael 89454fabdb Changed "Photo::select(" to "Photo::selectToArray(" 2019-07-27 15:52:02 +00:00
Michael ac6bfd3e4c Changed Attach::select to Attach::selectToArray 2019-07-27 15:47:17 +00:00
Michael 975ff86bae Fix: The $contact error is expected to be a single row array 2019-07-27 15:40:43 +00:00
Michael 2be0ceac6b Added "selectToArray" functions in DBA and Item 2019-07-27 14:33:17 +00:00
Michael 264936100f New functions to check if a contact supports that protocol 2019-07-27 11:09:12 +00:00
Hypolite Petovan eaf217ef7d Update server block admin page to reflect the addition of shell wildcard syntax 2019-07-25 22:37:30 -04:00
Hypolite Petovan 1dbdb9dd15 Update server block console help text to reflect the addition of shell wildcard syntax 2019-07-25 22:37:14 -04:00
Hypolite Petovan 46f7b79c7d Switch server blocklist check to case-insensitive shell wildcard 2019-07-25 22:36:25 -04:00
Philipp 56e0a92d83
Merge pull request #7425 from MrPetovan/task/2fa-ping-disallowed 
2FA: Remove mod/ping from exception list
 2019-07-25 08:49:20 +02:00
Hypolite Petovan d75e3e1650
Merge pull request #7430 from annando/contact-not-archived 
"all contacts" shouldn't show archived contacts
 2019-07-24 16:00:41 -04:00
Michael e256876ec1 Support for empty nick names 2019-07-24 19:30:36 +00:00
Michael aac086bf91 "all" contacts shouldn't show archived contacts 2019-07-24 19:29:45 +00:00
Hypolite Petovan 4ec4a04e49 Remove mod/ping from 2fa exception list 
- Prevent asynchronous calls to redirect to /2fa in case of missing valid 2fa session
 2019-07-23 20:03:08 -04:00
Hypolite Petovan 4821fe1b98 Use template-displayed errors in TwoFactor\Verify 
- Remove the page dependency on jGrowl notices
 2019-07-23 20:02:26 -04:00
Hypolite Petovan 56afc43b21 Extend the use of exceptions in App::runFrontend 
- Replace an explicit header locatiobn + exit with System::externalRedirect
 2019-07-23 20:01:45 -04:00
Hypolite Petovan 3812d3d445 Enable two-factor app-specific passwords for ejabberd 2019-07-23 05:11:33 -04:00
Hypolite Petovan 64b10205bc
Merge pull request #7420 from annando/reshare-contact 
Fix contact issues with fake reshares from Twitter
 2019-07-23 05:05:44 -04:00
Michael 2a213c215e Fix contact issues with fake reshares from Twitter 2019-07-23 04:26:20 +00:00
Hypolite Petovan 8677428edb Remove debug 2019-07-22 17:41:21 -04:00
Hypolite Petovan cd257dc7e8 Enable app-specific password authentication for API login 2019-07-22 07:56:36 -04:00
Hypolite Petovan 1a164b0dc5 Add two-factor app-specific password settings page 
- Add two-factor app-specific model
- Add link to new page from 2fa settings index page
 2019-07-22 07:56:00 -04:00
Hypolite Petovan a149d6ec44 Move recovery code model to sub-folder 2019-07-22 07:41:01 -04:00
Hypolite Petovan 1d8b809227
Merge pull request #7414 from annando/fetch-diaspora 
Fetch Diaspora posts by url
 2019-07-22 07:01:42 -04:00
Michael 105378f5a4 Changed regexp 2019-07-22 06:03:18 +00:00
Hypolite Petovan 55e2006312
Merge pull request #7412 from nupplaphil/task/dice 
Introduce DICE
 2019-07-21 11:04:41 -04:00
Philipp Holzer 05102911db
Fix App\Mode determination 2019-07-21 14:40:50 +02:00
Philipp Holzer 7aa9917ca8
Fix DB_UPDATE_VERSION constant 2019-07-21 14:34:42 +02:00
Philipp Holzer a8e6a57e9b
Fixing installer 2019-07-21 14:21:02 +02:00
Michael 53ffe5a2e1 Fetch Diaspora posts by url 2019-07-21 07:37:50 +00:00
Michael a11206dbcd Issue 6675: Improved check for follower, removed global setting 2019-07-21 05:56:57 +00:00
Philipp c6131c057b
Merge pull request #7411 from annando/ap-quote 
Preparation for quoted reshares on AP
 2019-07-21 01:49:22 +02:00
Philipp Holzer 55999730e0
Introduce DICE 
- Adding dice library
- Adding dependency config

- Removing Factories
- Refactoring App\Mode constructor
- Refactoring App\Router constructor
- Refactoring BasePath for DI usage
- Refactoring ConfigFileLoader constructor
- Refactoring Profiler constructor

- Adjust entrypoints (index, console, worker, ..)

- Adding functional test for DI
- Fix tests because of refactorings
 2019-07-21 01:22:10 +02:00
Michael 23830dc45f Preparation for quoted reshares on AP 2019-07-20 21:32:19 +00:00
Hypolite Petovan 6df53624c7 Remove confusing extraneous success_update >= failure_update conditions 2019-07-20 13:34:08 -04:00
Hypolite Petovan f5e07be04e Fix undefined property notice in L10n\L10n 2019-07-18 21:21:16 -04:00
Hypolite Petovan 3f85a921da Force invite remaining variable to be integer in Content\Widget 
- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-512786156
 2019-07-18 08:42:07 -04:00
Michael 931c190566 Removed test output 2019-07-18 06:20:54 +00:00
Michael 1553581175 Merge remote-tracking branch 'upstream/develop' into fetch-item 2019-07-18 06:16:40 +00:00
Michael c771c575a7 Fix PR 7399: Added missing "use" 2019-07-18 06:12:43 +00:00
Michael 41a1c1c3e6 Fetch items by given uri 2019-07-18 06:11:02 +00:00
Michael Vogel dcebf53ecf
Merge pull request #7402 from MrPetovan/bug/7401-node-settings-style 
Ensures node theme settings are used to render theme embed
 2019-07-18 06:32:40 +02:00
Hypolite Petovan 477a84a8c4 Ensures node theme settings are used to render theme embed 2019-07-17 23:25:22 -04:00
Hypolite Petovan 9b927fa333
Merge pull request #7399 from annando/only-sharer 
Added the option to only receive top level posts from people you follow
 2019-07-17 20:53:28 -04:00
Michael e247a14d2b Added the option to only receive top level posts from people you follow 2019-07-17 21:37:13 +00:00
Hypolite Petovan 4fc3eb8f06
Merge pull request #7398 from annando/fetch-posts 
Preparation for being able to fetch AP posts by proving the URL
 2019-07-17 16:01:19 -04:00
Michael a80a6bec74 Preparation for being able to fetch AP posts by proving the URL 2019-07-17 19:36:32 +00:00
Hypolite Petovan 11e4f906c2
Hot-fix: Core\L10n::t method passing parameter bug 
Follow-up to #7379
 2019-07-16 21:18:25 -04:00
Hypolite Petovan 0b97b32a59
Merge pull request #7379 from nupplaphil/task/refactor_l10n_for_test 
Refactor L10n for testing
 2019-07-16 16:03:42 -04:00
Hypolite Petovan 3b1f777d0c
Merge pull request #7391 from annando/warning 
Avoid a warning in Notifier worker
 2019-07-16 16:03:17 -04:00
Michael 379a1a52e0 Avoid a warning 2019-07-16 19:58:47 +00:00
Philipp Holzer 346290cc23
Reverted indention 2019-07-16 21:54:22 +02:00
Philipp Holzer 46a260aa01
Fix indentations 2019-07-16 20:19:56 +02:00
Philipp Holzer 92fb0a82ca
Dynamic config loading 
- Move settings, defaults and dbstructure to directory 'static'
- Dynamic loading of config files (after the static loading)
- Filter out '-sample.config.php' and '-sample.ini.php' files
- Remove unnecessary ConfigFileManager
- Move ConfigFileLoader to Utils
- Add tests for multi-loading for INI, config and sample-filtering
 2019-07-16 20:16:43 +02:00
Philipp Holzer 79e69ee528
Fix language (again ;-) ) 2019-07-16 16:50:49 +02:00
Philipp Holzer eb024a3718
Refactor L10n for testing 
- Moving L10n to L10n\L10n
- Adding constructor information
- Adding to factory
- simplify/speedup tests
 2019-07-16 16:44:47 +02:00
Philipp 966043712f
Merge pull request #7389 from MrPetovan/bug/7387-local_user-int 
Ensure NULL isn't passed to Feature::isEnabled
 2019-07-16 16:37:38 +02:00
Hypolite Petovan c6cd2b131d Add transitive type hints in Core\PConfig 2019-07-16 07:45:24 -04:00
Michael 8c2f50eb72 Issue 7315: Set the forum's contact id for forum posts 2019-07-16 05:07:26 +00:00
Michael Vogel bb83f23e26
Merge pull request #7386 from MrPetovan/bug/7293-hide-registration-link 
Hide registration button on login page when registration are closed
 2019-07-16 05:38:12 +02:00
Hypolite Petovan 68f5b639eb Restore $uid parameter integer type-hint in Config 
- Add integer type-hint to Feature::isEnabled
 2019-07-15 22:00:49 -04:00
Hypolite Petovan 19247b62ae Ensure $uid parameter of Feature::isEnabled to be an integer 2019-07-15 22:00:49 -04:00
Hypolite Petovan e9511b4f34
Merge pull request #7388 from annando/issue-7315 
Issue 7315: Changed handling of "Group" posts
 2019-07-15 16:32:42 -04:00
Hypolite Petovan d1c048cd4b
Fix typo in Model\Config\PConfig 2019-07-15 16:32:13 -04:00
Michael 1a213bd8e8 Issue 7315: Changed handling of "Group" posts 2019-07-15 20:05:36 +00:00
Philipp Holzer f70271aa5d
Allow nullable UID in PConfigCache 2019-07-15 21:14:13 +02:00
Philipp Holzer d5de5b6789
Bugfixing bad UIDs for PConfig 2019-07-15 21:11:38 +02:00
Philipp Holzer ebf00e32a1
minor phpdoc fixings 2019-07-15 20:54:33 +02:00
Philipp Holzer 74f7c16585
Fixup phpdoc 2019-07-15 20:19:52 +02:00
Philipp Holzer 9d98a4ce3a
Refactor PConfiguration 2019-07-15 20:13:53 +02:00
Hypolite Petovan e16c410b59 Hide registration button on login page when registration are closed 2019-07-15 09:11:21 -04:00
Hypolite Petovan ff99a62584
Merge pull request #7384 from nupplaphil/bug/fixing_config_load 
Fixing initial load config (Simplify Config Part 3a)
 2019-07-15 08:06:29 -04:00
Philipp e9c6746c3b
Merge pull request #7382 from annando/issue-7367 
Issue 7367: Enhanced check when DFRN delivery can be skipped
 2019-07-15 09:59:16 +02:00
Philipp Holzer 6801e8b5ab
Fixing initial load config 2019-07-15 08:58:37 +02:00
Michael 143566b853 Missing word 2019-07-15 04:36:55 +00:00
Michael 6170ddf58d Issue 7367: Only skip DFRN delivery when both author and owner of the post support AP 2019-07-15 04:33:00 +00:00
Hypolite Petovan 6c68b8359d
Merge pull request #7372 from nupplaphil/task/simplify_config 
Refactor Configuration (Simplify Config Part 3)
 2019-07-14 19:05:09 -04:00
Philipp Holzer 4af08d82b2
Added string type-hint for get() and a test case for it 2019-07-14 23:23:20 +02:00
Hypolite Petovan 7ce48d1b77
Merge pull request #7376 from annando/contact-update 
Contact update overhaul - again
 2019-07-14 17:07:04 -04:00
Philipp Holzer aa249adf6d
some more minor fixups (phpdoc, unused using) 2019-07-14 22:49:17 +02:00
Philipp Holzer a654470061
fix phpdoc 2019-07-14 22:41:09 +02:00
Philipp Holzer b48c22dc1a
minor fixing: phpdoc & type-hint 2019-07-14 22:31:53 +02:00
Philipp Holzer a2c6240da0
some minor fixings 2019-07-14 22:26:36 +02:00
Philipp Holzer 4913502922
bugfix: add lost changes due merge 2019-07-14 22:12:45 +02:00
Philipp Holzer c293eadb78
Improve & fixing Tests 2019-07-14 22:12:11 +02:00
Philipp Holzer 486f139342
Move Preload/JIT Configuration logic from Adapter to Core-Configuration 2019-07-14 22:09:07 +02:00
Michael 83729b8c00 "defaults" is replaced 2019-07-14 16:04:52 +00:00
Michael 9ba3ee13a8 Use an insert to avoid duplicates and for analyzing 2019-07-14 10:22:19 +00:00
Michael 5bba0e7d39 Hopefully avoiding duplicated relay entries 2019-07-13 23:53:15 +00:00
Michael 2df17fc0c0 Fix SQL problem with "not null" 2019-07-13 07:39:53 +00:00
Michael 002963f198 Fix wrong variable 2019-07-13 07:29:56 +00:00
Michael 9b8396620b Fix duplicated contacts due to relay probing 2019-07-13 07:25:01 +00:00
Philipp Holzer 8c0f047bc7
Add namespace 2019-07-12 23:08:01 +02:00
Michael 7dfadf7e7e Simplify the contact update in "getIdForURL" 2019-07-12 21:07:47 +00:00
Philipp Holzer a30200083a
BugFix: forgot configCache in ConfigFactory 2019-07-12 23:05:48 +02:00
Philipp Holzer c82127ffb7
Splitting ConfigCache & PConfigCache 
- Remove IConfigCache & IPConfigCache
- Add new PConfigCache
- Add missing Logger::init() (bugfixing tests)
 2019-07-12 22:53:37 +02:00
Michael c34204cf50 Merge remote-tracking branch 'upstream/develop' into contact-update 2019-07-12 20:51:27 +00:00
Hypolite Petovan b56709d802
Merge pull request #7358 from nupplaphil/bug/installer_db 
Bugfixing DB/Installer (Simplify Config Part 1)
 2019-07-12 16:48:17 -04:00
Michael 8cbdc7939e Fetch more comtact data from probing, remove duplicated contacts 2019-07-12 14:55:23 +00:00
Michael Vogel 807d2665ea Use standard function to update the contact to avoid SQL errors 2019-07-11 22:11:51 +02:00
Michael Vogel 6b25fd5b2f added logging 2019-07-10 05:19:54 +02:00
Michael Vogel 54d96da94a Fix fatal error with incomplete contact data upon delivery 2019-07-10 05:16:50 +02:00
Philipp Holzer e1d135238a
Revert default password setting & using "HiddenString" even for empty strings 2019-07-09 22:38:54 +02:00
Philipp Holzer ab7c6499ff
Bugfixing DB/Installer 
- default value with HiddenString
- Fixing checkDB during installation
 2019-07-09 22:22:06 +02:00
Jeroen De Meerleer 01dc0c031c There are no dead nodes anymore 2019-07-09 09:23:36 +02:00
Hypolite Petovan fe8a53425a
Revert "Changed unavailable to in a relation" 2019-07-08 15:55:08 -04:00
Hypolite Petovan 8e2d1fad17
Merge pull request #7347 from JeroenED/task/relationship-status 
Changed unavailable to in a relation
 2019-07-08 13:02:36 -04:00
Michael d1435bef61 Add ActivityPub related fields to the "uri" function 2019-07-08 12:00:11 +00:00
Jeroen De Meerleer 6811ee5d16 Merge remote-tracking branch 'friendica.github.com/develop' into task/relationship-status 2019-07-08 07:48:07 +02:00
Michael 6bb418c5a7 Use "received" instead of "created" when displaying posts in creation order 2019-07-07 21:30:33 +00:00
Jeroen De meerleer dea0bfd01f changed unavailable to In a relation, deleted available 2019-07-07 22:51:05 +02:00
Hypolite Petovan 9b8b2b36cd
Merge pull request #7339 from annando/gcontact-update 
Restructured Contact/GContact handling
 2019-07-07 13:28:20 -04: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
Philipp f60792348a
Merge pull request #7336 from MrPetovan/bug/globalcommunity-silence-getidforurl 
Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup
 2019-07-03 16:47:37 +02:00
Michael 7b0a9ffd89 Update gcontact when public contact is updated 2019-07-03 05:46:35 +00:00
Hypolite Petovan 50fa6b7e02 Use Contact::getIdForURL instead of Probe::uri and manual contact table lookup 
- Address https://forum.friendi.ca/display/0b6b25a8-215d-1bab-29c9-77a221796252
- Normalize quote style
- Remove deprecated get_app() call
 2019-07-02 19:25:24 -04: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
Hypolite Petovan a248da8f2e
Merge pull request #7334 from annando/federated-protocol 
New constant for federated protocols
 2019-07-01 21:52:55 -04: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
Hypolite Petovan 7abc42700c Fix missing App object in Worker\OnePoll 2019-06-30 12:16:18 -04: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 e48fbeda0a restore updating of the public contact 2019-06-28 04:34:01 +00:00
Michael 8838a1f2d1 Avoid overwriting of avatars for feeds 2019-06-28 04:26:49 +00:00
Michael 96651ae76d Fix a missing variable 2019-06-28 02:46:56 +00:00
Michael d552db5c55 Polling functions are split into several functions 2019-06-27 20:38:09 +00:00
Michael 7e7acf5763 Last old query replaced in OnePoll.php 2019-06-27 16:21:23 +00:00
Michael d4dc2a129e Replace old database queries 2019-06-27 13:30:26 +00:00
Michael 59b1a1aced Removing many now unused or duplicated tasks from OnePoll 2019-06-27 05:38:16 +00:00
Michael 4db3c79d04 Archive/unarchive the contacts 2019-06-27 05:03:58 +00:00
Michael 9caa8bae35 Unused parts removed, query refurbished 2019-06-26 05:18:11 +00:00
Michael 9b49fd7f3f Changed logging 2019-06-25 17:36:24 +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 Vogel 26accbe3ef
Merge pull request #7296 from MrPetovan/task/smilies-replace 
Limit smilies replacement to BBCode::convert
 2019-06-24 22:05:37 +02:00
Philipp Holzer 91c295b55f
Rebase type-hint based on af9ce6b92a 2019-06-24 09:36:07 +02:00
Philipp Holzer 082634adbc
Moving from DBA to Database 2019-06-24 09:36:07 +02:00
Michael 80f4214d91 Merge remote-tracking branch 'upstream/develop' into contact-discovery 2019-06-24 05:41:10 +00: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 2fb70bd5f2 Use Unicode to convert multiple hearts in Content\Smilies 2019-06-23 17:53:25 -04:00
Hypolite Petovan 9545ff614b Limit smilies replacement to BBCode::convert 2019-06-23 17:53:25 -04:00
Hypolite Petovan b9ab613777 Merge branch 'master' into develop 2019-06-23 17:40:52 -04: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
Philipp 5306622225
Merge pull request #7304 from MrPetovan/bug/smilies-escape-code-blocks 
Escape HTML pre-formatted blocks before converting smilies
 2019-06-23 03:00:22 +02:00
Dean Townsley 0c6a0942cc Clarify comment and log message 2019-06-22 19:08:34 -05:00
Dean Townsley 9dff3d2b6d Use User:: API insteadd of direct database read 2019-06-22 18:56:33 -05:00
Hypolite Petovan dc25355412
Merge pull request #7306 from annando/perform-activity 
Fix the processing of event activities
 2019-06-22 19:23:09 -04:00
Michael Vogel 449305e527 Fix the processing of event activities 2019-06-23 00:38:52 +02:00
Hypolite Petovan cf11f57a5b Escape HTML pre-formatted blocks before converting smilies 2019-06-22 18:22:37 -04:00
Michael Vogel 1883cfba24
Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray" 2019-06-22 22:06:43 +02:00
Dean Townsley 042fcfeb50 Enable multi-auth in dfrn autoRedir 
Update checks to account for a user being authenticated to multiple
contacts on the local server at the same time.
It was also necessary to remove a looping procection to make this work
correcly with browsers that open multiple connections because the
information about what contacts are authenticated is stored in the PHP
session.
 2019-06-22 12:34:54 -05: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 Vogel 85772f02ca
Merge pull request #7286 from MrPetovan/bug/invading-smilies 
Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray
 2019-06-22 12:51:49 +02:00
Hypolite Petovan cdd23e5b6d Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray 2019-06-22 04:16:02 -04:00
Michael b5de71c390 Fix a notice when the author is missing 2019-06-21 17:57:26 +00:00
Hypolite Petovan b07490266c
Merge pull request #7288 from annando/fix-search 
Fix searching for contacts
 2019-06-20 19:33:00 -04:00
Michael 7c87e83dcf Fix searching for contacts 2019-06-20 21:56:18 +00: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 d8ed2ed76d it is poll, not notify 2019-06-19 18:32:38 +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
Hypolite Petovan 2c19b8c8e6
Merge pull request #7277 from annando/ignore-resharer 
Issue #5983: Ignore reshares from blocked and ignored contacts
 2019-06-17 09:01:31 -04:00
Michael 496910e750 Issue #5983: Ignore reshares from blocked and ignored contacts 2019-06-17 11:55:19 +00:00
Hypolite Petovan d54e778f30 Move share conversion at the end of Text\BBCode::convert 2019-06-16 23:13:26 -04:00
Hypolite Petovan da56e0a541 Add tests folder to typo console coverage 
- Use correct config object in Console\Typo
 2019-06-15 22:27:20 -04:00
Hypolite Petovan 84ccaf50fa Allow brackets in URLs 
- Remove obsolete $URLSearchString variable
- Add related tests
 2019-06-15 22:26:29 -04:00
Hypolite Petovan 38311a4a02 Move link conversion to the end of BBCode::convert 
- Addresses https://github.com/friendica/friendica/issues/7271
- Add related tests
 2019-06-15 22:24:51 -04: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
Hypolite Petovan aa5a61baef Fix variable by reference notice in Module\Admin\Federation 
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502347979
 2019-06-15 17:12:36 -04:00
Hypolite Petovan 75894fa275 Use item created date if edited doesn't exist in Protocol\Diaspora::buildStatus 
- Addresses https://github.com/friendica/friendica/issues/6918#issuecomment-502347886
 2019-06-15 17:11:01 -04:00
Hypolite Petovan da114445c9
Merge pull request #7268 from annando/issue-5983 
Issue 5983: Central check for blocked and ignored contacts added
 2019-06-15 16:53:41 -04:00
Hypolite Petovan 394159d41e Use correct entry list in Module\Directory 2019-06-15 08:44:55 -04:00
Hypolite Petovan 68c65af046 Remove unused Module\Directory::init method 2019-06-15 08:44:36 -04:00
Michael f6f22378f1 Ignored stuff must be stored. 2019-06-14 18:34:17 +00:00
Michael Vogel 097ecdd106
Merge pull request #7266 from MrPetovan/bug/notices 
Add type-hint in ActivityPub\Receiver::fetchObject to catch wrong type coercion
 2019-06-14 15:03:30 +02:00
Michael Vogel dc3bbb749b
Merge pull request #7270 from MrPetovan/bug/7269-fetch-routes 
Define expected /fetch module routes
 2019-06-14 13:24:43 +02:00
Hypolite Petovan 95094aa53d Check for existing protocols.inbound value in Protocol\PortableContact 2019-06-14 06:25:44 -04:00
Hypolite Petovan 9f2529df30 Define expected /fetch module routes 2019-06-14 06:22:01 -04:00
Michael 2482072457 Issue 5983: Central check for blocked and ignored contacts added 2019-06-14 05:25:10 +00:00
Michael e4efddbabb Avoid a notice in AP Receiver 2019-06-14 02:58:40 +00:00
Hypolite Petovan 66d4f1d40b Add type-hint in ActivityPub\Receiver::fetchObject to catch wrong type coercion 2019-06-13 19:07:39 -04:00
Hypolite Petovan af9ce6b92a Add type-hint for dynamic variables in DBA 2019-06-13 19:07:04 -04:00
Michael f41513f4ec Issue 7264: Count local delivery as well 2019-06-13 20:24:49 +00:00
Philipp Holzer a85aa24d56
Add additional check for $links in Probe 
see https://github.com/friendica/friendica/issues/6917#issuecomment-501661530
 2019-06-13 15:01:24 +02: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 Vogel 33f5a98fd6
Merge pull request #7259 from MrPetovan/bug/7240-private-message-ap 
Normalize the datetime format of received activity before DB insertion
 2019-06-13 05:21:53 +02:00
Hypolite Petovan 94a70f54d1 Normalize the datetime format of received activity before DB insertion in ActivityPub\Processor 
- Restore private message storage
 2019-06-12 21:02:37 -04:00
Hypolite Petovan 9e24b8c55f Fix formatting and PHPDoc in ActivityPub\Processor 
Add expected return value to postMail method
 2019-06-12 21:01:44 -04: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
Philipp 17490fca33
Merge pull request #7256 from MrPetovan/bug/7249-remote-logout 
Fix remote logout
 2019-06-12 07:37:42 +02:00
Hypolite Petovan 0af10a42b0 Normalize logout link behavior across themes 2019-06-11 19:42:08 -04:00
Hypolite Petovan fd8844db83 Redirect remote visitors to their own profile after logout 2019-06-11 19:41:11 -04:00
Michael bfc6bad916 Added comment 2019-06-11 21:40:44 +00:00
Michael a11b258fd6 Issue 7223: Don't strip links 2019-06-11 20:34:21 +00:00
Michael 16b9d9f199 Fix pixture posts to connectors / fix delivery counter for connector posts 2019-06-11 19:35:03 +00:00
Philipp f4d20c577b
Merge pull request #7251 from annando/fix-fatal 
Avoid fatal error when AP contact has no photo
 2019-06-11 08:45:49 +02:00
Michael 9d8f01c49c Fix another fatal error 2019-06-11 06:02:18 +00:00
Michael 76a420fbe9 Avoid fatal error when AP contact has no photo 2019-06-11 05:26:16 +00:00
Hypolite Petovan b00bcbb1c1 Normalize the contact sidebar with the profile sidebar 
- Remove un/follow text links in contact status window
 2019-06-10 21:56:06 -04: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
Philipp Holzer 7c54edd4b4
Fixing Network::post() caused by wrong argument 2019-06-10 19:34:16 +02:00
Hypolite Petovan 9491c63934
Merge pull request #7247 from annando/fix-7242 
Fixes PR 7242: Now the "post" function works again
 2019-06-10 13:30:33 -04:00
Michael 7bbacd3878 Fixes PR 7242: Now the "post" function works again 2019-06-10 16:58:00 +00:00
Michael 7d0ebe8bbe Fix the detection of image posts 2019-06-10 16:06:54 +00: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
Hypolite Petovan 151c026a8a
Merge pull request #7244 from nupplaphil/task/hidden_string 
Introduce HiddenString for Config-Values
 2019-06-10 10:50:41 -04:00
Michael 41dc243186 Fix delivery counter for poking / unify delivery commands 2019-06-10 14:19:24 +00:00
Philipp Holzer 50d8dbb123
Bugfixing wrong typed password setting 2019-06-10 15:46:51 +02:00
Philipp Holzer 4666b18e5b
Bugfixing empty password setting 2019-06-10 15:40:15 +02: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 357d9b5108
Introduce HiddenString for Config-Values 2019-06-10 14:46:31 +02: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
Philipp Holzer 10683a43c8
Add typed parameter for methods in Friendica\Util\Network 2019-06-10 12:06:41 +02:00
Dean Townsley 19e99f7e81 Use accessing function for session variable 2019-06-09 21:06:42 -05:00
Dean Townsley 5c93db4097 remove leftover logging 2019-06-09 21:06:42 -05:00
Dean Townsley af85e498ce expand permission check to remote array 
This check was preventing multiple private images from different
users on the same server from loading on the same page.
It was only checking for permission for the single id returned by the
remote_user() function rather than the multiple possible autheniticated
id's stored in the remote arry session variable.
 2019-06-09 21:06:42 -05:00
Hypolite Petovan 8c5923bb46
Merge pull request #7233 from nupplaphil/bug/installer_replace_macro 
Fixing Installer - ReplaceMacro
 2019-06-06 20:37:11 -04:00
Philipp Holzer 79fe3c92c7
Fixing Installer - ReplaceMacro 2019-06-07 00:36:10 +02:00
Michael 52a3ece8b6 Added comments 2019-06-06 17:58:49 +00:00
Michael 44a49a8d7d Ensure that pokes are always send only via DFRN 2019-06-06 04:26:02 +00:00
Philipp f1c044e3b6
Merge pull request #7221 from annando/issue-6799 
Issue #6799 - remove linefeeds inside of a table structure
 2019-06-02 11:28:43 +02:00
Michael bcf0be5db1 Issue #6799 - remove linefeeds inside of a table structure 2019-06-02 04:18:38 +00:00
Hypolite Petovan 7875199167
Merge pull request #7218 from nupplaphil/bug/remove_queue_summary 
Remove queue from Admin/Summary
 2019-06-01 22:26:58 -04:00
Philipp Holzer aba7c9f08c
Remove queue from Admin/Summary 2019-06-02 03:28:22 +02:00
Philipp Holzer dec5983850
Remove .well-known hardening 2019-06-02 03:19:44 +02:00
Michael 9f026f1814 The only reason we don't defer is when it was a post to a relay 2019-06-01 11:28:37 +00:00
Hypolite Petovan bbac95d692
Merge pull request #7213 from annando/fix-counter 
The delivery counter now counts only successful deliveries
 2019-06-01 07:12:31 -04:00
Michael ecf809c7ae The delivery counter now counts only successful deliveries 2019-06-01 06:54:47 +00:00
Philipp 25433e79d5
Merge pull request #7211 from MrPetovan/bug/7209-admin-forbidden 
Add themed themed error page or login page for /admin[/*]
 2019-05-31 11:49:40 +02: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
Hypolite Petovan 4b4a319af9 Add themed themed error page or login page for /admin[/*] 2019-05-31 00:23:30 -04:00
Hypolite Petovan a9e534ea79
Merge pull request #7210 from annando/diaspora-edit 
Fix edited messages for Diaspora
 2019-05-30 15:25:29 -04:00
Michael 19e95ebdda Fix edited messages for Diaspora 2019-05-30 18:56:31 +00:00
Hypolite Petovan ac294be746
Merge pull request #7207 from nupplaphil/bug/6917-php_warnings 
Add hexadecimal check (fix warnings)
 2019-05-30 09:31:50 -04:00
Philipp Holzer c76258c370
catching nulls for FileTag 2019-05-30 13:54:35 +02:00
Philipp Holzer 4c5dd9f47c
Add more Strings::isHex() checks to photos 2019-05-30 10:30:15 +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 3de540d1d1
Adding hexadecimal check for photos 
see https://github.com/friendica/friendica/issues/6917#issuecomment-492798238
 2019-05-29 20:28:25 +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 Holzer 5002bda5fc
Checking the existence of '-' before array operation 
See https://github.com/friendica/friendica/issues/6918#issuecomment-491490533
 2019-05-29 20:07:53 +02:00
Philipp dc0978141c
Merge pull request #7202 from MrPetovan/bug/fatal-errors 
Prevent fatal error in ACL::getFullSelectorHTML when accessing a profile as a remote visitor
 2019-05-29 07:05:05 +02:00
Michael Vogel 64f51d337f
Merge pull request #7204 from MrPetovan/bug/notices 
Check for array index existence
 2019-05-29 07:04:46 +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
Michael 824d35774b Fix "Undefined index: protocol" 2019-05-29 04:30:01 +00:00
Hypolite Petovan 8a0c568fe1 Check for href existence for links in Protocol\PortableContact 
See https://github.com/friendica/friendica/issues/6918#issuecomment-495198587
 2019-05-28 21:27:13 -04:00
Hypolite Petovan 5414d51d4c Prevent fatal error in ACL::getFullSelectorHTML when accessing a profile as a remote visitor 
See https://github.com/friendica/friendica/issues/6916#issuecomment-495724811
 2019-05-28 21:09:06 -04:00
Philipp e557457158
Merge pull request #7201 from annando/mail-db-error 
Fix Issue 7196
 2019-05-28 20:02:39 +02:00
Philipp 32b8c6f65e
Merge pull request #7200 from annando/tag-process 
Process incoming tag add requests
 2019-05-28 19:43:23 +02:00
Michael ae940755c7 Fix Issue 7196 2019-05-28 17:39:26 +00:00
Philipp bae4a5e406
Merge pull request #7187 from MrPetovan/bug/7023-emailer-hooks 
Enable addon using emailer hooks to skip default call to mail()
 2019-05-28 08:02:48 +02:00
Philipp be3d7759f0
Merge pull request #7198 from MrPetovan/task/6861-to-plaintext 
Simplify BBCode::toPlaintext and HTML::toPlaintext
 2019-05-28 07:49:25 +02:00
Hypolite Petovan ed768c71ee Remove "f=&" nonsense from network module 
- Fixes wrong redirect when using the sidebar filters
 2019-05-27 17:45:27 -04:00
Hypolite Petovan 0fadc7730c Replace deprecated string-bases Model\FileTag calls with array-based ones 2019-05-27 17:40:08 -04: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
Hypolite Petovan 5d2bf73517 Add Babel result screen for compact HTML::toPlaintext 2019-05-27 12:02:28 -04:00
Hypolite Petovan 5f9fb1f14f Simplify BBCode::toPlaintext 
- Keep white spaces after tags
 2019-05-27 12:02:12 -04:00
Hypolite Petovan 596b5b0982 Simplify HTML::toPlaintext 
- Keep new lines in plain text output
 2019-05-27 12:01:48 -04:00
Hypolite Petovan 3c7e4b474b
Merge pull request #7193 from nupplaphil/bug/uimport_datetime 
Fix NULL datetime for uimport/uexport
 2019-05-27 09:13:01 -04:00
Hypolite Petovan 4e207ef786 Enable addon using emailer hooks to skip default call to mail() 2019-05-26 21:36:09 -04:00
Hypolite Petovan 01e71254d9 Replace defaults() calls on $_SESSION by Core\Session calls 
- Replace direct calls to $_SESSION by Core\Session calls in Module\Login
 2019-05-26 21:26:59 -04:00
Philipp Holzer 26d4214c19
added suggestions 2019-05-26 21:53:24 +02:00
Hypolite Petovan e99e8096bf
Merge pull request #7191 from nupplaphil/bug/logfile_permission 
Fixing logfile permission denied exceptions
 2019-05-26 15:19:26 -04:00
Philipp Holzer 220f8f0862
friendica-6950 uimport doesn't support "pwdreset_time":null 2019-05-26 15:49:44 +02:00
Philipp 57f6086fcd
Merge pull request #7189 from MrPetovan/bug/7183-archives-profile-widget 
Ensures Widget::postedByYear uid parameter is integer in Module\Profile
 2019-05-26 14:42:25 +02:00
Philipp Holzer b56b56ccb6
friendica-6379 Monolog - logfile permission denied 2019-05-26 14:33:09 +02:00
Hypolite Petovan cc6a17d27a Ensures Widget::postedByYear uid parameter is integer in Module\Profile 2019-05-26 08:18:59 -04:00
Michael ecf4789cc4 Process incoming tag add requests 2019-05-26 11:20:03 +00:00
Philipp ea218438d2
Merge pull request #7186 from MrPetovan/bug/7183-archives-profile-widget 
Restore profile archives widget
 2019-05-26 08:16:54 +02:00
Philipp 6ceb74c365
Merge pull request #7184 from annando/add-tag 
AP: We now transmit "add tag" activity
 2019-05-26 08:14:18 +02:00
Hypolite Petovan 50e44f46ae Add profile archive URL pattern to Router 2019-05-25 19:08:43 -04:00
Hypolite Petovan d27d4d8927 Move posted date widget to Content\Widget 2019-05-25 19:08:15 -04:00
Michael 32b1f75ece AP: We now transmit "add tag" activity / On Diaspora this is now supressed 2019-05-25 19:33:58 +00: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
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
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
Michael 55557a8f18 Contacts with protocol = AP are now delivered only via AP 2019-05-11 05:58:22 +00: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
Philipp 7c3a19be59
Merge pull request #7120 from friendica/MrPetovan-patch-7119 
Break redirection loop during install
 2019-05-08 15:51:17 +02:00
Hypolite Petovan 0cbb9b6d37
Merge pull request #7118 from valvin1/patch-1 
add new disallowed path for robots.txt
 2019-05-08 09:19:09 -04:00
Hypolite Petovan 4740ebcf9b
Merge pull request #7117 from annando/mail 
Mail storing is now centralized
 2019-05-08 09:17:22 -04:00
Hypolite Petovan 123c4610e7
Break redirection loop during install 2019-05-08 08:30:59 -04:00
Valvin 0b1c271837
add new disallowed path for robots.txt 2019-05-08 13:08:34 +02:00
Michael b8a23369b6 Mail storing is now centralized 2019-05-08 05:44:22 +00:00
Hypolite Petovan 5ff5325e14 Uninstall addon when it wasn't found when accessed from admin aside 2019-05-08 00:46:42 -04:00
Hypolite Petovan f0f44dbd84 Delete all addon hooks by default on uninstall 2019-05-08 00:46:13 -04:00