19758 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	7e54499856	"pending" shouldn't be set as well by default ...	2018-05-14 22:50:00 +02:00
Michael	cd7c337134	Urgent bugfix: Public contacts had been blocked automatically when created	2018-05-14 22:50:00 +02:00
Michael	002a1d1f54	Reshares had been detected falsely so that were rejected by Diaspora	2018-05-14 22:50:00 +02:00
Michael	d217d74081	Ensure that the link will be displayed correctly on Diaspora	2018-05-14 22:50:00 +02:00
Michael	3bb5a416f8	Some corrections	2018-05-14 22:50:00 +02:00
Michael	8b775d48f9	Replace old database queries with the new ones	2018-05-14 22:50:00 +02:00
Roland Häder	cbe12eba76	Continued: ... - ops, another rebase-leftover fixed Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:59 +02:00
Roland Häder	058f30d982	Continued: ... - ops, did accidently modify composer.lock ... :-( Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:59 +02:00
Roland Häder	a0d03bb311	Continued: ... - renamed .htaccess -> .htaccess-dist and ignored .htaccess to allow local changes - described /nbproject/private/ ignore (NetBeans IDE's private project data) Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:59 +02:00
Roland Häder	7a29944836	Fixes/cleanup: ... - added missing curly braces (and some absent caused parser errors) - <include|require>[_once] are keywords, so don't use them as such - removed/added empty lines Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:59 +02:00
Roland Häder	3d418dc1fd	Windows' CRLF are looking strange under Linux, let's get rid of them/ ... Also let's ignore addons/ as it is optional and depend on if the webmaster wants it or not. Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:59 +02:00
Roland Häder	dd6fd32883	rewrote based on CR by @Annando, thank you. It is now clear to me. ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:59 +02:00
Roland Häder	a871776615	LF fixed ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:59 +02:00
Roland Häder	b037b4123b	General project change: ... - cleaned up vendor/ as it is a "build" (means being locally recreated) directory and therefor should *NOT* be committed. - updated composer.lock - that is what would be updated now if vendor/ would be ignored, instead a lot files has been changed in vendor/ - people running `composer install` regulary will get (with the old way) a dirty working copy (version-controlled files being modified) and then cannot update Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:58 +02:00
Roland Häder	25fd270959	Continued: ... - added spaces and curly braces - added more TODOs as there really more to be done Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:58 +02:00
Roland Häder	35ada99954	Opps, added missing curly brace. ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:58 +02:00
Roland Häder	78ffd5b80f	fixed parser error ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:58 +02:00
Roland Häder	1c9dc6526f	Continued: ... - added more curly braces - replaced if (blaFoo()) { return true; } return false; with return blaFoo(); - added spaces Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:58 +02:00
Roland Haeder	337824f649	Continued: ... - added curly braces/spaces - added TODOs (type-hints, old-lost code) - more usage of dbm::is_result() - combined some if() return stuff into a simple return statement Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:58 +02:00
Roland Haeder	c3c9a53364	added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please ... note that PHP5 allows 'array' as type-hint already (+ interface/class name). Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:58 +02:00
Roland Haeder	61fdc32d2f	Continued a bit: ... - more spaces added - more curly braces added - let's use x($_FOO, 'bar') and not isset($_FOOT['bar']) Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:57 +02:00
Roland Haeder	7525b8fefe	Fixes for composer: ... - ./vendor/ is being prepared by executing `utils/composer.phar install`, no need to have it around - converted .gitignore to LF line-ending (more common over the whole project) - no need to have them around ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:57 +02:00
Roland Haeder	8e42e797cc	Opps, cutted this out by accident ... ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:57 +02:00
Roland Haeder	7514a3beb8	rewrote for() loop to foreach() + added curly braces/spaces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:57 +02:00
Roland Haeder	fc4d1296e3	was a bit confusing for me or I was not sleeping to much ... ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:57 +02:00
Roland Haeder	4d5c61395e	PHP5 does not support native type-hints, except array + used dbm::is_result() ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:57 +02:00
Roland Haeder	5ee91330a7	removed TODO, one day this all needs refacturizing ... ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:57 +02:00
Roland Haeder	03f283ca36	fixed comment and explained one ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:56 +02:00
Roland Haeder	85039d41a2	added more curly braces + spaces for #3254 ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:56 +02:00
Roland Häder	d9d60346ff	more usage of dbm::is_result() and sorted a bit statements ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:56 +02:00
Roland Haeder	d2d6200669	old behaviour restored ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:56 +02:00
Roland Haeder	be3d0a90a5	added curely branches + reverted back to old behaviour (may come back one day) ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:56 +02:00
Roland Haeder	b823708c50	better comment added by @Hypolite ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:56 +02:00
Roland Haeder	77cca70562	replaced some tabs -> spaces + added curly braces #3254 ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:56 +02:00
Roland Haeder	128c9b20e0	fixed curly braces + added more ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2018-05-14 22:49:55 +02:00
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
Roland Häder	09384119b1	added spaces + some curly braces + some usage of dbm::is_result() ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:55 +02:00
Roland Häder	c7e256f9de	more spaces + some curly spaces added ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:55 +02:00
Roland Häder	1a61cee5a7	added spaces + some curly braces ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:55 +02:00
Roland Häder	f7ceea7a85	added spaces + some curly braces ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:55 +02:00
Roland Häder	1de8e31df6	added spaces + some curly braces + some usage of dbm::is_result() ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:55 +02:00
Roland Häder	5b56f189ae	more spaces + some curly spaces added ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:54 +02:00
Roland Häder	bc259cdc44	added spaces + some curly braces ... Signed-off-by: Roland Häder <roland@mxchange.org>	2018-05-14 22:49:54 +02:00
Hypolite Petovan	dd4af5aba7	Merge pull request #5045 from tobiasd/20180514-msg ... regenerated master messages.po file	2018-05-14 08:15:01 -04:00
Tobias Diekershoff	348ed5d1ba	regenerated master messages.po file	2018-05-14 07:12:04 +02:00
Michael	f1b5e828db	Fix for the slow spawning of workers	2018-05-14 05:02:18 +00:00
Hypolite Petovan	f937dabc9e	Merge pull request #5044 from annando/no-feed-reshare ... We mustn't reshare a feed item (only DFRN and Diaspora)	2018-05-13 18:31:58 -04:00
Michael Vogel	24ef818d0d	Merge pull request #5038 from tobiasd/20180519-3834 ... dont delete but remove from your stream	2018-05-13 22:24:59 +02:00
Michael	57bd073ffd	We mustn't reshare a feed item (only DFRN and Diaspora)	2018-05-13 18:31:01 +00:00
Hypolite Petovan	3228bb614c	Merge pull request #5037 from Quix0r/rewrites/curly-braces-is-result-usage-001 ... Rewrites/curly braces is result usage 001	2018-05-13 10:05:38 -04:00