friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-17 07:37:55 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
31756 commits 3 branches 63 tags 247 MiB
Commit graph

1705 commits

Author SHA1 Message Date
Hypolite Petovan ce7d394ff9
Merge pull request #10801 from annando/network-thread-view 
Fixing "Unknown column 'network-thread-view.uri-id'"
 2021-10-02 17:40:00 -04:00
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
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
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 2408ac8227 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 18:35:43 +00: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
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
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
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 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
Michael 64d181c1cc Code style 2021-09-24 04:35:27 +00:00
Michael 0ad904c185 The conversation functionality moved to a class 2021-09-23 21:18:36 +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 Holzer c00da77c67
Add feedback 2021-09-18 12:55:17 +02:00
Philipp Holzer 462f76352e
Add feedback :-) 2021-09-18 12:51:09 +02:00
Philipp Holzer 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
Hypolite Petovan 44ec4de14c Use CSRF token as name and value for contact deletion confirm form 2021-09-14 17:28:42 -04: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
Michael 19c3e55ca8 Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-12 12:36:04 +00:00
Philipp Holzer 27e4586597
Move path determination logic into the ConfigFactory 2021-09-12 13:44:29 +02: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
Philipp Holzer 5702944116
Add the possibility to use a different configuration directory 2021-09-11 14:33:26 +02:00
Michael 9c14eb0c6b Use centralized function to update contact entries 2021-09-10 18:21:19 +00:00
Hypolite Petovan 8b450be09b Move unsecured GET endpoint handlers before security token check in Module\Contact 2021-09-10 12:05:43 -04:00
Hypolite Petovan 75d3f5094b
Merge pull request #10683 from annando/proxify 
Make the proxy functionality optional
 2021-09-10 10:24:17 -04:00
Michael 634db1ec85 Changed text 2021-09-10 00:30:11 +00:00
Michael bdb5aa6bd9 Make the proxy functionality optional 2021-09-09 12:40:19 +00:00
Hypolite Petovan e9aa27b19f Add form security token to contact actions 
- Add token to batch POST actions
- Add token to individual GET actions
 2021-09-06 12:30:38 -04:00
Hypolite Petovan d20b53607d Distinguish between public and private contact in contact actions 
- Block and ignore is done relating to a public contact (uid = 0)
- Update and drop is done relating to a private contact (uid !=0)
- Method documentation has been improved to precise the contact type it needs
- Public and private contact ids are retrieved before acting on contacts
 2021-09-06 11:50:46 -04:00
Hypolite Petovan 5262843e63 Add redirect URL parameter to contact batch 
- This allows redirection to the correct contact tab after a batch action
 2021-09-05 14:54:51 -04:00
Hypolite Petovan 6e358bfacf Remove user-controlled contact archival feature 
- Archival is managed at the system level for failed probing and doesn't make sense for a user to decide on it
 2021-09-05 14:54:50 -04:00
Michael 52ca3e5417 Remove all traces of "rino" 2021-09-05 18:34:44 +00:00
Michael ce6f6978bd Use the correct function is adviced ... 2021-09-03 04:20:32 +00:00
Michael 307cfef12b Select all fields 2021-09-03 04:09:02 +00:00
Michael 6bb8b63da0 Adding gravity to avoid notices 2021-09-03 04:05:29 +00:00
Hypolite Petovan 4140a59332
Merge pull request #10658 from nupplaphil/feat/storage_naming 
Rename Storage Backend labels
 2021-09-02 19:55:15 -04:00
Philipp Holzer 687e6841bc
Rename Storage Backend labels 2021-09-02 23:27:35 +02:00