github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity
538 Commits
3 Branches
25 Tags
13 MiB
Commit Graph

538 Commits (80df5b773527d200fa35cdb29a4c800cc63ebcec)

Author SHA1 Message Date
尘缘 80df5b7735 use ajax to auto refresh server status page 2016-10-10 20:11:59 +08:00
Samuel Denis-D'Ortun d91c544128 Merge pull request #361 from nutsteam/develop 
finish chinese language package translation
 2016-10-09 10:51:14 -04:00
Samuel Denis-D'Ortun 9a271e06a1 Merge pull request #362 from egogo-nl/develop 
Bugfix: Message needs to be encoded before sending to receive correct…
 2016-10-09 10:50:45 -04:00
Egogo Websolutions 5e0b2ac00b Bugfix: Message needs to be encoded before sending to receive correct SMS message 2016-10-09 14:49:09 +02:00
尘缘 1ac303af8c finish chinese language package translation 2016-10-09 17:38:48 +08:00
尘缘 0b68d4fb89 finish chinese language package translation 2016-10-09 16:06:25 +08:00
尘缘 fac784641a 优化中文语言包 2016-10-09 13:39:42 +08:00
Samuel Denis-D'Ortun 42c6c1c15c Merge pull request #360 from bzuro/develop 
Added Slovak translation
 2016-09-30 11:30:53 -04:00
Peter Misura 66ddbdcf1b Small fixes in Czech translation 2016-09-30 17:23:50 +02:00
Peter Misura ea22e36007 Add Slovak translation 2016-09-30 17:23:19 +02:00
Samuel Denis-D'Ortun 68c087025d Merge pull request #353 from MyTheValentinus/patch-1 
Add free mobile in README
 2016-09-11 14:38:47 -04:00
Valentin Deville 1d39f18e0d Add free mobile in README 2016-09-11 20:30:21 +02:00
Samuel Denis-D'Ortun 91336605db Merge pull request #346 from ChristianLJ/patch-2 
Update da_DK.lang.php
 2016-08-31 13:17:06 -04:00
Christian Leicht Jørgensen ff0f6f4cda Update da_DK.lang.php 
Translated the last missing strings and corrected a bunch of errors.
 2016-08-31 18:44:09 +02:00
Samuel Denis-D'Ortun 58cb3a6adf Merge pull request #345 from ChristianLJ/patch-1 
Update da_DK.lang.php
 2016-08-31 10:40:52 -04:00
Christian Leicht Jørgensen a07fb41728 Update da_DK.lang.php 2016-08-31 15:36:19 +02:00
Samuel Denis-D'Ortun cf41316998 Merge pull request #339 from Aestu/composer-bug-dev 
Replacing composer.phar, wrong signature
 2016-08-21 10:17:36 -04:00
