4269 Commits

Author SHA1 Message Date
Eric Lippmann
81ae138952 Remove config directory 2014-11-13 18:15:11 +01:00
Eric Lippmann
f3ae7357d7 Merge branch 'feature/localization-form-6073'
resolves #6073
2014-11-13 18:12:31 +01:00
Eric Lippmann
cc161764ff Use 'Preferences' instead of 'General Settings'
refs #6073
2014-11-13 18:08:30 +01:00
Eric Lippmann
1600514839 Merge branch 'master' into feature/localization-form-6073 2014-11-13 18:05:00 +01:00
Eric Lippmann
81b144d057 Fix locale setup
The CLI must not try to use HTTP_ACCEPT_LANGUAGE. Avoided double try-catch blocks.

refs #6073
2014-11-13 18:02:03 +01:00
Eric Lippmann
7f9b952719 Merge branch 'feature/remove-autotools-files-7505'
resolves #7505
2014-11-13 17:52:54 +01:00
Eric Lippmann
f37e6fe21b Merge branch 'master' into feature/remove-autotools-files-7505 2014-11-13 17:52:11 +01:00
Bernd Erk
6201858a68 Merge branch 'master' into feature/redesign-7144 2014-11-13 17:47:26 +01:00
Bernd Erk
205ba64781 Installer styling 2014-11-13 17:20:06 +01:00
Eric Lippmann
e3c70bec6d Fix timezone setup
The CLI must not try to use our web timezone detection thingy.

refs #6073
2014-11-13 17:07:36 +01:00
Eric Lippmann
ac2ec83852 Merge branch 'master' into feature/localization-form-6073
Conflicts:
	library/Icinga/Application/ApplicationBootstrap.php
	test/php/library/Icinga/User/Store/DbStoreTest.php
2014-11-13 17:03:41 +01:00
Johannes Meyer
f49d9e8591 Fix the tooltip's max page count in the joystick navigation 2014-11-13 16:45:03 +01:00
Eric Lippmann
94f8597271 Add existing GROUPBYs to count queries 2014-11-13 16:42:11 +01:00
Eric Lippmann
0e34001568 Use automatically a subquery when counting with groups 2014-11-13 16:42:11 +01:00
Johannes Meyer
77f5bc3932 Use GROUPBY instead of DISTINCT and subqueries when counting 2014-11-13 16:42:11 +01:00
Thomas Gelf
f86d3e7636 Web\StyleSheet: PCRE problem workaround, PHP5.3.7
Lines with embedded fonts where too long for lessphp's PCRE matches
unless PHP 5.3.7
2014-11-13 16:35:26 +01:00
Thomas Gelf
c68f9502ea modules/doc: restructure menu
Moved first hierarchy into the menu, added font style link

refs #6936
2014-11-13 15:57:39 +01:00
Alexander Fuhr
dedb348af9 Add clickable icon for command check now 2 2014-11-13 15:55:25 +01:00
Thomas Gelf
3343599a63 doc/style: show web font icon set
refs #6936
2014-11-13 15:54:31 +01:00
Bernd Erk
a5b8de366f Fixes error message 2014-11-13 15:52:20 +01:00
Bernd Erk
1743cec199 Centered error messages 2014-11-13 15:46:04 +01:00
Thomas Gelf
28c239c6fd Web\Controller: initial commit
* This is the controller all modules should inherit from.
* We will flip code with the ModuleActionController as soon as a couple
  of pending feature branches are merged back to the master.
2014-11-13 15:42:25 +01:00
Bernd Erk
c98a6d5912 Fixes type in error message 2014-11-13 15:41:31 +01:00
Thomas Gelf
1c0e427d3b Web\StyleSheet: compile webfont too
refs #6936
2014-11-13 15:41:13 +01:00
Thomas Gelf
47b1189af4 application/fonts: initial import
First sample font, to be replaced.

