clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
25,436 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

762 Commits

Author SHA1 Message Date
Roland Häder e61b8f667e
it is documenation, right? :-) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Hypolite Petovan 288b508e2a
Merge pull request #5041 from M-arcus/patch-1 
[TASK] Automatic installation: Install theme
 2018-05-13 10:03:11 -04:00
Pierre Rudloff 7893d96ad8 Add link to test doc on documentation home 2018-05-10 20:04:30 +02:00
Pierre Rudloff 3195d6e125 Add API tests 2018-05-10 19:12:00 +02:00
Tobias Diekershoff 03743184a8 added dedicated documentation about tools for admins 2018-05-09 18:52:11 +02:00
Tobias Diekershoff fada32a1c4 documentation update for !mentions of forum accounts 2018-05-09 11:49:29 +02:00
fabrixxm 5ebe10d7fc Docs: add a note on adding use on theme.php 2018-05-08 09:53:58 +02:00
Michael eb4650ff23 dbclean settings are now available from the frontend 2018-05-07 05:37:20 +00:00
Tobias Diekershoff 0c6333599d API docs, the count parameter 2018-05-06 12:25:23 +02:00
Hypolite Petovan 801a13aa10
Merge pull request #4915 from M-arcus/patch-4 
[DOCS] Docs: Minor improvements
 2018-04-25 08:06:04 -04:00
Marcus Müller ce52f40bdc [DOCS] Fix intendation 2018-04-25 11:29:56 +02:00
Marcus Müller 008f2a2ec7 [DOCS] Hooks: Add hooks intendation to german docs 2018-04-24 13:25:06 +02:00
Marcus Müller 7ac4b17c80 [DOCS] Hooks: Add empty line 2018-04-24 13:21:16 +02:00
Marcus Müller 81d636d05d [DOCS] Titles: Fix spaces 2018-04-24 13:20:44 +02:00
Marcus Müller efdb7a3835
[DOCS] Addons: Restructure hooks 2018-04-23 17:20:16 +02:00
Marcus Müller 78a974ad41
[DOCS] Installation: Fix multiple sentences 2018-04-23 12:24:47 +02:00
Marcus Müller 70d11d377b
[DOCS] Installation: Fix title 2018-04-23 12:22:39 +02:00
Tobias Diekershoff c66c09d5fd
Merge pull request #4914 from AndyHee/doc20180423 
Update Profiles.md
 2018-04-23 12:03:28 +02:00
Marcus Müller 6599898774
[DOCS] Account docs: Fix titles 2018-04-23 11:45:44 +02:00
Andy H3 3ac43f73c3
Update Profiles.md 2018-04-23 16:43:52 +07:00
Marcus Müller 74db460274
[DOCS] Install: Add intendation for list (en) 2018-04-22 19:28:27 +02:00
Marcus Müller f62531fef8
[DOCS] Install: Add intendation for list (de) 2018-04-22 19:27:56 +02:00
Marcus Müller b7410f6866
[DOCS] Installation: Fix minor text error 2018-04-22 19:11:37 +02:00
Marcus Müller f6a76f4f8f
[DOCS] Installation: Update german instructions 2018-04-22 19:10:27 +02:00
Marcus Müller ad95099948
[DOCS] Automatic install: Add documentation 2018-04-22 17:55:43 +02:00
Tobias Diekershoff f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic" 2018-04-21 16:28:22 +02:00
Philipp Holzer 334d392154 Merge remote-tracking branch 'origin/develop' into install_config 2018-04-21 14:23:49 +02:00
Philipp Holzer 346697d771 Moved .htconfig file 
Extracted install business functions to new Class `Install.php`
 2018-04-21 14:10:53 +02:00
Andy H3 c039c30837
Update Making-Friends.md 
Major changes to some outdated sections. 
Minor improvements, elsewhere.
 2018-04-14 16:27:49 +07:00
Angristan de99189325
chmod 777 is a bad practice 2018-04-13 20:54:02 +02:00
Andy H3 eb01c61a56
Update Account-Basics.md 2018-04-13 21:41:41 +07:00
Andy H3 8686c12478
Update Account-Basics.md 
Minor changes to wording + rm dead link
 2018-04-13 21:25:16 +07:00
