jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
31773 commits 10 branches 58 tags 216 MiB
Commit graph

31773 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
e10ab489a9
Merge pull request #10811 from MrPetovan/bug/photo-route 
Add missing Module\Photo route for contact avatar
 2021-10-03 13:53:17 +02:00
Hypolite Petovan
5112dd06f2 Add missing Module\Photo route for contact avatar 2021-10-03 07:48:46 -04:00
Michael Vogel
ec4034ad14
Merge pull request #10810 from MrPetovan/bug/photo-route 
Fix regular expression in the user avatar photo routes
 2021-10-03 13:40:14 +02:00
Hypolite Petovan
f426a5bd98 Fix regular expression in the user avatar photo routes 2021-10-03 07:37:30 -04:00
Tobias Diekershoff
e8becc1538
Merge pull request #10809 from annando/small-as 
Code Style: Replace "AS" with "as"
 2021-10-03 12:49:24 +02:00
Michael
9961943b73 Code Style: Replace "AS" with "as" 2021-10-03 10:34:41 +00:00
Michael Vogel
96b41fdb67
Merge pull request #10808 from MrPetovan/task/10725-user-avatar 
Replace remaining reference to Model\Photo::stripExtension
 2021-10-03 11:57:59 +02:00
Hypolite Petovan
c1ab3801ba Replace remaining reference to Model\Photo::stripExtension 2021-10-03 05:52:53 -04:00
Hypolite Petovan
cd9caec06b
Merge pull request #10807 from annando/emoji-media 
Don't store emoji images as media but links
 2021-10-03 05:49:30 -04:00
Michael
42790fbc1f Don't store emoji images as media but links 2021-10-03 09:42:14 +00:00
Hypolite Petovan
185e5ba900
Merge pull request #10806 from tobiasd/2021100-de 
DE translation update
 2021-10-03 05:33:02 -04:00
Tobias Diekershoff
20d20278ef DE translation updats 2021-10-03 10:13:16 +02:00
Michael Vogel
10038bb578
Merge pull request #10805 from MrPetovan/task/10725-user-avatar 
Switch uid with nickname in user picture URLs
 2021-10-03 01:10:55 +02:00
Hypolite Petovan
8cb0bb5deb Switch uid with nickname in user picture URLs 
- Keep previous URL scheme fallback as remote contact avatar URLs pointing to local user avatar URLs need to update
 2021-10-02 19:06:59 -04:00
Hypolite Petovan
7cdd2d1336 Refactor User::getAvatarUrlForId into getAvatarUrl 
- Use user/owner array as parameter instead of uid
- Rename $profile variables to $owner when it's the result of User::getOwnerDataByNick
- Replace Module\Photo::stripExtension with native pathinfo() calls
 2021-10-02 19:06:25 -04:00
Hypolite Petovan
dc3c8f915d
Merge pull request #10804 from annando/more-q 
Replaced "q" calls
 2021-10-02 18:53:43 -04:00
Michael
e609c4b8d2 Replaced "q" calls 2021-10-02 22:42:39 +00:00
Hypolite Petovan
810699b454
Merge pull request #10803 from nupplaphil/feat/message_log 
Forgot one Logpoint ..
 2021-10-02 17:41:34 -04:00
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
Michael Vogel
2a442952b6
Merge pull request #10800 from MrPetovan/task/10739-block 
Add block and unblock hooks
 2021-10-02 23:39:06 +02:00
Hypolite Petovan
a8e3d0a4d1 Updated main translation file because I'm used to do it now 2021-10-02 17:30:43 -04:00
Hypolite Petovan
66fec8944f Add block and unblock hooks 2021-10-02 17:30:40 -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
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
49310b46d3
Merge pull request #10802 from nupplaphil/feat/webda_storage 
Remove disturbing/superfluous logging messages
 2021-10-02 23:19:35 +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
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