clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 2a442952b6 Merge pull request #10800 from MrPetovan/task/10739-block Michael Vogel 2021-10-02 23:39:06 +02:00
  • a8e3d0a4d1 Updated main translation file because I'm used to do it now Hypolite Petovan 2021-10-02 16:57:35 -04:00
  • 66fec8944f Add block and unblock hooks Hypolite Petovan 2021-10-02 16:00:06 -04:00
  • bd42f5757f Implement relationship termination for Mastodon block Hypolite Petovan 2021-10-02 16:02:58 -04:00
  • b0d8136b00 Remove contact record instead of setting rel = 0 in Contact::revokeFollow Hypolite Petovan 2021-10-02 15:48:52 -04:00
  • 254c32ac91 Forgot one Logpoint .. Philipp 2021-10-02 23:27:15 +02:00
  • 49310b46d3 Merge pull request #10802 from nupplaphil/feat/webda_storage Michael Vogel 2021-10-02 23:19:35 +02:00
  • fc9ac0ff46 Update src/Module/Conversation/Network.php Michael Vogel 2021-10-02 23:18:54 +02:00
  • 80753ed1b6 Remove disturbing/superfluous logging messages Philipp 2021-10-02 22:20:39 +02:00
  • eea355ae3b Merge remote-tracking branch 'upstream/develop' into network-thread-view Michael 2021-10-02 21:00:10 +00:00
  • bd85babc3e Fixing "Unknown column 'network-thread-view.uri-id'" Michael 2021-10-02 20:56:11 +00:00
  • c4a4473cd0 Remove the obsolete parameter $two_way from terminateFriendship methods Hypolite Petovan 2021-10-02 15:48:20 -04:00
  • 1047ad7bc2 Merge pull request #10762 from MrPetovan/task/10729-remove-contact-drop Michael Vogel 2021-10-02 22:12:06 +02:00
  • 13dfce6356 Updated main translation file after string removal Hypolite Petovan 2021-09-25 13:17:10 -04:00
  • 222333f64f Remove contact drop feature Hypolite Petovan 2021-09-22 23:05:13 -04:00
  • 600c301bc1 Merge pull request #10795 from annando/contact-media Hypolite Petovan 2021-10-02 15:51:26 -04:00
  • 4622dacbd1 Merge pull request #10799 from tobiasd/20211002-de Hypolite Petovan 2021-10-02 15:49:28 -04:00
  • 1550c0cf13 Reverted unneeded changes Michael 2021-10-02 19:33:51 +00:00
  • afa611bd50 The media class moved Michael 2021-10-02 19:31:27 +00:00
  • a874d80861 DE translation updates Tobias Diekershoff 2021-10-02 21:30:30 +02:00
  • 606b0257ff Merge pull request #10798 from annando/q-calls Hypolite Petovan 2021-10-02 14:41:25 -04:00
  • da3fbced38 Merge branch 'contact-media' of github.com:annando/friendica into contact-media Michael 2021-10-02 18:35:47 +00:00
  • 2408ac8227 Merge remote-tracking branch 'upstream/develop' into contact-media Michael 2021-10-02 18:35:43 +00:00
  • 2924969b30 Some more "q" calls replaced Michael 2021-10-02 18:32:56 +00:00
  • a2f5190bdb Update src/Model/Contact.php Michael Vogel 2021-10-02 20:31:30 +02:00
  • 3a30f90324 Merge pull request #10796 from MrPetovan/task/10754-add-revoke-function Tobias Diekershoff 2021-10-02 20:30:20 +02:00
  • d675686a87 Updated main translation file after adding strings Hypolite Petovan 2021-10-02 11:47:45 -04:00
  • 72fae04e97 Add revoke follow feature Hypolite Petovan 2021-10-02 11:44:47 -04:00
  • 52b8cd054d [Docs] Move unfollow hook instances in the correct file Hypolite Petovan 2021-10-02 11:29:26 -04:00
  • 9918fa3ec0 Move translation strings in their own array for confirm templates Hypolite Petovan 2021-10-02 11:26:14 -04:00
  • e6aef548fb ActivityPub: Update relation when receiving a follow reject message Hypolite Petovan 2021-10-02 11:19:41 -04:00
  • c822cdaebd Removing "blubb" Michael 2021-10-02 17:47:11 +00:00
  • 8dc4499bcf Merge pull request #10797 from annando/diaspora-deprecated Tobias Diekershoff 2021-10-02 19:19:40 +02:00
  • e5ffda3478 Replaced deprecated code from the Diaspora implementation Michael 2021-10-02 17:11:54 +00:00
  • 27a0a47e7e Updated access key documentation Michael 2021-10-02 15:30:15 +00:00
  • a44d200c21 Merge remote-tracking branch 'upstream/develop' into contact-media Michael 2021-10-02 15:13:55 +00:00
  • c3554ac0f4 "Video" is replaced by a "Media" tab in contact and profile Michael 2021-10-02 15:09:43 +00:00
  • 2548d9f14f Merge pull request #10788 from fabrixxm/fix/gettext Hypolite Petovan 2021-10-02 09:24:52 -04:00
  • 51c7a7452c Merge pull request #10769 from MrPetovan/task/10734-unfollow-hook Michael Vogel 2021-10-02 15:11:07 +02:00
  • f5d73cb89a Fix comments, remove sed bkp files, fix bash compatiblity fabrixxm 2021-10-02 14:45:25 +02:00
  • b34034cef6 Updated main translation file after adding strings Hypolite Petovan 2021-09-26 17:49:51 -04:00
  • 797391e1d8 Rework contact termination to separate protocol-level and contact-level Hypolite Petovan 2021-09-26 10:30:44 -04:00
  • 6cba99f9c9 Merge pull request #10759 from annando/user-contact Hypolite Petovan 2021-10-02 08:27:14 -04:00
  • e938dc1fef Updated "database.sql" Michael 2021-10-02 11:59:03 +00:00
  • 865006682a Merge remote-tracking branch 'upstream/develop' into user-contact Michael 2021-10-02 11:57:43 +00:00
  • 1979b4775d New functionality to display media posted by a contact Michael 2021-10-02 11:55:22 +00:00
  • de2352e34d Merge pull request #10794 from annando/q-removed Hypolite Petovan 2021-10-02 07:44:33 -04:00
  • ef7c543634 Merge pull request #10793 from annando/issue-10747 Hypolite Petovan 2021-10-02 07:43:00 -04:00
  • 666cff7d55 "q" call is replaced Michael 2021-10-02 11:08:12 +00:00
  • f1e2ceb32c Issue 10747: Improved check for blocked domains Michael 2021-10-02 10:25:50 +00:00
  • 497bec1477 Merge pull request #10792 from annando/api-share-retweet Tobias Diekershoff 2021-10-02 11:21:18 +02:00
  • 4e5116cf7e API: No special handling for Diaspora reshares Michael 2021-10-02 08:22:15 +00:00
  • ac49a02c36 Merge pull request #10790 from tobiasd/20211001-install-docs Hypolite Petovan 2021-10-01 12:54:14 -04:00
  • 2e6b0f63be small typo Tobias Diekershoff 2021-10-01 18:27:22 +02:00
  • d7cb68e95d add a hint about the phpmailer addon to the install docs Tobias Diekershoff 2021-10-01 18:25:18 +02:00
  • c20c029edc Merge pull request #10789 from tobiasd/20211001-de Hypolite Petovan 2021-10-01 11:39:56 -04:00
  • 91a31f2da9 DE translation updates Tobias Diekershoff 2021-10-01 17:35:21 +02:00
  • 30c3740f67 Fix run_xgettext.sh code and make it work on osx fabrixxm 2021-10-01 17:19:16 +02:00
  • dae3e7d4c7 Merge pull request #10787 from fabrixxm/issue/10767 Hypolite Petovan 2021-10-01 11:08:11 -04:00
  • e8c0d5d445 Logs view: remove unneeded tpl var fabrixxm 2021-10-01 17:00:06 +02:00
  • 0638e23f7a Mark string translatable in View logs fabrixxm 2021-10-01 16:45:34 +02:00
  • 0c53adfd72 Merge pull request #10782 from annando/display-uid Hypolite Petovan 2021-10-01 10:41:38 -04:00
  • 6a444d8e13 Update mod/display.php Michael Vogel 2021-10-01 16:28:33 +02:00
  • 3727be9d6c Merge pull request #10786 from annando/sanitize-addon-author Tobias Diekershoff 2021-10-01 15:30:30 +02:00
  • 19d5987c9d Sanitize the addon author if it is not a valid URL but a handle Michael 2021-10-01 13:25:00 +00:00
  • 5bcc6cca75 Merge pull request #10784 from tobiasd/20211001-adminpanel_messages fabrixxm 2021-10-01 14:20:50 +02:00
  • 2f0b2e2276 Merge pull request #10785 from fabrixxm/fix/test-small-typo Tobias Diekershoff 2021-10-01 14:17:35 +02:00
  • fcc284577d Fix typo in test for ParsedLogIterator fabrixxm 2021-10-01 14:08:00 +02:00
  • f51438c168 unescape HTML from the relocation warning message Tobias Diekershoff 2021-10-01 14:05:17 +02:00
  • 786596fec5 remove superfluous characters from warning messages in the admin panel Tobias Diekershoff 2021-10-01 14:02:27 +02:00
  • e73be051ce Merge pull request #10783 from tobiasd/20211001-Vagrant fabrixxm 2021-10-01 10:35:57 +02:00
  • 9b23ac578e Vagrant: create the correct mail aliases during provision Tobias Diekershoff 2021-10-01 10:18:43 +02:00
  • 0b2fa63bcb Vagrant: Docs add a note about the PHP dependencies Tobias Diekershoff 2021-10-01 10:04:40 +02:00
  • d52e2ab791 Vagrant: Replace comment with more fitting one in provision Tobias Diekershoff 2021-10-01 10:00:01 +02:00
  • 4960d0f438 Vagrant: Add the type to the synced folder in the Vagrantfile Tobias Diekershoff 2021-10-01 09:42:08 +02:00
  • e4dc2b8e1c Vagrant: Docs Tobias Diekershoff 2021-10-01 09:38:51 +02:00
  • d6f89da11b Vagrant: updating the docs Tobias Diekershoff 2021-10-01 08:54:08 +02:00
  • 7331e90c00 Vagrant: Avoid mis-leading error during setup Tobias Diekershoff 2021-10-01 08:41:58 +02:00
  • 93bbf27d52 Vagrant: Do not pull PHP requirements during VM setup Tobias Diekershoff 2021-10-01 08:37:19 +02:00
  • 9858f86b21 Vagrant: Use Debian stable Tobias Diekershoff 2021-10-01 08:35:09 +02:00
  • d8447469b6 Prefer the local user when displaying items Michael 2021-10-01 05:26:13 +00:00
  • c8d2321c99 Merge pull request #10776 from tobiasd/20210929-ru Michael Vogel 2021-09-29 08:15:09 +02:00
  • 2139e46d98 RU translations THX Alexander An Tobias Diekershoff 2021-09-29 07:37:38 +02:00
  • 57ac1e5b92 Merge pull request #10775 from annando/comment-public Hypolite Petovan 2021-09-28 15:12:22 -04:00
  • 65b0b443b5 Fix commenting on profile pages Michael 2021-09-28 18:52:11 +00:00
  • d9cd2f5bca Merge pull request #10773 from annando/issue-10772 Hypolite Petovan 2021-09-28 07:03:39 -04:00
  • 0b333ef6bc Fixed test error Michael 2021-09-28 04:27:24 +00:00
  • dd6e321c97 Added test Michael 2021-09-28 03:36:48 +00:00
  • 5a7bd4884a Issue 10772: Avoid duplicated links in AP posts Michael 2021-09-27 20:26:08 +00:00
  • e53dcc3be2 Merge pull request #10771 from fabrixxm/issue/10766 Hypolite Petovan 2021-09-27 07:13:14 -04:00
  • ab7de16aca Fix code style fabrixxm 2021-09-27 12:22:08 +02:00
  • eadcc8dc93 Handle reading empty file in ReversedFileReader fabrixxm 2021-09-27 12:14:19 +02:00
  • 79b40ad573 Merge pull request #10770 from annando/issue-10768 Hypolite Petovan 2021-09-26 17:45:31 -04:00
  • e4b8536c75 Removing MySQL workaround Michael 2021-09-26 18:30:44 +00:00
  • f26226229a Issue 10768: Avoid MySQL problems when upgrading both index and structure Michael 2021-09-26 17:13:26 +00:00
  • 2a88262732 Merge pull request #10760 from annando/conversation-moved Hypolite Petovan 2021-09-26 10:03:26 -04:00
  • 92114dbe33 Merge pull request #10764 from MrPetovan/bug/notices Michael Vogel 2021-09-26 14:22:05 +02:00
  • 1bb25de287 Applied change from PR #10763 Michael 2021-09-26 12:17:30 +00:00
  • 6d19ecfde0 Merge remote-tracking branch 'upstream/develop' into conversation-moved Michael 2021-09-26 12:15:22 +00:00
  • 0bb169b4ed Check for reply existence before using its values in Model\Mail Hypolite Petovan 2021-09-25 20:45:53 -04:00