26526 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Roland Haeder	a66f6fe668	more spaces and curly braces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:01:04 +02:00
Roland Haeder	80f41991a5	curly braces were missing again ... ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:50:29 +02:00
Roland Haeder	622b532f23	more spaces again ... ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:49:32 +02:00
Roland Haeder	676e956a72	some more spaces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:45:44 +02:00
Roland Haeder	85d5592180	added curly braces + spaces (CR) ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:43:38 +02:00
Roland Haeder	3051d30c88	added spaces (CR) ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:40:19 +02:00
Roland Haeder	215cae204d	again develop and this branch differs ... (no blame on cherry-picking though) ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:38:40 +02:00
Roland Haeder	d94e878714	opps, was somehow missed to cherry-pick/merge ? ... + converted multiple single-line comments into one multi-line comment Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:36:38 +02:00
Roland Haeder	61cfa9e42d	Opps! ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:31:54 +02:00
Roland Haeder	a69f3017fb	Cleanups: ... - made SQL keywords all uper-case - put all SQL columns in back-ticks - added curly braces - added/removed spaces Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:31:09 +02:00
Roland Haeder	f6c667ef45	more spaces + curly braces ... ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:22:33 +02:00
Roland Haeder	8ba461db0a	removed spaces ... ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:17:20 +02:00
Roland Haeder	78b9cf97e0	huh? was in develop branch but not here? ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:12:31 +02:00
Roland Haeder	3d386daf53	no spaces here ... ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:11:51 +02:00
Hypolite Petovan	29eac5ca49	Merge pull request #3304 from rebeka-catalina/local_dir_warning ... Local dir warning	2017-04-08 13:11:27 -04:00
Roland Haeder	3220234693	more spaces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:10:50 +02:00
Roland Haeder	a0e5f7a59a	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>	2017-04-08 19:05:50 +02:00
Roland Haeder	8191bcc402	more spaces + curly braces + converted multiple single-line comments to one mult-line comment ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 18:52:15 +02:00
Roland Haeder	a4d60b65f1	fixed spacing + intending ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 18:49:01 +02:00
Roland Häder	3d1626781d	Merge branch 'develop' into rewrites/coding-convention-split2-1-2	2017-04-08 18:45:59 +02:00
rebeka-catalina	050675a629	The other lone comma in 1177	2017-04-08 18:07:30 +02:00
rebeka-catalina	554704e6b9	Added a whitespace between comma and t()	2017-04-08 16:57:24 +02:00
rebeka-catalina	d8a8fa9baa	Modified the warning message	2017-04-08 16:48:11 +02:00
rebeka-catalina	7320327fa1	Deleted the lone comma between paratheses	2017-04-08 16:37:18 +02:00
rebeka-catalina	895a6254a0	Correction of 1177 and added modification to 1171	2017-04-08 15:48:15 +02:00
Tobias Diekershoff	42cc8d729b	Merge pull request #3306 from Hypolite/issue/#3274 ... Fix path to default Text_Highlighter CSS	2017-04-08 15:24:16 +02:00
Hypolite Petovan	318166a381	Fix path to default Text_Highlighter CSS	2017-04-08 08:59:41 -04:00
rebeka-catalina	fa76ec4e33	Merge branch 'develop' of git://github.com/friendica/friendica into develop	2017-04-08 14:50:45 +02:00
rebeka-catalina	bcfbfeeba4	adding space for readability	2017-04-08 13:52:37 +02:00
Hypolite Petovan	5592837f71	Merge pull request #3305 from rabuzarus/20170408_-_fix_frio_css_nav_account_button ... Bugfix: there was a gui issue on the navbar account dropdown button	2017-04-08 07:49:12 -04:00
rabuzarus	c65fc6f8de	Bugfix: there was a gui issue on the navbar account dropdown button	2017-04-08 13:30:16 +02:00
rebeka-catalina	4c9c83e8e8	Warning, that profile published in local directory may be visible in public	2017-04-08 13:21:35 +02:00
rabuzarus	c58d7715ef	Merge pull request #3303 from annando/1704-duplicate-feed ... Avoid duplicates with feeds and "remote self"	2017-04-08 13:20:46 +02:00
rebeka-catalina	892ef45474	Warning, that profile published in local directory may be visible in public	2017-04-08 13:13:38 +02:00
Michael	c94525938d	Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed	2017-04-08 10:05:01 +00:00
rebeka-catalina	291906de5f	Merge branch 'develop' of http://github.com/rebeka-catalina/friendica into develop	2017-04-08 11:42:20 +02:00
Michael	8786bcdf0a	Avoid duplicates with feeds and "remote self"	2017-04-08 08:12:14 +00:00
rabuzarus	366ccdb09a	Merge pull request #3301 from annando/issue-3300 ... The temp path creation couldn't create a subdirectory with the hostname	2017-04-07 23:48:32 +02:00
Michael	47a6f6b726	Issue 3300: The temp path creation couldn't create a subdirectory with the hostname	2017-04-07 21:34:06 +00:00
Michael Vogel	56c0675fba	Merge pull request #3295 from Hypolite/issue/#3274 ... Friendica code blocks aren't rendered in Diaspora	2017-04-07 22:59:44 +02:00
fabrixxm	07f93b9636	Merge pull request #3298 from tobiasd/20170407-quattroadin ... the Quattro admin_user template was missing the users note for the admin	2017-04-07 14:31:28 +02:00
Tobias Diekershoff	fb94a0add7	the Quattro admin_user template was missing the users note for the admin	2017-04-07 12:59:22 +02:00
Tobias Diekershoff	b5a42c5b31	Merge pull request #3297 from rabuzarus/20170407_-_fix_bulk_deletion_button ... Bugfix: bulk deletion button was not available anymore	2017-04-07 11:45:00 +02:00
rabuzarus	39ccbe2e45	Merge pull request #3296 from tobiasd/20170407-isresult ... small fix for #3254	2017-04-07 11:41:38 +02:00
rabuzarus	a9b3696560	Bugfix: bulk deletion button was not available anymore	2017-04-07 11:35:45 +02:00
Tobias Diekershoff	6060f311e9	small fix for #3254	2017-04-07 11:26:11 +02:00
Hypolite Petovan	cfb99aa323	Merge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser ... frio: fbrowser styling	2017-04-07 00:01:46 -04:00
Hypolite Petovan	b0accf4d4c	Fix code blocks to Diaspora ... - Extracts code blocks before BBCode conversion to prevent code highlighting and whitespace meddling - Use the improved HTLM To Markdown library - Use <code> instead of <key> for Diaspora inline code blocks	2017-04-06 23:49:56 -04:00
Hypolite Petovan	8149e21add	Enforce standards	2017-04-06 23:43:55 -04:00
Hypolite Petovan	c9dafe3b4e	Move HTML to Markdown library to Composer	2017-04-06 23:33:12 -04:00