bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
25514 commits 4 branches 62 tags 178 MiB
Commit graph

25514 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff a241c32ae4 NL translation update THX Walis 2019-12-16 06:59:51 +01:00
Tobias Diekershoff 229df94bc6 NL translation update THX Casper 2019-12-16 06:58:29 +01:00
Hypolite Petovan b096172cdc
Merge pull request #7955 from annando/api-mentions 
Issue 6867: Only display direct mentions in the mentions API
 2019-12-15 15:08:25 -05:00
Michael 533f07e874 Issue 6867: Only display direct mentions in the corresponding API endpoint 2019-12-15 13:14:55 +00:00
Philipp 1479c426c7
Merge pull request #7950 from annando/notice 
Fix notice "Undefined index: href"
 2019-12-14 11:00:04 +01:00
Philipp 2c70619591
Merge pull request #7949 from annando/warning 
Fixed warning
 2019-12-14 10:59:29 +01:00
Michael b2d17abc7b Fix notice "Undefined index: href" 2019-12-14 05:49:53 +00:00
Michael Vogel eb4cfa65d8 Fixed warning 2019-12-14 06:42:40 +01:00
Michael Vogel dc1c9386db
Merge pull request #7948 from MrPetovan/bug/7946-frio-contact-tab 
Restore correct highlighted contact tabs
 2019-12-13 21:42:31 +01:00
Michael Vogel b2ae39db1a
Merge pull request #7943 from MrPetovan/bug/7920-api-fix-followers-friends-ids 
Add relationship filter to api_friends_ids and api_followers_ids
 2019-12-13 21:34:09 +01:00
Hypolite Petovan c23543f463 Restore correct highlighted contact tabs 2019-12-13 15:27:16 -05:00
Hypolite Petovan c88e76e427 Update tests related to api_ff_ids 
- Use new parameter
- Use new empty return
 2019-12-13 15:22:24 -05:00
Hypolite Petovan c2233e3416
Merge pull request #7947 from annando/api-attachments 
API: Improved handling of quoted posts and attachments
 2019-12-13 15:15:34 -05:00
Michael Vogel d3a4558e80
Merge pull request #7941 from MrPetovan/task/7889-api-post-contact-search 
[API] Provide post/contact search
 2019-12-13 21:13:19 +01:00
Michael Vogel 6ca38bac9f
Merge pull request #7944 from MrPetovan/bug/4451-escape-bbcode-blocks-autolinker 
Escape potential URL-containing BBCodes before running autolinker
 2019-12-13 21:10:57 +01:00
Philipp 8f58d2d84e
Merge pull request #7945 from MrPetovan/bug/fatal-errors 
Return early if user.uid isn't present in ACL::getFullSelectorHTML
 2019-12-13 20:28:34 +01:00
Hypolite Petovan fe5b80b9ba Return early if user.uid isn't present in ACL::getFullSelectorHTML 
- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-565533824
 2019-12-13 13:29:18 -05:00
Hypolite Petovan e1583123b4 Escape potential URL-containing BBCodes before running autolinker 2019-12-13 12:40:10 -05:00
Hypolite Petovan c9c30e4a23 Add relationship filter to api_friends_ids and api_followers_ids 2019-12-13 11:43:45 -05:00
Hypolite Petovan 81b9d25906 Add relationship filter to api_ff_ids() 2019-12-13 11:43:20 -05:00
Michael Vogel 0b13a7acd3
Merge pull request #7942 from MrPetovan/bug/notices 
Don't process empty hash tags in Model\Item
 2019-12-13 17:08:01 +01:00
Hypolite Petovan b800083a2b Don't process empty hash tags in Model\Item 
- Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-565372628
 2019-12-13 07:16:43 -05:00
