tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-05-21 15:10:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,960 Commits 122 Branches 75 Tags
Commit Graph

4309 Commits

Author SHA1 Message Date
Thomas Gelf
d55c2a4c87 Widget\Filter*: fix parse error, replace minus 2014-11-13 21:47:40 +01:00
Bernd Erk
903219b302 Merge branch 'master' into feature/redesign-7144 
Conflicts:
	library/Icinga/Web/Menu.php
	public/css/icinga/menu.less
 2014-11-13 21:11:36 +01:00
Eric Lippmann
0a7decd0a9 Remove dompdf from the IcingaVendor directory 
IcingaVendor will be removed.

refs #6165
refs #6166
 2014-11-13 20:11:00 +01:00
Eric Lippmann
c4aeaf3428 Use dompdf from the include path 
refs #6165
refs #6166
 2014-11-13 20:10:24 +01:00
Eric Lippmann
d87acd557a Add dompdf version 0.6.1 to our vendor library 
refs #6165
refs #6166
 2014-11-13 20:09:27 +01:00
Bernd Erk
20be45e8da Enable icon font 2014-11-13 20:08:58 +01:00
Eric Lippmann
48a468b888 Add our vendor path to the include path 2014-11-13 19:52:28 +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
Bernd Erk
6201858a68 Merge branch 'master' into feature/redesign-7144 2014-11-13 17:47:26 +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
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
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
Thomas Gelf
1c0e427d3b Web\StyleSheet: compile webfont too 
refs #6936
 2014-11-13 15:41:13 +01:00
Thomas Gelf
50869c783d MonitoringMenuItemRenderer: webfont icon support 
refs #6936
 2014-11-13 15:30:00 +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
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
Bernd Erk
ef2ec0442c Merge branch 'master' into feature/redesign-7144 2014-11-13 14:40:26 +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
Eric Lippmann
385157be8f Zend: Remove require_once calls 
refs #7464
 2014-11-13 10:49:39 +01:00
Eric Lippmann
38ebc949a5 Zend: Include Zend version 1.12.9 
refs #7464
 2014-11-13 10:49:32 +01:00
Eric Lippmann
f427577067 Add getVendorDir() in favor of constant ICINGAWEB_VENDORS 2014-11-13 09:38:04 +01:00
Eric Lippmann
bfa834fc3b Remove constant ICINGAWEB_APPDIR 
We should avoid use of constants.
 2014-11-13 09:33:31 +01:00
Eric Lippmann
9c103a9864 Remove constant ICINGAWEB_BASEDIR 
We should avoid use of constants.
 2014-11-13 09:24:51 +01:00
Bernd Erk
ac8cc0613c Merge branch 'master' into feature/redesign-7144 
Conflicts:
	application/views/scripts/authentication/login.phtml
	public/css/icinga/login.less
 2014-11-12 17:21:54 +01:00
Eric Lippmann
75475b1684 Rename getBootstrapDirecory() to getBootstrapDirectory() 2014-11-12 17:14:43 +01:00
Eric Lippmann
c394cd0bff Use realpath in ApplicationBootstrap::getBootstrapDirecory() 
If the CLI is called from source, the base directory is now set to the correct path.
Packagers will have to provide the path to the base directory though.
 2014-11-12 17:11:48 +01:00
Johannes Meyer
db7954c350 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 17:05:13 +01:00
Alexander Fuhr
c7f36a5afa Fix empty preferences array warning in the DbStore 2014-11-12 17:03:22 +01:00
Eric Lippmann
ec6b56a060 Allow to define Icinga Web 2's base directory while bootstrapping 2014-11-12 15:52:43 +01:00
Eric Lippmann
b27d1d0058 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 14:48:15 +01:00
Eric Lippmann
a081db08a4 icingacli: Fix "Notice: Constant ICINGAWEB_BASEDIR already defined" 2014-11-12 14:43:58 +01:00
Eric Lippmann
6089372c42 Do not define ICINGAWEB_BASEDIR in index.php 
There's SCRIPT_FILENAME. The constants will be removed shortly.
 2014-11-12 14:39:45 +01:00
Alexander Fuhr
993390941a Add user account menu and move logout and preferences inside it 2014-11-12 13:22:14 +01:00
Eric Lippmann
277765ac72 No longer make ICINGAWEB_APPDIR configureable 2014-11-12 13:18:05 +01:00
Eric Lippmann
11e13582e2 Define the ICINGAWEB_VENDORS contant 2014-11-12 13:17:18 +01:00
Alexander Fuhr
4f84979c89 Fix IniStore to save and load proper user preferences 2014-11-12 13:16:09 +01:00
Eric Lippmann
8c9465ffbd Fix ICINGAWEB_APPDIR location if the Icinga library is in PHP's include path 2014-11-12 13:06:43 +01:00
Eric Lippmann
877e9101f3 Do not define the constant ICINGAWEB_LIBDIR 
This constant should not be needed anywhere.
 2014-11-12 12:55:16 +01:00
Alexander Fuhr
533d2207fd Fix setupTimezone' and setupInternationalization' for user preferences 2014-11-12 12:16:05 +01:00
Alexander Fuhr
8d120762de Add timezone detection to `setupTimezone' in ApplicationBootstrap 2014-11-12 12:13:46 +01:00
Thomas Gelf
f0ca81d7af Data\Filter: SORT_NATURAL only for PHP >= 5.4 2014-11-12 11:47:42 +01:00
Thomas Gelf
5851886877 Widget\Tab: no underlined space after icon 2014-11-12 11:30:06 +01:00
Alexander Fuhr
33107ff8f2 Add new table columns and change the preferences DB save process 2014-11-12 11:08:05 +01:00
Johannes Meyer
62aacce469 Place the noscript button next to the element it is supposed to apply 2014-11-12 10:48:52 +01:00
Johannes Meyer
7aae291f69 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 10:08:28 +01:00