Commit graph

32145 commits

Author SHA1 Message Date
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
Michael Vogel
1047ad7bc2
Merge pull request #10762 from MrPetovan/task/10729-remove-contact-drop
Remove contact drop feature
2021-10-02 22:12:06 +02:00
Hypolite Petovan
13dfce6356 Updated main translation file after string removal 2021-10-02 16:08:10 -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
Hypolite Petovan
600c301bc1
Merge pull request #10795 from annando/contact-media
Contact-media
2021-10-02 15:51:26 -04:00
Hypolite Petovan
4622dacbd1
Merge pull request #10799 from tobiasd/20211002-de
DE translation updates
2021-10-02 15:49: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
Tobias Diekershoff
a874d80861 DE translation updates 2021-10-02 21:30:30 +02:00
Hypolite Petovan
606b0257ff
Merge pull request #10798 from annando/q-calls
Some more "q" calls replaced
2021-10-02 14:41:25 -04: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
2924969b30 Some more "q" calls replaced 2021-10-02 18:32:56 +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
Tobias Diekershoff
3a30f90324
Merge pull request #10796 from MrPetovan/task/10754-add-revoke-function
Add revoke follow feature
2021-10-02 20:30:20 +02:00
Hypolite Petovan
d675686a87 Updated main translation file after adding strings 2021-10-02 14:01:49 -04: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
52b8cd054d [Docs] Move unfollow hook instances in the correct file 2021-10-02 13:53:21 -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
27a0a47e7e Updated access key documentation 2021-10-02 15:30:15 +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
2548d9f14f
Merge pull request #10788 from fabrixxm/fix/gettext
Fix `run_xgettext.sh` code and make it work on osx
2021-10-02 09:24:52 -04:00
Michael Vogel
51c7a7452c
Merge pull request #10769 from MrPetovan/task/10734-unfollow-hook
Rework contact termination to separate protocol-level and contact-level
2021-10-02 15:11:07 +02:00
fabrixxm
f5d73cb89a Fix comments, remove sed bkp files, fix bash compatiblity 2021-10-02 14:45:25 +02:00
Hypolite Petovan
b34034cef6 Updated main translation file after adding strings 2021-10-02 08:36:41 -04: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
Hypolite Petovan
6cba99f9c9
Merge pull request #10759 from annando/user-contact
Insert a `user-contact` for every contact
2021-10-02 08:27:14 -04:00
Michael
e938dc1fef Updated "database.sql" 2021-10-02 11:59:03 +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
Hypolite Petovan
de2352e34d
Merge pull request #10794 from annando/q-removed
"q" call is replaced
2021-10-02 07:44:33 -04:00
Hypolite Petovan
ef7c543634
Merge pull request #10793 from annando/issue-10747
Issue 10747: Improved check for blocked domains
2021-10-02 07:43:00 -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
Tobias Diekershoff
497bec1477
Merge pull request #10792 from annando/api-share-retweet
API: No special handling for Diaspora reshares
2021-10-02 11:21:18 +02:00
Michael
4e5116cf7e API: No special handling for Diaspora reshares 2021-10-02 08:22:15 +00:00
Hypolite Petovan
ac49a02c36
Merge pull request #10790 from tobiasd/20211001-install-docs
add a hint about the phpmailer addon to the install docs
2021-10-01 12:54:14 -04:00
Tobias Diekershoff
2e6b0f63be small typo 2021-10-01 18:27:22 +02:00
Tobias Diekershoff
d7cb68e95d add a hint about the phpmailer addon to the install docs 2021-10-01 18:25:18 +02:00
Hypolite Petovan
c20c029edc
Merge pull request #10789 from tobiasd/20211001-de
DE translation updates
2021-10-01 11:39:56 -04:00
Tobias Diekershoff
91a31f2da9 DE translation updates 2021-10-01 17:35:21 +02:00
fabrixxm
30c3740f67 Fix run_xgettext.sh code and make it work on osx
- run script thru `shellcheck` and fix code
- replace `readlink -f` with a function which works on osx too
- set flags to stop on errors
2021-10-01 17:26:19 +02: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