Commit graph

17102 commits

Author SHA1 Message Date
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
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
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
Hypolite Petovan 0a7f1761e6
Merge pull request #4120 from annando/remoteauth
Bugfix for the api call for remoteauth
2017-12-22 20:00:11 -05:00
Hypolite Petovan d279cb0327
Merge pull request #4118 from annando/cleaned-update
Old stuff had been removed from the update routine
2017-12-22 19:57:23 -05:00
Pierre Rudloff ca73ec5cbb Incorrect return type 2017-12-23 01:36:55 +01:00
Pierre Rudloff f2758d00fb Unused variable 2017-12-23 01:34:12 +01:00
Pierre Rudloff da6a7b1fce Typo 2017-12-23 01:32:47 +01:00
Pierre Rudloff 70ab9dc9be Undefined variable 2017-12-23 01:31:29 +01:00
Pierre Rudloff 521d4b09b6 Unused argument 2017-12-23 01:27:17 +01:00
Pierre Rudloff b4cf27e767 api_format_data can also return an array 2017-12-23 01:25:43 +01:00
Pierre Rudloff 37aef32440 Remove unused variable 2017-12-23 01:23:28 +01:00
Pierre Rudloff 0691d83bbc Typo 2017-12-23 01:23:20 +01:00
Michael Vogel a8529779c7
Merge pull request #4119 from Rudloff/patch-1
Update api.md
2017-12-23 00:13:18 +01:00
Michael 1fc3993990 Code cleaning 2017-12-22 23:10:32 +00:00
Michael a309d3c733 Bugfix for the api call for remoteauth 2017-12-22 23:00:49 +00:00
Pierre Rudloff e982d68370
Update api.md
account/update_profile_background_image was listed twice
2017-12-22 23:56:13 +01:00
Michael 3fdfc2e425 Hopefully this is now clearer 2017-12-22 21:31:32 +00:00
Michael a614b17ed5 Grammar correction 2017-12-22 20:06:15 +00:00
Michael 00c6261dae Only include the update.php, when really needed 2017-12-22 14:56:40 +00:00
Michael 2e2a2b8040 Corrected wrong handling of the return value 2017-12-22 14:51:50 +00:00
Michael 1e7e83510a Old stuff had been removed from the update routine 2017-12-22 14:48:29 +00:00
Hypolite Petovan 98c2cdb49a
Merge pull request #4111 from annando/comment-public
Preparation for being able to comment every public item
2017-12-21 17:18:14 -05:00
Michael 4dcf14f62e Query was simplified 2017-12-21 18:49:27 +00:00
Michael cfa42552bc Standards 2017-12-21 18:46:35 +00:00
Hypolite Petovan 369f6f205d
Merge pull request #4114 from annando/as-private-as-possible
Only locally used methods should always be private
2017-12-21 08:16:10 -05:00