Commit Graph

20 Commits

Author SHA1 Message Date
Samuel Denis-D'Ortun bbb9284689 Update README.rst 2016-05-18 23:38:42 -04:00
Samuel Denis-D'Ortun fb131b843a Bump version 3.2.0 2016-05-18 23:31:40 -04:00
Samuel Denis-D'Ortun 9aadc6b8a8 Merge branch 'develop' of https://github.com/phpservermon/phpservermon into develop 2016-05-15 05:16:54 -04:00
Samuel Denis-D'Ortun bceb6ea3db Merge branch 'develop' of https://github.com/TechReanimate/phpservermon into TechReanimate-develop
# Conflicts:
#	README.rst
#	docs/credits.rst
#	docs/intro.rst
#	src/includes/functions.inc.php
#	src/lang/de_DE.lang.php
#	src/lang/en_US.lang.php
#	src/lang/es_ES.lang.php
#	src/lang/fr_FR.lang.php
#	src/lang/it_IT.lang.php
#	src/lang/nl_NL.lang.php
#	src/lang/pl_PL.lang.php
#	src/lang/pt_BR.lang.php
#	src/lang/ru_RU.lang.php
#	src/lang/sv_SE.lang.php
#	src/lang/tr_TR.lang.php
#	src/lang/zh_CN.lang.php
2016-05-15 05:15:32 -04:00
Samuel Denis-D'Ortun 2b8fae9416 Fix #268 2016-05-15 05:00:49 -04:00
Samuel Denis-D'Ortun 9111e502c0 Merge commit '62ba2d7ae8325937bea0e62ad638120b8ea64af9' into develop 2016-04-29 12:55:46 -04:00
Samuel Denis-D'Ortun 62ba2d7ae8 Update README.rst 2016-04-29 12:46:25 -04:00
Luis Rodriguez 6a2a4c1898 Implement Nexmo SMS Issue #170 2015-02-28 21:05:18 -05:00
Michiel van der Wulp 419ba4a0cf added freevoipdeal support 2014-12-11 13:16:06 +01:00
Pepijn Over 93ddf5139b Adding Vagrantfile w/ puphpet configuration for easy development 2014-12-05 15:05:52 +01:00
Pepijn Over 4b2c83588a bumping version to 3.1.1 2014-11-06 14:40:39 +01:00
Pepijn Over 27be6360a3 bumping version to 3.1.0 2014-08-07 14:25:16 +02:00
Pepijn Over 8f08c946be docs update for pushover and new languages 2014-07-31 16:30:02 +02:00
Pepijn Over 625500495f Merge branch 'develop' of https://github.com/nerdalertdk/phpservermon into nerdalertdk-develop
Conflicts:
	src/psm/Module/Config/Controller/ConfigController.class.php
	src/psm/Util/Updater/StatusNotifier.class.php
2014-04-25 07:12:49 +02:00
Pepijn Over b4a7ab3ba7 issue #55: adding xhr functionality to controllers 2014-04-24 23:50:47 +02:00
Michael 091b6a3a9f Added smsit.dk 2014-04-24 09:56:00 +02:00
Pepijn Over 52c0c93a0f restoring develop version to 3.1.0-dev 2014-04-12 14:09:27 +02:00
Pepijn Over e55d6acf04 changing release version to 3.0.1;
removng makefile from export
2014-04-12 13:52:59 +02:00
Pepijn Over 72507a7d94 removing docs indentation (markdown > resT..) 2014-04-10 20:08:46 +02:00
Pepijn Over 52923336f3 changing markdown to rst; updating docs; adding docs build dir to gitignore; adding docs to release export 2014-04-10 19:57:36 +02:00