shuhai
fff4da8f45
Improve chinese translation
2017-03-12 09:54:30 +08:00
shuhai
2c5fe21cbb
Merge branch 'develop' of https://github.com/phpservermon/phpservermon into develop
2017-03-10 16:30:23 +08:00
shuhai
9d12311ab2
Merge branch 'master' of https://github.com/phpservermon/phpservermon into develop
2017-03-10 16:28:58 +08:00
Samuel Denis-D'Ortun
5e87972387
Merge pull request #417 from jonasdkhansen/develop
...
Changed mysql pdo port empty check, to fix problem with mysql cant co…
2017-02-08 11:20:57 -05:00
Jonas Hansen
fed9cec88b
Changed mysql pdo port empty check, to fix problem with mysql cant connect, when using custom port
2017-02-08 15:59:23 +01:00
Samuel Denis-D'Ortun
fb1772dd66
Merge pull request #407 from elreverente/patch-1
...
Update fr_FR.lang.php
2017-01-20 06:58:36 -05:00
Guillaume
b7c24742bf
Update fr_FR.lang.php
...
Typo in login / remember_me
2017-01-20 11:32:38 +01:00
Samuel Denis-D'Ortun
f66c3453b1
Fix #406
2017-01-19 16:32:07 -05:00
Samuel Denis-D'Ortun
ca30284726
Merge pull request #404 from sandybeachit/patch-1
...
removed additional w from "dowwn"
2017-01-18 16:50:35 -05:00
sandybeachit
fc2a18fa22
removed additional w from "dowwn"
...
removed additional w from "dowwn"
2017-01-18 21:19:30 +00:00
Samuel Denis-D'Ortun
fd0e698253
Merge pull request #376 from invartam/develop
...
Base URL configuration
2017-01-13 03:08:21 -05:00
Samuel Denis-D'Ortun
c49e37be49
Merge pull request #358 from pieter-groeneweg/patch-1
...
update status.cron.php with added allowed IP check. Issue #215
2017-01-13 03:04:55 -05:00
Samuel Denis-D'Ortun
5b4525102a
Update composer.json
2017-01-13 03:01:15 -05:00
Samuel Denis-D'Ortun
e8857f809b
Merge pull request #348 from Aestu/use_proxy-develop-2
...
Add global proxy support
2017-01-13 02:57:56 -05:00
invartam
5a7e0e0bc4
Merge branch 'develop' into develop
2017-01-07 03:14:33 +01:00
Samuel Denis-D'Ortun
b3e920250e
Merge pull request #394 from criwe/develop
...
Basic pagespeedsettings + meta noindex + removed meta autor
2016-12-25 23:28:30 -05:00
criwe
b0add8c210
Added some basic pagespeed settings
...
Added some basic pagespeed settings to the htaccess
2016-12-25 23:00:49 +01:00
criwe
479f2119f6
add <meta name="robots" content="noindex" />
...
A monitoring website should not be indexed by google. <meta name="robots" content="noindex" /> will prevent that.
Removed autor-tag, because not relevant anymore (especially for a page like that)
2016-12-25 22:44:44 +01:00
Samuel Denis-D'Ortun
34c07f7d46
Merge pull request #393 from tomhatzer/develop
...
Add custom mysql port support
2016-12-23 09:49:24 -05:00
Tom Hatzer
6805903089
Remove trailing comma
2016-12-23 15:42:15 +01:00
Tom Hatzer
b1df28d4d9
Add port to installer
2016-12-23 15:41:03 +01:00
Tom Hatzer
b780a6237e
Add port input fields to template
2016-12-23 15:38:50 +01:00
Tom Hatzer
cd977e2e51
Initialize protected variable db_port with value 3306
2016-12-23 15:30:39 +01:00
Tom Hatzer
b2043b1b65
Add protected variable $db_port
2016-12-23 15:28:25 +01:00
Tom Hatzer
a9f11fb691
Add port constant to install readme
2016-12-23 15:24:25 +01:00
Tom Hatzer
a3853241f8
Add port param and argument
2016-12-23 15:23:31 +01:00
Tom Hatzer
4a69f606d3
Add port constant to psminstall
2016-12-23 15:22:24 +01:00
Tom Hatzer
80a092fa0c
Add port static to config file
2016-12-23 15:20:46 +01:00
Tom Hatzer
ff1013ed7c
Add custom port to config options in db class
2016-12-23 15:20:02 +01:00
Samuel Denis-D'Ortun
e120e8c636
Merge pull request #392 from tomhatzer/develop
...
Add ping to enum for type column in servers database table
2016-12-23 08:34:03 -05:00
Tom Hatzer
6bee28c78e
Add ping to enum for type column in servers database table
2016-12-23 14:29:57 +01:00
Samuel Denis-D'Ortun
3118fdbdbc
Merge pull request #391 from tomhatzer/develop
...
Add type ping to lang file
2016-12-23 08:19:57 -05:00
Tom Hatzer
3c961c8b91
Add type ping to lang file
2016-12-23 14:13:11 +01:00
Samuel Denis-D'Ortun
5836e27659
Merge pull request #390 from tomhatzer/develop
...
Add RDP (port 3389) support
2016-12-23 08:09:26 -05:00
Tom Hatzer
8ee269ceaa
Add type_ping to lang file
2016-12-23 11:45:27 +01:00
Tom Hatzer
b6060e7936
Add ping label to getLabels()
2016-12-23 11:44:15 +01:00
Tom Hatzer
5c0e889dd2
Add ping validation checks to ServerValidator
2016-12-23 11:38:47 +01:00
Tom Hatzer
3cd90b29ae
Add server type ping to dropdown
2016-12-23 11:33:55 +01:00
Tom Hatzer
363f67b335
Add copyright notice to updatePing method
2016-12-23 11:30:27 +01:00
Tom Hatzer
4c7d2bd4f3
Add updatePing method to check if ip is pingable
2016-12-23 11:29:28 +01:00
Tom Hatzer
2325a6c25f
Add RDP to port list
2016-12-23 11:14:30 +01:00
Tom Hatzer
92069a29a3
Add RDP port to save method
2016-12-23 11:12:07 +01:00
Samuel Denis-D'Ortun
eadc9b145e
Update README.rst
2016-11-15 13:08:21 -05:00
Benjy
f19dc454ee
Add base URL configuration field in installer and in sample configuration file
2016-11-05 19:10:28 +01:00
Samuel Denis-D'Ortun
74efd243c5
Merge pull request #375 from daif/develop
...
Support for SMSgw provider http://smsgw.net
2016-11-01 18:13:45 -04:00
Daif Alotaibi
d712bb7100
Support for SMSgw provider http://smsgw.net
2016-11-02 00:40:05 +03:00
Samuel Denis-D'Ortun
c981fe5daf
Merge pull request #351 from Quentinvarquet/develop
...
Update README.rst
2016-10-24 20:48:30 -04:00
Samuel Denis-D'Ortun
fd64fe1ef2
Update README.rst
2016-10-24 20:48:18 -04:00
Samuel Denis-D'Ortun
8ae313ebda
Merge pull request #369 from nutsteam/ajax_auto_refresh
...
#367 fixed a csrf bug since 2014
2016-10-24 20:45:29 -04:00
Samuel Denis-D'Ortun
a6d012f66a
Merge pull request #371 from micschk/patch-2
...
Update Mollie.php with new URL
2016-10-21 10:42:06 -04:00