Andy H3 62102cad74
Update Accesskeys.md 2018-04-13 12:29:10 +07:00
Andy H3 84d2906bb0
Update Accesskeys.md 2018-04-13 12:27:19 +07:00
Andy H3 145efbda7a
Update Accesskeys.md 
Expand intro
Format keys,
Capitalization
Style
Line breaks
 2018-04-13 11:03:22 +07:00
Michael 869d8ab12d We can now define the days after a contact is archived 2018-04-10 11:10:02 +00:00
Pierre Rudloff b3235c2d02 Implement parts of the list API: 
lists/statuses
lists/destroy
lists/update
lists/create
lists/ownerships
 2018-04-07 19:16:47 +02:00
Hypolite Petovan 296f561878 Rename hook to "prepare_body_content_filter" 2018-04-04 23:08:48 -04:00
Hypolite Petovan 2d1942a1fa Update hook documentation 2018-04-04 23:08:48 -04:00
Tobias Diekershoff 26be334dc1
Merge pull request #4698 from annando/direct-relay 
Direct transfer without a relay is now possible
 2018-03-28 08:36:44 +02:00
Michael 17a6cb18b8 Relais settings are added to admin backend 2018-03-28 06:16:46 +00:00
Tobias Diekershoff 8d53fed096 translation docs updated with a note, that the console tool has to be called from the base directory of the Friendica installation 2018-03-28 07:20:46 +02:00
Michael bfd057f148 Direct transfer without a relay is now possible 2018-03-28 04:24:38 +00:00
Alexandre Alapetite e64196c7b3 Fix PHP cannot take a shell script 
Fix part of https://github.com/friendica/friendica/issues/4665
`php [shell file]` does not work, so use `php [php file]` instead.
`php bin/console.php` is more robust than e.g. `bin/console` which does
not work on Windows, or *nix systems without Bash
 2018-03-24 12:47:40 +01:00
Hypolite Petovan 27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Michael 54405eb6fd Added linebreaks in the FAQ. 2018-03-21 07:01:40 +00:00
Hypolite Petovan 5b4fb945a2 Add htconfig setting to disable password_exposed() 2018-03-21 02:35:28 -04:00
Michael c6d4d416b1 The FAQ had been updated to reflect the latest changes 2018-03-21 06:23:07 +00:00
Tobias Diekershoff 4d8d5ca6a5
Merge pull request #4630 from MrPetovan/task/4629-move-executable-to-bin 
Move executable scripts to bin/ (part 1)
 2018-03-19 15:05:53 +01:00
Hypolite Petovan 132456697c Remove scripts/dbstructure 
- Updated documentation
 2018-03-18 23:53:53 -04:00
Hypolite Petovan 4622f42b1d Remove util/typo 
- Updated documentation
- Fixed typo in documenation
 2018-03-18 23:52:07 -04:00
Hypolite Petovan 2226ed2949 Remove util/po2php 
- Updated documentation
 2018-03-18 23:47:38 -04:00
Hypolite Petovan 1c2deac7e5 Move scripts/worker.php to bin/ 2018-03-18 23:25:21 -04:00
Hypolite Petovan 542ff9b082 Move scripts/auth_ejabberd.php to bin/ 2018-03-18 23:17:31 -04:00
Hypolite Petovan 3f71cdf8be Move util/composer.ohar to bin/ 2018-03-18 23:15:31 -04:00
Tobias Diekershoff 608e034a15 added note about POSIX to the installation docs 2018-03-18 07:21:22 +01:00
Tobias Diekershoff 658812ff46 php-zip module is needed for composer 2018-03-15 20:40:22 +01:00
Hypolite Petovan cacc1e1f79
Merge pull request #4583 from tobiasd/20180311-doc2 
Documentation about the Community Pages
 2018-03-11 13:09:39 -04:00
Tobias Diekershoff cc000a9021 community pages 2018-03-11 17:41:56 +01:00
Tobias Diekershoff 61954be480 no poormancron in the installs 2018-03-11 16:54:03 +01:00
Tobias Diekershoff d3b872d589 help not doc 2018-03-09 10:06:53 +01:00
Tobias Diekershoff c6abfa27c1 documentation of invitation based registration 2018-03-09 09:53:08 +01:00
Michael Vogel b6b67c9044
Merge pull request #4540 from MrPetovan/task/4520-load-whole-config 
[develop] Performance: Add preloading config adapter
 2018-03-08 20:35:14 +01:00
