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

8071 Commits

Author SHA1 Message Date
Hypolite Petovan bd42f5757f Implement relationship termination for Mastodon block 
- This is the expected Mastodon behavior on block
 2021-10-02 17:30:07 -04:00
Hypolite Petovan b0d8136b00 Remove contact record instead of setting rel = 0 in Contact::revokeFollow 2021-10-02 17:30:03 -04:00
Philipp 254c32ac91
Forgot one Logpoint .. 2021-10-02 23:27:15 +02:00
Michael Vogel fc9ac0ff46
Update src/Module/Conversation/Network.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-02 23:18:54 +02:00
Philipp 80753ed1b6
Remove disturbing/superfluous logging messages 2021-10-02 23:11:33 +02:00
Michael eea355ae3b Merge remote-tracking branch 'upstream/develop' into network-thread-view 2021-10-02 21:00:10 +00:00
Michael bd85babc3e Fixing "Unknown column 'network-thread-view.uri-id'" 2021-10-02 20:56:11 +00:00
Hypolite Petovan c4a4473cd0 Remove the obsolete parameter $two_way from terminateFriendship methods 
- Follow revokation is now done independently
 2021-10-02 16:14:22 -04:00
Hypolite Petovan 222333f64f Remove contact drop feature 
- Feature was confusing, sometimes ineffective and overall overlapping with unfollow/block
 2021-10-02 16:04:28 -04:00
Michael 1550c0cf13 Reverted unneeded changes 2021-10-02 19:33:51 +00:00
Michael afa611bd50 The media class moved 2021-10-02 19:31:27 +00:00
Michael da3fbced38 Merge branch 'contact-media' of github.com:annando/friendica into contact-media 2021-10-02 18:35:47 +00:00
Michael 2408ac8227 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 18:35:43 +00:00
Michael Vogel a2f5190bdb
Update src/Model/Contact.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-02 20:31:30 +02:00
Hypolite Petovan 72fae04e97 Add revoke follow feature 
- Add new follow revoke module
- Add new hooks: revoke_follow, support_follow, support_revoke_follow
- Add link in contact page action menu
 2021-10-02 14:01:46 -04:00
Hypolite Petovan 9918fa3ec0 Move translation strings in their own array for confirm templates 2021-10-02 13:52:54 -04:00
Hypolite Petovan e6aef548fb ActivityPub: Update relation when receiving a follow reject message 2021-10-02 13:52:54 -04:00
Michael c822cdaebd Removing "blubb" 2021-10-02 17:47:11 +00:00
Tobias Diekershoff 8dc4499bcf
Merge pull request #10797 from annando/diaspora-deprecated 
Replaced deprecated code from the Diaspora implementation
 2021-10-02 19:19:40 +02:00
Michael e5ffda3478 Replaced deprecated code from the Diaspora implementation 2021-10-02 17:11:54 +00:00
Michael a44d200c21 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 15:13:55 +00:00
Michael c3554ac0f4 "Video" is replaced by a "Media" tab in contact and profile 2021-10-02 15:09:43 +00:00
Hypolite Petovan 797391e1d8 Rework contact termination to separate protocol-level and contact-level 
- Mail and Feed contacts are now removed automatically on relationship termination
- Added logging and notice messages for different results
 2021-10-02 08:31:59 -04:00
Michael 865006682a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-10-02 11:57:43 +00:00
Michael 1979b4775d New functionality to display media posted by a contact 2021-10-02 11:55:22 +00:00
Hypolite Petovan de2352e34d
Merge pull request #10794 from annando/q-removed 
"q" call is replaced
 2021-10-02 07:44:33 -04:00
Michael 666cff7d55 "q" call is replaced 2021-10-02 11:08:12 +00:00
Michael f1e2ceb32c Issue 10747: Improved check for blocked domains 2021-10-02 10:25:50 +00:00
Hypolite Petovan dae3e7d4c7
Merge pull request #10787 from fabrixxm/issue/10767 
Mark string translatable in View logs
 2021-10-01 11:08:11 -04:00
fabrixxm e8c0d5d445 Logs view: remove unneeded tpl var 2021-10-01 17:00:06 +02:00
fabrixxm 0638e23f7a Mark string translatable in View logs 
and update messages.po
 2021-10-01 16:46:55 +02:00
