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

4102 Commits

Author SHA1 Message Date
Michael 418009ffea Improved PR 7452: We now respect the "self" contact 2019-08-02 16:46:26 +00:00
Michael 01ef630322 Fixed description 2019-08-02 16:42:24 +00:00
Michael d95ef96cca Fix issue 7449: Image permissions are now set like before 2019-08-02 16:38:50 +00:00
Hypolite Petovan 2e6b72ba62
Revert "Reworked contact-id generation" 2019-08-01 20:39:42 -04:00
Michael Vogel e8459cce34
Merge pull request #7381 from MrPetovan/task/7309-frio-compose 
[frio] New Compose page
 2019-08-01 08:15:02 +02:00
Hypolite Petovan e9f0c4dbfb
Merge pull request #7444 from nupplaphil/task/dice_console 
Use DICE for Console
 2019-07-31 14:07:45 -04:00
Philipp Holzer 5935e69d33
Adding Configuration dependency 2019-07-31 19:43:00 +02:00
Philipp Holzer a60eb9e33d
Use DICE for Console 
- Use Friendica\Core\Console as Controller for DI-library
- Refactor every console command to use DICE (when possible)
- Adjusting tests
 2019-07-31 19:37:42 +02:00
Michael 88aa777410 Moved user block 2019-07-31 16:09:03 +00:00
Michael c936232575 Added header 2019-07-31 16:07:50 +00:00
Michael cdc44e26de Log level changed 2019-07-31 16:05:28 +00:00
Michael b377906b77 Merge remote-tracking branch 'upstream/develop' into tag-deliver-delete 2019-07-31 14:11:06 +00:00
Michael 0696026380 Improved logging when item had been deliberately deleted after creation 2019-07-31 14:09:27 +00:00
Hypolite Petovan b8a336cc0d
Merge pull request #7452 from annando/contact-id 
Reworked contact-id generation
 2019-07-31 08:12:00 -04:00
Michael b4c673a620 We now use a central function for fetching the postdata 2019-07-30 22:26:01 +00:00
Michael 8ddcd8417d Reworked contact-id generation 2019-07-30 22:02:32 +00:00
Michael 7d79d48f6e Fix: The field "contact-id" now contains the correct contact id again 2019-07-30 13:08:14 +00:00
Hypolite Petovan 0b6f231ad3 Replace removed Contact::select method with Contact::selectToArray in Compose module 2019-07-29 20:31:50 -04:00
Hypolite Petovan f010beaa95 Fix formatting in Model\Group 
- Improve logging call
- Replace removed App->getDatabase call
 2019-07-29 20:31:50 -04:00
Hypolite Petovan cb38fe4e72 Develop one-liner in Item\Compose 2019-07-29 20:31:49 -04:00
Hypolite Petovan 361958ad04 Replace removed Contact::select by Contact::selectToArray 
- Add explicit DBA::close in Model\Group
 2019-07-29 20:31:49 -04:00
Hypolite Petovan c149ba2d59 Replace $uid parameter by $obj['uid'] in Item::enumeratePermissions 2019-07-29 20:31:49 -04:00
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