MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
13696 commits 3 branches 0 tags 96 MiB
Commit graph

13696 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roland Häder
d0bc38dbf8 added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:27:48 +01:00
Roland Häder
beca51bfba added curly braces + space between "if" and brace + initialized $result (was only within if() block but not outside of it) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:22:13 +01:00
Roland Häder
757a0c76f0 added curly braces + space between "if" and brace + added missing @param 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:19:48 +01:00
Roland Häder
244636d26c added curly braces + space between "if" and brace + added TODO 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:14:55 +01:00
Roland Häder
35973b9273 Merge branch 'develop' into rewrites/dbm_is_result 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/events.php
	mod/fbrowser.php
	mod/group.php
	view/theme/quattro/theme.php
 2016-12-20 11:06:07 +01:00
Roland Häder
92ad87590b added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 11:04:29 +01:00
Roland Häder
34fcaeb209 changed to this: 
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:59:11 +01:00
Roland Häder
fb817b18ad changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:59:06 +01:00
Roland Häder
4dce3d8224 changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:58:55 +01:00
Roland Häder
fb0ed18a43 changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:58:03 +01:00
Roland Häder
3ffea45a1c added more curyl braces + spaces between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:44:49 +01:00
Roland Häder
be35349495 added more curyl braces + spaces between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:44:27 +01:00
Roland Häder
e5461df082 Coding convention: 
- added curly braces
- added space between "if" and brace
- also added TODO (old-lost code?)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:40:27 +01:00
Roland Häder
e6463c8af6 Coding convention: 
- added curly braces
- added space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:40:25 +01:00
Roland Häder
064b53e673 Coding convention: 
- added curly braces
- added space between "if" and brace
- also added TODO (old-lost code?)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:39:06 +01:00
Roland Häder
a5e4882e25 Coding convention: 
- added curly braces
- added space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:35:28 +01:00
Roland Häder
5a90e7f822 Continued a bit: 
- converted some bad checks to use dbm::is_result()
- added space between "if" and brace
- added curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:20:10 +01:00
Roland Häder
f42c4b6d7f Continued a bit: 
- converted some bad checks to use dbm::is_result()
- added space between "if" and brace
- added curly braces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:19:48 +01:00
Roland Häder
98b7270295 Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/lock.php
 2016-12-20 10:19:33 +01:00
Roland Häder
e1f3661645 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:19:20 +01:00
Roland Häder
fb676335db Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:10:33 +01:00
Roland Häder
dac1dbd3e9 Merge branch 'rewrites/dbm_is_result' into develop 2016-12-19 14:47:05 +01:00
Roland Häder
a96eb3428d Used more dbm::is_result() instead of (!$r) or (!count($r)), still there are 
more pending ...

Also put SQL table columns into back-ticks.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:46:33 +01:00
Roland Häder
884f44ce94 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:27:16 +01:00
Roland Häder
c43389f79a No more needed ... util/typo.php is there. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:23:09 +01:00
Roland Häder
e06cac420b Use [] instead of test. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:23:09 +01:00
Roland Häder
7f1da5b1a9 added lint.sh which needs to be executed like this: 
$ ./util/lint.sh

No parameters needed. It will use "php -l" (current interpreter) for checking
for syntax errors in all PHP scripts.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-19 14:23:09 +01:00
Roland Häder
4615f39836 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-19 14:21:26 +01:00
Michael Vogel
52f12ee28d Merge pull request #3010 from Quix0r/rewrites/mixed-static-object-reference-calls 
Rewrites: mixed static object reference calls (and very sadly more ...)
 2016-12-19 14:12:50 +01:00
Michael Vogel
cae6a0c9fb Merge pull request #3026 from tobiasd/20161219-lng 
DE translation of the core
 2016-12-19 14:09:57 +01:00
Tobias Diekershoff
85dec3cf30 DE translation of the core 2016-12-19 12:22:47 +01:00
Roland Häder
ff569756ee Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/follow.php
 2016-12-19 09:40:34 +01:00
Michael Vogel
fd1afcbd35 Merge pull request #3025 from tobiasd/20161219-messagespo 
regenerated master messages.po file
 2016-12-19 08:40:49 +01:00
Tobias Diekershoff
5507a2caeb regenerated master messages.po file 2016-12-19 07:47:52 +01:00
Tobias Diekershoff
6aba536957 Merge pull request #3023 from annando/1612-attachment-link 
Bugfix: Reimported Friendica posts from pump.io had the links missing.
 2016-12-19 07:44:42 +01:00
Tobias Diekershoff
5a4c5ac8f7 Merge pull request #3024 from beardyunixer/develop 
This error message had me confused for about twenty minutes.  I couldn't
 2016-12-19 07:44:10 +01:00
Thomas Willingham
a58d8d2c71 This error message had me confused for about twenty minutes. I couldn't 
figure out what was wrong with my imagick install that would make it give
me an orange button if it was installed.  Of course, the problem was that
it wasn't installed, and the message was worded badly.  This is a bit less
confusing.
 2016-12-19 00:10:11 +00:00
Michael
8cab220387 Bugfix: Reimported Friendica posts from pump.io had the links missing. 2016-12-18 23:39:44 +00:00
Tobias Diekershoff
b3fa0a4e90 Merge pull request #3022 from annando/1612-ostatus-follow2 
Ostatus: The follow/unfollow XML should now be even more compliant.
 2016-12-18 22:27:02 +01:00
Michael
3f6fd4bf84 Mastodon: Hopefully we can now detect reshares better 2016-12-18 20:34:34 +00:00
Michael
a8e80ef0a6 Ostatus: The follow/unfollow XML should now be even more compliant. 2016-12-18 20:02:13 +00:00
Tobias Diekershoff
463a80e91d Merge pull request #3021 from annando/1612-ostatus-follow 
OStatus: Follow/Unfollow should now work again.
 2016-12-18 19:11:34 +01:00
Michael
099f51c7b5 Removal of test code 2016-12-18 17:36:48 +00:00
Michael
bc323b0bfa OStatus: Follow/Unfollow should now work again. 2016-12-18 17:10:38 +00:00
Tobias Diekershoff
e92135a2dc Merge pull request #3014 from annando/1612-missing-self-contact 
Create missing self contact
 2016-12-15 18:44:44 +01:00
Roland Häder
a126db451c Convention: SQL keywords all upper-case, columns and table names (better) lower-cased and always in back-ticks. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 10:12:00 +01:00
Roland Häder
2c9d282136 Convention: SQL keywords all upper-case, columns and table names (better) lower-cased and always in back-ticks. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 10:11:25 +01:00
Roland Häder
f89044ed61 Garrr ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 10:07:21 +01:00
Roland Häder
9c564c4fd3 Again, static *OR* object-referencing calls? Blue or red pill? 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 10:06:20 +01:00
Roland Häder
c43e9aa74e get_basepath() uses a lot $this (which means object-referenced calls, or 
non-static calls). but still it is called statically in many places.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-15 10:06:12 +01:00