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

27182 Commits

Author SHA1 Message Date
Hypolite Petovan eb09bdfc96 [vier] Fix accordion logic in templates/settings/profile/index 2020-05-08 09:06:28 -04:00
Hypolite Petovan e53e471b6b
Merge pull request #8602 from annando/no-follow-display 
Don't count and fetch "follow" activities
 2020-05-07 15:01:08 -04:00
Michael 856cf7f664 Don't count and fetch "follow" activities 2020-05-07 18:39:39 +00:00
Michael Vogel fbf846accb
Merge pull request #8599 from MrPetovan/task/8593-ensure-location-plaintext 
Account for missing location value in ActivityPub\Receiver
 2020-05-07 16:29:03 +02:00
Hypolite Petovan 8abaac6d79 Account for missing location value in ActivityPub\Receiver 2020-05-07 10:14:38 -04:00
Michael Vogel 64f1bc8a68
Merge pull request #8589 from MrPetovan/task/8588-ap-contacts-endpoint 
Only output ActivityPub contacts in /followers and /following AP endpoints
 2020-05-07 10:37:46 +02:00
Hypolite Petovan 63e7996891 Improve formatting in ActivityPub\Transmitter 2020-05-07 03:47:45 -04:00
Hypolite Petovan eb8dcd43f3
Merge pull request #8597 from annando/notice 
Fixed notice because of missing field
 2020-05-07 03:46:38 -04:00
Michael e3c08215f6 Fixed notice because of missing field 2020-05-07 07:34:00 +00:00
Michael Vogel 597efeef77
Merge pull request #8596 from MrPetovan/task/8593-ensure-location-plaintext 
Ensure post location received through ActivityPub is in plaintext
 2020-05-07 07:08:25 +02:00
Michael Vogel f1c1103e1d
Merge pull request #8595 from MrPetovan/task/8578-perfect-scrollbar-dependency 
Move perfect-scrollbar dependency back to composer.json
 2020-05-07 07:06:22 +02:00
Hypolite Petovan 3c0547c6e8 Ensure post location received through ActivityPub is in plaintext 2020-05-06 22:41:59 -04:00
Hypolite Petovan e0e131b620 Move perfect-scrollbar dependency back to composer.json 2020-05-06 21:49:34 -04:00
Hypolite Petovan 71c45330be
Merge pull request #8594 from annando/issue-8586 
Issue 8586 again: Don't transmit participations
 2020-05-06 17:32:31 -04:00
Michael 065fad31f1 ignore "follow" activities that are not from the user 2020-05-06 21:19:48 +00:00
Michael be9519708e Don't relay participation messages 2020-05-06 20:43:00 +00:00
Hypolite Petovan 4e579e77f5 Only output ActivityPub contacts in /followers and /following 
- Join contact table with apcontact to weed out non-AP contacts
 2020-05-06 15:29:35 -04:00
Michael ab4eaeedbe Merge remote-tracking branch 'upstream/develop' into issue-8586 2020-05-06 19:02:26 +00:00
Michael 806f4a0142 Added logging 2020-05-06 19:00:56 +00:00
Michael 7dea1ff6bd Issue 8586 again: Don't transmit participations 2020-05-06 17:30:21 +00:00
Hypolite Petovan 59d0bc5b5f
Merge pull request #8592 from annando/issue-8586 
Issue 8586: Reduce the amount of item receivers
 2020-05-06 12:04:33 -04:00
Michael b9ee46824f Added missing field 2020-05-06 15:37:04 +00:00
Michael 62a4638ea8 Don#t group 2020-05-06 15:27:13 +00:00
Michael 22be2cce8a Issue 8586: Reduce the amount of item receivers 2020-05-06 15:20:49 +00:00
Hypolite Petovan 8a86171a7f
Merge pull request #8591 from annando/fix-fatal 
fix a fatal error when displaying photos
 2020-05-06 10:26:46 -04:00
Michael 180b4e51df fix a fatal error when displaying photos 2020-05-06 04:58:25 +00:00
Michael Vogel 652efd1a5d
Merge pull request #8590 from MrPetovan/bug/8568-markdown-to-bbcode-autolink 
Remove preemptive autolinker from Text\Markdown::toBBCode
 2020-05-06 06:43:18 +02:00
Hypolite Petovan 36a7eceb89 Remove preemptive autolinker from Text\Markdown::toBBCode 
- Autolinker is done centrally in Text\BBCode::convert
 2020-05-05 23:41:35 -04:00
Hypolite Petovan ccb69414d2 Combine getFollowers and getFollowing into getContacts in ActivityPub\Transmitter 2020-05-05 22:32:45 -04:00
Hypolite Petovan f4083f6031
Merge pull request #8585 from annando/legacy-tag 
Removed legacy usage of the "tag" field
 2020-05-05 18:10:22 -04:00
Hypolite Petovan 16e9b3fdca
Merge pull request #8587 from annando/warning-notices 
Fix warning, notice and DB Error
 2020-05-05 18:08:43 -04:00
Michael d33f6fc167 Renamed function 2020-05-05 21:58:25 +00:00
Michael 0f042b064a Fix warning, notice and DB Error 2020-05-05 21:49:48 +00:00
Hypolite Petovan 1c39f2523c
Merge pull request #8584 from annando/composer 
The composer lock file had been updated
 2020-05-05 16:45:34 -04:00
Michael 980de37047 Removed legacy usage of the "tag" field 2020-05-05 19:54:25 +00:00
Michael 9c36b63b33 The composer lock file had been updated 2020-05-05 18:53:38 +00:00
Hypolite Petovan f7a45e4153
Merge pull request #8577 from annando/no-term2 
File and category aren't using "term" anymore
 2020-05-05 13:45:48 -04:00
Michael 349e1d2015 Tests could work again 2020-05-05 17:32:11 +00:00
Michael f67c8a7315 Fix test 2020-05-05 16:42:29 +00:00
Hypolite Petovan 24713e289e
Merge pull request #8563 from annando/issue-8550 
Issue 8550: Check for a good table_definition_cache value
 2020-05-05 12:26:28 -04:00
Michael 3d4ace7a9d Merge branch 'no-term3' into no-term2 2020-05-05 16:09:50 +00:00
Michael d67b9cb693 Formula according to documentation 2020-05-05 16:01:20 +00:00
Michael 7de6e60328 Merge remote-tracking branch 'upstream/develop' into issue-8550 2020-05-05 15:56:24 +00:00
Michael 5725784055 Update database definition, cleaned code 2020-05-05 15:47:35 +00:00
Michael 59675c4f0b Merge remote-tracking branch 'upstream/develop' into no-term2 2020-05-05 15:44:24 +00:00
Hypolite Petovan c1460ee3e8
Merge pull request #8575 from annando/post-delivery-data 
"item-delivery-data" is now "post-delivery-data"
 2020-05-05 10:29:27 -04:00
Michael d838dcbd8c Removed unused fields 2020-05-05 14:10:39 +00:00
Michael 2ee14bf5fe Merge remote-tracking branch 'upstream/develop' into post-delivery-data 2020-05-05 14:08:29 +00:00
Hypolite Petovan df7eb7fcc5
Merge pull request #8576 from annando/new-participation 
Diaspora participations are now stored as activities
 2020-05-05 09:29:04 -04:00
Michael 84e3892955 Merge remote-tracking branch 'upstream/develop' into post-delivery-data 2020-05-05 13:16:01 +00:00