Hypolite Petovan 789561c7a2 Remove/Update references to include/html2*.php 2018-03-07 16:34:17 -05:00
Hypolite Petovan 4b9c52aad0 Update htconfig documentation 2018-03-06 19:52:36 -05:00
Hypolite Petovan 47b1e4b3ee Improve default values in htconfig documentation 2018-03-04 23:41:01 -05:00
Hypolite Petovan 059b1f63f8 Add support for multiple Memcached servers 
- Updated htconfig documentation
 2018-03-04 23:28:49 -05:00
Hypolite Petovan 4e6dd7dd5f Update db cache table documentation 2018-03-04 23:13:19 -05:00
Hypolite Petovan e749e8ef4c Update htconfig documentation 2018-03-04 23:13:19 -05:00
Tobias Diekershoff 04e6b32d4f removed dead link 2018-03-03 15:47:36 +01:00
Tobias Diekershoff 80976e28d5 removed dead link 2018-03-03 09:50:42 +01:00
Tobias Diekershoff 6ca6193e04 added support channels to the FAQ 2018-03-03 08:13:46 +01:00
rabuzarus af3a57376a Item::tagDeliver(): remove contact as array key for hooks because it was never declared 2018-02-12 17:05:01 +01:00
Tobias Diekershoff a8d1a9b6fc typo 2018-02-11 10:48:29 +01:00
Tobias Diekershoff d828375fd8 use the correct markup for 2nd level list elements 2018-02-11 10:41:46 +01:00
Tobias Diekershoff 062ab547cf added ways to get some help on EN and DE landing page of the documentation 2018-02-11 10:29:30 +01:00
Michael 8ea572ebd1 Added a config value to ignore server checks 2018-02-08 13:09:09 +00:00
Hypolite Petovan 157027a6f5 Improve BBCode documentation/comment 2018-02-05 11:42:06 -05:00
Hypolite Petovan 16c6806c5b Add documentation for system.dlogip setting 2018-02-03 21:46:42 -05:00
Tobias Diekershoff e0996d19a1 Typo 2018-02-02 16:33:55 +01:00
Tobias Diekershoff efa6b2b9f0 add hook description to automatically update the dependencies via git-hooks to devel docs 2018-02-02 08:08:09 +01:00
Tobias Diekershoff 5c02e569f1 there is a label, even linked now 2018-02-02 07:53:27 +01:00
Tobias Diekershoff efd5bf27e9 name Friendiqa as client in devel docs as the one to help improving 2018-02-02 07:50:22 +01:00
Michael 662d2b31a1 Better title for the different communities 2018-02-01 06:11:56 +00:00
rebeka-catalina 3a94adb7a7 Fixed a few typos 2018-01-25 15:00:23 +01:00
Adam Magness c8ecc31405 Update functions and calls 
Update function names and calls.
 2018-01-22 18:03:26 -05:00
Adam Magness fb372877f6 Rename template and doc 
Rename admin/plugins.tpl to admin/addons.tpl and update references. Rename doc/de/Plugins.md to Addons.md
 2018-01-20 09:45:22 -05:00
Adam Magness ac374f7773 Review updates 2018-01-20 07:48:22 -05:00
Adam Magness 20a16b0b35 Update docs 
changelog, install and doc folder
 2018-01-20 07:48:22 -05:00
Adam Magness 11cf36105c Update Addon functions and calls 
Update function names and calls for Addon class.
 2018-01-20 07:48:22 -05:00
Tobias Diekershoff 573f64db2d added link to update documentation to DE index. Followup on #4259 2018-01-18 05:59:44 +01:00
Hypolite Petovan 12de1f9569 Remove orphan documentation pages 2018-01-17 15:31:25 -05:00
Hypolite Petovan f1e96a358d Update GitHub documentation page 
- Add composer install part
- Fix GitHub name capitalization
 2018-01-17 15:31:11 -05:00
Hypolite Petovan 379f93831f Add documentation about new array syntax 2018-01-17 15:30:47 -05:00
Hypolite Petovan 2b5bffecf4 Add Update documentation page 2018-01-17 15:30:34 -05:00
Hypolite Petovan 4034daca08 Updated installer dependency to PHP 5.6 and ext-xml 
- Updated doc
 2018-01-17 10:35:54 -05:00