Tobias Diekershoff 3727be9d6c
Merge pull request #10786 from annando/sanitize-addon-author 
Sanitize the addon author if it is not a valid URL but a handle
 2021-10-01 15:30:30 +02:00
Michael 19d5987c9d Sanitize the addon author if it is not a valid URL but a handle 2021-10-01 13:25:00 +00:00
Tobias Diekershoff 786596fec5 remove superfluous characters from warning messages in the admin panel 
\r\n was shown in the warning messages of the admin panel log view page. They have
been removed. Additionally the messages.po file has been regenerated.
 2021-10-01 14:02:27 +02:00
Hypolite Petovan d9cd2f5bca
Merge pull request #10773 from annando/issue-10772 
Issue 10772: Avoid duplicated links in AP posts
 2021-09-28 07:03:39 -04:00
Michael 5a7bd4884a Issue 10772: Avoid duplicated links in AP posts 2021-09-27 20:26:08 +00:00
fabrixxm eadcc8dc93 Handle reading empty file in ReversedFileReader 
fix #10766
 2021-09-27 12:14:19 +02:00
Michael e4b8536c75 Removing MySQL workaround 2021-09-26 18:30:44 +00:00
Michael f26226229a Issue 10768: Avoid MySQL problems when upgrading both index and structure 2021-09-26 17:13:26 +00:00
Hypolite Petovan 2a88262732
Merge pull request #10760 from annando/conversation-moved 
The conversation functionality moved to a class
 2021-09-26 10:03:26 -04:00
Michael 1bb25de287 Applied change from PR #10763 2021-09-26 12:17:30 +00:00
Hypolite Petovan 0bb169b4ed Check for reply existence before using its values in Model\Mail 
- Address https://github.com/friendica/friendica/issues/10474#issuecomment-925263894
 2021-09-26 08:15:07 -04:00
Hypolite Petovan 9d77958247 Ensure parent exists before adding reply to elements in OStatus and Feed 
- Address https://github.com/friendica/friendica/issues/10474#issuecomment-927118628
 2021-09-26 08:15:07 -04:00
Michael e08c5ca2e0 Another try ... 2021-09-26 04:16:21 +00:00
Michael 1e583b4f35 Space removed 2021-09-26 04:07:02 +00:00
Michael 171cbf0512 Removed spaces 2021-09-26 04:05:46 +00:00
Michael 96055cafff Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-26 03:57:31 +00:00
Michael a2532ad755 Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-26 03:07:59 +00:00
Hypolite Petovan d8febbe45e Add new hook to support unfollow contacts on non-native networks 2021-09-25 16:15:06 -04:00
Michael 1f96742695 Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-25 18:38:50 +00:00
Michael 3fddf3807a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-25 18:34:55 +00:00
Michael d4fd151227 Partly reverting formatting to cause a code style checker error 2021-09-25 08:06:38 +00:00
Michael 5cfb0cb58a Last style stuff ... 2021-09-24 04:52:34 +00:00
Michael 943f1961ea Style again 2021-09-24 04:50:47 +00:00
Michael 8fd8241797 Style again 2021-09-24 04:46:30 +00:00
Michael 64d181c1cc Code style 2021-09-24 04:35:27 +00:00
Michael f696fce824 Reformatting 2021-09-23 21:53:52 +00:00
Michael 26fa5e8b3f Moved functions 2021-09-23 21:29:36 +00:00
Michael 0ad904c185 The conversation functionality moved to a class 2021-09-23 21:18:36 +00:00
Hypolite Petovan 7f7f0eb10c Improve compacting error logging in Util\JsonLD 
- Exceptions thrown by friendica/json-ld are nested and their string representation shows all the exception chain
 2021-09-22 23:09:46 -04:00
Michael 840d9823d4 Log unexpected value 2021-09-22 03:25:01 +00:00
Michael 7ac76639c5 AVoid warning when fetching page data 2021-09-22 02:41:24 +00:00
Hypolite Petovan be3fb5f205
Merge pull request #10730 from annando/public-contact-list 
Display the public contacts for profile visitors
 2021-09-19 17:32:51 -04:00
