3677467cef
update perfect-scrollbar to version 0.6.15
rabuzarus
2016-12-24 02:27:17 +01:00
7131e45cb1
added some spaces
Roland Haeder
2016-12-23 20:21:38 +01:00
f844d96a7f
added some spaces
Roland Haeder
2016-12-23 20:21:38 +01:00
7aa799a0ee
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated.
Roland Haeder
2016-12-23 20:09:10 +01:00
b7c9d63b7a
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated.
Roland Haeder
2016-12-23 20:09:10 +01:00
370571845b
Merge branch 'develop' into rewrites/dbm_is_result
Roland Haeder
2016-12-23 19:51:43 +01:00
3dbb92c0dc
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
Roland Haeder
2016-12-21 23:04:09 +01:00
89319d9579
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:31:05 +01:00
45dd1ccc7b
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:15:53 +01:00
c1b76e889e
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:15:53 +01:00
ca82678a6d
Continued with coding convention: - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names
Roland Haeder
2016-12-20 21:13:50 +01:00
54905a3d81
added more curly braces + space between "if" and brace
Roland Häder
2016-12-20 17:43:46 +01:00
3472191b05
Changed $a->get_baseurl() to App::get_baseurl()
Roland Häder
2016-12-20 12:45:16 +01:00
8ce20f975c
Changed $a->get_baseurl() to App::get_baseurl()
Roland Häder
2016-12-20 12:45:16 +01:00
8b8a45b703
added curly braces + space between "if" and brace
Roland Häder
2016-12-20 11:27:40 +01:00
820ef8e4c7
changed to this: --------------------- function bla (App &$a) { $a->bla = 'stuff'; } ---------------------
Roland Häder
2016-12-20 10:59:06 +01:00
9fad8109ff
changed to this: --------------------- function bla (App &$a) { $a->bla = 'stuff'; } ---------------------
Roland Häder
2016-12-20 10:58:55 +01:00
9b6ad2fc47
Coding convention: - added curly braces - added space between "if" and brace - also added TODO (old-lost code?)
Roland Häder
2016-12-20 10:39:06 +01:00
f8a213e23b
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
Roland Häder
2016-12-19 14:26:13 +01:00
97c507e763
Coding convention applied: - space between "if" and brace - curly braces on conditional blocks
Roland Häder
2016-12-20 10:10:33 +01:00
17858bd844
Merge remote-tracking branch 'upstream/develop' into develop
Roland Haeder
2016-12-23 18:57:41 +01:00
ca734f168c
Merge pull request #3036 from Quix0r/rewrites/app_get_baseurl_static
Michael Vogel
2016-12-23 08:20:10 +01:00
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
Roland Häder
2016-12-22 17:12:34 +01:00
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
Roland Häder
2016-12-22 17:12:34 +01:00
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
Roland Häder
2016-12-22 17:12:34 +01:00
b33a28c082
Continued rewriting a bit: - more usage of dbm::is_result() - nicer look of code
Roland Häder
2016-12-22 17:03:00 +01:00
5547bc2cc2
Continued rewriting a bit: - more usage of dbm::is_result() - nicer look of code
Roland Häder
2016-12-22 17:03:00 +01:00
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
Roland Häder
2016-12-22 16:58:50 +01:00
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
Roland Häder
2016-12-22 16:58:50 +01:00
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
Roland Häder
2016-12-22 16:58:50 +01:00
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.
Roland Häder
2016-12-22 16:50:40 +01:00
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.
Roland Häder
2016-12-22 16:50:40 +01:00
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.
Roland Häder
2016-12-22 16:50:40 +01:00
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)
Roland Häder
2016-12-22 15:30:23 +01:00
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)
Roland Häder
2016-12-22 15:30:23 +01:00
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)
Roland Häder
2016-12-22 15:30:23 +01:00
061bcd7d2f
Merge branch 'develop' into rewrites/dbm_is_result
Roland Häder
2016-12-22 11:38:24 +01:00
20e71d21a6
Merge branch 'rewrites/app_get_baseurl_static' into develop
Roland Häder
2016-12-22 11:37:23 +01:00
ad20c5504d
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
Roland Häder
2016-12-22 11:33:00 +01:00
c99247ddab
Merge branch 'develop' into rewrites/dbm_is_result
Roland Häder
2016-12-22 11:30:45 +01:00
c0df692f5f
Merge remote-tracking branch 'upstream/develop' into develop
Roland Häder
2016-12-22 11:29:56 +01:00
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
Roland Häder
2016-12-22 11:21:50 +01:00
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
Roland Häder
2016-12-22 11:21:50 +01:00
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
Roland Häder
2016-12-22 11:21:50 +01:00
9e689e8b9b
Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links
Michael Vogel
2016-12-22 10:17:44 +01:00
a314dbc562
removed conflict solving remains, took from upstream/develop
Roland Häder
2016-12-22 09:14:14 +01:00
b2ffde3f6b
applied coding convention rule
Roland Häder
2016-12-22 09:09:27 +01:00
ef5838bbd2
was not missing in develop branch, but here. :-(
Roland Häder
2016-12-22 09:10:17 +01:00
99c8fd36c0
applied coding convention rule
Roland Häder
2016-12-22 09:09:27 +01:00
d242e72c65
applied coding convention rule
Roland Häder
2016-12-22 09:09:27 +01:00
8b7d5d0efc
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
Roland Häder
2016-12-22 09:06:00 +01:00
f42d768586
Merge remote-tracking branch 'upstream/develop' into rewrites/dbm_is_result
Roland Häder
2016-12-22 09:04:27 +01:00
4c04a78d1b
Merge remote-tracking branch 'upstream/develop' into develop
Roland Häder
2016-12-22 09:03:44 +01:00
584cf75af3
Merge pull request #3041 from rabuzarus/20161221_-_frio_notifications
Michael Vogel
2016-12-22 07:31:07 +01:00
747e97a7b2
frio: revert img.intro-photo to 80pxx80px
rabuzarus
2016-12-22 01:54:41 +01:00
2fcbba9410
provide local time for notifications
rabuzarus
2016-12-22 00:28:52 +01:00
125d2f24dd
frio: add profile link to the notifications url
rabuzarus
2016-12-21 23:17:55 +01:00
b3d33ee1e6
More curly braces added, left some TODOs behind
Roland Haeder
2016-12-21 23:17:22 +01:00
59404e4eaf
More curly braces added, left some TODOs behind
Roland Haeder
2016-12-21 23:17:22 +01:00
d3e666f71a
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
Roland Haeder
2016-12-21 23:04:09 +01:00
d97b6a2eba
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
Roland Haeder
2016-12-21 23:04:09 +01:00
d80b82c55d
no need for this else block
Roland Haeder
2016-12-21 22:53:08 +01:00
e6a4a736fc
no need for this else block
Roland Haeder
2016-12-21 22:53:08 +01:00
Michael
Michael Vogel
Tobias Diekershoff
Johannes Schwab
Hypolite Petovan
rabuzarus
rabuzarus
Roland Haeder
Hypolite Petovan