Hypolite Petovan 9dfd81db47 Add composer install commands to documentation 2018-01-16 20:30:09 -05:00
Michael 4c104a6cc2 Added table definition 2018-01-12 23:25:30 +00:00
Hypolite Petovan ebbf6089b4 Add database doc about the new oembed.maxwidth field 2018-01-10 19:25:08 -05:00
Tobias Diekershoff 7fe8801358
typo 2018-01-10 11:25:49 +01:00
Tobias Diekershoff cef6e24da8 updated Feed section in the FAQ 2018-01-10 08:47:30 +01:00
Tobias Diekershoff c8928c4dad added missing topics to DE FAQ 2018-01-10 08:24:06 +01:00
Tobias Diekershoff 32871c5f79 one sentence per line 2018-01-10 08:23:38 +01:00
Tobias Diekershoff f8f4044f06 missing word 2018-01-10 07:32:49 +01:00
Tobias Diekershoff e4c99a5a33 updated DE SSL doc by missing section from EN file (see #3955) 2018-01-10 07:26:46 +01:00
Tobias Diekershoff fc890e9869 use same intendation in entire docs file 2018-01-10 07:25:26 +01:00
Tobias Diekershoff 92049e20fa added howto manually check DB structure to the FSQ 2018-01-10 07:23:59 +01:00
Hypolite Petovan 390d5706f4
Merge pull request #4123 from Rudloff/feature/ruleset 
Custom PHPCS ruleset
 2018-01-08 09:14:46 -05:00
rabuzarus 9db936013c add registered-users to the db docu 2018-01-08 14:57:50 +01:00
rebeka-catalina f4707d03d9 Removed directory setting from htconfig.md and changed the example 2018-01-08 10:46:33 +01:00
Michael Vogel 066b776dcc
Merge pull request #4166 from MrPetovan/task/fix-scrutinizer-issues 
[Scrutinizer] Fix unused code issues in boot and include
 2018-01-04 20:59:07 +01:00
Hypolite Petovan 0dd664f54b Review change 
- Remove htconfig doc for admin panel setting
 2018-01-04 13:27:59 -05:00
Hypolite Petovan d1b3b7fbe4 Review changes 
- Remove doc for unused config value
- Restore api_get_user($a) calls
 2018-01-04 13:26:09 -05:00
Pierre Rudloff de5dae0751 Basic support for account/update_profile API (fixes #4094) 2017-12-25 21:10:26 +01:00
Pierre Rudloff c7544e41c0 Update doc to show how to use new ruleset 2017-12-24 00:40:40 +01:00
Pierre Rudloff 833815bff5 Lint doc/Developers-Intro.md 2017-12-24 00:39:42 +01:00
Pierre Rudloff e982d68370
Update api.md 
account/update_profile_background_image was listed twice
 2017-12-22 23:56:13 +01:00
Pierre Rudloff 30cb37cda5 Implement saved_searches/list API 2017-12-19 14:22:38 +01:00
Pierre Rudloff c9d1d6803d
Update api.md 
search/tweets is implemented
 2017-12-19 14:01:03 +01:00
Pierre Rudloff cf063b2045 Lint doc/api.md 2017-12-19 12:18:38 +01:00
Pierre Rudloff e11190b4cf Implement friendships/incoming and users/lookup APIs 2017-12-18 23:51:03 +01:00
Hypolite Petovan 7a6706b0f7
Merge pull request #4097 from Rudloff/feature/search_api 
Implement search API (fixes #929)
 2017-12-18 09:28:33 -05:00
Hypolite Petovan 86922c4821
Merge pull request #4101 from Rudloff/feature/block_api 
Implement the blocks/list API
 2017-12-18 09:27:35 -05:00
Pierre Rudloff 3e4af13772 Implement the blocks/list API 2017-12-18 15:20:42 +01:00
Pierre Rudloff bd427c40f1
Update Developers-Intro.md 
GitHub does not display titles correctly if there isn't a space after `#`.
 2017-12-18 13:09:03 +01:00
Pierre Rudloff 4a5d988d8c Implement search API (fixes #929) 2017-12-18 13:05:27 +01:00
Hypolite Petovan dcc0a77949 Add doc entry for statuses/networkpublic_timeline api 2017-12-17 08:51:57 -05:00
Michael 8db5b121ff Prevent the running of multiple xmpp auth daemons at a time 2017-12-09 09:46:21 +00:00
Hypolite Petovan eeee65136c Remove obsolete fserver and ffinder db table doc 2017-12-06 23:11:06 -05:00
Hypolite Petovan fe93029914 Remove unused table documentation 2017-12-06 18:27:55 -05:00
Michael 4268f42412 Grammar ... 2017-12-06 20:26:33 +00:00
Michael e272a5b847 Added documentation 2017-12-06 20:23:39 +00:00
Michael 925c03fda8 Retrieve data about Mastodon servers 2017-12-06 20:09:59 +00:00
Tobias Diekershoff 9f845b0279 Events doc is not in DE, but had a from link to the doc home page 2017-11-28 14:29:50 +01:00
Tobias Diekershoff 2bf8ebaab9 this and should be an or 2017-11-26 15:19:40 +01:00
Tobias Diekershoff 797aac9a3b Events docs had an obsolete paragraph 2017-11-26 00:59:27 +01:00
Hypolite Petovan e74d9d1113
Merge pull request #3957 from tobiasd/20171125-docEvents 
calendar documentation
 2017-11-25 17:58:16 -05:00
Tobias Diekershoff add6f85cdf added German translation to the events documentation, THX Ratten 2017-11-25 22:57:00 +01:00
Tobias Diekershoff 5c7694d00e export cal is now in core 2017-11-25 21:57:19 +01:00
Tobias Diekershoff 9bb1be91d9 updated links to Friendiqa 2017-11-25 21:43:36 +01:00
Silke Meyer 21a3a6f45b Markdown formatting and minor changes 2017-11-25 17:26:36 +01:00
Michael 4ddcc77c77 Always show small preview pictures, not the big ones 2017-11-25 10:07:49 +00:00
Michael 920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
Michael 731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
Tobias Diekershoff 4f95b413fa some corrections 2017-11-10 20:57:02 +01:00
Tobias Diekershoff 3948539495 add docs for the show_global_community_hint option 2017-11-10 20:24:05 +01:00
Adam Magness aa13302bbc Review updates 
Documentation and yet another use statement
 2017-11-08 08:37:03 -05:00
Adam Magness 4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Tobias Diekershoff ea4fb53f80 updated client list in FAQ 2017-11-08 09:20:20 +01:00
Adam Magness 0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Hypolite Petovan c847a2f9cc
Merge pull request #3874 from tobiasd/20171009-checkversion 
check upstream version
 2017-11-06 13:59:49 -05:00
Tobias Diekershoff a1fcff67f2 added some EN docs 2017-11-05 08:46:41 +01:00
Michael d2dc61c246 Logging for ejabberd authentication is now done via syslog 2017-11-04 08:36:42 +00:00
Michael c31d382e7d Added documentation 2017-10-31 21:11:30 +00:00
Michael 0695fa699c Removed "service class" functionality 2017-10-18 21:44:27 +00:00
Tobias Diekershoff 55e2f49268 also mention Transifex as tool to use near the translation example 2017-10-17 22:48:33 +02:00
Michael 9286f5cf31 Added documentation 2017-10-13 10:49:51 +00:00
Tobias Diekershoff 77471bccd3 changed links 2017-10-08 11:40:06 +02:00
Tobias Diekershoff 74eb0ae923 move to forum.friendi.ca 2017-10-08 11:38:26 +02:00
Tobias Diekershoff 8b9ce4a0ec move to forum.friendi.ca 2017-10-08 11:25:35 +02:00
Tobias Diekershoff 2bcd5b3243 Merge pull request #3757 from silke/develop 
Develop
 2017-10-05 07:55:00 +00:00
Silke Meyer 56bfb0f45a Updated MySQL and PHP requirements in documentation 2017-10-04 21:57:49 +02:00
Silke Meyer ab87f1215a Merge remote-tracking branch 'upstream/develop' into develop 2017-10-04 21:28:35 +02:00
Silke Meyer eadeb3ed21 Fixed settings for test mysql database and updated documentation 2017-10-04 20:25:15 +02:00
Michael bd88179419 Add additional checks for the worker 2017-09-30 11:19:46 +00:00
Michael 03c9e22334 Poller: A limit of 1 seems to be better 2017-09-25 19:33:41 +00:00
Tobias Diekershoff 7b89168f89 missing linebreaks 2017-09-24 12:05:28 +02:00
Tobias Diekershoff 1353417182 minor rephrasing 2017-09-24 11:04:24 +02:00
Tobias Diekershoff 1085487c0e missing linebreak and a typo 2017-09-24 11:00:16 +02:00
Tobias Diekershoff 592884467b added missing linebreak 2017-09-24 10:55:08 +02:00
Tobias Diekershoff d0dfcc71a8 missing linebreaks and a small typo 2017-09-24 10:52:14 +02:00
Tobias Diekershoff 9006a678c0 added missing link to translation docs 2017-09-24 10:51:43 +02:00
Tobias Diekershoff fb7ce8b82e missing line break 2017-09-21 09:54:52 +02:00
Tobias Diekershoff 4715495df1 added missing line breaks 2017-09-21 09:53:46 +02:00
Tobias Diekershoff 65ff646182 a README would be nice 2017-09-21 09:45:17 +02:00
Tobias Diekershoff 5b65bf2c9f added a note about Diaspora account movements 2017-09-21 09:42:02 +02:00
Tobias Diekershoff 0d9e974122 use typo.php to check before PR 2017-09-21 09:38:03 +02:00
Tobias Diekershoff ec95fb5c8d clarification 2017-09-21 09:37:23 +02:00
Tobias Diekershoff ac28cb9532 missing line breaks and some updates 2017-09-21 09:36:52 +02:00
Tobias Diekershoff 1dcc9e4d74 added link to the Wikipedia page about access keys 2017-09-21 09:36:18 +02:00
Tobias Diekershoff 37e6651f9f that place is long gone, and a typo 2017-09-20 19:26:15 +02:00
Michael 7a3bb02f11 Issue 3700: Security and Privacy related Headers 2017-09-14 05:40:23 +00:00
Tobias Diekershoff 02ff6b77bc php xml package is required and sometimes not installed by default 2017-09-06 21:05:10 +02:00
Michael 21b239cbc7 Documentation was updated. (Reference to poormancron removed) 2017-08-25 02:49:25 +00:00
Michael 17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
Tobias Diekershoff 7d97171eec include the delete item page in the docs for the admin panel 2017-07-23 19:51:03 +02:00
Tobias Diekershoff 29e9705d26 Update Install.md 2017-07-02 07:52:07 +02:00
Tobias Diekershoff 1a7dce6814 Update Install.md 2017-06-30 13:16:29 +02:00
Tobias Diekershoff dd250174b8 Let there be... 2017-06-30 10:38:11 +02:00
Tobias Diekershoff 076cf702b0 Added a short usage example of exportet profile data 2017-06-28 15:11:35 +02:00
Tobias Diekershoff 22a2c3b9bf added a short note about backups to the INSTALL files 2017-06-28 15:10:57 +02:00
Hypolite Petovan ea88e15a8c Merge pull request #3473 from Quix0r/rewrites/coding-convention-split2-6-2 
Coding convention applied split 2-6-2 (of 2-14-2)
 2017-06-18 18:44:34 -04:00
Michael fda4cd6001 Changed documentation 2017-06-17 19:13:40 +00:00
Michael cf179188b6 Some more worker fine tuning 2017-06-17 13:58:18 +00:00
Roland Häder 4e49939421
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-13 23:26:06 +02:00
Michael a056afd566 Small corrections 2017-06-13 20:51:24 +00:00
Michael 06815f1a38 Merge remote-tracking branch 'upstream/develop' into 1706-worker-even-faster 
Conflicts:
	include/poller.php
 2017-06-11 07:49:34 +00:00
Tobias Diekershoff 1838024f6d Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators 
Replace explicit php logical operators
 2017-06-09 07:44:19 +02:00
Michael d419962dbf Added documentation 2017-06-08 20:50:25 +00:00
Tobias Diekershoff 0489c04a43 spacing not tabs 2017-06-08 15:03:04 +02:00