Michael b42262f206 API: Improved handling of quoted posts and attachments 2019-12-13 10:12:40 +00:00
Hypolite Petovan 5a15e6bc59 Support post URL search term in api_search() 2019-12-12 20:59:19 -05:00
Hypolite Petovan 0069bb022d Support user profile URL search term in api_users_search() 2019-12-12 17:04:47 -05:00
Hypolite Petovan ff3a0a0eba
Merge pull request #7939 from annando/issue-7659 
Issue 7659: Display blocked and ignored public contacts as well
 2019-12-12 11:07:57 -05:00
Michael 543c8f8459 Use localuser() 2019-12-12 15:57:08 +00:00
Hypolite Petovan 7d150edb29
Merge pull request #7935 from annando/issue-7651 
Issue 7651: Added basic support for more complicated "video" elements
 2019-12-12 10:00:54 -05:00
Michael cc38250538 Improved RegExp 2019-12-12 14:57:31 +00:00
Michael 39560218f8 Issue 7659: Display blocked and ignored public contacts as well 2019-12-12 11:58:57 +00:00
Michael e70743f72d Issue 7651: Added basic support for more complicated "video" elements 2019-12-12 05:35:30 +00:00
Tobias Diekershoff 9d626516d8
Merge pull request #7932 from MrPetovan/bug/fatal-errors 
Log a message when data isn't the expected type in GContact::updateFromOutbox
 2019-12-11 18:36:36 +01:00
Hypolite Petovan e976bc0668 Log a message when data isn't the expected type in GContact::updateFromOutbox 2019-12-11 08:48:44 -05:00
Hypolite Petovan 97b0175e55
Merge pull request #7931 from nupplaphil/bug/codecov_exclude 
Fix phpunit exclude list
 2019-12-11 08:13:55 -05:00
Philipp Holzer 64977cc589
Fix codecov exclude list 2019-12-11 13:35:40 +01:00
Hypolite Petovan 1c69dda2e1
Merge pull request #7926 from annando/api-instance 
API: Added endpoints /instance and /instance/peers
 2019-12-11 04:07:49 -05:00
Michael 3388274f9a Removed unneeded function 2019-12-11 08:26:18 +00:00
Michael 203857ede0 Added parameter description 2019-12-11 06:54:31 +00:00
Michael 9296a55dfb Added entities 2019-12-11 06:51:59 +00:00
Hypolite Petovan d994c91f38
Merge pull request #7929 from annando/apcontact-data 
APContact: Added follower count, following count and count of posts
 2019-12-10 19:58:25 -05:00
Michael 1baa4d48af Removed outcommented code 2019-12-11 00:10:25 +00:00
Michael 911a854255 APContact: Added follower count, following count and count of posts 2019-12-11 00:05:50 +00:00
Michael 4e2804d783 Added some more data 2019-12-10 23:05:25 +00:00
Hypolite Petovan e39e3389ca
Merge pull request #7927 from nupplaphil/task/2fact_tel 
Make 2Factor "tel" field instead "number"
 2019-12-10 17:02:34 -05:00
Philipp Holzer b085098b49
Make 2Factor "tel" field instead "number" 
- because of missing copy&paste buttons at number
 2019-12-10 22:44:45 +01:00
Michael 1958bde4c0 API: Added endpoints /instance and /instance/peers 2019-12-10 21:27:09 +00:00
Tobias Diekershoff 9c1f652008 Version 2019.12-rc 2019-12-10 18:13:43 +01:00
Philipp d0b20fb499
Merge pull request #7904 from MrPetovan/task/7887-api-followers-request 
Add GET /api/v1/follow_requests Mastodon API endpoint
 2019-12-10 15:53:06 +01:00
Hypolite Petovan f4c94236c5
Merge pull request #7924 from annando/issue-7691 
Issue 7691: We can now switch to BCC for ActivityPub
 2019-12-10 08:36:07 -05:00
Hypolite Petovan 9e41488c40 Fix JSON syntax in Friendica API doc 2019-12-10 07:54:11 -05:00