[icinga-checkins] icinga.org: New commits on branch master

git at icinga.org git at icinga.org
Tue Aug 9 09:58:30 CEST 2011


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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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