strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
13953 commits 2 branches 55 tags 148 MiB
Commit graph

13953 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roland Häder
8ce20f975c
Changed $a->get_baseurl() to App::get_baseurl() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:50:58 +01:00
Roland Häder
8b8a45b703
added curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:50:53 +01:00
Roland Häder
820ef8e4c7
changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:50:51 +01:00
Roland Häder
9fad8109ff
changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:50:21 +01:00
Roland Häder
9b6ad2fc47
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-23 19:49:39 +01:00
Roland Häder
f8a213e23b
*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-23 19:49:36 +01:00
Roland Häder
97c507e763
Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-23 19:49:15 +01:00
Roland Haeder
17858bd844
Merge remote-tracking branch 'upstream/develop' into develop 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-23 18:57:41 +01:00
rabuzarus
e95337e9ae correct doxygen @todo 2016-12-23 18:31:42 +01:00
Michael Vogel
ca734f168c Merge pull request #3036 from Quix0r/rewrites/app_get_baseurl_static 
$a->get_baseurl() rewritten to App::get_baseurl() - 2nd PR
 2016-12-23 08:20:10 +01:00
Roland Häder
31cd3fb33c Coding convention continued: 
- added curly braces
- added spaces between if/foreach and brace
- made code block look nicer (spaces added, tabs replaced by space)
- added TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 17:13:34 +01:00
Roland Häder
7c8e834546 Coding convention continued: 
- added curly braces
- added spaces between if/foreach and brace
- made code block look nicer (spaces added, tabs replaced by space)
- added TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 17:13:22 +01:00
Roland Häder
13b57d4d50 Coding convention continued: 
- added curly braces
- added spaces between if/foreach and brace
- made code block look nicer (spaces added, tabs replaced by space)
- added TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 17:12:34 +01:00
Roland Häder
b33a28c082 Continued rewriting a bit: 
- more usage of dbm::is_result()
- nicer look of code

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 17:03:41 +01:00
Roland Häder
5547bc2cc2 Continued rewriting a bit: 
- more usage of dbm::is_result()
- nicer look of code

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 17:03:00 +01:00
Roland Häder
1c0bd91458 Coding convention applied: 
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:59:48 +01:00
Roland Häder
9c81b4948e Coding convention applied: 
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:59:43 +01:00
Roland Häder
8db0be09b8 Coding convention applied: 
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:58:50 +01:00
Roland Häder
2325d81048 Code style changed: 
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
  line comments, use /* */ instead and a asterisk in front of every line.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:52:28 +01:00
Roland Häder
70a03f38e5 Code style changed: 
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
  line comments, use /* */ instead and a asterisk in front of every line.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:52:18 +01:00
Roland Häder
30642756e5 Code style changed: 
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
  line comments, use /* */ instead and a asterisk in front of every line.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 16:50:40 +01:00
Roland Häder
4011f244d6 Continued with code convention: 
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 15:31:29 +01:00
Roland Häder
d82ed5d1b4 Continued with code convention: 
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 15:31:23 +01:00
Roland Häder
c9194b0381 Continued with code convention: 
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 15:30:23 +01:00
Roland Häder
061bcd7d2f Merge branch 'develop' into rewrites/dbm_is_result 2016-12-22 11:38:24 +01:00
Roland Häder
20e71d21a6 Merge branch 'rewrites/app_get_baseurl_static' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
 2016-12-22 11:37:23 +01:00
Roland Häder
ad20c5504d Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
 2016-12-22 11:33:00 +01:00
Roland Häder
c99247ddab Merge branch 'develop' into rewrites/dbm_is_result 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	object/Item.php
 2016-12-22 11:30:45 +01:00
Roland Häder
c0df692f5f Merge remote-tracking branch 'upstream/develop' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
 2016-12-22 11:29:56 +01:00
Roland Häder
dfc2c1f805 Beatification/coding convention: 
- added a lot spaces to make it look nicer
- added curly braces (coding convention)
- added needed spaces (coding convention)get_id
- removed obsolete $a = get_app() call

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 11:22:29 +01:00
Roland Häder
5d0db51fdf Beatification/coding convention: 
- added a lot spaces to make it look nicer
- added curly braces (coding convention)
- added needed spaces (coding convention)get_id
- removed obsolete $a = get_app() call

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 11:22:07 +01:00
Roland Häder
41da37ae67 Beatification/coding convention: 
- added a lot spaces to make it look nicer
- added curly braces (coding convention)
- added needed spaces (coding convention)get_id
- removed obsolete $a = get_app() call

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 11:21:50 +01:00
Michael Vogel
9e689e8b9b Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links 
Diaspora: Complete /people/* links from fcontact or author domain
 2016-12-22 10:17:44 +01:00
Roland Häder
a314dbc562 removed conflict solving remains, took from upstream/develop 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:14:14 +01:00
Roland Häder
b2ffde3f6b applied coding convention rule 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:11:17 +01:00
Roland Häder
ef5838bbd2 was not missing in develop branch, but here. :-( 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:10:17 +01:00
Roland Häder
99c8fd36c0 applied coding convention rule 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:10:00 +01:00
Roland Häder
d242e72c65 applied coding convention rule 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-22 09:09:27 +01:00
Roland Häder
8b7d5d0efc Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 09:06:00 +01:00
Roland Häder
f42d768586 Merge remote-tracking branch 'upstream/develop' into rewrites/dbm_is_result 2016-12-22 09:04:27 +01:00
Roland Häder
4c04a78d1b Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 09:03:44 +01:00
Michael Vogel
584cf75af3 Merge pull request #3041 from rabuzarus/20161221_-_frio_notifications 
frio notifications templates + local date & profile link for the notifications page
 2016-12-22 07:31:07 +01:00
rabuzarus
747e97a7b2 frio: revert img.intro-photo to 80pxx80px 2016-12-22 01:54:41 +01:00
rabuzarus
2fcbba9410 provide local time for notifications 2016-12-22 00:28:52 +01:00
rabuzarus
125d2f24dd frio: add profile link to the notifications url 2016-12-21 23:17:55 +01:00
Roland Haeder
b3d33ee1e6
More curly braces added, left some TODOs behind 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:17:47 +01:00
Roland Haeder
59404e4eaf
More curly braces added, left some TODOs behind 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:17:36 +01:00
Roland Haeder
d3e666f71a
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:12:28 +01:00
Roland Haeder
d97b6a2eba
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?) 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 23:04:09 +01:00
Roland Haeder
d80b82c55d no need for this else block 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-21 22:53:32 +01:00