Roland Häder
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
Roland Häder
5f71da5862
added more curly braces + spaces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
958c24e9f3
spaces -> tab + added spaces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
3849e7c9ff
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:40:47 +01:00
Roland Häder
5471dd79e8
added missing curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Roland Häder
63e4750b4a
more coding convention applied:
...
- added curly braces
- added spaces where needed
- $r only needs to be tested with dbm::is_result()
- made SQL keywords all uper-case
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Roland Häder
1c6535c0b4
applied coding convention:
...
- replaced space -> tab (code indenting)
- added curly braces
- used dbm::is_result() if $r is no result (may happen)
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Michael
87771cf617
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
...
Conflicts:
include/discover_poco.php
2017-03-17 15:53:19 +00:00
rabuzarus
3cef98caf6
Merge pull request #3226 from annando/1702-only-worker
...
The worker is now the only background processing system
2017-03-17 13:22:23 +01:00
Michael
88a69b93d5
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
2017-03-15 13:56:17 +00:00
Michael
8decd15565
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-15 13:55:43 +00:00
Michael Vogel
a7e8e86800
Merge pull request #3221 from strk/remember-openid
...
Fix "remember me" cookie for OpenID logins
2017-03-14 16:30:15 +01:00
fabrixxm
fa3490ba5b
Merge pull request #3224 from annando/1702-no-old_pager
...
The old pager is now removed
2017-03-14 10:29:03 +01:00
Michael
eaf93dc041
I guess, @Hypolite will still find something to change ...
2017-03-13 17:23:02 +00:00
Michael
0dbc72c4ea
Embrace the braces and spaces ...
2017-03-13 16:18:45 +00:00
Michael
d2bad13e83
Added documentation
2017-03-13 14:57:11 +00:00
Michael
fbb84ee219
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-13 10:18:29 +00:00
Tobias Diekershoff
dfc5dc2e9e
Merge pull request #3223 from annando/1702-no-language
...
The language string isn't displayed anymore
2017-03-13 08:26:43 +01:00
Michael
eb6a6228f7
more spaces
2017-03-13 05:57:37 +00:00
Michael
77e8c44016
Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
...
Conflicts:
include/onepoll.php
include/queue.php
2017-03-12 21:03:44 +00:00
Michael
259598e569
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share
2017-03-12 20:52:48 +00:00
Michael
044e9a6603
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
...
Conflicts:
mod/profile.php
2017-03-12 20:52:14 +00:00
Michael
b6a4a2ec7f
Merge remote-tracking branch 'upstream/develop' into 1702-no-language
2017-03-12 20:50:20 +00:00
Michael
18d23ca443
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-12 20:49:48 +00:00
Tobias Diekershoff
1bf089e424
Merge pull request #3216 from annando/1701-performance
...
Better network handling, improved structure
2017-03-12 15:40:56 +01:00
Sandro Santilli
df6304cc42
Fix "remember me" cookie for OpenID logins
...
Closes #2432
NOTE: in order to obtain the same "cookie hash" it was required
to include unneeded fields in the user record structure, this would
be good to change in the future...
2017-03-12 01:11:35 +01:00
Michael
0989f725a6
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server
2017-03-05 16:23:58 +00:00
Michael
2775adfdf5
Second followup for profile issue
2017-03-05 11:07:10 +00:00
Michael
b42167f0ac
We can now return a list of known servers
2017-03-04 11:04:00 +00:00
Michael
ec9dddb445
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server
2017-03-04 10:33:43 +00:00
Michael
461ee5c8a8
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server
2017-03-04 08:38:04 +00:00
Michael
8690b97c27
Follow up for issue 3196: We need an index hint for performance issues
2017-03-04 08:25:47 +00:00
Michael Vogel
9ccb6072b8
Merge pull request #3205 from tobiasd/20170226-issue3187
...
Bugfix issue 3187
2017-03-03 21:36:37 +01:00
Tobias Diekershoff
2fa9f76e67
better wording and placeholder for name
2017-03-03 10:28:29 +01:00
Michael
324d8bfe8e
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server
2017-03-02 20:20:38 +00:00
Michael
3ab845dcf3
Issue 3196: Not all forum posts weren't shown
2017-03-01 21:47:10 +00:00
Michael
cc86d8ea14
Language data won't be displayed anymore (it was experimental stuff)
2017-02-27 23:59:05 +00:00
Michael
997e94555b
The old pager is removed
2017-02-27 21:46:37 +00:00
Michael
39386ded36
"old_share" is removed
2017-02-27 21:26:37 +00:00
Michael
99fb15037b
Removed some more unneeded stuff
2017-02-27 06:27:22 +00:00
Michael
733caa5669
Removed admin settings
2017-02-26 23:19:13 +00:00
Michael
48209f0ecd
Now there is only the worker.
2017-02-26 23:16:49 +00:00
Michael
2a8a5a6d88
Improved server vitality detection
2017-02-26 18:19:20 +00:00
Tobias Diekershoff
7442ce3d6d
change Fan/Admirer to Subscriber
2017-02-26 16:47:11 +01:00
Michael
f9f27c2f5f
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-23 06:55:35 +00:00
Michael
cec79ddf2b
See issue 3157: Fulltext is now disabled
2017-02-21 05:23:37 +00:00
Tobias Diekershoff
a4dcd8be55
Merge pull request #3159 from annando/bugfix-diaspora-relay
...
Bugfix: Only accept postings from anyone when the relay is configured
2017-02-11 08:58:38 +01:00
Michael
40390cc5ec
Diaspora Relay: Only accept postings from anyone when the relay is configured
2017-02-10 20:45:22 +00:00
rabuzarus
3474b40732
fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts
2017-02-10 03:51:01 +01:00
Michael
9c4a53e380
Optimized query for nodeinfo, better way to analyze posting problems with DFRN
2017-02-04 16:16:15 +00:00