5f214db2f2
Merge pull request #375 from daif/develop
...
Support for SMSgw provider http://smsgw.net
2016-11-01 18:13:45 -04:00
294e9e7adf
Support for SMSgw provider http://smsgw.net
2016-11-02 00:40:05 +03:00
eb839eb304
Merge pull request #351 from Quentinvarquet/develop
...
Update README.rst
2016-10-24 20:48:30 -04:00
15eabe1944
Update README.rst
2016-10-24 20:48:18 -04:00
9b0bd4c328
Merge pull request #369 from nutsteam/ajax_auto_refresh
...
#367 fixed a csrf bug since 2014
2016-10-24 20:45:29 -04:00
8f45d7c9f3
Merge pull request #371 from micschk/patch-2
...
Update Mollie.php with new URL
2016-10-21 10:42:06 -04:00
4abe0bdf4c
Update Mollie.php with new URL ( Fixes #370 )
...
Mollie has changed their SMS api to api.messagebird.com
They have been redirecting calls to www.mollie.com but will stop doing so from oct 24 2016
The API hasn't changed, this configuration is tested & working
2016-10-21 05:47:33 +02:00
489edc933f
#367 fixed a csrf bug since 2014
2016-10-19 11:05:26 +08:00
8e7339efbd
Merge pull request #365 from nutsteam/ajax_auto_refresh
...
use ajax to auto refresh server status page
2016-10-10 23:01:50 -04:00
491293792a
Merge pull request #364 from nutsteam/urlport
...
format port from http/s url
2016-10-10 12:02:41 -04:00
6ca9fa9ec9
use ajax to auto refresh server status page
2016-10-10 20:11:59 +08:00
ab35ee9170
use ajax to auto refresh server status page
2016-10-10 19:58:23 +08:00
9b8eb75fbe
format port from http/s url
2016-10-10 17:22:28 +08:00
c2320ec638
Merge pull request #361 from nutsteam/develop
...
finish chinese language package translation
2016-10-09 10:51:14 -04:00
9c93b14606
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
c42f9c06c4
Bugfix: Message needs to be encoded before sending to receive correct SMS message
2016-10-09 14:49:09 +02:00
a075535cf0
finish chinese language package translation
2016-10-09 17:38:48 +08:00
1e85228ff1
finish chinese language package translation
2016-10-09 16:06:25 +08:00
44ac734570
优化中文语言包
2016-10-09 13:39:42 +08:00
02bea5c1fc
Merge pull request #360 from bzuro/develop
...
Added Slovak translation
2016-09-30 11:30:53 -04:00
2b4ae0eb36
Small fixes in Czech translation
2016-09-30 17:23:50 +02:00
f8694aba91
Add Slovak translation
2016-09-30 17:23:19 +02:00
940a7152f4
update status.cron.php with added allowed IP check.
...
to allow scheduled status updates over the web the commandline check is extended with a check on allowed IP address(es).
In config.php add following line:
define('PSM_CRON_ALLOW', array("xxx.xxx.xxx.xxx", "yyy.yyy.yyy.yyy"))
Where the xxx's and yyy's represent the IP addresses of course
2016-09-20 13:37:58 +02:00
5968ef81b9
Merge pull request #353 from MyTheValentinus/patch-1
...
Add free mobile in README
2016-09-11 14:38:47 -04:00
332bf1ccd4
Add free mobile in README
2016-09-11 20:30:21 +02:00
0d8895b478
Update README.rst
2016-09-08 14:58:37 +02:00
5e7a5951a7
Add global proxy support
2016-09-01 17:40:18 +02:00
c1bd0c8581
Merge pull request #346 from ChristianLJ/patch-2
...
Update da_DK.lang.php
2016-08-31 13:17:06 -04:00
b1d4663b7d
Update da_DK.lang.php
...
Translated the last missing strings and corrected a bunch of errors.
2016-08-31 18:44:09 +02:00
9bf2a3ec89
Merge pull request #345 from ChristianLJ/patch-1
...
Update da_DK.lang.php
2016-08-31 10:40:52 -04:00
9bfa511635
Update da_DK.lang.php
2016-08-31 15:36:19 +02:00
6e0067ce95
Merge pull request #339 from Aestu/composer-bug-dev
...
Replacing composer.phar, wrong signature
2016-08-21 10:17:36 -04:00
77fac34c54
Merge pull request #340 from Aestu/composer-bug-master
...
Replacing composer.phar, wrong signature
2016-08-21 10:17:26 -04:00
ad50e135e1
Replacing composer.phar, wrong signature
2016-08-17 01:17:02 +02:00
27d24b6459
Replacing composer.phar, wrong signature
2016-08-17 01:14:31 +02:00
bb89c1094e
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
f78d04c409
Minor addition to HTTPS check (where it doesn't use the standard port)
2016-07-07 01:26:35 +10:00
1a49db3654
Merge pull request #331 from victormacko/develop
...
Added ClickSend as another SMS gateway
2016-07-06 10:32:01 -04:00
5f1dac32c6
Removed duplicate file
2016-07-07 00:21:26 +10:00
c0843ff53c
Added ClickSend SMS provider
2016-07-07 00:09:57 +10:00
b0c6684212
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
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
7e6f8f04d3
Merge pull request #330 from MyTheValentinus/develop
...
Add FreeMobile SMS
2016-07-04 19:01:56 -04:00
f4ea91a6c8
Add FreeMobile SMS
2016-07-04 14:31:42 +02:00
ff37adcc60
Merge pull request #321 from Laupe/upstream
...
Fix Issue #318
2016-06-16 18:58:40 -04:00
dc5b7a0cfc
Fix Issue #318 - delete class types, typeWebsite in warning_threshold
2016-06-17 00:52:10 +02:00
f7f8f0d000
Merge pull request #311 from shaundma/develop
...
Initial Commit
2016-05-29 11:14:39 -04:00
f4037d2aaa
Initial Commit
2016-05-27 19:09:42 +02:00
54dd7124ab
Merge pull request #310 from phpservermon/sadortun-patch-1
...
Update install.rst
2016-05-27 00:06:21 -04:00
a615303db1
Update install.rst
2016-05-27 00:05:18 -04:00
Samuel Denis-D'Ortun