Commit Graph

178 Commits

Author SHA1 Message Date
Pepijn Over bcfa168389 Merge branch 'Lauraly-com-develop' into develop
Conflicts:
	src/lang/bg.lang.php
	src/lang/br.lang.php
	src/lang/de.lang.php
	src/lang/en.lang.php
	src/lang/fr.lang.php
	src/lang/kr.lang.php
	src/lang/nl.lang.php
2014-03-24 20:15:13 +01:00
Pepijn Over 3e38029a60 fixing status page on mobile 2014-03-24 19:21:07 +01:00
Pepijn Over 3adf2ca5b6 Adding latest changes to CHANGELOG
issue #31: changing title back to name of application for all languages
2014-03-24 19:21:07 +01:00
Pepijn Over 14388657f2 issue #15: adding warning threshold to server update, and separating notification/status functionality
adding warning threshold to insert form and adding tooltips

adding warning_threshold fields to install
2014-03-24 19:21:07 +01:00
Pepijn Over 5dbeb42c69 fixing status page on mobile 2014-03-24 19:13:25 +01:00
Pepijn Over c756da3b1e Adding latest changes to CHANGELOG
issue #31: changing title back to name of application for all languages
2014-03-24 16:50:12 +01:00
Pepijn Over 97edea3487 Merge branch 'develop' of github.com:phpservermon/phpservermon into develop 2014-03-24 16:37:59 +01:00
Pepijn Over 6415d0ed2e issue #15: adding warning threshold to server update, and separating notification/status functionality
adding warning threshold to insert form and adding tooltips

adding warning_threshold fields to install
2014-03-24 16:35:58 +01:00
jerome 7d06195992 spelling mistake 2014-03-24 03:12:04 +01:00
jerome 1ed97fa3b2 Server History Controller 2014-03-24 02:29:22 +01:00
Pepijn Over e8e00c91d1 issue #32: fixing padding on mobile and making top menu fixed 2014-03-23 23:33:54 +01:00
Pepijn Over 640645ac68 adding date format to last_check 2014-03-23 22:52:46 +01:00
jerome ae2b4700a7 Bad Status last online value. 2014-03-22 03:48:26 +01:00
Pep f376f374b4 Merge pull request #29 from Lauraly-com/templateChange
Change to prevent javascript single line object definition to be removed...
2014-03-21 21:02:24 +01:00
jerome 28e7c4ba90 Change to prevent javascript single line object definition to be removed by template.Display(). 2014-03-21 20:23:47 +01:00
Pepijn Over c045dcbb51 Moving install to its own module, somehow makes more sense 2014-03-21 13:48:26 +01:00
Pepijn Over f7f7491f85 issue #1: fixing validation of sever fields 2014-03-20 01:24:50 +01:00
Pepijn Over e880aab22a dont attempt to log user in on install 2014-03-18 23:28:42 +01:00
Pepijn Over 086aa41d0c adding user explanation message 2014-03-18 23:19:32 +01:00
Pepijn Over 378e7037f0 adding gitattributes file for export excludes
fixing call-time pass-by-reference error in Inetworx class

removing header from config.php.sample and removing PSM_CONFIG constant
(not really necessary)

adding Makefile for easy exporting releases
2014-03-18 22:09:44 +01:00
Pepijn Over b097ef2a46 Merge branch 'develop' of github.com:phpservermon/phpservermon into develop 2014-03-16 02:10:02 +01:00
Pepijn Over c47c33c0eb restricting server list for regular users, moving user-server relations
to own table
2014-03-16 02:04:49 +01:00
Pep 5eda9ddf2b Merge pull request #26 from Lauraly-com/develop
Develop
2014-03-15 22:46:17 +01:00
Pepijn Over d625dafa9e changing menu order, fixing subtitles 2014-03-15 22:41:40 +01:00
Pepijn Over 130a000cda restricting server edit/add/delete to admins only 2014-03-15 22:38:17 +01:00
jerome 1dca9bd01a Better french translation 2014-03-15 22:33:01 +01:00
jerome 464506b1bf Better french translation 2014-03-15 22:27:26 +01:00
Pepijn Over 51cefd6cd6 changing access level of config to admin 2014-03-15 21:49:37 +01:00
Pepijn Over b45e3699d4 issue #11: adding profile page 2014-03-15 21:47:55 +01:00
Pepijn Over 416eff8875 fixing bug that causes user password to be reset after edit 2014-03-15 13:02:47 +01:00
Pepijn Over ce64ec6bc3 psm_build_url(): only add https for port 443, http for the rest 2014-03-15 01:46:14 +01:00
Pepijn Over db73e9bb4b introducing a router and controllers to allow more submodules in the
future and more structured way of loading modules
2014-03-15 00:35:35 +01:00
Pepijn Over 59eddd9380 adding upgrade message for 2.1 upgrades 2014-03-14 21:32:09 +01:00
Pepijn Over 48f9ce168d Merge branch 'develop' of github.com:phpservermon/phpservermon into develop 2014-03-14 19:47:47 +01:00
Pepijn Over 6be84f3449 fix for issue #12, status was not saved to uptime table 2014-03-14 19:36:56 +01:00
Pepijn Over d32eafe9ec changing uptime table to servers_uptime, adding primary key and fixing
install sql for it
2014-03-14 19:26:25 +01:00
Pepijn Over 26f8fedffe issue #11: adding login module, adding user authentication to user
module

issue #11: adding user authentication to installer
2014-03-14 18:53:03 +01:00
Pepijn Over f8f3b38708 adding new psm_build_url() function to create clean urls with params 2014-03-14 15:12:00 +01:00
Pepijn Over bd016caf13 removing .htaccess examples 2014-03-14 15:07:53 +01:00
Pep a2ec64c590 Merge pull request #24 from PVasileff/patch-4
Update bg.lang.php
2014-03-14 11:32:15 +01:00
Plamen Vasilev bd51953d25 Update bg.lang.php
Fixed some grammatical errors. :)
2014-03-14 11:29:36 +02:00
Pep f3df3091cf Merge pull request #23 from PVasileff/patch-3
Update bg.lang.php
2014-03-14 10:02:20 +01:00
Plamen Vasilev 7466a1fae4 Update bg.lang.php
Translate SMTP section
2014-03-14 08:44:05 +02:00
Pepijn Over 33ce3d11da adding bulgarian translation to credits file 2014-03-14 01:31:02 +01:00
Pepijn Over 21a0bce8a7 fixing string search for website with compression on 2014-03-13 20:28:32 +01:00
Pepijn Over 5cfa6d8a57 minor docs update 2014-03-13 20:21:18 +01:00
Pepijn Over 217d5e04b6 Readme update: adding contributing, moving language stuff to wiki 2014-03-13 20:16:31 +01:00
Pepijn Over ce47a45c6f Fixing bulgarian language header and adding to other language files 2014-03-13 19:46:17 +01:00
Pep 8e318ac829 Merge pull request #22 from PVasileff/patch-2
Create bg.lang.php
2014-03-13 17:01:40 +01:00
Plamen Vasilev 42bfdeb334 Create bg.lang.php 2014-03-13 17:49:05 +02:00