Michael 325342a886 Renamed variable 2021-09-19 17:56:44 +00:00
Michael 9c73e49db7 Make posts on the profile page writable 2021-09-19 10:53:19 +00:00
Michael f032f66b38 Display the public contacts for profile visitors 2021-09-19 10:06:42 +00:00
Michael 3dddea96fa Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-18 20:27:24 +00:00
Hypolite Petovan 24ecf5954c
Merge pull request #10721 from annando/issue-10720-avatar 
Issue 10720: Use different path scheme for user avatars
 2021-09-18 09:30:08 -04:00
Philipp c00da77c67
Add feedback 2021-09-18 12:55:17 +02:00
Philipp fd22906d70
Add feedback 2021-09-18 12:51:10 +02:00
Philipp 6893e2c3f7
Add feedback / revert fix for $item['post-type'] 2021-09-18 12:51:09 +02:00
Philipp 462f76352e
Add feedback :-) 2021-09-18 12:51:09 +02:00
Philipp 89a085a12c
Check DBA::count() result 2021-09-18 12:51:08 +02:00
Philipp 644f312896
Fix various Notices 2021-09-18 12:51:06 +02:00
Michael a91e3f5dbc Issue 10720: Use different path scheme for user avatars 2021-09-17 18:36:20 +00:00
Hypolite Petovan 9a0c3cc834 Simplify max_data parameter for Temporal::getDateTimeField 2021-09-15 15:56:44 -04:00
Michael Vogel 695df7507a
Merge pull request #10713 from MrPetovan/task/10672-contact-module-security-token 
Use CSRF token as name and value for contact deletion confirm form
 2021-09-15 07:55:34 +02:00
Hypolite Petovan 44ec4de14c Use CSRF token as name and value for contact deletion confirm form 2021-09-14 17:28:42 -04:00
Michael Vogel a689db7b64
Update src/Protocol/ActivityPub.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-09-14 23:22:57 +02:00
Michael b18f92ea72 Fixed indendation 2021-09-14 20:46:59 +00:00
Michael f99c4ca704 Removing unused variable 2021-09-14 08:08:50 +00:00
Michael 72fa4e9970 Better handling of displaying peertube videos 2021-09-14 07:52:53 +00:00
Michael d33fea1993 Fix: Use the $uid 2021-09-14 02:00:40 +00:00
Michael e3413cf959 Issue 10706: Publish public custom fields in AP 2021-09-14 01:28:58 +00:00
Michael 2926282f8d More fields added to "user-contact" 2021-09-13 14:20:20 +00:00
Michael 5abc1543fd Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-13 12:31:30 +00:00
Hypolite Petovan d78661817e
Merge pull request #10693 from nupplaphil/feat/config_dir 
Add the possibility to use a different configuration directory
 2021-09-13 07:02:52 -04:00
Philipp a65fbcebe7
Fixing #10699 (prohibits blocking and ignoreing from the photo menu) 2021-09-12 21:20:12 +02:00
Michael 3eea4b1130 Use "rel" for "self" instead of using a separate field 2021-09-12 19:04:27 +00:00
Michael 19c3e55ca8 Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-12 12:36:04 +00:00
Philipp 27e4586597
Move path determination logic into the ConfigFactory 2021-09-12 13:44:29 +02:00
Michael Vogel 5246b9c4b0
Merge pull request #10697 from MrPetovan/bug/10692-api-expand-entities 
Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses
 2021-09-12 06:47:51 +02:00
Hypolite Petovan e3a2f17f9f
Merge pull request #10696 from annando/photo-type 
Use post type "photo" for multiple photos as well
 2021-09-12 00:19:47 -04:00
Hypolite Petovan 8e99b7f775 Refine BBCode::expandTags regular expression 
- Now requires the tag to be preceded by either a non-word character or a start of a line
- Added corresponding tests
 2021-09-12 00:06:14 -04:00
Hypolite Petovan 5a93bb6eff Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses 
- We never need to expand tags inside of an already existing BBCode url tag
 2021-09-12 00:05:22 -04:00
Michael 6579a3a106 Use post type "photo" for multiple photos as well 2021-09-12 01:58:29 +00:00
Michael 9191daf12f Fix commenting on public posts 2021-09-12 01:52:10 +00:00
Michael eeec6aaeb9 Removed unused "use" 2021-09-11 13:02:36 +00:00
Michael 1e123ace12 Only fetch, not probe 2021-09-11 13:00:12 +00:00
Michael 10cb52bc00 Only add user contacts, alternate way to fetch public contact id 2021-09-11 12:43:46 +00:00