56ac7e969f
Update README.rst
2016-09-08 14:58:37 +02:00
91336605db
Merge pull request #346 from ChristianLJ/patch-2
...
Update da_DK.lang.php
2016-08-31 13:17:06 -04:00
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
58cb3a6adf
Merge pull request #345 from ChristianLJ/patch-1
...
Update da_DK.lang.php
2016-08-31 10:40:52 -04:00
a07fb41728
Update da_DK.lang.php
2016-08-31 15:36:19 +02:00
cf41316998
Merge pull request #339 from Aestu/composer-bug-dev
...
Replacing composer.phar, wrong signature
2016-08-21 10:17:36 -04:00
003d4ca47a
Replacing composer.phar, wrong signature
2016-08-17 01:14:31 +02:00
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
f229d18f2f
Minor addition to HTTPS check (where it doesn't use the standard port)
2016-07-07 01:26:35 +10:00
3dda7d6ad8
Merge pull request #331 from victormacko/develop
...
Added ClickSend as another SMS gateway
2016-07-06 10:32:01 -04: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
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
Quentin Varquet