Alfredo Esteban 003d4ca47a Replacing composer.phar, wrong signature 2016-08-17 01:14:31 +02:00
Samuel Denis-D'Ortun 4e86794aff Merge pull request #332 from victormacko/develop 
Minor addition to HTTPS check (where it doesn't use the standard port)
 2016-07-06 12:36:53 -04:00
Victor Macko f229d18f2f Minor addition to HTTPS check (where it doesn't use the standard port) 2016-07-07 01:26:35 +10:00
Samuel Denis-D'Ortun 3dda7d6ad8 Merge pull request #331 from victormacko/develop 
Added ClickSend as another SMS gateway
 2016-07-06 10:32:01 -04:00
Victor Macko 62acb604c6 Removed duplicate file 2016-07-07 00:21:26 +10:00
Victor Macko 3a1e8522a3 Added ClickSend SMS provider 2016-07-07 00:09:57 +10:00
Victor Macko dc132831d4 Merge branch 'develop' of github.com:phpservermon/phpservermon 
Conflicts:
	src/includes/functions.inc.php
	src/lang/en_US.lang.php
	src/psm/Module/Config/Controller/ConfigController.class.php
	src/psm/Util/Server/Updater/StatusUpdater.php
	src/templates/config/config.tpl.html
 2016-07-06 22:43:10 +10:00
Victor Macko 8e2698f4ce Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/lang/en_US.lang.php
#	src/psm/Txtmsg/Smsglobal.class.php
#	src/psm/Util/Updater/StatusNotifier.class.php
 2016-07-06 22:37:50 +10:00
Samuel Denis-D'Ortun e6bc31681d Merge pull request #330 from MyTheValentinus/develop 
Add FreeMobile SMS
 2016-07-04 19:01:56 -04:00
Valentin Deville d9557b4115
Add FreeMobile SMS 2016-07-04 14:31:42 +02:00
Samuel Denis-D'Ortun ff37adcc60 Merge pull request #321 from Laupe/upstream 
Fix Issue #318
 2016-06-16 18:58:40 -04:00
Pavel Dvořák dc5b7a0cfc Fix Issue #318 - delete class types, typeWebsite in warning_threshold 2016-06-17 00:52:10 +02:00
Samuel Denis-D'Ortun f7f8f0d000 Merge pull request #311 from shaundma/develop 
Initial Commit
 2016-05-29 11:14:39 -04:00
shaundma f4037d2aaa Initial Commit 2016-05-27 19:09:42 +02:00
Samuel Denis-D'Ortun 54dd7124ab Merge pull request #310 from phpservermon/sadortun-patch-1 
Update install.rst
 2016-05-27 00:06:21 -04:00
Samuel Denis-D'Ortun a615303db1 Update install.rst 2016-05-27 00:05:18 -04:00
Samuel Denis-D'Ortun 945226eb16 Update install.rst 2016-05-27 00:01:45 -04:00
Samuel Denis-D'Ortun 67c2b273f6 Merge pull request #309 from TimZ99/patch-2 
Add explanation how to make the cronjob on cPanel
 2016-05-26 23:59:28 -04:00
Samuel Denis-D'Ortun 90a961613f Merge pull request #308 from TimZ99/patch-1 
Changed some wrong or not translated things
 2016-05-26 23:52:57 -04:00
Tim 02e24c53ef Add explanation how to make the cronjob on cPanel 2016-05-26 19:50:37 +02:00
Tim 5a85eeff36 Changed some wrong translations 2016-05-26 19:01:33 +02:00
Samuel Denis-D'Ortun 10d2f3aeed Merge pull request #307 from lploi91/patch-1 
Create vi_VN.lang.php
 2016-05-26 01:09:15 -04:00
lploi91 aee4eb0306 Create vi_VN.lang.php 2016-05-22 15:33:01 +07:00
Samuel Denis-D'Ortun 1d02955a39 Merge pull request #300 from phpservermon/master 
Merge pull request #299 from phpservermon/develop
 2016-05-21 20:48:05 -04:00
Samuel Denis-D'Ortun a654a8d44e Merge branch 'develop' of https://github.com/phpservermon/phpservermon into develop 2016-05-21 20:35:09 -04:00
Samuel Denis-D'Ortun dcd552517b Merge branch 'davyrolink-201410_log-users' into develop 2016-05-21 20:34:16 -04:00
Samuel Denis-D'Ortun 953a7ddf57 Mute error when fsockopen fail to connect to host 2016-05-21 20:34:03 -04:00
Samuel Denis-D'Ortun c811876c89 Merge branch '201410_log-users' of https://github.com/davyrolink/phpservermon into davyrolink-201410_log-users 
# Conflicts:
#	src/includes/psmconfig.inc.php
#	src/psm/Util/Install/Installer.php
 2016-05-21 20:33:31 -04:00
Samuel Denis-D'Ortun 0780fdef3a Merge pull request #299 from phpservermon/develop 
Authentication for website checks
 2016-05-21 20:13:46 -04:00
Samuel Denis-D'Ortun eb235e60ca Update CHANGELOG.rst 2016-05-21 20:12:29 -04:00
Pavel Dvořák 24d7fee63e Use salt to encrypt the website check password #297 2016-05-21 19:55:35 -04:00
Samuel Denis-D'Ortun 4d480fe2c3 Update server title font size Closes #272 2016-05-21 17:43:07 -04:00
Samuel Denis-D'Ortun 678537cee5 Merge branch 'develop' of https://github.com/phpservermon/phpservermon into develop 2016-05-21 16:56:22 -04:00