Commit graph

29094 commits

Author SHA1 Message Date
Hypolite Petovan
2a7327a41c
Fix spaces in Cache\Memcachedriver 2018-10-03 00:24:26 -04:00
Hypolite Petovan
1f7cb530c7
Merge pull request #5812 from annando/develop
Issue 5811: "objects" instead of "object"
2018-10-02 22:11:28 -04:00
Michael
76cdc9e594 Renamed class 2018-10-02 20:14:28 +00:00
Michael
518d461a8f Issue 5811: "objects" instead of "object" 2018-10-02 20:12:38 +00:00
Hypolite Petovan
406b46b635
Merge pull request #5800 from JonnyTischbein/issue_return_path
Update return path former via $_SESSION['return_url']
2018-10-02 12:30:38 -04:00
Jonny Tischbein
6d1b98dc0e wrong var name - conversation not found 2018-10-02 18:24:16 +02:00
Jonny Tischbein
ecb67cfcb4 syntax typo 2018-10-02 18:22:23 +02:00
Jonny Tischbein
fa3bbc5f45 Code Standards + return path for \!local_user() and cancel 2018-10-02 18:13:58 +02:00
Hypolite Petovan
100f35f9f5
Merge pull request #5810 from annando/develop
removed obsolete package
2018-10-02 11:50:53 -04:00
Michael
c02dea7b02 removed obsolete package 2018-10-02 15:45:39 +00:00
Hypolite Petovan
505350c9fb
Merge pull request #5794 from annando/ap1
ActivityPub support
2018-10-02 11:24:04 -04:00
Michael
3020b0fdc4 Fix missing mentions 2018-10-02 14:48:57 +00:00
Jonny Tischbein
9915523490 mod/message return to conversation if message deleted 2018-10-02 13:16:43 +02:00
Hypolite Petovan
e8fd13ff21
Merge pull request #5806 from annando/issue-5804-2
Repeated posts from OStatus, ActitivyPub and Twitter are now shown as is
2018-10-02 07:07:07 -04:00
Hypolite Petovan
010a7e121c
Merge pull request #5807 from annando/fix-test
The API test should now complete again
2018-10-02 07:06:28 -04:00
Michael
fcfd04bcc9 Normalize the mentions and ensure to not have duplicates 2018-10-02 09:04:32 +00:00
Michael
d4f6261b81 Avoid notice 2018-10-02 08:31:58 +00:00
Michael
d5203735eb The API test should now complete again 2018-10-02 07:38:43 +00:00
Michael
54c7ca58d8 Repeated posts from OStatus, ActitivyPub and Twitter are now shown as is 2018-10-02 03:41:38 +00:00
Michael
7e9499ac13 AP contacts are now tagged upon commenting 2018-10-01 21:09:08 +00:00
Michael
6020605d5c Account deletion could work now. 2018-10-01 19:22:13 +00:00
Hypolite Petovan
b5b2bfdd46
Merge pull request #5804 from annando/issue-5797
Issue 5797: Retweets are now displayed again via API
2018-10-01 14:18:30 -04:00
Michael
b746ddec64 Issue 5797: Retweets are now displayed again via API 2018-10-01 18:16:19 +00:00
Hypolite Petovan
d5804bd1a5
Merge pull request #5803 from annando/issue-5798
Issue 5798: We had displayed the author as owner
2018-10-01 13:40:52 -04:00
Michael
e3a4a9c407 Issue 5798: We had displayed the author as owner 2018-10-01 17:36:23 +00:00
Michael Vogel
103535d620
Merge pull request #5773 from MrPetovan/task/rewrite-js-hooks
Rewrite JS hooks
2018-10-01 17:10:30 +00:00
Hypolite Petovan
3dfb0c2e7c
Merge pull request #5762 from JonnyTischbein/2018.08-rc
Add api_friendships_destroy() like mod/unfollow.php
2018-10-01 12:51:46 -04:00
Ralf Thees
939466d5a7 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-01 17:08:37 +02:00
Michael
72c3a62e7f Profile update is now done via APDelivery 2018-10-01 05:44:56 +00:00
Michael
93ccca5807 AP hast to be enabled here as well 2018-09-30 21:23:40 +00:00
Michael
9f481c1f5e + is * 2018-09-30 20:48:29 +00:00
Michael
fdc396e197 "rawcontent" is now a baseobject method 2018-09-30 20:47:28 +00:00
Michael
0769a115aa Avoiding a notice 2018-09-30 20:40:40 +00:00
Michael
5456ef0185 Profile update and some more is now added 2018-09-30 20:26:30 +00:00
Jonny Tischbein
57fe36e9a3 replace session return url by static pages 2018-09-30 19:26:29 +02:00
Jonny Tischbein
0a699be3c0 replace session return url by static pages 2018-09-30 19:03:05 +02:00
Michael
761bdafa34 Correct content type 2018-09-30 14:13:07 +00:00
Michael
a8b776c189 There is now "rawContent" for technical endpoints 2018-09-30 13:15:10 +00:00
Michael
cb44aa83c7 Object instead of Display 2018-09-30 12:21:57 +00:00
Michael
e71f497295 Renamed 2018-09-30 08:14:05 +00:00
Michael
2fc79e3886 Superfluous, since we only fetch this data 2018-09-30 07:48:13 +00:00
Michael
82987d018a Some changes for better code quality 2018-09-30 07:21:57 +00:00
Michael
b043c7e0f2 Changed constant name to keep compatible with PHP 5 2018-09-28 15:25:20 +00:00
Michael
357352efcc Changed json-ld library 2018-09-28 15:04:51 +00:00
Michael
da79566125 Relocated function 2018-09-28 03:56:41 +00:00
Michael
a5ddcb367b Newly generated messages 2018-09-27 21:19:14 +00:00
Michael
30f67d6e14 removed unneded line 2018-09-27 21:14:01 +00:00
Michael
162233e503 moved line 2018-09-27 21:04:56 +00:00
Michael
a36d010f86 Composer-foo 2018-09-27 21:03:29 +00:00
Hypolite Petovan
e287991819
Merge pull request #5796 from JonnyTischbein/issue_5547
[frio] Get PHP Configuration for upload limit and display in /admin summary site
2018-09-27 14:18:21 -04:00