[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: Merge branch 'mhein/reporting'

git at icinga.org git at icinga.org
Fri Aug 5 09:13:15 CEST 2011


Module: icinga-web
Branch: jmosshammer/default
Commit: 947a54b11562213d144bd8cc6bdc13e6bd5772ab
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=947a54b11562213d144bd8cc6bdc13e6bd5772ab

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Aug  1 09:35:07 2011 +0200

Merge branch 'mhein/reporting'

---

 app/config/output_types.xml                        |    2 +-
 app/modules/AppKit/config/module.xml               |    9 +-
 .../xml/to/icinga-tactical-overview-groupstat.xml  |    8 +-
 .../System/StaticContentTemplateModel.class.php    |    2 +-
 .../actions/Provider/SchedulerAction.class.php     |   19 +
 app/modules/Reporting/config/module.xml            |    4 +
 .../lib/jasper/JasperSoapMultipartClient.class.php |    5 +-
 .../Reporting/lib/js/Icinga.Reporting.Cronk.js     |   42 +-
 .../Icinga.Reporting.abstract.ApplicationWindow.js |   12 +-
 ...nga.Reporting.inputControl.ApiSelectionField.js |    7 +
 .../Icinga.Reporting.util.InputControlBuilder.js   |   74 ++
 .../lib/js/Icinga.Reporting.util.JobFormValues.js  |  256 +++++++
 .../js/Icinga.Reporting.util.ReportScheduling.js   |    7 +-
 .../lib/js/Icinga.Reporting.util.ResourceTree.js   |    2 +-
 .../lib/js/Icinga.Reporting.util.RunReportPanel.js |   33 +-
 .../js/Icinga.Reporting.util.ScheduleEditForm.js   |  715 +++++++++++++++++++-
 .../js/Icinga.Reporting.util.ScheduleTaskList.js   |   79 +++
 .../Icinga.Reporting.util.SchedulingListPanel.js   |   87 +++-
 .../lib/js/Icinga.Reporting.widget.MonthPicker.js  |   29 +
 .../js/Icinga.Reporting.widget.WeekDayPicker.js    |   24 +
 .../models/JasperParameterStructModel.class.php    |    2 +-
 .../models/JasperSchedulerModel.class.php          |   25 +-
 .../Reporting/templates/Cronk/MainSuccess.php      |   13 +-
 .../Reporting/validate/Provider/Scheduler.xml      |    8 +
 .../views/Provider/SchedulerJobView.class.php      |   42 ++
 .../views/Provider/SchedulerListView.class.php     |   17 +-
 .../views/Provider/SchedulerSuccessView.class.php  |    8 +
 27 files changed, 1448 insertions(+), 83 deletions(-)

Diff:   https://git.icinga.org/?p=icinga-web.git;a=commitdiff;h=947a54b11562213d144bd8cc6bdc13e6bd5772ab




More information about the icinga-checkins mailing list