f229d18f2f
Minor addition to HTTPS check (where it doesn't use the standard port)
2016-07-07 01:26:35 +10:00
62acb604c6
Removed duplicate file
2016-07-07 00:21:26 +10:00
3a1e8522a3
Added ClickSend SMS provider
2016-07-07 00:09:57 +10:00
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
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
d9557b4115
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
f4037d2aaa
Initial Commit
2016-05-27 19:09:42 +02:00
5a85eeff36
Changed some wrong translations
2016-05-26 19:01:33 +02:00
aee4eb0306
Create vi_VN.lang.php
2016-05-22 15:33:01 +07:00
dcd552517b
Merge branch 'davyrolink-201410_log-users' into develop
2016-05-21 20:34:16 -04:00
953a7ddf57
Mute error when fsockopen fail to connect to host
2016-05-21 20:34:03 -04:00
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
24d7fee63e
Use salt to encrypt the website check password #297
2016-05-21 19:55:35 -04:00
9ded89b6a5
Improve password security by obfuscating it in the form #96
2016-05-21 16:55:12 -04:00
36b5229fcd
Issue #96 Authentication fields for website/services
...
- Installer.php - Fixed install method
2016-05-21 18:11:57 +02:00
340660da4b
Issue #96 Authentication fields for website/services
...
- File functions.inc.php - modified and added features psm_curl_get parameters for website_username and website_password
- File functions.inc.php - new features and psm_password_encrypt psm_password_decrypt to encrypt and decrypt passwords
- Adjusted basic language EN and supplemented by new language CZ phrase
- ConfigController.php - adjusted executeIndex method of password encryption key for each installation separately + executeSave method of saving the settings + added labels to methods getLabels
- AbstractServerController.php - adjusted method getServers a login password of the name
- ServerController.php - adjusted executeEdit method for storing information about name and password + executeSave method of storage in a database + method getLabels on labels
- Installer.php - adjusted method install a new configuration values for the encryption key passwords + method installTables a new table structure servers + method upgrade320 the new structure
- StatusUpdater.php - adjusted method update the transmission website_username and website_password + method updateWebsite adjusted parameters passed to the function psm_curl_get
- Modified template: config/config.tpl.html, server/update.tpl.html, view.tpl.html
- Adapted javascript scripts.js
2016-05-21 17:08:01 +02:00
fb131b843a
Bump version 3.2.0
2016-05-18 23:31:40 -04:00
aac195e893
Merge branch 'master' into develop
2016-05-18 23:14:56 -04:00
5fc59454d0
Issue #286 Popular Ports
...
- scripts.js - selection and filling port based on a selection from the popular port
- update.tpl.html - Added section with a selection of popular ports
- ServerController.php - Methods to getLabels added new label
- en_US.lang.php + cs_CZ.lang.php - modified the language of the new texts
2016-05-18 23:04:50 -04:00
2d460abbf8
Issue #287 - Added to the default English language
...
- Modified file functions.inc.php - because if you add new language variable so it is necessary to immediately translate all languages or all files added to the English translation of which is very inconvenient and time consuming.
- Function psm_load_lang - loading the default language that I chose English and stored in the $ GLOBALS [ 'sm_lang_default'] for further use.
- Function psm_get_lang - edited selection of translation. If there is no translation in the language you chose the user returns to the default language.
2016-05-18 23:04:50 -04:00
cbfd60871e
Allow empty db password
2016-05-18 22:48:09 -04:00
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
f01c39695d
update language Czech (cs_CZ)
2016-05-14 08:43:10 +02:00
22112777d1
Issue #269 update language Slovenian (sl_SI)
2016-05-14 08:42:33 +02:00
d7140c9b2a
Issue #269 new language Slovenian (sl_SI)
2016-05-13 23:34:08 +02:00
e5db728634
Editing and updating of the Czech language
2016-05-13 23:22:30 +02:00
73f77218fd
Merge pull request #258 from prathers/develop
...
Update da_DK.lang.php
2016-04-30 18:18:38 -04:00
7cf13e5b8a
Case insensitive check
2016-03-30 12:25:40 +11:00
b77ffc95c3
Also use string comparison
2016-03-24 07:35:06 +11:00
87a576642c
ajout mode premium
2016-03-15 15:11:52 +01:00
57a01d27c5
add support for Octopush sms provider
2016-03-15 13:00:07 +01:00
9bda115e47
Update it_IT.lang.php
2016-03-01 11:25:40 +01:00
1c763e82ef
Update da_DK.lang.php
...
Done a few typos and translated new labels
2016-02-15 20:24:30 +01:00
a30dcf5610
adding estonian translation to changelog/credits
2016-01-31 18:08:45 +01:00
62ee04707f
Merge pull request #185 from ItsRichardRaz/patch-1
...
et_ET.lang.php
2016-01-31 18:02:04 +01:00
f46fae667b
fixes issue #202 and #203 : adding right-to-left stylesheet and html class
2016-01-31 17:58:12 +01:00
52803e2d70
adding language subtags to template and support for right-to-left locales
2016-01-31 17:48:59 +01:00
daf843df07
Merge branch 'patch-1' of git://github.com/evazzadeh/phpservermon into evazzadeh-patch-1
2016-01-31 17:09:53 +01:00
4be64dfa3a
removing csrf key from login module to prevent 401 errors on login
2016-01-31 17:07:56 +01:00
653fe4f7b8
Merge pull request #195 from Esselans/develop
...
Improved translation & UTF email output
2016-01-31 00:28:04 +01:00
98faef1b06
fixes #237 : adding CSRF token to all forms and requires now on POST
2016-01-31 00:24:37 +01:00
b2ed873b1b
on login, make sure to clear existing session vars and start from fresh (moving from migrate() to invalidate())
2016-01-31 00:17:28 +01:00
6300e8103f
Merge pull request #210 from celeroncool/develop
...
Added finnish translation and chrome mobile statusbar color
2016-01-30 21:27:05 +01:00
b1647d2c3f
Merge pull request #207 from loran750/patch-1
...
If pattern is set up, you cannot catch server problems
2016-01-30 21:13:47 +01:00
c0b4264959
Merge pull request #218 from rigonijunior/develop
...
changed the character of capitalized to tiny is the correct the ediom…
2016-01-30 21:11:51 +01:00
1cecc80845
Translation fixes for NL language
2015-10-19 14:28:29 +02:00
7035410c1e
changed the character of capitalized to tiny is the correct the edioma pt_BR
...
changed the character of capitalized to tiny is the correct the edioma pt_BR
line 152
2015-07-23 10:35:53 -03:00
a482ae5e27
Fix for issue #187 (Unable to connect to MySQL)
2015-06-17 23:15:10 +07:00
Victor Macko
Valentin Deville
Samuel Denis-D'Ortun
Pavel Dvořák
shaundma
Tim
lploi91
Alexis U (portable)
Xendorf
Preben Rather Sørensen
Pepijn Over
Southparkfan
José Rigoni Jr
Edi Septriyanto