friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
24,978 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

24978 Commits

Author SHA1 Message Date
Michael 8852e26e9c And another documentation improvment 2019-09-13 20:56:32 +00:00
Michael 7e9f4becc0 Improvements 2019-09-13 20:37:10 +00:00
Michael d9476cac62 Issue 870: Clarified description of the account removal activity 2019-09-13 20:15:43 +00:00
Hypolite Petovan 2e0e1538d8
Merge pull request #7622 from annando/fix-notice 
Fix a notice because of invalid return data
 2019-09-13 15:13:53 -04:00
Michael 39133a1e0e Fix a notice because of invalid return data 2019-09-13 18:59:33 +00:00
Tobias Diekershoff 052659517b
Merge pull request #7621 from MrPetovan/bug/1605-fix-spoiler-BBCode-tag 
Bug/1605 fix spoiler bb code tag
 2019-09-13 06:04:57 +02:00
Hypolite Petovan f5eb8e88f1 Remove obsolete blockquote replacement in Item::prepareBody 2019-09-12 22:18:46 -04:00
Hypolite Petovan c034fa7baa Use <details> tag for spoilers BCode 2019-09-12 22:17:55 -04:00
Michael Vogel 31e7ba9d7e
Merge pull request #7619 from tobiasd/20190912-msg 
regen messages.po
 2019-09-12 10:15:15 +02:00
Tobias Diekershoff 980a6fea07 regen messages.po 2019-09-12 09:52:37 +02:00
Philipp 50cce950f6
Merge pull request #7614 from annando/issue-5721 
Issue 5721: Set permissions of photos in PM
 2019-09-11 22:22:06 +02:00
Hypolite Petovan 981a808873
Merge pull request #7617 from annando/notice 
Fix a notice about a missing "pending"
 2019-09-11 16:19:12 -04:00
Michael 4223011a7d Fix a notice about a missing "pending" 2019-09-11 20:03:29 +00:00
Hypolite Petovan 835ebd4777
Merge pull request #7616 from annando/follow-pleroma 
Fix enduring follow requests to Pleroma
 2019-09-11 13:13:58 -04:00
Hypolite Petovan 564b850729
Merge pull request #7615 from annando/issue-3229 
Issue 3229: Switched to other function to receive the identity
 2019-09-11 13:13:52 -04:00
Michael 3c1380fdcc Fix enduring follow requests to Pleroma 2019-09-11 16:54:13 +00:00
Michael f71abb30ca Issue 3229: Switched to other function to receive the identity 2019-09-11 16:46:13 +00:00
Michael a34995a3e5 Issue 5721: Set permissions of photos in PM 2019-09-11 04:08:41 +00:00
Hypolite Petovan 7a9aba7674
Merge pull request #7612 from annando/issue-7610-2 
Issue 7610-2: Read the "hide" status for non DFRN profiles
 2019-09-10 17:18:36 -04:00
Michael a733a00ea9 Detect the hide status when it hadn't been detected before 2019-09-10 20:20:34 +00:00
Michael 3c7fe5fc1b Issue 7610-2: Read the "hide" status for non DFRN profiles 2019-09-10 20:06:07 +00:00
Hypolite Petovan 4f504bebd2
Merge pull request #7611 from annando/issue-7610 
Issue 7610: Set the appropriate meta header to not being crawled
 2019-09-10 14:38:16 -04:00
Michael 57e4b9f806 Issue 7610: Set the appropriate meta header to not being crawled 2019-09-10 17:15:29 +00:00
Philipp d8a61f0647
Merge pull request #7609 from annando/issue-6521 
Issue 6521: Don't send notifications for deleted items
 2019-09-10 13:02:41 +02:00
Philipp 64e74b4e03
Merge pull request #7607 from annando/issue-7603 
Issue 7603: Display forums too when they are AP
 2019-09-10 13:01:41 +02:00
Tobias Diekershoff 75e2b7d297
Merge pull request #7608 from annando/issue-7285 
Issue 7285: Perform duplicate check for item URI also with AP
 2019-09-10 07:56:56 +02:00
Michael 461c3169b1 Issue 6521: Don't send notifications for deleted items 2019-09-10 05:44:09 +00:00
Michael b2d6854829 Issue 7285: Perform duplicate check for item URI also with AP 2019-09-10 04:59:12 +00:00
Tobias Diekershoff 5f2028b657
Merge pull request #7605 from annando/pending-2 
Pending contacts: Fix contact deletion / added cron job for repairs
 2019-09-10 06:32:18 +02:00
Tobias Diekershoff 3d5d50a25b
Merge pull request #7606 from annando/fix-invalid-url 
Replace not working "redir" link with a working one
 2019-09-10 06:29:55 +02:00
Michael e588c350ef Issue 7603: Display forums too when they are AP 2019-09-10 04:29:49 +00:00
Michael 0a0a961c52 The value is used twice, so use a variable 2019-09-10 04:04:07 +00:00
Michael 8fc8e26e23 Replace not working "redir" link with a working one 2019-09-09 21:37:26 +00:00
Michael 323285216b We have to check for "0" in "rel" as well 2019-09-09 20:39:19 +00:00
Michael f185f6fd3d Pending contacts part 2: Fix contact deletion / added cron job for repairs 2019-09-09 20:03:11 +00:00
Hypolite Petovan 91b0f0465f
Merge pull request #7604 from annando/pending-contacts 
Display pending contacts in the contact list
 2019-09-09 13:49:51 -04:00
Michael a70a0306d7 Only show incoming pending contact requests with intro 2019-09-09 08:58:56 +00:00
Michael 2dbd843ed2 Don't display ignored pending contacts, link to contact request page 2019-09-09 05:29:33 +00:00
Michael 591ba9c68e Display pending contacts in the contact list 2019-09-08 19:18:56 +00:00
Tobias Diekershoff 6f546c6ae4
Merge pull request #7602 from MrPetovan/bug/7597-fix-magic-link-destination 
Fix magic link destination URL
 2019-09-06 15:11:04 +02:00
Hypolite Petovan 4d411c284f [frio] Improve accessibility of event Link to source button 2019-09-06 08:34:22 -04:00
Hypolite Petovan c2c3bb2074 Remove deprecated defaults() call in mod/events 2019-09-06 08:33:41 -04:00
Hypolite Petovan 69105928f5 Use destination URL when provided in Contact::magicLink 2019-09-06 08:33:19 -04:00
Hypolite Petovan 2dcb9926bc
Merge pull request #7601 from annando/issue-2199 
Issue 2199: Diaspora doesn't interpret size elements
 2019-09-05 17:15:01 -04:00
Michael ba2e57e84a Added tests 2019-09-05 20:37:16 +00:00
Hypolite Petovan f90827d020
Merge pull request #7599 from annando/delivery-counter 
Fixes the delivery counter for edits
 2019-09-05 07:10:57 -04:00
Michael aa6497c281 Issue 2199: Diaspora doesn't interpret size elements 2019-09-05 05:14:43 +00:00
Michael f0b40853d0 Merge remote-tracking branch 'upstream/2019.09-rc' into delivery-counter 2019-09-05 03:10:34 +00:00
Hypolite Petovan 878d8a506d
Merge pull request #7600 from annando/fix-fatal 
Fix fatal error for empty parameter for "System::removedBaseUrl"
 2019-09-04 18:33:57 -04:00
Hypolite Petovan 39a4a3cd5f
Merge pull request #7598 from annando/fix-picture-detection 
Fix cache key problem / avoid need for fetching own pictures
 2019-09-04 18:31:58 -04:00