27397 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	ada5c4cc6a	Add Content Warning support for comments too ... Doh!	2017-04-10 00:57:36 -04:00
Hypolite Petovan	69d157c319	Add spoiler tags for Mastodon Content Warning	2017-04-10 00:08:14 -04:00
Hypolite Petovan	b9c0c114fb	Merge pull request #3312 from rabuzarus/20170409_-_fix_desktop_notifs ... Bugfix: Desktop-notifs - show notifs which have seen = false or seen = 0	2017-04-09 09:22:20 -04:00
rabuzarus	836e0b2799	Bugfix: Desktop-notifs - show notifs which have seen = false or seen = 0	2017-04-09 14:24:26 +02:00
rabuzarus	0e177e6d5e	Merge pull request #3311 from tobiasd/20170409-ru ... RU translations THX pztrn	2017-04-09 12:50:33 +02:00
Tobias Diekershoff	dad89a125a	RU translations THX pztrn	2017-04-09 07:35:12 +02:00
Hypolite Petovan	ffbf330585	Merge pull request #3310 from annando/1704-probing ... Avoid possible problems with numeric nicknames and GNU Social	2017-04-09 01:08:12 -04:00
Michael	5c75fe4c14	Avoid possible problems with numeric nicknames and GNU Social	2017-04-09 04:29:02 +00:00
Hypolite Petovan	c627780600	Merge pull request #3307 from rebeka-catalina/space_before_t ... Space before t	2017-04-08 23:18:26 -04:00
Hypolite Petovan	472345d740	Merge branch 'develop' into space_before_t	2017-04-08 23:17:31 -04:00
Roland Haeder	e325c6ec85	opps, missed this one. ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-09 00:28:48 +02:00
rabuzarus	6338636ff3	short test with array	2017-04-08 23:46:59 +02:00
Michael Vogel	1a05efb026	Merge pull request #3308 from rabuzarus/20170408_-_fix_desktop_notifs ... Desktop-Notifs: include the user id into the storage key for local browser storage	2017-04-08 21:15:04 +02:00
rabuzarus	8bd41592ef	Desktop-Notifs: include the user id into the storage key for local browser storage	2017-04-08 20:25:10 +02:00
Roland Haeder	3778b15b7c	not on develop was this code in, but here? :-/ ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:09:31 +02:00
Roland Haeder	d07236deb6	huh? missed again ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:08:22 +02:00
Roland Haeder	cd697e0d7c	more spaces! ;-) ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:07:40 +02:00
Roland Haeder	0319517f94	more curly braces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:06:56 +02:00
Roland Haeder	6ff0b15873	more spaces + curly braces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:05:56 +02:00
Roland Haeder	577e93e9fc	added spaces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:04:33 +02:00
Roland Haeder	bc5d1015b3	added curly braces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:03:21 +02:00
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