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
8bd8e858d0
regenerated master messages.po file
2017-03-20 08:27:10 +01:00
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
62915007c6
Test code removed
2017-03-20 04:37:59 +00:00
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
b42a977894
Bugfix for issue 3242 - forgotten "use"
2017-03-19 22:58:35 +00:00
41ee4ec60a
Standards and just some more poco slitting
2017-03-19 21:32:11 +00:00
24ee60492b
If the maintenance reason is a url, then redirect to this address
2017-03-19 19:03:09 +00:00
e684fff477
Added documention
2017-03-19 18:24:49 +00:00
2615d40d6b
Split the POCO discovery process in several small processes
2017-03-19 17:43:59 +00:00
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
51f93346d6
Standards, like always
2017-03-19 14:57:36 +00:00
e93825b9f0
Some more standards
2017-03-19 14:43:24 +00:00
8dd732a896
Issue 3242: Define a maintenance reason
2017-03-19 13:24:07 +00:00
b06d787130
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
2017-03-19 08:06:02 +00:00
132688d663
Standards, what else?
2017-03-19 08:04:04 +00:00
e9b083d13d
You shoudln't use a text variable like an array.
2017-03-19 01:23:34 +01:00
5e1c303c08
added spaces according to coding-convention
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 01:04:30 +01:00
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
8d5e66a61a
removed MyISAM ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 01:02:01 +01:00
1946cf143d
added logger ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 01:00:35 +01:00
621a77b275
added spaces around + curly braces ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 00:58:46 +01:00
6ca6c6813a
better log here ...
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 00:56:58 +01:00
aeaafb5d71
Continued:
...
- added curly braces
- added TODO
- removed TODO (no change needed, is fine)
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
4fe5cdf3fd
don't quit silently, at least a TODO is now around
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
e8e51d8535
Missed a 't', thanks to @annando
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
fbd559a823
more spaces + some curly spaces added
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:24 +01:00
ed0d858f98
added spaces + some curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:24 +01:00
d529125c8e
added spaces + some curly braces + some usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:24 +01:00
4c72cb3584
Continued:
...
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
bf0a07b7ae
Continued:
...
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
long time around in PHP) anything can be handled over to the method/function.
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
015561fec6
Opps ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
4a96c280d0
added more curly braces + a bit more usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
1e3b443245
added more spaces/curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
a4fea38c38
unified most db upgrades:
...
- common way is to check on result ($r mostly) of db upgrade
- on success, return UPDATE_SUCCESS
- on failure, return UPDATE_FAILED
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
aeb0ed32c8
added curly braces + removed more useless intval() calls on file_exists()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
fef61a28cc
fixed chmod
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
d9c22c7f3e
Continued a bit:
...
- converted some else if to elseif (only PHP)
- converted some space -> tab (intending)
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
rabuzarus
080e2af882
Merge pull request #3244 from annando/bugfix-text
...
You shouldn't use a text variable like an array.
2017-03-19 00:51:57 +01:00
c2d8738285
added spaces (coding convention)
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:51:54 +01:00
951006dd10
more spaces + some curly spaces added
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:51:54 +01:00
41a36606c6
added spaces + some curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:50:19 +01:00
0cd241bcbe
added spaces + some curly braces + some usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:44:40 +01:00