github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity
353 Commits
3 Branches
25 Tags
13 MiB
Commit Graph

353 Commits (c10c4601c0313fda5e6d78dce6489cfcdcdbb3a6)

Author SHA1 Message Date
Luis Rodriguez c10c4601c0 ignore my project file 2014-10-18 17:17:48 -04:00
Pepijn Over e13ca5e1b6 updating changelog/credits for #132 / #134 2014-09-26 22:06:33 +02:00
Pep 9a88b830b6 Merge pull request #131 from davyrolink/201409_cli-url 
allow urls to be generated from cli, with the help of argument --uri=
 2014-09-26 21:58:05 +02:00
Pep cb5f2b5952 Merge pull request #132 from JPKCom/develop 
Full German translation
 2014-09-26 21:28:28 +02:00
Pep fe57fca39a Merge pull request #134 from Lauraly-com/develop 
French translation
 2014-09-26 21:27:39 +02:00
jerome 5eb0e69c32 French translation 2014-09-19 16:05:19 +02:00
Jean Pierre Kolb ca9f52939c Full German translation 2014-09-18 16:19:53 +02:00
Davy Rolink 7585eb23e0 allow urls to be generated from cli, with the help of argument --uri= 2014-09-12 09:05:52 +02:00
Pepijn Over ec9c07a3d7 adding issue #124 to changelog 2014-09-08 09:56:19 +02:00
Pepijn Over c54a48d668 adding issue #130 czech translation to changelog 2014-09-08 09:55:30 +02:00
Pep 1204c9a4b0 Merge pull request #124 from PVasileff/patch-9 
bg_BG.lang.php - develop update
 2014-09-08 09:52:45 +02:00
Pep d5273db51d Merge pull request #130 from berkas1/develop 
add Czech translation
 2014-09-08 09:48:34 +02:00
berkas1 8834dd6cfe add Czech translation 2014-09-05 19:29:30 +02:00
Plamen Vasilev ef49e67366 bg_BG.lang.php - develop update 
bg_BG.lang.php - develop update
 2014-08-23 23:42:15 +03:00
Pepijn Over 16906708ad Merge branch 'release-3.1.0' into develop 2014-08-07 15:04:43 +02:00
Pepijn Over 27be6360a3 bumping version to 3.1.0 2014-08-07 14:25:16 +02:00
Pepijn Over 16bba4b949 disable pushover by default on upgrade 2014-08-07 14:25:01 +02:00
Pepijn Over a896e33f3b Makefile: changing export name of archives 2014-08-07 13:48:33 +02:00
Pepijn Over 55714e4208 removing closing tag from generated config 2014-08-07 13:05:34 +02:00
Pepijn Over b25ceae4a8 minor layout changes to install page 2014-08-07 12:55:57 +02:00
Pepijn Over eeda80e17f adding catch block around LOCK TABLES to prevent warnings when user has no rights 2014-08-06 16:40:55 +02:00
Pepijn Over f954e1e47b export changes 2014-08-06 16:40:30 +02:00
Pepijn Over 1fd2fd7cb6 moving pushover device help to tooltip 2014-08-06 14:14:16 +02:00
Pepijn Over 7913fdaa8a Moving updater utils to Server subnamespace, and renaming Autorun to UpdateManager 2014-08-06 13:20:12 +02:00
Pepijn Over 1cd694a145 removing inline-block display of fieldsets (not sure why its there?) 2014-08-06 13:08:31 +02:00
Pepijn Over 71d432c973 issue #119: adding log retention period 2014-08-06 13:08:31 +02:00
jerome 5c99a4bbd3 Rewriting Archiver. Database access optimization + thread safe. 2014-08-06 13:08:31 +02:00
jerome 131ec1c7b4 Fixing dates in charts regression. 2014-08-06 13:08:31 +02:00
Pepijn Over 02d2c953a3 updating credits 2014-08-05 23:22:09 +02:00
Pepijn Over 17b5d175ff adding pushover clone button for new app 2014-08-05 15:58:44 +02:00
Pepijn Over ea585d2ac3 adding #117 to changelog 2014-08-05 15:21:59 +02:00
Pepijn Over 750513d681 adding db check to psm_load_conf in case we're on install page 2014-08-05 15:19:29 +02:00
Pepijn Over 0922823814 adding "install" shortcut to makefile for composer dependencies 2014-08-05 15:19:29 +02:00
Pepijn Over 945a09cfc3 issue #117: Replacing Template service with Twig and implementing Twig in all modules/utils 2014-08-05 15:19:17 +02:00
Pep 475bad8cec Merge pull request #116 from delysh/develop 
Russian translation revision.
 2014-08-04 21:55:26 +02:00
Yuriy Lyutov 458960addf Russian translation revision. 2014-08-02 19:28:23 +02:00
Pepijn Over a1faa6e605 fixing list in changelog 2014-08-02 00:31:43 +02:00
Pepijn Over fb0b321380 adding bootstrap multiselect for users/servers 2014-08-01 15:41:50 +02:00
Pepijn Over e60e647eb3 issue #115: add warning to server page when notifications are disabled 2014-08-01 15:04:36 +02:00
Pepijn Over f038ccbff1 new favicon (with higher res available) 2014-08-01 11:38:16 +02:00
Pepijn Over 75be122e82 updating dutch translation 2014-07-31 16:53:54 +02:00
Pepijn Over 1f1ca0c3eb disabling sms by default on new installs 2014-07-31 16:37:12 +02:00
Pepijn Over e590eb798f issue #101: fixing instasll for pushover 2014-07-31 16:35:01 +02:00
Pepijn Over 8f08c946be docs update for pushover and new languages 2014-07-31 16:30:02 +02:00
Pepijn Over 5c605ddcb2 issue #101: adding test feature for Pushover 2014-07-31 16:21:19 +02:00
Pepijn Over 4d92e9c0c1 psm_get_conf(): auto-load config if it hasnt been loaded yet 2014-07-31 16:06:20 +02:00
Pepijn Over 77e295a465 issue #101: adding pushover.net to changelog/credits 2014-07-31 14:44:54 +02:00
Pepijn Over ca7fdf1ec5 minor form styling, adding check all/uncheck all buttons, fixing url entities in forms 2014-07-31 14:37:27 +02:00
Pepijn Over c589424bce issue #101: finishing pushover implementation 2014-07-31 14:36:39 +02:00
Pepijn Over 6b4668937d Merge branch 'develop' of https://github.com/remmedia/phpservermon into remmedia-develop 
Conflicts:
	src/lang/de_DE.lang.php
	src/lang/en_US.lang.php
	src/psm/Module/Server/Controller/ServerController.class.php
	src/templates/server/view.tpl.html
 2014-07-30 15:03:57 +02:00