[icinga-checkins] icinga.org: New commits on branch mhein/default

git at icinga.org git at icinga.org
Fri Aug 26 09:18:16 CEST 2011


URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=fd59b848a36f17ebf4d628f32be740edb20d358f
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 26 09:17:48 2011 +0200

    * Removed JS files from PHP syntax check

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9ccea15e9f85182eeff3c17f9ee5473495666bb2
Merge: c2dfc69e89b680a3ae5e5dee3e914d3e19e6d47b b8037f4e0133ff5e4dd60c4abf9b221bba39946f
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 25 16:43:44 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b8037f4e0133ff5e4dd60c4abf9b221bba39946f
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 25 16:43:02 2011 +0200

    * Added use_retained to database config

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=c2dfc69e89b680a3ae5e5dee3e914d3e19e6d47b
Merge: ba3eb6955bee1c9d45fe73db804935164dbf87ba 8dcae6ad8bcbf232b116c3569ba41fd98e61752e
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 25 15:51:20 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8dcae6ad8bcbf232b116c3569ba41fd98e61752e
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 25 14:00:13 2011 +0200

    * Wrong comments on access.xml

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=55ee11bb6cf559ed880ee4b69634c0e1b53c5268
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 25 13:53:25 2011 +0200

    * Fixed access.xml from siteconfig

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ba3eb6955bee1c9d45fe73db804935164dbf87ba
Merge: 8b0cff16018726ad0ae4884b8ed8f8187f0c08be 2f66fe0d5f2f6d55161340b7d3084d960406e960
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 25 13:37:19 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8b0cff16018726ad0ae4884b8ed8f8187f0c08be
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 25 13:37:02 2011 +0200

    * LDAP fix based on doctrine bug?

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=2f66fe0d5f2f6d55161340b7d3084d960406e960
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 25 12:23:08 2011 +0200

    * Fixed active/passive performance view in hostgroups-to

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=4f31d2310dfa722d4e0b10e430f3857d5ec9c274
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 25 11:45:50 2011 +0200

    * Fixed aliased count fields in legacy api

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8a0b76a7ad6f6f0aa2bee2fe05ba1f7aa8a494d7
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 25 10:36:01 2011 +0200

    * Adde missing alias

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=919d4ed29c364058f8af3458d6ad0ea3e209078d
Merge: 8c48ca9b13b079365e5651c3c82596b85732ec2a 9551dbc18b0d9308b4eb83aea303d761e7c7a899
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 25 08:42:06 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8c48ca9b13b079365e5651c3c82596b85732ec2a
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 25 08:40:38 2011 +0200

    * Fixed status map freeze in some cases

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9551dbc18b0d9308b4eb83aea303d761e7c7a899
Merge: ba34b991a9b209f1f1015f38121dfc68e991ee4a 3f0aae0cdb8b6ec24c6a22bd9ddad07d68d0d006
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 15:48:27 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=3f0aae0cdb8b6ec24c6a22bd9ddad07d68d0d006
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Wed Aug 24 15:42:25 2011 +0200

    * added databases namespace to example template documentation

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ba34b991a9b209f1f1015f38121dfc68e991ee4a
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 14:17:35 2011 +0200

    * Fixed cronks including

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=09d771ccac146bcd50dd43c40cfb663e74191190
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 12:04:34 2011 +0200

    * distclean fixes

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d4f18b2dd4b50d742ae357ee0fcdedc4015e1748
Merge: 34fc5778033311654f9c5ae83133fa2a47ac071f 28f9eb50cf5cec61dccb4e551ad66386192cfce0
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 11:45:50 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=34fc5778033311654f9c5ae83133fa2a47ac071f
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 11:45:36 2011 +0200

    * configure fixes for finding binaries

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=28f9eb50cf5cec61dccb4e551ad66386192cfce0
Merge: f34354e17cf77143cb8192d29a31bebd34e3dcac 6da75677485ec753451416ebef578329da7b5748
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Wed Aug 24 11:42:27 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=f34354e17cf77143cb8192d29a31bebd34e3dcac
Author: Jannis Moßhanner <jannis.mosshammer at netways.de>
Date:   Wed Aug 24 11:42:03 2011 +0200

    fixed log, fixed data overflow on wrong ssh key

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=5d82ce5f1b2a6c5630da56ba575e094f8f3009a6
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 11:09:52 2011 +0200

    * fixes #1839
    * removed configured files
    * changed gitignore to match configure output

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=6da75677485ec753451416ebef578329da7b5748
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 11:09:52 2011 +0200

    * fixes #1839
    * removed configured files
    * changed gitignore to match configure output

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d15836221c6cbe818ba6bcfe9f5dfeeb4cf68898
Merge: b1693d94abc3224eb48d80af8dde4b0c04fb5474 4019103087120babde1a54d6dc33c2781a61fb56
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 10:40:34 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b1693d94abc3224eb48d80af8dde4b0c04fb5474
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 10:40:25 2011 +0200

    * Changed meta things

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=c3c8827729fee8667dd947158791e4c5c059a403
Merge: 9a879ded8088f4fa72746ef91e41dcbf8e2e7335 17a828b235439ab7a254170b3de99410987478aa
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 10:12:17 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=4019103087120babde1a54d6dc33c2781a61fb56
Merge: 17a828b235439ab7a254170b3de99410987478aa 9a879ded8088f4fa72746ef91e41dcbf8e2e7335
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Wed Aug 24 10:12:09 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=17a828b235439ab7a254170b3de99410987478aa
Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Wed Aug 24 10:11:29 2011 +0200

    * update in contrib

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9a879ded8088f4fa72746ef91e41dcbf8e2e7335
Merge: b121eb17471b7fe0484b40f335d292c2d3aae556 c16c697be83183b13f7cbd6bffb97cfb91f5bdd5
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 09:49:48 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=c16c697be83183b13f7cbd6bffb97cfb91f5bdd5
Author: Jannis Moßhanner <jannis.mosshammer at netways.de>
Date:   Wed Aug 24 09:44:00 2011 +0200

    * updated api fallback route name

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=a245ca5411bef008cf63b0e0ca68cbcfaa39cd85
Author: Jannis Moßhanner <jannis.mosshammer at netways.de>
Date:   Wed Aug 24 09:42:47 2011 +0200

    Updated contrib

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b121eb17471b7fe0484b40f335d292c2d3aae556
Merge: 54697b206ed552073c6b30cee0aa6ef96bdf0749 3eb3c6e944e7e841cc2ffebebe4e30e0c79768d1
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 09:26:54 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=54697b206ed552073c6b30cee0aa6ef96bdf0749
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 24 09:25:40 2011 +0200

    * Conform view for Instance status

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=0ac2ea3a7c3b82366fffbf73d26d78684f5fdfc9
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 23 17:01:11 2011 +0200

    * Changed submodule pointer

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=3eb3c6e944e7e841cc2ffebebe4e30e0c79768d1
Author: Jannis Moßhanner <jannis.mosshammer at netways.de>
Date:   Tue Aug 23 16:43:35 2011 +0200

    * Fixed missing default conenction name in DataStoreModel

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=6fbbd4620d91f9cf23f833a707865eaedd0d491d
Merge: b23af03c303a095fa2baf146eb91d7ae68c53b0f e8cdfb8fa87a3abd6fb470625ae49c7ce2db4331
Author: Jannis Moßhanner <jannis.mosshammer at netways.de>
Date:   Tue Aug 23 15:50:56 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b23af03c303a095fa2baf146eb91d7ae68c53b0f
Author: Jannis Moßhanner <jannis.mosshammer at netways.de>
Date:   Tue Aug 23 15:50:06 2011 +0200

    * Fixed IcignaDoctrine_Query auto-alias resolve bug

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=e8cdfb8fa87a3abd6fb470625ae49c7ce2db4331
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 23 15:34:00 2011 +0200

    * Updated changelog

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=2395d655813ee1bd61f0c64359d4def1af876da1
Merge: b90f058bc5479a89c31d8cc7f22dffd4842e982c 383ed49e1abcbfe7b3be12ac6286ec98739cf80a
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 23 14:52:40 2011 +0200

    * Added persistent flag for add comment in api (fixes #1437)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b90f058bc5479a89c31d8cc7f22dffd4842e982c
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 23 14:52:40 2011 +0200

    * Added persistent flag for add comment in api (fixes #1437)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b03ad65f1449f65844ada76f7412ad741aa59086
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 23 14:25:12 2011 +0200

    * Allow selectable text in grids (fixes #1612)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=383ed49e1abcbfe7b3be12ac6286ec98739cf80a
Author: Jannis Moßhanner <jannis.mosshammer at netways.de>
Date:   Tue Aug 23 14:07:11 2011 +0200

    Fixed scheduler, updated translation.xml to automagically check for Translations

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9ec99d028e5bad5f5e59e64dd186b90868b2392d
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 23 12:43:29 2011 +0200

    * Fixed #1646, ColumnRenderer encodings

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9800229227016000cd295c093e44a5acce324063
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 23 12:30:52 2011 +0200

    * Configurable app name (fixes #1648)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=75c75bda35fc9e8e73801a939aa7434e82793598
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 23 11:26:03 2011 +0200

    * Added view for instances and their status (ref #1821)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ec8f1cd502873332878e9cca9372142506b59321
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 22 15:18:58 2011 +0200

    * Added mini instance status (fixes #1821)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ca285f542d4c1b17dbe67b4c7e6cd4f31a84a385
Merge: 8e8032ae5b2d6742bcc3aa764148f9d418361955 efdbebba2ac7cbed8743b9b52e45a4db1faa2fcf
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 22 15:15:41 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing
    
    Conflicts:
    	app/modules/AppKit/models/LogParserModel.class.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=efdbebba2ac7cbed8743b9b52e45a4db1faa2fcf
Author: Jannis Moßhanner <jannis.mosshammer at netways.de>
Date:   Mon Aug 22 12:59:27 2011 +0200

    Fixed db-initialize complaining, fixed log to respect dynamic path, disabled task view

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8e8032ae5b2d6742bcc3aa764148f9d418361955
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 22 11:07:30 2011 +0200

    * Added new OverallStatus JS implementation

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ee1183e8e6c16bb79e7b62160d74997ce8d7c9eb
Author: Jannis Moßhanner <jannis.mosshammer at netways.de>
Date:   Sun Aug 21 19:50:16 2011 +0200

    * Added DirectoryMatch to allow proper access to module ressources

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=7f0d70c0167a5300e196ff1e30e5de8c41873554
Author: root <root at linux-7kv8.site>
Date:   Sun Aug 21 18:08:59 2011 +0200

    * Fixed sql-issue in status-summary and missing quoting in legacy filter

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=6868938645cdb8764d621edf21ebcca986a43167
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Sun Aug 21 15:16:21 2011 +0200

    * working state module installer, not used anywhere at this time

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=7c203eb0fba3c02f42d5b646ba30ee0217ca3a80
Author: Marius Hein <marius.hein at netways.de>
Date:   Sat Aug 20 12:52:34 2011 +0200

    * Log dir fixes

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=237841ae9c793aad5b9edbd618ae19b26e102022
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 18 16:56:23 2011 +0200

    * Fixed context awareness bug in AppKitXIncludeConfigHandler

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=3187fb3cb7e0a65083c345ae30165ac0977800b0
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 18 13:29:18 2011 +0200

    * Modules can now be disabled (altough menu,etc. will be displayed)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=04041d094703affe486eba09cb061639889fc03e
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 18 13:08:47 2011 +0200

    * modlarized schedules xml, created SubSettingConfigHandler that allows to create own setting-xmls

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=e614b440ebc2b96e5fa794c4a9bd5b1c4769f96d
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 18 11:06:36 2011 +0200

    * Added AliasMatch for public module resources

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=1592dda2f166cd28246ac6dab45709ef2931dde1
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 18 09:57:43 2011 +0200

    * Removed initModules from icinga.xml

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=4340b033864f9ef6c843aefbd7600117a1549e53
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 18 09:39:21 2011 +0200

    * Removed access.xml from modules and put it in a own xml document, added ConfigHandler that enables modules to add access definitions

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=4e5117487f04ae933a98c9ff76c7c2ff8f8ec431
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Aug 17 16:56:11 2011 +0200

    * Fixed typo in service-tempalte

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=754aa4e435dff91933b56ad316d36e9316c0ea00
Merge: ec9f83f00d1df3f8653c2ab17e208e9fa6dc40fe 14ab31e5165a3ce9d426805dc74fb27b3df4b067
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 17 08:32:07 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ec9f83f00d1df3f8653c2ab17e208e9fa6dc40fe
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 17 08:30:51 2011 +0200

    * Changed version to beta
    * Resize bug in reporting cronk (fixes #1822)
    * Fixed fuzzy translation

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=14ab31e5165a3ce9d426805dc74fb27b3df4b067
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Aug 16 17:46:12 2011 +0200

    * Fixed clickhandler. added column extensions to Cronks, fixed icons missing in column selection, modularisation fixes

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8aee5b7b7a1dd0958a418abf5f8eaa0c1b1b3f67
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 12 16:47:36 2011 +0200

    * Removed template based refresh and pagination values (fixes #1817)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=f4c6b7cb49f2b70fc9c54b55aae011991f53e006
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 15:33:44 2011 +0200

    * Fixed drop action

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d076dad0fdf88f1d09843dd0acbc7b393d70f28f
Merge: e909f50db714d483589f7efeaa619132d3bda887 f044a9fb1773fb604a41903294f56bb5f27c1dc7
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 15:11:27 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=f044a9fb1773fb604a41903294f56bb5f27c1dc7
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 12 15:11:00 2011 +0200

    * removed with

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=e909f50db714d483589f7efeaa619132d3bda887
Merge: fd708b05ee5eb3dbef85418079abf057d8666130 c84ef987bcf38b0f0c6ae9c12bd5357b866a3ce3
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 15:09:48 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=5b84cff4ffb5b6d7aac86f1a48dca8d3cb91dddb
Merge: c84ef987bcf38b0f0c6ae9c12bd5357b866a3ce3 fd708b05ee5eb3dbef85418079abf057d8666130
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 12 15:00:17 2011 +0200

    Merge branch 'mhein/testing' of ssh://git.icinga.org/icinga-web into jmosshammer/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=fd708b05ee5eb3dbef85418079abf057d8666130
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 14:41:10 2011 +0200

    * fixes #1816

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=c84ef987bcf38b0f0c6ae9c12bd5357b866a3ce3
Merge: 0ee43ad1d86246b0e023865c84d1bc80058b2b34 370c341d0fe60070f3b6e2400ed7ecc6b85ddfba
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 12 14:35:54 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=0ee43ad1d86246b0e023865c84d1bc80058b2b34
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 12 14:34:59 2011 +0200

    * Added PHPSeclib implementation instead of libssh

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=370c341d0fe60070f3b6e2400ed7ecc6b85ddfba
Merge: 0db32fcc3c28650ace628913ff7ec360b615fa12 b81df97245e6d5f0ebf424d672dae20c4f16eec3
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 14:26:31 2011 +0200

    Merge branch 'mhein/testing'

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b81df97245e6d5f0ebf424d672dae20c4f16eec3
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 14:26:10 2011 +0200

    * Installation fixes for Reporting

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=0db32fcc3c28650ace628913ff7ec360b615fa12
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 14:10:30 2011 +0200

    * Install fixes

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=52966c5f13427326ae43d826a1c9836b1a71db70
Merge: a132c002e106abfbb284fcfd455f8f0f5f9a3c6f 83135a1510309545344214f36c7015a39706d348
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 13:34:16 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=83135a1510309545344214f36c7015a39706d348
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 12 12:44:23 2011 +0200

    * Added session-caching for principals

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=a132c002e106abfbb284fcfd455f8f0f5f9a3c6f
Merge: 53bec97d8c9a6bc89a2300a7a62b61942cbd28a5 c09e3459d0cf1e893b607666f5dd19ac877a685d
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 12:28:24 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=53bec97d8c9a6bc89a2300a7a62b61942cbd28a5
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 12:26:41 2011 +0200

    * Testing starts now only from make (fixes #1814)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=c09e3459d0cf1e893b607666f5dd19ac877a685d
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 12 12:01:27 2011 +0200

    * Search now stays open on click, services are displayed on host-click (fixes #1815)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=3a246a65b5101c90da767429e856f5da41e96b94
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 12 11:41:42 2011 +0200

    * Excluded disabled hostgroups in view

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=034cf914953da4127d35276223d7e698a7a4ebb7
Merge: 31425cd7f79749c54870771f8d19e162e0b2f3d4 845cb9c46c7c164d3a6c2ea4ac7675359eabd9b8
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 12 11:21:13 2011 +0200

    Merge branch 'mhein/testing' of ssh://git.icinga.org/icinga-web into jmosshammer/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=845cb9c46c7c164d3a6c2ea4ac7675359eabd9b8
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 11:19:04 2011 +0200

    * Changed menu route for about

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=31425cd7f79749c54870771f8d19e162e0b2f3d4
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 12 11:19:01 2011 +0200

    * Due to a bug in doctrine, CronkGridTemplateWorker retrieves data now as array

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=02d9e6f7601440cb896051fae3f235967f4567b9
Merge: 97a58c7b631b4cd77bc0dbdcd9abf9a8e83c85a1 c7fb653344bec7df527f3d87b39539f7d8917a4e
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 11:12:48 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=97a58c7b631b4cd77bc0dbdcd9abf9a8e83c85a1
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 11:12:03 2011 +0200

    * Moved js action to squishloader action because of etag handling (fixes #1813)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=c7fb653344bec7df527f3d87b39539f7d8917a4e
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 12 09:28:42 2011 +0200

    * Added host_id to default sort in host view to prevent hosts not showing in pagination when they have exactly the same check dates

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=37086c14ec98405ff6e4ed9e9067ee99c0f2efa4
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 12 09:22:46 2011 +0200

    * Applied new translations from pootle (THANKS TO ALL TRANSLATOR
    * DOING THIS GREAT WORK!) fixes #1811

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=81a876d1cf309f00d3f12cb583d9645d3d76e0b8
Merge: d6f768fd95d8eb37363483fbe8ebd253de55b0bd 7ea3adec657c8db4ee99884d87e062ba4a304815
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 17:51:23 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=7ea3adec657c8db4ee99884d87e062ba4a304815
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 17:51:05 2011 +0200

    * Added icinga.css

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d6f768fd95d8eb37363483fbe8ebd253de55b0bd
Merge: bb2798598d7b7a71b4dcda53f606a378e2f42d69 0f4bc9f5e198caed71ce2c42c33b6c3bc64f7325
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 17:49:11 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=0f4bc9f5e198caed71ce2c42c33b6c3bc64f7325
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 17:44:57 2011 +0200

    * Fixed tyepo from conflict

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=bb2798598d7b7a71b4dcda53f606a378e2f42d69
Merge: 04d2b3a1943beecbb48b7f193b6aa510baa7fb94 c577b5d37297cab8b8446ca1ef96d629818145a4
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 17:37:48 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=c577b5d37297cab8b8446ca1ef96d629818145a4
Merge: 0b9e08e328e30bfe0cc4cf378968c2024dda5572 76fd306b7f2fc1a51981f28a9e7df6ef87a6d029
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 17:35:46 2011 +0200

    Merge branch 'mhein/testing' of ssh://git.icinga.org/icinga-web into jmosshammer/default
    
    Conflicts:
    	app/modules/Api/lib/datastore/IcingaStoreTargetModifierModel.class.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=04d2b3a1943beecbb48b7f193b6aa510baa7fb94
Merge: 2254006f093a876db565d1b0e71a8c0e2439883d dbd53a5d77b3d4e9ce8ca22f0154abcc439a2406
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 17:35:28 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=2254006f093a876db565d1b0e71a8c0e2439883d
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 17:34:54 2011 +0200

    * Fixed small overview cronks (fixes #1808)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=7ac3e10e7867f2e52233c9f914f7055e14349f08
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 17:31:45 2011 +0200

    * Fixed config handler issue (sub module include databases)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=0b9e08e328e30bfe0cc4cf378968c2024dda5572
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 17:31:27 2011 +0200

    * Added failure fallback for IcingaStoreTargetModifier w/o columns given

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=01b5fcbc7989bde0cfb98bd8d79a2104ce490faf
Merge: dbd53a5d77b3d4e9ce8ca22f0154abcc439a2406 6df27c9ede23bc1e8e34c185221a539d9ab21e2e
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 17:30:16 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=dbd53a5d77b3d4e9ce8ca22f0154abcc439a2406
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 17:27:12 2011 +0200

    * Removed duplicated cronk loadings on start (fixes #1804) and added open problems summary to hosts (fixes #1803)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=76fd306b7f2fc1a51981f28a9e7df6ef87a6d029
Merge: 6beb66b0dacd79c7564e48f90de9cae9390d7311 8d51b9907cad0004284a32f6a8db6fec9afc5efe
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 16:43:36 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing
    
    * Also added DDTabPanel (fixes #1807)
    
    Conflicts:
    	app/modules/Api/actions/ApiSearchAction.class.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8d51b9907cad0004284a32f6a8db6fec9afc5efe
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 16:27:43 2011 +0200

    * fixed default columns not working in search

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=6beb66b0dacd79c7564e48f90de9cae9390d7311
Merge: 887854d4bafd83f370230a978f37dc4c37acbe99 d37522aa6a3d9163d64e99c6298d0471ddcaeb7e
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 16:18:28 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d37522aa6a3d9163d64e99c6298d0471ddcaeb7e
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 16:15:27 2011 +0200

    * Fixed wrong variable in check

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=887854d4bafd83f370230a978f37dc4c37acbe99
Merge: 1417c30a4274370323cbf38ccfd005be1deec91a 634bb915dd45dc075cf8c65b82d6cd6f61334b80
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 16:13:44 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=634bb915dd45dc075cf8c65b82d6cd6f61334b80
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 16:13:06 2011 +0200

    * Made api more tolerant, added slash to folder definition in logging.xml.in

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=1417c30a4274370323cbf38ccfd005be1deec91a
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 14:16:36 2011 +0200

    * Applied coding style (ref #1536)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=04c7fc79c915b8a23399877b582ea36950a14a73
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 14:16:36 2011 +0200

    * Added astyle config

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=6df27c9ede23bc1e8e34c185221a539d9ab21e2e
Merge: 114909bda538d87054150c6d9e336af013e8ebfe 1e365827d8170eb52ea407f9a9cbf4c244658e48
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 13:47:40 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=114909bda538d87054150c6d9e336af013e8ebfe
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Aug 11 13:47:06 2011 +0200

    * Cleanup pt2 (fixes #1530, fixes #1532)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=1e365827d8170eb52ea407f9a9cbf4c244658e48
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 12:26:08 2011 +0200

    * Removed timezone conversion in translation.xml.in (fixes #1733)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=df15c0adb0699e65f88a763a3207848ca214747c
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 11:49:41 2011 +0200

    * Fixed makefile type (fixes #1801)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b15dbc475e6ebd58ff4d99eb31d5b8f1870e6d6d
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 11:46:26 2011 +0200

    * Fixed appkit.admin routing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=85e2347856326bc1afca669c7d71dd642b2a5e69
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 11:29:03 2011 +0200

    * Moved config files to etc/conf.d (or --with-conf-folder, fixes #1708), moved log to log (or --with-log-folder, fixes #1714)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=87ccfbbd675e3531e001e8bf9851838490c89f98
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 10:52:30 2011 +0200

    * Fixed css typo that killed the layout on non-WebKit browser

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ad9d4a2d2bc6d867d019eb076afe65bdeeeb02cb
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 08:38:51 2011 +0200

    * Removed squishloader from configure

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b45f3fcca2ff17287aa92a73261061d954b42e7e
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 08:37:33 2011 +0200

    * Added caching for template xmls, removed Agavi-based Squishloader cache

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=7cce2444a988bc712ecaeab0fb5181ba6f761e7d
Merge: cd499a264283031d8d7ce6581519c132b4451361 0a0d70099ea634a91609f0ca74d08fea17759e70
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Aug 11 08:23:03 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default
    
    Conflicts:
    	app/modules/AppKit/config/autoload.xml
    	app/modules/AppKit/lib/context/AppKitAgaviContext.class.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=cd499a264283031d8d7ce6581519c132b4451361
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Aug 10 19:04:40 2011 +0200

    * updated gitignore

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ceb1596779b58e49c578b96c12c60fad67992361
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Aug 10 19:03:13 2011 +0200

    * Added unhandled host/service problems (fixes #1614) added lazy loading of comments (fixes #1806)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=0a0d70099ea634a91609f0ca74d08fea17759e70
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 10 14:35:43 2011 +0200

    * Cleanup AppKit library (fixes #1531)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=83ce3e1f33791bcef8f91da5c0fc82415771da30
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Aug 10 13:56:39 2011 +0200

    * added configure flag to squishloader cache

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=64a401b1bbee3e886f68a2f08d866adcf05556c6
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Aug 10 10:56:17 2011 +0200

    * Fixed old IcingaApi definition breaking ObjectSearch

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=eaaf53595e21e56fea694099ee67164add8db3f2
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Aug 10 10:45:29 2011 +0200

    * Compiled doctrine, added config-property in module.xml for using the compiled version, moved Doctrine-specific changes to
    * own AppKitDoctrineDatabase class and added caching configuration in databases.xml

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=64ce97f7166f58b4ae715c7a2d93842f5fef34eb
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Aug 9 18:39:59 2011 +0200

    * Added custom caching mechanism for squishloader (uses ETags)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=830e6dfb363a1a70f7d8d84a4928a5df3de50134
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Aug 9 14:48:12 2011 +0200

    * Updated stylesheet for menubar

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=73b4e261e4d9f0367da3ce9d8b5f2a5fceab89b3
Merge: 6d783075a6d2e0c0b08defa3093d254f4a03e6be 4be5ffb1168a05f478f23958dbe8970fe53f9ca2
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Aug 9 14:37:57 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default
    
    Conflicts:
    	app/modules/AppKit/config/module.xml
    	app/modules/AppKit/templates/Ext/HeaderSuccess.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=6d783075a6d2e0c0b08defa3093d254f4a03e6be
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Aug 9 14:16:11 2011 +0200

    * Forgot config_handler.xml changes

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=f231d82838c1c2f53d72e7203a92817ee6392628
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Aug 9 14:13:28 2011 +0200

    * Rewrite of menubar, removed events, added AppKitLinkedList (that is used by the menu), replaced DoctrineSessionStorage with simple AgaviSessionstorage
    * which should be a major performance improvement

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=4be5ffb1168a05f478f23958dbe8970fe53f9ca2
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 5 14:12:26 2011 +0200

    * Fixed simpleDataProvider URL  (ref #1548)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=869869e2f7fd7de40e92468f767bc63aae8a593a
Merge: e295e8cbb6632d734c461010e30d4b77bce3d86e 062a430bd0bd9a52f6df8f83f32e95268d4b7e35
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 5 14:13:34 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=e295e8cbb6632d734c461010e30d4b77bce3d86e
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 5 14:12:26 2011 +0200

    * Removed global routing space and moved everything into modules (ref #1548)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=062a430bd0bd9a52f6df8f83f32e95268d4b7e35
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 5 12:55:20 2011 +0200

    * Removed initializeModule from index and added AgaviAppKitContext to compile.xml

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=32fa4b0da57348429c0a8f8748736ee72f7be954
Merge: 5ed55109433a6bff2098c6ab78d204438bbaf503 bca31028bf9f15837ec531ca7e5581cd1b55ea03
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 5 12:24:07 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=5ed55109433a6bff2098c6ab78d204438bbaf503
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 5 11:26:28 2011 +0200

    * Added agavi javascript actions to javascript config handler (ref #1548)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=bca31028bf9f15837ec531ca7e5581cd1b55ea03
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 5 11:14:34 2011 +0200

    * Added dispatcher routes to Ext.Ajax and Ping action to avoid false-positives on server-down check

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=f9551a52bdf4216609a6c35c6184cb4eba26044f
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 5 09:17:54 2011 +0200

    * Added (HOST|SERVICE)_PROCESS_PERFORMANCE_DATA to target defs

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=93340db0a41ef7019e0f42e086c3bf130e15cd7d
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 3 15:33:14 2011 +0200

    * Removed the module util (ref #1548)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=7cde0ba5d0cc3e90ed3ec19d6f149f4e01281517
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 3 14:41:37 2011 +0200

    * Removed the javascript dynamic loader (fixes #1534)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=2d4765aa53ad2ff608e3f359be1de138e655d061
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 3 12:37:03 2011 +0200

    * fixes #723 cookie for login credntials

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=df06e9da59b6b6b145299ca1045765c10faa5149
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Aug 3 10:29:42 2011 +0200

    * Removed some php5.2 errors

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ab3898c2e8ac03cac5697ca264f1a763c1809b42
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 2 13:26:15 2011 +0200

    * Finished merge of new module based configuration (II)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=233548439d054cbd6df4cedc9cf23bf3a6d2ae59
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 2 15:18:28 2011 +0200

    * Removed PHP syntax error getting contants from dynamic class

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=862def0a25e446dd6a83418cafb35ec3b1afbdc1
Merge: acd2c80e49af713c71c8e2039843c6bada688a86 b28a702010a6e56e350f8814359ba8c845af27fb
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 2 13:26:42 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=acd2c80e49af713c71c8e2039843c6bada688a86
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 2 13:26:15 2011 +0200

    * Finished merge of new module based configuration

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=22e32f1721f765fa22fa9f2918f0f41c39a883b5
Merge: df6515284a7f24504a6f23931b1a80fbb41aa0fa ededf0ecb72e978e79845931e98a85fe66977936
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug 2 10:58:15 2011 +0200

    Merge branch 'elippmann/config_handlers' of git.icinga.org:icinga-web into mhein/testing
    
    Conflicts:
    	app/config/config_handlers.xml
    	app/config/routing.xml
    	app/modules/AppKit/actions/Widgets/AddHeaderDataAction.class.php
    	app/modules/AppKit/actions/Widgets/SquishLoaderAction.class.php
    	app/modules/AppKit/config/autoload.xml
    	app/modules/AppKit/config/module.xml
    	app/modules/AppKit/lib/html/AppKitBulkLoader.class.php
    	app/modules/AppKit/lib/model/AppKitBaseModel.class.php
    	app/modules/AppKit/models/HeaderDataModel.class.php
    	app/modules/AppKit/models/SquishFileContainerModel.class.php
    	app/modules/AppKit/views/Widgets/AddHeaderDataSuccessView.class.php
    	app/modules/AppKit/views/Widgets/SquishLoaderSuccessView.class.php
    	app/modules/Cronks/config/module.xml
    	app/modules/Reporting/config/module.xml

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b28a702010a6e56e350f8814359ba8c845af27fb
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Aug 2 09:59:55 2011 +0200

    * Fixed typo that crashed php 5.2.x

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=946989ef09a0b83f83da7386cdd692c7e6e4e462
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Aug 2 09:52:03 2011 +0200

    * fixed xmls

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=df6515284a7f24504a6f23931b1a80fbb41aa0fa
Merge: d64ada4a77f391b5af86de2826cd70a8a3f024e1 5642c6faf0e679ac65f59b64f6a97018a984ee00
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 1 15:14:00 2011 +0200

    Merge branch 'master' into mhein/testing
    
    Conflicts:
    	app/modules/AppKit/config/module.xml

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=5642c6faf0e679ac65f59b64f6a97018a984ee00
Merge: 2035ab5b8764545acf7bd7381884b9d31f494e7d 3960125883ba4c04c31a60b383c95edf9741b254
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 1 13:20:49 2011 +0200

    Merge branch 'mhein/reporting'
    
    Conflicts:
    	app/modules/Reporting/lib/js/Icinga.Reporting.Cronk.js

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=3960125883ba4c04c31a60b383c95edf9741b254
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 1 13:19:15 2011 +0200

    * REPORTING: Fixed merge structure

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=2035ab5b8764545acf7bd7381884b9d31f494e7d
Merge: 947a54b11562213d144bd8cc6bdc13e6bd5772ab 89bfad565f02c1b90f301ab3ad7acc25b1e409f3
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 1 13:15:57 2011 +0200

    Merge branch 'master' of git.icinga.org:icinga-web
    
    Conflicts:
    	app/modules/Reporting/lib/js/Icinga.Reporting.Cronk.js

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=947a54b11562213d144bd8cc6bdc13e6bd5772ab
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 1 09:35:07 2011 +0200

    Merge branch 'mhein/reporting'

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=89bfad565f02c1b90f301ab3ad7acc25b1e409f3
Merge: 3b490e24a7cdc90e094858344d04635fbfef192d d49f7d923ac3cecad8295516b0062d6af678610d
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 1 09:35:07 2011 +0200

    Merge branch 'mhein/reporting'

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d49f7d923ac3cecad8295516b0062d6af678610d
Merge: 15fda344c68755188d15724960e8598bd25f6c2a ee10e9c5308838ade042d7cbcf72926a649b8ed6
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 1 09:29:54 2011 +0200

    Merge branch 'mhein/reporting' of git.icinga.org:icinga-web into mhein/reporting
    
    Conflicts:
    	app/modules/Reporting/lib/js/Icinga.Reporting.Cronk.js

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=15fda344c68755188d15724960e8598bd25f6c2a
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug 1 09:28:39 2011 +0200

    * REPORTING: Ready for release

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d64ada4a77f391b5af86de2826cd70a8a3f024e1
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 29 18:58:02 2011 +0200

    * Added logging for queries

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ba4812274a9a95704f708d01a5b80c14e1699518
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 29 18:26:34 2011 +0200

    * Fixed installation

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=0cef24db3a27db984c03ca5de300271e90416249
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 29 08:15:43 2011 +0200

    * Fixed relations, cleaned up configs/vim swp files

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ee10e9c5308838ade042d7cbcf72926a649b8ed6
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Jul 28 15:19:24 2011 +0200

    * REPORTING: Work in progress

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=324dee03b867c1ec8f8193637e4ee2a2346ca9e9
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Jul 28 11:28:19 2011 +0200

    * REPORTING: pre merge

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=3fa3e1f2ffb8ea44c0bbbd241c0f55ddaf4339b3
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jul 27 15:50:37 2011 +0200

    * REPORTING: Working stage

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=a0c6a7217055771f94d0707cbcf06d2b97f985cc
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Jul 27 11:08:55 2011 +0200

    * Updated configure

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=2dda181f3c7a39fb309a8d046ffd83abd283a9f2
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Jul 27 10:53:14 2011 +0200

    * Removed the icinga-api dependencies and created Commanddispatcher, several fixes in relations

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ededf0ecb72e978e79845931e98a85fe66977936
Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Tue Jul 26 14:18:46 2011 +0200

    * Fixed AppKitResourceConfigHandler using values of directory iterator's array instead of keys
    * Added try catch to missing xincludes
    * Allowed array syntax for pointer definition of AppKitXIncludeConfigHandler since Agavi is not capable of multiple config handlers for one file (which I assumed)
    * Dropped second css.xml handler and updated the remaining one
    
    refs #1548

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=1414202fea679cb3d12136425d048192c140c7db
Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Tue Jul 26 11:19:42 2011 +0200

    * Removed squishloader.css route
    * Added styles.css route allowing url(../images*) for module css files
    
    refs #1548

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=75b3960c914997e200a2861f3519d2da2ed3ab38
Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Mon Jul 25 17:28:39 2011 +0200

    * Added css / css_import processing to AppKitResourceConfigHandler
    * Moved css imports from module.xmls to own files
    * Revamped AddHeaderDataAction
    * Dropped meta config from module.xml but added to template
    * Dropped HeaderData model
    
    refs #1548

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=4cca607779bc2b01827328cfe5d69536bd598ee3
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Jul 25 15:57:42 2011 +0200

    * REPORTING: Working stage

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b84cb11563f8eeee7c36baa604af52a02360d109
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 22 17:17:12 2011 +0200

    * Removed debug print_r

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=0cda6e9a64f8838957727288dfaa9eb5e3e30265
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 22 17:14:11 2011 +0200

    * Several LegacyLayer fixes, only statusmap query must be fixed

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=236d38a6500a54001b9b0331a2018c6207059c58
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Jul 22 17:01:30 2011 +0200

    * REPORTING: Fill scheduling form from soap request

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=e2b09a1a829a0eb6cede62e77cc0ed1788147823
Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Fri Jul 22 12:47:13 2011 +0200

    * Removed AppKit BulkLoader from autoload

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=a2509a583c317ca84d7f669fd4c6298277425e50
Merge: 2a21e1c2e56e20c2a1344139b240c506d4924abb 3b490e24a7cdc90e094858344d04635fbfef192d
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 22 10:08:33 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default
    
    Conflicts:
    	app/modules/AppKit/actions/Login/SilentAuthAction.class.php
    	app/modules/AppKit/lib/context/AppKitAgaviContext.class.php
    	app/modules/AppKit/lib/util/AppKitFileUtil.class.php
    	app/modules/Cronks/config/cronks.xml
    	app/modules/Web/lib/template/IcingaTemplateWorker.class.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=2a21e1c2e56e20c2a1344139b240c506d4924abb
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 22 09:55:54 2011 +0200

    * Fixed parent_host relation, fixed LegacyApiQueries

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=acafaf090f89115ae1aeb2c2036866f5223055fc
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 22 09:54:59 2011 +0200

    * Added cronks.xml from mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ffbfae93473aa5b5ba2b6fe24792edb2779fa428
Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Thu Jul 21 16:27:41 2011 +0200

    * Added AppKit_BuldLoader model, replacing class AppKitBulkLoader
    * Added minify tasks to loader
    * Adapted SquishFileContainer model to use the new model

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d5fadaf517c092cece8aefb69f2f96dab1de08c1
Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Thu Jul 21 12:11:03 2011 +0200

    * Added AppKitXIncludeConfigHandler which includes module config files into their global equivalent respectively
    * Added xsd/xsl validation/transformation for configs handled with AppKitXIncludeConfigHandler
    * Added AppKitResourceConfigHandler which collects modules' javascript and stylesheet (not yet) includes
    * Added AppKit_Resources model holding those includes
    * Outsourced modules' javascript includes to own files
    * Adapted global config_handlers and SquishLoader for the changes to take effect
    
    refs #1548

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=3b490e24a7cdc90e094858344d04635fbfef192d
Merge: c8642a4938abea63b89117cbc5f8fc0adec38cb2 61811b516d3eae06d5928d9e1de0b44eb7275687
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jul 20 08:40:41 2011 +0200

    Merge branch 'mhein/reporting'

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=61811b516d3eae06d5928d9e1de0b44eb7275687
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Jul 19 15:50:47 2011 +0200

    * REPORTING: Rewritten the constants handling of jasper
    * REPORTING: Started scheduleing implementation

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=da5f844b920f715538b6286eb9387a1e8a7b1882
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Jul 19 07:33:49 2011 +0200

    * Current working state

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=c8642a4938abea63b89117cbc5f8fc0adec38cb2
Merge: 1e4f122502d3f4a0e63481e683fa8b20382a102d f771adeb410e4fef4b78c6946190337f87133be7
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Jul 18 10:39:06 2011 +0200

    Merge branch 'mhein/reporting'

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=1e4f122502d3f4a0e63481e683fa8b20382a102d
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Jul 18 10:38:39 2011 +0200

    * Added global temp directory

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=f771adeb410e4fef4b78c6946190337f87133be7
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Jul 18 10:37:04 2011 +0200

    * Fixes grid filter (fixes #1564)
    * REPORTING: Resource view ready now

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b997f182d8d9dbab15027560dc7d22be1f6771a7
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Jul 15 15:51:47 2011 +0200

    * REPORTING: Add resource tab panel
    * REPORTING: Added preview for resource data

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=50f0021f64e5eeacec66e8d09e84c8c803307c8c
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 15 15:00:33 2011 +0200

    * Changed Icinga-Api functions to be able to call doctrine based legacy layer

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=0a6fb326da2093c432ab6d3be9ef0d04964fa2e4
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 15 14:57:05 2011 +0200

    * Added grouping functions to query, LegacyLayer only needs filtering to be finished
    * Fixed some relations and made the alias functions more comfortable
    *

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=10771dd11a042dc07c69e81f67baa9bb27231f4f
Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Fri Jul 15 14:18:15 2011 +0200

    * Added folder creation (app/cache/config) to make devel-inplace-config

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=60132b5a1c54f9666f1785e7d5f6d92efa4247f6
Merge: a79e9b0a5b85202b88c708f5e4dfc46993382949 a76918047365a6428023960fcc59096410a84f1a
Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Fri Jul 15 14:11:49 2011 +0200

    Merge branch 'master' of git.icinga.org:icinga-web into elippmann/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=a76918047365a6428023960fcc59096410a84f1a
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jul 13 15:00:04 2011 +0200

    * Reporting: Added missing files

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=fcfffda7c00b875cea9f0c0fff2c290f42cd879d
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jul 13 14:59:20 2011 +0200

    * Added fix for filters in grid

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=180e7840d34f01095041096b9ec441aa10889cfd
Merge: dc55be9e9576c33d4bc566c4dd2355914b403566 b6e9eb9a3a4960b8c4127118efd460bb4d87424a
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Jul 13 07:55:38 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default
    
    Conflicts:
    	app/modules/AppKit/actions/Admin/Users/EditAction.class.php
    	app/modules/AppKit/actions/Login/SilentAuthAction.class.php
    	app/modules/AppKit/models/Auth/DispatchModel.class.php
    	app/modules/AppKit/models/UserAdminModel.class.php
    	app/modules/Cronks/models/Provider/CronksDataModel.class.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=a619b8150ab1793df15724863d5c1879c5821910
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Jul 12 16:58:06 2011 +0200

    * Reporting: Added multipart soap client
    * Reporting: Changed multipart implementation to new client

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=dc55be9e9576c33d4bc566c4dd2355914b403566
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon Jul 11 21:42:02 2011 +0200

    * Removed working files

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=91719fbe0d788fdd91df3ab653a966c49469fa58
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon Jul 11 21:40:52 2011 +0200

    * Fixed some relations, added raw setting of all icinga-api targets

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d1952ecb756691394b9ad8408546b3fdba0d8b4d
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Sat Jul 9 10:23:51 2011 +0200

    * Created custom adapter for oracle and fixed several model issues
    NOTE: The icinga-Api should now work in oracle without any changes in code. The driver name
    herefore is icingaOracle://... and it reparses the sql prior to executing it (it's not very nice
    but the cleanest way to realize it i found - and I tried EVERYTHING :) )

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=39ca1234dda8eed4ae908133f009a195579c9cd6
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Jul 7 17:18:36 2011 +0200

    * Reporting: Added repository node
    * Reporting: Better tree, icons, qtips, tree filter

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b6e9eb9a3a4960b8c4127118efd460bb4d87424a
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Jul 7 13:43:37 2011 +0200

    * Fixed "SilentAuth" login issue
    * Disabled silent user could not login
    * Fixed session creation for silent providers

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=867f5803edccd14edb2821deecbbc69d6669ed20
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Jul 7 12:53:52 2011 +0200

    * Oracle fix for editing users with principals

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=426e2a1932ae680708491e5753414d306a00d0ea
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jul 6 17:14:59 2011 +0200

    * Rewritten report form handling in JS
    * Reports: Added preview option with html reports
    * Reports: Better UI integration

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=261fad312db6a7c6b749d3ecf54531d2c62267a6
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jul 6 14:10:22 2011 +0200

    * Added oracle fix for deleting cronks

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=458841f1c52248e0cadb64110530a75827e80bd5
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Jul 5 17:00:03 2011 +0200

    * Extended Doctrine to support n-m relations without being forced to use the primary key

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=314a00e3e50bfd23125c13d1f7304aca0e6bb5fb
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Jul 5 09:51:46 2011 +0200

    * Added additional output types
    * Better parsing of multipart response
    * Added HTML embedded images for HTML export

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8f1b755695cdf15d3cc2405034ae6b849c57a73d
Merge: eaa7cad278aba9baa45f30254c3fd617626c8b9f 87cecf940224ff860bc57bf5a8a1ea27e0cf5115
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon Jul 4 12:41:33 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default
    
    Conflicts:
    	app/modules/AppKit/config/autoload.xml
    	app/modules/AppKit/lib/util/AppKitXmlUtil.class.php
    	app/modules/Cronks/config/cronks.xml

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=eaa7cad278aba9baa45f30254c3fd617626c8b9f
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon Jul 4 12:35:38 2011 +0200

    * Added additional relations to doctrine models, started LegacyLayer for Icinga-Api emulation

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=87cecf940224ff860bc57bf5a8a1ea27e0cf5115
Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Jul 4 09:54:16 2011 +0200

    * Fix for FF4

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8a7438cef1b4438e7d26d3deb64abe3ac7d76e38
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Fri Jul 1 21:35:32 2011 +0200

    * Added a bunch of PHPDoc tags to store/data classes

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9a527a0ac831835774afc838d96e848b4a2de9c2
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Jul 1 13:39:05 2011 +0200

    * Bugfixes, reporting and session only for PHP5.3

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=37db20f458a06b794c2fb6b71fd0b3ee92c98686
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Jul 1 12:41:33 2011 +0200

    * Working stage final

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=39565af64ff200e4838dd585bdde08830291836e
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Jun 30 23:57:19 2011 +0200

    * Working stage

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=fff6a8c5619ad1495eb6977a94b33e5173acb393
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Jun 30 16:08:39 2011 +0200

    * Working stage

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8c83c561bbbc126a68e684f5f46f5961c521e1a6
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 29 23:19:37 2011 +0200

    * Added initial reporting module

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ff3b392bd99ca4656e84f24fb4edfb39e084d6c5
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Jun 28 18:54:37 2011 +0200

    * Updated tests

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9a5ae3f8ae6a972ef8436833556ff60f3a7b84af
Merge: aa37619ca5d56792c95e34da888bab17ea8e786e a216431bb4af0d8b1c927d1c73f32747e42ab579
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Jun 28 17:11:21 2011 +0200

    Merge branch 'mhein/testing' of ssh://git.icinga.org/icinga-web into jmosshammer/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=aa37619ca5d56792c95e34da888bab17ea8e786e
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Jun 28 17:10:29 2011 +0200

    * Grid concept works, needs some tweaking in the filtering, but this can be handled when it will be implemented in icinga 1.6

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=dd2791f409b1062f41092892d0b009f862cf7700
Author: Marius Hein <marius.hein at netways.de>
Date:   Sat Jun 25 13:20:52 2011 +0200

    * Provded oracle fix for session garbage collector

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=a216431bb4af0d8b1c927d1c73f32747e42ab579
Author: Marius Hein <marius.hein at netways.de>
Date:   Sun Jun 26 12:06:27 2011 +0200

    * Changed clear cache to agavi way

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=0425a5286d05f175db3a7937b280f2027fa22b7e
Merge: 453fc4cc259286c97e515c6534352fdea929488c 7d63bb602f19c8e74ec48b69a00cf4fb5f4f27af
Author: Marius Hein <marius.hein at netways.de>
Date:   Sun Jun 26 11:43:13 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=7d63bb602f19c8e74ec48b69a00cf4fb5f4f27af
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Sun Jun 26 11:33:54 2011 +0200

    * removed debug output

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d30255cec126fbe68d40a2412fd014deeca08383
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Sun Jun 26 11:30:37 2011 +0200

    * Patched agavi exceptions and classes for doctrine connection

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=1b05582ef962cb22f983ece80d7c38b370eead35
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Sun Jun 26 11:22:15 2011 +0200

    * Added IDispatchable

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=e423cfac376703a52e9e60635beff50af123154b
Merge: cb2c7e0c9acd7d0563436723373454ffca41f4a8 25d93fb5c7ec1d60cb691272c1381d71748a3030
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Sun Jun 26 11:20:52 2011 +0200

    Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default
    
    Conflicts:
    	app/modules/Cronks/config/cronks.xml
    	app/modules/Cronks/models/System/StaticContentModel.class.php
    	app/modules/Cronks/models/System/StaticContentTemplateModel.class.php
    	app/modules/Cronks/views/System/StaticContentSuccessView.class.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=cb2c7e0c9acd7d0563436723373454ffca41f4a8
Merge: ec319694bd9e9f7c7f85843600f31b1e8c4cb22d 9ab4e4f3f4ae24b0472761181fdbc2416f3ec069
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Sun Jun 26 11:14:50 2011 +0200

    Merge branch 'mhein/testing' of ssh://git.icinga.org/icinga-web into jmosshammer/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=453fc4cc259286c97e515c6534352fdea929488c
Merge: 9ab4e4f3f4ae24b0472761181fdbc2416f3ec069 ec319694bd9e9f7c7f85843600f31b1e8c4cb22d
Author: Marius Hein <marius.hein at netways.de>
Date:   Sun Jun 26 11:14:09 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ec319694bd9e9f7c7f85843600f31b1e8c4cb22d
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Sun Jun 26 11:06:59 2011 +0200

    * Added JS functions for frontend

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9ab4e4f3f4ae24b0472761181fdbc2416f3ec069
Author: Marius Hein <marius.hein at netways.de>
Date:   Sat Jun 25 13:20:52 2011 +0200

    * Provded oracle fix for session garbage collector

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=25d93fb5c7ec1d60cb691272c1381d71748a3030
Author: Marius Hein <marius.hein at netways.de>
Date:   Sat Jun 25 13:20:52 2011 +0200

    * Provded oracle fix for session garbage collector

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b6da33ecb4e13e4f9cbf835cdc51194ac60f9882
Author: Marius Hein <marius.hein at netways.de>
Date:   Sat Jun 25 08:45:22 2011 +0200

    * Fixed translation issue (fixes #1671)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9f6bb962827c5a6971c12485532792780171a4bb
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 22 09:03:33 2011 +0200

    * Upgraded to agavi 1.0.5

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8832c25ce321bf387f3e43452bb40504841a0f8c
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 22 08:44:52 2011 +0200

    * Added icinga-web db oracle default config option (fixes #1284)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8eda7ea4a39702906b2c37568a0ab591df778e05
Merge: eec2600a341e7fc8cabc6260f14c375618d78c02 8074c0aa0c706d29ab115b100662d2a2eb289001
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon Jun 20 11:04:44 2011 +0200

    Merge branch 'mhein/testing' of ssh://git.icinga.org/icinga-web into jmosshammer/default
    
    Conflicts:
    	tests/phpunit/runSuite.sh

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=eec2600a341e7fc8cabc6260f14c375618d78c02
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon Jun 20 11:00:53 2011 +0200

    * Almost finished server side part of api creationJ:

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8074c0aa0c706d29ab115b100662d2a2eb289001
Merge: a46b9e729459117997d80c1df973206ddc713df1 66a17e5b3b17eeef960da518225a903ff8a9cf3c
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 15 15:57:02 2011 +0200

    Merge branch 'mhein/testing' of git.icinga.org:icinga-web into mhein/testing
    
    Conflicts:
    	app/config/config_handlers.xml
    	app/modules/AppKit/config/autoload.xml
    	app/modules/AppKit/lib/module/AppKitModuleUtil.class.php
    	app/modules/TestDummy/config/module.xml
    	tests/phpunit/tests/module/ModuleLoadingTest.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=a46b9e729459117997d80c1df973206ddc713df1
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 15 15:53:56 2011 +0200

    * Added module based translation and tests (ref #1548)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=5f3808d381823618fe69ea7692d2227153a690e9
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 15 11:30:45 2011 +0200

    * Renamed AppKitRoutingHandler -> AppKitRoutingConfigHandler

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d33e3b64967642e7908f0f4bd5b5bebc79aa987e
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Jun 14 10:09:06 2011 +0200

    * Added IcingaDoctrine_Query (readded), finished DataStoreModel

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b69a7abd7557741557ad4a393498b57cb2d12deb
Merge: 42fd32b91eab43af9ab57caa8a3e7491d4424dec 66a17e5b3b17eeef960da518225a903ff8a9cf3c
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Jun 14 08:47:10 2011 +0200

    Merge branch 'mhein/testing' of ssh://git.icinga.org/icinga-web into jmosshammer/default
    
    Conflicts:
    	tests/phpunit/suites.xml

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=42fd32b91eab43af9ab57caa8a3e7491d4424dec
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Jun 14 08:43:50 2011 +0200

    * Current working state !! unstable, just for merge !!

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=b905a4775374048cb44e4bea7e5f89435995b056
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Jun 10 15:36:49 2011 +0200

    * Independent cronk module ref (cronk.xml, AppKitModuleUticronk.xml, AppKitModuleUtil) #1548

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ae749ff07406e81912ef17c388bfdd6b16ba2a9c
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 8 12:21:36 2011 +0200

    * Added database independent configuration for modules (ref #1548)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=66a17e5b3b17eeef960da518225a903ff8a9cf3c
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 8 12:21:36 2011 +0200

    * Added database independent configuration for modules (ref #1548)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=625d0ca0df67882d76f25ae18bd9fd503b3712b6
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 8 08:08:33 2011 +0200

    * Fixed modules based routing handler
    * Added testing context for module routes
    * Added test stub module for use with phpunit

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=97489f50d62f095b2d7b050a61332afa19c03431
Merge: d4c7d729b8edb3fd3bb1f061e9a99e478375545a 9febfa198410be09cd55c69dbad581cb457ef1a5
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Jun 7 13:12:36 2011 +0200

    Merge branch 'jmosshammer/default' of git.icinga.org:icinga-web into mhein/testing
    
    Conflicts:
    	tests/phpunit/TestInit.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d4c7d729b8edb3fd3bb1f061e9a99e478375545a
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Jun 7 13:05:23 2011 +0200

    * Fixes some errors in TestInit

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9febfa198410be09cd55c69dbad581cb457ef1a5
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Jun 7 12:55:43 2011 +0200

    * Fixed problem in routing provider

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=48e089f19c25adc1358f69fa576ef55b99797130
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Jun 7 11:12:48 2011 +0200

    * Added Filter modifier for DataStore

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=542984d2913d500ee41a089bbe7e788b2a2137ea
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon Jun 6 14:07:13 2011 +0200

    * Added connection identifier to internal icinga_web doctrine models (icinga_web connection can now
    * be placed in anywhere in the databases.xml and needn't to be the last element anymore)
    * Prepared API tests to succeed where they should
    * Added 'connection' property to ConsoleCommand
    * Removed deleted files

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=2b3ab8db6e5f00c242f9da05ba4d77515b7a9d36
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Jun 4 16:10:57 2011 +0200

    add .gitattributes to ignore .git* in git archive

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=fdbf7e3006007a792a2c4b4e4d8f0d4637c9db48
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Jun 1 16:59:03 2011 +0200

    * Added AppKitJson Validator, started concrete DataStore implementation

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=a8eb290e2d4eaea5947b8eeac70e118110bec441
Merge: e458c48a2ceba2d2e5db0e1370c38bfbf5392aab 4e5f5ce416defd9731b551fe316dd5195acc1b1b
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 1 14:15:12 2011 +0200

    Merge branch 'mhein/to'

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=4e5f5ce416defd9731b551fe316dd5195acc1b1b
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jun 1 14:14:39 2011 +0200

    * Added tree-like tactical overview (based on special CV layout)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=486f66cd440554949c590387d0f14eddddbe610d
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue May 31 17:14:51 2011 +0200

    * current (unstable and not usable) working state
    * - Added Filter definitions
    * - Started DataStore implementation
    * - Started DataStoreModifier implementation
    * - Wrote tests

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=e458c48a2ceba2d2e5db0e1370c38bfbf5392aab
Author: Marius Hein <marius.hein at netways.de>
Date:   Tue May 31 10:39:13 2011 +0200

    * Upgraded bp icinga cronk

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ac166cbb2702fa386880a9ded2551b5542bcd5ff
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon May 30 18:01:56 2011 +0200

    * Validator arguments are now parsed for apiProvider routes, started action reflection in cache creation process

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=61f1faf82f16142889482e614074e0ad025e6900
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon May 30 10:43:47 2011 +0200

    * Updated to working status

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=bbac63762ca0b99c6546cbd4bad9aecb2fae2f38
Merge: 7d141e6f1bc54cf15e37bd2ea7bd78e3709d7293 69af3196cd0caca8cf5f19f5b9d419e195d4faf1
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon May 30 10:12:35 2011 +0200

    qMerge branch 'mhein/testing' of git://git.icinga.org/icinga-web into jmosshammer/default
    
    Conflicts:
    	app/modules/AppKit/lib/module/AppKitModuleRoutingHandler.class.php
    	app/modules/AppKit/lib/util/AppKitXmlUtil.class.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=7d141e6f1bc54cf15e37bd2ea7bd78e3709d7293
Merge: 5765288e7e006846bd082fe37cd35c5ef33b2cad 07a5c02d2632065414aa4d377e18d30a3ba343fa
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon May 30 10:01:20 2011 +0200

    Merge branch 'jmosshammer/default' of git://git.icinga.org/icinga-web into jmosshammer/default

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=69af3196cd0caca8cf5f19f5b9d419e195d4faf1
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri May 27 16:54:09 2011 +0200

    Merge branch 'master' into mhein/testing
    
    Conflicts:
    	app/modules/AppKit/models/Auth/Provider/LDAPModel.class.php
    	app/modules/Web/lib/principal/IcingaDataPrincipalTarget.class.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=c7a6ddbf80ea81870c7278e13514c96316985e4c
Merge: 0e5d219b4204faf8fccd3de0d798e8f383e11f1b 5765288e7e006846bd082fe37cd35c5ef33b2cad
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri May 27 16:54:09 2011 +0200

    Merge branch 'master' into mhein/testing
    
    Conflicts:
    	app/modules/AppKit/models/Auth/Provider/LDAPModel.class.php
    	app/modules/Web/lib/principal/IcingaDataPrincipalTarget.class.php

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=5765288e7e006846bd082fe37cd35c5ef33b2cad
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri May 27 16:30:02 2011 +0200

    * Applied patch from lydon, thanks, fixes #1596

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=0e5d219b4204faf8fccd3de0d798e8f383e11f1b
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri May 27 15:23:53 2011 +0200

    * Moved php tests to phpunit
    * Added CodeSniffer tests (YACS)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=dc27487bca745dfe067067df80eb29e749ca97bc
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri May 27 14:06:22 2011 +0200

    * Added padding header for control structs

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=e7f711aa2e3aa91ccf6d419bc149be6345a10768
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri May 27 12:09:47 2011 +0200

    * Part 1 of code styling

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d95bb41b5ab8ba34dedc5073883045d1d3182a83
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Wed May 25 13:16:09 2011 +0200

    * Principals now work with wildcards

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=07a5c02d2632065414aa4d377e18d30a3ba343fa
Author: jmosshammer <jmosshammer at debian.int.netways.de>
Date:   Mon May 23 19:25:38 2011 +0200

    * modules and actions for ext.direct export can now be marked in the routing xml

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=4ce95c2a8db3eab27eae5eda17410aa40f803afd
Author: jmosshammer <jmosshammer at debian.int.netways.de>
Date:   Mon May 23 14:28:09 2011 +0200

    * Replaced AppKitModuleRoutingHandler with AppKitRoutingHandler,
    * Routing XMLs can now be modified via their own xsd/xsls
    * Added own xsd/xsl files for routing and put routing in a own icinga.org context

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=bb48870b4e393e8f0a24861ad176ebb3ed59b1c9
Author: jmosshammer <jmosshammer at debian.int.netways.de>
Date:   Mon May 23 11:02:21 2011 +0200

    * Fixed compatibility with PHPUnit 3.4.x (which is default in debian squeeze)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=617469fbbc4b618bc711ef7f2b255f0d54d3fa69
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu May 19 11:06:26 2011 +0200

    * Added testing toolkit (bootstrap, properties)
    * Changed agavi bootstrapping test
    * rel #1568

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=6fca3280cf916ab4290593ee98b41d3e78f46b62
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed May 18 16:49:37 2011 +0200

    * Reorganised structure for php testing ref #1536

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=6f1f45eeb8d6a9759562dff69486d35cf39bfda3
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Wed May 18 10:58:45 2011 +0200

    * Fixed postgresql scheme

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ac5cbfc5b7c39762f592773a1340589ea383aebc
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Tue May 17 19:03:42 2011 +0200

    * Added bp bugfix for editor

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=fe60941e024d98f176da09c8e659bc9a01baa628
Author: root <root at debian.localhost>
Date:   Tue May 17 18:58:51 2011 +0200

    * Fixed #1525, fixed #1513, fixed #1509

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=c1a6364738e2361e853f925e9d0ad4c65f473dac
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu May 12 13:48:00 2011 +0200

    * Provided IE JS fix

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=fdefb8b9bf7c2548ef5a351a5aeddd5ccfe14b56
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu May 12 13:34:16 2011 +0200

    * Prepared 1.5 dev trunk

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9bccb96fc684854e5095238f9ceb165bca9e0908
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Mon May 9 13:39:31 2011 +0200

    * fixed cache clearing in bp-integration

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=003a1dc1ff5a6ea99f87c454994eb5479482ba49
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Mon May 9 13:03:06 2011 +0200

    * Chaanged delete icon in cronks, fixed preferences window not constraining to view

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=07aa4a5f6b176704623c391ce03bf38527f4ae93
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Mon May 9 11:44:15 2011 +0200

    * Fixed log-cronk principal name in template

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=dc73e978f6f13cf14702f94264a1eaa403cc4c33
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Mon May 9 11:34:18 2011 +0200

    * Fixed typo

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=fdca745f4e20af723a9668079ccf48b458ff918e
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Mon May 9 11:26:13 2011 +0200

    * Removed id from update routine

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=9206ec49963edee9f459ba20250f138135fdc188
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Mon May 9 11:10:03 2011 +0200

    * added target id to schemes

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=89ff2e3d29b3151f19aed47244826942b7513fca
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri May 6 14:05:54 2011 +0200

    * Added smaller bg images

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=3952eafd80e7b6ce8037c425e44d1521512da4d7
Merge: bf0829364e418bfc7809eefe480f3875b75913f9 d2c1d2a683b37871470ab8e9daf692ee90f6438d
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri May 6 11:21:56 2011 +0200

    Merge branch 'master' into r1.4

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d2c1d2a683b37871470ab8e9daf692ee90f6438d
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri May 6 11:21:28 2011 +0200

    * Recreated changelog

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=bf0829364e418bfc7809eefe480f3875b75913f9
Merge: fc9f5361139abf518ed8e68fa67c23d8362a6e1b a3b38f6e600fc67dbf2a0c3edce0d4b2d1ab1443
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri May 6 09:41:54 2011 +0200

    Merge branch 'master' into r1.4

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=a3b38f6e600fc67dbf2a0c3edce0d4b2d1ab1443
Author: Marius Hein <marius.hein at netways.de>
Date:   Fri May 6 09:40:54 2011 +0200

    * Added pending filters in grids
    * Fixed overall status pending filters

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=fc9f5361139abf518ed8e68fa67c23d8362a6e1b
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu May 5 16:50:05 2011 +0200

    set version to 1.4.0

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=8e8a55bfc47293541ea77b94247e67c52b69c145
Merge: 2235f044fb24f4f1e0cb20728780df2f4515baf4 76d6dc0ad030db9c583d1bbc4fe7bda4c95d609f
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu May 5 16:48:42 2011 +0200

    Merge branch 'master' into mfriedrich/fixes

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=76d6dc0ad030db9c583d1bbc4fe7bda4c95d609f
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu May 5 16:45:12 2011 +0200

    * Quick fix for view and counter (pending state)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=2235f044fb24f4f1e0cb20728780df2f4515baf4
Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu May 5 16:38:15 2011 +0200

    update icinga-web.spec for 1.4, rpms build ok #1455
    
    fixes #1455

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=392e96db31eaae2939f4e2b3367b89a60b61c2cc
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu May 5 14:52:02 2011 +0200

    * Tagged new dev version

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=72514d7357912975fe2eb19bf7c010924b974b7c
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu May 5 14:46:57 2011 +0200

    * Added r1.4
    * Changed version meta data
    * Added new about layout and images

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=49442845b612ef45bbaf208e94471697cb94b928
Author: Marius Hein <marius.hein at netways.de>
Date:   Thu May 5 12:38:12 2011 +0200

    * Merged and fixed translations (fixes #1400)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=ffdcb7ebaf12a74bbe7f13b61feba94f3774f37e
Merge: cb989dc5199dd0ddaf685cb817e120bed334bc6d 57d8eab7d9c616cf0d5e283c036c9902571e0cdf
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Wed May 4 16:04:17 2011 +0200

    Merge branch 'master' of ssh://git@git.icinga.org/icinga-web

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=cb989dc5199dd0ddaf685cb817e120bed334bc6d
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Wed May 4 16:03:57 2011 +0200

    * Updated bp-addon

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=57d8eab7d9c616cf0d5e283c036c9902571e0cdf
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed May 4 15:33:55 2011 +0200

    * Fixed typo (ref #1167)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=6bb6d26262ffca2a9fd74f0e4db62039e2eabce3
Merge: 39e9ab5c1cf2fd59447bb8e2926d1306891a5ec6 d49ac98f22f8cb4d2b9940924c6c720931b5e168
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed May 4 15:32:20 2011 +0200

    Merge branch 'master' of git.icinga.org:icinga-web

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=39e9ab5c1cf2fd59447bb8e2926d1306891a5ec6
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed May 4 15:31:52 2011 +0200

    * Added instance name configure flag (fixes #1167)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d49ac98f22f8cb4d2b9940924c6c720931b5e168
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Wed May 4 15:14:33 2011 +0200

    * Updated module installer, added update sql schemas

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=7055b6a705f7fe740598a34c48bbae2aa42fadf3
Merge: 568f4406debb59041ac38ea2f6f3f2b726403c4b d4e33e168443623b96c83ab686ccd37dce1be370
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Wed May 4 14:51:25 2011 +0200

    Merge branch 'master' of ssh://git@git.icinga.org/icinga-web

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=568f4406debb59041ac38ea2f6f3f2b726403c4b
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Wed May 4 14:50:27 2011 +0200

    * Removed exception in AppKitExtJsonDocument triggered by Doctrine-relations, fixed tests

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=d4e33e168443623b96c83ab686ccd37dce1be370
Merge: f1f67ebfb0b3723e38b907bb37a5bf9a0a54b443 538ea163c56d705d21e6afc88be8ba0a2f6f1561
Author: Marius Hein <marius.hein at netways.de>
Date:   Wed May 4 14:43:36 2011 +0200

    Merge branch 'mhein/default'

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=f1f67ebfb0b3723e38b907bb37a5bf9a0a54b443
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Wed May 4 14:13:41 2011 +0200

    * Added long_output to host/service details, check_multi should no work (fixes #958)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=50a68a6c2377aea03a6626a90d269ef1e2b0bd19
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Wed May 4 13:59:15 2011 +0200

    * Readded unknown state constant

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=3606583bce436111ad31fe436f1601e72f7c8911
Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Wed May 4 13:54:41 2011 +0200

    * Added output length as parameter (fixes #1360), fixed and extended pending state handling (is now in statussummary)

URL:    https://git.icinga.org/?p=icinga-web.git/commit/?id=a79e9b0a5b85202b88c708f5e4dfc46993382949
Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Wed Mar 23 15:03:48 2011 +0100

    * Fixed API to not return metaData if parameter "withMeta" is not set or set to false/0..
    * Fixed runSuite.sh





More information about the icinga-checkins mailing list