1
0
Fork 0
Commit graph

204 commits

Author SHA1 Message Date
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04: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
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
41ee4ec60a Standards and just some more poco slitting 2017-03-19 21:32:11 +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
132688d663 Standards, what else? 2017-03-19 08:04:04 +00: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
e301fa0832 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 2017-03-18 08:31:43 +00:00
24a57020b9 Better version transformation for nodeinfo and statistics.json 2017-03-16 21:34:53 +00:00
6a16565642 Merge remote-tracking branch 'upstream/develop' into 1701-poco 2017-03-13 07:23:32 +00:00
44888590e5 One error, one documentation, one brace 2017-03-13 06:32:33 +00:00
97d3176754 Querying via nodeinfo 2017-03-13 00:03:27 +00:00
1624150db4 Merge remote-tracking branch 'upstream/develop' into 1702-null-date
Conflicts:
	include/onepoll.php
2017-03-12 20:54:28 +00:00
18d23ca443 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-12 20:49:48 +00:00
1bf089e424 Merge pull request #3216 from annando/1701-performance
Better network handling, improved structure
2017-03-12 15:40:56 +01:00
bfad58a777 We don't need to show the id. 2017-03-12 09:41:10 +00:00
3a3fa017a6 Discovery of new servers 2017-03-12 09:13:04 +00:00
32f1b2de20 Forgotten debug output 2017-03-08 13:15:24 +00:00
d898616f8d Remove junk from the version number 2017-03-08 05:40:57 +00:00
f7f23038db Merge remote-tracking branch 'upstream/develop' into 1701-performance 2017-03-07 21:24:20 +00:00
9a71472be6 Only store a new gserver entry if it is a valid one 2017-03-04 14:32:40 +00:00
953477de87 Improved check for the server base url 2017-03-04 13:30:34 +00:00
b42167f0ac We can now return a list of known servers 2017-03-04 11:04:00 +00:00
25e6244950 BlaBlaNet is now detected again. No false positive for Statusnet anymore 2017-03-04 07:57:55 +00:00
9965061359 Better detection for Hubzilla 2017-03-02 21:20:33 +00:00
324d8bfe8e Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server 2017-03-02 20:20:38 +00:00
60adf67f13 Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-null-date 2017-02-28 06:50:46 +00:00
c829dc8e71 The service at gstools.org doesn't exist anymore. 2017-02-28 06:26:50 +00:00
0afb0c2ea4 NULL_DATE is now a constant 2017-02-27 23:37:15 +00:00
2a8a5a6d88 Improved server vitality detection 2017-02-26 18:19:20 +00:00
ffeae7e048 Bugfix for bugfix :-) 2017-02-23 05:45:06 +00:00
c84565633e Added check for invalid "contact-type" 2017-02-22 22:25:35 +00:00
194d80c326 Bugfix for badly formatted date time string. 2017-02-22 22:04:56 +00:00
f5a634abbc Changed server detection. 2017-02-10 19:23:46 +00:00
7a89d06465 Make sure that we only quit when we are sure we can 2017-02-01 08:43:18 +00:00
7324a661f1 Optimized timeouts during network operations 2017-02-01 00:15:37 +00:00
2a77e426f9 Split poco discovery in smaller function calls 2017-01-27 17:00:34 +00:00
021a4fad71 Some more database stuff 2017-01-15 12:36:06 +00:00
d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:33:41 +01:00
f8a213e23b
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:49:36 +01:00
rabuzarus
e95337e9ae correct doxygen @todo 2016-12-23 18:31:42 +01:00
de689583e2 added more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
2016-12-20 17:58:34 +01:00
4b221d216e added more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 17:57:40 +01:00
fc9dbc0899 added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:28 +01:00
5588472f6d added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:16 +01:00
f3529e7dbc added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:27 +01:00
c86f09a894 added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:03 +01:00
a9bed1422e added more curyl braces + spaces between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:44:59 +01:00