]>
git.mxchange.org Git - friendica.git/log
Michael [Thu, 3 May 2018 17:43:10 +0000 (17:43 +0000)]
Urgent bugfix: Public contacts had been blocked automatically when created
Michael [Thu, 3 May 2018 13:03:41 +0000 (13:03 +0000)]
Reshares had been detected falsely so that were rejected by Diaspora
Michael [Thu, 3 May 2018 04:43:50 +0000 (04:43 +0000)]
Ensure that the link will be displayed correctly on Diaspora
Michael [Wed, 2 May 2018 21:12:48 +0000 (21:12 +0000)]
Some corrections
Michael [Wed, 2 May 2018 19:26:15 +0000 (19:26 +0000)]
Replace old database queries with the new ones
Roland Häder [Thu, 3 May 2018 00:17:16 +0000 (02:17 +0200)]
Continued:
- ops, another rebase-leftover fixed
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 2 May 2018 21:07:28 +0000 (23:07 +0200)]
Continued:
- ops, did accidently modify composer.lock ... :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 2 May 2018 20:26:24 +0000 (22:26 +0200)]
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>
Roland Häder [Wed, 11 Oct 2017 20:21:35 +0000 (22:21 +0200)]
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>
Roland Häder [Wed, 26 Jul 2017 20:16:29 +0000 (22:16 +0200)]
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>
Roland Häder [Wed, 26 Jul 2017 20:15:24 +0000 (22:15 +0200)]
rewrote based on CR by @Annando, thank you. It is now clear to me.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 26 Jul 2017 17:50:13 +0000 (19:50 +0200)]
LF fixed
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 20 Jul 2017 18:19:28 +0000 (20:19 +0200)]
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>
Roland Häder [Thu, 20 Jul 2017 18:04:32 +0000 (20:04 +0200)]
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>
Roland Häder [Wed, 19 Jul 2017 21:16:54 +0000 (23:16 +0200)]
Opps, added missing curly brace.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Sun, 16 Jul 2017 18:35:42 +0000 (20:35 +0200)]
fixed parser error
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 17 May 2017 16:28:00 +0000 (18:28 +0200)]
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>
Roland Haeder [Fri, 14 Apr 2017 14:59:51 +0000 (16:59 +0200)]
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>
Roland Haeder [Sat, 8 Apr 2017 17:05:50 +0000 (19:05 +0200)]
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>
Roland Haeder [Wed, 5 Apr 2017 20:17:15 +0000 (22:17 +0200)]
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>
Roland Haeder [Sun, 2 Apr 2017 19:29:06 +0000 (21:29 +0200)]
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>
Roland Haeder [Sat, 25 Mar 2017 14:06:54 +0000 (15:06 +0100)]
Opps, cutted this out by accident ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Sat, 25 Mar 2017 13:32:49 +0000 (14:32 +0100)]
rewrote for() loop to foreach() + added curly braces/spaces
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Sat, 25 Mar 2017 12:46:28 +0000 (13:46 +0100)]
was a bit confusing for me or I was not sleeping to much ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Sat, 25 Mar 2017 12:37:15 +0000 (13:37 +0100)]
PHP5 does not support native type-hints, except `array` + used dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Sat, 25 Mar 2017 12:01:41 +0000 (13:01 +0100)]
removed TODO, one day this all needs refacturizing ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Thu, 23 Mar 2017 22:37:58 +0000 (23:37 +0100)]
fixed comment and explained one
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Thu, 23 Mar 2017 22:05:53 +0000 (23:05 +0100)]
added more curly braces + spaces for #3254
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Häder [Sat, 4 Mar 2017 09:34:46 +0000 (10:34 +0100)]
more usage of dbm::is_result() and sorted a bit statements
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Haeder [Thu, 23 Mar 2017 21:49:05 +0000 (22:49 +0100)]
old behaviour restored
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Thu, 23 Mar 2017 21:33:12 +0000 (22:33 +0100)]
added curely branches + reverted back to old behaviour (may come back one day)
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Thu, 23 Mar 2017 21:26:07 +0000 (22:26 +0100)]
better comment added by @Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Thu, 23 Mar 2017 19:48:48 +0000 (20:48 +0100)]
replaced some tabs -> spaces + added curly braces #3254
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Haeder [Tue, 21 Mar 2017 21:39:53 +0000 (22:39 +0100)]
fixed curly braces + added more
Signed-off-by: Roland Haeder <roland@mxchange.org>
Roland Häder [Sat, 4 Mar 2017 09:58:33 +0000 (10:58 +0100)]
it is documenation, right? :-)
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 26 Jan 2017 14:23:30 +0000 (15:23 +0100)]
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 26 Jan 2017 15:07:30 +0000 (16:07 +0100)]
more spaces + some curly spaces added
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 26 Jan 2017 15:01:56 +0000 (16:01 +0100)]
added spaces + some curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 26 Jan 2017 15:01:56 +0000 (16:01 +0100)]
added spaces + some curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 26 Jan 2017 14:23:30 +0000 (15:23 +0100)]
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 26 Jan 2017 15:07:30 +0000 (16:07 +0100)]
more spaces + some curly spaces added
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 26 Jan 2017 15:01:56 +0000 (16:01 +0100)]
added spaces + some curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
Hypolite Petovan [Sun, 13 May 2018 14:05:38 +0000 (10:05 -0400)]
Merge pull request #5037 from Quix0r/rewrites/curly-braces-is-result-usage-001
Rewrites/curly braces is result usage 001
Roland Häder [Sun, 13 May 2018 12:20:15 +0000 (14:20 +0200)]
Beatification:
- added space after curly braces (MrPetovan)
- added TODO for possible rewrite candidate
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Sun, 13 May 2018 08:20:15 +0000 (10:20 +0200)]
reverted back ...
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Sun, 13 May 2018 08:06:43 +0000 (10:06 +0200)]
Fixes:
- brought back comment (ops)
- DBM is the class name (not dbm)
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Sun, 13 May 2018 08:05:31 +0000 (10:05 +0200)]
Ops, was redundant here.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Sun, 13 May 2018 08:04:49 +0000 (10:04 +0200)]
No extra empty line here
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Sun, 13 May 2018 08:02:47 +0000 (10:02 +0200)]
Ops, one to much ...
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 26 Jan 2017 14:23:30 +0000 (15:23 +0100)]
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Thu, 26 Jan 2017 08:38:52 +0000 (09:38 +0100)]
Continued:
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
long time around in PHP) anything can be handled over to the method/function.
Signed-off-by: Roland Häder <roland@mxchange.org>
Roland Häder [Wed, 25 Jan 2017 14:59:27 +0000 (15:59 +0100)]
added more curly braces + a bit more usage of dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
Hypolite Petovan [Tue, 8 May 2018 08:02:37 +0000 (04:02 -0400)]
Merge pull request #4996 from fabrixxm/docs-theme-dev
Docs: add a note on adding `use` on theme.php
fabrixxm [Mon, 7 May 2018 16:28:55 +0000 (18:28 +0200)]
Docs: add a note on adding `use` on theme.php
Tobias Diekershoff [Mon, 7 May 2018 12:28:59 +0000 (14:28 +0200)]
Merge pull request #4991 from annando/dbclean
dbclean settings are now available from the frontend
Michael [Mon, 7 May 2018 08:46:32 +0000 (08:46 +0000)]
Text for translations
Michael [Mon, 7 May 2018 05:37:20 +0000 (05:37 +0000)]
dbclean settings are now available from the frontend
Hypolite Petovan [Sun, 6 May 2018 21:59:05 +0000 (17:59 -0400)]
Merge pull request #4989 from annando/video-bbcode
Fix video display problems with videos with parameters
Michael [Sun, 6 May 2018 16:57:46 +0000 (16:57 +0000)]
Fix video display problems with videos with parameters
Michael Vogel [Sun, 6 May 2018 11:57:41 +0000 (13:57 +0200)]
Merge pull request #4987 from tobiasd/
20180506 -lng
translation updates for FI, PL and ZH CN
Michael Vogel [Sun, 6 May 2018 11:56:21 +0000 (13:56 +0200)]
Merge pull request #4988 from tobiasd/
20180506 -4689
API docs, the count parameter
Tobias Diekershoff [Sun, 6 May 2018 10:25:23 +0000 (12:25 +0200)]
API docs, the count parameter
Tobias Diekershoff [Sun, 6 May 2018 09:18:56 +0000 (11:18 +0200)]
update PL translations THX waldis
Tobias Diekershoff [Sun, 6 May 2018 09:18:08 +0000 (11:18 +0200)]
update FI translations THX Samuli Valavuo
Tobias Diekershoff [Sun, 6 May 2018 09:17:15 +0000 (11:17 +0200)]
update to the zh-cn translation THX 朱陈锬
Hypolite Petovan [Fri, 4 May 2018 22:04:38 +0000 (18:04 -0400)]
Merge pull request #4978 from annando/dba-2
Diaspora: Fix person/contact retraction
Hypolite Petovan [Fri, 4 May 2018 21:50:17 +0000 (17:50 -0400)]
Merge pull request #4981 from annando/remote-self
"remote-self" is now working for Diaspora and Twitter as well
Hypolite Petovan [Fri, 4 May 2018 21:49:21 +0000 (17:49 -0400)]
Merge pull request #4982 from annando/no-blocked-contact
Suppress blocked contacts from being displayed
Michael [Fri, 4 May 2018 21:43:29 +0000 (21:43 +0000)]
Some more replaced queries
Michael [Fri, 4 May 2018 21:33:15 +0000 (21:33 +0000)]
Ups
Michael [Fri, 4 May 2018 21:27:20 +0000 (21:27 +0000)]
Suppress blocked contacts from being displayed
Michael [Fri, 4 May 2018 21:12:13 +0000 (21:12 +0000)]
"remote-self" is now working for Diaspora and Twitter as well
Hypolite Petovan [Fri, 4 May 2018 18:23:36 +0000 (14:23 -0400)]
Merge pull request #4980 from nupplaphil/install-pdo-bugfix
using \PDO instead of PDO (bugfix)
Philipp Holzer [Fri, 4 May 2018 17:48:01 +0000 (19:48 +0200)]
using \PDO instead PDO (bugfix)
Michael [Fri, 4 May 2018 06:34:02 +0000 (06:34 +0000)]
Removed activities that aren't in the Diaspora protocol
Michael [Fri, 4 May 2018 06:33:36 +0000 (06:33 +0000)]
Some more dba stuff
Hypolite Petovan [Thu, 3 May 2018 21:03:30 +0000 (17:03 -0400)]
Merge pull request #4977 from annando/dba-error
Avoid SQL error with wrong formatted datetime value
Michael [Thu, 3 May 2018 20:49:32 +0000 (20:49 +0000)]
Reformat wrong expansion
Michael [Thu, 3 May 2018 20:48:35 +0000 (20:48 +0000)]
Avoid SQL error with wrong formatted datetime value
Hypolite Petovan [Thu, 3 May 2018 18:22:50 +0000 (14:22 -0400)]
Merge pull request #4975 from annando/fix-blocked-contacts
"pending" shouldn't be set as well by default ...
Michael [Thu, 3 May 2018 18:19:40 +0000 (18:19 +0000)]
"pending" shouldn't be set as well by default ...
Hypolite Petovan [Thu, 3 May 2018 18:06:01 +0000 (14:06 -0400)]
Merge pull request #4974 from annando/fix-blocked-contacts
Ugly bugfix: Public contacts had been blocked automatically when created
Michael [Thu, 3 May 2018 17:43:10 +0000 (17:43 +0000)]
Urgent bugfix: Public contacts had been blocked automatically when created
Hypolite Petovan [Thu, 3 May 2018 14:20:18 +0000 (10:20 -0400)]
Merge pull request #4973 from annando/diaspora-link
Bugfix: Twitter "Reshares" are now appearing again on Diaspora
Michael [Thu, 3 May 2018 13:03:41 +0000 (13:03 +0000)]
Reshares had been detected falsely so that were rejected by Diaspora
Michael [Thu, 3 May 2018 04:43:50 +0000 (04:43 +0000)]
Ensure that the link will be displayed correctly on Diaspora
Hypolite Petovan [Thu, 3 May 2018 00:55:58 +0000 (20:55 -0400)]
Merge pull request #4972 from annando/dba-stuff
Replace old database queries with the new ones
Michael [Wed, 2 May 2018 21:12:48 +0000 (21:12 +0000)]
Some corrections
Michael [Wed, 2 May 2018 19:26:15 +0000 (19:26 +0000)]
Replace old database queries with the new ones
Hypolite Petovan [Tue, 1 May 2018 12:43:45 +0000 (08:43 -0400)]
Merge pull request #4962 from astifter/fix_cropped_find_button
vier: Fix layout issue introduced with PR #4873.
Hypolite Petovan [Tue, 1 May 2018 12:19:02 +0000 (08:19 -0400)]
Merge pull request #4967 from nupplaphil/4899-autoinstall-with-file
AutomaticInstallation - use config file
Philipp Holzer [Tue, 1 May 2018 11:21:42 +0000 (13:21 +0200)]
Updated help-text
accidentaly changed `htconfig.php` (reverted)
Philipp Holzer [Tue, 1 May 2018 11:14:41 +0000 (13:14 +0200)]
Updated help-text
Philipp Holzer [Tue, 1 May 2018 11:11:25 +0000 (13:11 +0200)]
AutomaticInstallation - use config file
- added new parameter "-f config file" to `AutomaticInstallation.php`
Tobias Diekershoff [Tue, 1 May 2018 09:30:31 +0000 (11:30 +0200)]
Merge pull request #4964 from annando/delivery-foo
Fixed private messaging/relaying is controlled by the parent
Michael [Tue, 1 May 2018 06:37:12 +0000 (06:37 +0000)]
Fixed private messaging/relaying is controlled by the parent
Andreas Neustifter [Mon, 30 Apr 2018 21:22:59 +0000 (21:22 +0000)]
Fix layout issue introduced with PR #4873.
The find button in the find-people widget was badly layouted on Firefox under Debian.
Remove the width constraint and float: left so the button gracely drops to the next
line when necessary.
Hypolite Petovan [Mon, 30 Apr 2018 18:06:35 +0000 (14:06 -0400)]
Merge pull request #4961 from annando/direct-dfrn
Direct Relay is now working with DFRN as well
Michael [Mon, 30 Apr 2018 16:52:44 +0000 (16:52 +0000)]
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
Michael [Mon, 30 Apr 2018 16:46:49 +0000 (16:46 +0000)]
Improved logging, avoiding PHP warning