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
e6bc31681d
Merge pull request #330 from MyTheValentinus/develop
...
Add FreeMobile SMS
2016-07-04 19:01:56 -04: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
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
945226eb16
Update install.rst
2016-05-27 00:01:45 -04:00
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
90a961613f
Merge pull request #308 from TimZ99/patch-1
...
Changed some wrong or not translated things
2016-05-26 23:52:57 -04:00
02e24c53ef
Add explanation how to make the cronjob on cPanel
2016-05-26 19:50:37 +02:00
5a85eeff36
Changed some wrong translations
2016-05-26 19:01:33 +02:00
10d2f3aeed
Merge pull request #307 from lploi91/patch-1
...
Create vi_VN.lang.php
2016-05-26 01:09:15 -04:00
aee4eb0306
Create vi_VN.lang.php
2016-05-22 15:33:01 +07:00
1d02955a39
Merge pull request #300 from phpservermon/master
...
Merge pull request #299 from phpservermon/develop
2016-05-21 20:48:05 -04:00
a654a8d44e
Merge branch 'develop' of https://github.com/phpservermon/phpservermon into develop
2016-05-21 20:35:09 -04: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
0780fdef3a
Merge pull request #299 from phpservermon/develop
...
Authentication for website checks
2016-05-21 20:13:46 -04:00
eb235e60ca
Update CHANGELOG.rst
2016-05-21 20:12:29 -04:00
24d7fee63e
Use salt to encrypt the website check password #297
2016-05-21 19:55:35 -04:00
4d480fe2c3
Update server title font size Closes #272
2016-05-21 17:43:07 -04:00
678537cee5
Merge branch 'develop' of https://github.com/phpservermon/phpservermon into develop
2016-05-21 16:56:22 -04:00
9ded89b6a5
Improve password security by obfuscating it in the form #96
2016-05-21 16:55:12 -04:00
736b713a70
Merge branch 'upstream' of https://github.com/Laupe/phpservermon into Laupe-upstream
2016-05-21 12:16:27 -04:00
36b5229fcd
Issue #96 Authentication fields for website/services
...
- Installer.php - Fixed install method
2016-05-21 18:11:57 +02:00
fffdc7f022
Merge branch 'upstream' of https://github.com/Laupe/phpservermon into Laupe-upstream
2016-05-21 11:58:33 -04: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
8cbc93fc9e
Merge pull request #291 from elbakai/develop
...
Disable directory Listing
2016-05-19 16:32:30 -04:00
3af2b23518
Update .gitattributes
2016-05-19 01:22:07 -04:00
bbb9284689
Update README.rst
2016-05-18 23:38:42 -04: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
9aadc6b8a8
Merge branch 'develop' of https://github.com/phpservermon/phpservermon into develop
2016-05-15 05:16:54 -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
2b8fae9416
Fix #268
2016-05-15 05:00:49 -04:00
6af6e4b459
Merge branch 'Laupe-develop' into develop
2016-05-15 04:36:01 -04:00
421a67abaa
Do not force EOL for non-text files
2016-05-15 04:35:27 -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
4e954e594d
Merge pull request #280 from Abawell/develop
...
Fix regression
2016-04-30 19:15:05 -04:00
Victor Macko