Commit graph

17176 commits

Author SHA1 Message Date
Hypolite Petovan
62391d321b Merge branch 'task/4137-add-posts-only-feed' of https://github.com/MrPetovan/friendica into task/4137-add-posts-only-feed
# Conflicts:
#	src/Module/Feed.php
2017-12-30 00:34:23 -05:00
Hypolite Petovan
a75a27e08f Add Feed module
- Update profile alternate links
2017-12-30 00:32:45 -05:00
Hypolite Petovan
fec3aaf9b2 Add Feed module
- Update profile alternate links
2017-12-30 00:19:45 -05:00
Hypolite Petovan
c2e29f2685 Add type parameter to OStatus::feed
- Removed unused parameter $a
- Added $nocache parameter
- Updated usages
2017-12-30 00:19:16 -05:00
Hypolite Petovan
095d458de4 Fix formatting mod/profile 2017-12-29 22:23:58 -05:00
Hypolite Petovan
19878a6397 Fix formatting dfrn_poll 2017-12-29 22:12:18 -05:00
Hypolite Petovan
6d6d83012c
Merge pull request #4151 from annando/connect-follow
Don't show the connect link in the profile on the "follow" page
2017-12-29 17:49:44 -06:00
Michael
69d16d9cfa Don't show the connect link in the profile on the "follow" page 2017-12-29 22:53:08 +00:00
Hypolite Petovan
6bd19e7dab
Merge pull request #4149 from annando/send_participation
Follow up to PR 4147
2017-12-29 14:06:27 -06:00
Hypolite Petovan
2f7ef735f7
Merge pull request #4147 from annando/send_participation
We now send participations when receiving public posts
2017-12-29 14:02:25 -06:00
Michael
10bea2f120 Use the "real" receiver when possible 2017-12-29 20:02:15 +00:00
Michael
d3b626a266 We should send "Post" 2017-12-29 19:18:25 +00:00
Michael
80a41922a9 We now send participations when receiving public posts 2017-12-29 18:52:26 +00:00
Hypolite Petovan
d38cf3cc13
Merge pull request #4145 from annando/photo-twist
Reformatted file, improved coding for "twist"
2017-12-29 10:09:20 -06:00
Michael
319e21f6e3 Added explanation 2017-12-29 12:47:56 +00:00
Michael
c7bcc13451 Reformatted file, improved coding for "twist" 2017-12-28 20:37:23 +00:00
Hypolite Petovan
c40466fe2d
Merge pull request #4143 from annando/comment-public
Likes on "uid=0" does work now
2017-12-27 20:05:20 -06:00
Michael
0bcbe6034e Like on uid=0 does work now 2017-12-27 22:21:40 +00:00
Michael
9acc2ffc24 Make it easier 2017-12-27 21:51:16 +00:00
Michael
1c72a71933 Use another uid for likes 2017-12-27 21:44:22 +00:00
Michael
d7039c6862 Merge remote-tracking branch 'upstream/develop' into comment-public 2017-12-27 15:51:36 +00:00
Hypolite Petovan
0b790b4a76
Merge pull request #4138 from annando/follow-include
Missing include
2017-12-27 09:28:57 -06:00
Michael
d0a43b8533 Missing include 2017-12-27 15:26:17 +00:00
Michael
d707c5afcd Merge remote-tracking branch 'upstream/develop' into comment-public 2017-12-26 23:59:32 +00:00
Hypolite Petovan
b39e06ed23
Merge pull request #4136 from Rudloff/feature/update_profile_api
Cleaner way to get user URL in api_account_update_profile
2017-12-26 17:13:58 -06:00
Pierre Rudloff
8b10bfe3a8 Cleaner way to get user URL in api_account_update_profile 2017-12-26 21:50:08 +01:00
Hypolite Petovan
06f32aaaa6
Merge pull request #4130 from Rudloff/feature/update_profile_api
Basic support for account/update_profile API (fixes #4094)
2017-12-25 20:06:34 -05:00
Pierre Rudloff
c490a718ac Update profile in directory when calling api_account_update_profile 2017-12-26 01:09:51 +01:00
Pierre Rudloff
94244024ac Improve conditions in api_account_update_profile 2017-12-26 01:05:12 +01:00
Hypolite Petovan
f09b139ead
Merge pull request #4132 from annando/jabberlog
Some more logging for auth_ejabberd
2017-12-25 18:37:17 -05:00
Michael Vogel
b571906463
Merge pull request #4131 from Rudloff/feature/types
Add missing return types in docblocks
2017-12-26 00:06:09 +01:00
Michael
869af9f323 Some more logging for auth_ejabberd 2017-12-25 23:03:14 +00:00
Pierre Rudloff
8c17b96749 Missing return types in docblocks 2017-12-25 21:14:02 +01:00
Pierre Rudloff
ee5301018a Fix typo 2017-12-25 21:12:08 +01:00
Pierre Rudloff
de5dae0751 Basic support for account/update_profile API (fixes #4094) 2017-12-25 21:10:26 +01:00
Hypolite Petovan
75ba84efa8
Merge pull request #4129 from annando/issue-4121
API: Better use "about" instead of "pdesc"
2017-12-25 09:23:46 -05:00
Michael
0475fc1fce API: Better use "about" instead of "pdesc" 2017-12-25 05:39:11 +00:00
Hypolite Petovan
c6a00f5ac4
Merge pull request #4126 from annando/issue-4121
Fix for issue 4121 - now the description isn't empty
2017-12-24 21:19:21 -05:00
Michael
ba4329da61 Fixed typo 2017-12-24 23:07:14 +00:00
Hypolite Petovan
cc394349c5
Merge pull request #4128 from tobiasd/20171224-socialhome
add Socialhome to the federation stats
2017-12-24 13:44:02 -05:00
Tobias Diekershoff
3873d4863f add Socialhome to the federation stats 2017-12-24 16:08:34 +01:00
Hypolite Petovan
3a3a690495
Merge pull request #4127 from Rudloff/feature/phpdoc
Add missing doc in api.php
2017-12-24 09:54:19 -05:00
Pierre Rudloff
37eecad8cc Add missing doc in api.php 2017-12-24 15:01:43 +01:00
Michael
e848e376b8 Fix for issue 4121 - now the description isn't empty 2017-12-24 11:51:38 +00:00
Michael
fc0031f4ba First steps to support public likes 2017-12-24 11:36:30 +00:00
Hypolite Petovan
a7b752df67
Merge pull request #4125 from Rudloff/feature/lint_doc
Lint doc/Developers-Intro.md
2017-12-23 20:35:58 -05:00
Hypolite Petovan
ab95cd7114
Merge pull request #4124 from Rudloff/feature/phpcs
Lint api.php
2017-12-23 20:19:44 -05:00
Pierre Rudloff
833815bff5 Lint doc/Developers-Intro.md 2017-12-24 00:39:42 +01:00
Pierre Rudloff
0305aa2d82 Lint api.php 2017-12-24 00:27:45 +01:00
Hypolite Petovan
1fd62ee626
Merge pull request #4122 from Rudloff/feature/cleanup_api
Various fixes in api.php
2017-12-22 20:04:07 -05:00