1
1
Fork 0
Commit graph

31929 commits

Author SHA1 Message Date
3a30f90324
Merge pull request #10796 from MrPetovan/task/10754-add-revoke-function
Add revoke follow feature
2021-10-02 20:30:20 +02:00
d675686a87 Updated main translation file after adding strings 2021-10-02 14:01:49 -04:00
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
52b8cd054d [Docs] Move unfollow hook instances in the correct file 2021-10-02 13:53:21 -04:00
9918fa3ec0 Move translation strings in their own array for confirm templates 2021-10-02 13:52:54 -04:00
e6aef548fb ActivityPub: Update relation when receiving a follow reject message 2021-10-02 13:52:54 -04:00
c822cdaebd Removing "blubb" 2021-10-02 17:47:11 +00:00
8dc4499bcf
Merge pull request #10797 from annando/diaspora-deprecated
Replaced deprecated code from the Diaspora implementation
2021-10-02 19:19:40 +02:00
e5ffda3478 Replaced deprecated code from the Diaspora implementation 2021-10-02 17:11:54 +00:00
27a0a47e7e Updated access key documentation 2021-10-02 15:30:15 +00:00
a44d200c21 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 15:13:55 +00:00
c3554ac0f4 "Video" is replaced by a "Media" tab in contact and profile 2021-10-02 15:09:43 +00:00
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
f5d73cb89a Fix comments, remove sed bkp files, fix bash compatiblity 2021-10-02 14:45:25 +02:00
b34034cef6 Updated main translation file after adding strings 2021-10-02 08:36:41 -04:00
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
6cba99f9c9
Merge pull request #10759 from annando/user-contact
Insert a `user-contact` for every contact
2021-10-02 08:27:14 -04:00
e938dc1fef Updated "database.sql" 2021-10-02 11:59:03 +00:00
865006682a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-10-02 11:57:43 +00:00
1979b4775d New functionality to display media posted by a contact 2021-10-02 11:55:22 +00:00
de2352e34d
Merge pull request #10794 from annando/q-removed
"q" call is replaced
2021-10-02 07:44:33 -04:00
ef7c543634
Merge pull request #10793 from annando/issue-10747
Issue 10747: Improved check for blocked domains
2021-10-02 07:43:00 -04:00
666cff7d55 "q" call is replaced 2021-10-02 11:08:12 +00:00
f1e2ceb32c Issue 10747: Improved check for blocked domains 2021-10-02 10:25:50 +00:00
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
4e5116cf7e API: No special handling for Diaspora reshares 2021-10-02 08:22:15 +00:00
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
2e6b0f63be small typo 2021-10-01 18:27:22 +02:00
d7cb68e95d add a hint about the phpmailer addon to the install docs 2021-10-01 18:25:18 +02:00
c20c029edc
Merge pull request #10789 from tobiasd/20211001-de
DE translation updates
2021-10-01 11:39:56 -04:00
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
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
0c53adfd72
Merge pull request #10782 from annando/display-uid
Prefer the local user when displaying items
2021-10-01 10:41:38 -04:00
Michael Vogel
6a444d8e13
Update mod/display.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-10-01 16:28:33 +02:00
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
19d5987c9d Sanitize the addon author if it is not a valid URL but a handle 2021-10-01 13:25:00 +00:00
fabrixxm
5bcc6cca75
Merge pull request #10784 from tobiasd/20211001-adminpanel_messages
cleanup adminpanel messages
2021-10-01 14:20:50 +02:00
2f0b2e2276
Merge pull request #10785 from fabrixxm/fix/test-small-typo
Fix typo in test for ParsedLogIterator
2021-10-01 14:17:35 +02:00
fabrixxm
fcc284577d Fix typo in test for ParsedLogIterator 2021-10-01 14:08:00 +02:00
f51438c168 unescape HTML from the relocation warning message 2021-10-01 14:05:17 +02:00
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
fabrixxm
e73be051ce
Merge pull request #10783 from tobiasd/20211001-Vagrant
Vagrant updates
2021-10-01 10:35:57 +02:00
9b23ac578e Vagrant: create the correct mail aliases during provision 2021-10-01 10:18:43 +02:00
0b2fa63bcb Vagrant: Docs add a note about the PHP dependencies 2021-10-01 10:04:40 +02:00
d52e2ab791 Vagrant: Replace comment with more fitting one in provision 2021-10-01 10:00:01 +02:00
4960d0f438 Vagrant: Add the type to the synced folder in the Vagrantfile 2021-10-01 09:42:08 +02:00