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
Michael van Schaik
43645bf36f
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
尘缘
fe99c1cbec
#367 fixed a csrf bug since 2014
2016-10-19 11:05:26 +08:00
Samuel Denis-D'Ortun
c4551ab59e
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
Samuel Denis-D'Ortun
3f255f7461
Merge pull request #364 from nutsteam/urlport
...
format port from http/s url
2016-10-10 12:02:41 -04:00
尘缘
80df5b7735
use ajax to auto refresh server status page
2016-10-10 20:11:59 +08:00
尘缘
0be9f3a09c
use ajax to auto refresh server status page
2016-10-10 19:58:23 +08:00
尘缘
a586425c65
format port from http/s url
2016-10-10 17:22:28 +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
pieter-groeneweg
0be8e40c50
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
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
Quentin Varquet
56ac7e969f
Update README.rst
2016-09-08 14:58:37 +02:00
Alfredo Esteban
7b3f792f76
Add global proxy support
2016-09-01 17:40:18 +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
Samuel Denis-D'Ortun
77fac34c54
Merge pull request #340 from Aestu/composer-bug-master
...
Replacing composer.phar, wrong signature
2016-08-21 10:17:26 -04:00
Alfredo Esteban
ad50e135e1
Replacing composer.phar, wrong signature
2016-08-17 01:17:02 +02: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