refs #6936
2014-11-13 15:40:20 +01:00
Bernd Erk
56aabf0d15 Fixes radius in error message 2014-11-13 15:37:00 +01:00
Thomas Gelf
50869c783d MonitoringMenuItemRenderer: webfont icon support
refs #6936
2014-11-13 15:30:00 +01:00
Alexander Fuhr
cab89914bb Add clickable icon for command check now 2014-11-13 15:28:10 +01:00
Thomas Gelf
b16959bc44 Widget\Tab: support webfont icons
refs #6936
2014-11-13 15:22:47 +01:00
Thomas Gelf
29c7c2e707 Web\MenuRenderer: support webfont icons
refs #6936
2014-11-13 15:21:49 +01:00
Bernd Erk
ac3ff90e69 Fixes input margin 2014-11-13 15:18:18 +01:00
Thomas Gelf
1aa8858dca helpers/icon: support webfont shortcuts
* set icon class instead of icon image if no such is given
* fix TODO: merge parameter classes

refs #6936
2014-11-13 15:17:36 +01:00
Eric Lippmann
86a9c7f8c6 Merge branch 'feature/generate-webserver-config-6120'
resolves #6120
2014-11-13 15:10:12 +01:00
Eric Lippmann
b52adcc2ab Merge branch 'master' into feature/generate-webserver-config-6120 2014-11-13 15:09:34 +01:00
Bernd Erk
45418bd902 Removes login form placeholder 2014-11-13 15:08:49 +01:00
Bernd Erk
ef2ec0442c Merge branch 'master' into feature/redesign-7144 2014-11-13 14:40:26 +01:00
Johannes Meyer
688c016f2d Re-enable requirement checks for Zend_Db_Adapter_*
refs #7464
2014-11-13 14:34:31 +01:00
Johannes Meyer
4595b51318 Remove Zend version check
refs #7464
2014-11-13 14:34:04 +01:00
Johannes Meyer
6be51d1565 Use Icinga\Web\Form\Element\Button instead of Zend's button
Due to a bug in Zend prior to 1.12.2 we need our own button implementation
to support earlier versions of the Zend Framework. The side effect is, that
this button can also be used as submit button for our forms as isChecked
will do its job now properly.
2014-11-13 14:26:12 +01:00
Alexander Fuhr
dc1960184d Add hint in the grid if there are no active downtimes 2014-11-13 14:18:19 +01:00
Eric Lippmann
7c8e9e6f56 CLI/Webserver Setup: Rename webPath to urlPath
This is how the apache docs call it. Nginx speaks of uri.

refs #6120
2014-11-13 14:18:14 +01:00
Eric Lippmann
459fc77fc7 CLI/Webserver Setup: Allow to define Icinga Web 2's configuration directory
refs #6120
2014-11-13 14:05:13 +01:00
Alexander Fuhr
d0651e9e7f Rename 'service current state' to 'service detail information' header 2014-11-13 14:04:23 +01:00
Eric Lippmann
0e64a8d573 CLI/Webserver Setup: Prefix URL paths with '/' if missing
refs #6120
2014-11-13 13:47:08 +01:00
Eric Lippmann
36d3c3e3d5 CLI/Webserver Setup: Don't print "# Your %s configuration"
I want to copy the config only.

refs #6120
2014-11-13 13:42:22 +01:00
Eric Lippmann
a0d4b6eee6 CLI/Webserver Setup: Don't use camelCase arguments
refs #6120
2014-11-13 13:40:39 +01:00
Eric Lippmann
e0f6ce36ea CLI/Webserver Setup: Fix argument sanity checks
refs #6120
2014-11-13 13:30:07 +01:00
Eric Lippmann
8594dc068a CLI/Webserver Setup: Rename publicPath to documentRoot
refs #6120
2014-11-13 13:17:59 +01:00
Eric Lippmann
0d4ed40cb2 CLI/Webserver Setup: Remove sapi stuff becuase it's nowhere used
refs #6120
2014-11-13 13:17:53 +01:00
Eric Lippmann
2ad2127ae3 Merge branch 'master' into feature/generate-webserver-config-6120
Conflicts:
	application/clicommands/SetupCommand.php
2014-11-13 12:50:55 +01:00