878aa81d98
Changes conf icon in menu
2014-11-17 17:08:08 +01:00
812f9af949
Change modulePath setting to module_path
...
fixes #7694
2014-11-17 10:10:08 +01:00
8d4089c22a
Merge remote-tracking branch 'origin/feature/livestatus-playground-4787'
...
Not really useful yet, allows to play around a little bit
2014-11-16 19:41:54 +01:00
0cea370a5c
Widget\Tab: fix tagParams check breaking tabs
2014-11-16 19:37:11 +01:00
b6464c5d83
Livestatus\Connection: one more comment
2014-11-16 18:43:11 +01:00
aaec1b84bf
Livestatus\Query: indentation
2014-11-16 18:42:10 +01:00
0ff9d57504
Livestatus\Connection: just a comment
2014-11-16 18:37:01 +01:00
40c4562fe4
Data\SimpleQuery: don't fail on missing columns...
...
...for now
2014-11-16 18:24:16 +01:00
c0343a0dae
Merge remote-tracking branch 'origin/master' into feature/livestatus-playground-4787
2014-11-16 18:07:18 +01:00
195375f055
Livestatus\Query: use calculated column headers
2014-11-16 18:03:58 +01:00
d368df8211
Livestatus\Connection: check resource on disconnect
2014-11-16 18:01:07 +01:00
2c7373f385
Livestatus\Connection: benchmark, comments
2014-11-16 17:59:56 +01:00
140b246974
Livestatus\Connection: remove obsolete constant
...
TCPNODELAY is available in PHP >= 5.3
2014-11-16 17:58:56 +01:00
b2a55f0998
Db\DbQuery: do not expose applyFilterSql
2014-11-16 17:09:51 +01:00
5ea2f33efb
Db\DbQuery: add NOT LIKE support
2014-11-16 17:08:50 +01:00
90f1ab06b4
Db\DbQuery: add "deep" clone support
...
Still far from being complete, Zend_Db_Select makes life really hard for
us. More to come...
2014-11-16 17:06:26 +01:00
6bf0ca216a
Livestatus\Query: resultrow method - base for more
...
This is where query-based column fixup voodoo starts
2014-11-16 16:35:02 +01:00
628597d6cb
Livestatus\Query: some more filter-related stuff
2014-11-16 16:32:53 +01:00
46b047b013
Livestatus\Query: add customvar support
2014-11-16 16:31:09 +01:00
7d02107803
Livestatus\Query: fix limit, add some notes
2014-11-16 16:29:40 +01:00
d7141392a5
Livestatus\Query: return available columns
2014-11-16 16:28:52 +01:00
7b6b9b8574
LivestatusConnection: separator constant
2014-11-16 16:27:21 +01:00
e0143bf572
Livestatus\Connection: add missing use statements
2014-11-16 16:26:28 +01:00
fd55ffe47e
Livestatus\Connection: switch to new fetch methods
2014-11-16 16:25:47 +01:00
efd395e12a
Livestatus\ResponseRow: initial dummy implementation
2014-11-16 16:22:10 +01:00
17c8453c1c
Livestatus\Connection: line splitting implementation
...
Will need some more work to get SplFixedArray handling safe
2014-11-16 16:02:50 +01:00
e1cdd30c93
Livestatus\Connection: fetch row from socket...
...
...basically just calling readLine, but splitting columns
2014-11-16 16:00:03 +01:00
e755b37af3
Livestatus\Connection: discover column headers...
...
...in case the query doesn't know about
2014-11-16 15:56:58 +01:00
8ec8c153dd
Livestatus\Connection: implement readLineFromSocket
...
We want to stream data in the near future, so reading line by line is
essential
2014-11-16 15:55:53 +01:00
a027efc9e7
Livestatus\Connection: make use of socketError
2014-11-16 15:55:20 +01:00
d66c95a725
Livestatus\Connection: implement socketError method
2014-11-16 15:54:32 +01:00
be8120bd39
Livestatus\Connection: document hardcoded count
2014-11-16 15:53:19 +01:00
d6b9f56a2c
Livestatus\Connection: throw "better" exceptions
...
Removed outdated method
2014-11-16 15:51:26 +01:00
578873f695
Livestatus\Query: start using new filter methods
2014-11-16 15:48:59 +01:00
3b1b38a353
Livestatus\Query: attempt to separate column handling
2014-11-16 15:47:06 +01:00
4b5b5f4ae3
Livestatus\Query: use trigger_error in __toString
2014-11-16 15:37:52 +01:00
510e1e66d6
Livestatus\Connection: add fetchRow / fetchPairs
...
Temporary ugly and slow implementation
2014-11-16 15:33:17 +01:00
4cbe8da26f
Livestatus\Query: add a lot of filter voodoo
2014-11-16 15:30:10 +01:00
14cdcc8ce2
Livestatus\Query: fetch csv, not json
2014-11-16 15:28:17 +01:00
23546a4224
Livestatus\Query: parse an array structure
2014-11-16 15:22:54 +01:00
1b8449009c
Livestatus\Connection: temporarily hardcode count
2014-11-16 15:20:12 +01:00
0916f57ce8
Livestatus\Query: split string cast implementation
...
This way we can use an exception-throwing variant internally while not
breaking __toString
2014-11-16 15:13:07 +01:00
38fec33849
Livestatus\Query: temporarily disable count cache
2014-11-16 15:12:13 +01:00
48dfb1bb70
Livestatus\Query: remove obsolete properties
2014-11-16 15:11:31 +01:00
39a995cc6f
Livestatus\Query: remove SimpleQuery tasks
2014-11-16 15:09:33 +01:00
6de98dcf97
Livestatus\Query: extend SimpleQuery, not abstract
2014-11-16 15:06:58 +01:00
2e1cc8ed35
Widget\Tabs: use icon font
2014-11-16 14:41:22 +01:00
e89d4642e3
Merge remote-tracking branch 'origin/master' into feature/livestatus-playground-4787
2014-11-16 10:12:34 +01:00
9e0e3f12e3
FilterChain: addFilter should return itself
2014-11-16 02:49:33 +01:00
387928de02
Filter: support 'q' searches
...
This makes the overall search play nice with the FilterEditor and
reduces code in the action controller. Still some work to do, but
seems to be pretty fine right now.
2014-11-16 02:40:28 +01:00
5630374058
FilterEditor: handle ignoreParams correctly
2014-11-16 00:19:28 +01:00
e0bf021fb9
FilterEditor: apply submitted changes do filter
2014-11-15 23:49:37 +01:00
b1f82bd025
FilterEditor: add request handle support
2014-11-15 23:49:06 +01:00
7da87b7341
FilterEditor: split render function and clean up
2014-11-15 23:48:17 +01:00
0e4a8575a9
FilterEditor: new helper for text inputs
2014-11-15 23:46:36 +01:00
1c5cba9ddf
FilterEditor: don't sort all select's
...
Columns are now sorted separately, so that's fine
2014-11-15 23:45:03 +01:00
2eb2fa51da
FilterEditor: cache available columns
2014-11-15 23:43:13 +01:00
1d4ea88251
FilterEditor: clean up selectColumn
2014-11-15 23:42:15 +01:00
e6ded2eb3c
FilterEditor: use new id helper in selectSign
2014-11-15 23:39:21 +01:00
934a0a4914
FilterEditor: helper function for op dropdown
2014-11-15 23:38:36 +01:00
c700e86008
FilterEditor: add helper rendering new filters
2014-11-15 23:37:31 +01:00
711b1a5224
FilterEditor: elementId helper method for inputs
2014-11-15 23:34:21 +01:00
7993ad2fde
FilterEditor: add a couple of link generators
...
remove/add/strip/cancel
2014-11-15 23:32:38 +01:00
d6e3f06997
FilterEditor: readability
2014-11-15 23:31:17 +01:00
4a38c069f3
FilterEditor: do not export removal function
2014-11-15 23:30:06 +01:00
8858069514
FilterEditor: addTo method for special operations
...
Removed obsolete mark function
2014-11-15 23:27:58 +01:00
ee16391720
FilterEditor: no title, add cancel button
2014-11-15 23:24:55 +01:00
dcc0c213b2
FilterEditor: add redirect support
...
Not the cleanest way, could be improved
2014-11-15 23:18:50 +01:00
ac483a0fe6
FilterEditor: add compact search render support
...
We show the search box and a filter preview while not modifying the
filter
2014-11-15 23:11:55 +01:00
44d5ee8fa0
FilterEditor: make constructor parameter optional
...
...and use new setters
2014-11-15 23:02:38 +01:00
c5ca3b633c
FilterEditor: allow additional parameter control
...
We may want to keep additional parameters in our url and ignore other
ones when the filter changes
2014-11-15 22:57:25 +01:00
269f4b4c83
FilterEditor: allow to set the query from outside
...
Query will be used to provide a column list
2014-11-15 22:55:26 +01:00
118abbe980
FilterEditor: url-setter and protected lazy-shortcut
2014-11-15 22:54:40 +01:00
e75d0aa10e
FilterEditor: add getter and setter for Filter
...
We will shift quite some logic over here
2014-11-15 22:52:55 +01:00
a75bfd1dfb
FilterEditor: add failsafe string cast
2014-11-15 22:50:35 +01:00
0fd4a094ea
Web\Request: the request should know the URL
2014-11-15 22:40:29 +01:00
2ecdfefa85
Widget\Tabs: use icon for dropdown tabs
2014-11-15 22:39:42 +01:00
44c96f0410
FilterOr: override operator change for NOT
...
Replacing an OR filter with a NOT operator should return a NOT OR
when the OR contains more than one entry
2014-11-15 22:37:12 +01:00
1f74c462d4
FilterChain: add and use count() function
2014-11-15 22:34:18 +01:00
39d7d13ddb
AbstractWidget: default properties should be empty
...
Helps troubleshooting, getter would fail with a hard-to-track error
otherwise.
2014-11-15 16:54:59 +01:00
210aae27fd
Merge remote-tracking branch 'origin/feature/redesign-7144'
2014-11-15 12:19:46 +01:00
6ba4e55277
Throw exception on E_NOTICE
...
Use of uninitialized values must be detected asap.
2014-11-15 01:20:27 +01:00
2cd8e14998
Remove Zend/Locale/Data/*.xml
...
This should be safe.
2014-11-15 01:20:02 +01:00
b38a108385
Revert "Remove Zend/Locale from our vendor library"
...
This reverts commit 9b2bff4d17
2014-11-15 01:14:49 +01:00
52c19b5843
EmbeddedWeb must not load core modules, i.e. setup
2014-11-15 01:04:56 +01:00
2c0122ba9f
Fix ApplicationBootstrap::getBootstrapDirectory() when Icinga Web 2 is served using PHP's built-in web server
2014-11-15 01:04:14 +01:00
925348d171
Data\Filter: add or/andFilter implementations
...
Those shortcuts make it easy to correctly add or/and conditions
regardless of the original filter type
2014-11-14 23:06:20 +01:00
6aefc4b491
Data\Filter: fix $self VS $this
2014-11-14 22:53:46 +01:00
178ddaade7
Data\Filter: add missing abstract function type
2014-11-14 22:44:04 +01:00
53bca911fb
Data\Filter: enforce isEmpty() implementation
2014-11-14 22:43:30 +01:00
ce7aea5df7
Data\Filter: add isChain() and isExpression()
...
This makes node type distiction easier
2014-11-14 22:41:30 +01:00
da47c7fc7e
Merge remote-tracking branch 'origin/master' into feature/redesign-7144
2014-11-14 21:32:57 +01:00
11bb8dbab0
icingacli web serve: Fix "PHP Notice: Use of undefined constant ICINGA_LIBDIR"
2014-11-14 16:02:17 +01:00
ce69300c9a
cli: Fix the path to the clicommands
2014-11-14 16:01:40 +01:00
9b2bff4d17
Remove Zend/Locale from our vendor library
2014-11-14 15:36:51 +01:00
5178798fa9
Remove Zend/Gdata from our vendor library
...
Let's waste less space
2014-11-14 15:06:26 +01:00
ddf2ef5cc9
Remove $request parameter from Form::onSuccess and Form::onRequest
...
fixes #7552
2014-11-14 14:59:29 +01:00
029630308d
Load Zend on Web and EmbeddedWeb
...
refs #7464
2014-11-14 14:07:13 +01:00
37dd2f5dd2
Do not load Zend on the CLI and remove our library from the include path
...
Adding Icinga Web 2's library to the include is not necessary for getting the Zend_Plugin_Loader working.
2014-11-14 14:04:24 +01:00
c1591bc641
Zend: Reset require_once in Zend_Loader_Autoloader
...
refs #7464
2014-11-14 14:03:20 +01:00
5bd888f46c
Merge branch 'master' into feature/include-zend-7464
2014-11-14 13:28:08 +01:00
49d66a7b73
Use lessphp from the include path
...
refs #6165
refs #6166
2014-11-14 13:27:02 +01:00
85c6150ca4
Move lessphp from IcingaVendor to vendor
...
refs #6165
refs #6166
2014-11-14 13:26:11 +01:00
97d026fb09
Update JShrink to version 1.0.1
...
refs #6165
refs #6166
2014-11-14 11:59:08 +01:00
6624b764cf
Use JShrink from the include path
...
refs #6165
refs #6166
2014-11-14 11:55:06 +01:00
8e7a56db58
Move JShrink from IcingaVendor to vendor
...
refs #6165
refs #6166
2014-11-14 11:54:20 +01:00
c081841917
Move Parsedown from IcingaVendor to vendor
...
refs #6165
refs #6166
2014-11-14 11:50:38 +01:00
586b4f463b
Let our module autloader know that we renamed our form namespaces
...
refs #7553
2014-11-14 11:30:44 +01:00
775c20d9ad
Rename namespace Icinga\Form to Icinga\Forms
...
refs #7553
2014-11-14 10:57:14 +01:00
1c4a5ce86f
Leave it up to Icinga\Web\Form to instantiate our own form elements
2014-11-14 10:15:27 +01:00
872dce2208
Prefer form elements of Icinga\Web\Form\Element in Form::createElement
2014-11-14 10:15:27 +01:00
69fdc6a329
Chart/InlinePie: smaller, white border for hover
...
I roughly changed the piechart defaults to their original (icon-like)
size. However, this is NOT how we should handle such changes. We MUST
be able to style them via CSS and get rid of that incredible amount of
HTML attributes.
I want to be able to set the height directly in CSS as em/px. And I want
also be able to set it to 100% and size the outer container.
refs #7077
2014-11-14 09:54:20 +01:00
69c5728769
Remove htmlpurifier-4.6.0-lite from the IcingaVendor directory
2014-11-13 23:50:28 +01:00
967492736b
Add HTMLPurifier version 4.6.0 to our vendor library
...
refs #6165
refs #6166
2014-11-13 23:49:31 +01:00
d55c2a4c87
Widget\Filter*: fix parse error, replace minus
2014-11-13 21:47:40 +01:00
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
0a7decd0a9
Remove dompdf from the IcingaVendor directory
...
IcingaVendor will be removed.
refs #6165
refs #6166
2014-11-13 20:11:00 +01:00
c4aeaf3428
Use dompdf from the include path
...
refs #6165
refs #6166
2014-11-13 20:10:24 +01:00
d87acd557a
Add dompdf version 0.6.1 to our vendor library
...
refs #6165
refs #6166
2014-11-13 20:09:27 +01:00
20be45e8da
Enable icon font
2014-11-13 20:08:58 +01:00
48a468b888
Add our vendor path to the include path
2014-11-13 19:52:28 +01:00
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
6201858a68
Merge branch 'master' into feature/redesign-7144
2014-11-13 17:47:26 +01:00
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
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
94f8597271
Add existing GROUPBYs to count queries
2014-11-13 16:42:11 +01:00
0e34001568
Use automatically a subquery when counting with groups
2014-11-13 16:42:11 +01:00
77f5bc3932
Use GROUPBY instead of DISTINCT and subqueries when counting
2014-11-13 16:42:11 +01:00
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
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
1c0e427d3b
Web\StyleSheet: compile webfont too
...
refs #6936
2014-11-13 15:41:13 +01:00
50869c783d
MonitoringMenuItemRenderer: webfont icon support
...
refs #6936
2014-11-13 15:30:00 +01:00
b16959bc44
Widget\Tab: support webfont icons
...
refs #6936
2014-11-13 15:22:47 +01:00
29c7c2e707
Web\MenuRenderer: support webfont icons
...
refs #6936
2014-11-13 15:21:49 +01:00
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
ef2ec0442c
Merge branch 'master' into feature/redesign-7144
2014-11-13 14:40:26 +01:00
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
385157be8f
Zend: Remove require_once calls
...
refs #7464
2014-11-13 10:49:39 +01:00
38ebc949a5
Zend: Include Zend version 1.12.9
...
refs #7464
2014-11-13 10:49:32 +01:00
f427577067
Add getVendorDir() in favor of constant ICINGAWEB_VENDORS
2014-11-13 09:38:04 +01:00
bfa834fc3b
Remove constant ICINGAWEB_APPDIR
...
We should avoid use of constants.
2014-11-13 09:33:31 +01:00
9c103a9864
Remove constant ICINGAWEB_BASEDIR
...
We should avoid use of constants.
2014-11-13 09:24:51 +01:00
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
75475b1684
Rename getBootstrapDirecory() to getBootstrapDirectory()
2014-11-12 17:14:43 +01:00
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
db7954c350
Merge branch 'master' into feature/setup-wizard-7163
2014-11-12 17:05:13 +01:00
c7f36a5afa
Fix empty preferences array warning in the DbStore
2014-11-12 17:03:22 +01:00
ec6b56a060
Allow to define Icinga Web 2's base directory while bootstrapping
2014-11-12 15:52:43 +01:00
b27d1d0058
Merge branch 'master' into feature/setup-wizard-7163
2014-11-12 14:48:15 +01:00
a081db08a4
icingacli: Fix "Notice: Constant ICINGAWEB_BASEDIR already defined"
2014-11-12 14:43:58 +01:00
Bernd Erk
Johannes Meyer
Thomas Gelf
Eric Lippmann
Alexander Fuhr