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

30985 Commits

Author SHA1 Message Date
Hypolite Petovan fd37a57678
Merge pull request #10496 from annando/subscribe 
Subscribe to contacts from a remote AP account
 2021-07-14 06:45:25 -04:00
Michael Vogel b60396f306
Merge pull request #10497 from MrPetovan/bug/10494-api-last-status-optional 
Make last status parameter actually optional in Object\Api\Mastodon\Conversation
 2021-07-14 05:09:11 +02:00
Hypolite Petovan be18a59bd7 Make last status parameter actually optional in Object\Api\Mastodon\Conversation 2021-07-13 23:02:11 -04:00
Michael 0277589fbd Removed experimental code 2021-07-14 02:59:29 +00:00
Michael bbebbb662a spaces removed 2021-07-14 02:57:50 +00:00
Michael 097eb9e83b Updated messages.po 2021-07-14 02:56:15 +00:00
Michael 6fceab0cc8 Merge remote-tracking branch 'upstream/develop' into subscribe 2021-07-14 02:54:12 +00:00
Hypolite Petovan 2b5f1f8bca
Merge pull request #10493 from annando/api 
Improve how shared posting look on mobile apps
 2021-07-13 22:48:31 -04:00
Hypolite Petovan 2ff5889e9a
Merge pull request #10492 from annando/simple-short 
Issue 10491: Possibility for simple shortening added
 2021-07-13 22:47:47 -04:00
Michael 708d7220ac Added messages.po 2021-07-13 22:37:22 -04:00
Michael 5526421607 Issue 10491: Possibility for simple shortening added 2021-07-13 22:37:22 -04:00
Michael b4e4378568 Merge remote-tracking branch 'upstream/develop' into api 2021-07-14 02:28:37 +00:00
Hypolite Petovan 999a394b4d
Merge pull request #10490 from annando/fatal 
Fix Uncaught TypeError: Argument 1 passed to Friendica\Model\Item::storeForUserByUriId()
 2021-07-13 21:01:53 -04:00
Hypolite Petovan b1fde5e095
Merge pull request #10489 from annando/notice 
Fixes "Undefined index: nick"
 2021-07-13 21:00:30 -04:00
Michael ff8f350a42 Change the BBCode version 2021-07-13 20:37:06 +00:00
Michael 875a6b81ef Improve links for API 2021-07-13 14:40:10 +00:00
Michael 267b652857 Improve how shared posting look on mobile apps 2021-07-13 08:30:05 +00:00
Michael 1466afe3b2 Automatically subscribe to the followings of a given AP account 2021-07-13 06:06:08 +00:00
Michael 299cff8c50 Defining return value 2021-07-12 20:06:35 +00:00
Michael aee652117c Definiing parameter type 2021-07-12 14:28:13 +00:00
Michael b80cca61e6 Added messages.po 2021-07-12 14:20:10 +00:00
Michael e5c312a066 Issue 10491: Possibility for simple shortening added 2021-07-12 14:11:51 +00:00
Michael 002df6e8d1 Fix Uncaught TypeError: Argument 1 passed to Friendica\Model\Item::storeForUserByUriId() 2021-07-12 07:02:01 +00:00
Michael e151a2dc41 Fixes "Undefined index: nick" 2021-07-12 06:25:48 +00:00
Hypolite Petovan 07ef1edfd6
Merge pull request #10484 from annando/use-account-view 
We now use the new account-user-view (and fixed the function name)
 2021-07-11 22:56:23 -04:00
Michael 219534e88c Accepting "null" as parameter value 2021-07-11 14:37:17 +00:00
Michael Vogel 85e36abb5f
Merge pull request #10486 from nupplaphil/feat/remove_test_data 
Remove outdated friendica_test_data.sql
 2021-07-11 14:38:34 +02:00
Philipp Holzer a676060eea
Remove outdated friendica_test_data.sql 2021-07-11 14:27:52 +02:00
Michael 7390791d21 Avoid problems with "null" values 2021-07-11 11:11:03 +00:00
Michael 4955670e15 Linefeed added 2021-07-11 09:51:04 +00:00
Michael d267ba999c We now use the new account-user-view (and fixed the function name) 2021-07-11 09:39:34 +00:00
Hypolite Petovan 780d9f1793
Merge pull request #10483 from annando/account 
New view that combines all contact tables
 2021-07-11 01:14:39 -04:00
Michael 58b84ca01d Public id added 2021-07-11 03:06:46 +00:00
Michael f1e4d30898 New view chat combines all contact tables 2021-07-10 21:55:03 +00:00
Hypolite Petovan f6df07ec86
Merge pull request #10482 from annando/converturiid 
Some more "convertForUriId" replacements
 2021-07-10 17:45:34 -04:00
Michael b46b88cc10 Fix fatal error 2021-07-10 21:08:55 +00:00
Michael 49c59fed2c Fix tests 2021-07-10 14:04:27 +00:00
Michael e5e3143293 Fix tests 2021-07-10 14:02:03 +00:00
Michael 07d2dfcd60 Some more "convertForUriId" replacements 2021-07-10 12:58:48 +00:00
Hypolite Petovan c151376596
Merge pull request #10480 from annando/postupdate 
Post update: Set "uri-id" in the contact tables
 2021-07-09 22:19:39 -04:00
Michael Vogel c41aaf8a17
Merge pull request #10479 from MrPetovan/task/9378-merge-share-template 
Merge frio-specific share block template into the base template
 2021-07-10 04:01:51 +02:00
Michael 161fa4a795 Post update: Set "uri-id" in the contact tables 2021-07-10 01:41:26 +00:00
Hypolite Petovan f3f890702c
Merge pull request #10478 from annando/notice 
Fix notice "undefined index: uri"
 2021-07-09 19:31:30 -04:00
Hypolite Petovan 540dc90ce1 Merge frio-specific share block template into the base template 
- Add BIDI support for share blocks
- Remove redundant share block styles
 2021-07-09 19:23:01 -04:00
Michael de39091a79 Revert some test changes 2021-07-09 19:32:06 +00:00
Michael 90897f36ca Fix notices because of unknown Hubzilla activity type 2021-07-09 19:30:41 +00:00
Michael d6c1e1fd1c Fix "Undefined index: reply-to-id" 2021-07-09 18:10:48 +00:00
Michael e0fdde3287 Fix the tests, hopefully 2021-07-09 17:13:54 +00:00
Michael 04580ad4fb Don't update automatically to make tests happy 2021-07-09 16:20:22 +00:00
Michael 0735a22cdd Fix notice "undefined index: uri" 2021-07-09 14:52:22 +00:00