f5227c016d
replaced some tabs -> spaces + added curly braces #3254
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-23 21:28:32 +01:00
2ce5ab1467
removed commented out line
2017-03-23 07:36:22 +00:00
5b6215d7bd
Better server_url handling
2017-03-23 07:34:45 +00:00
c25af197c9
baseurl should now be set correctly at all the time.
2017-03-23 07:10:22 +00:00
26ec56dfa5
server_url was forgotten
2017-03-23 06:45:00 +00:00
9e5bec1bc8
"poco_check" is now replaced and removed
2017-03-23 06:23:23 +00:00
8e240a1e8c
New function to validate gcontact array data
2017-03-22 23:13:32 +00:00
Hypolite Petovan
b2cded0758
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons
2017-03-22 07:29:13 -04:00
Hypolite Petovan
d799662992
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
2017-03-22 07:28:22 -04:00
1d6910277d
Remove more deprecated "poco_check" calls
2017-03-22 07:11:58 +00:00
bc517ef3d2
Remove reduncancies
2017-03-22 05:26:44 +00:00
Hypolite Petovan
991b62784a
Remove spaces confusing jSmart in contact_template
...
- Fix two missing button closing tags
2017-03-21 22:39:29 -04:00
Hypolite Petovan
8752ce6254
Merge pull request #3252 from annando/1703-worker-splitting
...
The worker processes in cron.php are now split into many small parts
2017-03-21 20:29:35 -04:00
rabuzarus
835e54dfc3
upload images to the selected album
2017-03-21 23:08:37 +01:00
a376f55c1f
Linefeed added
2017-03-21 22:06:57 +00:00
f173322539
added missing spaces/curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-21 21:52:00 +01:00
ddb5a8ea78
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-21 21:51:22 +01:00
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
f7b0c2082b
Some standards
2017-03-21 15:24:49 +00:00
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
19825eddf7
Changed probing call. Removed dupolicated code.
2017-03-21 13:43:53 +00:00
be9db7f060
Merge remote-tracking branch 'upstream/develop' into 1703-worker-splitting
2017-03-21 07:59:14 +00:00
74cc5ade0c
Worker processes are split into many more separate tasks
2017-03-21 07:57:09 +00:00
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
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
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
