26087 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Roland Häder	830af774d3	added more curly braces + a bit more usage of dbm::is_result() ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-21 21:50:45 +01:00
rabuzarus	2633e820ab	remove upload file from jot because it's now in the browser included	2017-03-21 21:18:27 +01:00
rabuzarus	9acfbae6ea	add justified-gallery to fbrowser	2017-03-21 20:39:31 +01:00
Michael Vogel	4ebebe96fe	Merge branch 'develop' into 1703-worker-splitting	2017-03-21 17:08:07 +01:00
Hypolite Petovan	61a01141d7	Merge pull request #3253 from friendica/revert-3112-rewrites/coding-convention ... Revert "Coding convention applied - part 1"	2017-03-21 12:04:19 -04:00
Hypolite Petovan	7b352f3f74	Revert "Coding convention applied - part 1"	2017-03-21 12:02:59 -04:00
Michael Vogel	5a6da8b447	Merge branch 'develop' into 1703-worker-splitting	2017-03-21 16:38:59 +01:00
Michael	f7b0c2082b	Some standards	2017-03-21 15:24:49 +00:00
Michael	9c16b47f55	Strange comment removed	2017-03-21 15:15:58 +00:00
Hypolite Petovan	9c2c483996	Merge pull request #3112 from Quix0r/rewrites/coding-convention ... Coding convention applied - part 1	2017-03-21 10:19:53 -04:00
Michael	19825eddf7	Changed probing call. Removed dupolicated code.	2017-03-21 13:43:53 +00:00
Michael	be9db7f060	Merge remote-tracking branch 'upstream/develop' into 1703-worker-splitting	2017-03-21 07:59:14 +00:00
Michael	74cc5ade0c	Worker processes are split into many more separate tasks	2017-03-21 07:57:09 +00:00
Tobias Diekershoff	0fd874a683	Merge pull request #3246 from annando/1701-poco ... Split poco discovery in smaller function calls	2017-03-21 07:27:10 +01:00
rabuzarus	af8bd4b45f	frio: gui work for fbrowser + switch between image and file mode	2017-03-21 03:35:25 +01:00
rabuzarus	c8a427804e	Bugfix: fbrowser did insert 2 Pictures instead of only 1	2017-03-20 22:45:24 +01:00
Roland Haeder	09851331a9	Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-20 20:51:32 +01:00
Hypolite Petovan	8a0b057dc7	Merge branch 'develop' into improvement/frio-action-links-to-buttons	2017-03-20 14:43:37 -04:00
Hypolite Petovan	7a95fcf02a	Merge pull request #3241 from rabuzarus/20170316_-_fix_event_edit ... add dop event & fix event edit	2017-03-20 13:18:18 -04:00
rabuzarus	0557a42e2f	add missed NULL_DATE	2017-03-20 17:19:24 +01:00
rabuzarus	d1d33dc79a	Merge origin/20170316_-_fix_event_edit into 20170316_-_fix_event_edit ... Conflicts: mod/events.php	2017-03-20 17:16:39 +01:00
rabuzarus	0879b46125	add NULL_DATE & coding standard work	2017-03-20 16:59:21 +01:00
rabuzarus	0060e2449e	Merge develop into 20170316_-_fix_event_edit ... Conflicts: mod/events.php	2017-03-20 16:46:36 +01:00
Hypolite Petovan	8f7d191bfc	Merge branch 'develop' into 20170316_-_fix_event_edit	2017-03-20 11:08:07 -04:00
Michael Vogel	eaf308ad01	Merge pull request #3250 from tobiasd/20170320-msg ... regenerated master messages.po file	2017-03-20 08:40:37 +01:00
Tobias Diekershoff	8bd8e858d0	regenerated master messages.po file	2017-03-20 08:27:10 +01:00
Tobias Diekershoff	3021254f85	Merge pull request #3247 from annando/issue-3242-b ... If the maintenance reason is a url, then redirect to this address	2017-03-20 07:20:23 +01:00
Michael	62915007c6	Test code removed	2017-03-20 04:37:59 +00:00
Michael	aa4f9c985f	Enhanced explanation	2017-03-20 04:37:13 +00:00
Hypolite Petovan	46c5b3b419	Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons	2017-03-19 21:12:20 -04:00
Hypolite Petovan	28b3fa4f1f	Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop	2017-03-19 21:10:41 -04:00
Hypolite Petovan	8c8b8c32d9	Merge pull request #3249 from annando/bugfix-dbstructure ... Bugfix for issue 3242 - forgotten "use"	2017-03-19 21:00:55 -04:00
Michael	b42a977894	Bugfix for issue 3242 - forgotten "use"	2017-03-19 22:58:35 +00:00
Michael	41ee4ec60a	Standards and just some more poco slitting	2017-03-19 21:32:11 +00:00
Michael	24ee60492b	If the maintenance reason is a url, then redirect to this address	2017-03-19 19:03:09 +00:00
Michael	e684fff477	Added documention	2017-03-19 18:24:49 +00:00
Michael	2615d40d6b	Split the POCO discovery process in several small processes	2017-03-19 17:43:59 +00:00
Michael	7f61b2ee15	Merge remote-tracking branch 'upstream/develop' into 1701-poco ... Conflicts: include/socgraph.php	2017-03-19 15:36:41 +00:00
Hypolite Petovan	65f809f5cb	Merge pull request #3245 from annando/issue-3242 ... Issue 3242: Define a maintenance reason	2017-03-19 11:06:25 -04:00
Hypolite Petovan	7dfe6d1580	Merge pull request #3243 from annando/1702-null-date ... Datetime compatibility to MySQL restored	2017-03-19 11:03:32 -04:00
Michael	51f93346d6	Standards, like always	2017-03-19 14:57:36 +00:00
Michael	e93825b9f0	Some more standards	2017-03-19 14:43:24 +00:00
Michael	8dd732a896	Issue 3242: Define a maintenance reason	2017-03-19 13:24:07 +00:00
Michael	b06d787130	Merge remote-tracking branch 'upstream/develop' into 1702-null-date	2017-03-19 08:06:02 +00:00
Michael	132688d663	Standards, what else?	2017-03-19 08:04:04 +00:00
Michael	e9b083d13d	You shoudln't use a text variable like an array.	2017-03-19 01:23:34 +01:00
Roland Haeder	5e1c303c08	added spaces according to coding-convention ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-19 01:04:30 +01:00
Roland Haeder	46a031368a	old-lost update way, no need for TODO around. ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-19 01:03:14 +01:00
Roland Haeder	8d5e66a61a	removed MyISAM ... ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-19 01:02:01 +01:00
Roland Haeder	1946cf143d	added logger ... ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-03-19 01:00:35 +01:00