From 1b59fb5be9ae776b03c949dd9095191fe82ebca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 14 Mar 2015 16:13:25 -0400 Subject: [PATCH 001/398] POC for repeating panels based on template variable options --- src/app/features/dashboard/all.js | 1 + src/app/features/dashboard/dashboardCtrl.js | 3 ++ src/app/features/dashboard/dashboardSrv.js | 1 + .../features/dashboard/dynamicDashboardSrv.js | 48 +++++++++++++++++++ src/app/features/panel/panelSrv.js | 1 + src/app/partials/panelgeneral.html | 7 +++ 6 files changed, 61 insertions(+) create mode 100644 src/app/features/dashboard/dynamicDashboardSrv.js diff --git a/src/app/features/dashboard/all.js b/src/app/features/dashboard/all.js index e9edfe7fcdd..811f48cc464 100644 --- a/src/app/features/dashboard/all.js +++ b/src/app/features/dashboard/all.js @@ -14,5 +14,6 @@ define([ './unsavedChangesSrv', './directives/dashSearchView', './graphiteImportCtrl', + './dynamicDashboardSrv', './importCtrl', ], function () {}); diff --git a/src/app/features/dashboard/dashboardCtrl.js b/src/app/features/dashboard/dashboardCtrl.js index 8430ac18631..c194dcdb7ed 100644 --- a/src/app/features/dashboard/dashboardCtrl.js +++ b/src/app/features/dashboard/dashboardCtrl.js @@ -15,6 +15,7 @@ function (angular, $, config) { dashboardKeybindings, timeSrv, templateValuesSrv, + dynamicDashboardSrv, dashboardSrv, dashboardViewStateSrv, $timeout) { @@ -44,6 +45,8 @@ function (angular, $, config) { // template values service needs to initialize completely before // the rest of the dashboard can load templateValuesSrv.init(dashboard).then(function() { + dynamicDashboardSrv.init(dashboard); + $scope.dashboard = dashboard; $scope.dashboardViewState = dashboardViewStateSrv.create($scope); $scope.dashboardMeta = data.meta; diff --git a/src/app/features/dashboard/dashboardSrv.js b/src/app/features/dashboard/dashboardSrv.js index 90ec885ed41..0eab4f867d9 100644 --- a/src/app/features/dashboard/dashboardSrv.js +++ b/src/app/features/dashboard/dashboardSrv.js @@ -126,6 +126,7 @@ function (angular, $, kbn, _, moment) { var currentRow = this.rows[rowIndex]; currentRow.panels.push(newPanel); + return newPanel; }; p.formatDate = function(date, format) { diff --git a/src/app/features/dashboard/dynamicDashboardSrv.js b/src/app/features/dashboard/dynamicDashboardSrv.js new file mode 100644 index 00000000000..0c54b61419a --- /dev/null +++ b/src/app/features/dashboard/dynamicDashboardSrv.js @@ -0,0 +1,48 @@ +define([ + 'angular', + 'lodash', +], +function (angular, _) { + 'use strict'; + + var module = angular.module('grafana.services'); + + module.service('dynamicDashboardSrv', function() { + + this.init = function(dashboard) { + this.handlePanelRepeats(dashboard); + }; + + this.handlePanelRepeats = function(dashboard) { + var i, j, row, panel; + for (i = 0; i < dashboard.rows.length; i++) { + row = dashboard.rows[i]; + for (j = 0; j < row.panels.length; j++) { + panel = row.panels[j]; + if (panel.repeat) { + this.repeatPanel(panel, row, dashboard); + } + } + } + }; + + this.repeatPanel = function(panel, row, dashboard) { + var variables = dashboard.templating.list; + var variable = _.findWhere(variables, {name: panel.repeat.replace('$', '')}); + if (!variable) { + return; + } + + _.each(variable.options, function(option) { + var copy = dashboard.duplicatePanel(panel, row); + copy.repeat = null; + console.log('duplicatePanel'); + }); + }; + + + }); + +}); + + diff --git a/src/app/features/panel/panelSrv.js b/src/app/features/panel/panelSrv.js index ec3373c3426..4ffebe67f18 100644 --- a/src/app/features/panel/panelSrv.js +++ b/src/app/features/panel/panelSrv.js @@ -11,6 +11,7 @@ function (angular, _, config) { module.service('panelSrv', function($rootScope, $timeout, datasourceSrv, $q) { this.init = function($scope) { + if (!$scope.panel.span) { $scope.panel.span = 12; } $scope.inspector = {}; diff --git a/src/app/partials/panelgeneral.html b/src/app/partials/panelgeneral.html index 21fbf68c68f..75cb2517192 100644 --- a/src/app/partials/panelgeneral.html +++ b/src/app/partials/panelgeneral.html @@ -10,6 +10,13 @@
+ +
+
Templating options
+
+ + +
From 5de499c7f628903b069df69e83e0e693080f1498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 17 Mar 2015 12:30:42 -0400 Subject: [PATCH 002/398] Working on panel repeat --- src/app/features/dashboard/dynamicDashboardSrv.js | 6 ++++++ src/app/features/panel/panelHelper.js | 1 + src/app/features/templating/templateSrv.js | 7 ++++++- src/app/plugins/datasource/graphite/datasource.js | 6 +++--- src/test/specs/templateSrv-specs.js | 12 ++++++++++++ 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/app/features/dashboard/dynamicDashboardSrv.js b/src/app/features/dashboard/dynamicDashboardSrv.js index 0c54b61419a..446b7c96392 100644 --- a/src/app/features/dashboard/dynamicDashboardSrv.js +++ b/src/app/features/dashboard/dynamicDashboardSrv.js @@ -33,9 +33,15 @@ function (angular, _) { return; } + dashboard.scopedVars = { + panel: {} + }; + _.each(variable.options, function(option) { var copy = dashboard.duplicatePanel(panel, row); copy.repeat = null; + dashboard.scopedVars.panel[panel.id] = {}; + dashboard.scopedVars.panel[panel.id][variable.name] = option.value; console.log('duplicatePanel'); }); }; diff --git a/src/app/features/panel/panelHelper.js b/src/app/features/panel/panelHelper.js index c2842fb225e..2f90615fac6 100644 --- a/src/app/features/panel/panelHelper.js +++ b/src/app/features/panel/panelHelper.js @@ -8,6 +8,7 @@ function (angular, _, kbn, $) { 'use strict'; var module = angular.module('grafana.services'); + module.service('panelHelper', function(timeSrv) { this.updateTimeRange = function(scope) { diff --git a/src/app/features/templating/templateSrv.js b/src/app/features/templating/templateSrv.js index 8fc45097944..6e4a25f3580 100644 --- a/src/app/features/templating/templateSrv.js +++ b/src/app/features/templating/templateSrv.js @@ -63,13 +63,18 @@ function (angular, _) { }); }; - this.replace = function(target) { + this.replace = function(target, scopedVars) { if (!target) { return; } var value; this._regex.lastIndex = 0; return target.replace(this._regex, function(match, g1, g2) { + if (scopedVars) { + value = scopedVars[g1 || g2]; + if (value) { return value; } + } + value = self._values[g1 || g2]; if (!value) { return match; } diff --git a/src/app/plugins/datasource/graphite/datasource.js b/src/app/plugins/datasource/graphite/datasource.js index 37ce4356ee8..6e0ae3ebd97 100644 --- a/src/app/plugins/datasource/graphite/datasource.js +++ b/src/app/plugins/datasource/graphite/datasource.js @@ -36,7 +36,7 @@ function (angular, _, $, config, kbn, moment) { maxDataPoints: options.maxDataPoints, }; - var params = this.buildGraphiteParams(graphOptions); + var params = this.buildGraphiteParams(graphOptions, options.panelId); if (options.format === 'png') { return $q.when(this.url + '/render' + '?' + params.join('&')); @@ -231,7 +231,7 @@ function (angular, _, $, config, kbn, moment) { '#Y', '#Z' ]; - GraphiteDatasource.prototype.buildGraphiteParams = function(options) { + GraphiteDatasource.prototype.buildGraphiteParams = function(options, panelId) { var graphite_options = ['from', 'until', 'rawData', 'format', 'maxDataPoints', 'cacheTimeout']; var clean_options = [], targets = {}; var target, targetValue, i; @@ -252,7 +252,7 @@ function (angular, _, $, config, kbn, moment) { continue; } - targetValue = templateSrv.replace(target.target); + targetValue = templateSrv.replace(target.target, panelId); targetValue = targetValue.replace(intervalFormatFixRegex, fixIntervalFormat); targets[this._seriesRefLetters[i]] = targetValue; } diff --git a/src/test/specs/templateSrv-specs.js b/src/test/specs/templateSrv-specs.js index bb85b9a1c98..57e853d8a3f 100644 --- a/src/test/specs/templateSrv-specs.js +++ b/src/test/specs/templateSrv-specs.js @@ -29,6 +29,18 @@ define([ }); }); + describe('replace can pass scoped vars', function() { + beforeEach(function() { + _templateSrv.init([{ name: 'test', current: { value: 'oogle' } }]); + }); + + it('should replace $test with scoped value', function() { + var target = _templateSrv.replace('this.$test.filters', {'test': 'mupp'}); + expect(target).to.be('this.mupp.filters'); + }); + }); + + describe('can check if variable exists', function() { beforeEach(function() { _templateSrv.init([{ name: 'test', current: { value: 'oogle' } }]); From 9f729900f2574e2a9387f169ab5c95882de57c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 17 Mar 2015 13:33:58 -0400 Subject: [PATCH 003/398] work on scoped variable values --- .../features/dashboard/dynamicDashboardSrv.js | 19 ++++++++++--------- src/app/features/panel/panelHelper.js | 1 + src/app/features/panel/panelMenu.js | 2 +- src/app/features/templating/templateSrv.js | 9 +++++++-- src/app/filters/all.js | 4 ++-- .../plugins/datasource/graphite/datasource.js | 6 +++--- src/test/specs/templateSrv-specs.js | 7 ++++++- 7 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/app/features/dashboard/dynamicDashboardSrv.js b/src/app/features/dashboard/dynamicDashboardSrv.js index 446b7c96392..c8bfd74c895 100644 --- a/src/app/features/dashboard/dynamicDashboardSrv.js +++ b/src/app/features/dashboard/dynamicDashboardSrv.js @@ -33,15 +33,16 @@ function (angular, _) { return; } - dashboard.scopedVars = { - panel: {} - }; - - _.each(variable.options, function(option) { - var copy = dashboard.duplicatePanel(panel, row); - copy.repeat = null; - dashboard.scopedVars.panel[panel.id] = {}; - dashboard.scopedVars.panel[panel.id][variable.name] = option.value; + _.each(variable.options, function(option, index) { + if (index > 0) { + var copy = dashboard.duplicatePanel(panel, row); + copy.repeat = null; + copy.scopedVars = {}; + copy.scopedVars[variable.name] = option; + } else { + panel.scopedVars = {}; + panel.scopedVars[variable.name] = option; + } console.log('duplicatePanel'); }); }; diff --git a/src/app/features/panel/panelHelper.js b/src/app/features/panel/panelHelper.js index 2f90615fac6..3d164798d9b 100644 --- a/src/app/features/panel/panelHelper.js +++ b/src/app/features/panel/panelHelper.js @@ -68,6 +68,7 @@ function (angular, _, kbn, $) { targets: scope.panel.targets, format: scope.panel.renderer === 'png' ? 'png' : 'json', maxDataPoints: scope.resolution, + scopedVars: scope.panel.scopedVars, cacheTimeout: scope.panel.cacheTimeout }; diff --git a/src/app/features/panel/panelMenu.js b/src/app/features/panel/panelMenu.js index a529dd87b5c..99b5bcfe3b8 100644 --- a/src/app/features/panel/panelMenu.js +++ b/src/app/features/panel/panelMenu.js @@ -11,7 +11,7 @@ function (angular, $, _) { .directive('panelMenu', function($compile, linkSrv) { var linkTemplate = '' + - '{{panel.title | interpolateTemplateVars}}' + + '{{panel.title | interpolateTemplateVars:this}}' + '' + ' {{panelMeta.timeInfo}}' + ''; diff --git a/src/app/features/templating/templateSrv.js b/src/app/features/templating/templateSrv.js index 6e4a25f3580..09aed015386 100644 --- a/src/app/features/templating/templateSrv.js +++ b/src/app/features/templating/templateSrv.js @@ -72,7 +72,7 @@ function (angular, _) { return target.replace(this._regex, function(match, g1, g2) { if (scopedVars) { value = scopedVars[g1 || g2]; - if (value) { return value; } + if (value) { return value.value; } } value = self._values[g1 || g2]; @@ -82,7 +82,7 @@ function (angular, _) { }); }; - this.replaceWithText = function(target) { + this.replaceWithText = function(target, scopedVars) { if (!target) { return; } var value; @@ -90,6 +90,11 @@ function (angular, _) { this._regex.lastIndex = 0; return target.replace(this._regex, function(match, g1, g2) { + if (scopedVars) { + var option = scopedVars[g1 || g2]; + if (option) { return option.text; } + } + value = self._values[g1 || g2]; text = self._texts[g1 || g2]; if (!value) { return match; } diff --git a/src/app/filters/all.js b/src/app/filters/all.js index e75d70043d8..fd22061da66 100755 --- a/src/app/filters/all.js +++ b/src/app/filters/all.js @@ -56,8 +56,8 @@ define(['angular', 'jquery', 'lodash', 'moment'], function (angular, $, _, momen }); module.filter('interpolateTemplateVars', function(templateSrv) { - function interpolateTemplateVars(text) { - return templateSrv.replaceWithText(text); + function interpolateTemplateVars(text, scope) { + return templateSrv.replaceWithText(text, scope.panel.scopedVars); } interpolateTemplateVars.$stateful = true; diff --git a/src/app/plugins/datasource/graphite/datasource.js b/src/app/plugins/datasource/graphite/datasource.js index 6e0ae3ebd97..53eda28ea3b 100644 --- a/src/app/plugins/datasource/graphite/datasource.js +++ b/src/app/plugins/datasource/graphite/datasource.js @@ -36,7 +36,7 @@ function (angular, _, $, config, kbn, moment) { maxDataPoints: options.maxDataPoints, }; - var params = this.buildGraphiteParams(graphOptions, options.panelId); + var params = this.buildGraphiteParams(graphOptions, options.scopedVars); if (options.format === 'png') { return $q.when(this.url + '/render' + '?' + params.join('&')); @@ -231,7 +231,7 @@ function (angular, _, $, config, kbn, moment) { '#Y', '#Z' ]; - GraphiteDatasource.prototype.buildGraphiteParams = function(options, panelId) { + GraphiteDatasource.prototype.buildGraphiteParams = function(options, scopedVars) { var graphite_options = ['from', 'until', 'rawData', 'format', 'maxDataPoints', 'cacheTimeout']; var clean_options = [], targets = {}; var target, targetValue, i; @@ -252,7 +252,7 @@ function (angular, _, $, config, kbn, moment) { continue; } - targetValue = templateSrv.replace(target.target, panelId); + targetValue = templateSrv.replace(target.target, scopedVars); targetValue = targetValue.replace(intervalFormatFixRegex, fixIntervalFormat); targets[this._seriesRefLetters[i]] = targetValue; } diff --git a/src/test/specs/templateSrv-specs.js b/src/test/specs/templateSrv-specs.js index 57e853d8a3f..b39fca0ac1a 100644 --- a/src/test/specs/templateSrv-specs.js +++ b/src/test/specs/templateSrv-specs.js @@ -35,9 +35,14 @@ define([ }); it('should replace $test with scoped value', function() { - var target = _templateSrv.replace('this.$test.filters', {'test': 'mupp'}); + var target = _templateSrv.replace('this.$test.filters', {'test': {value: 'mupp', text: 'asd'}}); expect(target).to.be('this.mupp.filters'); }); + + it('should replace $test with scoped text', function() { + var target = _templateSrv.replaceWithText('this.$test.filters', {'test': {value: 'mupp', text: 'asd'}}); + expect(target).to.be('this.asd.filters'); + }); }); From 741a1736a490804201786e7492aa4996742b4fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 17 Mar 2015 16:04:08 -0400 Subject: [PATCH 004/398] can handle updates --- .../features/dashboard/dynamicDashboardSrv.js | 20 +++++++++++++++++++ src/app/features/dashboard/submenuCtrl.js | 7 +++++-- .../features/templating/templateValuesSrv.js | 17 +++++----------- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/app/features/dashboard/dynamicDashboardSrv.js b/src/app/features/dashboard/dynamicDashboardSrv.js index c8bfd74c895..8af85bc0aba 100644 --- a/src/app/features/dashboard/dynamicDashboardSrv.js +++ b/src/app/features/dashboard/dynamicDashboardSrv.js @@ -13,6 +13,25 @@ function (angular, _) { this.handlePanelRepeats(dashboard); }; + this.update = function(dashboard) { + this.removeLinkedPanels(dashboard); + this.handlePanelRepeats(dashboard); + }; + + this.removeLinkedPanels = function(dashboard) { + var i, j, row, panel; + for (i = 0; i < dashboard.rows.length; i++) { + row = dashboard.rows[i]; + for (j = 0; j < row.panels.length; j++) { + panel = row.panels[j]; + if (panel.linked) { + row.panels = _.without(row.panels, panel); + j = j - 1; + } + } + } + }; + this.handlePanelRepeats = function(dashboard) { var i, j, row, panel; for (i = 0; i < dashboard.rows.length; i++) { @@ -37,6 +56,7 @@ function (angular, _) { if (index > 0) { var copy = dashboard.duplicatePanel(panel, row); copy.repeat = null; + copy.linked = true; copy.scopedVars = {}; copy.scopedVars[variable.name] = option; } else { diff --git a/src/app/features/dashboard/submenuCtrl.js b/src/app/features/dashboard/submenuCtrl.js index 456cc1b76c1..cca0c9c731a 100644 --- a/src/app/features/dashboard/submenuCtrl.js +++ b/src/app/features/dashboard/submenuCtrl.js @@ -7,7 +7,7 @@ function (angular, _) { var module = angular.module('grafana.controllers'); - module.controller('SubmenuCtrl', function($scope, $q, $rootScope, templateValuesSrv) { + module.controller('SubmenuCtrl', function($scope, $q, $rootScope, templateValuesSrv, dynamicDashboardSrv) { var _d = { enable: true }; @@ -27,7 +27,10 @@ function (angular, _) { }; $scope.setVariableValue = function(param, option) { - templateValuesSrv.setVariableValue(param, option); + templateValuesSrv.setVariableValue(param, option).then(function() { + dynamicDashboardSrv.update($scope.dashboard); + $rootScope.$broadcast('refresh'); + }); }; $scope.init(); diff --git a/src/app/features/templating/templateValuesSrv.js b/src/app/features/templating/templateValuesSrv.js index 73bcfb662bd..63a7a863272 100644 --- a/src/app/features/templating/templateValuesSrv.js +++ b/src/app/features/templating/templateValuesSrv.js @@ -32,7 +32,7 @@ function (angular, _, kbn) { var option = _.findWhere(variable.options, { text: urlValue }); option = option || { text: urlValue, value: urlValue }; - var promise = this.setVariableValue(variable, option, true); + var promise = this.setVariableValue(variable, option); this.updateAutoInterval(variable); promises.push(promise); @@ -60,17 +60,10 @@ function (angular, _, kbn) { templateSrv.setGrafanaVariable('$__auto_interval', interval); }; - this.setVariableValue = function(variable, option, recursive) { + this.setVariableValue = function(variable, option) { variable.current = option; - templateSrv.updateTemplateData(); - - return this.updateOptionsInChildVariables(variable) - .then(function() { - if (!recursive) { - $rootScope.$broadcast('refresh'); - } - }); + return this.updateOptionsInChildVariables(variable); }; this.updateOptionsInChildVariables = function(updatedVariable) { @@ -117,11 +110,11 @@ function (angular, _, kbn) { if (variable.current) { var currentOption = _.findWhere(variable.options, { text: variable.current.text }); if (currentOption) { - return self.setVariableValue(variable, currentOption, true); + return self.setVariableValue(variable, currentOption); } } - return self.setVariableValue(variable, variable.options[0], true); + return self.setVariableValue(variable, variable.options[0]); }); }); }; From d08144e73091a96296387f927a2d69f52adede5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 18 Mar 2015 11:15:21 -0400 Subject: [PATCH 005/398] Began work on template multi select feature --- src/app/controllers/search.js | 18 --------- src/app/directives/all.js | 1 + src/app/directives/giveFocus.js | 26 ++++++++++++ src/app/directives/templateParamSelector.js | 40 +++++++++++++++++++ .../partials/variableValueSelect.html | 23 +++++++++++ src/app/partials/search.html | 2 +- src/app/partials/submenu.html | 24 +++++++---- src/css/less/submenu.less | 29 +++++++++++++- 8 files changed, 136 insertions(+), 27 deletions(-) create mode 100644 src/app/directives/giveFocus.js create mode 100644 src/app/features/dashboard/partials/variableValueSelect.html diff --git a/src/app/controllers/search.js b/src/app/controllers/search.js index e031559f3a8..00ad972e60a 100644 --- a/src/app/controllers/search.js +++ b/src/app/controllers/search.js @@ -136,24 +136,6 @@ function (angular, _, config) { }); - module.directive('xngFocus', function() { - return function(scope, element, attrs) { - element.click(function(e) { - e.stopPropagation(); - }); - - scope.$watch(attrs.xngFocus,function (newValue) { - if (!newValue) { - return; - } - setTimeout(function() { - element.focus(); - var pos = element.val().length * 2; - element[0].setSelectionRange(pos, pos); - }, 200); - },true); - }; - }); module.directive('tagColorFromName', function() { diff --git a/src/app/directives/all.js b/src/app/directives/all.js index 6190ef89099..3ef0b669d6c 100644 --- a/src/app/directives/all.js +++ b/src/app/directives/all.js @@ -16,4 +16,5 @@ define([ './grafanaVersionCheck', './dropdown.typeahead', './topnav', + './giveFocus', ], function () {}); diff --git a/src/app/directives/giveFocus.js b/src/app/directives/giveFocus.js new file mode 100644 index 00000000000..ac4a80e6197 --- /dev/null +++ b/src/app/directives/giveFocus.js @@ -0,0 +1,26 @@ +define([ + 'angular', +], +function (angular) { + 'use strict'; + + var module = angular.module('grafana.directives'); + + module.directive('giveFocus', function() { + return function(scope, element, attrs) { + element.click(function(e) { + e.stopPropagation(); + }); + + scope.$watch(attrs.giveFocus, function (newValue) { + if (!newValue) { return; } + + setTimeout(function() { + element.focus(); + var pos = element.val().length * 2; + element[0].setSelectionRange(pos, pos); + }, 200); + },true); + }; + }); +}); diff --git a/src/app/directives/templateParamSelector.js b/src/app/directives/templateParamSelector.js index d9ad33512b5..a7ae67e363c 100644 --- a/src/app/directives/templateParamSelector.js +++ b/src/app/directives/templateParamSelector.js @@ -84,4 +84,44 @@ function (angular, app, _, $) { } }; }); + + angular + .module('grafana.directives') + .directive('variableValueSelect', function($compile, $window, $timeout) { + return { + scope: { + variable: "=", + }, + templateUrl: 'app/features/dashboard/partials/variableValueSelect.html', + link: function(scope, elem) { + var bodyEl = angular.element($window.document.body); + + scope.show = function() { + scope.selectorOpen = true; + scope.giveFocus = 1; + + $timeout(function() { + bodyEl.on('click', scope.bodyOnClick); + }, 0, false); + }; + + scope.hide = function() { + scope.selectorOpen = false; + bodyEl.off('click', scope.bodyOnClick); + }; + + + scope.bodyOnClick = function(e) { + var dropdown = elem.find('.variable-value-dropdown'); + if (dropdown.has(e.target).length === 0) { + scope.$apply(scope.hide); + } + }; + + scope.$on('$destroy', function() { + }); + }, + }; + }); + }); diff --git a/src/app/features/dashboard/partials/variableValueSelect.html b/src/app/features/dashboard/partials/variableValueSelect.html new file mode 100644 index 00000000000..2a923f14ab6 --- /dev/null +++ b/src/app/features/dashboard/partials/variableValueSelect.html @@ -0,0 +1,23 @@ + + {{variable.name}}: {{variable.current.text}} + + +
+
+ + + +
+ +
+
+ + + +
+
+
+ + diff --git a/src/app/partials/search.html b/src/app/partials/search.html index 76400cd3eba..1a28ddc74a2 100644 --- a/src/app/partials/search.html +++ b/src/app/partials/search.html @@ -2,7 +2,7 @@
-
diff --git a/src/app/partials/submenu.html b/src/app/partials/submenu.html index 416fb47558b..c5e2762985e 100644 --- a/src/app/partials/submenu.html +++ b/src/app/partials/submenu.html @@ -3,17 +3,27 @@
    -
  • - VARIABLES: -
    • -
  • - - ${{variable.name}}: - + +
  • +
    • + + + + + + + + + + + + +
    • diff --git a/src/css/less/submenu.less b/src/css/less/submenu.less index 74a2664d3ce..32820b9f051 100644 --- a/src/css/less/submenu.less +++ b/src/css/less/submenu.less @@ -5,7 +5,7 @@ } .submenu-controls { - margin: 10px 10px 0 10px; + margin: 20px 0px 15px 20px; } .annotation-disabled, .annotation-disabled a { @@ -18,3 +18,30 @@ } } +.variable-value-link { + font-size: 16px; + margin-right: 20px; +} + +.variable-value-dropdown { + position: absolute; + top: 30px; + width: 300px; + height: 400px; + background: @grafanaPanelBackground; + box-shadow: 0px 0px 55px 0px black; + border: 1px solid @grafanaTargetFuncBackground; + z-index: 1000; + padding: 10px; + + .variable-options-container { + height: 350px; + overflow: auto; + display: block; + line-height: 28px; + } + + .variable-option { + display: block; + } +} From 35888c814c94e82f27a2f239c4f890ee108bca01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 19 Mar 2015 23:09:50 -0400 Subject: [PATCH 006/398] more work on multi select --- src/app/directives/templateParamSelector.js | 77 +++++++- .../partials/variableValueSelect.html | 7 +- src/app/features/dashboard/submenuCtrl.js | 6 +- src/app/features/templating/editorCtrl.js | 4 +- src/app/features/templating/templateSrv.js | 14 +- .../features/templating/templateValuesSrv.js | 5 + src/app/partials/submenu.html | 3 +- src/app/partials/templating_editor.html | 176 ++++++++++-------- src/css/less/forms.less | 5 + src/css/less/submenu.less | 6 +- src/test/specs/templateSrv-specs.js | 28 +++ 11 files changed, 238 insertions(+), 93 deletions(-) diff --git a/src/app/directives/templateParamSelector.js b/src/app/directives/templateParamSelector.js index a7ae67e363c..8a21f75ef54 100644 --- a/src/app/directives/templateParamSelector.js +++ b/src/app/directives/templateParamSelector.js @@ -91,25 +91,84 @@ function (angular, app, _, $) { return { scope: { variable: "=", + onUpdated: "&" }, templateUrl: 'app/features/dashboard/partials/variableValueSelect.html', link: function(scope, elem) { var bodyEl = angular.element($window.document.body); + var variable = scope.variable; scope.show = function() { scope.selectorOpen = true; scope.giveFocus = 1; + scope.oldCurrentText = variable.current.text; + + var currentValues = variable.current.value; + + if (_.isString(currentValues)) { + currentValues = [currentValues]; + } + + scope.options = _.map(variable.options, function(option) { + var op = {text: option.text, value: option.value}; + if (_.indexOf(currentValues, option.value) >= 0) { + op.selected = true; + } + return op; + }); $timeout(function() { bodyEl.on('click', scope.bodyOnClick); }, 0, false); }; - scope.hide = function() { - scope.selectorOpen = false; - bodyEl.off('click', scope.bodyOnClick); + scope.optionSelected = function(option) { + if (!variable.multi) { + _.each(scope.options, function(other) { + if (option !== other) { + other.selected = false; + } + }); + } + + var selected = _.filter(scope.options, {selected: true}); + + if (selected.length === 0) { + // encode the first selected if no option is selected + scope.options[0].selected = true; + $timeout(function() { + scope.optionSelected(scope.options[0]); + }); + return; + } + + if (selected.length > 1) { + if (selected[0].text === 'All') { + selected = selected.slice(1, selected.length); + } + } + + variable.current = { + text: _.pluck(selected, 'text').join(', '), + value: _.pluck(selected, 'value'), + }; + + // only single value + if (variable.current.value.length === 1) { + variable.current.value = selected[0].value; + } + + scope.updateLinkText(); }; + scope.hide = function() { + scope.selectorOpen = false; + if (scope.oldCurrentText !== variable.current.text) { + scope.onUpdated(); + } + + bodyEl.off('click', scope.bodyOnClick); + }; scope.bodyOnClick = function(e) { var dropdown = elem.find('.variable-value-dropdown'); @@ -118,7 +177,17 @@ function (angular, app, _, $) { } }; - scope.$on('$destroy', function() { + scope.updateLinkText = function() { + scope.linkText = ""; + if (!variable.hideLabel) { + scope.linkText = (variable.label || variable.name) + ': '; + } + + scope.linkText += variable.current.text; + }; + + scope.$watchGroup(['variable.hideLabel', 'variable.name', 'variable.label'], function() { + scope.updateLinkText(); }); }, }; diff --git a/src/app/features/dashboard/partials/variableValueSelect.html b/src/app/features/dashboard/partials/variableValueSelect.html index 2a923f14ab6..cc9d3b08f1b 100644 --- a/src/app/features/dashboard/partials/variableValueSelect.html +++ b/src/app/features/dashboard/partials/variableValueSelect.html @@ -1,5 +1,6 @@ - {{variable.name}}: {{variable.current.text}} + {{linkText}} +
    @@ -11,9 +12,9 @@
    -
    - +
    diff --git a/src/app/features/dashboard/submenuCtrl.js b/src/app/features/dashboard/submenuCtrl.js index 456cc1b76c1..5099147fd53 100644 --- a/src/app/features/dashboard/submenuCtrl.js +++ b/src/app/features/dashboard/submenuCtrl.js @@ -26,8 +26,10 @@ function (angular, _) { $rootScope.$broadcast('refresh'); }; - $scope.setVariableValue = function(param, option) { - templateValuesSrv.setVariableValue(param, option); + $scope.variableUpdated = function(variable) { + templateValuesSrv.variableUpdated(variable).then(function() { + $rootScope.$broadcast('refresh'); + }); }; $scope.init(); diff --git a/src/app/features/templating/editorCtrl.js b/src/app/features/templating/editorCtrl.js index f17c383155d..f48452e4569 100644 --- a/src/app/features/templating/editorCtrl.js +++ b/src/app/features/templating/editorCtrl.js @@ -17,6 +17,8 @@ function (angular, _) { options: [], includeAll: false, allFormat: 'glob', + multi: false, + multiFormat: 'glob', }; $scope.init = function() { @@ -75,7 +77,7 @@ function (angular, _) { if ($scope.current.datasource === void 0) { $scope.current.datasource = null; $scope.current.type = 'query'; - $scope.current.allFormat = 'Glob'; + $scope.current.allFormat = 'glob'; } }; diff --git a/src/app/features/templating/templateSrv.js b/src/app/features/templating/templateSrv.js index 8fc45097944..008d0653cd5 100644 --- a/src/app/features/templating/templateSrv.js +++ b/src/app/features/templating/templateSrv.js @@ -29,11 +29,23 @@ function (angular, _) { _.each(this.variables, function(variable) { if (!variable.current || !variable.current.value) { return; } - this._values[variable.name] = variable.current.value; + this._values[variable.name] = this.renderVariableValue(variable); this._texts[variable.name] = variable.current.text; }, this); }; + this.renderVariableValue = function(variable) { + var value = variable.current.value; + if (_.isString(value)) { + return value; + } else { + if (variable.multiFormat === 'regex values') { + return '(' + value.join('|') + ')'; + } + return '{' + value.join(',') + '}'; + } + }; + this.setGrafanaVariable = function (name, value) { this._grafanaVariables[name] = value; }; diff --git a/src/app/features/templating/templateValuesSrv.js b/src/app/features/templating/templateValuesSrv.js index 73bcfb662bd..7d4830d960d 100644 --- a/src/app/features/templating/templateValuesSrv.js +++ b/src/app/features/templating/templateValuesSrv.js @@ -73,6 +73,11 @@ function (angular, _, kbn) { }); }; + this.variableUpdated = function(variable) { + templateSrv.updateTemplateData(); + return this.updateOptionsInChildVariables(variable); + }; + this.updateOptionsInChildVariables = function(updatedVariable) { var promises = _.map(self.variables, function(otherVariable) { if (otherVariable === updatedVariable) { diff --git a/src/app/partials/submenu.html b/src/app/partials/submenu.html index c5e2762985e..bdd75cb50b6 100644 --- a/src/app/partials/submenu.html +++ b/src/app/partials/submenu.html @@ -1,11 +1,10 @@
    -
    • - +
      • diff --git a/src/app/partials/templating_editor.html b/src/app/partials/templating_editor.html index c366f7e7f57..b04debd40f6 100644 --- a/src/app/partials/templating_editor.html +++ b/src/app/partials/templating_editor.html @@ -37,7 +37,7 @@ {{variable.query}} - + Edit @@ -56,97 +56,119 @@
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    - - -
    - -
    +
    +
    +
    General
    - - + +
    -
    -
    - -
    - - -
    -
    -
    - -
    -
    - - + + +
    +
    + + +
    +
    + +
    +
    +
    + + +
    + +
    + + +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    + +
    +
    Values Query
    +
    +
    + + + +
    +
    + +
    +
    + + + +
    +
    + +
    + + + +
    + + +
    +
    + + +
    -
    -
    -
    - - - +
    +
    +
    Display options
    +
    + + +
    + +
    + +
    +
    Multi-value selection Enables multiple values to be selected at the same time
    + +
    + +
    -
    - - - +
    + +
      +
    • + {{option.text}} +
      • +
    +
    +
    -
    - -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    - -
      -
    • - {{option.text}} -
      • -
    -
    -
    -
    + + + +
    - - -
    -
    diff --git a/src/css/less/forms.less b/src/css/less/forms.less index 2a6512dd882..0adc2637472 100644 --- a/src/css/less/forms.less +++ b/src/css/less/forms.less @@ -11,6 +11,11 @@ input[type="checkbox"].cr1 { display: none; } +.editor-option label.cr1 { + display: inline-block; + margin: 5px 0 1px 0; +} + label.cr1 { display: inline-block; height: 19px; diff --git a/src/css/less/submenu.less b/src/css/less/submenu.less index 32820b9f051..3fe5cfffd42 100644 --- a/src/css/less/submenu.less +++ b/src/css/less/submenu.less @@ -5,7 +5,7 @@ } .submenu-controls { - margin: 20px 0px 15px 20px; + margin: 15px 0px 10px 13px; } .annotation-disabled, .annotation-disabled a { @@ -25,8 +25,8 @@ .variable-value-dropdown { position: absolute; - top: 30px; - width: 300px; + top: 43px; + min-width: 200px; height: 400px; background: @grafanaPanelBackground; box-shadow: 0px 0px 55px 0px black; diff --git a/src/test/specs/templateSrv-specs.js b/src/test/specs/templateSrv-specs.js index bb85b9a1c98..0745011414c 100644 --- a/src/test/specs/templateSrv-specs.js +++ b/src/test/specs/templateSrv-specs.js @@ -29,6 +29,34 @@ define([ }); }); + describe('render variable to string values', function() { + it('single value should return value', function() { + var result = _templateSrv.renderVariableValue({current: {value: 'test'}}); + expect(result).to.be('test'); + }); + + it('multi value and glob format should render glob string', function() { + var result = _templateSrv.renderVariableValue({ + multiFormat: 'glob', + current: { + value: ['test','test2'], + } + }); + expect(result).to.be('{test,test2}'); + }); + + it('multi value and regex format should render regex string', function() { + var result = _templateSrv.renderVariableValue({ + multiFormat: 'regex values', + current: { + value: ['test','test2'], + } + }); + expect(result).to.be('(test|test2)'); + }); + + }); + describe('can check if variable exists', function() { beforeEach(function() { _templateSrv.init([{ name: 'test', current: { value: 'oogle' } }]); From 3334e36397287235a0af15747f8b4d4d73e15f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 20 Mar 2015 10:24:42 -0400 Subject: [PATCH 007/398] Updated --- src/app/directives/templateParamSelector.js | 1 + .../features/dashboard/partials/variableValueSelect.html | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/directives/templateParamSelector.js b/src/app/directives/templateParamSelector.js index 8a21f75ef54..3bd2190fe44 100644 --- a/src/app/directives/templateParamSelector.js +++ b/src/app/directives/templateParamSelector.js @@ -145,6 +145,7 @@ function (angular, app, _, $) { if (selected.length > 1) { if (selected[0].text === 'All') { selected = selected.slice(1, selected.length); + debugger; } } diff --git a/src/app/features/dashboard/partials/variableValueSelect.html b/src/app/features/dashboard/partials/variableValueSelect.html index cc9d3b08f1b..490a84b257a 100644 --- a/src/app/features/dashboard/partials/variableValueSelect.html +++ b/src/app/features/dashboard/partials/variableValueSelect.html @@ -13,10 +13,9 @@
    - - - + ng-class="{'selected': selected}" ng-href="{{row.url}}"> + +
    From 6e0947c0d907d6deed9cdbdeb6f96730c77ec198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 20 Mar 2015 12:55:55 -0400 Subject: [PATCH 008/398] Multi selecting starting to work --- src/app/controllers/search.js | 1 - src/app/directives/templateParamSelector.js | 16 ++++++++-------- .../dashboard/partials/variableValueSelect.html | 11 ++++++----- src/css/less/submenu.less | 16 ++++++++++++++++ 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/app/controllers/search.js b/src/app/controllers/search.js index 00ad972e60a..1f85952843b 100644 --- a/src/app/controllers/search.js +++ b/src/app/controllers/search.js @@ -136,7 +136,6 @@ function (angular, _, config) { }); - module.directive('tagColorFromName', function() { function djb2(str) { diff --git a/src/app/directives/templateParamSelector.js b/src/app/directives/templateParamSelector.js index 3bd2190fe44..df3b668496e 100644 --- a/src/app/directives/templateParamSelector.js +++ b/src/app/directives/templateParamSelector.js @@ -123,7 +123,9 @@ function (angular, app, _, $) { }; scope.optionSelected = function(option) { - if (!variable.multi) { + option.selected = !option.selected; + + if (!variable.multi || option.text === 'All') { _.each(scope.options, function(other) { if (option !== other) { other.selected = false; @@ -133,19 +135,16 @@ function (angular, app, _, $) { var selected = _.filter(scope.options, {selected: true}); + // enfore the first selected if no option is selected if (selected.length === 0) { - // encode the first selected if no option is selected scope.options[0].selected = true; - $timeout(function() { - scope.optionSelected(scope.options[0]); - }); - return; + selected = [scope.options[0]]; } if (selected.length > 1) { if (selected[0].text === 'All') { + selected[0].selected = false; selected = selected.slice(1, selected.length); - debugger; } } @@ -160,6 +159,7 @@ function (angular, app, _, $) { } scope.updateLinkText(); + scope.onUpdated(); }; scope.hide = function() { @@ -187,7 +187,7 @@ function (angular, app, _, $) { scope.linkText += variable.current.text; }; - scope.$watchGroup(['variable.hideLabel', 'variable.name', 'variable.label'], function() { + scope.$watchGroup(['variable.hideLabel', 'variable.name', 'variable.label', 'variable.current.text'], function() { scope.updateLinkText(); }); }, diff --git a/src/app/features/dashboard/partials/variableValueSelect.html b/src/app/features/dashboard/partials/variableValueSelect.html index 490a84b257a..099e7f2fdd5 100644 --- a/src/app/features/dashboard/partials/variableValueSelect.html +++ b/src/app/features/dashboard/partials/variableValueSelect.html @@ -12,12 +12,13 @@
    -
    - - + + + + {{option.text}}
    -
    +
    diff --git a/src/css/less/submenu.less b/src/css/less/submenu.less index 3fe5cfffd42..f49d56876f2 100644 --- a/src/css/less/submenu.less +++ b/src/css/less/submenu.less @@ -43,5 +43,21 @@ .variable-option { display: block; + .fa { + font-size: 130%; + position: relative; + top: 2px; + padding-right: 6px; + } + .fa-check-square-o { display: none; } + + &.selected { + .fa-square-o { + display: none; + } + .fa-check-square-o { + display: inline-block; + } + } } } From 86e9d2cf07b983415e287f12b32107aa9d6d62e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 20 Mar 2015 13:33:52 -0400 Subject: [PATCH 009/398] more work on repeating row --- src/app/directives/templateParamSelector.js | 6 ++---- src/app/features/dashboard/dynamicDashboardSrv.js | 11 ++++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/app/directives/templateParamSelector.js b/src/app/directives/templateParamSelector.js index df3b668496e..6cd2ce5a964 100644 --- a/src/app/directives/templateParamSelector.js +++ b/src/app/directives/templateParamSelector.js @@ -102,7 +102,6 @@ function (angular, app, _, $) { scope.selectorOpen = true; scope.giveFocus = 1; scope.oldCurrentText = variable.current.text; - var currentValues = variable.current.value; if (_.isString(currentValues)) { @@ -110,11 +109,10 @@ function (angular, app, _, $) { } scope.options = _.map(variable.options, function(option) { - var op = {text: option.text, value: option.value}; if (_.indexOf(currentValues, option.value) >= 0) { - op.selected = true; + option.selected = true; } - return op; + return option; }); $timeout(function() { diff --git a/src/app/features/dashboard/dynamicDashboardSrv.js b/src/app/features/dashboard/dynamicDashboardSrv.js index 8af85bc0aba..49070e8ce49 100644 --- a/src/app/features/dashboard/dynamicDashboardSrv.js +++ b/src/app/features/dashboard/dynamicDashboardSrv.js @@ -10,6 +10,7 @@ function (angular, _) { module.service('dynamicDashboardSrv', function() { this.init = function(dashboard) { + this.removeLinkedPanels(dashboard); this.handlePanelRepeats(dashboard); }; @@ -25,6 +26,7 @@ function (angular, _) { for (j = 0; j < row.panels.length; j++) { panel = row.panels[j]; if (panel.linked) { + console.log('removing panel: ' + panel.id); row.panels = _.without(row.panels, panel); j = j - 1; } @@ -52,7 +54,14 @@ function (angular, _) { return; } - _.each(variable.options, function(option, index) { + var selected; + if (variable.current.text === 'All') { + selected = variable.options.slice(1, variable.options.length); + } else { + selected = _.filter(variable.options, {selected: true}); + } + + _.each(selected, function(option, index) { if (index > 0) { var copy = dashboard.duplicatePanel(panel, row); copy.repeat = null; From 0aab51a73fdeed60be9cf32c6da1d1a9350cc437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 20 Mar 2015 15:06:23 -0400 Subject: [PATCH 010/398] Added row repeats --- .../features/dashboard/dynamicDashboardSrv.js | 70 +++++++++++++++++-- src/app/partials/roweditor.html | 24 +++++-- 2 files changed, 84 insertions(+), 10 deletions(-) diff --git a/src/app/features/dashboard/dynamicDashboardSrv.js b/src/app/features/dashboard/dynamicDashboardSrv.js index 49070e8ce49..d2ac44d10e4 100644 --- a/src/app/features/dashboard/dynamicDashboardSrv.js +++ b/src/app/features/dashboard/dynamicDashboardSrv.js @@ -10,13 +10,13 @@ function (angular, _) { module.service('dynamicDashboardSrv', function() { this.init = function(dashboard) { - this.removeLinkedPanels(dashboard); this.handlePanelRepeats(dashboard); + this.handleRowRepeats(dashboard); }; this.update = function(dashboard) { - this.removeLinkedPanels(dashboard); this.handlePanelRepeats(dashboard); + this.handleRowRepeats(dashboard); }; this.removeLinkedPanels = function(dashboard) { @@ -26,7 +26,6 @@ function (angular, _) { for (j = 0; j < row.panels.length; j++) { panel = row.panels[j]; if (panel.linked) { - console.log('removing panel: ' + panel.id); row.panels = _.without(row.panels, panel); j = j - 1; } @@ -35,6 +34,8 @@ function (angular, _) { }; this.handlePanelRepeats = function(dashboard) { + this.removeLinkedPanels(dashboard); + var i, j, row, panel; for (i = 0; i < dashboard.rows.length; i++) { row = dashboard.rows[i]; @@ -47,6 +48,68 @@ function (angular, _) { } }; + this.removeLinkedRows = function(dashboard) { + var i, row; + for (i = 0; i < dashboard.rows.length; i++) { + row = dashboard.rows[i]; + if (row.linked) { + dashboard.rows = _.without(dashboard.rows, row); + i = i - 1; + } + } + }; + + this.handleRowRepeats = function(dashboard) { + this.removeLinkedRows(dashboard); + var i, row; + for (i = 0; i < dashboard.rows.length; i++) { + row = dashboard.rows[i]; + if (row.repeat) { + this.repeatRow(row, dashboard); + } + } + }; + + this.repeatRow = function(row, dashboard) { + console.log('repeat row'); + var variables = dashboard.templating.list; + var variable = _.findWhere(variables, {name: row.repeat.replace('$', '')}); + if (!variable) { + return; + } + + var selected, copy, i, panel; + if (variable.current.text === 'All') { + selected = variable.options.slice(1, variable.options.length); + } else { + selected = _.filter(variable.options, {selected: true}); + } + + _.each(selected, function(option, index) { + if (index > 0) { + copy = angular.copy(row); + copy.repeat = null; + copy.linked = true; + + // set new panel ids + for (i = 0; i < copy.panels.length; i++) { + panel = row.panels[i]; + panel.id = dashboard.getNextPanelId(); + } + + dashboard.rows.push(copy); + } else { + copy = row; + } + + for (i = 0; i < copy.panels.length; i++) { + panel = row.panels[i]; + panel.scopedVars = {}; + panel.scopedVars[variable.name] = option; + } + }); + }; + this.repeatPanel = function(panel, row, dashboard) { var variables = dashboard.templating.list; var variable = _.findWhere(variables, {name: panel.repeat.replace('$', '')}); @@ -76,7 +139,6 @@ function (angular, _) { }); }; - }); }); diff --git a/src/app/partials/roweditor.html b/src/app/partials/roweditor.html index 4c77a0bf814..8202052821c 100644 --- a/src/app/partials/roweditor.html +++ b/src/app/partials/roweditor.html @@ -17,15 +17,27 @@
    -
    - +
    +
    Row details
    +
    + +
    +
    + +
    + +
    -
    - + +
    +
    Templating options
    +
    + + +
    - -
    +
    From c658189c85ab187d8f18d59e2c16a62e2996cb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 21 Mar 2015 18:39:43 -0400 Subject: [PATCH 011/398] Updated --- src/app/features/dashboard/dynamicDashboardSrv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/dashboard/dynamicDashboardSrv.js b/src/app/features/dashboard/dynamicDashboardSrv.js index d2ac44d10e4..f7956fd94a7 100644 --- a/src/app/features/dashboard/dynamicDashboardSrv.js +++ b/src/app/features/dashboard/dynamicDashboardSrv.js @@ -104,7 +104,7 @@ function (angular, _) { for (i = 0; i < copy.panels.length; i++) { panel = row.panels[i]; - panel.scopedVars = {}; + panel.scopedVars = panel.scopedVars || {}; panel.scopedVars[variable.name] = option; } }); From 618d4f0a9de54bddd603e12e3a8f74f6004214b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 27 Mar 2015 13:49:05 +0100 Subject: [PATCH 012/398] Testing kariosdb datasource, hm.. needs a lot of work --- pkg/api/frontendsettings.go | 6 +- .../plugins/datasource/kairosdb/datasource.js | 420 ++++++++++++++++++ .../datasource/kairosdb/partials/config.html | 1 + .../kairosdb/partials/query.editor.html | 384 ++++++++++++++++ .../plugins/datasource/kairosdb/plugin.json | 17 + .../plugins/datasource/kairosdb/queryCtrl.js | 379 ++++++++++++++++ 6 files changed, 1204 insertions(+), 3 deletions(-) create mode 100644 src/app/plugins/datasource/kairosdb/datasource.js create mode 100644 src/app/plugins/datasource/kairosdb/partials/config.html create mode 100644 src/app/plugins/datasource/kairosdb/partials/query.editor.html create mode 100644 src/app/plugins/datasource/kairosdb/plugin.json create mode 100644 src/app/plugins/datasource/kairosdb/queryCtrl.js diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index e42a2deedf2..3af191a7af7 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -1,11 +1,10 @@ package api import ( - "errors" - "fmt" "strconv" "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/plugins" @@ -45,7 +44,8 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro meta, exists := plugins.DataSources[ds.Type] if !exists { - return nil, errors.New(fmt.Sprintf("Could not find plugin definition for data source: %v", ds.Type)) + log.Error(3, "Could not find plugin definition for data source: %v", ds.Type) + continue } dsMap["meta"] = meta diff --git a/src/app/plugins/datasource/kairosdb/datasource.js b/src/app/plugins/datasource/kairosdb/datasource.js new file mode 100644 index 00000000000..e055c118956 --- /dev/null +++ b/src/app/plugins/datasource/kairosdb/datasource.js @@ -0,0 +1,420 @@ +define([ + 'angular', + 'lodash', + 'kbn', + './queryCtrl', +], +function (angular, _, kbn) { + 'use strict'; + + var module = angular.module('grafana.services'); + var tagList = null; + + module.factory('KairosDBDatasource', function($q, $http) { + + function KairosDBDatasource(datasource) { + this.type = datasource.type; + this.editorSrc = 'plugins/datasources/kairosdb/kairosdb.editor.html'; + this.url = datasource.url; + this.name = datasource.name; + this.supportMetrics = true; + this.grafanaDB = datasource.grafanaDB; + } + + // Called once per panel (graph) + KairosDBDatasource.prototype.query = function(options) { + var start = options.range.from; + var end = options.range.to; + + var queries = _.compact(_.map(options.targets, _.partial(convertTargetToQuery, options))); + var plotParams = _.compact(_.map(options.targets, function(target){ + var alias = target.alias; + if (typeof target.alias == 'undefined' || target.alias == "") + alias = target.metric; + return !target.hide + ? {alias: alias, + exouter: target.exOuter} + : null; + })); + var handleKairosDBQueryResponseAlias = _.partial(handleKairosDBQueryResponse, plotParams); + // No valid targets, return the empty result to save a round trip. + if (_.isEmpty(queries)) { + var d = $q.defer(); + d.resolve({ data: [] }); + return d.promise; + } + return this.performTimeSeriesQuery(queries, start, end).then(handleKairosDBQueryResponseAlias,handleQueryError); + }; + + /////////////////////////////////////////////////////////////////////// + /// Query methods + /////////////////////////////////////////////////////////////////////// + + KairosDBDatasource.prototype.performTimeSeriesQuery = function(queries, start, end) { + var reqBody = { + metrics: queries + }; + reqBody.cache_time=0; + convertToKairosTime(start,reqBody,'start'); + convertToKairosTime(end,reqBody,'end'); + var options = { + method: 'POST', + url: '/api/v1/datapoints/query', + data: reqBody + }; + + options.url = this.url + options.url; + return $http(options); + }; + + /** + * Gets the list of metrics + * @returns {*|Promise} + */ + KairosDBDatasource.prototype.performMetricSuggestQuery = function() { + var options = { + url : this.url + '/api/v1/metricnames', + method : 'GET' + }; + return $http(options).then(function(results) { + if (!results.data) { + return []; + } + return results.data.results; + }); + + }; + + KairosDBDatasource.prototype.performTagSuggestQuery = function(metricname,range,type,keyValue) { + if(tagList && (metricname === tagList.metricName) && (range.from === tagList.range.from) && + (range.to === tagList.range.to)) { + return getTagListFromResponse(tagList.results,type,keyValue); + } + tagList = { + metricName:metricname, + range:range + }; + var body = { + metrics : [{name : metricname}] + }; + convertToKairosTime(range.from,body,'start'); + convertToKairosTime(range.to,body,'end'); + var options = { + url : this.url + '/api/v1/datapoints/query/tags', + method : 'POST', + data : body + }; + return $http(options).then(function(results) { + tagList.results = results; + return getTagListFromResponse(results,type,keyValue); + }); + + }; + + ///////////////////////////////////////////////////////////////////////// + /// Formatting methods + //////////////////////////////////////////////////////////////////////// + + function getTagListFromResponse(results,type,keyValue) { + if (!results.data) { + return []; + } + if(type==="key") { + return _.keys(results.data.queries[0].results[0].tags); + } + else if(type==="value" && _.has(results.data.queries[0].results[0].tags,keyValue)) { + return results.data.queries[0].results[0].tags[keyValue]; + } + return []; + } + + /** + * Requires a verion of KairosDB with every CORS defects fixed + * @param results + * @returns {*} + */ + function handleQueryError(results) { + if(results.data.errors && !_.isEmpty(results.data.errors)) { + var errors = { + message: results.data.errors[0] + }; + return $q.reject(errors); + } + else{ + return $q.reject(results); + } + } + + function handleKairosDBQueryResponse(plotParams, results) { + var output = []; + var index = 0; + _.each(results.data.queries, function (series) { + var sample_size = series.sample_size; + console.log("sample_size:" + sample_size + " samples"); + + _.each(series.results, function (result) { + + //var target = result.name; + var target = plotParams[index].alias; + var details = " ( "; + _.each(result.group_by,function(element) { + if(element.name==="tag") { + _.each(element.group,function(value, key) { + details+= key+"="+value+" "; + }); + } + else if(element.name==="value") { + details+= 'value_group='+element.group.group_number+" "; + } + else if(element.name==="time") { + details+= 'time_group='+element.group.group_number+" "; + } + }); + details+= ") "; + if (details != " ( ) ") + target += details; + var datapoints = []; + + for (var i = 0; i < result.values.length; i++) { + var t = Math.floor(result.values[i][0]); + var v = result.values[i][1]; + datapoints[i] = [v, t]; + } + if (plotParams[index].exouter) + datapoints = PeakFilter(datapoints, 10); + output.push({ target: target, datapoints: datapoints }); + }); + index ++; + }); + var output2 = { data: _.flatten(output) }; + + return output2; + } + + function convertTargetToQuery(options,target) { + if (!target.metric || target.hide) { + return null; + } + + var query = { + name: target.metric + }; + + query.aggregators = []; + if(target.downsampling!=='(NONE)') { + query.aggregators.push({ + name: target.downsampling, + align_sampling: true, + align_start_time: true, + sampling: KairosDBDatasource.prototype.convertToKairosInterval(target.sampling || options.interval) + }); + } + if(target.horizontalAggregators) { + _.each(target.horizontalAggregators,function(chosenAggregator) { + var returnedAggregator = { + name:chosenAggregator.name + }; + if(chosenAggregator.sampling_rate) { + returnedAggregator.sampling = KairosDBDatasource.prototype.convertToKairosInterval(chosenAggregator.sampling_rate); + returnedAggregator.align_sampling = true; + returnedAggregator.align_start_time=true; + } + if(chosenAggregator.unit) { + returnedAggregator.unit = chosenAggregator.unit+'s'; + } + if(chosenAggregator.factor && chosenAggregator.name==='div') { + returnedAggregator.divisor = chosenAggregator.factor; + } + else if(chosenAggregator.factor && chosenAggregator.name==='scale') { + returnedAggregator.factor = chosenAggregator.factor; + } + if(chosenAggregator.percentile) { + returnedAggregator.percentile = chosenAggregator.percentile; + } + query.aggregators.push(returnedAggregator); + }); + } + if(_.isEmpty(query.aggregators)) { + delete query.aggregators; + } + + if(target.tags) { + query.tags = angular.copy(target.tags); + } + + if(target.groupByTags || target.nonTagGroupBys) { + query.group_by = []; + if(target.groupByTags) {query.group_by.push({name: "tag", tags: angular.copy(target.groupByTags)});} + if(target.nonTagGroupBys) { + _.each(target.nonTagGroupBys,function(rawGroupBy) { + var formattedGroupBy = angular.copy(rawGroupBy); + if(formattedGroupBy.name==='time') { + formattedGroupBy.range_size=KairosDBDatasource.prototype.convertToKairosInterval(formattedGroupBy.range_size); + } + query.group_by.push(formattedGroupBy); + }); + } + } + return query; + } + + /////////////////////////////////////////////////////////////////////// + /// Time conversion functions specifics to KairosDB + ////////////////////////////////////////////////////////////////////// + + KairosDBDatasource.prototype.convertToKairosInterval = function(intervalString) { + var interval_regex = /(\d+(?:\.\d+)?)([Mwdhmsy])/; + var interval_regex_ms = /(\d+(?:\.\d+)?)(ms)/; + var matches = intervalString.match(interval_regex_ms); + if(!matches) { + matches = intervalString.match(interval_regex); + } + if (!matches) { + throw new Error('Invalid interval string, expecting a number followed by one of "y M w d h m s ms"'); + } + + var value = matches[1]; + var unit = matches[2]; + if (value%1!==0) { + if(unit==='ms') {throw new Error('Invalid interval value, cannot be smaller than the millisecond');} + value = Math.round(kbn.intervals_in_seconds[unit]*value*1000); + unit = 'ms'; + + } + switch(unit) { + case 'ms': + unit = 'milliseconds'; + break; + case 's': + unit = 'seconds'; + break; + case 'm': + unit = 'minutes'; + break; + case 'h': + unit = 'hours'; + break; + case 'd': + unit = 'days'; + break; + case 'w': + unit = 'weeks'; + break; + case 'M': + unit = 'months'; + break; + case 'y': + unit = 'years'; + break; + default: + console.log("Unknown interval ", intervalString); + break; + } + + return { + "value": value, + "unit": unit + }; + + }; + + function convertToKairosTime(date, response_obj, start_stop_name) { + var name; + if (_.isString(date)) { + if (date === 'now') { + return; + } + else if (date.indexOf('now-') >= 0) { + + name = start_stop_name + "_relative"; + + date = date.substring(4); + var re_date = /(\d+)\s*(\D+)/; + var result = re_date.exec(date); + if (result) { + var value = result[1]; + var unit = result[2]; + switch(unit) { + case 'ms': + unit = 'milliseconds'; + break; + case 's': + unit = 'seconds'; + break; + case 'm': + unit = 'minutes'; + break; + case 'h': + unit = 'hours'; + break; + case 'd': + unit = 'days'; + break; + case 'w': + unit = 'weeks'; + break; + case 'M': + unit = 'months'; + break; + case 'y': + unit = 'years'; + break; + default: + console.log("Unknown date ", date); + break; + } + response_obj[name] = { + "value": value, + "unit": unit + }; + return; + } + console.log("Unparseable date", date); + return; + } + date = kbn.parseDate(date); + } + + if(_.isDate(date)) { + name = start_stop_name + "_absolute"; + response_obj[name] = date.getTime(); + return; + } + + console.log("Date is neither string nor date"); + } + + function PeakFilter(dataIn, limit) { + var datapoints = dataIn; + var arrLength = datapoints.length; + if (arrLength <= 3) + return datapoints; + var LastIndx = arrLength - 1; + + // Check first point + var prvDelta = Math.abs((datapoints[1][0] - datapoints[0][0]) / datapoints[0][0]); + var nxtDelta = Math.abs((datapoints[1][0] - datapoints[2][0]) / datapoints[2][0]); + if (prvDelta >= limit && nxtDelta < limit) + datapoints[0][0] = datapoints[1][0]; + + // Check last point + prvDelta = Math.abs((datapoints[LastIndx - 1][0] - datapoints[LastIndx - 2][0]) / datapoints[LastIndx - 2][0]); + nxtDelta = Math.abs((datapoints[LastIndx - 1][0] - datapoints[LastIndx][0]) / datapoints[LastIndx][0]); + if (prvDelta >= limit && nxtDelta < limit) + datapoints[LastIndx][0] = datapoints[LastIndx - 1][0]; + + for (var i = 1; i < arrLength - 1; i++){ + prvDelta = Math.abs((datapoints[i][0] - datapoints[i - 1][0]) / datapoints[i - 1][0]); + nxtDelta = Math.abs((datapoints[i][0] - datapoints[i + 1][0]) / datapoints[i + 1][0]); + if (prvDelta >= limit && nxtDelta >= limit) + datapoints[i][0] = (datapoints[i-1][0] + datapoints[i+1][0]) / 2; + } + + return datapoints; + } + + //////////////////////////////////////////////////////////////////////// + return KairosDBDatasource; + }); + +}); diff --git a/src/app/plugins/datasource/kairosdb/partials/config.html b/src/app/plugins/datasource/kairosdb/partials/config.html new file mode 100644 index 00000000000..384edeaeafe --- /dev/null +++ b/src/app/plugins/datasource/kairosdb/partials/config.html @@ -0,0 +1 @@ +
    diff --git a/src/app/plugins/datasource/kairosdb/partials/query.editor.html b/src/app/plugins/datasource/kairosdb/partials/query.editor.html new file mode 100644 index 00000000000..8a794e7fdf2 --- /dev/null +++ b/src/app/plugins/datasource/kairosdb/partials/query.editor.html @@ -0,0 +1,384 @@ +
    +
    + +
    + + +
      +
    • + {{targetLetters[$index]}} +
      • +
    • + + + +
      • +
    • + +
      • +
    • + + + + +
      • + +
    • +  Peak filter + +
      • +
    + +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
      +
    • + +
      • + +
    • + Downsampling with +
      • +
    • + +
      • + + +
    • + every +
      • +
    • + + + + +
      • +
    +
    +
    +
    diff --git a/src/app/plugins/datasource/kairosdb/plugin.json b/src/app/plugins/datasource/kairosdb/plugin.json new file mode 100644 index 00000000000..bdbf27c5fa8 --- /dev/null +++ b/src/app/plugins/datasource/kairosdb/plugin.json @@ -0,0 +1,17 @@ +{ + "pluginType": "datasource", + "name": "KairosDB", + + "type": "kairosdb", + "serviceName": "KairosDBDatasource", + + "module": "plugins/datasource/kairosdb/datasource", + + "partials": { + "config": "app/plugins/datasource/kairosdb/partials/config.html", + "query": "app/plugins/datasource/kairosdb/partials/query.editor.html" + }, + + "metrics": true, + "annotations": false +} diff --git a/src/app/plugins/datasource/kairosdb/queryCtrl.js b/src/app/plugins/datasource/kairosdb/queryCtrl.js new file mode 100644 index 00000000000..fef1e4d39f4 --- /dev/null +++ b/src/app/plugins/datasource/kairosdb/queryCtrl.js @@ -0,0 +1,379 @@ +define([ + 'angular', + 'lodash' +], +function (angular, _) { + 'use strict'; + + var module = angular.module('grafana.controllers'); + var metricList = null; + var targetLetters = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O']; + + module.controller('KairosDBTargetCtrl', function($scope) { + + $scope.init = function() { + $scope.metric = { + list: ["Loading..."], + value: "Loading..." + }; + $scope.panel.stack = false; + if (!$scope.panel.downsampling) { + $scope.panel.downsampling = 'avg'; + } + if (!$scope.target.downsampling) { + $scope.target.downsampling = $scope.panel.downsampling; + $scope.target.sampling = $scope.panel.sampling; + } + $scope.targetLetters = targetLetters; + $scope.updateMetricList(); + $scope.target.errors = validateTarget($scope.target); + }; + + $scope.targetBlur = function() { + $scope.target.metric = $scope.metric.value; + $scope.target.errors = validateTarget($scope.target); + if (!_.isEqual($scope.oldTarget, $scope.target) && _.isEmpty($scope.target.errors)) { + $scope.oldTarget = angular.copy($scope.target); + $scope.get_data(); + } + }; + $scope.panelBlur = function() { + _.each($scope.panel.targets, function(target) { + target.downsampling = $scope.panel.downsampling; + target.sampling = $scope.panel.sampling; + }); + $scope.get_data(); + }; + + $scope.duplicate = function() { + var clone = angular.copy($scope.target); + $scope.panel.targets.push(clone); + }; + $scope.moveMetricQuery = function(fromIndex, toIndex) { + _.move($scope.panel.targets, fromIndex, toIndex); + }; + + ////////////////////////////// + // SUGGESTION QUERIES + ////////////////////////////// + + $scope.updateMetricList = function() { + $scope.metricListLoading = true; + metricList = []; + $scope.datasource.performMetricSuggestQuery().then(function(series) { + metricList = series; + $scope.metric.list = series; + if ($scope.target.metric) + $scope.metric.value = $scope.target.metric; + else + $scope.metric.value = ""; + $scope.metricListLoading = false; + return metricList; + }); + }; + + $scope.suggestTagKeys = function(query, callback) { + $scope.updateTimeRange(); + callback($scope.datasource + .performTagSuggestQuery($scope.target.metric,$scope.rangeUnparsed, 'key','')); + + }; + + $scope.suggestTagValues = function(query, callback) { + callback($scope.datasource + .performTagSuggestQuery($scope.target.metric,$scope.rangeUnparsed, 'value',$scope.target.currentTagKey)); + }; + + ////////////////////////////// + // FILTER by TAG + ////////////////////////////// + + $scope.addFilterTag = function() { + if (!$scope.addFilterTagMode) { + $scope.addFilterTagMode = true; + $scope.validateFilterTag(); + return; + } + + if (!$scope.target.tags) { + $scope.target.tags = {}; + } + + $scope.validateFilterTag(); + if (!$scope.target.errors.tags) { + if(!_.has($scope.target.tags,$scope.target.currentTagKey)) { + $scope.target.tags[$scope.target.currentTagKey] = []; + } + $scope.target.tags[$scope.target.currentTagKey].push($scope.target.currentTagValue); + $scope.target.currentTagKey = ''; + $scope.target.currentTagValue = ''; + $scope.targetBlur(); + } + + $scope.addFilterTagMode = false; + }; + + $scope.removeFilterTag = function(key) { + delete $scope.target.tags[key]; + if(_.size($scope.target.tags)===0) { + $scope.target.tags = null; + } + $scope.targetBlur(); + }; + + $scope.validateFilterTag = function() { + $scope.target.errors.tags = null; + if(!$scope.target.currentTagKey || !$scope.target.currentTagValue) { + $scope.target.errors.tags = "You must specify a tag name and value."; + } + }; + + ////////////////////////////// + // GROUP BY + ////////////////////////////// + + $scope.addGroupBy = function() { + if (!$scope.addGroupByMode) { + $scope.addGroupByMode = true; + $scope.target.currentGroupByType = 'tag'; + $scope.isTagGroupBy = true; + $scope.validateGroupBy(); + return; + } + $scope.validateGroupBy(); + // nb: if error is found, means that user clicked on cross : cancels input + if (_.isEmpty($scope.target.errors.groupBy)) { + if($scope.isTagGroupBy) { + if (!$scope.target.groupByTags) { + $scope.target.groupByTags = []; + } + console.log($scope.target.groupBy.tagKey); + if (!_.contains($scope.target.groupByTags, $scope.target.groupBy.tagKey)) { + $scope.target.groupByTags.push($scope.target.groupBy.tagKey); + $scope.targetBlur(); + } + $scope.target.groupBy.tagKey = ''; + } + else { + if (!$scope.target.nonTagGroupBys) { + $scope.target.nonTagGroupBys = []; + } + var groupBy = { + name: $scope.target.currentGroupByType + }; + if($scope.isValueGroupBy) {groupBy.range_size = $scope.target.groupBy.valueRange;} + else if($scope.isTimeGroupBy) { + groupBy.range_size = $scope.target.groupBy.timeInterval; + groupBy.group_count = $scope.target.groupBy.groupCount; + } + $scope.target.nonTagGroupBys.push(groupBy); + } + $scope.targetBlur(); + } + $scope.isTagGroupBy = false; + $scope.isValueGroupBy = false; + $scope.isTimeGroupBy = false; + $scope.addGroupByMode = false; + }; + + $scope.removeGroupByTag = function(index) { + $scope.target.groupByTags.splice(index, 1); + if(_.size($scope.target.groupByTags)===0) { + $scope.target.groupByTags = null; + } + $scope.targetBlur(); + }; + + $scope.removeNonTagGroupBy = function(index) { + $scope.target.nonTagGroupBys.splice(index, 1); + if(_.size($scope.target.nonTagGroupBys)===0) { + $scope.target.nonTagGroupBys = null; + } + $scope.targetBlur(); + }; + + $scope.changeGroupByInput = function() { + $scope.isTagGroupBy = $scope.target.currentGroupByType==='tag'; + $scope.isValueGroupBy = $scope.target.currentGroupByType==='value'; + $scope.isTimeGroupBy = $scope.target.currentGroupByType==='time'; + $scope.validateGroupBy(); + }; + + $scope.validateGroupBy = function() { + delete $scope.target.errors.groupBy; + var errors = {}; + $scope.isGroupByValid = true; + if($scope.isTagGroupBy) { + if(!$scope.target.groupBy.tagKey) { + $scope.isGroupByValid = false; + errors.tagKey = 'You must supply a tag name'; + } + } + if($scope.isValueGroupBy) { + if(!$scope.target.groupBy.valueRange || !isInt($scope.target.groupBy.valueRange)) { + errors.valueRange = "Range must be an integer"; + $scope.isGroupByValid = false; + } + } + if($scope.isTimeGroupBy) { + try { + $scope.datasource.convertToKairosInterval($scope.target.groupBy.timeInterval); + } catch(err) { + errors.timeInterval = err.message; + $scope.isGroupByValid = false; + } + if(!$scope.target.groupBy.groupCount || !isInt($scope.target.groupBy.groupCount)) { + errors.groupCount = "Group count must be an integer"; + $scope.isGroupByValid = false; + } + } + + if(!_.isEmpty(errors)) { + $scope.target.errors.groupBy = errors; + } + }; + + function isInt(n) { + return parseInt(n) % 1 === 0; + } + + ////////////////////////////// + // HORIZONTAL AGGREGATION + ////////////////////////////// + + $scope.addHorizontalAggregator = function() { + if (!$scope.addHorizontalAggregatorMode) { + $scope.addHorizontalAggregatorMode = true; + $scope.target.currentHorizontalAggregatorName = 'avg'; + $scope.hasSamplingRate = true; + $scope.validateHorizontalAggregator(); + return; + } + + $scope.validateHorizontalAggregator(); + // nb: if error is found, means that user clicked on cross : cancels input + if(_.isEmpty($scope.target.errors.horAggregator)) { + if (!$scope.target.horizontalAggregators) { + $scope.target.horizontalAggregators = []; + } + var aggregator = { + name:$scope.target.currentHorizontalAggregatorName + }; + if($scope.hasSamplingRate) {aggregator.sampling_rate = $scope.target.horAggregator.samplingRate;} + if($scope.hasUnit) {aggregator.unit = $scope.target.horAggregator.unit;} + if($scope.hasFactor) {aggregator.factor = $scope.target.horAggregator.factor;} + if($scope.hasPercentile) {aggregator.percentile = $scope.target.horAggregator.percentile;} + $scope.target.horizontalAggregators.push(aggregator); + $scope.targetBlur(); + } + + $scope.addHorizontalAggregatorMode = false; + $scope.hasSamplingRate = false; + $scope.hasUnit = false; + $scope.hasFactor = false; + $scope.hasPercentile = false; + + }; + + $scope.removeHorizontalAggregator = function(index) { + $scope.target.horizontalAggregators.splice(index, 1); + if(_.size($scope.target.horizontalAggregators)===0) { + $scope.target.horizontalAggregators = null; + } + + $scope.targetBlur(); + }; + + $scope.changeHorAggregationInput = function() { + $scope.hasSamplingRate = _.contains(['avg','dev','max','min','sum','least_squares','count','percentile'], + $scope.target.currentHorizontalAggregatorName); + $scope.hasUnit = _.contains(['sampler','rate'], $scope.target.currentHorizontalAggregatorName); + $scope.hasFactor = _.contains(['div','scale'], $scope.target.currentHorizontalAggregatorName); + $scope.hasPercentile = 'percentile'===$scope.target.currentHorizontalAggregatorName; + $scope.validateHorizontalAggregator(); + }; + + $scope.validateHorizontalAggregator = function() { + delete $scope.target.errors.horAggregator; + var errors = {}; + $scope.isAggregatorValid = true; + if($scope.hasSamplingRate) { + try { + $scope.datasource.convertToKairosInterval($scope.target.horAggregator.samplingRate); + } catch(err) { + errors.samplingRate = err.message; + $scope.isAggregatorValid = false; + } + } + if($scope.hasFactor) { + if(!$scope.target.horAggregator.factor) { + errors.factor = 'You must supply a numeric value for this aggregator'; + $scope.isAggregatorValid = false; + } + else if(parseInt($scope.target.horAggregator.factor)===0 && $scope.target.currentHorizontalAggregatorName==='div') { + errors.factor = 'Cannot divide by 0'; + $scope.isAggregatorValid = false; + } + } + if($scope.hasPercentile) { + if(!$scope.target.horAggregator.percentile || + $scope.target.horAggregator.percentile<=0 || + $scope.target.horAggregator.percentile>1) { + errors.percentile = 'Percentile must be between 0 and 1'; + $scope.isAggregatorValid = false; + } + } + + if(!_.isEmpty(errors)) { + $scope.target.errors.horAggregator = errors; + } + }; + + $scope.alert = function(message) { + alert(message); + }; + + ////////////////////////////// + // VALIDATION + ////////////////////////////// + + function MetricListToObject(MetricList) { + var result = {}; + var Metric; + var MetricArray = []; + var MetricCnt = 0; + for (var i =0;i < MetricList.length; i++) { + Metric = MetricList[i]; + MetricArray = Metric.split('.'); + if(!result.hasOwnProperty(MetricArray[0])) { + result[MetricArray[0]] = {}; + } + if(!result[MetricArray[0]].hasOwnProperty(MetricArray[1])) { + result[MetricArray[0]][MetricArray[1]] = []; + } + result[MetricArray[0]][MetricArray[1]].push(MetricArray[2]); + } + return result; + } + + function validateTarget(target) { + var errs = {}; + + if (!target.metric) { + errs.metric = "You must supply a metric name."; + } + + try { + if (target.sampling) { + $scope.datasource.convertToKairosInterval(target.sampling); + } + } catch(err) { + errs.sampling = err.message; + } + + return errs; + } + + }); + +}); From 15188c4a885c9f884a867e6711c2461f1a87d033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 29 Mar 2015 20:13:32 +0200 Subject: [PATCH 013/398] Moved kairosdb data source to correct folder --- {src => public}/app/plugins/datasource/kairosdb/datasource.js | 0 .../app/plugins/datasource/kairosdb/partials/config.html | 0 .../app/plugins/datasource/kairosdb/partials/query.editor.html | 0 {src => public}/app/plugins/datasource/kairosdb/plugin.json | 0 {src => public}/app/plugins/datasource/kairosdb/queryCtrl.js | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename {src => public}/app/plugins/datasource/kairosdb/datasource.js (100%) rename {src => public}/app/plugins/datasource/kairosdb/partials/config.html (100%) rename {src => public}/app/plugins/datasource/kairosdb/partials/query.editor.html (100%) rename {src => public}/app/plugins/datasource/kairosdb/plugin.json (100%) rename {src => public}/app/plugins/datasource/kairosdb/queryCtrl.js (100%) diff --git a/src/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js similarity index 100% rename from src/app/plugins/datasource/kairosdb/datasource.js rename to public/app/plugins/datasource/kairosdb/datasource.js diff --git a/src/app/plugins/datasource/kairosdb/partials/config.html b/public/app/plugins/datasource/kairosdb/partials/config.html similarity index 100% rename from src/app/plugins/datasource/kairosdb/partials/config.html rename to public/app/plugins/datasource/kairosdb/partials/config.html diff --git a/src/app/plugins/datasource/kairosdb/partials/query.editor.html b/public/app/plugins/datasource/kairosdb/partials/query.editor.html similarity index 100% rename from src/app/plugins/datasource/kairosdb/partials/query.editor.html rename to public/app/plugins/datasource/kairosdb/partials/query.editor.html diff --git a/src/app/plugins/datasource/kairosdb/plugin.json b/public/app/plugins/datasource/kairosdb/plugin.json similarity index 100% rename from src/app/plugins/datasource/kairosdb/plugin.json rename to public/app/plugins/datasource/kairosdb/plugin.json diff --git a/src/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js similarity index 100% rename from src/app/plugins/datasource/kairosdb/queryCtrl.js rename to public/app/plugins/datasource/kairosdb/queryCtrl.js From 795cee13c8b011c8e2ccbf7b0fe12a83de699503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 29 Mar 2015 20:30:42 +0200 Subject: [PATCH 014/398] KairosDB data source plugin is messy, needs a lot of clean up & refactoring, please help --- .../plugins/datasource/kairosdb/datasource.js | 2 +- .../plugins/datasource/kairosdb/queryCtrl.js | 26 ++++++------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index e055c118956..bcce19cb83f 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -217,7 +217,7 @@ function (angular, _, kbn) { if(chosenAggregator.sampling_rate) { returnedAggregator.sampling = KairosDBDatasource.prototype.convertToKairosInterval(chosenAggregator.sampling_rate); returnedAggregator.align_sampling = true; - returnedAggregator.align_start_time=true; + returnedAggregator.align_start_time =true; } if(chosenAggregator.unit) { returnedAggregator.unit = chosenAggregator.unit+'s'; diff --git a/public/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js index fef1e4d39f4..73321d3016a 100644 --- a/public/app/plugins/datasource/kairosdb/queryCtrl.js +++ b/public/app/plugins/datasource/kairosdb/queryCtrl.js @@ -53,30 +53,26 @@ function (angular, _) { _.move($scope.panel.targets, fromIndex, toIndex); }; - ////////////////////////////// - // SUGGESTION QUERIES - ////////////////////////////// - + // Fetch metric list $scope.updateMetricList = function() { $scope.metricListLoading = true; metricList = []; $scope.datasource.performMetricSuggestQuery().then(function(series) { metricList = series; $scope.metric.list = series; - if ($scope.target.metric) + if ($scope.target.metric) { $scope.metric.value = $scope.target.metric; - else + } + else { $scope.metric.value = ""; + } $scope.metricListLoading = false; return metricList; }); }; $scope.suggestTagKeys = function(query, callback) { - $scope.updateTimeRange(); - callback($scope.datasource - .performTagSuggestQuery($scope.target.metric,$scope.rangeUnparsed, 'key','')); - + callback($scope.datasource.performTagSuggestQuery($scope.target.metric, $scope.rangeUnparsed, 'key','')); }; $scope.suggestTagValues = function(query, callback) { @@ -84,10 +80,7 @@ function (angular, _) { .performTagSuggestQuery($scope.target.metric,$scope.rangeUnparsed, 'value',$scope.target.currentTagKey)); }; - ////////////////////////////// - // FILTER by TAG - ////////////////////////////// - + // Filter metric by tag $scope.addFilterTag = function() { if (!$scope.addFilterTagMode) { $scope.addFilterTagMode = true; @@ -333,10 +326,7 @@ function (angular, _) { alert(message); }; - ////////////////////////////// - // VALIDATION - ////////////////////////////// - + // Validation function MetricListToObject(MetricList) { var result = {}; var Metric; From 66f5411402f87d7ba4ca34e96b83dd97601f0e19 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 12 Apr 2015 18:39:41 +0900 Subject: [PATCH 015/398] Fix class names in query.editor.html of KairosDB Plugin --- .../kairosdb/partials/query.editor.html | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/partials/query.editor.html b/public/app/plugins/datasource/kairosdb/partials/query.editor.html index 8a794e7fdf2..23ddecabc4e 100644 --- a/public/app/plugins/datasource/kairosdb/partials/query.editor.html +++ b/public/app/plugins/datasource/kairosdb/partials/query.editor.html @@ -10,7 +10,7 @@
  • - +
  • @@ -72,7 +72,7 @@ - +
    • @@ -98,13 +98,13 @@
  • {{key}} = {{value}} - +
  • - +
    • @@ -130,12 +130,12 @@ - +
  • - - + +
    • @@ -152,7 +152,7 @@
  • {{key}} - +
    • @@ -163,13 +163,13 @@
  • {{_.values(groupByObject)}} - +
  • - +
  • @@ -190,7 +190,7 @@ - +
  • @@ -204,7 +204,7 @@ - +
  • @@ -219,7 +219,7 @@ - +
  • @@ -233,13 +233,13 @@ - +
  • - - + +
    • @@ -285,7 +285,7 @@ - + @@ -375,7 +375,7 @@ - + From ed69ddedbf2a58a2ae24a1bf11320983624fe8c4 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 12 Apr 2015 19:46:19 +0900 Subject: [PATCH 016/398] Fix styles warned by jscs --- public/app/plugins/datasource/kairosdb/datasource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index bcce19cb83f..7376c528ce9 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -27,7 +27,7 @@ function (angular, _, kbn) { var end = options.range.to; var queries = _.compact(_.map(options.targets, _.partial(convertTargetToQuery, options))); - var plotParams = _.compact(_.map(options.targets, function(target){ + var plotParams = _.compact(_.map(options.targets, function(target) { var alias = target.alias; if (typeof target.alias == 'undefined' || target.alias == "") alias = target.metric; From ae2201ef6f50dd79ae4165c6e969df6d93e59d09 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 12 Apr 2015 20:03:43 +0900 Subject: [PATCH 017/398] Add space after keywords --- .../plugins/datasource/kairosdb/datasource.js | 54 +++++++-------- .../plugins/datasource/kairosdb/queryCtrl.js | 68 +++++++++---------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index 7376c528ce9..ecd4564f72f 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -86,7 +86,7 @@ function (angular, _, kbn) { }; KairosDBDatasource.prototype.performTagSuggestQuery = function(metricname,range,type,keyValue) { - if(tagList && (metricname === tagList.metricName) && (range.from === tagList.range.from) && + if (tagList && (metricname === tagList.metricName) && (range.from === tagList.range.from) && (range.to === tagList.range.to)) { return getTagListFromResponse(tagList.results,type,keyValue); } @@ -119,10 +119,10 @@ function (angular, _, kbn) { if (!results.data) { return []; } - if(type==="key") { + if (type==="key") { return _.keys(results.data.queries[0].results[0].tags); } - else if(type==="value" && _.has(results.data.queries[0].results[0].tags,keyValue)) { + else if (type==="value" && _.has(results.data.queries[0].results[0].tags,keyValue)) { return results.data.queries[0].results[0].tags[keyValue]; } return []; @@ -134,13 +134,13 @@ function (angular, _, kbn) { * @returns {*} */ function handleQueryError(results) { - if(results.data.errors && !_.isEmpty(results.data.errors)) { + if (results.data.errors && !_.isEmpty(results.data.errors)) { var errors = { message: results.data.errors[0] }; return $q.reject(errors); } - else{ + else { return $q.reject(results); } } @@ -158,15 +158,15 @@ function (angular, _, kbn) { var target = plotParams[index].alias; var details = " ( "; _.each(result.group_by,function(element) { - if(element.name==="tag") { + if (element.name==="tag") { _.each(element.group,function(value, key) { details+= key+"="+value+" "; }); } - else if(element.name==="value") { + else if (element.name==="value") { details+= 'value_group='+element.group.group_number+" "; } - else if(element.name==="time") { + else if (element.name==="time") { details+= 'time_group='+element.group.group_number+" "; } }); @@ -201,7 +201,7 @@ function (angular, _, kbn) { }; query.aggregators = []; - if(target.downsampling!=='(NONE)') { + if (target.downsampling!=='(NONE)') { query.aggregators.push({ name: target.downsampling, align_sampling: true, @@ -209,46 +209,46 @@ function (angular, _, kbn) { sampling: KairosDBDatasource.prototype.convertToKairosInterval(target.sampling || options.interval) }); } - if(target.horizontalAggregators) { + if (target.horizontalAggregators) { _.each(target.horizontalAggregators,function(chosenAggregator) { var returnedAggregator = { name:chosenAggregator.name }; - if(chosenAggregator.sampling_rate) { + if (chosenAggregator.sampling_rate) { returnedAggregator.sampling = KairosDBDatasource.prototype.convertToKairosInterval(chosenAggregator.sampling_rate); returnedAggregator.align_sampling = true; returnedAggregator.align_start_time =true; } - if(chosenAggregator.unit) { + if (chosenAggregator.unit) { returnedAggregator.unit = chosenAggregator.unit+'s'; } - if(chosenAggregator.factor && chosenAggregator.name==='div') { + if (chosenAggregator.factor && chosenAggregator.name==='div') { returnedAggregator.divisor = chosenAggregator.factor; } - else if(chosenAggregator.factor && chosenAggregator.name==='scale') { + else if (chosenAggregator.factor && chosenAggregator.name==='scale') { returnedAggregator.factor = chosenAggregator.factor; } - if(chosenAggregator.percentile) { + if (chosenAggregator.percentile) { returnedAggregator.percentile = chosenAggregator.percentile; } query.aggregators.push(returnedAggregator); }); } - if(_.isEmpty(query.aggregators)) { + if (_.isEmpty(query.aggregators)) { delete query.aggregators; } - if(target.tags) { + if (target.tags) { query.tags = angular.copy(target.tags); } - if(target.groupByTags || target.nonTagGroupBys) { + if (target.groupByTags || target.nonTagGroupBys) { query.group_by = []; - if(target.groupByTags) {query.group_by.push({name: "tag", tags: angular.copy(target.groupByTags)});} - if(target.nonTagGroupBys) { + if (target.groupByTags) {query.group_by.push({name: "tag", tags: angular.copy(target.groupByTags)});} + if (target.nonTagGroupBys) { _.each(target.nonTagGroupBys,function(rawGroupBy) { var formattedGroupBy = angular.copy(rawGroupBy); - if(formattedGroupBy.name==='time') { + if (formattedGroupBy.name==='time') { formattedGroupBy.range_size=KairosDBDatasource.prototype.convertToKairosInterval(formattedGroupBy.range_size); } query.group_by.push(formattedGroupBy); @@ -266,7 +266,7 @@ function (angular, _, kbn) { var interval_regex = /(\d+(?:\.\d+)?)([Mwdhmsy])/; var interval_regex_ms = /(\d+(?:\.\d+)?)(ms)/; var matches = intervalString.match(interval_regex_ms); - if(!matches) { + if (!matches) { matches = intervalString.match(interval_regex); } if (!matches) { @@ -276,12 +276,12 @@ function (angular, _, kbn) { var value = matches[1]; var unit = matches[2]; if (value%1!==0) { - if(unit==='ms') {throw new Error('Invalid interval value, cannot be smaller than the millisecond');} + if (unit==='ms') {throw new Error('Invalid interval value, cannot be smaller than the millisecond');} value = Math.round(kbn.intervals_in_seconds[unit]*value*1000); unit = 'ms'; } - switch(unit) { + switch (unit) { case 'ms': unit = 'milliseconds'; break; @@ -334,7 +334,7 @@ function (angular, _, kbn) { if (result) { var value = result[1]; var unit = result[2]; - switch(unit) { + switch (unit) { case 'ms': unit = 'milliseconds'; break; @@ -375,7 +375,7 @@ function (angular, _, kbn) { date = kbn.parseDate(date); } - if(_.isDate(date)) { + if (_.isDate(date)) { name = start_stop_name + "_absolute"; response_obj[name] = date.getTime(); return; @@ -403,7 +403,7 @@ function (angular, _, kbn) { if (prvDelta >= limit && nxtDelta < limit) datapoints[LastIndx][0] = datapoints[LastIndx - 1][0]; - for (var i = 1; i < arrLength - 1; i++){ + for (var i = 1; i < arrLength - 1; i++) { prvDelta = Math.abs((datapoints[i][0] - datapoints[i - 1][0]) / datapoints[i - 1][0]); nxtDelta = Math.abs((datapoints[i][0] - datapoints[i + 1][0]) / datapoints[i + 1][0]); if (prvDelta >= limit && nxtDelta >= limit) diff --git a/public/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js index 73321d3016a..bb0f74a68b3 100644 --- a/public/app/plugins/datasource/kairosdb/queryCtrl.js +++ b/public/app/plugins/datasource/kairosdb/queryCtrl.js @@ -94,7 +94,7 @@ function (angular, _) { $scope.validateFilterTag(); if (!$scope.target.errors.tags) { - if(!_.has($scope.target.tags,$scope.target.currentTagKey)) { + if (!_.has($scope.target.tags,$scope.target.currentTagKey)) { $scope.target.tags[$scope.target.currentTagKey] = []; } $scope.target.tags[$scope.target.currentTagKey].push($scope.target.currentTagValue); @@ -108,7 +108,7 @@ function (angular, _) { $scope.removeFilterTag = function(key) { delete $scope.target.tags[key]; - if(_.size($scope.target.tags)===0) { + if (_.size($scope.target.tags)===0) { $scope.target.tags = null; } $scope.targetBlur(); @@ -116,7 +116,7 @@ function (angular, _) { $scope.validateFilterTag = function() { $scope.target.errors.tags = null; - if(!$scope.target.currentTagKey || !$scope.target.currentTagValue) { + if (!$scope.target.currentTagKey || !$scope.target.currentTagValue) { $scope.target.errors.tags = "You must specify a tag name and value."; } }; @@ -136,7 +136,7 @@ function (angular, _) { $scope.validateGroupBy(); // nb: if error is found, means that user clicked on cross : cancels input if (_.isEmpty($scope.target.errors.groupBy)) { - if($scope.isTagGroupBy) { + if ($scope.isTagGroupBy) { if (!$scope.target.groupByTags) { $scope.target.groupByTags = []; } @@ -147,15 +147,15 @@ function (angular, _) { } $scope.target.groupBy.tagKey = ''; } - else { + else { if (!$scope.target.nonTagGroupBys) { $scope.target.nonTagGroupBys = []; } var groupBy = { name: $scope.target.currentGroupByType }; - if($scope.isValueGroupBy) {groupBy.range_size = $scope.target.groupBy.valueRange;} - else if($scope.isTimeGroupBy) { + if ($scope.isValueGroupBy) {groupBy.range_size = $scope.target.groupBy.valueRange;} + else if ($scope.isTimeGroupBy) { groupBy.range_size = $scope.target.groupBy.timeInterval; groupBy.group_count = $scope.target.groupBy.groupCount; } @@ -171,7 +171,7 @@ function (angular, _) { $scope.removeGroupByTag = function(index) { $scope.target.groupByTags.splice(index, 1); - if(_.size($scope.target.groupByTags)===0) { + if (_.size($scope.target.groupByTags)===0) { $scope.target.groupByTags = null; } $scope.targetBlur(); @@ -179,7 +179,7 @@ function (angular, _) { $scope.removeNonTagGroupBy = function(index) { $scope.target.nonTagGroupBys.splice(index, 1); - if(_.size($scope.target.nonTagGroupBys)===0) { + if (_.size($scope.target.nonTagGroupBys)===0) { $scope.target.nonTagGroupBys = null; } $scope.targetBlur(); @@ -196,32 +196,32 @@ function (angular, _) { delete $scope.target.errors.groupBy; var errors = {}; $scope.isGroupByValid = true; - if($scope.isTagGroupBy) { - if(!$scope.target.groupBy.tagKey) { + if ($scope.isTagGroupBy) { + if (!$scope.target.groupBy.tagKey) { $scope.isGroupByValid = false; errors.tagKey = 'You must supply a tag name'; } } - if($scope.isValueGroupBy) { - if(!$scope.target.groupBy.valueRange || !isInt($scope.target.groupBy.valueRange)) { + if ($scope.isValueGroupBy) { + if (!$scope.target.groupBy.valueRange || !isInt($scope.target.groupBy.valueRange)) { errors.valueRange = "Range must be an integer"; $scope.isGroupByValid = false; } } - if($scope.isTimeGroupBy) { + if ($scope.isTimeGroupBy) { try { $scope.datasource.convertToKairosInterval($scope.target.groupBy.timeInterval); - } catch(err) { + } catch (err) { errors.timeInterval = err.message; $scope.isGroupByValid = false; } - if(!$scope.target.groupBy.groupCount || !isInt($scope.target.groupBy.groupCount)) { + if (!$scope.target.groupBy.groupCount || !isInt($scope.target.groupBy.groupCount)) { errors.groupCount = "Group count must be an integer"; $scope.isGroupByValid = false; } } - if(!_.isEmpty(errors)) { + if (!_.isEmpty(errors)) { $scope.target.errors.groupBy = errors; } }; @@ -245,17 +245,17 @@ function (angular, _) { $scope.validateHorizontalAggregator(); // nb: if error is found, means that user clicked on cross : cancels input - if(_.isEmpty($scope.target.errors.horAggregator)) { + if (_.isEmpty($scope.target.errors.horAggregator)) { if (!$scope.target.horizontalAggregators) { $scope.target.horizontalAggregators = []; } var aggregator = { name:$scope.target.currentHorizontalAggregatorName }; - if($scope.hasSamplingRate) {aggregator.sampling_rate = $scope.target.horAggregator.samplingRate;} - if($scope.hasUnit) {aggregator.unit = $scope.target.horAggregator.unit;} - if($scope.hasFactor) {aggregator.factor = $scope.target.horAggregator.factor;} - if($scope.hasPercentile) {aggregator.percentile = $scope.target.horAggregator.percentile;} + if ($scope.hasSamplingRate) {aggregator.sampling_rate = $scope.target.horAggregator.samplingRate;} + if ($scope.hasUnit) {aggregator.unit = $scope.target.horAggregator.unit;} + if ($scope.hasFactor) {aggregator.factor = $scope.target.horAggregator.factor;} + if ($scope.hasPercentile) {aggregator.percentile = $scope.target.horAggregator.percentile;} $scope.target.horizontalAggregators.push(aggregator); $scope.targetBlur(); } @@ -270,7 +270,7 @@ function (angular, _) { $scope.removeHorizontalAggregator = function(index) { $scope.target.horizontalAggregators.splice(index, 1); - if(_.size($scope.target.horizontalAggregators)===0) { + if (_.size($scope.target.horizontalAggregators)===0) { $scope.target.horizontalAggregators = null; } @@ -290,26 +290,26 @@ function (angular, _) { delete $scope.target.errors.horAggregator; var errors = {}; $scope.isAggregatorValid = true; - if($scope.hasSamplingRate) { + if ($scope.hasSamplingRate) { try { $scope.datasource.convertToKairosInterval($scope.target.horAggregator.samplingRate); - } catch(err) { + } catch (err) { errors.samplingRate = err.message; $scope.isAggregatorValid = false; } } - if($scope.hasFactor) { - if(!$scope.target.horAggregator.factor) { + if ($scope.hasFactor) { + if (!$scope.target.horAggregator.factor) { errors.factor = 'You must supply a numeric value for this aggregator'; $scope.isAggregatorValid = false; } - else if(parseInt($scope.target.horAggregator.factor)===0 && $scope.target.currentHorizontalAggregatorName==='div') { + else if (parseInt($scope.target.horAggregator.factor)===0 && $scope.target.currentHorizontalAggregatorName==='div') { errors.factor = 'Cannot divide by 0'; $scope.isAggregatorValid = false; } } - if($scope.hasPercentile) { - if(!$scope.target.horAggregator.percentile || + if ($scope.hasPercentile) { + if (!$scope.target.horAggregator.percentile || $scope.target.horAggregator.percentile<=0 || $scope.target.horAggregator.percentile>1) { errors.percentile = 'Percentile must be between 0 and 1'; @@ -317,7 +317,7 @@ function (angular, _) { } } - if(!_.isEmpty(errors)) { + if (!_.isEmpty(errors)) { $scope.target.errors.horAggregator = errors; } }; @@ -335,10 +335,10 @@ function (angular, _) { for (var i =0;i < MetricList.length; i++) { Metric = MetricList[i]; MetricArray = Metric.split('.'); - if(!result.hasOwnProperty(MetricArray[0])) { + if (!result.hasOwnProperty(MetricArray[0])) { result[MetricArray[0]] = {}; } - if(!result[MetricArray[0]].hasOwnProperty(MetricArray[1])) { + if (!result[MetricArray[0]].hasOwnProperty(MetricArray[1])) { result[MetricArray[0]][MetricArray[1]] = []; } result[MetricArray[0]][MetricArray[1]].push(MetricArray[2]); @@ -357,7 +357,7 @@ function (angular, _) { if (target.sampling) { $scope.datasource.convertToKairosInterval(target.sampling); } - } catch(err) { + } catch (err) { errs.sampling = err.message; } From 2b5fa599fbcffad8e938a5574bf8257a16f86566 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 12 Apr 2015 20:11:42 +0900 Subject: [PATCH 018/398] Fix styles warned by jshint --- .../plugins/datasource/kairosdb/datasource.js | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index ecd4564f72f..086b07b88e6 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -29,8 +29,9 @@ function (angular, _, kbn) { var queries = _.compact(_.map(options.targets, _.partial(convertTargetToQuery, options))); var plotParams = _.compact(_.map(options.targets, function(target) { var alias = target.alias; - if (typeof target.alias == 'undefined' || target.alias == "") + if (typeof target.alias === 'undefined' || target.alias === "") { alias = target.metric; + } return !target.hide ? {alias: alias, exouter: target.exOuter} @@ -171,8 +172,9 @@ function (angular, _, kbn) { } }); details+= ") "; - if (details != " ( ) ") + if (details !== " ( ) ") { target += details; + } var datapoints = []; for (var i = 0; i < result.values.length; i++) { @@ -180,8 +182,9 @@ function (angular, _, kbn) { var v = result.values[i][1]; datapoints[i] = [v, t]; } - if (plotParams[index].exouter) - datapoints = PeakFilter(datapoints, 10); + if (plotParams[index].exouter) { + datapoints = new PeakFilter(datapoints, 10); + } output.push({ target: target, datapoints: datapoints }); }); index ++; @@ -387,27 +390,31 @@ function (angular, _, kbn) { function PeakFilter(dataIn, limit) { var datapoints = dataIn; var arrLength = datapoints.length; - if (arrLength <= 3) + if (arrLength <= 3) { return datapoints; + } var LastIndx = arrLength - 1; // Check first point var prvDelta = Math.abs((datapoints[1][0] - datapoints[0][0]) / datapoints[0][0]); var nxtDelta = Math.abs((datapoints[1][0] - datapoints[2][0]) / datapoints[2][0]); - if (prvDelta >= limit && nxtDelta < limit) + if (prvDelta >= limit && nxtDelta < limit) { datapoints[0][0] = datapoints[1][0]; + } // Check last point prvDelta = Math.abs((datapoints[LastIndx - 1][0] - datapoints[LastIndx - 2][0]) / datapoints[LastIndx - 2][0]); nxtDelta = Math.abs((datapoints[LastIndx - 1][0] - datapoints[LastIndx][0]) / datapoints[LastIndx][0]); - if (prvDelta >= limit && nxtDelta < limit) + if (prvDelta >= limit && nxtDelta < limit) { datapoints[LastIndx][0] = datapoints[LastIndx - 1][0]; + } for (var i = 1; i < arrLength - 1; i++) { prvDelta = Math.abs((datapoints[i][0] - datapoints[i - 1][0]) / datapoints[i - 1][0]); nxtDelta = Math.abs((datapoints[i][0] - datapoints[i + 1][0]) / datapoints[i + 1][0]); - if (prvDelta >= limit && nxtDelta >= limit) + if (prvDelta >= limit && nxtDelta >= limit) { datapoints[i][0] = (datapoints[i-1][0] + datapoints[i+1][0]) / 2; + } } return datapoints; From ddb4b928a06c531f79576d85272e51173575b901 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 12 Apr 2015 20:18:01 +0900 Subject: [PATCH 019/398] Delete MetricListToObject which never used --- .../plugins/datasource/kairosdb/queryCtrl.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js index bb0f74a68b3..20b77c59644 100644 --- a/public/app/plugins/datasource/kairosdb/queryCtrl.js +++ b/public/app/plugins/datasource/kairosdb/queryCtrl.js @@ -327,25 +327,6 @@ function (angular, _) { }; // Validation - function MetricListToObject(MetricList) { - var result = {}; - var Metric; - var MetricArray = []; - var MetricCnt = 0; - for (var i =0;i < MetricList.length; i++) { - Metric = MetricList[i]; - MetricArray = Metric.split('.'); - if (!result.hasOwnProperty(MetricArray[0])) { - result[MetricArray[0]] = {}; - } - if (!result[MetricArray[0]].hasOwnProperty(MetricArray[1])) { - result[MetricArray[0]][MetricArray[1]] = []; - } - result[MetricArray[0]][MetricArray[1]].push(MetricArray[2]); - } - return result; - } - function validateTarget(target) { var errs = {}; From a2b751976e7472ce0ab0ce6e303d7285bc584ec4 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 12 Apr 2015 20:41:09 +0900 Subject: [PATCH 020/398] Add space before and after binary operators --- .../plugins/datasource/kairosdb/datasource.js | 44 +++++++++---------- .../plugins/datasource/kairosdb/queryCtrl.js | 18 ++++---- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index 086b07b88e6..cc1ee79c852 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -55,7 +55,7 @@ function (angular, _, kbn) { var reqBody = { metrics: queries }; - reqBody.cache_time=0; + reqBody.cache_time = 0; convertToKairosTime(start,reqBody,'start'); convertToKairosTime(end,reqBody,'end'); var options = { @@ -120,10 +120,10 @@ function (angular, _, kbn) { if (!results.data) { return []; } - if (type==="key") { + if (type === "key") { return _.keys(results.data.queries[0].results[0].tags); } - else if (type==="value" && _.has(results.data.queries[0].results[0].tags,keyValue)) { + else if (type === "value" && _.has(results.data.queries[0].results[0].tags,keyValue)) { return results.data.queries[0].results[0].tags[keyValue]; } return []; @@ -159,19 +159,19 @@ function (angular, _, kbn) { var target = plotParams[index].alias; var details = " ( "; _.each(result.group_by,function(element) { - if (element.name==="tag") { + if (element.name === "tag") { _.each(element.group,function(value, key) { - details+= key+"="+value+" "; + details += key + "=" + value + " "; }); } - else if (element.name==="value") { - details+= 'value_group='+element.group.group_number+" "; + else if (element.name === "value") { + details += 'value_group=' + element.group.group_number + " "; } - else if (element.name==="time") { - details+= 'time_group='+element.group.group_number+" "; + else if (element.name === "time") { + details += 'time_group=' + element.group.group_number + " "; } }); - details+= ") "; + details += ") "; if (details !== " ( ) ") { target += details; } @@ -204,7 +204,7 @@ function (angular, _, kbn) { }; query.aggregators = []; - if (target.downsampling!=='(NONE)') { + if (target.downsampling !== '(NONE)') { query.aggregators.push({ name: target.downsampling, align_sampling: true, @@ -223,13 +223,13 @@ function (angular, _, kbn) { returnedAggregator.align_start_time =true; } if (chosenAggregator.unit) { - returnedAggregator.unit = chosenAggregator.unit+'s'; + returnedAggregator.unit = chosenAggregator.unit + 's'; } - if (chosenAggregator.factor && chosenAggregator.name==='div') { + if (chosenAggregator.factor && chosenAggregator.name === 'div') { returnedAggregator.divisor = chosenAggregator.factor; } - else if (chosenAggregator.factor && chosenAggregator.name==='scale') { - returnedAggregator.factor = chosenAggregator.factor; + else if (chosenAggregator.factor && chosenAggregator.name === 'scale') { + returnedAggregator.factor = chosenAggregator.factor; } if (chosenAggregator.percentile) { returnedAggregator.percentile = chosenAggregator.percentile; @@ -249,10 +249,10 @@ function (angular, _, kbn) { query.group_by = []; if (target.groupByTags) {query.group_by.push({name: "tag", tags: angular.copy(target.groupByTags)});} if (target.nonTagGroupBys) { - _.each(target.nonTagGroupBys,function(rawGroupBy) { + _.each(target.nonTagGroupBys, function(rawGroupBy) { var formattedGroupBy = angular.copy(rawGroupBy); - if (formattedGroupBy.name==='time') { - formattedGroupBy.range_size=KairosDBDatasource.prototype.convertToKairosInterval(formattedGroupBy.range_size); + if (formattedGroupBy.name === 'time') { + formattedGroupBy.range_size = KairosDBDatasource.prototype.convertToKairosInterval(formattedGroupBy.range_size); } query.group_by.push(formattedGroupBy); }); @@ -278,9 +278,9 @@ function (angular, _, kbn) { var value = matches[1]; var unit = matches[2]; - if (value%1!==0) { - if (unit==='ms') {throw new Error('Invalid interval value, cannot be smaller than the millisecond');} - value = Math.round(kbn.intervals_in_seconds[unit]*value*1000); + if (value%1 !== 0) { + if (unit === 'ms') {throw new Error('Invalid interval value, cannot be smaller than the millisecond');} + value = Math.round(kbn.intervals_in_seconds[unit] * value * 1000); unit = 'ms'; } @@ -413,7 +413,7 @@ function (angular, _, kbn) { prvDelta = Math.abs((datapoints[i][0] - datapoints[i - 1][0]) / datapoints[i - 1][0]); nxtDelta = Math.abs((datapoints[i][0] - datapoints[i + 1][0]) / datapoints[i + 1][0]); if (prvDelta >= limit && nxtDelta >= limit) { - datapoints[i][0] = (datapoints[i-1][0] + datapoints[i+1][0]) / 2; + datapoints[i][0] = (datapoints[i - 1][0] + datapoints[i + 1][0]) / 2; } } diff --git a/public/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js index 20b77c59644..0de3c953152 100644 --- a/public/app/plugins/datasource/kairosdb/queryCtrl.js +++ b/public/app/plugins/datasource/kairosdb/queryCtrl.js @@ -108,7 +108,7 @@ function (angular, _) { $scope.removeFilterTag = function(key) { delete $scope.target.tags[key]; - if (_.size($scope.target.tags)===0) { + if (_.size($scope.target.tags) === 0) { $scope.target.tags = null; } $scope.targetBlur(); @@ -171,7 +171,7 @@ function (angular, _) { $scope.removeGroupByTag = function(index) { $scope.target.groupByTags.splice(index, 1); - if (_.size($scope.target.groupByTags)===0) { + if (_.size($scope.target.groupByTags) === 0) { $scope.target.groupByTags = null; } $scope.targetBlur(); @@ -179,16 +179,16 @@ function (angular, _) { $scope.removeNonTagGroupBy = function(index) { $scope.target.nonTagGroupBys.splice(index, 1); - if (_.size($scope.target.nonTagGroupBys)===0) { + if (_.size($scope.target.nonTagGroupBys) === 0) { $scope.target.nonTagGroupBys = null; } $scope.targetBlur(); }; $scope.changeGroupByInput = function() { - $scope.isTagGroupBy = $scope.target.currentGroupByType==='tag'; - $scope.isValueGroupBy = $scope.target.currentGroupByType==='value'; - $scope.isTimeGroupBy = $scope.target.currentGroupByType==='time'; + $scope.isTagGroupBy = $scope.target.currentGroupByType === 'tag'; + $scope.isValueGroupBy = $scope.target.currentGroupByType === 'value'; + $scope.isTimeGroupBy = $scope.target.currentGroupByType === 'time'; $scope.validateGroupBy(); }; @@ -270,7 +270,7 @@ function (angular, _) { $scope.removeHorizontalAggregator = function(index) { $scope.target.horizontalAggregators.splice(index, 1); - if (_.size($scope.target.horizontalAggregators)===0) { + if (_.size($scope.target.horizontalAggregators) === 0) { $scope.target.horizontalAggregators = null; } @@ -282,7 +282,7 @@ function (angular, _) { $scope.target.currentHorizontalAggregatorName); $scope.hasUnit = _.contains(['sampler','rate'], $scope.target.currentHorizontalAggregatorName); $scope.hasFactor = _.contains(['div','scale'], $scope.target.currentHorizontalAggregatorName); - $scope.hasPercentile = 'percentile'===$scope.target.currentHorizontalAggregatorName; + $scope.hasPercentile = 'percentile' === $scope.target.currentHorizontalAggregatorName; $scope.validateHorizontalAggregator(); }; @@ -303,7 +303,7 @@ function (angular, _) { errors.factor = 'You must supply a numeric value for this aggregator'; $scope.isAggregatorValid = false; } - else if (parseInt($scope.target.horAggregator.factor)===0 && $scope.target.currentHorizontalAggregatorName==='div') { + else if (parseInt($scope.target.horAggregator.factor) === 0 && $scope.target.currentHorizontalAggregatorName === 'div') { errors.factor = 'Cannot divide by 0'; $scope.isAggregatorValid = false; } From 88bf0cdb9e6a734e30d9355f64f69fd30a5d35b9 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 12 Apr 2015 20:51:35 +0900 Subject: [PATCH 021/398] Fix styles around 'function' --- public/app/plugins/datasource/kairosdb/datasource.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index cc1ee79c852..a93febf9ff4 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -149,18 +149,18 @@ function (angular, _, kbn) { function handleKairosDBQueryResponse(plotParams, results) { var output = []; var index = 0; - _.each(results.data.queries, function (series) { + _.each(results.data.queries, function(series) { var sample_size = series.sample_size; console.log("sample_size:" + sample_size + " samples"); - _.each(series.results, function (result) { + _.each(series.results, function(result) { //var target = result.name; var target = plotParams[index].alias; var details = " ( "; - _.each(result.group_by,function(element) { + _.each(result.group_by, function(element) { if (element.name === "tag") { - _.each(element.group,function(value, key) { + _.each(element.group, function(value, key) { details += key + "=" + value + " "; }); } @@ -213,7 +213,7 @@ function (angular, _, kbn) { }); } if (target.horizontalAggregators) { - _.each(target.horizontalAggregators,function(chosenAggregator) { + _.each(target.horizontalAggregators, function(chosenAggregator) { var returnedAggregator = { name:chosenAggregator.name }; From 76b517b361235e9478eb84d994be74e0761b5a49 Mon Sep 17 00:00:00 2001 From: William Wei Date: Fri, 17 Apr 2015 15:51:26 +0800 Subject: [PATCH 022/398] allow graphite metrics name contain '~' when a metrics name contains '~', id does not impact graph display. but you can not use grafana UI to edit metrics with realtime graphite query. --- public/app/plugins/datasource/graphite/lexer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/app/plugins/datasource/graphite/lexer.js b/public/app/plugins/datasource/graphite/lexer.js index 7306737d96e..ffb65121a60 100644 --- a/public/app/plugins/datasource/graphite/lexer.js +++ b/public/app/plugins/datasource/graphite/lexer.js @@ -119,6 +119,7 @@ define([ identifierStartTable[i] = i >= 48 && i <= 57 || // 0-9 i === 36 || // $ + i === 126 || // ~ i >= 65 && i <= 90 || // A-Z i === 95 || // _ i === 45 || // - From d57ffad5e176f938c7d48670c5d7b4b7c4a956a1 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 19 Apr 2015 21:39:23 +0900 Subject: [PATCH 023/398] Add a space between arguments --- .../plugins/datasource/kairosdb/datasource.js | 22 +++++++++---------- .../plugins/datasource/kairosdb/queryCtrl.js | 6 ++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index a93febf9ff4..5fc25590dbd 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -44,7 +44,7 @@ function (angular, _, kbn) { d.resolve({ data: [] }); return d.promise; } - return this.performTimeSeriesQuery(queries, start, end).then(handleKairosDBQueryResponseAlias,handleQueryError); + return this.performTimeSeriesQuery(queries, start, end).then(handleKairosDBQueryResponseAlias, handleQueryError); }; /////////////////////////////////////////////////////////////////////// @@ -56,8 +56,8 @@ function (angular, _, kbn) { metrics: queries }; reqBody.cache_time = 0; - convertToKairosTime(start,reqBody,'start'); - convertToKairosTime(end,reqBody,'end'); + convertToKairosTime(start, reqBody, 'start'); + convertToKairosTime(end, reqBody, 'end'); var options = { method: 'POST', url: '/api/v1/datapoints/query', @@ -86,10 +86,10 @@ function (angular, _, kbn) { }; - KairosDBDatasource.prototype.performTagSuggestQuery = function(metricname,range,type,keyValue) { + KairosDBDatasource.prototype.performTagSuggestQuery = function(metricname, range, type, keyValue) { if (tagList && (metricname === tagList.metricName) && (range.from === tagList.range.from) && (range.to === tagList.range.to)) { - return getTagListFromResponse(tagList.results,type,keyValue); + return getTagListFromResponse(tagList.results, type, keyValue); } tagList = { metricName:metricname, @@ -98,8 +98,8 @@ function (angular, _, kbn) { var body = { metrics : [{name : metricname}] }; - convertToKairosTime(range.from,body,'start'); - convertToKairosTime(range.to,body,'end'); + convertToKairosTime(range.from, body, 'start'); + convertToKairosTime(range.to, body, 'end'); var options = { url : this.url + '/api/v1/datapoints/query/tags', method : 'POST', @@ -107,7 +107,7 @@ function (angular, _, kbn) { }; return $http(options).then(function(results) { tagList.results = results; - return getTagListFromResponse(results,type,keyValue); + return getTagListFromResponse(results, type, keyValue); }); }; @@ -116,14 +116,14 @@ function (angular, _, kbn) { /// Formatting methods //////////////////////////////////////////////////////////////////////// - function getTagListFromResponse(results,type,keyValue) { + function getTagListFromResponse(results, type, keyValue) { if (!results.data) { return []; } if (type === "key") { return _.keys(results.data.queries[0].results[0].tags); } - else if (type === "value" && _.has(results.data.queries[0].results[0].tags,keyValue)) { + else if (type === "value" && _.has(results.data.queries[0].results[0].tags, keyValue)) { return results.data.queries[0].results[0].tags[keyValue]; } return []; @@ -194,7 +194,7 @@ function (angular, _, kbn) { return output2; } - function convertTargetToQuery(options,target) { + function convertTargetToQuery(options, target) { if (!target.metric || target.hide) { return null; } diff --git a/public/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js index 0de3c953152..30c658629b9 100644 --- a/public/app/plugins/datasource/kairosdb/queryCtrl.js +++ b/public/app/plugins/datasource/kairosdb/queryCtrl.js @@ -72,12 +72,12 @@ function (angular, _) { }; $scope.suggestTagKeys = function(query, callback) { - callback($scope.datasource.performTagSuggestQuery($scope.target.metric, $scope.rangeUnparsed, 'key','')); + callback($scope.datasource.performTagSuggestQuery($scope.target.metric, $scope.rangeUnparsed, 'key', '')); }; $scope.suggestTagValues = function(query, callback) { callback($scope.datasource - .performTagSuggestQuery($scope.target.metric,$scope.rangeUnparsed, 'value',$scope.target.currentTagKey)); + .performTagSuggestQuery($scope.target.metric, $scope.rangeUnparsed, 'value', $scope.target.currentTagKey)); }; // Filter metric by tag @@ -94,7 +94,7 @@ function (angular, _) { $scope.validateFilterTag(); if (!$scope.target.errors.tags) { - if (!_.has($scope.target.tags,$scope.target.currentTagKey)) { + if (!_.has($scope.target.tags, $scope.target.currentTagKey)) { $scope.target.tags[$scope.target.currentTagKey] = []; } $scope.target.tags[$scope.target.currentTagKey].push($scope.target.currentTagValue); From 05c27d8340e518ef52f1ada15e810c131c5935b1 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 19 Apr 2015 21:52:04 +0900 Subject: [PATCH 024/398] Rename 'KairosDBTargetCtrl' to 'KairosDBQueryCtrl' --- .../plugins/datasource/kairosdb/partials/query.editor.html | 4 ++-- public/app/plugins/datasource/kairosdb/queryCtrl.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/partials/query.editor.html b/public/app/plugins/datasource/kairosdb/partials/query.editor.html index 23ddecabc4e..dc272ebbf4c 100644 --- a/public/app/plugins/datasource/kairosdb/partials/query.editor.html +++ b/public/app/plugins/datasource/kairosdb/partials/query.editor.html @@ -2,7 +2,7 @@
    @@ -345,7 +345,7 @@
    -
    +
    • diff --git a/public/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js index 30c658629b9..9aad7c41fc9 100644 --- a/public/app/plugins/datasource/kairosdb/queryCtrl.js +++ b/public/app/plugins/datasource/kairosdb/queryCtrl.js @@ -9,7 +9,7 @@ function (angular, _) { var metricList = null; var targetLetters = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O']; - module.controller('KairosDBTargetCtrl', function($scope) { + module.controller('KairosDBQueryCtrl', function($scope) { $scope.init = function() { $scope.metric = { From dbc07827cfa206aefff43b6211f39e04bed2eb99 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 19 Apr 2015 23:40:48 +0900 Subject: [PATCH 025/398] Add a basic test of KairosDBDatasource --- .../test/specs/kairosdb-datasource-specs.js | 63 +++++++++++++++++++ public/test/test-main.js | 2 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 public/test/specs/kairosdb-datasource-specs.js diff --git a/public/test/specs/kairosdb-datasource-specs.js b/public/test/specs/kairosdb-datasource-specs.js new file mode 100644 index 00000000000..43004656573 --- /dev/null +++ b/public/test/specs/kairosdb-datasource-specs.js @@ -0,0 +1,63 @@ +define([ + 'helpers', + 'plugins/datasource/kairosdb/datasource' +], function(helpers) { + 'use strict'; + + describe('KairosDBDatasource', function() { + var ctx = new helpers.ServiceTestContext(); + + beforeEach(module('grafana.services')); + beforeEach(ctx.providePhase(['templateSrv'])); + beforeEach(ctx.createService('KairosDBDatasource')); + beforeEach(function() { + ctx.ds = new ctx.service({ url: ''}); + }); + + describe('When querying kairosdb with one target using query editor target spec', function() { + var results; + var urlExpected = "/api/v1/datapoints/query"; + var bodyExpected = { + metrics: [{ name: "test" }], + cache_time: 0, + start_relative: { + value: "1", + unit: "hours" + } + }; + + var query = { + range: { from: 'now-1h', to: 'now' }, + targets: [{ metric: 'test', downsampling: '(NONE)'}] + }; + + var response = { + queries: [{ + sample_size: 60, + results: [{ + name: "test", + values: [[1420070400000, 1]] + }] + }] + }; + + beforeEach(function() { + ctx.$httpBackend.expect('POST', urlExpected, bodyExpected).respond(response); + ctx.ds.query(query).then(function(data) { results = data; }); + ctx.$httpBackend.flush(); + }); + + it('should generate the correct query', function() { + ctx.$httpBackend.verifyNoOutstandingExpectation(); + }); + + it('should return series list', function() { + expect(results.data.length).to.be(1); + expect(results.data[0].target).to.be('test'); + }); + + }); + + }); + +}); diff --git a/public/test/test-main.js b/public/test/test-main.js index a38f8dca32b..b6fca85e9e5 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -128,6 +128,7 @@ require([ 'specs/influxQueryBuilder-specs', 'specs/influx09-querybuilder-specs', 'specs/influxdb-datasource-specs', + 'specs/kairosdb-datasource-specs', 'specs/graph-ctrl-specs', 'specs/graph-specs', 'specs/graph-tooltip-specs', @@ -150,4 +151,3 @@ require([ window.__karma__.start(); }); }); - From cc9d2fc139bdf4a9846fdd9b3c113e91aba3804b Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 19 Apr 2015 23:51:48 +0900 Subject: [PATCH 026/398] Suppress LOG in test --- public/app/plugins/datasource/kairosdb/datasource.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index 5fc25590dbd..da3f8ca665f 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -150,9 +150,6 @@ function (angular, _, kbn) { var output = []; var index = 0; _.each(results.data.queries, function(series) { - var sample_size = series.sample_size; - console.log("sample_size:" + sample_size + " samples"); - _.each(series.results, function(result) { //var target = result.name; From c762ad8db2185983f2c6d2c362abbb3f3284827d Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Mon, 20 Apr 2015 00:49:16 +0900 Subject: [PATCH 027/398] Refactoring KairosDB Plugin --- .../plugins/datasource/kairosdb/datasource.js | 171 ++++++++---------- .../plugins/datasource/kairosdb/queryCtrl.js | 11 +- 2 files changed, 88 insertions(+), 94 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index da3f8ca665f..9d25b694891 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -32,18 +32,24 @@ function (angular, _, kbn) { if (typeof target.alias === 'undefined' || target.alias === "") { alias = target.metric; } - return !target.hide - ? {alias: alias, - exouter: target.exOuter} - : null; + + if (!target.hide) { + return { alias: alias, exouter: target.exOuter }; + } + else { + return null; + } })); + var handleKairosDBQueryResponseAlias = _.partial(handleKairosDBQueryResponse, plotParams); + // No valid targets, return the empty result to save a round trip. if (_.isEmpty(queries)) { var d = $q.defer(); d.resolve({ data: [] }); return d.promise; } + return this.performTimeSeriesQuery(queries, start, end).then(handleKairosDBQueryResponseAlias, handleQueryError); }; @@ -53,18 +59,19 @@ function (angular, _, kbn) { KairosDBDatasource.prototype.performTimeSeriesQuery = function(queries, start, end) { var reqBody = { - metrics: queries + metrics: queries, + cache_time: 0 }; - reqBody.cache_time = 0; + convertToKairosTime(start, reqBody, 'start'); convertToKairosTime(end, reqBody, 'end'); + var options = { method: 'POST', - url: '/api/v1/datapoints/query', + url: this.url + '/api/v1/datapoints/query', data: reqBody }; - options.url = this.url + options.url; return $http(options); }; @@ -77,39 +84,41 @@ function (angular, _, kbn) { url : this.url + '/api/v1/metricnames', method : 'GET' }; + return $http(options).then(function(results) { if (!results.data) { return []; } return results.data.results; }); - }; KairosDBDatasource.prototype.performTagSuggestQuery = function(metricname, range, type, keyValue) { if (tagList && (metricname === tagList.metricName) && (range.from === tagList.range.from) && - (range.to === tagList.range.to)) { + (range.to === tagList.range.to)) { return getTagListFromResponse(tagList.results, type, keyValue); } tagList = { - metricName:metricname, - range:range + metricName: metricname, + range: range }; var body = { metrics : [{name : metricname}] }; + convertToKairosTime(range.from, body, 'start'); convertToKairosTime(range.to, body, 'end'); + var options = { url : this.url + '/api/v1/datapoints/query/tags', method : 'POST', data : body }; + return $http(options).then(function(results) { tagList.results = results; return getTagListFromResponse(results, type, keyValue); }); - }; ///////////////////////////////////////////////////////////////////////// @@ -120,13 +129,15 @@ function (angular, _, kbn) { if (!results.data) { return []; } - if (type === "key") { + else if (type === "key") { return _.keys(results.data.queries[0].results[0].tags); } else if (type === "value" && _.has(results.data.queries[0].results[0].tags, keyValue)) { return results.data.queries[0].results[0].tags[keyValue]; } - return []; + else { + return []; + } } /** @@ -151,10 +162,9 @@ function (angular, _, kbn) { var index = 0; _.each(results.data.queries, function(series) { _.each(series.results, function(result) { - - //var target = result.name; var target = plotParams[index].alias; var details = " ( "; + _.each(result.group_by, function(element) { if (element.name === "tag") { _.each(element.group, function(value, key) { @@ -168,10 +178,13 @@ function (angular, _, kbn) { details += 'time_group=' + element.group.group_number + " "; } }); + details += ") "; + if (details !== " ( ) ") { target += details; } + var datapoints = []; for (var i = 0; i < result.values.length; i++) { @@ -184,11 +197,11 @@ function (angular, _, kbn) { } output.push({ target: target, datapoints: datapoints }); }); - index ++; - }); - var output2 = { data: _.flatten(output) }; - return output2; + index++; + }); + + return { data: _.flatten(output) }; } function convertTargetToQuery(options, target) { @@ -201,6 +214,7 @@ function (angular, _, kbn) { }; query.aggregators = []; + if (target.downsampling !== '(NONE)') { query.aggregators.push({ name: target.downsampling, @@ -209,31 +223,37 @@ function (angular, _, kbn) { sampling: KairosDBDatasource.prototype.convertToKairosInterval(target.sampling || options.interval) }); } + if (target.horizontalAggregators) { _.each(target.horizontalAggregators, function(chosenAggregator) { var returnedAggregator = { name:chosenAggregator.name }; + if (chosenAggregator.sampling_rate) { returnedAggregator.sampling = KairosDBDatasource.prototype.convertToKairosInterval(chosenAggregator.sampling_rate); returnedAggregator.align_sampling = true; returnedAggregator.align_start_time =true; } + if (chosenAggregator.unit) { returnedAggregator.unit = chosenAggregator.unit + 's'; } + if (chosenAggregator.factor && chosenAggregator.name === 'div') { returnedAggregator.divisor = chosenAggregator.factor; } else if (chosenAggregator.factor && chosenAggregator.name === 'scale') { returnedAggregator.factor = chosenAggregator.factor; } + if (chosenAggregator.percentile) { returnedAggregator.percentile = chosenAggregator.percentile; } query.aggregators.push(returnedAggregator); }); } + if (_.isEmpty(query.aggregators)) { delete query.aggregators; } @@ -244,7 +264,9 @@ function (angular, _, kbn) { if (target.groupByTags || target.nonTagGroupBys) { query.group_by = []; - if (target.groupByTags) {query.group_by.push({name: "tag", tags: angular.copy(target.groupByTags)});} + if (target.groupByTags) { + query.group_by.push({name: "tag", tags: angular.copy(target.groupByTags)}); + } if (target.nonTagGroupBys) { _.each(target.nonTagGroupBys, function(rawGroupBy) { var formattedGroupBy = angular.copy(rawGroupBy); @@ -276,102 +298,46 @@ function (angular, _, kbn) { var value = matches[1]; var unit = matches[2]; if (value%1 !== 0) { - if (unit === 'ms') {throw new Error('Invalid interval value, cannot be smaller than the millisecond');} + if (unit === 'ms') { + throw new Error('Invalid interval value, cannot be smaller than the millisecond'); + } value = Math.round(kbn.intervals_in_seconds[unit] * value * 1000); unit = 'ms'; - - } - switch (unit) { - case 'ms': - unit = 'milliseconds'; - break; - case 's': - unit = 'seconds'; - break; - case 'm': - unit = 'minutes'; - break; - case 'h': - unit = 'hours'; - break; - case 'd': - unit = 'days'; - break; - case 'w': - unit = 'weeks'; - break; - case 'M': - unit = 'months'; - break; - case 'y': - unit = 'years'; - break; - default: - console.log("Unknown interval ", intervalString); - break; } return { - "value": value, - "unit": unit + value: value, + unit: convertToKairosDBTimeUnit(unit) }; - }; function convertToKairosTime(date, response_obj, start_stop_name) { var name; + if (_.isString(date)) { if (date === 'now') { return; } else if (date.indexOf('now-') >= 0) { - - name = start_stop_name + "_relative"; - date = date.substring(4); + name = start_stop_name + "_relative"; var re_date = /(\d+)\s*(\D+)/; var result = re_date.exec(date); + if (result) { var value = result[1]; var unit = result[2]; - switch (unit) { - case 'ms': - unit = 'milliseconds'; - break; - case 's': - unit = 'seconds'; - break; - case 'm': - unit = 'minutes'; - break; - case 'h': - unit = 'hours'; - break; - case 'd': - unit = 'days'; - break; - case 'w': - unit = 'weeks'; - break; - case 'M': - unit = 'months'; - break; - case 'y': - unit = 'years'; - break; - default: - console.log("Unknown date ", date); - break; - } + response_obj[name] = { - "value": value, - "unit": unit + value: value, + unit: convertToKairosDBTimeUnit(unit) }; return; } console.log("Unparseable date", date); return; } + date = kbn.parseDate(date); } @@ -384,6 +350,30 @@ function (angular, _, kbn) { console.log("Date is neither string nor date"); } + function convertToKairosDBTimeUnit(unit) { + switch (unit) { + case 'ms': + return 'milliseconds'; + case 's': + return 'seconds'; + case 'm': + return 'minutes'; + case 'h': + return 'hours'; + case 'd': + return 'days'; + case 'w': + return 'weeks'; + case 'M': + return 'months'; + case 'y': + return 'years'; + default: + console.log("Unknown unit ", unit); + return ''; + } + } + function PeakFilter(dataIn, limit) { var datapoints = dataIn; var arrLength = datapoints.length; @@ -417,7 +407,6 @@ function (angular, _, kbn) { return datapoints; } - //////////////////////////////////////////////////////////////////////// return KairosDBDatasource; }); diff --git a/public/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js index 9aad7c41fc9..6370afc7c0e 100644 --- a/public/app/plugins/datasource/kairosdb/queryCtrl.js +++ b/public/app/plugins/datasource/kairosdb/queryCtrl.js @@ -37,6 +37,7 @@ function (angular, _) { $scope.get_data(); } }; + $scope.panelBlur = function() { _.each($scope.panel.targets, function(target) { target.downsampling = $scope.panel.downsampling; @@ -49,6 +50,7 @@ function (angular, _) { var clone = angular.copy($scope.target); $scope.panel.targets.push(clone); }; + $scope.moveMetricQuery = function(fromIndex, toIndex) { _.move($scope.panel.targets, fromIndex, toIndex); }; @@ -140,7 +142,6 @@ function (angular, _) { if (!$scope.target.groupByTags) { $scope.target.groupByTags = []; } - console.log($scope.target.groupBy.tagKey); if (!_.contains($scope.target.groupByTags, $scope.target.groupBy.tagKey)) { $scope.target.groupByTags.push($scope.target.groupBy.tagKey); $scope.targetBlur(); @@ -202,12 +203,14 @@ function (angular, _) { errors.tagKey = 'You must supply a tag name'; } } + if ($scope.isValueGroupBy) { if (!$scope.target.groupBy.valueRange || !isInt($scope.target.groupBy.valueRange)) { errors.valueRange = "Range must be an integer"; $scope.isGroupByValid = false; } } + if ($scope.isTimeGroupBy) { try { $scope.datasource.convertToKairosInterval($scope.target.groupBy.timeInterval); @@ -265,7 +268,6 @@ function (angular, _) { $scope.hasUnit = false; $scope.hasFactor = false; $scope.hasPercentile = false; - }; $scope.removeHorizontalAggregator = function(index) { @@ -279,7 +281,7 @@ function (angular, _) { $scope.changeHorAggregationInput = function() { $scope.hasSamplingRate = _.contains(['avg','dev','max','min','sum','least_squares','count','percentile'], - $scope.target.currentHorizontalAggregatorName); + $scope.target.currentHorizontalAggregatorName); $scope.hasUnit = _.contains(['sampler','rate'], $scope.target.currentHorizontalAggregatorName); $scope.hasFactor = _.contains(['div','scale'], $scope.target.currentHorizontalAggregatorName); $scope.hasPercentile = 'percentile' === $scope.target.currentHorizontalAggregatorName; @@ -290,6 +292,7 @@ function (angular, _) { delete $scope.target.errors.horAggregator; var errors = {}; $scope.isAggregatorValid = true; + if ($scope.hasSamplingRate) { try { $scope.datasource.convertToKairosInterval($scope.target.horAggregator.samplingRate); @@ -298,6 +301,7 @@ function (angular, _) { $scope.isAggregatorValid = false; } } + if ($scope.hasFactor) { if (!$scope.target.horAggregator.factor) { errors.factor = 'You must supply a numeric value for this aggregator'; @@ -308,6 +312,7 @@ function (angular, _) { $scope.isAggregatorValid = false; } } + if ($scope.hasPercentile) { if (!$scope.target.horAggregator.percentile || $scope.target.horAggregator.percentile<=0 || From 869cf705e08b954b9d37c3b69e654b7a642aeaa4 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Wed, 22 Apr 2015 22:29:56 +0300 Subject: [PATCH 028/398] Remove exit 0 at the end of init.d script --- packaging/rpm/init.d/grafana-server | 2 -- 1 file changed, 2 deletions(-) diff --git a/packaging/rpm/init.d/grafana-server b/packaging/rpm/init.d/grafana-server index 96e0c18c5e4..a30fffb6e00 100755 --- a/packaging/rpm/init.d/grafana-server +++ b/packaging/rpm/init.d/grafana-server @@ -144,5 +144,3 @@ case "$1" in exit 1 ;; esac - -exit 0 From 2c52224013dbe3b3e9da530d57c0d7175a051b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 23 Apr 2015 08:24:30 +0200 Subject: [PATCH 029/398] /api/login/ping Fix for issue when behind reverse proxy and subpath, Fixes #1857 --- CHANGELOG.md | 5 +++++ package.json | 2 +- public/app/services/backendSrv.js | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94852d43047..1d656e3685c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.0.3 (unreleased) + +**Fixes** +- [Issue #1857](https://github.com/grafana/grafana/issues/1857). /api/login/ping Fix for issue when behind reverse proxy and subpath + # 2.0.2 (2015-04-22) **Fixes** diff --git a/package.json b/package.json index 0ff6bf8b480..64e393616f6 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Coding Instinct AB" }, "name": "grafana", - "version": "2.0.2", + "version": "2.0.3-pre1", "repository": { "type": "git", "url": "http://github.com/torkelo/grafana.git" diff --git a/public/app/services/backendSrv.js b/public/app/services/backendSrv.js index 30cad361bbe..c208fe3388e 100644 --- a/public/app/services/backendSrv.js +++ b/public/app/services/backendSrv.js @@ -63,8 +63,9 @@ function (angular, _, config) { var requestIsLocal = options.url.indexOf('/') === 0; var firstAttempt = options.retry === 0; - if (requestIsLocal && firstAttempt) { + if (requestIsLocal && !options.hasSubUrl) { options.url = config.appSubUrl + options.url; + options.hasSubUrl = true; } return $http(options).then(function(results) { From 968b1b430827472057195c798282649982392801 Mon Sep 17 00:00:00 2001 From: aibou Date: Thu, 23 Apr 2015 17:42:04 +0900 Subject: [PATCH 030/398] Fix and update documents --- conf/defaults.ini | 5 +++-- conf/sample.ini | 4 ++-- docs/sources/installation/configuration.md | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 042f1a5574c..6bb3fb80857 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -7,7 +7,7 @@ app_mode = production #################################### Paths #################################### [paths] -# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is useD) +# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used) # data = data # @@ -62,7 +62,7 @@ path = grafana.db #################################### Session #################################### [session] -# Either "memory", "file", "redis", "mysql", default is "memory" +# Either "memory", "file", "redis", "mysql", "postgresql", default is "file" provider = file # Provider config options @@ -70,6 +70,7 @@ provider = file # file: session dir path, is relative to grafana data_path # redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana` # mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name` + provider_config = sessions # Session cookie name diff --git a/conf/sample.ini b/conf/sample.ini index 6aaa69f7314..68bd3eb3a1d 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -7,7 +7,7 @@ #################################### Paths #################################### [paths] -# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is useD) +# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used) # ;data = /var/lib/grafana # @@ -62,7 +62,7 @@ #################################### Session #################################### [session] -# Either "memory", "file", "redis", "mysql", default is "memory" +# Either "memory", "file", "redis", "mysql", "postgresql", default is "file" ;provider = file # Provider config options diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index d727f9ced41..a79a8494d73 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -219,7 +219,7 @@ set to true, any user successfully authenticating via google auth will be automa ## [session] ### provider -Valid values are "memory", "file", "mysql", 'postgres'. Default is "memory". +Valid values are "memory", "file", "mysql", 'postgres'. Default is "file". ### provider_config This option should be configured differently depending on what type of session provider you have configured. From 236c4e65f863d55ae79e4df9a3ff9124d4d4b15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 23 Apr 2015 15:26:39 +0200 Subject: [PATCH 031/398] Began work on dashboard: editable flag, that actually stops users from changing anything, #1834 --- pkg/api/dtos/models.go | 6 +- public/app/features/dashboard/dashboardSrv.js | 20 +-- .../dashboard/partials/dashboardTopNav.html | 12 +- public/app/partials/dasheditor.html | 155 ++++++++++++------ public/app/routes/dashLoadControllers.js | 41 +++-- public/css/less/bootstrap-tagsinput.less | 30 +--- .../vendor/tagsinput/bootstrap-tagsinput.js | 2 +- 7 files changed, 157 insertions(+), 109 deletions(-) diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go index 53519631d22..0057f78ff0d 100644 --- a/pkg/api/dtos/models.go +++ b/pkg/api/dtos/models.go @@ -28,9 +28,9 @@ type CurrentUser struct { } type DashboardMeta struct { - IsStarred bool `json:"isStarred"` - IsHome bool `json:"isHome"` - IsSnapshot bool `json:"isSnapshot"` + IsStarred bool `json:"isStarred,omitempty"` + IsHome bool `json:"isHome,omitempty"` + IsSnapshot bool `json:"isSnapshot,omitempty"` Slug string `json:"slug"` Expires time.Time `json:"expires"` Created time.Time `json:"created"` diff --git a/public/app/features/dashboard/dashboardSrv.js b/public/app/features/dashboard/dashboardSrv.js index 1064892745b..73a36ed3da8 100644 --- a/public/app/features/dashboard/dashboardSrv.js +++ b/public/app/features/dashboard/dashboardSrv.js @@ -52,24 +52,20 @@ function (angular, $, kbn, _, moment) { p._initMeta = function(meta) { meta = meta || {}; - meta.canShare = true; - meta.canSave = true; - meta.canEdit = true; - meta.canStar = true; + + meta.canShare = meta.canShare === false ? false : true; + meta.canSave = meta.canSave === false ? false : true; + meta.canEdit = meta.canEdit === false ? false : true; + meta.canStar = meta.canStar === false ? false : true; + meta.canDelete = meta.canDelete === false ? false : true; if (contextSrv.hasRole('Viewer')) { meta.canSave = false; } - if (meta.isSnapshot) { - meta.canSave = false; - } - - if (meta.isHome) { - meta.canShare = false; - meta.canStar = false; - meta.canSave = false; + if (!this.editable) { meta.canEdit = false; + meta.canDelete = false; } this.meta = meta; diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html index 784185837e8..711fb1f34ba 100644 --- a/public/app/features/dashboard/partials/dashboardTopNav.html +++ b/public/app/features/dashboard/partials/dashboardTopNav.html @@ -27,19 +27,19 @@
      • -
    • +
      • -
    • +
    diff --git a/public/app/partials/dasheditor.html b/public/app/partials/dasheditor.html index e6ab6070f9f..fefded81efc 100644 --- a/public/app/partials/dasheditor.html +++ b/public/app/partials/dasheditor.html @@ -17,63 +17,118 @@
    -
    - -
    -
    -
    -
    - -
    -
    - - -
    - - +
    +
    +
    +
    +
    Dashboard info
    +
    +
      +
    • + Title +
      • +
    • + +
      • +
    • + Tags + Press enter to a add tag +
      • +
    • + + +
      • +
    +
    +
    +
      +
    • + Timezone +
      • +
    • + +
      • +
    +
    +
    +
    -
    -
    -
    - - - - Press enter to a add tag -
    + +
    +
    Toggles
    +
    +
      +
    • + +
      • +
    • +
    • + + +
      • + +
    +
    +
    +
    +
      +
    • + +
      • +
    • + + +
      • +
    +
    +
    +
    +
      +
    • + +
      • +
    • + + +
      • +
    +
    - -
    -
    -
    -
    - - - - - - -
    - {{row.title}} - - - - -
    -
    -
    -
    - -
    - - -
    -
    -
    +
    +
    +
    + + + + + + + +
    + {{row.title}} + + + + +
    +
    +
    +
    +
    + +
    + + +
    + +
    + +
diff --git a/public/app/routes/dashLoadControllers.js b/public/app/routes/dashLoadControllers.js index b19b0c9664f..ba33dc7e73a 100644 --- a/public/app/routes/dashLoadControllers.js +++ b/public/app/routes/dashLoadControllers.js @@ -18,6 +18,8 @@ function (angular, _, kbn, moment, $) { if (!$routeParams.slug) { backendSrv.get('/api/dashboards/home').then(function(result) { + var meta = result.meta; + meta.canSave = meta.canShare = meta.canEdit = meta.canStar = false; $scope.initDashboard(result, $scope); },function() { dashboardLoadFailed('Not found'); @@ -38,7 +40,16 @@ function (angular, _, kbn, moment, $) { backendSrv.get('/api/snapshots/' + $routeParams.key).then(function(result) { $scope.initDashboard(result, $scope); }, function() { - $scope.initDashboard({meta: {isSnapshot: true}, model: {title: 'Snapshot not found'}}, $scope); + $scope.initDashboard({ + meta: { + isSnapshot: true, + canSave: false, + canEdit: false, + }, + model: { + title: 'Snapshot not found' + } + }, $scope); }); }); @@ -56,7 +67,7 @@ function (angular, _, kbn, moment, $) { meta: {}, model: { title: "New dashboard", - rows: [{ height: '250px', panels:[] }] + rows: [{ height: '250px', panels:[] }] }, }, $scope); }); @@ -66,10 +77,10 @@ function (angular, _, kbn, moment, $) { var file_load = function(file) { return $http({ url: "public/dashboards/"+file.replace(/\.(?!json)/,"/")+'?' + new Date().getTime(), - method: "GET", - transformResponse: function(response) { - return angular.fromJson(response); - } + method: "GET", + transformResponse: function(response) { + return angular.fromJson(response); + } }).then(function(result) { if(!result) { return false; @@ -92,8 +103,8 @@ function (angular, _, kbn, moment, $) { var execute_script = function(result) { var services = { dashboardSrv: dashboardSrv, - datasourceSrv: datasourceSrv, - $q: $q, + datasourceSrv: datasourceSrv, + $q: $q, }; /*jshint -W054 */ @@ -118,16 +129,16 @@ function (angular, _, kbn, moment, $) { var url = 'public/dashboards/'+file.replace(/\.(?!js)/,"/") + '?' + new Date().getTime(); return $http({ url: url, method: "GET" }) - .then(execute_script) - .then(null,function(err) { - console.log('Script dashboard error '+ err); - $scope.appEvent('alert-error', ["Script Error", "Please make sure it exists and returns a valid dashboard"]); - return false; - }); + .then(execute_script) + .then(null,function(err) { + console.log('Script dashboard error '+ err); + $scope.appEvent('alert-error', ["Script Error", "Please make sure it exists and returns a valid dashboard"]); + return false; + }); }; script_load($routeParams.jsFile).then(function(result) { - $scope.initDashboard({meta: {fromScript: true}, model: result.data}, $scope); + $scope.initDashboard({meta: {fromScript: true, canDelete: false}, model: result.data}, $scope); }); }); diff --git a/public/css/less/bootstrap-tagsinput.less b/public/css/less/bootstrap-tagsinput.less index 42466919afe..aeedb317997 100644 --- a/public/css/less/bootstrap-tagsinput.less +++ b/public/css/less/bootstrap-tagsinput.less @@ -1,33 +1,19 @@ .bootstrap-tagsinput { display: inline-block; - padding: 4px 6px; - margin-bottom: 10px; - color: #555; + padding: 0 0 0 6px; vertical-align: middle; - border-radius: 4px; max-width: 100%; line-height: 22px; - background-color: @inputBackground; - border: 1px solid @inputBorder; - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); - .transition(~"border linear .2s, box-shadow linear .2s"); input { border: none; - box-shadow: none; - outline: none; - background-color: transparent; - padding: 0; - padding-left: 5px; - margin: 0; - width: auto !important; - max-width: inherit; - - &:focus { - border: none; - box-shadow: none; - } + border-right: 1px solid @grafanaTargetSegmentBorder; + margin: 0px; + border-radius: 0; + padding: 8px 6px; + height: 100%; + box-sizing: border-box; } .tag { @@ -49,4 +35,4 @@ } } } -} \ No newline at end of file +} diff --git a/public/vendor/tagsinput/bootstrap-tagsinput.js b/public/vendor/tagsinput/bootstrap-tagsinput.js index be94965d807..5c8e25a5761 100644 --- a/public/vendor/tagsinput/bootstrap-tagsinput.js +++ b/public/vendor/tagsinput/bootstrap-tagsinput.js @@ -500,4 +500,4 @@ $(function() { $("input[data-role=tagsinput], select[multiple][data-role=tagsinput]").tagsinput(); }); -})(window.jQuery); \ No newline at end of file +})(window.jQuery); From 8526025792f125666390fcbcc31f6183057447ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 23 Apr 2015 16:18:00 +0200 Subject: [PATCH 032/398] MySQL: Dashboard.data column type changed to mediumtext (sql migration added), Fixes #1863 --- CHANGELOG.md | 1 + pkg/services/sqlstore/datasource_test.go | 4 ++-- pkg/services/sqlstore/migrations/dashboard_mig.go | 6 ++++++ .../sqlstore/migrations/dashboard_snapshot_mig.go | 6 ++++++ pkg/services/sqlstore/migrator/migrations.go | 12 ++++++++++-- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d656e3685c..0f21b45db61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ **Fixes** - [Issue #1857](https://github.com/grafana/grafana/issues/1857). /api/login/ping Fix for issue when behind reverse proxy and subpath +- [Issue #1863](https://github.com/grafana/grafana/issues/1863). MySQL: Dashboard.data column type changed to mediumtext (sql migration added) # 2.0.2 (2015-04-22) diff --git a/pkg/services/sqlstore/datasource_test.go b/pkg/services/sqlstore/datasource_test.go index 4142602c472..cbe81ebbb75 100644 --- a/pkg/services/sqlstore/datasource_test.go +++ b/pkg/services/sqlstore/datasource_test.go @@ -14,9 +14,9 @@ import ( func InitTestDB(t *testing.T) { t.Log("InitTestDB") - x, err := xorm.NewEngine(sqlutil.TestDB_Sqlite3.DriverName, sqlutil.TestDB_Sqlite3.ConnStr) + //x, err := xorm.NewEngine(sqlutil.TestDB_Sqlite3.DriverName, sqlutil.TestDB_Sqlite3.ConnStr) //x, err := xorm.NewEngine(sqlutil.TestDB_Mysql.DriverName, sqlutil.TestDB_Mysql.ConnStr) - //x, err := xorm.NewEngine(sqlutil.TestDB_Postgres.DriverName, sqlutil.TestDB_Postgres.ConnStr) + x, err := xorm.NewEngine(sqlutil.TestDB_Postgres.DriverName, sqlutil.TestDB_Postgres.ConnStr) if err != nil { t.Fatalf("Failed to init in memory sqllite3 db %v", err) diff --git a/pkg/services/sqlstore/migrations/dashboard_mig.go b/pkg/services/sqlstore/migrations/dashboard_mig.go index 6ded17ff0e7..5d440d85ebc 100644 --- a/pkg/services/sqlstore/migrations/dashboard_mig.go +++ b/pkg/services/sqlstore/migrations/dashboard_mig.go @@ -86,4 +86,10 @@ func addDashboardMigration(mg *Migrator) { })) mg.AddMigration("drop table dashboard_v1", NewDropTableMigration("dashboard_v1")) + + // change column type of dashboard.data + mg.AddMigration("alter dashboard.data to mediumtext v1", new(RawSqlMigration). + Sqlite("SELECT 0 WHERE 0;"). + Postgres("SELECT 0;"). + Mysql("ALTER TABLE dashboard MODIFY data MEDIUMTEXT;")) } diff --git a/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go b/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go index 4d83dfd5bc6..9cbb5c8c7ab 100644 --- a/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go +++ b/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go @@ -48,4 +48,10 @@ func addDashboardSnapshotMigrations(mg *Migrator) { mg.AddMigration("create dashboard_snapshot table v5 #2", NewAddTableMigration(snapshotV5)) addTableIndicesMigrations(mg, "v5", snapshotV5) + + // ncrease data type + mg.AddMigration("alter dashboard_snapshot.data to mediumtext v1", new(RawSqlMigration). + Sqlite("SELECT 0 WHERE 0;"). + Postgres("SELECT 0;"). + Mysql("ALTER TABLE dashboard_snapshot.data MODIFY data MEDIUMTEXT;")) } diff --git a/pkg/services/sqlstore/migrator/migrations.go b/pkg/services/sqlstore/migrator/migrations.go index e596ef6c171..a65c7ec7e81 100644 --- a/pkg/services/sqlstore/migrator/migrations.go +++ b/pkg/services/sqlstore/migrator/migrations.go @@ -25,8 +25,9 @@ func (m *MigrationBase) GetCondition() MigrationCondition { type RawSqlMigration struct { MigrationBase - sqlite string - mysql string + sqlite string + mysql string + postgres string } func (m *RawSqlMigration) Sql(dialect Dialect) string { @@ -35,6 +36,8 @@ func (m *RawSqlMigration) Sql(dialect Dialect) string { return m.mysql case SQLITE: return m.sqlite + case POSTGRES: + return m.postgres } panic("db type not supported") @@ -50,6 +53,11 @@ func (m *RawSqlMigration) Mysql(sql string) *RawSqlMigration { return m } +func (m *RawSqlMigration) Postgres(sql string) *RawSqlMigration { + m.postgres = sql + return m +} + type AddColumnMigration struct { MigrationBase tableName string From b99ee2562e0facc6c035ffbb6a8f143f8549479e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 23 Apr 2015 16:21:49 +0200 Subject: [PATCH 033/398] Restored sql integration tests to use in mem sqlite3 --- pkg/services/sqlstore/datasource_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/services/sqlstore/datasource_test.go b/pkg/services/sqlstore/datasource_test.go index cbe81ebbb75..4142602c472 100644 --- a/pkg/services/sqlstore/datasource_test.go +++ b/pkg/services/sqlstore/datasource_test.go @@ -14,9 +14,9 @@ import ( func InitTestDB(t *testing.T) { t.Log("InitTestDB") - //x, err := xorm.NewEngine(sqlutil.TestDB_Sqlite3.DriverName, sqlutil.TestDB_Sqlite3.ConnStr) + x, err := xorm.NewEngine(sqlutil.TestDB_Sqlite3.DriverName, sqlutil.TestDB_Sqlite3.ConnStr) //x, err := xorm.NewEngine(sqlutil.TestDB_Mysql.DriverName, sqlutil.TestDB_Mysql.ConnStr) - x, err := xorm.NewEngine(sqlutil.TestDB_Postgres.DriverName, sqlutil.TestDB_Postgres.ConnStr) + //x, err := xorm.NewEngine(sqlutil.TestDB_Postgres.DriverName, sqlutil.TestDB_Postgres.ConnStr) if err != nil { t.Fatalf("Failed to init in memory sqllite3 db %v", err) From b6a4db3f8aa8e991f5d20ae37c7a06480439335a Mon Sep 17 00:00:00 2001 From: Anthony Woods Date: Fri, 24 Apr 2015 00:19:16 +0800 Subject: [PATCH 034/398] always refresh varible options if refresh=true --- public/app/features/templating/templateValuesSrv.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index e933c16796f..3df2c831b6f 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -28,6 +28,9 @@ function (angular, _, kbn) { for (var i = 0; i < this.variables.length; i++) { var variable = this.variables[i]; var urlValue = queryParams['var-' + variable.name]; + if (variable.refresh) { + promises.push(this.updateOptions(variable)); + } if (urlValue !== void 0) { var option = _.findWhere(variable.options, { text: urlValue }); option = option || { text: urlValue, value: urlValue }; @@ -37,9 +40,6 @@ function (angular, _, kbn) { promises.push(promise); } - else if (variable.refresh) { - promises.push(this.updateOptions(variable)); - } else if (variable.type === 'interval') { this.updateAutoInterval(variable); } From 9fd3ef26878240721c0af97cd6556b817f6d05f5 Mon Sep 17 00:00:00 2001 From: Emil Thelin Date: Thu, 23 Apr 2015 20:38:00 +0200 Subject: [PATCH 035/398] Enforce domain --- pkg/middleware/middleware.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index b93cd517364..a865b5b7f03 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -34,6 +34,16 @@ func GetContextHandler() macaron.Handler { AllowAnonymous: false, } + h := ctx.Req.Host + if i := strings.Index(h, ":"); i >= 0 { + h = h[:i] + } + + if !strings.EqualFold(h, setting.Domain) { + ctx.Redirect(strings.TrimSuffix(setting.AppUrl, "/") + ctx.Req.RequestURI, 301) + return + } + // the order in which these are tested are important // look for api key in Authorization header first // then init session and look for userId in session From 2d7c7871b02e9dcd7a5b8def9fe8c4e90ad69456 Mon Sep 17 00:00:00 2001 From: Emil Thelin Date: Thu, 23 Apr 2015 20:56:31 +0200 Subject: [PATCH 036/398] Fixes broken test --- pkg/middleware/middleware.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index a865b5b7f03..04aa2cd8e4c 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -40,7 +40,7 @@ func GetContextHandler() macaron.Handler { } if !strings.EqualFold(h, setting.Domain) { - ctx.Redirect(strings.TrimSuffix(setting.AppUrl, "/") + ctx.Req.RequestURI, 301) + ctx.Redirect(strings.TrimSuffix(setting.AppUrl, "/")+ctx.Req.RequestURI, 301) return } From 3fdab59029c0140196dc7c081cc03ee256292ce4 Mon Sep 17 00:00:00 2001 From: Chris Madden Date: Thu, 23 Apr 2015 23:53:15 +0200 Subject: [PATCH 037/398] Documented units for timepicker Timepicker units (like s, m, M, etc) were not in the documentation so I have added them. --- docs/sources/reference/timerange.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/reference/timerange.md b/docs/sources/reference/timerange.md index 4f5f4659594..47c9186e119 100644 --- a/docs/sources/reference/timerange.md +++ b/docs/sources/reference/timerange.md @@ -24,7 +24,7 @@ All of this applies to all Panels in the Dashboard (except those with Panel Time It's possible to customize the options displayed for relative time and the auto-refresh options. -From Dashboard setttings, click the Timepicker tab. From here you can specify the relative and auto refresh intervals. The Timepicker tab settings are saved on a per Dashboard basis. +From Dashboard setttings, click the Timepicker tab. From here you can specify the relative and auto refresh intervals. The Timepicker tab settings are saved on a per Dashboard basis. Entries are comma seperated and accept a number followed by one of the following units: s (seconds), m (minutes), h (hours), d (days), w (weeks), M (months), y (years). ![](/img/v1/timepicker_editor.png) From f8ceb341d6b5e941d9e55fd898e3df6a45d4f483 Mon Sep 17 00:00:00 2001 From: Mark Oellermann Date: Fri, 24 Apr 2015 13:23:54 +1000 Subject: [PATCH 038/398] Added units for voltage, current and frequency --- public/app/components/kbn.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/public/app/components/kbn.js b/public/app/components/kbn.js index 1193285787f..fa2b8214873 100644 --- a/public/app/components/kbn.js +++ b/public/app/components/kbn.js @@ -380,6 +380,9 @@ function($, _, moment) { kbn.valueFormats.Bps = kbn.formatFuncCreator(1000, [' Bps', ' KBps', ' MBps', ' GBps', ' TBps', ' PBps', ' EBps', ' ZBps', ' YBps']); kbn.valueFormats.short = kbn.formatFuncCreator(1000, ['', ' K', ' Mil', ' Bil', ' Tri', ' Qaudr', ' Quint', ' Sext', ' Sept']); kbn.valueFormats.joule = kbn.formatFuncCreator(1000, [' J', ' kJ', ' MJ', ' GJ', ' TJ', ' PJ', ' EJ', ' ZJ', ' YJ']); + kbn.valueFormats.amp = kbn.formatFuncCreator(1000, [' A', ' kA', ' MA', ' GA', ' TA', ' PA', ' EA', ' ZA', ' YA']); + kbn.valueFormats.volt = kbn.formatFuncCreator(1000, [' V', ' kV', ' MV', ' GV', ' TV', ' PV', ' EV', ' ZV', ' YV']); + kbn.valueFormats.hertz = kbn.formatFuncCreator(1000, [' Hz', ' kHz', ' MHz', ' GHz', ' THz', ' PHz', ' EHz', ' ZHz', ' YHz']); kbn.valueFormats.watt = kbn.formatFuncCreator(1000, [' W', ' kW', ' MW', ' GW', ' TW', ' PW', ' EW', ' ZW', ' YW']); kbn.valueFormats.kwatt = kbn.formatFuncCreator(1000, [' kW', ' MW', ' GW', ' TW', ' PW', ' EW', ' ZW', ' YW']); kbn.valueFormats.watth = kbn.formatFuncCreator(1000, [' Wh', ' kWh', ' MWh', ' GWh', ' TWh', ' PWh', ' EWh', ' ZWh', ' YWh']); @@ -534,6 +537,7 @@ function($, _, moment) { {text: 'microseconds (µs)', value: 'µs'}, {text: 'milliseconds (ms)', value: 'ms'}, {text: 'seconds (s)', value: 's'}, + {text: 'Hertz (1/s)', value: 'hertz'}, ] }, { @@ -561,6 +565,8 @@ function($, _, moment) { {text: 'kilowatt-hour (kWh)', value: 'kwatth'}, {text: 'joule (J)', value: 'joule'}, {text: 'electron volt (eV)', value: 'ev'}, + {text: 'Ampere (A)', value: 'amp'}, + {text: 'Volt (V)', value: 'volt'}, ] }, { From 7064d871068a37863f6d4aed17bc0c9503b8260c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 24 Apr 2015 11:20:09 +0200 Subject: [PATCH 039/398] Firefox/IE issue, invisible text in dashboard search fixed, Fixes #1872 --- CHANGELOG.md | 1 + public/css/less/search.less | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f21b45db61..b9133bf8601 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 2.0.3 (unreleased) **Fixes** +- [Issue #1872](https://github.com/grafana/grafana/issues/1872). Firefox/IE issue, invisible text in dashboard search fixed - [Issue #1857](https://github.com/grafana/grafana/issues/1857). /api/login/ping Fix for issue when behind reverse proxy and subpath - [Issue #1863](https://github.com/grafana/grafana/issues/1863). MySQL: Dashboard.data column type changed to mediumtext (sql migration added) diff --git a/public/css/less/search.less b/public/css/less/search.less index 9b3da69f0e2..7182333bd16 100644 --- a/public/css/less/search.less +++ b/public/css/less/search.less @@ -22,7 +22,8 @@ padding-bottom: 10px; input { width: 100%; - padding: 18px 8px; + padding: 8px 8px; + height: 100%; box-sizing: border-box; } button { From 4fd2c0570c18366167e91b2f98dee0a1b6718a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 24 Apr 2015 15:46:16 +0200 Subject: [PATCH 040/398] Replaced slug dependency with one that did not use gopkgs.com --- Godeps/Godeps.json | 18 +++++++------- .../{gosimple => dalu}/slug/README.md | 10 +++----- .../slug/default_substitution.go | 0 .../github.com/{gosimple => dalu}/slug/doc.go | 6 +---- .../slug/languages_substitution.go | 0 .../{gosimple => dalu}/slug/slug.go | 2 +- .../{gosimple => dalu}/slug/slug_test.go | 0 .../dalu/unidecode}/.gitignore | 0 .../dalu/unidecode}/LICENSE | 0 .../dalu/unidecode}/README.md | 6 ----- .../dalu/unidecode}/decode.go | 0 .../dalu/unidecode}/make_table.go | 0 .../dalu/unidecode}/table.go | 0 .../dalu/unidecode}/table.txt | 0 .../dalu/unidecode}/unidecode.go | 0 .../dalu/unidecode}/unidecode_test.go | 0 .../src/github.com/gosimple/slug/.gitignore | 2 -- .../src/gopkgs.com/unidecode.v1/gopkgs.go | 24 ------------------- pkg/models/dashboards.go | 2 +- 19 files changed, 15 insertions(+), 55 deletions(-) rename Godeps/_workspace/src/github.com/{gosimple => dalu}/slug/README.md (72%) rename Godeps/_workspace/src/github.com/{gosimple => dalu}/slug/default_substitution.go (100%) rename Godeps/_workspace/src/github.com/{gosimple => dalu}/slug/doc.go (91%) rename Godeps/_workspace/src/github.com/{gosimple => dalu}/slug/languages_substitution.go (100%) rename Godeps/_workspace/src/github.com/{gosimple => dalu}/slug/slug.go (99%) rename Godeps/_workspace/src/github.com/{gosimple => dalu}/slug/slug_test.go (100%) rename Godeps/_workspace/src/{gopkgs.com/unidecode.v1 => github.com/dalu/unidecode}/.gitignore (100%) rename Godeps/_workspace/src/{gopkgs.com/unidecode.v1 => github.com/dalu/unidecode}/LICENSE (100%) rename Godeps/_workspace/src/{gopkgs.com/unidecode.v1 => github.com/dalu/unidecode}/README.md (65%) rename Godeps/_workspace/src/{gopkgs.com/unidecode.v1 => github.com/dalu/unidecode}/decode.go (100%) rename Godeps/_workspace/src/{gopkgs.com/unidecode.v1 => github.com/dalu/unidecode}/make_table.go (100%) rename Godeps/_workspace/src/{gopkgs.com/unidecode.v1 => github.com/dalu/unidecode}/table.go (100%) rename Godeps/_workspace/src/{gopkgs.com/unidecode.v1 => github.com/dalu/unidecode}/table.txt (100%) rename Godeps/_workspace/src/{gopkgs.com/unidecode.v1 => github.com/dalu/unidecode}/unidecode.go (100%) rename Godeps/_workspace/src/{gopkgs.com/unidecode.v1 => github.com/dalu/unidecode}/unidecode_test.go (100%) delete mode 100644 Godeps/_workspace/src/github.com/gosimple/slug/.gitignore delete mode 100644 Godeps/_workspace/src/gopkgs.com/unidecode.v1/gopkgs.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index a7e150e215e..dd08ac91121 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "github.com/grafana/grafana", - "GoVersion": "go1.4.2", + "GoVersion": "go1.3", "Packages": [ "./pkg/..." ], @@ -13,6 +13,14 @@ "ImportPath": "github.com/Unknwon/macaron", "Rev": "93de4f3fad97bf246b838f828e2348f46f21f20a" }, + { + "ImportPath": "github.com/dalu/slug", + "Rev": "6dbd13912e9be466e2c1de349a2c7d1466c97e07" + }, + { + "ImportPath": "github.com/dalu/unidecode", + "Rev": "339814d47f3e32a6f7036a0a4c56ed9b373dd755" + }, { "ImportPath": "github.com/go-sql-driver/mysql", "Comment": "v1.2-26-g9543750", @@ -27,10 +35,6 @@ "Comment": "v0.4.2-58-ge2889e5", "Rev": "e2889e5517600b82905f1d2ba8b70deb71823ffe" }, - { - "ImportPath": "github.com/gosimple/slug", - "Rev": "a2392a4a87fa0366cbff131d3fd421f83f52492f" - }, { "ImportPath": "github.com/jtolds/gls", "Rev": "f1ac7f4f24f50328e6bc838ca4437d1612a0243c" @@ -87,10 +91,6 @@ { "ImportPath": "gopkgs.com/pool.v1", "Rev": "c850f092aad1780cbffff25f471c5cc32097932a" - }, - { - "ImportPath": "gopkgs.com/unidecode.v1", - "Rev": "4deae2c05236b41cc39f8144ac87a837ba974d40" } ] } diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/README.md b/Godeps/_workspace/src/github.com/dalu/slug/README.md similarity index 72% rename from Godeps/_workspace/src/github.com/gosimple/slug/README.md rename to Godeps/_workspace/src/github.com/dalu/slug/README.md index a2649bdb170..ddefc36ff04 100644 --- a/Godeps/_workspace/src/github.com/gosimple/slug/README.md +++ b/Godeps/_workspace/src/github.com/dalu/slug/README.md @@ -4,10 +4,9 @@ slug Package `slug` generate slug from unicode string, URL-friendly slugify with multiple languages support. -[![GoDoc](https://godoc.org/github.com/gosimple/slug?status.png)](https://godoc.org/github.com/gosimple/slug) -[![Build Status](https://drone.io/github.com/gosimple/slug/status.png)](https://drone.io/github.com/gosimple/slug/latest) +[![GoDoc](https://godoc.org/github.com/dalu/slug?status.png)](https://godoc.org/github.com/dalu/slug) -[Documentation online](http://godoc.org/github.com/gosimple/slug) +[Documentation online](http://godoc.org/github.com/dalu/slug) ## Example @@ -38,12 +37,9 @@ multiple languages support. fmt.Println(textSub) // Will print 'sand-is-hot' } -### Requests or bugs? - - ## Installation - go get -u github.com/gosimple/slug + go get -u github.com/dalu/slug ## License diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/default_substitution.go b/Godeps/_workspace/src/github.com/dalu/slug/default_substitution.go similarity index 100% rename from Godeps/_workspace/src/github.com/gosimple/slug/default_substitution.go rename to Godeps/_workspace/src/github.com/dalu/slug/default_substitution.go diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/doc.go b/Godeps/_workspace/src/github.com/dalu/slug/doc.go similarity index 91% rename from Godeps/_workspace/src/github.com/gosimple/slug/doc.go rename to Godeps/_workspace/src/github.com/dalu/slug/doc.go index ffbe2c223f5..39f57b30eb4 100644 --- a/Godeps/_workspace/src/github.com/gosimple/slug/doc.go +++ b/Godeps/_workspace/src/github.com/dalu/slug/doc.go @@ -12,7 +12,7 @@ Example: package main import( - "github.com/gosimple/slug" + "github.com/dalu/slug" "fmt" ) @@ -35,9 +35,5 @@ Example: textSub := slug.Make("water is hot") fmt.Println(textSub) // Will print 'sand-is-hot' } - -Requests or bugs? - -https://github.com/gosimple/slug/issues */ package slug diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/languages_substitution.go b/Godeps/_workspace/src/github.com/dalu/slug/languages_substitution.go similarity index 100% rename from Godeps/_workspace/src/github.com/gosimple/slug/languages_substitution.go rename to Godeps/_workspace/src/github.com/dalu/slug/languages_substitution.go diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/slug.go b/Godeps/_workspace/src/github.com/dalu/slug/slug.go similarity index 99% rename from Godeps/_workspace/src/github.com/gosimple/slug/slug.go rename to Godeps/_workspace/src/github.com/dalu/slug/slug.go index 26974fbd7d8..85d614f941e 100644 --- a/Godeps/_workspace/src/github.com/gosimple/slug/slug.go +++ b/Godeps/_workspace/src/github.com/dalu/slug/slug.go @@ -6,7 +6,7 @@ package slug import ( - "gopkgs.com/unidecode.v1" + "github.com/dalu/unidecode" "regexp" "strings" ) diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/slug_test.go b/Godeps/_workspace/src/github.com/dalu/slug/slug_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/gosimple/slug/slug_test.go rename to Godeps/_workspace/src/github.com/dalu/slug/slug_test.go diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/.gitignore b/Godeps/_workspace/src/github.com/dalu/unidecode/.gitignore similarity index 100% rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/.gitignore rename to Godeps/_workspace/src/github.com/dalu/unidecode/.gitignore diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/LICENSE b/Godeps/_workspace/src/github.com/dalu/unidecode/LICENSE similarity index 100% rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/LICENSE rename to Godeps/_workspace/src/github.com/dalu/unidecode/LICENSE diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/README.md b/Godeps/_workspace/src/github.com/dalu/unidecode/README.md similarity index 65% rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/README.md rename to Godeps/_workspace/src/github.com/dalu/unidecode/README.md index fa5d70841fb..589d955593c 100644 --- a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/README.md +++ b/Godeps/_workspace/src/github.com/dalu/unidecode/README.md @@ -3,10 +3,4 @@ unidecode Unicode transliterator in Golang - Replaces non-ASCII characters with their ASCII approximations. -Please, use the following import path to ensure a stable API: - -```go - import "gopkgs.com/unidecode.v1" -``` - View other available versions, documentation and examples at http://gopkgs.com/unidecode diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/decode.go b/Godeps/_workspace/src/github.com/dalu/unidecode/decode.go similarity index 100% rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/decode.go rename to Godeps/_workspace/src/github.com/dalu/unidecode/decode.go diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/make_table.go b/Godeps/_workspace/src/github.com/dalu/unidecode/make_table.go similarity index 100% rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/make_table.go rename to Godeps/_workspace/src/github.com/dalu/unidecode/make_table.go diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/table.go b/Godeps/_workspace/src/github.com/dalu/unidecode/table.go similarity index 100% rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/table.go rename to Godeps/_workspace/src/github.com/dalu/unidecode/table.go diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/table.txt b/Godeps/_workspace/src/github.com/dalu/unidecode/table.txt similarity index 100% rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/table.txt rename to Godeps/_workspace/src/github.com/dalu/unidecode/table.txt diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/unidecode.go b/Godeps/_workspace/src/github.com/dalu/unidecode/unidecode.go similarity index 100% rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/unidecode.go rename to Godeps/_workspace/src/github.com/dalu/unidecode/unidecode.go diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/unidecode_test.go b/Godeps/_workspace/src/github.com/dalu/unidecode/unidecode_test.go similarity index 100% rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/unidecode_test.go rename to Godeps/_workspace/src/github.com/dalu/unidecode/unidecode_test.go diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/.gitignore b/Godeps/_workspace/src/github.com/gosimple/slug/.gitignore deleted file mode 100644 index 02a8da53752..00000000000 --- a/Godeps/_workspace/src/github.com/gosimple/slug/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -_* -cover*.out diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/gopkgs.go b/Godeps/_workspace/src/gopkgs.com/unidecode.v1/gopkgs.go deleted file mode 100644 index a907de14384..00000000000 --- a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/gopkgs.go +++ /dev/null @@ -1,24 +0,0 @@ -package unidecode - -import ( - "fmt" - "reflect" -) - -// gopkgs.go: v1 - -// NOTE: This file is autogenerated by gopkgs.com. -const ( - goPkgsSrcPath = "github.com/rainycape/unidecode" - goPkgsName = "unidecode" - goPkgsErrFmt = "invalid import path %s - please use gopkgs.com/%s.v1 or see http://gopkgs.com/%s" -) - -type goPkgsCheck struct{} - -func init() { - typ := reflect.TypeOf(goPkgsCheck{}) - if typ.PkgPath() == goPkgsSrcPath { - panic(fmt.Errorf(goPkgsErrFmt, typ.PkgPath(), goPkgsName, goPkgsName)) - } -} diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go index 7c4e8db1611..159d4e1a3c6 100644 --- a/pkg/models/dashboards.go +++ b/pkg/models/dashboards.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/gosimple/slug" + "github.com/dalu/slug" ) // Typed errors From 380b7f4d9421369abe61b048fdf787afc4d05158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 24 Apr 2015 15:57:20 +0200 Subject: [PATCH 041/398] updated version to 2.1.0-pre1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 64e393616f6..8785632eaee 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Coding Instinct AB" }, "name": "grafana", - "version": "2.0.3-pre1", + "version": "2.1.0-pre1", "repository": { "type": "git", "url": "http://github.com/torkelo/grafana.git" From 0a23a996bcc786fa6128c4fb49d1635e593a08e1 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sat, 25 Apr 2015 16:12:10 +0900 Subject: [PATCH 042/398] Remove targetLetters --- .../app/plugins/datasource/kairosdb/partials/query.editor.html | 3 --- public/app/plugins/datasource/kairosdb/queryCtrl.js | 2 -- 2 files changed, 5 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/partials/query.editor.html b/public/app/plugins/datasource/kairosdb/partials/query.editor.html index dc272ebbf4c..052bea2d078 100644 --- a/public/app/plugins/datasource/kairosdb/partials/query.editor.html +++ b/public/app/plugins/datasource/kairosdb/partials/query.editor.html @@ -48,9 +48,6 @@
-
+
@@ -99,7 +99,7 @@
-
+
ADD ROW From d84d92f73c9bdb4578a6ce48540fb38bfab8b710 Mon Sep 17 00:00:00 2001 From: Anthony Woods Date: Sat, 25 Apr 2015 18:46:30 +0800 Subject: [PATCH 044/398] fixes #1880 correct mysql statement for modifying column data type --- pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go b/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go index 9cbb5c8c7ab..2e3d2d2a188 100644 --- a/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go +++ b/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go @@ -53,5 +53,5 @@ func addDashboardSnapshotMigrations(mg *Migrator) { mg.AddMigration("alter dashboard_snapshot.data to mediumtext v1", new(RawSqlMigration). Sqlite("SELECT 0 WHERE 0;"). Postgres("SELECT 0;"). - Mysql("ALTER TABLE dashboard_snapshot.data MODIFY data MEDIUMTEXT;")) + Mysql("ALTER TABLE dashboard_snapshot MODIFY data MEDIUMTEXT;")) } From f227002a804c4fcdc360939ce5bb7e0b5194a3aa Mon Sep 17 00:00:00 2001 From: Anthony Woods Date: Sat, 25 Apr 2015 18:51:25 +0800 Subject: [PATCH 045/398] fixes #1880 dashboard_snapshot table does not have a data column --- pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go b/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go index 2e3d2d2a188..352619ee6e9 100644 --- a/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go +++ b/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go @@ -49,9 +49,4 @@ func addDashboardSnapshotMigrations(mg *Migrator) { mg.AddMigration("create dashboard_snapshot table v5 #2", NewAddTableMigration(snapshotV5)) addTableIndicesMigrations(mg, "v5", snapshotV5) - // ncrease data type - mg.AddMigration("alter dashboard_snapshot.data to mediumtext v1", new(RawSqlMigration). - Sqlite("SELECT 0 WHERE 0;"). - Postgres("SELECT 0;"). - Mysql("ALTER TABLE dashboard_snapshot MODIFY data MEDIUMTEXT;")) } From 5d57931060419416203eb55a049dd13478c1687a Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sat, 25 Apr 2015 23:48:47 +0900 Subject: [PATCH 046/398] Fix appearance of query editor --- .../kairosdb/partials/query.editor.html | 102 +++++++++--------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/partials/query.editor.html b/public/app/plugins/datasource/kairosdb/partials/query.editor.html index 052bea2d078..6fa3401dad7 100644 --- a/public/app/plugins/datasource/kairosdb/partials/query.editor.html +++ b/public/app/plugins/datasource/kairosdb/partials/query.editor.html @@ -7,40 +7,21 @@
+
+
+
- + +
+
- + +
+ From e410fbb558be6ae491523a413872b24002028211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 25 Apr 2015 20:28:50 +0200 Subject: [PATCH 047/398] Corrected SQL migration for snapshot table column type change, #1880 --- pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go b/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go index 352619ee6e9..b08cc451e55 100644 --- a/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go +++ b/pkg/services/sqlstore/migrations/dashboard_snapshot_mig.go @@ -49,4 +49,9 @@ func addDashboardSnapshotMigrations(mg *Migrator) { mg.AddMigration("create dashboard_snapshot table v5 #2", NewAddTableMigration(snapshotV5)) addTableIndicesMigrations(mg, "v5", snapshotV5) + // change column type of dashboard + mg.AddMigration("alter dashboard_snapshot to mediumtext v2", new(RawSqlMigration). + Sqlite("SELECT 0 WHERE 0;"). + Postgres("SELECT 0;"). + Mysql("ALTER TABLE dashboard_snapshot MODIFY dashboard MEDIUMTEXT;")) } From 7e044e29baebcce3747bb17ee0b96ed2ddeb9f1e Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 26 Apr 2015 11:37:17 +0900 Subject: [PATCH 048/398] Change metric form input text Preparation of templated dashboard support. --- .../plugins/datasource/kairosdb/datasource.js | 7 ++-- .../kairosdb/partials/query.editor.html | 17 +++++----- .../plugins/datasource/kairosdb/queryCtrl.js | 32 ++++++------------- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index 9d25b694891..64e9c4c9b49 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -18,7 +18,6 @@ function (angular, _, kbn) { this.url = datasource.url; this.name = datasource.name; this.supportMetrics = true; - this.grafanaDB = datasource.grafanaDB; } // Called once per panel (graph) @@ -85,11 +84,11 @@ function (angular, _, kbn) { method : 'GET' }; - return $http(options).then(function(results) { - if (!results.data) { + return $http(options).then(function(response) { + if (!response.data) { return []; } - return results.data.results; + return response.data.results; }); }; diff --git a/public/app/plugins/datasource/kairosdb/partials/query.editor.html b/public/app/plugins/datasource/kairosdb/partials/query.editor.html index dc272ebbf4c..eacc78f8819 100644 --- a/public/app/plugins/datasource/kairosdb/partials/query.editor.html +++ b/public/app/plugins/datasource/kairosdb/partials/query.editor.html @@ -61,14 +61,15 @@ spellcheck='false' placeholder="alias" ng-blur="targetBlur()">
  • - + diff --git a/public/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js index 6370afc7c0e..d7ec94f5205 100644 --- a/public/app/plugins/datasource/kairosdb/queryCtrl.js +++ b/public/app/plugins/datasource/kairosdb/queryCtrl.js @@ -6,16 +6,12 @@ function (angular, _) { 'use strict'; var module = angular.module('grafana.controllers'); - var metricList = null; + var metricList = []; var targetLetters = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O']; module.controller('KairosDBQueryCtrl', function($scope) { $scope.init = function() { - $scope.metric = { - list: ["Loading..."], - value: "Loading..." - }; $scope.panel.stack = false; if (!$scope.panel.downsampling) { $scope.panel.downsampling = 'avg'; @@ -25,12 +21,10 @@ function (angular, _) { $scope.target.sampling = $scope.panel.sampling; } $scope.targetLetters = targetLetters; - $scope.updateMetricList(); $scope.target.errors = validateTarget($scope.target); }; $scope.targetBlur = function() { - $scope.target.metric = $scope.metric.value; $scope.target.errors = validateTarget($scope.target); if (!_.isEqual($scope.oldTarget, $scope.target) && _.isEmpty($scope.target.errors)) { $scope.oldTarget = angular.copy($scope.target); @@ -55,22 +49,16 @@ function (angular, _) { _.move($scope.panel.targets, fromIndex, toIndex); }; - // Fetch metric list - $scope.updateMetricList = function() { - $scope.metricListLoading = true; - metricList = []; - $scope.datasource.performMetricSuggestQuery().then(function(series) { - metricList = series; - $scope.metric.list = series; - if ($scope.target.metric) { - $scope.metric.value = $scope.target.metric; - } - else { - $scope.metric.value = ""; - } - $scope.metricListLoading = false; + $scope.suggestMetrics = function(query, callback) { + if (!_.isEmpty(metricList)) { return metricList; - }); + } + else { + $scope.datasource.performMetricSuggestQuery().then(function(result) { + metricList = result; + callback(metricList); + }); + } }; $scope.suggestTagKeys = function(query, callback) { From d86814b6c5af1ff6c30a7a20c42c4f0eb2f1fe8a Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 26 Apr 2015 18:18:43 +0900 Subject: [PATCH 049/398] Refactoring of tag suggestion --- .../plugins/datasource/kairosdb/datasource.js | 49 +++++-------------- .../plugins/datasource/kairosdb/queryCtrl.js | 32 ++++++++++-- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index 64e9c4c9b49..b97a06fea04 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -8,7 +8,6 @@ function (angular, _, kbn) { 'use strict'; var module = angular.module('grafana.services'); - var tagList = null; module.factory('KairosDBDatasource', function($q, $http) { @@ -92,31 +91,24 @@ function (angular, _, kbn) { }); }; - KairosDBDatasource.prototype.performTagSuggestQuery = function(metricname, range, type, keyValue) { - if (tagList && (metricname === tagList.metricName) && (range.from === tagList.range.from) && - (range.to === tagList.range.to)) { - return getTagListFromResponse(tagList.results, type, keyValue); - } - tagList = { - metricName: metricname, - range: range - }; - var body = { - metrics : [{name : metricname}] - }; - - convertToKairosTime(range.from, body, 'start'); - convertToKairosTime(range.to, body, 'end'); - + KairosDBDatasource.prototype.performTagSuggestQuery = function(metricname) { var options = { url : this.url + '/api/v1/datapoints/query/tags', method : 'POST', - data : body + data : { + metrics : [{ name : metricname }], + cache_time : 0, + start_absolute: 0 + } }; - return $http(options).then(function(results) { - tagList.results = results; - return getTagListFromResponse(results, type, keyValue); + return $http(options).then(function(response) { + if (!response.data) { + return []; + } + else { + return response.data.queries[0].results[0]; + } }); }; @@ -124,21 +116,6 @@ function (angular, _, kbn) { /// Formatting methods //////////////////////////////////////////////////////////////////////// - function getTagListFromResponse(results, type, keyValue) { - if (!results.data) { - return []; - } - else if (type === "key") { - return _.keys(results.data.queries[0].results[0].tags); - } - else if (type === "value" && _.has(results.data.queries[0].results[0].tags, keyValue)) { - return results.data.queries[0].results[0].tags[keyValue]; - } - else { - return []; - } - } - /** * Requires a verion of KairosDB with every CORS defects fixed * @param results diff --git a/public/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js index 716274ffe0a..c2fb5055ea5 100644 --- a/public/app/plugins/datasource/kairosdb/queryCtrl.js +++ b/public/app/plugins/datasource/kairosdb/queryCtrl.js @@ -7,6 +7,7 @@ function (angular, _) { var module = angular.module('grafana.controllers'); var metricList = []; + var tagList = []; var targetLetters = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O']; module.controller('KairosDBQueryCtrl', function($scope) { @@ -63,12 +64,37 @@ function (angular, _) { }; $scope.suggestTagKeys = function(query, callback) { - callback($scope.datasource.performTagSuggestQuery($scope.target.metric, $scope.rangeUnparsed, 'key', '')); + if (!_.isEmpty(tagList)) { + var result = _.find(tagList, { name : $scope.target.metric }); + + if (!_.isEmpty(result)) { + return _.keys(result.tags); + } + } + + $scope.datasource.performTagSuggestQuery($scope.target.metric).then(function(result) { + if (!_.isEmpty(result)) { + tagList.push(result); + callback(_.keys(result.tags)); + } + }); }; $scope.suggestTagValues = function(query, callback) { - callback($scope.datasource - .performTagSuggestQuery($scope.target.metric, $scope.rangeUnparsed, 'value', $scope.target.currentTagKey)); + if (!_.isEmpty(tagList)) { + var result = _.find(tagList, { name : $scope.target.metric }); + + if (!_.isEmpty(result)) { + return result.tags[$scope.target.currentTagKey]; + } + } + + $scope.datasource.performTagSuggestQuery($scope.target.metric).then(function(result) { + if (!_.isEmpty(result)) { + tagList.push(result); + callback(result.tags[$scope.target.currentTagKey]); + } + }); }; // Filter metric by tag From df9403809b42499cb896677f02e2a9f5953d9dfb Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 26 Apr 2015 23:14:50 +0900 Subject: [PATCH 050/398] Fix conflict --- public/app/plugins/datasource/kairosdb/queryCtrl.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js index c2fb5055ea5..9e8c5817dd1 100644 --- a/public/app/plugins/datasource/kairosdb/queryCtrl.js +++ b/public/app/plugins/datasource/kairosdb/queryCtrl.js @@ -8,7 +8,6 @@ function (angular, _) { var module = angular.module('grafana.controllers'); var metricList = []; var tagList = []; - var targetLetters = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O']; module.controller('KairosDBQueryCtrl', function($scope) { @@ -21,8 +20,6 @@ function (angular, _) { $scope.target.downsampling = $scope.panel.downsampling; $scope.target.sampling = $scope.panel.sampling; } - $scope.targetLetters = targetLetters; - $scope.updateMetricList(); $scope.target.errors = validateTarget($scope.target); }; From 16fc6e8b4234dbffda88af6091a47f70f3a6bc53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 27 Apr 2015 10:09:32 +0200 Subject: [PATCH 051/398] More work on editable false dashboards, #1834 --- .../features/dashboard/dashboardNavCtrl.js | 2 ++ public/app/features/dashboard/dashboardSrv.js | 2 ++ .../dashboard/partials/dashboardTopNav.html | 4 ++-- public/app/routes/dashLoadControllers.js | 17 ++++++++++---- public/app/services/contextSrv.js | 15 ++++++------- public/test/specs/dashboardSrv-specs.js | 22 ++++++++++++++++--- 6 files changed, 45 insertions(+), 17 deletions(-) diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js index 11595e30479..d2cf8d29c12 100644 --- a/public/app/features/dashboard/dashboardNavCtrl.js +++ b/public/app/features/dashboard/dashboardNavCtrl.js @@ -119,6 +119,8 @@ function (angular, _) { $scope.saveDashboardAs = function() { var newScope = $rootScope.$new(); newScope.clone = $scope.dashboard.getSaveModelClone(); + newScope.clone.editable = true; + newScope.clone.hideControls = false; $scope.appEvent('show-modal', { src: './app/features/dashboard/partials/saveDashboardAs.html', diff --git a/public/app/features/dashboard/dashboardSrv.js b/public/app/features/dashboard/dashboardSrv.js index 73a36ed3da8..9324f18e33b 100644 --- a/public/app/features/dashboard/dashboardSrv.js +++ b/public/app/features/dashboard/dashboardSrv.js @@ -66,6 +66,8 @@ function (angular, $, kbn, _, moment) { if (!this.editable) { meta.canEdit = false; meta.canDelete = false; + meta.canSave = false; + this.hideControls = true; } this.meta = meta; diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html index 711fb1f34ba..6f85d6b4e02 100644 --- a/public/app/features/dashboard/partials/dashboardTopNav.html +++ b/public/app/features/dashboard/partials/dashboardTopNav.html @@ -27,7 +27,7 @@
    • -
  • +
  • @@ -38,7 +38,7 @@
  • Templating
  • Export
  • View JSON
    • -
  • Save As...
    • +
  • Save As...
  • Delete dashboard
    • diff --git a/public/app/routes/dashLoadControllers.js b/public/app/routes/dashLoadControllers.js index ba33dc7e73a..ee36ef72117 100644 --- a/public/app/routes/dashLoadControllers.js +++ b/public/app/routes/dashLoadControllers.js @@ -59,12 +59,15 @@ function (angular, _, kbn, moment, $) { $location.path(''); return; } - $scope.initDashboard({meta: {}, model: window.grafanaImportDashboard }, $scope); + $scope.initDashboard({ + meta: { canShare: false, canStar: false }, + model: window.grafanaImportDashboard + }, $scope); }); module.controller('NewDashboardCtrl', function($scope) { $scope.initDashboard({ - meta: {}, + meta: { canStar: false, canShare: false }, model: { title: "New dashboard", rows: [{ height: '250px', panels:[] }] @@ -93,7 +96,10 @@ function (angular, _, kbn, moment, $) { }; file_load($routeParams.jsonFile).then(function(result) { - $scope.initDashboard({meta: {fromFile: true}, model: result}, $scope); + $scope.initDashboard({ + meta: { canSave: false, canDelete: false }, + model: result + }, $scope); }); }); @@ -138,7 +144,10 @@ function (angular, _, kbn, moment, $) { }; script_load($routeParams.jsFile).then(function(result) { - $scope.initDashboard({meta: {fromScript: true, canDelete: false}, model: result.data}, $scope); + $scope.initDashboard({ + meta: {fromScript: true, canDelete: false, canSave: false}, + model: result.data + }, $scope); }); }); diff --git a/public/app/services/contextSrv.js b/public/app/services/contextSrv.js index c615e0baf8c..99bbcccf156 100644 --- a/public/app/services/contextSrv.js +++ b/public/app/services/contextSrv.js @@ -18,13 +18,6 @@ function (angular, _, store, config) { } } - this.version = config.buildInfo.version; - this.lightTheme = false; - this.user = new User(); - this.isSignedIn = this.user.isSignedIn; - this.isGrafanaAdmin = this.user.isGrafanaAdmin; - this.sidemenu = store.getBool('grafana.sidemenu'); - // events $rootScope.$on('toggle-sidemenu', function() { self.toggleSideMenu(); @@ -47,6 +40,12 @@ function (angular, _, store, config) { }, 50); }; + this.version = config.buildInfo.version; + this.lightTheme = false; + this.user = new User(); + this.isSignedIn = this.user.isSignedIn; + this.isGrafanaAdmin = this.user.isGrafanaAdmin; + this.sidemenu = store.getBool('grafana.sidemenu'); + this.isEditor = this.hasRole('Editor') || this.hasRole('Admin'); }); - }); diff --git a/public/test/specs/dashboardSrv-specs.js b/public/test/specs/dashboardSrv-specs.js index 19f81f1cc01..35d248888c7 100644 --- a/public/test/specs/dashboardSrv-specs.js +++ b/public/test/specs/dashboardSrv-specs.js @@ -185,10 +185,26 @@ define([ expect(model.annotations.list.length).to.be(0); expect(model.templating.list.length).to.be(0); }); - }); + describe('Given editable false dashboard', function() { + var model; + + beforeEach(function() { + model = _dashboardSrv.create({ + editable: false, + }); + }); + + it('Should set meta canEdit and canSave to false', function() { + expect(model.meta.canSave).to.be(false); + expect(model.meta.canEdit).to.be(false); + }); + + it('getSaveModelClone should remove meta', function() { + var clone = model.getSaveModelClone(); + expect(clone.meta).to.be(undefined); + }); + }); }); - - }); From 29a7490af294887ec03db1aff2fd5d78ded49ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 27 Apr 2015 10:29:04 +0200 Subject: [PATCH 052/398] Small fix for unsaved changes when using save as feature --- public/app/features/dashboard/unsavedChangesSrv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js index d17276dc374..eec884551ec 100644 --- a/public/app/features/dashboard/unsavedChangesSrv.js +++ b/public/app/features/dashboard/unsavedChangesSrv.js @@ -37,7 +37,7 @@ function(angular, _, config) { }); this.ignoreChanges = function() { - if (!self.current) { return true; } + if (!self.current || !self.current.meta) { return true; } var meta = self.current.meta; return !meta.canSave || meta.fromScript || meta.fromFile; From b0ef659add252ae47dea6a5730ffca2a9051401c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 27 Apr 2015 10:56:36 +0200 Subject: [PATCH 053/398] Stop users from entering panel edit mode when dashboard editable is false, #1834 --- public/app/features/panel/panelSrv.js | 8 ++++++++ public/app/panels/graph/module.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/public/app/features/panel/panelSrv.js b/public/app/features/panel/panelSrv.js index d8e2272436a..33f70ca25da 100644 --- a/public/app/features/panel/panelSrv.js +++ b/public/app/features/panel/panelSrv.js @@ -70,6 +70,14 @@ function (angular, _, config) { }; $scope.toggleFullscreen = function(edit) { + if (edit && $scope.dashboardMeta.canEdit === false) { + $scope.appEvent('alert-warning', [ + 'Dashboard not editable', + 'Use Save As.. feature to create an editable copy of this dashboard.' + ]); + return; + } + $scope.dashboardViewState.update({ fullscreen: true, edit: edit, panelId: $scope.panel.id }); }; diff --git a/public/app/panels/graph/module.js b/public/app/panels/graph/module.js index b9fff58f670..dfcd5901594 100644 --- a/public/app/panels/graph/module.js +++ b/public/app/panels/graph/module.js @@ -29,7 +29,7 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) { panelName: 'Graph', editIcon: "fa fa-bar-chart", fullscreen: true, - metricsEditor: true + metricsEditor: true, }); $scope.panelMeta.addEditorTab('Axes & Grid', 'app/panels/graph/axisEditor.html'); From 8a986ec340948ba3ce0b9954ffba29e112822b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 27 Apr 2015 10:59:14 +0200 Subject: [PATCH 054/398] Using CTRL+S should not work when dashboardMeta.canSave is false, #1834 --- public/app/features/dashboard/dashboardNavCtrl.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js index d2cf8d29c12..27ce528f69e 100644 --- a/public/app/features/dashboard/dashboardNavCtrl.js +++ b/public/app/features/dashboard/dashboardNavCtrl.js @@ -52,6 +52,10 @@ function (angular, _) { }; $scope.saveDashboard = function(options) { + if ($scope.dashboardMeta.canSave === false) { + return; + } + var clone = $scope.dashboard.getSaveModelClone(); backendSrv.saveDashboard(clone, options).then(function(data) { From 3f97bd8212269d6c1c01126c91eb95fd0bd9ba1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 27 Apr 2015 13:59:20 +0200 Subject: [PATCH 055/398] Added files removed in merge --- public/app/directives/giveFocus.js | 0 .../features/dashboard/dynamicDashboardSrv.js | 146 ++++++++++++++++++ .../partials/variableValueSelect.html | 23 +++ 3 files changed, 169 insertions(+) create mode 100644 public/app/directives/giveFocus.js create mode 100644 public/app/features/dashboard/dynamicDashboardSrv.js create mode 100644 public/app/features/dashboard/partials/variableValueSelect.html diff --git a/public/app/directives/giveFocus.js b/public/app/directives/giveFocus.js new file mode 100644 index 00000000000..e69de29bb2d diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js new file mode 100644 index 00000000000..333fb5aed08 --- /dev/null +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -0,0 +1,146 @@ +define([ + 'angular', + 'lodash', +], +function (angular, _) { + 'use strict'; + + var module = angular.module('grafana.services'); + + module.service('dynamicDashboardSrv', function() { + + this.init = function(dashboard) { + this.handlePanelRepeats(dashboard); + this.handleRowRepeats(dashboard); + }; + + this.update = function(dashboard) { + this.handlePanelRepeats(dashboard); + this.handleRowRepeats(dashboard); + }; + + this.removeLinkedPanels = function(dashboard) { + var i, j, row, panel; + for (i = 0; i < dashboard.rows.length; i++) { + row = dashboard.rows[i]; + for (j = 0; j < row.panels.length; j++) { + panel = row.panels[j]; + if (panel.linked) { + row.panels = _.without(row.panels, panel); + j = j - 1; + } + } + } + }; + + this.handlePanelRepeats = function(dashboard) { + this.removeLinkedPanels(dashboard); + + var i, j, row, panel; + for (i = 0; i < dashboard.rows.length; i++) { + row = dashboard.rows[i]; + for (j = 0; j < row.panels.length; j++) { + panel = row.panels[j]; + if (panel.repeat) { + this.repeatPanel(panel, row, dashboard); + } + } + } + }; + + this.removeLinkedRows = function(dashboard) { + var i, row; + for (i = 0; i < dashboard.rows.length; i++) { + row = dashboard.rows[i]; + if (row.linked) { + dashboard.rows = _.without(dashboard.rows, row); + i = i - 1; + } + } + }; + + this.handleRowRepeats = function(dashboard) { + this.removeLinkedRows(dashboard); + var i, row; + for (i = 0; i < dashboard.rows.length; i++) { + row = dashboard.rows[i]; + if (row.repeat) { + this.repeatRow(row, dashboard); + } + } + }; + + this.repeatRow = function(row, dashboard) { + console.log('repeat row'); + var variables = dashboard.templating.list; + var variable = _.findWhere(variables, {name: row.repeat.replace('$', '')}); + if (!variable) { + return; + } + + var selected, copy, i, panel; + if (variable.current.text === 'All') { + selected = variable.options.slice(1, variable.options.length); + } else { + selected = _.filter(variable.options, {selected: true}); + } + + _.each(selected, function(option, index) { + if (index > 0) { + copy = angular.copy(row); + copy.repeat = null; + copy.linked = true; + + // set new panel ids + for (i = 0; i < copy.panels.length; i++) { + panel = row.panels[i]; + panel.id = dashboard.getNextPanelId(); + } + + dashboard.rows.push(copy); + } else { + copy = row; + } + + for (i = 0; i < copy.panels.length; i++) { + panel = copy.panels[i]; + panel.scopedVars = panel.scopedVars || {}; + panel.scopedVars[variable.name] = option; + } + }); + + }; + + this.repeatPanel = function(panel, row, dashboard) { + var variables = dashboard.templating.list; + var variable = _.findWhere(variables, {name: panel.repeat.replace('$', '')}); + if (!variable) { + return; + } + + var selected; + if (variable.current.text === 'All') { + selected = variable.options.slice(1, variable.options.length); + } else { + selected = _.filter(variable.options, {selected: true}); + } + + _.each(selected, function(option, index) { + if (index > 0) { + var copy = dashboard.duplicatePanel(panel, row); + copy.repeat = null; + copy.linked = true; + copy.scopedVars = {}; + copy.scopedVars[variable.name] = option; + } else { + panel.scopedVars = {}; + panel.scopedVars[variable.name] = option; + } + console.log('duplicatePanel'); + }); + }; + + }); + +}); + diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html new file mode 100644 index 00000000000..1904aa598ee --- /dev/null +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -0,0 +1,23 @@ + + {{linkText}} + + + +
    +
    + + + +
    + +
    + + + + {{option.text}} +
    + +
    +
    From 158b77d54e5d9c8ebaba4a36003ac3ad32e6095f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 27 Apr 2015 15:01:27 +0200 Subject: [PATCH 056/398] small update to panel repeats --- .../features/dashboard/dynamicDashboardSrv.js | 1 + public/app/partials/roweditor.html | 23 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index 333fb5aed08..286eb116e25 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -29,6 +29,7 @@ function (angular, _) { row.panels = _.without(row.panels, panel); j = j - 1; } + delete panel.scopedVars; } } }; diff --git a/public/app/partials/roweditor.html b/public/app/partials/roweditor.html index 243546392cc..f47351c8ffa 100644 --- a/public/app/partials/roweditor.html +++ b/public/app/partials/roweditor.html @@ -17,14 +17,25 @@
    -
    - +
    +
    Row details
    +
    + +
    +
    + +
    + +
    -
    - + +
    +
    Templating options
    +
    + + +
    - -
    From 5cb7721ab21cb93637202a3bd4cfc0bdbf900eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 27 Apr 2015 15:06:42 +0200 Subject: [PATCH 057/398] Updated config sample.ini with oauth allow_sign_up --- conf/defaults.ini | 3 ++- conf/sample.ini | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 6bb3fb80857..e6e82badb24 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -137,6 +137,7 @@ org_role = Viewer #################################### Github Auth ########################## [auth.github] enabled = false +allow_sign_up = false client_id = some_id client_secret = some_secret scopes = user:email @@ -144,11 +145,11 @@ auth_url = https://github.com/login/oauth/authorize token_url = https://github.com/login/oauth/access_token api_url = https://api.github.com/user allowed_domains = -allow_sign_up = false #################################### Google Auth ########################## [auth.google] enabled = false +allow_sign_up = false client_id = some_client_id client_secret = some_client_secret scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email diff --git a/conf/sample.ini b/conf/sample.ini index 68bd3eb3a1d..c0b427fd1a4 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -136,26 +136,26 @@ #################################### Github Auth ########################## [auth.github] ;enabled = false +;allow_sign_up = false ;client_id = some_id ;client_secret = some_secret ;scopes = user:email ;auth_url = https://github.com/login/oauth/authorize ;token_url = https://github.com/login/oauth/access_token ;api_url = https://api.github.com/user -# Uncomment bellow to only allow specific email domains -; allowed_domains = mycompany.com othercompany.com +;allowed_domains = #################################### Google Auth ########################## [auth.google] ;enabled = false +;allow_sign_up = false ;client_id = some_client_id ;client_secret = some_client_secret ;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email ;auth_url = https://accounts.google.com/o/oauth2/auth ;token_url = https://accounts.google.com/o/oauth2/token ;api_url = https://www.googleapis.com/oauth2/v1/userinfo -# Uncomment bellow to only allow specific email domains -; allowed_domains = mycompany.com othercompany.com +;allowed_domains = #################################### Logging ########################## [log] From 5175cf70ef53a551c9b51d1981b8577859eb6289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 27 Apr 2015 15:07:13 +0200 Subject: [PATCH 058/398] fixed version in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8785632eaee..64e393616f6 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Coding Instinct AB" }, "name": "grafana", - "version": "2.1.0-pre1", + "version": "2.0.3-pre1", "repository": { "type": "git", "url": "http://github.com/torkelo/grafana.git" From ca7aa294e0524143f7a71a03db9fbc65b3e0ba6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 27 Apr 2015 17:20:32 +0200 Subject: [PATCH 059/398] Began wriing unit test for new panel repeat features, #1888 --- .../app/features/dashboard/dashboardCtrl.js | 1 + public/app/features/dashboard/dashboardSrv.js | 6 +- .../features/dashboard/dynamicDashboardSrv.js | 13 +++- .../dashboard/partials/dashboardTopNav.html | 2 +- .../features/dashboard/unsavedChangesSrv.js | 3 +- public/test/specs/dashboardSrv-specs.js | 9 +-- .../test/specs/dynamicDashboardSrv-specs.js | 65 +++++++++++++++++++ public/test/test-main.js | 1 + 8 files changed, 85 insertions(+), 15 deletions(-) create mode 100644 public/test/specs/dynamicDashboardSrv-specs.js diff --git a/public/app/features/dashboard/dashboardCtrl.js b/public/app/features/dashboard/dashboardCtrl.js index ba86f9f5dba..41453bd77e3 100644 --- a/public/app/features/dashboard/dashboardCtrl.js +++ b/public/app/features/dashboard/dashboardCtrl.js @@ -48,6 +48,7 @@ function (angular, $, config) { // the rest of the dashboard can load templateValuesSrv.init(dashboard).finally(function() { dynamicDashboardSrv.init(dashboard); + $scope.dashboard = dashboard; $scope.dashboardMeta = dashboard.meta; $scope.dashboardViewState = dashboardViewStateSrv.create($scope); diff --git a/public/app/features/dashboard/dashboardSrv.js b/public/app/features/dashboard/dashboardSrv.js index 02d8f51fafe..afe5e7964c6 100644 --- a/public/app/features/dashboard/dashboardSrv.js +++ b/public/app/features/dashboard/dashboardSrv.js @@ -10,7 +10,7 @@ function (angular, $, kbn, _, moment) { var module = angular.module('grafana.services'); - module.factory('dashboardSrv', function(contextSrv) { + module.factory('dashboardSrv', function() { function DashboardModel (data, meta) { if (!data) { @@ -59,10 +59,6 @@ function (angular, $, kbn, _, moment) { meta.canStar = meta.canStar === false ? false : true; meta.canDelete = meta.canDelete === false ? false : true; - if (contextSrv.hasRole('Viewer')) { - meta.canSave = false; - } - if (!this.editable) { meta.canEdit = false; meta.canDelete = false; diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index 286eb116e25..8d099a9f6c6 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -8,8 +8,11 @@ function (angular, _) { var module = angular.module('grafana.services'); module.service('dynamicDashboardSrv', function() { + var self = this; this.init = function(dashboard) { + this.iteration = 0; + this.handlePanelRepeats(dashboard); this.handleRowRepeats(dashboard); }; @@ -112,6 +115,15 @@ function (angular, _) { }; + this.getRepeatPanel = function(sourcePanel, row) { + for (var i = 0; i < row.panels.length; i++) { + var panel = row.panels[i]; + if (panel.sourcePanel === sourcePanel) { + return panel; + } + } + }; + this.repeatPanel = function(panel, row, dashboard) { var variables = dashboard.templating.list; var variable = _.findWhere(variables, {name: panel.repeat.replace('$', '')}); @@ -137,7 +149,6 @@ function (angular, _) { panel.scopedVars = {}; panel.scopedVars[variable.name] = option; } - console.log('duplicatePanel'); }); }; diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html index 6f85d6b4e02..89a6a185759 100644 --- a/public/app/features/dashboard/partials/dashboardTopNav.html +++ b/public/app/features/dashboard/partials/dashboardTopNav.html @@ -27,7 +27,7 @@
    • -
  • +
  • diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js index eec884551ec..3fd942f1139 100644 --- a/public/app/features/dashboard/unsavedChangesSrv.js +++ b/public/app/features/dashboard/unsavedChangesSrv.js @@ -12,7 +12,7 @@ function(angular, _, config) { var module = angular.module('grafana.services'); - module.service('unsavedChangesSrv', function($rootScope, $modal, $q, $location, $timeout) { + module.service('unsavedChangesSrv', function($rootScope, $modal, $q, $location, $timeout, contextSrv) { var self = this; var modalScope = $rootScope.$new(); @@ -37,6 +37,7 @@ function(angular, _, config) { }); this.ignoreChanges = function() { + if (!contextSrv.isEditor) { return true; } if (!self.current || !self.current.meta) { return true; } var meta = self.current.meta; diff --git a/public/test/specs/dashboardSrv-specs.js b/public/test/specs/dashboardSrv-specs.js index 35d248888c7..93f6c04aa13 100644 --- a/public/test/specs/dashboardSrv-specs.js +++ b/public/test/specs/dashboardSrv-specs.js @@ -1,17 +1,12 @@ define([ - 'helpers', 'features/dashboard/dashboardSrv' -], function(helpers) { +], function() { 'use strict'; describe('dashboardSrv', function() { var _dashboardSrv; - var contextSrv = new helpers.ContextSrvStub(); beforeEach(module('grafana.services')); - beforeEach(module(function($provide) { - $provide.value('contextSrv', contextSrv); - })); beforeEach(inject(function(dashboardSrv) { _dashboardSrv = dashboardSrv; @@ -29,7 +24,7 @@ define([ }); it('should have meta', function() { - expect(model.meta.canSave).to.be(false); + expect(model.meta.canSave).to.be(true); expect(model.meta.canShare).to.be(true); }); diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js new file mode 100644 index 00000000000..3fdc6faf14f --- /dev/null +++ b/public/test/specs/dynamicDashboardSrv-specs.js @@ -0,0 +1,65 @@ +define([ + 'features/dashboard/dynamicDashboardSrv', + 'features/dashboard/dashboardSrv' +], function() { + 'use strict'; + + describe('dynamicDashboardSrv', function() { + var _dynamicDashboardSrv; + var _dashboardSrv; + + beforeEach(module('grafana.services')); + + beforeEach(inject(function(dynamicDashboardSrv, dashboardSrv) { + _dynamicDashboardSrv = dynamicDashboardSrv; + _dashboardSrv = dashboardSrv; + })); + + describe('given dashboard with panel repeat', function() { + var model; + + beforeEach(function() { + model = _dashboardSrv.create({ + rows: [ + { + panels: [{id: 2, repeat: '$apps'}] + } + ], + templating: { + list: [{ + name: 'apps', + current: { + text: 'se1, se2', + value: ['se1', 'se2'] + }, + options: [ + {text: 'se1', value: 'se1', selected: true}, + {text: 'se2', value: 'se2', selected: true}, + ] + }] + } + }, {}); + + _dynamicDashboardSrv.init(model); + }); + + it('should repeat panel one time', function() { + expect(model.rows[0].panels.length).to.be(2); + }); + + it('should mark panel repeated', function() { + expect(model.rows[0].panels[0].linked).to.be(undefined); + expect(model.rows[0].panels[0].repeat).to.be('$apps'); + expect(model.rows[0].panels[1].linked).to.be(true); + expect(model.rows[0].panels[1].repeat).to.be(null); + }); + + it('should set scopedVars on panels', function() { + expect(model.rows[0].panels[0].scopedVars.apps.value).to.be('se1'); + expect(model.rows[0].panels[1].scopedVars.apps.value).to.be('se2'); + }); + + }); + + }); +}); diff --git a/public/test/test-main.js b/public/test/test-main.js index a38f8dca32b..2dc85cc65ef 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -140,6 +140,7 @@ require([ 'specs/dashboardSrv-specs', 'specs/dashboardViewStateSrv-specs', 'specs/soloPanelCtrl-specs', + 'specs/dynamicDashboardSrv-specs', ]; var pluginSpecs = (config.plugins.specs || []).map(function (spec) { From 3044a74a52b973c2145d101249802310abd32a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 27 Apr 2015 18:37:39 +0200 Subject: [PATCH 060/398] Optimization and unit tests for panel and row repeat feature, #1888 --- .../features/dashboard/dynamicDashboardSrv.js | 13 +- public/app/panels/graph/module.js | 1 + public/app/partials/dashboard.html | 2 +- .../test/specs/dynamicDashboardSrv-specs.js | 142 ++++++++++++------ 4 files changed, 103 insertions(+), 55 deletions(-) diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index 8d099a9f6c6..82b40007174 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -8,8 +8,6 @@ function (angular, _) { var module = angular.module('grafana.services'); module.service('dynamicDashboardSrv', function() { - var self = this; - this.init = function(dashboard) { this.iteration = 0; @@ -57,7 +55,7 @@ function (angular, _) { for (i = 0; i < dashboard.rows.length; i++) { row = dashboard.rows[i]; if (row.linked) { - dashboard.rows = _.without(dashboard.rows, row); + dashboard.rows.splice(i, 1); i = i - 1; } } @@ -75,7 +73,6 @@ function (angular, _) { }; this.repeatRow = function(row, dashboard) { - console.log('repeat row'); var variables = dashboard.templating.list; var variable = _.findWhere(variables, {name: row.repeat.replace('$', '')}); if (!variable) { @@ -95,13 +92,13 @@ function (angular, _) { copy.repeat = null; copy.linked = true; + dashboard.rows.push(copy); + // set new panel ids for (i = 0; i < copy.panels.length; i++) { - panel = row.panels[i]; + panel = copy.panels[i]; panel.id = dashboard.getNextPanelId(); } - - dashboard.rows.push(copy); } else { copy = row; } @@ -112,7 +109,6 @@ function (angular, _) { panel.scopedVars[variable.name] = option; } }); - }; this.getRepeatPanel = function(sourcePanel, row) { @@ -155,4 +151,3 @@ function (angular, _) { }); }); - diff --git a/public/app/panels/graph/module.js b/public/app/panels/graph/module.js index dfcd5901594..228fab59e03 100644 --- a/public/app/panels/graph/module.js +++ b/public/app/panels/graph/module.js @@ -24,6 +24,7 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) { }); module.controller('GraphCtrl', function($scope, $rootScope, panelSrv, annotationsSrv, panelHelper, $q) { + console.log('Graph: init: ' + $scope.panel.id); $scope.panelMeta = new PanelMeta({ panelName: 'Graph', diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html index 1a4bd402879..c9dca5c5f72 100644 --- a/public/app/partials/dashboard.html +++ b/public/app/partials/dashboard.html @@ -79,7 +79,7 @@
    • -
    diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js index 3fdc6faf14f..f58fbf5cfc6 100644 --- a/public/test/specs/dynamicDashboardSrv-specs.js +++ b/public/test/specs/dynamicDashboardSrv-specs.js @@ -4,62 +4,114 @@ define([ ], function() { 'use strict'; - describe('dynamicDashboardSrv', function() { - var _dynamicDashboardSrv; - var _dashboardSrv; + function dynamicDashScenario(desc, func) { - beforeEach(module('grafana.services')); + describe(desc, function() { + var ctx = {}; - beforeEach(inject(function(dynamicDashboardSrv, dashboardSrv) { - _dynamicDashboardSrv = dynamicDashboardSrv; - _dashboardSrv = dashboardSrv; - })); + ctx.setup = function (setupFunc) { - describe('given dashboard with panel repeat', function() { - var model; + beforeEach(module('grafana.services')); - beforeEach(function() { - model = _dashboardSrv.create({ - rows: [ - { - panels: [{id: 2, repeat: '$apps'}] - } - ], - templating: { - list: [{ - name: 'apps', - current: { - text: 'se1, se2', - value: ['se1', 'se2'] - }, - options: [ - {text: 'se1', value: 'se1', selected: true}, - {text: 'se2', value: 'se2', selected: true}, - ] - }] - } - }, {}); + beforeEach(inject(function(dynamicDashboardSrv, dashboardSrv) { + ctx.dynamicDashboardSrv = dynamicDashboardSrv; + ctx.dashboardSrv = dashboardSrv; - _dynamicDashboardSrv.init(model); + var model = { + rows: [], + templating: { list: [] } + }; + + setupFunc(model); + ctx.dash = ctx.dashboardSrv.create(model); + ctx.dynamicDashboardSrv.init(ctx.dash); + ctx.rows = ctx.dash.rows; + + })); + + }; + + func(ctx); + + }); + } + + dynamicDashScenario('given dashboard with panel repeat', function(ctx) { + ctx.setup(function(dash) { + dash.rows.push({ + panels: [{id: 2, repeat: '$apps'}] }); - - it('should repeat panel one time', function() { - expect(model.rows[0].panels.length).to.be(2); + dash.templating.list.push({ + name: 'apps', + current: { + text: 'se1, se2', + value: ['se1', 'se2'] + }, + options: [ + {text: 'se1', value: 'se1', selected: true}, + {text: 'se2', value: 'se2', selected: true}, + ] }); + }); - it('should mark panel repeated', function() { - expect(model.rows[0].panels[0].linked).to.be(undefined); - expect(model.rows[0].panels[0].repeat).to.be('$apps'); - expect(model.rows[0].panels[1].linked).to.be(true); - expect(model.rows[0].panels[1].repeat).to.be(null); - }); + it('should repeat panel one time', function() { + expect(ctx.rows[0].panels.length).to.be(2); + }); - it('should set scopedVars on panels', function() { - expect(model.rows[0].panels[0].scopedVars.apps.value).to.be('se1'); - expect(model.rows[0].panels[1].scopedVars.apps.value).to.be('se2'); - }); + it('should mark panel repeated', function() { + expect(ctx.rows[0].panels[0].linked).to.be(undefined); + expect(ctx.rows[0].panels[0].repeat).to.be('$apps'); + expect(ctx.rows[0].panels[1].linked).to.be(true); + expect(ctx.rows[0].panels[1].repeat).to.be(null); + }); + it('should set scopedVars on panels', function() { + expect(ctx.rows[0].panels[0].scopedVars.apps.value).to.be('se1'); + expect(ctx.rows[0].panels[1].scopedVars.apps.value).to.be('se2'); }); }); + + dynamicDashScenario('given dashboard with row repeat', function(ctx) { + ctx.setup(function(dash) { + dash.rows.push({ + repeat: '$servers', + panels: [{id: 2}] + }); + dash.templating.list.push({ + name: 'servers', + current: { + text: 'se1, se2', + value: ['se1', 'se2'] + }, + options: [ + {text: 'se1', value: 'se1', selected: true}, + {text: 'se2', value: 'se2', selected: true}, + ] + }); + }); + + it('should repeat row one time', function() { + expect(ctx.rows.length).to.be(2); + }); + + it('should keep panel ids on first row', function() { + expect(ctx.rows[0].panels[0].id).to.be(2); + }); + + it('should mark second row as repeated', function() { + expect(ctx.rows[0].linked).to.be(undefined); + expect(ctx.rows[0].repeat).to.be('$servers'); + expect(ctx.rows[1].linked).to.be(true); + expect(ctx.rows[1].repeat).to.be(null); + }); + + it('should set scopedVars on row panels', function() { + expect(ctx.rows[0].panels[0].scopedVars.servers.value).to.be('se1'); + expect(ctx.rows[1].panels[0].scopedVars.servers.value).to.be('se2'); + }); + + }); + + }); From 48b25bc327108fd4d609e310e52a02ff929cfd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 28 Apr 2015 06:40:23 +0200 Subject: [PATCH 061/398] Fix to graph panel, and width=0 bug --- public/app/panels/graph/graph.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/app/panels/graph/graph.js b/public/app/panels/graph/graph.js index 795aee03c20..e63bd6536c3 100755 --- a/public/app/panels/graph/graph.js +++ b/public/app/panels/graph/graph.js @@ -112,7 +112,7 @@ function (angular, $, kbn, moment, _, GraphTooltip) { } if (elem.width() === 0) { - return; + return true; } } @@ -277,7 +277,6 @@ function (angular, $, kbn, moment, _, GraphTooltip) { if (legendSideLastValue !== null && panel.legend.rightSide !== legendSideLastValue) { return true; } - return false; } function addTimeAxis(options) { From 32fe723da627a3614d03d38753e7f4a31f89beb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 28 Apr 2015 08:44:48 +0200 Subject: [PATCH 062/398] More optimizations and unit tests for panel repeats, #1888 --- .../features/dashboard/dynamicDashboardSrv.js | 46 +++++++++++++------ .../test/specs/dynamicDashboardSrv-specs.js | 37 +++++++++++---- 2 files changed, 60 insertions(+), 23 deletions(-) diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index 82b40007174..3f053e4e9af 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -8,14 +8,20 @@ function (angular, _) { var module = angular.module('grafana.services'); module.service('dynamicDashboardSrv', function() { + var self = this; + this.init = function(dashboard) { - this.iteration = 0; + this.dashboard = dashboard; + this.iteration = new Date().getTime(); this.handlePanelRepeats(dashboard); this.handleRowRepeats(dashboard); }; this.update = function(dashboard) { + this.dashboard = dashboard; + this.iteration = this.iteration + 1; + this.handlePanelRepeats(dashboard); this.handleRowRepeats(dashboard); }; @@ -36,8 +42,6 @@ function (angular, _) { }; this.handlePanelRepeats = function(dashboard) { - this.removeLinkedPanels(dashboard); - var i, j, row, panel; for (i = 0; i < dashboard.rows.length; i++) { row = dashboard.rows[i]; @@ -46,6 +50,11 @@ function (angular, _) { if (panel.repeat) { this.repeatPanel(panel, row, dashboard); } + // clean up old left overs + else if (panel.repeatPanelId && panel.repeatIteration !== this.iteration) { + row.panels = _.without(row.panels, panel); + j = j - 1; + } } } }; @@ -111,13 +120,27 @@ function (angular, _) { }); }; - this.getRepeatPanel = function(sourcePanel, row) { + this.getPanelClone = function(sourcePanel, row, index) { + // if first clone return source + if (index === 0) { + return sourcePanel; + } + + // first try finding an existing clone to use for (var i = 0; i < row.panels.length; i++) { var panel = row.panels[i]; - if (panel.sourcePanel === sourcePanel) { + if (panel.repeatIteration !== this.iteration && + panel.repeatPanelId === sourcePanel.id) { + panel.repeatIteration = this.iteration; return panel; } } + + var clone = this.dashboard.duplicatePanel(sourcePanel, row); + clone.repeatIteration = this.iteration; + clone.repeatPanelId = sourcePanel.id; + clone.repeat = null; + return clone; }; this.repeatPanel = function(panel, row, dashboard) { @@ -135,16 +158,9 @@ function (angular, _) { } _.each(selected, function(option, index) { - if (index > 0) { - var copy = dashboard.duplicatePanel(panel, row); - copy.repeat = null; - copy.linked = true; - copy.scopedVars = {}; - copy.scopedVars[variable.name] = option; - } else { - panel.scopedVars = {}; - panel.scopedVars[variable.name] = option; - } + var copy = self.getPanelClone(panel, row, index); + copy.scopedVars = {}; + copy.scopedVars[variable.name] = option; }); }; diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js index f58fbf5cfc6..c4e2ff9204c 100644 --- a/public/test/specs/dynamicDashboardSrv-specs.js +++ b/public/test/specs/dynamicDashboardSrv-specs.js @@ -26,13 +26,10 @@ define([ ctx.dash = ctx.dashboardSrv.create(model); ctx.dynamicDashboardSrv.init(ctx.dash); ctx.rows = ctx.dash.rows; - })); - }; func(ctx); - }); } @@ -59,10 +56,8 @@ define([ }); it('should mark panel repeated', function() { - expect(ctx.rows[0].panels[0].linked).to.be(undefined); expect(ctx.rows[0].panels[0].repeat).to.be('$apps'); - expect(ctx.rows[0].panels[1].linked).to.be(true); - expect(ctx.rows[0].panels[1].repeat).to.be(null); + expect(ctx.rows[0].panels[1].repeatPanelId).to.be(2); }); it('should set scopedVars on panels', function() { @@ -70,6 +65,34 @@ define([ expect(ctx.rows[0].panels[1].scopedVars.apps.value).to.be('se2'); }); + describe('After a second iteration', function() { + var repeatedPanelAfterIteration1; + + beforeEach(function() { + repeatedPanelAfterIteration1 = ctx.rows[0].panels[1]; + ctx.dynamicDashboardSrv.update(ctx.dash); + }); + + it('should have reused same panel instances', function() { + expect(ctx.rows[0].panels[1]).to.be(repeatedPanelAfterIteration1); + }); + + it('should have same panel count', function() { + expect(ctx.rows[0].panels.length).to.be(2); + }); + }); + + describe('After a second iteration and selected values reduced', function() { + beforeEach(function() { + ctx.dash.templating.list[0].options[1].selected = false; + ctx.dynamicDashboardSrv.update(ctx.dash); + }); + + it('should clean up repeated panel', function() { + expect(ctx.rows[0].panels.length).to.be(1); + }); + }); + }); dynamicDashScenario('given dashboard with row repeat', function(ctx) { @@ -110,8 +133,6 @@ define([ expect(ctx.rows[0].panels[0].scopedVars.servers.value).to.be('se1'); expect(ctx.rows[1].panels[0].scopedVars.servers.value).to.be('se2'); }); - }); - }); From 9590f485f1951b0fa0101b4a38979d5745988309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 28 Apr 2015 09:24:07 +0200 Subject: [PATCH 063/398] More optimizations and unit tests for panel repeats, this time reuse rows, #1888 --- .../features/dashboard/dynamicDashboardSrv.js | 83 +++++++++---------- .../test/specs/dynamicDashboardSrv-specs.js | 29 ++++++- 2 files changed, 67 insertions(+), 45 deletions(-) diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index 3f053e4e9af..391a8d1bf7b 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -26,21 +26,6 @@ function (angular, _) { this.handleRowRepeats(dashboard); }; - this.removeLinkedPanels = function(dashboard) { - var i, j, row, panel; - for (i = 0; i < dashboard.rows.length; i++) { - row = dashboard.rows[i]; - for (j = 0; j < row.panels.length; j++) { - panel = row.panels[j]; - if (panel.linked) { - row.panels = _.without(row.panels, panel); - j = j - 1; - } - delete panel.scopedVars; - } - } - }; - this.handlePanelRepeats = function(dashboard) { var i, j, row, panel; for (i = 0; i < dashboard.rows.length; i++) { @@ -59,28 +44,53 @@ function (angular, _) { } }; - this.removeLinkedRows = function(dashboard) { - var i, row; - for (i = 0; i < dashboard.rows.length; i++) { - row = dashboard.rows[i]; - if (row.linked) { - dashboard.rows.splice(i, 1); - i = i - 1; - } - } - }; - this.handleRowRepeats = function(dashboard) { - this.removeLinkedRows(dashboard); var i, row; for (i = 0; i < dashboard.rows.length; i++) { row = dashboard.rows[i]; if (row.repeat) { this.repeatRow(row, dashboard); } + // clean up old left overs + else if (row.repeatRowId && row.repeatIteration !== this.iteration) { + dashboard.rows.splice(i, 1); + i = i - 1; + } } }; + this.getRowClone = function(sourceRow, index) { + if (index === 0) { + return sourceRow; + } + + var i, panel, row; + var sourceRowId = _.indexOf(this.dashboard.rows, sourceRow) + 1; + + // look for row to reuse + for (i = 0; i < this.dashboard.rows.length; i++) { + row = this.dashboard.rows[i]; + if (row.repeatRowId === sourceRowId && row.repeatIteration !== this.iteration) { + row.repeatIteration = this.iteration; + return row; + } + } + + var copy = angular.copy(sourceRow); + copy.repeat = null; + copy.repeatRowId = sourceRowId; + copy.repeatIteration = this.iteration; + this.dashboard.rows.push(copy); + + // set new panel ids + for (i = 0; i < copy.panels.length; i++) { + panel = copy.panels[i]; + panel.id = this.dashboard.getNextPanelId(); + } + + return copy; + }; + this.repeatRow = function(row, dashboard) { var variables = dashboard.templating.list; var variable = _.findWhere(variables, {name: row.repeat.replace('$', '')}); @@ -96,21 +106,7 @@ function (angular, _) { } _.each(selected, function(option, index) { - if (index > 0) { - copy = angular.copy(row); - copy.repeat = null; - copy.linked = true; - - dashboard.rows.push(copy); - - // set new panel ids - for (i = 0; i < copy.panels.length; i++) { - panel = copy.panels[i]; - panel.id = dashboard.getNextPanelId(); - } - } else { - copy = row; - } + copy = self.getRowClone(row, index); for (i = 0; i < copy.panels.length; i++) { panel = copy.panels[i]; @@ -129,8 +125,7 @@ function (angular, _) { // first try finding an existing clone to use for (var i = 0; i < row.panels.length; i++) { var panel = row.panels[i]; - if (panel.repeatIteration !== this.iteration && - panel.repeatPanelId === sourcePanel.id) { + if (panel.repeatIteration !== this.iteration && panel.repeatPanelId === sourcePanel.id) { panel.repeatIteration = this.iteration; return panel; } diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js index c4e2ff9204c..cba4d6f00ca 100644 --- a/public/test/specs/dynamicDashboardSrv-specs.js +++ b/public/test/specs/dynamicDashboardSrv-specs.js @@ -133,6 +133,33 @@ define([ expect(ctx.rows[0].panels[0].scopedVars.servers.value).to.be('se1'); expect(ctx.rows[1].panels[0].scopedVars.servers.value).to.be('se2'); }); - }); + describe('After a second iteration', function() { + var repeatedRowAfterFirstIteration; + + beforeEach(function() { + repeatedRowAfterFirstIteration = ctx.rows[1]; + ctx.dynamicDashboardSrv.update(ctx.dash); + }); + + it('should still only have 2 rows', function() { + expect(ctx.rows.length).to.be(2); + }); + + it('should reuse row instance', function() { + expect(ctx.rows[1]).to.be(repeatedRowAfterFirstIteration); + }); + }); + + describe('After a second iteration and selected values reduced', function() { + beforeEach(function() { + ctx.dash.templating.list[0].options[1].selected = false; + ctx.dynamicDashboardSrv.update(ctx.dash); + }); + + it('should remove repeated second row', function() { + expect(ctx.rows.length).to.be(1); + }); + }); + }); }); From bcb80eb38f824616915cae7184dda8595ed1d77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 28 Apr 2015 09:26:20 +0200 Subject: [PATCH 064/398] more tweaks --- public/app/panels/graph/module.js | 1 - public/test/specs/dynamicDashboardSrv-specs.js | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/public/app/panels/graph/module.js b/public/app/panels/graph/module.js index 228fab59e03..dfcd5901594 100644 --- a/public/app/panels/graph/module.js +++ b/public/app/panels/graph/module.js @@ -24,7 +24,6 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) { }); module.controller('GraphCtrl', function($scope, $rootScope, panelSrv, annotationsSrv, panelHelper, $q) { - console.log('Graph: init: ' + $scope.panel.id); $scope.panelMeta = new PanelMeta({ panelName: 'Graph', diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js index cba4d6f00ca..62c722cf98e 100644 --- a/public/test/specs/dynamicDashboardSrv-specs.js +++ b/public/test/specs/dynamicDashboardSrv-specs.js @@ -123,12 +123,17 @@ define([ }); it('should mark second row as repeated', function() { - expect(ctx.rows[0].linked).to.be(undefined); expect(ctx.rows[0].repeat).to.be('$servers'); - expect(ctx.rows[1].linked).to.be(true); + }); + + it('should clear repeat field on repeated row', function() { expect(ctx.rows[1].repeat).to.be(null); }); + it('should generate a repeartRowId based on repeat row index', function() { + expect(ctx.rows[1].repeatRowId).to.be(1); + }); + it('should set scopedVars on row panels', function() { expect(ctx.rows[0].panels[0].scopedVars.servers.value).to.be('se1'); expect(ctx.rows[1].panels[0].scopedVars.servers.value).to.be('se2'); From 5768f107695509db96da52e8b4468ff892ddcf18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 28 Apr 2015 10:23:35 +0200 Subject: [PATCH 065/398] More optimizations and unit tests for panel repeats #1888 --- .../features/dashboard/dynamicDashboardSrv.js | 51 ++++++++++++------- .../test/specs/dynamicDashboardSrv-specs.js | 10 ++++ 2 files changed, 44 insertions(+), 17 deletions(-) diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index 391a8d1bf7b..bea79a81d8c 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -64,30 +64,35 @@ function (angular, _) { return sourceRow; } - var i, panel, row; + var i, panel, row, copy; var sourceRowId = _.indexOf(this.dashboard.rows, sourceRow) + 1; // look for row to reuse for (i = 0; i < this.dashboard.rows.length; i++) { row = this.dashboard.rows[i]; if (row.repeatRowId === sourceRowId && row.repeatIteration !== this.iteration) { - row.repeatIteration = this.iteration; - return row; + copy = row; + break; } } - var copy = angular.copy(sourceRow); + if (!copy) { + copy = angular.copy(sourceRow); + this.dashboard.rows.push(copy); + + // set new panel ids + for (i = 0; i < copy.panels.length; i++) { + panel = copy.panels[i]; + panel.id = this.dashboard.getNextPanelId(); + } + + } else { + // update reused instance + } + copy.repeat = null; copy.repeatRowId = sourceRowId; copy.repeatIteration = this.iteration; - this.dashboard.rows.push(copy); - - // set new panel ids - for (i = 0; i < copy.panels.length; i++) { - panel = copy.panels[i]; - panel.id = this.dashboard.getNextPanelId(); - } - return copy; }; @@ -122,16 +127,28 @@ function (angular, _) { return sourcePanel; } + var i, tmpId, panel, clone; + // first try finding an existing clone to use - for (var i = 0; i < row.panels.length; i++) { - var panel = row.panels[i]; + for (i = 0; i < row.panels.length; i++) { + panel = row.panels[i]; if (panel.repeatIteration !== this.iteration && panel.repeatPanelId === sourcePanel.id) { - panel.repeatIteration = this.iteration; - return panel; + clone = panel; + break; } } - var clone = this.dashboard.duplicatePanel(sourcePanel, row); + if (!clone) { + clone = { id: this.dashboard.getNextPanelId() }; + row.panels.push(clone); + } + + // save id + tmpId = clone.id; + // copy properties from source + angular.extend(clone, sourcePanel); + // restore id + clone.id = tmpId; clone.repeatIteration = this.iteration; clone.repeatPanelId = sourcePanel.id; clone.repeat = null; diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js index 62c722cf98e..968a181e288 100644 --- a/public/test/specs/dynamicDashboardSrv-specs.js +++ b/public/test/specs/dynamicDashboardSrv-specs.js @@ -70,6 +70,7 @@ define([ beforeEach(function() { repeatedPanelAfterIteration1 = ctx.rows[0].panels[1]; + ctx.rows[0].panels[0].fill = 10; ctx.dynamicDashboardSrv.update(ctx.dash); }); @@ -77,6 +78,10 @@ define([ expect(ctx.rows[0].panels[1]).to.be(repeatedPanelAfterIteration1); }); + it('reused panel should copy properties from source', function() { + expect(ctx.rows[0].panels[1].fill).to.be(10); + }); + it('should have same panel count', function() { expect(ctx.rows[0].panels.length).to.be(2); }); @@ -144,6 +149,7 @@ define([ beforeEach(function() { repeatedRowAfterFirstIteration = ctx.rows[1]; + ctx.rows[0].height = 500; ctx.dynamicDashboardSrv.update(ctx.dash); }); @@ -151,6 +157,10 @@ define([ expect(ctx.rows.length).to.be(2); }); + it.skip('should have updated props from source', function() { + expect(ctx.rows[1].height).to.be(500); + }); + it('should reuse row instance', function() { expect(ctx.rows[1]).to.be(repeatedRowAfterFirstIteration); }); From f6a61c1ec5229104661ac9b05a62e338bd9cc416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 28 Apr 2015 12:02:39 +0200 Subject: [PATCH 066/398] Changes to unsaved changes service to ignore repeated panels and rows, #1888 --- .../features/dashboard/dynamicDashboardSrv.js | 3 --- .../features/dashboard/unsavedChangesSrv.js | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index bea79a81d8c..2ecd526f795 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -85,9 +85,6 @@ function (angular, _) { panel = copy.panels[i]; panel.id = this.dashboard.getNextPanelId(); } - - } else { - // update reused instance } copy.repeat = null; diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js index 3fd942f1139..97fa3027cfc 100644 --- a/public/app/features/dashboard/unsavedChangesSrv.js +++ b/public/app/features/dashboard/unsavedChangesSrv.js @@ -81,6 +81,26 @@ function(angular, _, config) { }); }; + this.cleanDashboardFromRepeatedPanelsAndRows = function(dash) { + dash.rows = _.filter(dash.rows, function(row) { + if (row.repeatRowId) { + console.log('filtering out row'); + return false; + } + + row.panels = _.filter(row.panels, function(panel) { + if (panel.repeatPanelId) { + return false; + } + // remove scopedVars + panel.scopedVars = null; + return true; + }); + + return true; + }); + }; + this.has_unsaved_changes = function() { if (!self.original) { return false; @@ -106,6 +126,9 @@ function(angular, _, config) { } }); + this.cleanDashboardFromRepeatedPanelsAndRows(current); + this.cleanDashboardFromRepeatedPanelsAndRows(original); + // ignore some panel and row stuff current.forEachPanel(function(panel, panelIndex, row, rowIndex) { var originalRow = original.rows[rowIndex]; From aaea80e0537301b1856c8ba09b2e083b829bb4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 28 Apr 2015 13:45:59 +0200 Subject: [PATCH 067/398] A lot of refactoring opf unsaved changes service so it can be unit tested better --- ' | 47 +++++ .../app/features/dashboard/dashboardCtrl.js | 2 + .../features/dashboard/unsavedChangesSrv.js | 165 ++++++++---------- public/test/specs/unsavedChangesSrv-specs.js | 48 +++++ public/test/test-main.js | 1 + 5 files changed, 175 insertions(+), 88 deletions(-) create mode 100644 ' create mode 100644 public/test/specs/unsavedChangesSrv-specs.js diff --git a/' b/' new file mode 100644 index 00000000000..2b78b586722 --- /dev/null +++ b/' @@ -0,0 +1,47 @@ +define([ + 'features/dashboard/unsavedChangesSrv', + 'features/dashboard/dashboardSrv' +], function() { + 'use strict'; + + describe("unsavedChangesSrv", function() { + var _unsavedChangesSrv; + var _dashboardSrv; + var _location; + var _contextSrvStub = { + isEditor: true + }; + var _rootScope; + var tracker; + + beforeEach(module('grafana.services')); + beforeEach(module(function($provide) { + $provide.value('contextSrv', _contextSrvStub); + })); + + beforeEach(inject(function(unsavedChangesSrv, $location, $rootScope, dashboardSrv) { + _unsavedChangesSrv = unsavedChangesSrv; + _dashboardSrv = dashboardSrv; + _location = $location; + _rootScope = $rootScope; + })); + + describe('when dashboard is modified and route changes', function() { + + beforeEach(function() { + var dash = _dashboardSrv.create({}); + var scope = _rootScope.$new(); + scope.appEvent = sinon.spy(); + scope.onAppEvent = sinon.spy(); + tracker = _unsavedChangesSrv.constructor(dash, scope); + }); + + it('No changes should not have changes', function() { + expect(tracker.hasChanges()).to.be(false); + }); + + }); + + }); + +}); diff --git a/public/app/features/dashboard/dashboardCtrl.js b/public/app/features/dashboard/dashboardCtrl.js index 41453bd77e3..f81b808a0e1 100644 --- a/public/app/features/dashboard/dashboardCtrl.js +++ b/public/app/features/dashboard/dashboardCtrl.js @@ -17,6 +17,7 @@ function (angular, $, config) { templateValuesSrv, dynamicDashboardSrv, dashboardSrv, + unsavedChangesSrv, dashboardViewStateSrv, contextSrv, $timeout) { @@ -48,6 +49,7 @@ function (angular, $, config) { // the rest of the dashboard can load templateValuesSrv.init(dashboard).finally(function() { dynamicDashboardSrv.init(dashboard); + unsavedChangesSrv.init(dashboard, $scope); $scope.dashboard = dashboard; $scope.dashboardMeta = dashboard.meta; diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js index 97fa3027cfc..8c1862674e7 100644 --- a/public/app/features/dashboard/unsavedChangesSrv.js +++ b/public/app/features/dashboard/unsavedChangesSrv.js @@ -1,90 +1,68 @@ define([ 'angular', 'lodash', - 'config', ], -function(angular, _, config) { +function(angular, _) { 'use strict'; - if (!config.unsaved_changes_warning) { - return; - } - var module = angular.module('grafana.services'); - module.service('unsavedChangesSrv', function($rootScope, $modal, $q, $location, $timeout, contextSrv) { + module.service('unsavedChangesSrv', function($modal, $q, $location, $timeout, contextSrv, $window) { - var self = this; - var modalScope = $rootScope.$new(); + function Tracker(dashboard, scope) { + var self = this; - $rootScope.$on("dashboard-loaded", function(event, newDashboard) { - // wait for different services to patch the dashboard (missing properties) - $timeout(function() { - self.original = newDashboard.getSaveModelClone(); - self.current = newDashboard; - }, 1200); - }); + this.original = dashboard.getSaveModelClone(); + this.current = dashboard; + this.originalPath = $location.path(); + this.scope = scope; - $rootScope.$on("dashboard-saved", function(event, savedDashboard) { - self.original = savedDashboard.getSaveModelClone(); - self.current = savedDashboard; - self.orignalPath = $location.path(); - }); + // register events + scope.onAppEvent('dashboard-saved', function() { + self.original = self.current.getSaveModelClone(); + self.originalPath = $location.path(); + }); - $rootScope.$on("$routeChangeSuccess", function() { - self.original = null; - self.originalPath = $location.path(); - }); + $window.onbeforeunload = function() { + if (self.ignoreChanges()) { return; } + if (self.hasChanges()) { + return "There are unsaved changes to this dashboard"; + } + }; - this.ignoreChanges = function() { - if (!contextSrv.isEditor) { return true; } - if (!self.current || !self.current.meta) { return true; } - - var meta = self.current.meta; - return !meta.canSave || meta.fromScript || meta.fromFile; - }; - - window.onbeforeunload = function() { - if (self.ignoreChanges()) { return; } - if (self.has_unsaved_changes()) { - return "There are unsaved changes to this dashboard"; - } - }; - - this.init = function() { - $rootScope.$on("$locationChangeStart", function(event, next) { + scope.$on("$locationChangeStart", function(event, next) { // check if we should look for changes if (self.originalPath === $location.path()) { return true; } if (self.ignoreChanges()) { return true; } - if (self.has_unsaved_changes()) { + if (self.hasChanges()) { event.preventDefault(); self.next = next; - $timeout(self.open_modal); + $timeout(function() { + self.open_modal(); + }); } }); + } + + var p = Tracker.prototype; + + // for some dashboards and users + // changes should be ignored + p.ignoreChanges = function() { + if (!this.original) { return false; } + if (!contextSrv.isEditor) { return true; } + if (!this.current || !this.current.meta) { return true; } + + var meta = this.current.meta; + return !meta.canSave || meta.fromScript || meta.fromFile; }; - this.open_modal = function() { - var confirmModal = $modal({ - template: './app/partials/unsaved-changes.html', - modalClass: 'confirm-modal', - persist: true, - show: false, - scope: modalScope, - keyboard: false - }); - - $q.when(confirmModal).then(function(modalEl) { - modalEl.modal('show'); - }); - }; - - this.cleanDashboardFromRepeatedPanelsAndRows = function(dash) { + // remove stuff that should not count in diff + p.cleanDashboardFromIgnoredChanges = function(dash) { dash.rows = _.filter(dash.rows, function(row) { if (row.repeatRowId) { - console.log('filtering out row'); return false; } @@ -101,13 +79,9 @@ function(angular, _, config) { }); }; - this.has_unsaved_changes = function() { - if (!self.original) { - return false; - } - - var current = self.current.getSaveModelClone(); - var original = self.original; + p.hasChanges = function() { + var current = this.current.getSaveModelClone(); + var original = this.original; // ignore timespan changes current.time = original.time = {}; @@ -126,8 +100,8 @@ function(angular, _, config) { } }); - this.cleanDashboardFromRepeatedPanelsAndRows(current); - this.cleanDashboardFromRepeatedPanelsAndRows(original); + this.cleanDashboardFromIgnoredChanges(current); + this.cleanDashboardFromIgnoredChanges(original); // ignore some panel and row stuff current.forEachPanel(function(panel, panelIndex, row, rowIndex) { @@ -165,28 +139,43 @@ function(angular, _, config) { return false; }; - this.goto_next = function() { + p.open_modal = function() { + var tracker = this; + + var modalScope = this.scope.$new(); + modalScope.ignore = function() { + tracker.original = null; + tracker.goto_next(); + }; + + modalScope.save = function() { + tracker.scope.$emit('save-dashboard'); + }; + + var confirmModal = $modal({ + template: './app/partials/unsaved-changes.html', + modalClass: 'confirm-modal', + persist: false, + show: false, + scope: modalScope, + keyboard: false + }); + + $q.when(confirmModal).then(function(modalEl) { + modalEl.modal('show'); + }); + }; + + p.goto_next = function() { var baseLen = $location.absUrl().length - $location.url().length; - var nextUrl = self.next.substring(baseLen); + var nextUrl = this.next.substring(baseLen); $location.url(nextUrl); }; - modalScope.ignore = function() { - self.original = null; - self.goto_next(); + this.Tracker = Tracker; + this.init = function(dashboard, scope) { + // wait for different services to patch the dashboard (missing properties) + $timeout(function() { new Tracker(dashboard, scope); }, 1200); }; - - modalScope.save = function() { - var unregister = $rootScope.$on('dashboard-saved', function() { - self.goto_next(); - }); - - $timeout(unregister, 2000); - - $rootScope.$emit('save-dashboard'); - }; - - }).run(function(unsavedChangesSrv) { - unsavedChangesSrv.init(); }); }); diff --git a/public/test/specs/unsavedChangesSrv-specs.js b/public/test/specs/unsavedChangesSrv-specs.js new file mode 100644 index 00000000000..33691e17a0b --- /dev/null +++ b/public/test/specs/unsavedChangesSrv-specs.js @@ -0,0 +1,48 @@ +define([ + 'features/dashboard/unsavedChangesSrv', + 'features/dashboard/dashboardSrv' +], function() { + 'use strict'; + + describe("unsavedChangesSrv", function() { + var _unsavedChangesSrv; + var _dashboardSrv; + var _location; + var _contextSrvStub = { isEditor: true }; + var _rootScope; + var tracker; + var dash; + var scope; + + beforeEach(module('grafana.services')); + beforeEach(module(function($provide) { + $provide.value('contextSrv', _contextSrvStub); + })); + + beforeEach(inject(function(unsavedChangesSrv, $location, $rootScope, dashboardSrv) { + _unsavedChangesSrv = unsavedChangesSrv; + _dashboardSrv = dashboardSrv; + _location = $location; + _rootScope = $rootScope; + })); + + beforeEach(function() { + dash = _dashboardSrv.create({}); + scope = _rootScope.$new(); + scope.appEvent = sinon.spy(); + scope.onAppEvent = sinon.spy(); + + tracker = new _unsavedChangesSrv.Tracker(dash, scope); + }); + + it('No changes should not have changes', function() { + expect(tracker.hasChanges()).to.be(false); + }); + + it('Simple change should be registered', function() { + dash.property = "google"; + expect(tracker.hasChanges()).to.be(true); + }); + + }); +}); diff --git a/public/test/test-main.js b/public/test/test-main.js index 2dc85cc65ef..9f69735d782 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -141,6 +141,7 @@ require([ 'specs/dashboardViewStateSrv-specs', 'specs/soloPanelCtrl-specs', 'specs/dynamicDashboardSrv-specs', + 'specs/unsavedChangesSrv-specs', ]; var pluginSpecs = (config.plugins.specs || []).map(function (spec) { From 14e8c15a3abffa1d52236d8fc5665d3c0fa73cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 28 Apr 2015 16:42:40 +0200 Subject: [PATCH 068/398] Lots of new unit tests for unsaved changes service --- ' | 47 --------------- .../features/dashboard/unsavedChangesSrv.js | 59 ++++++++----------- public/test/specs/unsavedChangesSrv-specs.js | 38 +++++++++++- 3 files changed, 60 insertions(+), 84 deletions(-) delete mode 100644 ' diff --git a/' b/' deleted file mode 100644 index 2b78b586722..00000000000 --- a/' +++ /dev/null @@ -1,47 +0,0 @@ -define([ - 'features/dashboard/unsavedChangesSrv', - 'features/dashboard/dashboardSrv' -], function() { - 'use strict'; - - describe("unsavedChangesSrv", function() { - var _unsavedChangesSrv; - var _dashboardSrv; - var _location; - var _contextSrvStub = { - isEditor: true - }; - var _rootScope; - var tracker; - - beforeEach(module('grafana.services')); - beforeEach(module(function($provide) { - $provide.value('contextSrv', _contextSrvStub); - })); - - beforeEach(inject(function(unsavedChangesSrv, $location, $rootScope, dashboardSrv) { - _unsavedChangesSrv = unsavedChangesSrv; - _dashboardSrv = dashboardSrv; - _location = $location; - _rootScope = $rootScope; - })); - - describe('when dashboard is modified and route changes', function() { - - beforeEach(function() { - var dash = _dashboardSrv.create({}); - var scope = _rootScope.$new(); - scope.appEvent = sinon.spy(); - scope.onAppEvent = sinon.spy(); - tracker = _unsavedChangesSrv.constructor(dash, scope); - }); - - it('No changes should not have changes', function() { - expect(tracker.hasChanges()).to.be(false); - }); - - }); - - }); - -}); diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js index 8c1862674e7..fe45fbe48ba 100644 --- a/public/app/features/dashboard/unsavedChangesSrv.js +++ b/public/app/features/dashboard/unsavedChangesSrv.js @@ -61,6 +61,12 @@ function(angular, _) { // remove stuff that should not count in diff p.cleanDashboardFromIgnoredChanges = function(dash) { + // ignore time and refresh + dash.time = 0; + dash.refresh = 0; + dash.version = 0; + + // filter row and panels properties that should be ignored dash.rows = _.filter(dash.rows, function(row) { if (row.repeatRowId) { return false; @@ -70,58 +76,39 @@ function(angular, _) { if (panel.repeatPanelId) { return false; } + // remove scopedVars panel.scopedVars = null; + + // ignore panel legend sort + if (panel.legend) { + delete panel.legend.sort; + delete panel.legend.sortDesc; + } + return true; }); + // ignore collapse state + row.collapse = false; return true; }); + + // ignore template variable values + _.each(dash.templating.list, function(value) { + value.current = null; + value.options = null; + }); + }; p.hasChanges = function() { var current = this.current.getSaveModelClone(); var original = this.original; - // ignore timespan changes - current.time = original.time = {}; - current.refresh = original.refresh; - // ignore version - current.version = original.version; - - // ignore template variable values - _.each(current.templating.list, function(value, index) { - value.current = null; - value.options = null; - - if (original.templating.list.length > index) { - original.templating.list[index].current = null; - original.templating.list[index].options = null; - } - }); - this.cleanDashboardFromIgnoredChanges(current); this.cleanDashboardFromIgnoredChanges(original); - // ignore some panel and row stuff - current.forEachPanel(function(panel, panelIndex, row, rowIndex) { - var originalRow = original.rows[rowIndex]; - var originalPanel = original.getPanelById(panel.id); - // ignore row collapse state - if (originalRow) { - row.collapse = originalRow.collapse; - } - if (originalPanel) { - // ignore graph legend sort - if (originalPanel.legend && panel.legend) { - delete originalPanel.legend.sortDesc; - delete originalPanel.legend.sort; - delete panel.legend.sort; - delete panel.legend.sortDesc; - } - } - }); - var currentTimepicker = _.findWhere(current.nav, { type: 'timepicker' }); var originalTimepicker = _.findWhere(original.nav, { type: 'timepicker' }); diff --git a/public/test/specs/unsavedChangesSrv-specs.js b/public/test/specs/unsavedChangesSrv-specs.js index 33691e17a0b..43cb3ab0e63 100644 --- a/public/test/specs/unsavedChangesSrv-specs.js +++ b/public/test/specs/unsavedChangesSrv-specs.js @@ -17,6 +17,7 @@ define([ beforeEach(module('grafana.services')); beforeEach(module(function($provide) { $provide.value('contextSrv', _contextSrvStub); + $provide.value('$window', {}); })); beforeEach(inject(function(unsavedChangesSrv, $location, $rootScope, dashboardSrv) { @@ -27,7 +28,13 @@ define([ })); beforeEach(function() { - dash = _dashboardSrv.create({}); + dash = _dashboardSrv.create({ + rows: [ + { + panels: [{ test: "asd", legend: { } }] + } + ] + }); scope = _rootScope.$new(); scope.appEvent = sinon.spy(); scope.onAppEvent = sinon.spy(); @@ -44,5 +51,34 @@ define([ expect(tracker.hasChanges()).to.be(true); }); + it('Should ignore a lot of changes', function() { + dash.time = {from: '1h'}; + dash.refresh = true; + dash.version = 10; + dash.rows[0].collapse = true; + expect(tracker.hasChanges()).to.be(false); + }); + + it('Should ignore row collapse change', function() { + dash.rows[0].collapse = true; + expect(tracker.hasChanges()).to.be(false); + }); + + it('Should ignore panel legend changes', function() { + dash.rows[0].panels[0].legend.sortDesc = true; + dash.rows[0].panels[0].legend.sort = "avg"; + expect(tracker.hasChanges()).to.be(false); + }); + + it('Should ignore panel repeats', function() { + dash.rows[0].panels.push({repeatPanelId: 10}); + expect(tracker.hasChanges()).to.be(false); + }); + + it('Should ignore row repeats', function() { + dash.rows.push({repeatRowId: 10}); + expect(tracker.hasChanges()).to.be(false); + }); + }); }); From 53cb0feda9ffd176c3f5700a2958606142162ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 28 Apr 2015 17:28:34 +0200 Subject: [PATCH 069/398] Various fixes, restored search auto focus --- public/app/directives/giveFocus.js | 26 +++++++++++++++++++ .../features/dashboard/unsavedChangesSrv.js | 2 +- public/test/specs/unsavedChangesSrv-specs.js | 3 +-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/public/app/directives/giveFocus.js b/public/app/directives/giveFocus.js index e69de29bb2d..ef395d27fbd 100644 --- a/public/app/directives/giveFocus.js +++ b/public/app/directives/giveFocus.js @@ -0,0 +1,26 @@ +define([ + 'angular' +], +function (angular) { + 'use strict'; + + angular.module('grafana.directives').directive('giveFocus', function() { + return function(scope, element, attrs) { + element.click(function(e) { + e.stopPropagation(); + }); + + scope.$watch(attrs.giveFocus,function (newValue) { + if (!newValue) { + return; + } + setTimeout(function() { + element.focus(); + var pos = element.val().length * 2; + element[0].setSelectionRange(pos, pos); + }, 200); + },true); + }; + }); + +}); diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js index fe45fbe48ba..11a806c865d 100644 --- a/public/app/features/dashboard/unsavedChangesSrv.js +++ b/public/app/features/dashboard/unsavedChangesSrv.js @@ -64,7 +64,7 @@ function(angular, _) { // ignore time and refresh dash.time = 0; dash.refresh = 0; - dash.version = 0; + dash.schemaVersion = 0; // filter row and panels properties that should be ignored dash.rows = _.filter(dash.rows, function(row) { diff --git a/public/test/specs/unsavedChangesSrv-specs.js b/public/test/specs/unsavedChangesSrv-specs.js index 43cb3ab0e63..4ec2a8f82a1 100644 --- a/public/test/specs/unsavedChangesSrv-specs.js +++ b/public/test/specs/unsavedChangesSrv-specs.js @@ -54,8 +54,7 @@ define([ it('Should ignore a lot of changes', function() { dash.time = {from: '1h'}; dash.refresh = true; - dash.version = 10; - dash.rows[0].collapse = true; + dash.schemaVersion = 10; expect(tracker.hasChanges()).to.be(false); }); From 8c14e565a7bdee9619dbf396d7b9a560fa37b2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 28 Apr 2015 17:54:22 +0200 Subject: [PATCH 070/398] Restored the variable color for the label/name in the submenu --- public/app/directives/templateParamSelector.js | 8 ++------ .../features/dashboard/partials/variableValueSelect.html | 3 +++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/public/app/directives/templateParamSelector.js b/public/app/directives/templateParamSelector.js index 3d7a9f964d4..629c3ececcc 100644 --- a/public/app/directives/templateParamSelector.js +++ b/public/app/directives/templateParamSelector.js @@ -99,12 +99,8 @@ function (angular, app, _) { }; scope.updateLinkText = function() { - scope.linkText = ""; - if (!variable.hideLabel) { - scope.linkText = (variable.label || variable.name) + ': '; - } - - scope.linkText += variable.current.text; + scope.labelText = variable.label || '$' + variable.name; + scope.linkText = variable.current.text; }; scope.$watchGroup(['variable.hideLabel', 'variable.name', 'variable.label', 'variable.current.text'], function() { diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index 1904aa598ee..058500c495c 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -1,3 +1,6 @@ + + {{labelText}}: + {{linkText}} From c4ac3d61b167a2286d133267023e0890d38a66d4 Mon Sep 17 00:00:00 2001 From: davidak Date: Tue, 28 Apr 2015 20:53:29 +0200 Subject: [PATCH 071/398] add gigabytes as unit --- public/app/components/kbn.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/app/components/kbn.js b/public/app/components/kbn.js index fa2b8214873..652b7d6c923 100644 --- a/public/app/components/kbn.js +++ b/public/app/components/kbn.js @@ -376,6 +376,7 @@ function($, _, moment) { kbn.valueFormats.bytes = kbn.formatFuncCreator(1024, [' B', ' KiB', ' MiB', ' GiB', ' TiB', ' PiB', ' EiB', ' ZiB', ' YiB']); kbn.valueFormats.kbytes = kbn.formatFuncCreator(1024, [' KiB', ' MiB', ' GiB', ' TiB', ' PiB', ' EiB', ' ZiB', ' YiB']); kbn.valueFormats.mbytes = kbn.formatFuncCreator(1024, [' MiB', ' GiB', ' TiB', ' PiB', ' EiB', ' ZiB', ' YiB']); + kbn.valueFormats.gbytes = kbn.formatFuncCreator(1024, [' GiB', ' TiB', ' PiB', ' EiB', ' ZiB', ' YiB']); kbn.valueFormats.bps = kbn.formatFuncCreator(1000, [' bps', ' Kbps', ' Mbps', ' Gbps', ' Tbps', ' Pbps', ' Ebps', ' Zbps', ' Ybps']); kbn.valueFormats.Bps = kbn.formatFuncCreator(1000, [' Bps', ' KBps', ' MBps', ' GBps', ' TBps', ' PBps', ' EBps', ' ZBps', ' YBps']); kbn.valueFormats.short = kbn.formatFuncCreator(1000, ['', ' K', ' Mil', ' Bil', ' Tri', ' Qaudr', ' Quint', ' Sext', ' Sept']); @@ -547,6 +548,7 @@ function($, _, moment) { {text: 'bytes', value: 'bytes'}, {text: 'kilobytes', value: 'kbytes'}, {text: 'megabytes', value: 'mbytes'}, + {text: 'gigabytes', value: 'gbytes'}, ] }, { From e5844afb0f394876b5396923a59d56fd96695e65 Mon Sep 17 00:00:00 2001 From: David Raifaizen Date: Tue, 28 Apr 2015 16:29:32 -0400 Subject: [PATCH 072/398] Corrected missing annotations: true tag from the influxdb9 plugin json and fixed influxseries data handling --- .../datasource/influxdb/influxSeries.js | 21 +++++++------------ .../plugins/datasource/influxdb/plugin.json | 3 ++- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/influxSeries.js b/public/app/plugins/datasource/influxdb/influxSeries.js index 9e28884547b..cca01459fc4 100644 --- a/public/app/plugins/datasource/influxdb/influxSeries.js +++ b/public/app/plugins/datasource/influxdb/influxSeries.js @@ -5,7 +5,8 @@ function (_) { 'use strict'; function InfluxSeries(options) { - this.seriesList = options.seriesList; + this.seriesList = options.seriesList && options.seriesList.results && options.seriesList.results.length > 0 + ? options.seriesList.results[0].series || [] : []; this.alias = options.alias; this.annotation = options.annotation; } @@ -17,12 +18,10 @@ function (_) { var self = this; console.log(self.seriesList); - if (!self.seriesList || !self.seriesList.results || !self.seriesList.results[0]) { + if (self.seriesList.length === 0) { return output; } - this.seriesList = self.seriesList.results[0].series; - _.each(self.seriesList, function(series) { var datapoints = []; for (var i = 0; i < series.values.length; i++) { @@ -63,19 +62,15 @@ function (_) { if (column === self.annotation.textColumn) { textCol = index; return; } }); - _.each(series.points, function (point) { + _.each(series.values, function (value) { var data = { annotation: self.annotation, - time: point[timeCol], - title: point[titleCol], - tags: point[tagsCol], - text: point[textCol] + time: + new Date(value[timeCol]), + title: value[titleCol], + tags: value[tagsCol], + text: value[textCol] }; - if (tagsCol) { - data.tags = point[tagsCol]; - } - list.push(data); }); }); diff --git a/public/app/plugins/datasource/influxdb/plugin.json b/public/app/plugins/datasource/influxdb/plugin.json index 40c5fc9cea9..c93b41747a7 100644 --- a/public/app/plugins/datasource/influxdb/plugin.json +++ b/public/app/plugins/datasource/influxdb/plugin.json @@ -13,5 +13,6 @@ "annotations": "app/plugins/datasource/influxdb/partials/annotations.editor.html" }, - "metrics": true + "metrics": true, + "annotations": true } From a0dad3897479533eb8b8b181404876306f4e278a Mon Sep 17 00:00:00 2001 From: Ian Danforth Date: Tue, 28 Apr 2015 15:09:22 -0700 Subject: [PATCH 073/398] Correct deb version number in install guide. --- docs/sources/installation/debian.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 4bba51ec530..c2594e38445 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -16,7 +16,7 @@ Description | Download $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.2_amd64.deb $ sudo apt-get install -y adduser libfontconfig - $ sudo dpkg -i grafana_2.0.1_amd64.deb + $ sudo dpkg -i grafana_2.0.2_amd64.deb ## APT Repository Add the following line to your `/etc/apt/sources.list` From 7ea579bb71cf1d505c815d5907b4d8910772a488 Mon Sep 17 00:00:00 2001 From: Garrett Bjerkhoel Date: Tue, 28 Apr 2015 20:19:48 -0700 Subject: [PATCH 074/398] Add team_ids configuration option --- conf/defaults.ini | 1 + pkg/social/social.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 6bb3fb80857..7345f18520e 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -140,6 +140,7 @@ enabled = false client_id = some_id client_secret = some_secret scopes = user:email +team_ids = auth_url = https://github.com/login/oauth/authorize token_url = https://github.com/login/oauth/access_token api_url = https://api.github.com/user diff --git a/pkg/social/social.go b/pkg/social/social.go index 47c7ea5dc38..c19784e34e1 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -75,7 +75,8 @@ func NewOAuthService() { // GitHub. if name == "github" { setting.OAuthService.GitHub = true - SocialMap["github"] = &SocialGithub{Config: &config, allowedDomains: info.AllowedDomains, ApiUrl: info.ApiUrl, allowSignup: info.AllowSignup} + teamIds := sec.Key("team_ids").Ints(",") + SocialMap["github"] = &SocialGithub{Config: &config, allowedDomains: info.AllowedDomains, ApiUrl: info.ApiUrl, allowSignup: info.AllowSignup, teamIds: teamIds} } // Google. @@ -105,6 +106,7 @@ type SocialGithub struct { allowedDomains []string ApiUrl string allowSignup bool + teamIds []int } func (s *SocialGithub) Type() int { From 979d0ca70f5aec638ce6e6bb8c8f69f47973f221 Mon Sep 17 00:00:00 2001 From: Garrett Bjerkhoel Date: Tue, 28 Apr 2015 20:21:44 -0700 Subject: [PATCH 075/398] Add new error type for team membership permissions --- pkg/social/social.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/social/social.go b/pkg/social/social.go index c19784e34e1..752ed7114c2 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -5,6 +5,7 @@ import ( "fmt" "strconv" "strings" + "errors" "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" @@ -109,6 +110,10 @@ type SocialGithub struct { teamIds []int } +var ( + ErrMissingTeamMembership = errors.New("User not a member of one of the required teams") +) + func (s *SocialGithub) Type() int { return int(models.GITHUB) } From eb37fc089b01aba3d046635e60596e8d82dc1601 Mon Sep 17 00:00:00 2001 From: Garrett Bjerkhoel Date: Tue, 28 Apr 2015 20:22:21 -0700 Subject: [PATCH 076/398] Check for active team membership when fetching s.UserInfo --- pkg/social/social.go | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/pkg/social/social.go b/pkg/social/social.go index 752ed7114c2..2b716495d53 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -6,6 +6,7 @@ import ( "strconv" "strings" "errors" + "net/http" "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" @@ -126,6 +127,28 @@ func (s *SocialGithub) IsSignupAllowed() bool { return s.allowSignup } +func (s *SocialGithub) IsTeamMember(client *http.Client, username string, teamId int) bool { + var data struct { + Url string `json:"url"` + State string `json:"state"` + } + + membershipUrl := fmt.Sprintf("https://api.github.com/teams/%d/memberships/%s", teamId, username) + r, err := client.Get(membershipUrl) + if err != nil { + return false + } + + defer r.Body.Close() + + if err = json.NewDecoder(r.Body).Decode(&data); err != nil { + return false + } + + active := data.State == "active" + return active +} + func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { var data struct { Id int `json:"id"` @@ -146,11 +169,23 @@ func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { return nil, err } - return &BasicUserInfo{ + userInfo := &BasicUserInfo{ Identity: strconv.Itoa(data.Id), Name: data.Name, Email: data.Email, - }, nil + } + + if len(s.teamIds) > 0 { + for _, teamId := range s.teamIds { + if s.IsTeamMember(client, data.Name, teamId) { + return userInfo, nil + } + } + + return nil, ErrMissingTeamMembership + } else { + return userInfo, nil + } } // ________ .__ From 1d7f9452685f5f2d41224afbf659bb922636a8bc Mon Sep 17 00:00:00 2001 From: Garrett Bjerkhoel Date: Tue, 28 Apr 2015 20:22:45 -0700 Subject: [PATCH 077/398] Handle special error case if connect.UserInfo returns an error --- pkg/api/login_oauth.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go index 11d62754a18..d89a7237d35 100644 --- a/pkg/api/login_oauth.go +++ b/pkg/api/login_oauth.go @@ -45,7 +45,11 @@ func OAuthLogin(ctx *middleware.Context) { userInfo, err := connect.UserInfo(token) if err != nil { - ctx.Handle(500, fmt.Sprintf("login.OAuthLogin(get info from %s)", name), err) + if err == social.ErrMissingTeamMembership { + ctx.Redirect(setting.AppSubUrl + "/login?missing_team_membership=1") + } else { + ctx.Handle(500, fmt.Sprintf("login.OAuthLogin(get info from %s)", name), err) + } return } From 1fdc5277ae875b50ee680dcc7f162ef716cdc9c4 Mon Sep 17 00:00:00 2001 From: Garrett Bjerkhoel Date: Tue, 28 Apr 2015 20:38:05 -0700 Subject: [PATCH 078/398] Update documentation for team_ids option --- docs/sources/installation/configuration.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index a79a8494d73..a1dfb6ac035 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -179,6 +179,7 @@ Client ID and a Client Secret. Specify these in the grafana config file. Example client_id = YOUR_GITHUB_APP_CLIENT_ID client_secret = YOUR_GITHUB_APP_CLIENT_SECRET scopes = user:email + team_ids = auth_url = https://github.com/login/oauth/authorize token_url = https://github.com/login/oauth/access_token allow_sign_up = false @@ -189,6 +190,21 @@ now login or signup with your github accounts. You may allow users to sign-up via github auth by setting allow_sign_up to true. When this option is set to true, any user successfully authenticating via github auth will be automatically signed up. +### team_ids +Require an active team membership for at least one of the given teams on GitHub. +If the authenticated user isn't a member of at least one the teams they will not +be able to register or authenticate with your Grafana instance. Example: + + [auth.github] + enabled = true + client_id = YOUR_GITHUB_APP_CLIENT_ID + client_secret = YOUR_GITHUB_APP_CLIENT_SECRET + scopes = user:email + team_ids = 150,300 + auth_url = https://github.com/login/oauth/authorize + token_url = https://github.com/login/oauth/access_token + allow_sign_up = false + ## [auth.google] You need to create a google project. You can do this in the [Google Developer Console](https://console.developers.google.com/project). When you create the project you will need to specify a callback URL. Specify this as callback: @@ -257,5 +273,3 @@ enabled. Counters are sent every 24 hours. Default value is `true`. ### google_analytics_ua_id If you want to track Grafana usage via Google analytics specify *your* Univeral Analytics ID here. By defualt this feature is disabled. - - From b72eba1ef223e2476ab4a04663ad74da1b58d1a6 Mon Sep 17 00:00:00 2001 From: Anthony Woods Date: Wed, 29 Apr 2015 14:55:39 +0800 Subject: [PATCH 079/398] refactor handling of refresh when urlValues being used for templates. fixes #1862 --- .../features/templating/templateValuesSrv.js | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 3df2c831b6f..10ff556bf84 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -28,17 +28,11 @@ function (angular, _, kbn) { for (var i = 0; i < this.variables.length; i++) { var variable = this.variables[i]; var urlValue = queryParams['var-' + variable.name]; - if (variable.refresh) { - promises.push(this.updateOptions(variable)); - } if (urlValue !== void 0) { - var option = _.findWhere(variable.options, { text: urlValue }); - option = option || { text: urlValue, value: urlValue }; - - var promise = this.setVariableValue(variable, option, true); - this.updateAutoInterval(variable); - - promises.push(promise); + promises.push(this.setVariableFromUrl(variable, urlValue)); + } + else if (variable.refresh) { + promises.push(this.updateOptions(variable)); } else if (variable.type === 'interval') { this.updateAutoInterval(variable); @@ -48,6 +42,25 @@ function (angular, _, kbn) { return $q.all(promises); }; + this.setVariableFromUrl = function(variable, urlValue) { + if (variable.refresh) { + var self = this; + //refresh the list of options before setting the value + return this.updateOptions(variable).then(function() { + var option = _.findWhere(variable.options, { text: urlValue }); + option = option || { text: urlValue, value: urlValue }; + + self.updateAutoInterval(variable); + return self.setVariableValue(variable, option); + }); + } + var option = _.findWhere(variable.options, { text: urlValue }); + option = option || { text: urlValue, value: urlValue }; + + this.updateAutoInterval(variable); + return this.setVariableValue(variable, option); + }; + this.updateAutoInterval = function(variable) { if (!variable.auto) { return; } From 81636d8634fa21f60a867ca4a11a270df883d473 Mon Sep 17 00:00:00 2001 From: Anthony Woods Date: Wed, 29 Apr 2015 15:14:49 +0800 Subject: [PATCH 080/398] expose orgId via currentUser object. fixes #1907 --- pkg/api/dtos/models.go | 1 + pkg/api/index.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go index 0057f78ff0d..a14ff55c079 100644 --- a/pkg/api/dtos/models.go +++ b/pkg/api/dtos/models.go @@ -23,6 +23,7 @@ type CurrentUser struct { LightTheme bool `json:"lightTheme"` OrgRole m.RoleType `json:"orgRole"` OrgName string `json:"orgName"` + OrgId int64 `json:"orgId"` IsGrafanaAdmin bool `json:"isGrafanaAdmin"` GravatarUrl string `json:"gravatarUrl"` } diff --git a/pkg/api/index.go b/pkg/api/index.go index d9ecf65b699..6e880b1d066 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -20,6 +20,7 @@ func setIndexViewData(c *middleware.Context) error { LightTheme: c.Theme == "light", OrgName: c.OrgName, OrgRole: c.OrgRole, + OrgId: c.OrgId, GravatarUrl: dtos.GetGravatarUrl(c.Email), IsGrafanaAdmin: c.IsGrafanaAdmin, } From e7c43bf614ae380c99f9cf09b4bdbb100088efad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 09:26:12 +0200 Subject: [PATCH 081/398] expose org id to frontend, Closes #1907 --- pkg/api/dtos/models.go | 3 ++- pkg/api/index.go | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go index 0057f78ff0d..fea88f07550 100644 --- a/pkg/api/dtos/models.go +++ b/pkg/api/dtos/models.go @@ -21,8 +21,9 @@ type CurrentUser struct { Email string `json:"email"` Name string `json:"name"` LightTheme bool `json:"lightTheme"` - OrgRole m.RoleType `json:"orgRole"` + OrgId int64 `json:"orgId"` OrgName string `json:"orgName"` + OrgRole m.RoleType `json:"orgRole"` IsGrafanaAdmin bool `json:"isGrafanaAdmin"` GravatarUrl string `json:"gravatarUrl"` } diff --git a/pkg/api/index.go b/pkg/api/index.go index d9ecf65b699..86a5e3f1882 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -18,6 +18,7 @@ func setIndexViewData(c *middleware.Context) error { Email: c.Email, Name: c.Name, LightTheme: c.Theme == "light", + OrgId: c.OrgId, OrgName: c.OrgName, OrgRole: c.OrgRole, GravatarUrl: dtos.GetGravatarUrl(c.Email), From 884dc53f8a7bf963e802eb551fc845749516d6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 09:49:22 +0200 Subject: [PATCH 082/398] =?UTF-8?q?smal=C4=BA=20refactorings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/social/social.go | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkg/social/social.go b/pkg/social/social.go index 2b716495d53..355f85b54b6 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -2,11 +2,11 @@ package social import ( "encoding/json" + "errors" "fmt" + "net/http" "strconv" "strings" - "errors" - "net/http" "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" @@ -78,13 +78,23 @@ func NewOAuthService() { if name == "github" { setting.OAuthService.GitHub = true teamIds := sec.Key("team_ids").Ints(",") - SocialMap["github"] = &SocialGithub{Config: &config, allowedDomains: info.AllowedDomains, ApiUrl: info.ApiUrl, allowSignup: info.AllowSignup, teamIds: teamIds} + SocialMap["github"] = &SocialGithub{ + Config: &config, + allowedDomains: info.AllowedDomains, + apiUrl: info.ApiUrl, + allowSignup: info.AllowSignup, + teamIds: teamIds, + } } // Google. if name == "google" { setting.OAuthService.Google = true - SocialMap["google"] = &SocialGoogle{Config: &config, allowedDomains: info.AllowedDomains, ApiUrl: info.ApiUrl, allowSignup: info.AllowSignup} + SocialMap["google"] = &SocialGoogle{ + Config: &config, allowedDomains: info.AllowedDomains, + apiUrl: info.ApiUrl, + allowSignup: info.AllowSignup, + } } } } @@ -106,7 +116,7 @@ func isEmailAllowed(email string, allowedDomains []string) bool { type SocialGithub struct { *oauth2.Config allowedDomains []string - ApiUrl string + apiUrl string allowSignup bool teamIds []int } @@ -129,8 +139,8 @@ func (s *SocialGithub) IsSignupAllowed() bool { func (s *SocialGithub) IsTeamMember(client *http.Client, username string, teamId int) bool { var data struct { - Url string `json:"url"` - State string `json:"state"` + Url string `json:"url"` + State string `json:"state"` } membershipUrl := fmt.Sprintf("https://api.github.com/teams/%d/memberships/%s", teamId, username) @@ -158,7 +168,7 @@ func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { var err error client := s.Client(oauth2.NoContext, token) - r, err := client.Get(s.ApiUrl) + r, err := client.Get(s.apiUrl) if err != nil { return nil, err } @@ -198,7 +208,7 @@ func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { type SocialGoogle struct { *oauth2.Config allowedDomains []string - ApiUrl string + apiUrl string allowSignup bool } @@ -223,7 +233,7 @@ func (s *SocialGoogle) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { var err error client := s.Client(oauth2.NoContext, token) - r, err := client.Get(s.ApiUrl) + r, err := client.Get(s.apiUrl) if err != nil { return nil, err } From 32fa8180fa2bc3c57192a6dce93e34cc4761ad35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 09:52:52 +0200 Subject: [PATCH 083/398] Github OAuth: You can now configure a Github team membership requirement, Closes #1731 --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9133bf8601..70aaa67ab22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -# 2.0.3 (unreleased) +# 2.1.0 (unreleased - master branch) + +**Backend** +- [Issue #1905](https://github.com/grafana/grafana/issues/1905). Github OAuth: You can now configure a Github team membership requirement, thx @dewski + + +# 2.0.3 (unreleased - 2.0.x branch) **Fixes** - [Issue #1872](https://github.com/grafana/grafana/issues/1872). Firefox/IE issue, invisible text in dashboard search fixed From 0d3fbb865929becce7ff5cc72ab0a15d4f1b7da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 10:08:01 +0200 Subject: [PATCH 084/398] Added message alerts when login failed due to github team membership or email domain requirement, #1731, #1660 --- conf/sample.ini | 7 +++---- pkg/api/login_oauth.go | 5 +++-- public/app/controllers/loginCtrl.js | 9 ++++++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/conf/sample.ini b/conf/sample.ini index 68bd3eb3a1d..4ebab72d1af 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -142,8 +142,8 @@ ;auth_url = https://github.com/login/oauth/authorize ;token_url = https://github.com/login/oauth/access_token ;api_url = https://api.github.com/user -# Uncomment bellow to only allow specific email domains -; allowed_domains = mycompany.com othercompany.com +;team_ids = +;allowed_domains = #################################### Google Auth ########################## [auth.google] @@ -154,8 +154,7 @@ ;auth_url = https://accounts.google.com/o/oauth2/auth ;token_url = https://accounts.google.com/o/oauth2/token ;api_url = https://www.googleapis.com/oauth2/v1/userinfo -# Uncomment bellow to only allow specific email domains -; allowed_domains = mycompany.com othercompany.com +;allowed_domains = #################################### Logging ########################## [log] diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go index d89a7237d35..505c17ddde8 100644 --- a/pkg/api/login_oauth.go +++ b/pkg/api/login_oauth.go @@ -3,6 +3,7 @@ package api import ( "errors" "fmt" + "net/url" "golang.org/x/oauth2" @@ -46,7 +47,7 @@ func OAuthLogin(ctx *middleware.Context) { userInfo, err := connect.UserInfo(token) if err != nil { if err == social.ErrMissingTeamMembership { - ctx.Redirect(setting.AppSubUrl + "/login?missing_team_membership=1") + ctx.Redirect(setting.AppSubUrl + "/login?failedMsg=" + url.QueryEscape("Required Github team membership not fulfilled")) } else { ctx.Handle(500, fmt.Sprintf("login.OAuthLogin(get info from %s)", name), err) } @@ -58,7 +59,7 @@ func OAuthLogin(ctx *middleware.Context) { // validate that the email is allowed to login to grafana if !connect.IsEmailAllowed(userInfo.Email) { log.Info("OAuth login attempt with unallowed email, %s", userInfo.Email) - ctx.Redirect(setting.AppSubUrl + "/login?email_not_allowed=1") + ctx.Redirect(setting.AppSubUrl + "/login?failedMsg=" + url.QueryEscape("Required email domain not fulfilled")) return } diff --git a/public/app/controllers/loginCtrl.js b/public/app/controllers/loginCtrl.js index 5de773842f8..c8856df0690 100644 --- a/public/app/controllers/loginCtrl.js +++ b/public/app/controllers/loginCtrl.js @@ -7,7 +7,7 @@ function (angular, config) { var module = angular.module('grafana.controllers'); - module.controller('LoginCtrl', function($scope, backendSrv, contextSrv) { + module.controller('LoginCtrl', function($scope, backendSrv, contextSrv, $location) { $scope.formModel = { user: '', email: '', @@ -28,6 +28,13 @@ function (angular, config) { $scope.init = function() { $scope.$watch("loginMode", $scope.loginModeChanged); $scope.passwordChanged(); + + var params = $location.search(); + if (params.failedMsg) { + $scope.appEvent('alert-warning', ['Login Failed', params.failedMsg]); + delete params.failedMsg; + $location.search(params); + } }; // build info view model From 3007add4ca4ddb865fb20216c49aa14c00066ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 10:10:44 +0200 Subject: [PATCH 085/398] small docs fix --- docs/sources/installation/debian.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index cf5e4f4f072..aed4eb420b5 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -16,7 +16,7 @@ Description | Download $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.1_amd64.deb $ sudo apt-get install -y adduser libfontconfig - $ sudo dpkg -i grafana_2.0.1_amd64.deb + $ sudo dpkg -i grafana_2.0.2_amd64.deb ## APT Repository Add the following line to your `/etc/apt/sources.list` From a0e80e5869aee5835151b3156a36e0a1a6498cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 10:13:00 +0200 Subject: [PATCH 086/398] Updated 2.0 docs, merged with master and removed docs for features in 2.1, doc updates related to 2.0 needs to be done to this branch --- docs/sources/installation/configuration.md | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index a1dfb6ac035..f55561e6668 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -179,7 +179,6 @@ Client ID and a Client Secret. Specify these in the grafana config file. Example client_id = YOUR_GITHUB_APP_CLIENT_ID client_secret = YOUR_GITHUB_APP_CLIENT_SECRET scopes = user:email - team_ids = auth_url = https://github.com/login/oauth/authorize token_url = https://github.com/login/oauth/access_token allow_sign_up = false @@ -190,21 +189,6 @@ now login or signup with your github accounts. You may allow users to sign-up via github auth by setting allow_sign_up to true. When this option is set to true, any user successfully authenticating via github auth will be automatically signed up. -### team_ids -Require an active team membership for at least one of the given teams on GitHub. -If the authenticated user isn't a member of at least one the teams they will not -be able to register or authenticate with your Grafana instance. Example: - - [auth.github] - enabled = true - client_id = YOUR_GITHUB_APP_CLIENT_ID - client_secret = YOUR_GITHUB_APP_CLIENT_SECRET - scopes = user:email - team_ids = 150,300 - auth_url = https://github.com/login/oauth/authorize - token_url = https://github.com/login/oauth/access_token - allow_sign_up = false - ## [auth.google] You need to create a google project. You can do this in the [Google Developer Console](https://console.developers.google.com/project). When you create the project you will need to specify a callback URL. Specify this as callback: From 4c7545e909df74299b91b29be556e4acd888398a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 10:13:52 +0200 Subject: [PATCH 087/398] Updated docs Makefile --- docs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Makefile b/docs/Makefile index d44bc545e2c..fcb1708f916 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -44,7 +44,7 @@ docs-test: docs-build $(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh docs-build: - git fetch https://github.com/grafana/grafana.git docs-2.0 && git diff --name-status FETCH_HEAD...HEAD -- . > changed-files + git fetch https://github.com/grafana/grafana.git docs-1.x && git diff --name-status FETCH_HEAD...HEAD -- . > changed-files echo "$(GIT_BRANCH)" > GIT_BRANCH echo "$(GITCOMMIT)" > GITCOMMIT docker build -t "$(DOCKER_DOCS_IMAGE)" . From 9ae3d66da72dc53a7eae2430524292bace801b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 10:18:11 +0200 Subject: [PATCH 088/398] Fixed docs, screencasts page --- docs/sources/guides/screencasts.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/sources/guides/screencasts.md b/docs/sources/guides/screencasts.md index 6c09e5b26af..d8c605a4245 100644 --- a/docs/sources/guides/screencasts.md +++ b/docs/sources/guides/screencasts.md @@ -15,10 +15,9 @@ no_toc: true

    Episode 2 - Templated Graphite Queries

    - +
    -
    @@ -34,7 +33,6 @@ no_toc: true
    -
    @@ -50,7 +48,6 @@ no_toc: true
    -
    From 74a8fa61f2217c6a63d9d08394c8086173632c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 10:33:37 +0200 Subject: [PATCH 089/398] Merged with 2.0 docs and restored some stuff --- conf/defaults.ini | 6 +++--- conf/sample.ini | 2 ++ docs/sources/installation/configuration.md | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 7345f18520e..4fef290b908 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -137,19 +137,20 @@ org_role = Viewer #################################### Github Auth ########################## [auth.github] enabled = false +allow_sign_up = false client_id = some_id client_secret = some_secret scopes = user:email -team_ids = auth_url = https://github.com/login/oauth/authorize token_url = https://github.com/login/oauth/access_token api_url = https://api.github.com/user +team_ids = allowed_domains = -allow_sign_up = false #################################### Google Auth ########################## [auth.google] enabled = false +allow_sign_up = false client_id = some_client_id client_secret = some_client_secret scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email @@ -157,7 +158,6 @@ auth_url = https://accounts.google.com/o/oauth2/auth token_url = https://accounts.google.com/o/oauth2/token api_url = https://www.googleapis.com/oauth2/v1/userinfo allowed_domains = -allow_sign_up = false #################################### Logging ########################## [log] diff --git a/conf/sample.ini b/conf/sample.ini index 4ebab72d1af..62d5c2a09ce 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -136,6 +136,7 @@ #################################### Github Auth ########################## [auth.github] ;enabled = false +;allow_sign_up = false ;client_id = some_id ;client_secret = some_secret ;scopes = user:email @@ -148,6 +149,7 @@ #################################### Google Auth ########################## [auth.google] ;enabled = false +;allow_sign_up = false ;client_id = some_client_id ;client_secret = some_client_secret ;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index f55561e6668..ace8c57184f 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -182,6 +182,7 @@ Client ID and a Client Secret. Specify these in the grafana config file. Example auth_url = https://github.com/login/oauth/authorize token_url = https://github.com/login/oauth/access_token allow_sign_up = false + team_ids = Restart the grafana backend. You should now see a github login button on the login page. You can now login or signup with your github accounts. @@ -189,6 +190,21 @@ now login or signup with your github accounts. You may allow users to sign-up via github auth by setting allow_sign_up to true. When this option is set to true, any user successfully authenticating via github auth will be automatically signed up. +### team_ids +Require an active team membership for at least one of the given teams on GitHub. +If the authenticated user isn't a member of at least one the teams they will not +be able to register or authenticate with your Grafana instance. Example: + + [auth.github] + enabled = true + client_id = YOUR_GITHUB_APP_CLIENT_ID + client_secret = YOUR_GITHUB_APP_CLIENT_SECRET + scopes = user:email + team_ids = 150,300 + auth_url = https://github.com/login/oauth/authorize + token_url = https://github.com/login/oauth/access_token + allow_sign_up = false + ## [auth.google] You need to create a google project. You can do this in the [Google Developer Console](https://console.developers.google.com/project). When you create the project you will need to specify a callback URL. Specify this as callback: From c5be95e46ca36652cf5c7f63accedbc8401e6c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 14:23:29 +0200 Subject: [PATCH 090/398] Began polish and tweaks of new template variable multi select dropdown --- .../partials/variableValueSelect.html | 5 +- public/css/less/submenu.less | 58 +++++++++++-------- public/css/less/variables.dark.less | 2 +- 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index 058500c495c..ffa5b46ada9 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -7,10 +7,9 @@
    -
    +
    - +
    diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index 693c29b3ea4..cdf231cbd9f 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -28,37 +28,49 @@ position: absolute; top: 43px; min-width: 200px; - height: 400px; + max-height: 400px; background: @grafanaPanelBackground; box-shadow: 0px 0px 55px 0px black; border: 1px solid @grafanaTargetFuncBackground; z-index: 1000; - padding: 10px; + font-size: @baseFontSize; + padding: 4px 4px 8px 4px; +} - .variable-options-container { - height: 350px; - overflow: auto; - display: block; - line-height: 28px; +.variable-options-container { + max-height: 350px; + overflow: auto; + display: block; + line-height: 28px; +} + +.variable-option { + display: block; + .fa { + font-size: 130%; + position: relative; + top: 2px; + padding-right: 4px; } + .fa-check-square-o { display: none; } - .variable-option { - display: block; - .fa { - font-size: 130%; - position: relative; - top: 2px; - padding-right: 6px; + &.selected { + .fa-square-o { + display: none; } - .fa-check-square-o { display: none; } - - &.selected { - .fa-square-o { - display: none; - } - .fa-check-square-o { - display: inline-block; - } + .fa-check-square-o { + display: inline-block; } } } + +.variable-search-wrapper { + input { + width: 100%; + padding: 7px 8px; + height: 100%; + box-sizing: border-box; + margin-bottom: 6px; + } +} + diff --git a/public/css/less/variables.dark.less b/public/css/less/variables.dark.less index 9a0180added..40333bef9ab 100644 --- a/public/css/less/variables.dark.less +++ b/public/css/less/variables.dark.less @@ -63,7 +63,7 @@ @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; @baseFontSize: 14px; -@baseFontWeight: 400; +@baseFontWeight: 400; @baseFontFamily: @sansFontFamily; @baseLineHeight: 20px; @altFontFamily: @serifFontFamily; From fe0bf876d92bb618f648d098cb7e4bc99c50bb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 15:34:14 +0200 Subject: [PATCH 091/398] Style changes and polish to multi variable value selection, #1144 --- .../app/directives/templateParamSelector.js | 34 ++++++++++++++----- .../partials/variableValueSelect.html | 6 ++-- public/css/less/submenu.less | 32 +++++++++-------- 3 files changed, 44 insertions(+), 28 deletions(-) diff --git a/public/app/directives/templateParamSelector.js b/public/app/directives/templateParamSelector.js index 629c3ececcc..1f1cf9faf5f 100644 --- a/public/app/directives/templateParamSelector.js +++ b/public/app/directives/templateParamSelector.js @@ -42,26 +42,38 @@ function (angular, app, _) { }, 0, false); }; - scope.optionSelected = function(option) { + scope.optionSelected = function(option, event) { option.selected = !option.selected; - if (!variable.multi || option.text === 'All') { + var hideAfter = true; + var setAllExceptCurrentTo = function(newValue) { _.each(scope.options, function(other) { - if (option !== other) { - other.selected = false; - } + if (option !== other) { other.selected = newValue; } }); + }; + + if (option.text === 'All') { + setAllExceptCurrentTo(false); + } + else if (!variable.multi) { + setAllExceptCurrentTo(false); + } else { + if (event.ctrlKey || event.metaKey || event.shiftKey) { + hideAfter = false; + } + else { + setAllExceptCurrentTo(false); + } } var selected = _.filter(scope.options, {selected: true}); - // enfore the first selected if no option is selected if (selected.length === 0) { - scope.options[0].selected = true; - selected = [scope.options[0]]; + option.selected = true; + selected = [option]; } - if (selected.length > 1) { + if (selected.length > 1 && selected.length !== scope.options.length) { if (selected[0].text === 'All') { selected[0].selected = false; selected = selected.slice(1, selected.length); @@ -80,6 +92,10 @@ function (angular, app, _) { scope.updateLinkText(); scope.onUpdated(); + + if (hideAfter) { + scope.hide(); + } }; scope.hide = function() { diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index ffa5b46ada9..a556b57a72d 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -14,11 +14,9 @@
    - - - + {{option.text}} +
    diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index cdf231cbd9f..35cf84022cb 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -26,40 +26,42 @@ .variable-value-dropdown { position: absolute; - top: 43px; - min-width: 200px; + top: 35px; + min-width: 150px; max-height: 400px; background: @grafanaPanelBackground; box-shadow: 0px 0px 55px 0px black; border: 1px solid @grafanaTargetFuncBackground; z-index: 1000; font-size: @baseFontSize; - padding: 4px 4px 8px 4px; + padding: 0; + border-radius: 3px 3px 0 0; } .variable-options-container { max-height: 350px; overflow: auto; display: block; - line-height: 28px; + line-height: 26px; } .variable-option { display: block; - .fa { - font-size: 130%; - position: relative; - top: 2px; - padding-right: 4px; + padding: 0 8px; + + &:hover { + background-color: @blueDark; + } + + .fa { + line-height: 26px; + float: right; + padding-left: 4px; } - .fa-check-square-o { display: none; } &.selected { - .fa-square-o { - display: none; - } - .fa-check-square-o { - display: inline-block; + .variable-option-icon:before { + content: "\f00c"; } } } From d10ce90936cc6f4c53e584f97af39c300e7f6066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 29 Apr 2015 15:50:47 +0200 Subject: [PATCH 092/398] Fixed XSS issue with file based dashboards, was really casued by an issue with alertSrv accepting html in message alerts --- public/app/routes/dashLoadControllers.js | 2 +- public/app/services/alertSrv.js | 2 +- public/views/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/routes/dashLoadControllers.js b/public/app/routes/dashLoadControllers.js index b19b0c9664f..570ce2b18c1 100644 --- a/public/app/routes/dashLoadControllers.js +++ b/public/app/routes/dashLoadControllers.js @@ -76,7 +76,7 @@ function (angular, _, kbn, moment, $) { } return result.data; },function() { - $scope.appEvent('alert-error', ["Dashboard load failed", "Could not load dashboards/"+file+". Please make sure it exists"]); + $scope.appEvent('alert-error', ["Dashboard load failed", "Could not load "+file+". Please make sure it exists"]); return false; }); }; diff --git a/public/app/services/alertSrv.js b/public/app/services/alertSrv.js index d38c1f4aecc..4a8ef273523 100644 --- a/public/app/services/alertSrv.js +++ b/public/app/services/alertSrv.js @@ -29,7 +29,7 @@ function (angular, _) { this.set = function(title,text,severity,timeout) { var newAlert = { title: title || '', - text: $sce.trustAsHtml(text || ''), + text: text || '', severity: severity || 'info', }; diff --git a/public/views/index.html b/public/views/index.html index d5dfab06a64..8fb4a93bba6 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -35,7 +35,7 @@
    {{alert.title}}
    -
    +
    From 0a2b03ba52f4cee22d0bdcb875d811ea7fc4ba48 Mon Sep 17 00:00:00 2001 From: Morton Fox Date: Wed, 29 Apr 2015 16:35:03 -0400 Subject: [PATCH 093/398] Fix the first CLA link. --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bd178eddbdd..5f0fb88b951 100644 --- a/README.md +++ b/README.md @@ -125,8 +125,9 @@ You only need to add the options you want to override. Config files are applied 2. dev.ini (if found) 3. custom.ini -## Create a pull requests -Before or after your create a pull requests, sign the [contributor license aggrement](/docs/contributing/cla.html).## Contribute +## Create a pull request +Before or after you create a pull request, sign the [contributor license agreement](http://grafana.org/docs/contributing/cla.html). +## Contribute If you have any idea for an improvement or found a bug do not hesitate to open an issue. And if you have time clone this repo and submit a pull request and help me make Grafana the kickass metrics & devops dashboard we all dream about! From a8b2074fc6045f25f8538f942e5cc39dfde71d55 Mon Sep 17 00:00:00 2001 From: Morton Fox Date: Wed, 29 Apr 2015 16:35:03 -0400 Subject: [PATCH 094/398] Fix the first CLA link. --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bd178eddbdd..5f0fb88b951 100644 --- a/README.md +++ b/README.md @@ -125,8 +125,9 @@ You only need to add the options you want to override. Config files are applied 2. dev.ini (if found) 3. custom.ini -## Create a pull requests -Before or after your create a pull requests, sign the [contributor license aggrement](/docs/contributing/cla.html).## Contribute +## Create a pull request +Before or after you create a pull request, sign the [contributor license agreement](http://grafana.org/docs/contributing/cla.html). +## Contribute If you have any idea for an improvement or found a bug do not hesitate to open an issue. And if you have time clone this repo and submit a pull request and help me make Grafana the kickass metrics & devops dashboard we all dream about! From 3ee1ea28e152b0a435289f9ab2e538a80ba4f5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 30 Apr 2015 09:09:00 +0200 Subject: [PATCH 095/398] Templating: Support for search filtering and keyboard up/down filtering in the new multi variable value selector dropdown, #1144 --- .../app/directives/templateParamSelector.js | 38 +++++++++++++++++-- .../partials/variableValueSelect.html | 5 ++- public/css/less/submenu.less | 2 +- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/public/app/directives/templateParamSelector.js b/public/app/directives/templateParamSelector.js index 1f1cf9faf5f..fa0e56acebc 100644 --- a/public/app/directives/templateParamSelector.js +++ b/public/app/directives/templateParamSelector.js @@ -21,9 +21,15 @@ function (angular, app, _) { var variable = scope.variable; scope.show = function() { + if (scope.selectorOpen) { + return; + } + scope.selectorOpen = true; scope.giveFocus = 1; scope.oldCurrentText = variable.current.text; + scope.highlightIndex = -1; + var currentValues = variable.current.value; if (_.isString(currentValues)) { @@ -37,11 +43,39 @@ function (angular, app, _) { return option; }); + scope.search = {query: '', options: scope.options}; + $timeout(function() { bodyEl.on('click', scope.bodyOnClick); }, 0, false); }; + scope.queryChanged = function() { + scope.highlightIndex = -1; + scope.search.options = _.filter(scope.options, function(option) { + return option.text.toLowerCase().indexOf(scope.search.query.toLowerCase()) !== -1; + }); + }; + + scope.keyDown = function (evt) { + if (evt.keyCode === 27) { + scope.hide(); + } + if (evt.keyCode === 40) { + scope.moveHighlight(1); + } + if (evt.keyCode === 38) { + scope.moveHighlight(-1); + } + if (evt.keyCode === 13) { + scope.optionSelected(scope.search.options[scope.highlightIndex], {}); + } + }; + + scope.moveHighlight = function(direction) { + scope.highlightIndex = (scope.highlightIndex + direction) % scope.search.options.length; + }; + scope.optionSelected = function(option, event) { option.selected = !option.selected; @@ -100,10 +134,6 @@ function (angular, app, _) { scope.hide = function() { scope.selectorOpen = false; - // if (scope.oldCurrentText !== variable.current.text) { - // scope.onUpdated(); - // } - bodyEl.off('click', scope.bodyOnClick); }; diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index a556b57a72d..ff5291c11d3 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -9,12 +9,13 @@
    - +
    - + {{option.text}}
    diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index 35cf84022cb..f12de218d8b 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -49,7 +49,7 @@ display: block; padding: 0 8px; - &:hover { + &:hover, &.highlighted { background-color: @blueDark; } From 25ef49494b5e6f283deccba6df0c39d569f9576d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 30 Apr 2015 10:47:51 +0200 Subject: [PATCH 096/398] Final polish on repeat panel variable selection, #1888 --- .../features/dashboard/dynamicDashboardSrv.js | 50 +++++++-------- public/app/panels/graph/axisEditor.html | 2 +- public/app/partials/panelgeneral.html | 61 +++++++++++++------ .../test/specs/dynamicDashboardSrv-specs.js | 8 +-- 4 files changed, 74 insertions(+), 47 deletions(-) diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index 2ecd526f795..51309a0841d 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -11,29 +11,31 @@ function (angular, _) { var self = this; this.init = function(dashboard) { - this.dashboard = dashboard; this.iteration = new Date().getTime(); - - this.handlePanelRepeats(dashboard); - this.handleRowRepeats(dashboard); + this.process(dashboard); }; this.update = function(dashboard) { - this.dashboard = dashboard; this.iteration = this.iteration + 1; - - this.handlePanelRepeats(dashboard); - this.handleRowRepeats(dashboard); + this.process(dashboard); }; - this.handlePanelRepeats = function(dashboard) { + this.process = function(dashboard) { + if (dashboard.templating.list.length === 0) { return; } + this.dashboard = dashboard; + + this.handlePanelRepeats(); + this.handleRowRepeats(); + }; + + this.handlePanelRepeats = function() { var i, j, row, panel; - for (i = 0; i < dashboard.rows.length; i++) { - row = dashboard.rows[i]; + for (i = 0; i < this.dashboard.rows.length; i++) { + row = this.dashboard.rows[i]; for (j = 0; j < row.panels.length; j++) { panel = row.panels[j]; if (panel.repeat) { - this.repeatPanel(panel, row, dashboard); + this.repeatPanel(panel, row); } // clean up old left overs else if (panel.repeatPanelId && panel.repeatIteration !== this.iteration) { @@ -44,16 +46,16 @@ function (angular, _) { } }; - this.handleRowRepeats = function(dashboard) { + this.handleRowRepeats = function() { var i, row; - for (i = 0; i < dashboard.rows.length; i++) { - row = dashboard.rows[i]; + for (i = 0; i < this.dashboard.rows.length; i++) { + row = this.dashboard.rows[i]; if (row.repeat) { - this.repeatRow(row, dashboard); + this.repeatRow(row); } // clean up old left overs else if (row.repeatRowId && row.repeatIteration !== this.iteration) { - dashboard.rows.splice(i, 1); + this.dashboard.rows.splice(i, 1); i = i - 1; } } @@ -93,8 +95,8 @@ function (angular, _) { return copy; }; - this.repeatRow = function(row, dashboard) { - var variables = dashboard.templating.list; + this.repeatRow = function(row) { + var variables = this.dashboard.templating.list; var variable = _.findWhere(variables, {name: row.repeat.replace('$', '')}); if (!variable) { return; @@ -152,12 +154,10 @@ function (angular, _) { return clone; }; - this.repeatPanel = function(panel, row, dashboard) { - var variables = dashboard.templating.list; - var variable = _.findWhere(variables, {name: panel.repeat.replace('$', '')}); - if (!variable) { - return; - } + this.repeatPanel = function(panel, row) { + var variables = this.dashboard.templating.list; + var variable = _.findWhere(variables, {name: panel.repeat}); + if (!variable) { return; } var selected; if (variable.current.text === 'All') { diff --git a/public/app/panels/graph/axisEditor.html b/public/app/panels/graph/axisEditor.html index ae69ec60929..d161330f5c0 100644 --- a/public/app/panels/graph/axisEditor.html +++ b/public/app/panels/graph/axisEditor.html @@ -190,7 +190,7 @@
      -
    • +
    • Legend values
    • diff --git a/public/app/partials/panelgeneral.html b/public/app/partials/panelgeneral.html index 2fd3f0043cb..8d4ef57b141 100644 --- a/public/app/partials/panelgeneral.html +++ b/public/app/partials/panelgeneral.html @@ -1,24 +1,51 @@
      General options
      -
      - -
      -
      - -
      -
      - -
      - -
      +
      +
        +
      • + Title +
        • +
      • + +
        • +
      • + Span +
        • +
      • + +
        • +
      • + Height +
        • +
      • + +
        • +
      • + + + +
        • +
      +
      +
      +
      -
      Templating options
      -
      - - -
      -
      +
      Templating options
      +
      +
        +
      • + Repeat Panel +
        • +
      • + +
        • +
      +
      +
      +
    diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js index 968a181e288..08a2f1af561 100644 --- a/public/test/specs/dynamicDashboardSrv-specs.js +++ b/public/test/specs/dynamicDashboardSrv-specs.js @@ -36,7 +36,7 @@ define([ dynamicDashScenario('given dashboard with panel repeat', function(ctx) { ctx.setup(function(dash) { dash.rows.push({ - panels: [{id: 2, repeat: '$apps'}] + panels: [{id: 2, repeat: 'apps'}] }); dash.templating.list.push({ name: 'apps', @@ -56,7 +56,7 @@ define([ }); it('should mark panel repeated', function() { - expect(ctx.rows[0].panels[0].repeat).to.be('$apps'); + expect(ctx.rows[0].panels[0].repeat).to.be('apps'); expect(ctx.rows[0].panels[1].repeatPanelId).to.be(2); }); @@ -103,7 +103,7 @@ define([ dynamicDashScenario('given dashboard with row repeat', function(ctx) { ctx.setup(function(dash) { dash.rows.push({ - repeat: '$servers', + repeat: 'servers', panels: [{id: 2}] }); dash.templating.list.push({ @@ -128,7 +128,7 @@ define([ }); it('should mark second row as repeated', function() { - expect(ctx.rows[0].repeat).to.be('$servers'); + expect(ctx.rows[0].repeat).to.be('servers'); }); it('should clear repeat field on repeated row', function() { From 32e0ce1beb8c738fae6e08784be441e8e0c3e240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 30 Apr 2015 10:50:23 +0200 Subject: [PATCH 097/398] Minor code refinements to panel repeat code, #1888 --- .../features/dashboard/dynamicDashboardSrv.js | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index 51309a0841d..cfa824e3402 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -24,14 +24,11 @@ function (angular, _) { if (dashboard.templating.list.length === 0) { return; } this.dashboard = dashboard; - this.handlePanelRepeats(); - this.handleRowRepeats(); - }; - - this.handlePanelRepeats = function() { var i, j, row, panel; for (i = 0; i < this.dashboard.rows.length; i++) { row = this.dashboard.rows[i]; + + // repeat panels first for (j = 0; j < row.panels.length; j++) { panel = row.panels[j]; if (panel.repeat) { @@ -43,13 +40,8 @@ function (angular, _) { j = j - 1; } } - } - }; - this.handleRowRepeats = function() { - var i, row; - for (i = 0; i < this.dashboard.rows.length; i++) { - row = this.dashboard.rows[i]; + // handle row repeats if (row.repeat) { this.repeatRow(row); } @@ -61,6 +53,7 @@ function (angular, _) { } }; + // returns a new row clone or reuses a clone from previous iteration this.getRowClone = function(sourceRow, index) { if (index === 0) { return sourceRow; @@ -95,6 +88,7 @@ function (angular, _) { return copy; }; + // returns a new panel clone or reuses a clone from previous iteration this.repeatRow = function(row) { var variables = this.dashboard.templating.list; var variable = _.findWhere(variables, {name: row.repeat.replace('$', '')}); From e17f56b4ad480eeb6b12d8641f446735bc040e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 30 Apr 2015 11:15:26 +0200 Subject: [PATCH 098/398] Final polish on panel & row repeats, #1888, still some missing places where scopedVars needs to be used --- .../partials/variableValueSelect.html | 30 ++++++------ public/app/partials/panelgeneral.html | 2 +- public/app/partials/roweditor.html | 47 ++++++++++++++----- public/css/less/submenu.less | 2 +- 4 files changed, 53 insertions(+), 28 deletions(-) diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index ff5291c11d3..30a61072626 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -1,24 +1,26 @@ {{labelText}}: -     - {{linkText}} - - -
    -
    - - - -
    +
    diff --git a/public/app/partials/panelgeneral.html b/public/app/partials/panelgeneral.html index 8d4ef57b141..7a4b57b0db8 100644 --- a/public/app/partials/panelgeneral.html +++ b/public/app/partials/panelgeneral.html @@ -38,7 +38,7 @@ Repeat Panel
  • -
    • diff --git a/public/app/partials/roweditor.html b/public/app/partials/roweditor.html index f47351c8ffa..37e258a9b89 100644 --- a/public/app/partials/roweditor.html +++ b/public/app/partials/roweditor.html @@ -1,3 +1,4 @@ +
    @@ -16,24 +17,46 @@
    -
    +
    Row details
    -
    - +
    +
      +
    • + Title +
      • +
    • + +
      • +
    • + Height +
      • +
    • + +
      • +
    • + + + +
      • +
    +
    -
    - -
    - -
    -
    Templating options
    -
    - - +
    +
      +
    • + Repeat Row +
      • +
    • + +
      • +
    +
    diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index f12de218d8b..f69ac9c5791 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -26,7 +26,7 @@ .variable-value-dropdown { position: absolute; - top: 35px; + top: 27px; min-width: 150px; max-height: 400px; background: @grafanaPanelBackground; From 95fcddcd952fa8c497c1bda703f706e5feba339e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 1 May 2015 08:07:45 +0200 Subject: [PATCH 099/398] More work on panel & row repeats, #1888, updated changelog --- CHANGELOG.md | 4 ++ public/app/directives/all.js | 2 +- ...aramSelector.js => variableValueSelect.js} | 0 .../features/dashboard/dynamicDashboardSrv.js | 29 +++++----- public/app/partials/roweditor.html | 2 +- .../test/specs/dynamicDashboardSrv-specs.js | 57 +++++++++++++++++++ 6 files changed, 77 insertions(+), 17 deletions(-) rename public/app/directives/{templateParamSelector.js => variableValueSelect.js} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70aaa67ab22..d0358f7e572 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 2.1.0 (unreleased - master branch) +**New dashboard features** +- [Issue #1144](https://github.com/grafana/grafana/issues/1144). Templating: You can now select multiple template variables values at the same time. +- [Issue #1888](https://github.com/grafana/grafana/issues/1144). Templating: Repeat panel or row for each selected template variable value + **Backend** - [Issue #1905](https://github.com/grafana/grafana/issues/1905). Github OAuth: You can now configure a Github team membership requirement, thx @dewski diff --git a/public/app/directives/all.js b/public/app/directives/all.js index 3ef0b669d6c..4ab92d111d6 100644 --- a/public/app/directives/all.js +++ b/public/app/directives/all.js @@ -11,7 +11,7 @@ define([ './spectrumPicker', './bootstrap-tagsinput', './bodyClass', - './templateParamSelector', + './variableValueSelect', './graphiteSegment', './grafanaVersionCheck', './dropdown.typeahead', diff --git a/public/app/directives/templateParamSelector.js b/public/app/directives/variableValueSelect.js similarity index 100% rename from public/app/directives/templateParamSelector.js rename to public/app/directives/variableValueSelect.js diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index cfa824e3402..dcb4e31340c 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -28,7 +28,17 @@ function (angular, _) { for (i = 0; i < this.dashboard.rows.length; i++) { row = this.dashboard.rows[i]; - // repeat panels first + // handle row repeats + if (row.repeat) { + this.repeatRow(row); + } + // clean up old left overs + else if (row.repeatRowId && row.repeatIteration !== this.iteration) { + this.dashboard.rows.splice(i, 1); + i = i - 1; + } + + // repeat panels for (j = 0; j < row.panels.length; j++) { panel = row.panels[j]; if (panel.repeat) { @@ -40,16 +50,6 @@ function (angular, _) { j = j - 1; } } - - // handle row repeats - if (row.repeat) { - this.repeatRow(row); - } - // clean up old left overs - else if (row.repeatRowId && row.repeatIteration !== this.iteration) { - this.dashboard.rows.splice(i, 1); - i = i - 1; - } } }; @@ -108,7 +108,7 @@ function (angular, _) { for (i = 0; i < copy.panels.length; i++) { panel = copy.panels[i]; - panel.scopedVars = panel.scopedVars || {}; + panel.scopedVars = {}; panel.scopedVars[variable.name] = option; } }); @@ -139,7 +139,7 @@ function (angular, _) { // save id tmpId = clone.id; // copy properties from source - angular.extend(clone, sourcePanel); + angular.copy(sourcePanel, clone); // restore id clone.id = tmpId; clone.repeatIteration = this.iteration; @@ -162,11 +162,10 @@ function (angular, _) { _.each(selected, function(option, index) { var copy = self.getPanelClone(panel, row, index); - copy.scopedVars = {}; + copy.scopedVars = copy.scopedVars || {}; copy.scopedVars[variable.name] = option; }); }; }); - }); diff --git a/public/app/partials/roweditor.html b/public/app/partials/roweditor.html index 37e258a9b89..5780d624302 100644 --- a/public/app/partials/roweditor.html +++ b/public/app/partials/roweditor.html @@ -34,7 +34,7 @@
    • -
  • +
  • diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js index 08a2f1af561..905b8896cd4 100644 --- a/public/test/specs/dynamicDashboardSrv-specs.js +++ b/public/test/specs/dynamicDashboardSrv-specs.js @@ -177,4 +177,61 @@ define([ }); }); }); + + dynamicDashScenario('given dashboard with row repeat and panel repeat', function(ctx) { + ctx.setup(function(dash) { + dash.rows.push({ + repeat: 'servers', + panels: [{id: 2, repeat: 'metric'}] + }); + dash.templating.list.push({ + name: 'servers', + current: { text: 'se1, se2', value: ['se1', 'se2'] }, + options: [ + {text: 'se1', value: 'se1', selected: true}, + {text: 'se2', value: 'se2', selected: true}, + ] + }); + dash.templating.list.push({ + name: 'metric', + current: { text: 'm1, m2', value: ['m1', 'm2'] }, + options: [ + {text: 'm1', value: 'm1', selected: true}, + {text: 'm2', value: 'm2', selected: true}, + ] + }); + }); + + it('should repeat row one time', function() { + expect(ctx.rows.length).to.be(2); + }); + + it('should repeat panel on both rows', function() { + expect(ctx.rows[0].panels.length).to.be(2); + expect(ctx.rows[1].panels.length).to.be(2); + }); + + it('should keep panel ids on first row', function() { + expect(ctx.rows[0].panels[0].id).to.be(2); + }); + + it('should mark second row as repeated', function() { + expect(ctx.rows[0].repeat).to.be('servers'); + }); + + it('should clear repeat field on repeated row', function() { + expect(ctx.rows[1].repeat).to.be(null); + }); + + it('should generate a repeartRowId based on repeat row index', function() { + expect(ctx.rows[1].repeatRowId).to.be(1); + }); + + it('should set scopedVars on row panels', function() { + expect(ctx.rows[0].panels[0].scopedVars.servers.value).to.be('se1'); + expect(ctx.rows[1].panels[0].scopedVars.servers.value).to.be('se2'); + }); + + }); + }); From 59fcd3914d4254625da41833f92c658e6ffb43e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 1 May 2015 08:08:31 +0200 Subject: [PATCH 100/398] corrected master version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 64e393616f6..8785632eaee 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Coding Instinct AB" }, "name": "grafana", - "version": "2.0.3-pre1", + "version": "2.1.0-pre1", "repository": { "type": "git", "url": "http://github.com/torkelo/grafana.git" From 5de92309243ca3c100a49bdf2e32a1992d0ca235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 1 May 2015 08:40:13 +0200 Subject: [PATCH 101/398] Security: New config option to disable the use of gravatar for profile images, Closes #1891 --- CHANGELOG.md | 1 + conf/defaults.ini | 3 +++ conf/sample.ini | 3 +++ docs/sources/installation/configuration.md | 3 +++ pkg/api/index.go | 4 ++++ pkg/setting/setting.go | 3 +++ .../plugins/datasource/influxdb_08/datasource.js | 4 ++-- public/img/user_profile.png | Bin 0 -> 1486 bytes 8 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 public/img/user_profile.png diff --git a/CHANGELOG.md b/CHANGELOG.md index d0358f7e572..517fa82779b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Backend** - [Issue #1905](https://github.com/grafana/grafana/issues/1905). Github OAuth: You can now configure a Github team membership requirement, thx @dewski +- [Issue #1891](https://github.com/grafana/grafana/issues/1891). Security: New config option to disable the use of gravatar for profile images # 2.0.3 (unreleased - 2.0.x branch) diff --git a/conf/defaults.ini b/conf/defaults.ini index 4fef290b908..891c04920e1 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -109,6 +109,9 @@ login_remember_days = 7 cookie_username = grafana_user cookie_remember_name = grafana_remember +# disable gravatar profile images +disable_gravatar = false + #################################### Users #################################### [users] # disable user signup / registration diff --git a/conf/sample.ini b/conf/sample.ini index 62d5c2a09ce..aa333cdc5de 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -108,6 +108,9 @@ ;cookie_username = grafana_user ;cookie_remember_name = grafana_remember +# disable gravatar profile images +;disable_gravatar = false + #################################### Users #################################### [users] # disable user signup / registration diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index ace8c57184f..7ccee50fbc9 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -134,6 +134,9 @@ The number of days the keep me logged in / remember me cookie lasts. ### secret_key Used for signing keep me logged in / remember me cookies. +### disable_gravatar +Set to true to disable the use of Gravatar for user profile images. Default is `false`. +
    ## [user] diff --git a/pkg/api/index.go b/pkg/api/index.go index 86a5e3f1882..386bb3351df 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -25,6 +25,10 @@ func setIndexViewData(c *middleware.Context) error { IsGrafanaAdmin: c.IsGrafanaAdmin, } + if setting.DisableGravatar { + currentUser.GravatarUrl = setting.AppSubUrl + "/img/user_profile.png" + } + if len(currentUser.Name) == 0 { currentUser.Name = currentUser.Login } diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 46f98e32efe..520267fb871 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -71,6 +71,7 @@ var ( LogInRememberDays int CookieUserName string CookieRememberName string + DisableGravatar bool // User settings AllowUserSignUp bool @@ -358,6 +359,8 @@ func NewConfigContext(args *CommandLineArgs) { LogInRememberDays = security.Key("login_remember_days").MustInt() CookieUserName = security.Key("cookie_username").String() CookieRememberName = security.Key("cookie_remember_name").String() + DisableGravatar = security.Key("disable_gravatar").MustBool(true) + // admin AdminUser = security.Key("admin_user").String() AdminPassword = security.Key("admin_password").String() diff --git a/public/app/plugins/datasource/influxdb_08/datasource.js b/public/app/plugins/datasource/influxdb_08/datasource.js index 7462bdb41b9..8ff01c8553f 100644 --- a/public/app/plugins/datasource/influxdb_08/datasource.js +++ b/public/app/plugins/datasource/influxdb_08/datasource.js @@ -42,9 +42,9 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { query = query.replace(/\$interval/g, (target.interval || options.interval)); // replace templated variables - query = templateSrv.replace(query); + query = templateSrv.replace(query, options.scopedVars); - var alias = target.alias ? templateSrv.replace(target.alias) : ''; + var alias = target.alias ? templateSrv.replace(target.alias, options.scopedVars) : ''; var handleResponse = _.partial(handleInfluxQueryResponse, alias, queryBuilder.groupByField); return this._seriesQuery(query).then(handleResponse); diff --git a/public/img/user_profile.png b/public/img/user_profile.png new file mode 100644 index 0000000000000000000000000000000000000000..bc492598e4fa5982c4bee100a50d35865d77a610 GIT binary patch literal 1486 zcmex=_1P|rX?qqI0P zFI~aY%U!`Mz|~!$%*;qrN1?DZF(6Oj-S5fuR$!pIEN!@|nR z%E~Fi%grl7GWdUhL6CzXiXn=bQHg;`kdaxC@&6G9d7vj*8Nq-73K*GyZe(NU;N;>4 zD%dK(z{JSR%*4VBay3wOEl{3;MUYiU(a@1iI53f2sZhkIapFP_Wv7h?MT0JWP%%y_ zYU1P)6PJ*bQdLve(9|+9H8Z!cv~qTFb#wRd^a>6M4GWKmj7m;PO-s+n%qlJ^Ei136 ztZHs)ZENr7?3y%r%G7DoXUv?nXz`Mz%a*TLxoXqqEnBy3-?4Mop~FXx9y@;G&P778mFHFAhJOE?_w-yD~F_amQ+_y1B)x?zv`X3r?%#6LtUj zAVl=_eJ&fjX;scyMQV9^og5y&H#YZQX{y&^n0$CYx5-;8mC1qs8T@y>3YnxF{Kop9 z{nXOH7qfCaH|ppH+V4^fu%8;csKIh?`onjftB>7(u{zW6rS68C{Rax_wLaO4R``8B zw7p65qYD3gtx|dI{ui~YUvQoIsMaptv8B4(lHtx_!;SKV$DRLGr#0A>KkJ(0aZ6KH zwrtm=C344RJMcd130|>)smtf$tp>4utsiD-{YduYviPl&{_&Rauj}V6*Ju5RU8}bA z;g)SWHouLZZu)+!GWf4O7sH#1#UGX|Y7qYbq*l$^wv?}b*_}8)hb|GF+VhD&=4mh= ztO@Cur*_qeaZ9Y{e};upr&sFb$-R4)`NVRPo8Iv|b7pn#WzZFwxu`*?=izkS-(D?!Bu@D99&bkP6;5Z^PZrFv`e%E5 z;{yKq#%|fkNB&9d{;>Dw_MOs?b7m}y-}U&HeAaQb2A)gLdM*_@aCaGcN8e++=(h7w zw1-SyEB|Z_+pCqw9~Ib3F?^Zd_D?95-zWO!<-b->i%&c=c_sd;YW}~iWs%ROizGD& zn=H84W$3_`aaLln2;=lewruy0%!=7o+`#$F(t2^3(jKONhjPunWk+65xoGGn_h{eb zqm|*uctsp5vsWH7P?HN;!v9FVev%U@5b zpRnF|ebf&#`$xXD{~2PB|7+4 Date: Fri, 1 May 2015 08:52:34 +0200 Subject: [PATCH 102/398] Added new graphite function spec, weightedAverage, Closes #1879 --- public/app/plugins/datasource/graphite/gfunc.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/public/app/plugins/datasource/graphite/gfunc.js b/public/app/plugins/datasource/graphite/gfunc.js index 7190fbf0295..063fc473f88 100644 --- a/public/app/plugins/datasource/graphite/gfunc.js +++ b/public/app/plugins/datasource/graphite/gfunc.js @@ -530,6 +530,16 @@ function (_, $) { defaultParams: [10] }); + addFuncDef({ + name: 'weightedAverage', + category: categories.Filter, + params: [ + { name: 'other', type: 'value_or_series', optional: true }, + { name: "node", type: "int", options: [0,1,2,3,4,5,6,7,8,9,10,12] }, + ], + defaultParams: ['#A', 4] + }); + addFuncDef({ name: 'movingMedian', category: categories.Filter, From e771d8e944b5fe80d27e25abaec39bd5258b229d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 1 May 2015 09:48:07 +0200 Subject: [PATCH 103/398] Organization: You can now update the organization user role directly (without removing and readding the organization user). Closes #1899 --- CHANGELOG.md | 3 +++ pkg/api/api.go | 1 + pkg/api/org_users.go | 17 ++++++++++++++++ pkg/models/org_user.go | 9 +++++++++ pkg/services/sqlstore/org_test.go | 13 ++++++++++++ pkg/services/sqlstore/org_users.go | 20 +++++++++++++++++++ public/app/features/org/orgUsersCtrl.js | 4 ++++ .../app/features/org/partials/orgUsers.html | 5 +++-- public/app/services/backendSrv.js | 4 ++++ 9 files changed, 74 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 517fa82779b..22e4f5482b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ - [Issue #1144](https://github.com/grafana/grafana/issues/1144). Templating: You can now select multiple template variables values at the same time. - [Issue #1888](https://github.com/grafana/grafana/issues/1144). Templating: Repeat panel or row for each selected template variable value +**User or Organization admin** +- [Issue #1899](https://github.com/grafana/grafana/issues/1899). Organization: You can now update the organization user role directly (without removing and readding the organization user). + **Backend** - [Issue #1905](https://github.com/grafana/grafana/issues/1905). Github OAuth: You can now configure a Github team membership requirement, thx @dewski - [Issue #1891](https://github.com/grafana/grafana/issues/1891). Security: New config option to disable the use of gravatar for profile images diff --git a/pkg/api/api.go b/pkg/api/api.go index 6482beb075c..d281d94419f 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -71,6 +71,7 @@ func Register(r *macaron.Macaron) { r.Put("/", bind(m.UpdateOrgCommand{}), UpdateOrg) r.Post("/users", bind(m.AddOrgUserCommand{}), AddOrgUser) r.Get("/users", GetOrgUsers) + r.Patch("/users/:id", bind(m.UpdateOrgUserCommand{}), UpdateOrgUser) r.Delete("/users/:id", RemoveOrgUser) }, reqAccountAdmin) diff --git a/pkg/api/org_users.go b/pkg/api/org_users.go index 123ba08c4c7..8a372c791b9 100644 --- a/pkg/api/org_users.go +++ b/pkg/api/org_users.go @@ -48,6 +48,23 @@ func GetOrgUsers(c *middleware.Context) { c.JSON(200, query.Result) } +func UpdateOrgUser(c *middleware.Context, cmd m.UpdateOrgUserCommand) { + if !cmd.Role.IsValid() { + c.JsonApiErr(400, "Invalid role specified", nil) + return + } + + cmd.UserId = c.ParamsInt64(":id") + cmd.OrgId = c.OrgId + + if err := bus.Dispatch(&cmd); err != nil { + c.JsonApiErr(500, "Failed update org user", err) + return + } + + c.JsonOK("Organization user updated") +} + func RemoveOrgUser(c *middleware.Context) { userId := c.ParamsInt64(":id") diff --git a/pkg/models/org_user.go b/pkg/models/org_user.go index 811d02e1afe..3e40fd24b68 100644 --- a/pkg/models/org_user.go +++ b/pkg/models/org_user.go @@ -9,6 +9,7 @@ import ( var ( ErrInvalidRoleType = errors.New("Invalid role type") ErrLastOrgAdmin = errors.New("Cannot remove last organization admin") + ErrOrgUserNotFound = errors.New("Cannot find the organization user") ) type RoleType string @@ -24,6 +25,7 @@ func (r RoleType) IsValid() bool { } type OrgUser struct { + Id int64 OrgId int64 UserId int64 Role RoleType @@ -47,6 +49,13 @@ type AddOrgUserCommand struct { UserId int64 `json:"-"` } +type UpdateOrgUserCommand struct { + Role RoleType `json:"role" binding:"Required"` + + OrgId int64 `json:"-"` + UserId int64 `json:"-"` +} + // ---------------------- // QUERIES diff --git a/pkg/services/sqlstore/org_test.go b/pkg/services/sqlstore/org_test.go index 0e20919709b..7d98da076e0 100644 --- a/pkg/services/sqlstore/org_test.go +++ b/pkg/services/sqlstore/org_test.go @@ -80,6 +80,19 @@ func TestAccountDataAccess(t *testing.T) { So(err, ShouldBeNil) }) + Convey("Can update org user role", func() { + updateCmd := m.UpdateOrgUserCommand{OrgId: ac1.OrgId, UserId: ac2.Id, Role: m.ROLE_ADMIN} + err = UpdateOrgUser(&updateCmd) + So(err, ShouldBeNil) + + orgUsersQuery := m.GetOrgUsersQuery{OrgId: ac1.OrgId} + err = GetOrgUsers(&orgUsersQuery) + So(err, ShouldBeNil) + + So(orgUsersQuery.Result[1].Role, ShouldEqual, m.ROLE_ADMIN) + + }) + Convey("Can get logged in user projection", func() { query := m.GetSignedInUserQuery{UserId: ac2.Id} err := GetSignedInUser(&query) diff --git a/pkg/services/sqlstore/org_users.go b/pkg/services/sqlstore/org_users.go index eaca01ce12c..3502cd97d60 100644 --- a/pkg/services/sqlstore/org_users.go +++ b/pkg/services/sqlstore/org_users.go @@ -14,6 +14,7 @@ func init() { bus.AddHandler("sql", AddOrgUser) bus.AddHandler("sql", RemoveOrgUser) bus.AddHandler("sql", GetOrgUsers) + bus.AddHandler("sql", UpdateOrgUser) } func AddOrgUser(cmd *m.AddOrgUserCommand) error { @@ -32,6 +33,25 @@ func AddOrgUser(cmd *m.AddOrgUserCommand) error { }) } +func UpdateOrgUser(cmd *m.UpdateOrgUserCommand) error { + return inTransaction(func(sess *xorm.Session) error { + var orgUser m.OrgUser + exists, err := sess.Where("org_id=? AND user_id=?", cmd.OrgId, cmd.UserId).Get(&orgUser) + if err != nil { + return err + } + + if !exists { + return m.ErrOrgUserNotFound + } + + orgUser.Role = cmd.Role + orgUser.Updated = time.Now() + _, err = sess.Id(orgUser.Id).Update(&orgUser) + return err + }) +} + func GetOrgUsers(query *m.GetOrgUsersQuery) error { query.Result = make([]*m.OrgUserDTO, 0) sess := x.Table("org_user") diff --git a/public/app/features/org/orgUsersCtrl.js b/public/app/features/org/orgUsersCtrl.js index d679a8dab98..9623e2566a7 100644 --- a/public/app/features/org/orgUsersCtrl.js +++ b/public/app/features/org/orgUsersCtrl.js @@ -23,6 +23,10 @@ function (angular) { }); }; + $scope.updateOrgUser = function(user) { + backendSrv.patch('/api/org/users/' + user.userId, user); + }; + $scope.removeUser = function(user) { backendSrv.delete('/api/org/users/' + user.userId).then($scope.get); }; diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html index c14a44efef7..8b1829437c7 100644 --- a/public/app/features/org/partials/orgUsers.html +++ b/public/app/features/org/partials/orgUsers.html @@ -35,7 +35,7 @@
    - +
    @@ -46,7 +46,8 @@ From 62e8841e8cf2f63ec3a18eb6a6dd9c16d3b57a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 May 2015 17:54:12 +0200 Subject: [PATCH 190/398] Fixed spelling of Peta unit Quadr --- public/app/components/kbn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/components/kbn.js b/public/app/components/kbn.js index ef1e45c23d3..15a4c7637c3 100644 --- a/public/app/components/kbn.js +++ b/public/app/components/kbn.js @@ -384,7 +384,7 @@ function($, _, moment) { kbn.valueFormats.gbytes = kbn.formatFuncCreator(1024, [' GiB', ' TiB', ' PiB', ' EiB', ' ZiB', ' YiB']); kbn.valueFormats.bps = kbn.formatFuncCreator(1000, [' bps', ' Kbps', ' Mbps', ' Gbps', ' Tbps', ' Pbps', ' Ebps', ' Zbps', ' Ybps']); kbn.valueFormats.Bps = kbn.formatFuncCreator(1000, [' Bps', ' KBps', ' MBps', ' GBps', ' TBps', ' PBps', ' EBps', ' ZBps', ' YBps']); - kbn.valueFormats.short = kbn.formatFuncCreator(1000, ['', ' K', ' Mil', ' Bil', ' Tri', ' Qaudr', ' Quint', ' Sext', ' Sept']); + kbn.valueFormats.short = kbn.formatFuncCreator(1000, ['', ' K', ' Mil', ' Bil', ' Tri', ' Quadr', ' Quint', ' Sext', ' Sept']); kbn.valueFormats.joule = kbn.formatFuncCreator(1000, [' J', ' kJ', ' MJ', ' GJ', ' TJ', ' PJ', ' EJ', ' ZJ', ' YJ']); kbn.valueFormats.amp = kbn.formatFuncCreator(1000, [' A', ' kA', ' MA', ' GA', ' TA', ' PA', ' EA', ' ZA', ' YA']); kbn.valueFormats.volt = kbn.formatFuncCreator(1000, [' V', ' kV', ' MV', ' GV', ' TV', ' PV', ' EV', ' ZV', ' YV']); From fbc6bb21123d3bb97efe61c19abe7896e3a741a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 May 2015 19:06:19 +0200 Subject: [PATCH 191/398] More refactoring of user http api, trying to reuse handlers for sign in user and admin operations --- pkg/api/admin_users.go | 46 ------------------- pkg/api/api.go | 7 ++- pkg/api/common.go | 17 +++++-- pkg/api/user.go | 26 +++++++++-- pkg/services/sqlstore/user.go | 9 ++-- .../app/features/admin/adminEditUserCtrl.js | 4 +- 6 files changed, 45 insertions(+), 64 deletions(-) diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go index f7e8fca2b5e..23cfc826ed2 100644 --- a/pkg/api/admin_users.go +++ b/pkg/api/admin_users.go @@ -19,26 +19,6 @@ func AdminSearchUsers(c *middleware.Context) { c.JSON(200, query.Result) } -func AdminGetUser(c *middleware.Context) { - userId := c.ParamsInt64(":id") - - query := m.GetUserByIdQuery{Id: userId} - - if err := bus.Dispatch(&query); err != nil { - c.JsonApiErr(500, "Failed to fetch user", err) - return - } - - result := dtos.AdminUserListItem{ - Name: query.Result.Name, - Email: query.Result.Email, - Login: query.Result.Login, - IsGrafanaAdmin: query.Result.IsAdmin, - } - - c.JSON(200, result) -} - func AdminCreateUser(c *middleware.Context, form dtos.AdminCreateUserForm) { cmd := m.CreateUserCommand{ Login: form.Login, @@ -70,32 +50,6 @@ func AdminCreateUser(c *middleware.Context, form dtos.AdminCreateUserForm) { c.JsonOK("User created") } -func AdminUpdateUser(c *middleware.Context, form dtos.AdminUpdateUserForm) { - userId := c.ParamsInt64(":id") - - cmd := m.UpdateUserCommand{ - UserId: userId, - Login: form.Login, - Email: form.Email, - Name: form.Name, - } - - if len(cmd.Login) == 0 { - cmd.Login = cmd.Email - if len(cmd.Login) == 0 { - c.JsonApiErr(400, "Validation error, need specify either username or email", nil) - return - } - } - - if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "failed to update user", err) - return - } - - c.JsonOK("User updated") -} - func AdminUpdateUserPassword(c *middleware.Context, form dtos.AdminUpdateUserPasswordForm) { userId := c.ParamsInt64(":id") diff --git a/pkg/api/api.go b/pkg/api/api.go index cfc1f50b98e..a84c753c7ba 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -56,7 +56,7 @@ func Register(r *macaron.Macaron) { // user r.Group("/user", func() { r.Get("/", wrap(GetSignedInUser)) - r.Put("/", bind(m.UpdateUserCommand{}), UpdateUser) + r.Put("/", bind(m.UpdateUserCommand{}), wrap(UpdateSignedInUser)) r.Post("/using/:id", UserSetUsingOrg) r.Get("/orgs", wrap(GetSignedInUserOrgList)) r.Post("/stars/dashboard/:id", StarDashboard) @@ -66,8 +66,9 @@ func Register(r *macaron.Macaron) { // users r.Group("/users", func() { - r.Get("/:id/", wrap(GetUserById)) + r.Get("/:id", wrap(GetUserById)) r.Get("/:id/org", wrap(GetUserOrgList)) + r.Put("/:id", bind(m.UpdateUserCommand{}), wrap(UpdateUser)) }, reqGrafanaAdmin) // account @@ -122,9 +123,7 @@ func Register(r *macaron.Macaron) { r.Group("/api/admin", func() { r.Get("/settings", AdminGetSettings) r.Get("/users", AdminSearchUsers) - r.Get("/users/:id", AdminGetUser) r.Post("/users", bind(dtos.AdminCreateUserForm{}), AdminCreateUser) - r.Put("/users/:id/details", bind(dtos.AdminUpdateUserForm{}), AdminUpdateUser) r.Put("/users/:id/password", bind(dtos.AdminUpdateUserPasswordForm{}), AdminUpdateUserPassword) r.Put("/users/:id/permissions", bind(dtos.AdminUpdateUserPermissionsForm{}), AdminUpdateUserPermissions) r.Delete("/users/:id", AdminDeleteUser) diff --git a/pkg/api/common.go b/pkg/api/common.go index 8757318159e..4d8b3c28032 100644 --- a/pkg/api/common.go +++ b/pkg/api/common.go @@ -26,12 +26,17 @@ type NormalResponse struct { header http.Header } -func wrap(action func(c *middleware.Context) Response) macaron.Handler { +func wrap(action interface{}) macaron.Handler { + return func(c *middleware.Context) { - res := action(c) - if res == nil { + var res Response + val, err := c.Invoke(action) + if err == nil && val != nil && len(val) > 0 { + res = val[0].Interface().(Response) + } else { res = ServerError } + res.WriteTo(c.Resp) } } @@ -64,6 +69,12 @@ func Json(status int, body interface{}) *NormalResponse { return Respond(status, body).Header("Content-Type", "application/json") } +func ApiSuccess(message string) *NormalResponse { + resp := make(map[string]interface{}) + resp["message"] = message + return Respond(200, resp) +} + func ApiError(status int, message string, err error) *NormalResponse { resp := make(map[string]interface{}) diff --git a/pkg/api/user.go b/pkg/api/user.go index e7cc8ff0366..1b5654ce1f0 100644 --- a/pkg/api/user.go +++ b/pkg/api/user.go @@ -27,15 +27,31 @@ func getUserUserProfile(userId int64) Response { return Json(200, query.Result) } -func UpdateUser(c *middleware.Context, cmd m.UpdateUserCommand) { +// POST /api/user +func UpdateSignedInUser(c *middleware.Context, cmd m.UpdateUserCommand) Response { cmd.UserId = c.UserId + return handleUpdateUser(cmd) +} - if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(400, "Failed to update user", err) - return +// POST /api/users/:id +func UpdateUser(c *middleware.Context, cmd m.UpdateUserCommand) Response { + cmd.UserId = c.ParamsInt64(":id") + return handleUpdateUser(cmd) +} + +func handleUpdateUser(cmd m.UpdateUserCommand) Response { + if len(cmd.Login) == 0 { + cmd.Login = cmd.Email + if len(cmd.Login) == 0 { + return ApiError(400, "Validation error, need specify either username or email", nil) + } } - c.JsonOK("User updated") + if err := bus.Dispatch(&cmd); err != nil { + return ApiError(500, "failed to update user", err) + } + + return ApiSuccess("User updated") } // GET /api/user/orgs diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go index 663496427ba..b74422b69ca 100644 --- a/pkg/services/sqlstore/user.go +++ b/pkg/services/sqlstore/user.go @@ -231,10 +231,11 @@ func GetUserProfile(query *m.GetUserProfileQuery) error { } query.Result = m.UserProfileDTO{ - Name: user.Name, - Email: user.Email, - Login: user.Login, - Theme: user.Theme, + Name: user.Name, + Email: user.Email, + Login: user.Login, + Theme: user.Theme, + IsGrafanaAdmin: user.IsAdmin, } return err diff --git a/public/app/features/admin/adminEditUserCtrl.js b/public/app/features/admin/adminEditUserCtrl.js index 19deac532ea..72a7dba0229 100644 --- a/public/app/features/admin/adminEditUserCtrl.js +++ b/public/app/features/admin/adminEditUserCtrl.js @@ -17,7 +17,7 @@ function (angular) { }; $scope.getUser = function(id) { - backendSrv.get('/api/admin/users/' + id).then(function(user) { + backendSrv.get('/api/users/' + id).then(function(user) { $scope.user = user; $scope.user_id = id; $scope.permissions.isGrafanaAdmin = user.isGrafanaAdmin; @@ -52,7 +52,7 @@ function (angular) { $scope.update = function() { if (!$scope.userForm.$valid) { return; } - backendSrv.put('/api/admin/users/' + $scope.user_id + '/details', $scope.user).then(function() { + backendSrv.put('/api/users/' + $scope.user_id, $scope.user).then(function() { $location.path('/admin/users'); }); }; From f81bde5643722ebb3e8290e8208347d288f4d935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 May 2015 21:23:40 +0200 Subject: [PATCH 192/398] Refactoring some api handlers to use the new Response return object --- pkg/api/api.go | 6 ++--- pkg/api/apikey.go | 28 ++++++++++------------- public/app/features/org/orgApiKeysCtrl.js | 2 ++ 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index a84c753c7ba..0503ac61a3c 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -84,9 +84,9 @@ func Register(r *macaron.Macaron) { // auth api keys r.Group("/auth/keys", func() { - r.Get("/", GetApiKeys) - r.Post("/", bind(m.AddApiKeyCommand{}), AddApiKey) - r.Delete("/:id", DeleteApiKey) + r.Get("/", wrap(GetApiKeys)) + r.Post("/", bind(m.AddApiKeyCommand{}), wrap(AddApiKey)) + r.Delete("/:id", wrap(DeleteApiKey)) }, reqAccountAdmin) // Data sources diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go index 237fdc48ab0..b2097104aba 100644 --- a/pkg/api/apikey.go +++ b/pkg/api/apikey.go @@ -8,12 +8,11 @@ import ( m "github.com/grafana/grafana/pkg/models" ) -func GetApiKeys(c *middleware.Context) { +func GetApiKeys(c *middleware.Context) Response { query := m.GetApiKeysQuery{OrgId: c.OrgId} if err := bus.Dispatch(&query); err != nil { - c.JsonApiErr(500, "Failed to list api keys", err) - return + return ApiError(500, "Failed to list api keys", err) } result := make([]*m.ApiKeyDTO, len(query.Result)) @@ -24,27 +23,26 @@ func GetApiKeys(c *middleware.Context) { Role: t.Role, } } - c.JSON(200, result) + + return Json(200, result) } -func DeleteApiKey(c *middleware.Context) { +func DeleteApiKey(c *middleware.Context) Response { id := c.ParamsInt64(":id") cmd := &m.DeleteApiKeyCommand{Id: id, OrgId: c.OrgId} err := bus.Dispatch(cmd) if err != nil { - c.JsonApiErr(500, "Failed to delete API key", err) - return + return ApiError(500, "Failed to delete API key", err) } - c.JsonOK("API key deleted") + return ApiSuccess("API key deleted") } -func AddApiKey(c *middleware.Context, cmd m.AddApiKeyCommand) { +func AddApiKey(c *middleware.Context, cmd m.AddApiKeyCommand) Response { if !cmd.Role.IsValid() { - c.JsonApiErr(400, "Invalid role specified", nil) - return + return ApiError(400, "Invalid role specified", nil) } cmd.OrgId = c.OrgId @@ -53,14 +51,12 @@ func AddApiKey(c *middleware.Context, cmd m.AddApiKeyCommand) { cmd.Key = newKeyInfo.HashedKey if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "Failed to add API key", err) - return + return ApiError(500, "Failed to add API key", err) } result := &dtos.NewApiKeyResult{ Name: cmd.Result.Name, - Key: newKeyInfo.ClientSecret, - } + Key: newKeyInfo.ClientSecret} - c.JSON(200, result) + return Json(200, result) } diff --git a/public/app/features/org/orgApiKeysCtrl.js b/public/app/features/org/orgApiKeysCtrl.js index a8b05155401..918f57b42e8 100644 --- a/public/app/features/org/orgApiKeysCtrl.js +++ b/public/app/features/org/orgApiKeysCtrl.js @@ -35,6 +35,8 @@ function (angular) { src: './app/features/org/partials/apikeyModal.html', scope: modalScope }); + + $scope.getTokens(); }); }; From bfe6d5434e70f5ea1c1af6acbb568d5878ab7843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 19 May 2015 08:46:45 +0200 Subject: [PATCH 193/398] Fixed placeholder text in templating editor --- public/app/features/templating/partials/editor.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index 11769e34dfc..a0549414b6a 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -65,7 +65,7 @@ Name
  • - +
  • Type @@ -139,7 +139,7 @@ Query
  • - +
    • From bf9e51928df97ff0bc2895c869697648dd660def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 19 May 2015 09:02:37 +0200 Subject: [PATCH 194/398] Fix to signed in user when user <-> org link is gone --- pkg/services/sqlstore/user.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go index b74422b69ca..9f79081783b 100644 --- a/pkg/services/sqlstore/user.go +++ b/pkg/services/sqlstore/user.go @@ -283,6 +283,11 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error { return m.ErrUserNotFound } + if user.OrgRole == "" { + user.OrgId = -1 + user.OrgName = "Org missing" + } + query.Result = &user return err } From 74bf1f23fb8e217e82aff0c9d7b5e697e0e6a9e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 19 May 2015 09:09:21 +0200 Subject: [PATCH 195/398] Small progress on #2014 --- pkg/api/api.go | 2 +- public/app/features/admin/adminEditUserCtrl.js | 7 +++++++ .../app/features/admin/partials/edit_user.html | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 0503ac61a3c..f45da26d9c2 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -67,7 +67,7 @@ func Register(r *macaron.Macaron) { // users r.Group("/users", func() { r.Get("/:id", wrap(GetUserById)) - r.Get("/:id/org", wrap(GetUserOrgList)) + r.Get("/:id/orgs", wrap(GetUserOrgList)) r.Put("/:id", bind(m.UpdateUserCommand{}), wrap(UpdateUser)) }, reqGrafanaAdmin) diff --git a/public/app/features/admin/adminEditUserCtrl.js b/public/app/features/admin/adminEditUserCtrl.js index 72a7dba0229..dc8839f0f84 100644 --- a/public/app/features/admin/adminEditUserCtrl.js +++ b/public/app/features/admin/adminEditUserCtrl.js @@ -13,6 +13,7 @@ function (angular) { $scope.init = function() { if ($routeParams.id) { $scope.getUser($routeParams.id); + $scope.getUserOrgs($routeParams.id); } }; @@ -49,6 +50,12 @@ function (angular) { }); }; + $scope.getUserOrgs = function(id) { + backendSrv.get('/api/users/' + id + '/orgs').then(function(orgs) { + $scope.orgs = orgs; + }); + }; + $scope.update = function() { if (!$scope.userForm.$valid) { return; } diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html index c82d7705b8d..712aee26d5d 100644 --- a/public/app/features/admin/partials/edit_user.html +++ b/public/app/features/admin/partials/edit_user.html @@ -94,5 +94,21 @@
    +

    + Organizations +

    + +
    Login Email{{user.login}} {{user.email}} - {{user.role}} + diff --git a/public/app/services/backendSrv.js b/public/app/services/backendSrv.js index c208fe3388e..7424d8fcd83 100644 --- a/public/app/services/backendSrv.js +++ b/public/app/services/backendSrv.js @@ -23,6 +23,10 @@ function (angular, _, config) { return this.request({ method: 'POST', url: url, data: data }); }; + this.patch = function(url, data) { + return this.request({ method: 'PATCH', url: url, data: data }); + }; + this.put = function(url, data) { return this.request({ method: 'PUT', url: url, data: data }); }; From 7a8851c5ab75a4c1c0154a7c31fa6681a8c29fe5 Mon Sep 17 00:00:00 2001 From: Anthony Woods Date: Fri, 1 May 2015 17:02:00 +0800 Subject: [PATCH 104/398] default sidemenu to open #54 --- public/app/services/contextSrv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/services/contextSrv.js b/public/app/services/contextSrv.js index 99bbcccf156..700b7f7390c 100644 --- a/public/app/services/contextSrv.js +++ b/public/app/services/contextSrv.js @@ -45,7 +45,7 @@ function (angular, _, store, config) { this.user = new User(); this.isSignedIn = this.user.isSignedIn; this.isGrafanaAdmin = this.user.isGrafanaAdmin; - this.sidemenu = store.getBool('grafana.sidemenu'); + this.sidemenu = store.getBool('grafana.sidemenu', true); this.isEditor = this.hasRole('Editor') || this.hasRole('Admin'); }); }); From e7ac367392df731348dfdac079487d8af8436443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 1 May 2015 11:22:21 +0200 Subject: [PATCH 105/398] SignUp: password strength meter updated, Fixes #1892 --- public/app/controllers/loginCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/controllers/loginCtrl.js b/public/app/controllers/loginCtrl.js index c8856df0690..cda5a085fd3 100644 --- a/public/app/controllers/loginCtrl.js +++ b/public/app/controllers/loginCtrl.js @@ -67,7 +67,7 @@ function (angular, config) { $scope.strengthClass = "password-strength-bad"; return; } - if (newValue.length <= 6) { + if (newValue.length <= 8) { $scope.strengthText = "strength: you can do better."; $scope.strengthClass = "password-strength-ok"; return; From d1e9b6d6ae952b466c2e4a139113568e0f54a41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 1 May 2015 11:55:59 +0200 Subject: [PATCH 106/398] Began work on auth_proxy feature (#1932), and began work on testing http api, and auth middleware --- conf/defaults.ini | 7 ++++++ pkg/cmd/web.go | 2 +- pkg/middleware/middleware_test.go | 40 +++++++++++++++++++++++++++++++ pkg/middleware/session.go | 34 ++++++++++++++++++++++---- pkg/setting/setting.go | 13 ++++++++++ 5 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 pkg/middleware/middleware_test.go diff --git a/conf/defaults.ini b/conf/defaults.ini index 891c04920e1..88218240bac 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -162,6 +162,13 @@ token_url = https://accounts.google.com/o/oauth2/token api_url = https://www.googleapis.com/oauth2/v1/userinfo allowed_domains = +#################################### Auth Proxy ########################## +[auth.proxy] +enabled = false; +header_name = X-WEBAUTH-USER +header_property = username +auto_sign_up = true + #################################### Logging ########################## [log] # Either "console", "file", default is "console" diff --git a/pkg/cmd/web.go b/pkg/cmd/web.go index 7b6014aeb7e..a95d2af2498 100644 --- a/pkg/cmd/web.go +++ b/pkg/cmd/web.go @@ -41,7 +41,7 @@ func newMacaron() *macaron.Macaron { })) m.Use(middleware.GetContextHandler()) - m.Use(middleware.Sessioner(setting.SessionOptions)) + m.Use(middleware.Sessioner(&setting.SessionOptions)) return m } diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go new file mode 100644 index 00000000000..9be76121718 --- /dev/null +++ b/pkg/middleware/middleware_test.go @@ -0,0 +1,40 @@ +package middleware + +import ( + "net/http" + "net/http/httptest" + "testing" + + "github.com/Unknwon/macaron" + "github.com/macaron-contrib/session" + . "github.com/smartystreets/goconvey/convey" +) + +func TestMiddlewareContext(t *testing.T) { + + Convey("Given grafana context", t, func() { + m := macaron.New() + m.Use(GetContextHandler()) + m.Use(Sessioner(&session.Options{})) + + var context *Context + + m.Get("/", func(c *Context) { + context = c + }) + + resp := httptest.NewRecorder() + req, err := http.NewRequest("GET", "/", nil) + So(err, ShouldBeNil) + + m.ServeHTTP(resp, req) + + Convey("Should be able to get grafana context in handlers", func() { + So(context, ShouldNotBeNil) + }) + + Convey("should return 200", func() { + So(resp.Code, ShouldEqual, 200) + }) + }) +} diff --git a/pkg/middleware/session.go b/pkg/middleware/session.go index 71f87b343ff..c0a12cab781 100644 --- a/pkg/middleware/session.go +++ b/pkg/middleware/session.go @@ -16,17 +16,43 @@ const ( ) var sessionManager *session.Manager -var sessionOptions session.Options +var sessionOptions *session.Options func startSessionGC() { sessionManager.GC() time.AfterFunc(time.Duration(sessionOptions.Gclifetime)*time.Second, startSessionGC) } -func Sessioner(options session.Options) macaron.Handler { +func prepareOptions(opt *session.Options) *session.Options { + if len(opt.Provider) == 0 { + opt.Provider = "memory" + } + if len(opt.ProviderConfig) == 0 { + opt.ProviderConfig = "data/sessions" + } + if len(opt.CookieName) == 0 { + opt.CookieName = "grafana_sess" + } + if len(opt.CookiePath) == 0 { + opt.CookiePath = "/" + } + if opt.Gclifetime == 0 { + opt.Gclifetime = 3600 + } + if opt.Maxlifetime == 0 { + opt.Maxlifetime = opt.Gclifetime + } + if opt.IDLength == 0 { + opt.IDLength = 16 + } + + return opt +} + +func Sessioner(options *session.Options) macaron.Handler { var err error - sessionOptions = options - sessionManager, err = session.NewManager(options.Provider, options) + sessionOptions = prepareOptions(options) + sessionManager, err = session.NewManager(options.Provider, *options) if err != nil { panic(err) } diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 520267fb871..b451aad634f 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -87,6 +87,12 @@ var ( AnonymousOrgName string AnonymousOrgRole string + // Auth proxy settings + AuthProxyEnabled bool + AuthProxyHeaderName string + AuthProxyHeaderProperty string + AuthProxyAutoSignUp bool + // Session settings. SessionOptions session.Options @@ -376,6 +382,13 @@ func NewConfigContext(args *CommandLineArgs) { AnonymousOrgName = Cfg.Section("auth.anonymous").Key("org_name").String() AnonymousOrgRole = Cfg.Section("auth.anonymous").Key("org_role").String() + // auth proxy + authProxy := Cfg.Section("auth.proxy") + AuthProxyEnabled = authProxy.Key("enabled").MustBool(false) + AuthProxyHeaderName = authProxy.Key("header_name").String() + AuthProxyHeaderProperty = authProxy.Key("header_property").String() + AuthProxyAutoSignUp = authProxy.Key("auto_sign_up").MustBool(true) + // PhantomJS rendering ImagesDir = filepath.Join(DataPath, "png") PhantomDir = filepath.Join(HomePath, "vendor/phantomjs") From 8d081a081df53432a49fe76e45e5070c5bdbb77b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 1 May 2015 15:01:31 +0200 Subject: [PATCH 107/398] Fixed configuration docs issue, Fixes #1924 --- docs/sources/installation/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index f55561e6668..32c41ca332e 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -135,7 +135,7 @@ The number of days the keep me logged in / remember me cookie lasts. Used for signing keep me logged in / remember me cookies.
    -## [user] +## [users] ### allow_sign_up Set to `false` to prohibit users from being able to sign up / create user accounts. Defaults to `true`. From cb8110cd48edf4445b4679281b207fc5190ac13d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 1 May 2015 16:23:36 +0200 Subject: [PATCH 108/398] Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921 --- pkg/api/api_test.go | 35 ++++++++++++ pkg/middleware/middleware_test.go | 56 ++++++++++++------- pkg/middleware/session.go | 9 ++- .../sqlstore/migrations/migrations_test.go | 43 +++++++------- pkg/services/sqlstore/org_test.go | 1 - pkg/services/sqlstore/xorm.log | 0 pkg/setting/setting.go | 2 +- 7 files changed, 99 insertions(+), 47 deletions(-) create mode 100644 pkg/api/api_test.go delete mode 100644 pkg/services/sqlstore/xorm.log diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go new file mode 100644 index 00000000000..ea3588b0e67 --- /dev/null +++ b/pkg/api/api_test.go @@ -0,0 +1,35 @@ +package api + +import ( + "testing" +) + +func TestHttpApi(t *testing.T) { + + // Convey("Given the grafana api", t, func() { + // ConveyApiScenario("Can sign up", func(c apiTestContext) { + // c.PostJson() + // So(c.Resp, ShouldEqualJsonApiResponse, "User created and logged in") + // }) + // + // m := macaron.New() + // m.Use(middleware.GetContextHandler()) + // m.Use(middleware.Sessioner(&session.Options{})) + // Register(m) + // + // var context *middleware.Context + // m.Get("/", func(c *middleware.Context) { + // context = c + // }) + // + // resp := httptest.NewRecorder() + // req, err := http.NewRequest("GET", "/", nil) + // So(err, ShouldBeNil) + // + // m.ServeHTTP(resp, req) + // + // Convey("should red 200", func() { + // So(resp.Code, ShouldEqual, 200) + // }) + // }) +} diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go index 9be76121718..9bfa73d2df7 100644 --- a/pkg/middleware/middleware_test.go +++ b/pkg/middleware/middleware_test.go @@ -10,31 +10,49 @@ import ( . "github.com/smartystreets/goconvey/convey" ) +type scenarioContext struct { + m *macaron.Macaron + context *Context + resp *httptest.ResponseRecorder +} + +func (sc *scenarioContext) PerformGet(url string) { + req, err := http.NewRequest("GET", "/", nil) + So(err, ShouldBeNil) + sc.m.ServeHTTP(sc.resp, req) +} + +type scenarioFunc func(c *scenarioContext) + +func middlewareScenario(desc string, fn scenarioFunc) { + sc := &scenarioContext{} + + sc.m = macaron.New() + sc.m.Use(GetContextHandler()) + // mock out gc goroutine + startSessionGC = func() {} + sc.m.Use(Sessioner(&session.Options{})) + + sc.m.Get("/", func(c *Context) { + sc.context = c + }) + + sc.resp = httptest.NewRecorder() + fn(sc) +} + func TestMiddlewareContext(t *testing.T) { Convey("Given grafana context", t, func() { - m := macaron.New() - m.Use(GetContextHandler()) - m.Use(Sessioner(&session.Options{})) - - var context *Context - - m.Get("/", func(c *Context) { - context = c + middlewareScenario("middleware should add context to injector", func(sc *scenarioContext) { + sc.PerformGet("/") + So(sc.context, ShouldNotBeNil) }) - resp := httptest.NewRecorder() - req, err := http.NewRequest("GET", "/", nil) - So(err, ShouldBeNil) - - m.ServeHTTP(resp, req) - - Convey("Should be able to get grafana context in handlers", func() { - So(context, ShouldNotBeNil) + middlewareScenario("Default middleware should allow get request", func(sc *scenarioContext) { + sc.PerformGet("/") + So(sc.resp.Code, ShouldEqual, 200) }) - Convey("should return 200", func() { - So(resp.Code, ShouldEqual, 200) - }) }) } diff --git a/pkg/middleware/session.go b/pkg/middleware/session.go index c0a12cab781..7b036b9790e 100644 --- a/pkg/middleware/session.go +++ b/pkg/middleware/session.go @@ -17,10 +17,13 @@ const ( var sessionManager *session.Manager var sessionOptions *session.Options +var startSessionGC func() -func startSessionGC() { - sessionManager.GC() - time.AfterFunc(time.Duration(sessionOptions.Gclifetime)*time.Second, startSessionGC) +func init() { + startSessionGC = func() { + sessionManager.GC() + time.AfterFunc(time.Duration(sessionOptions.Gclifetime)*time.Second, startSessionGC) + } } func prepareOptions(opt *session.Options) *session.Options { diff --git a/pkg/services/sqlstore/migrations/migrations_test.go b/pkg/services/sqlstore/migrations/migrations_test.go index d4ba97450f7..0278ea6632b 100644 --- a/pkg/services/sqlstore/migrations/migrations_test.go +++ b/pkg/services/sqlstore/migrations/migrations_test.go @@ -1,12 +1,9 @@ package migrations import ( - "fmt" - "strings" "testing" "github.com/go-xorm/xorm" - "github.com/grafana/grafana/pkg/log" . "github.com/grafana/grafana/pkg/services/sqlstore/migrator" "github.com/grafana/grafana/pkg/services/sqlstore/sqlutil" @@ -16,7 +13,7 @@ import ( var indexTypes = []string{"Unknown", "INDEX", "UNIQUE INDEX"} func TestMigrations(t *testing.T) { - log.NewLogger(0, "console", `{"level": 0}`) + //log.NewLogger(0, "console", `{"level": 0}`) testDBs := []sqlutil.TestDB{ sqlutil.TestDB_Sqlite3, @@ -31,30 +28,30 @@ func TestMigrations(t *testing.T) { sqlutil.CleanDB(x) mg := NewMigrator(x) - mg.LogLevel = log.DEBUG + //mg.LogLevel = log.DEBUG AddMigrations(mg) err = mg.Start() So(err, ShouldBeNil) - tables, err := x.DBMetas() - So(err, ShouldBeNil) - - fmt.Printf("\nDB Schema after migration: table count: %v\n", len(tables)) - - for _, table := range tables { - fmt.Printf("\nTable: %v \n", table.Name) - for _, column := range table.Columns() { - fmt.Printf("\t %v \n", column.String(x.Dialect())) - } - - if len(table.Indexes) > 0 { - fmt.Printf("\n\tIndexes:\n") - for _, index := range table.Indexes { - fmt.Printf("\t %v (%v) %v \n", index.Name, strings.Join(index.Cols, ","), indexTypes[index.Type]) - } - } - } + // tables, err := x.DBMetas() + // So(err, ShouldBeNil) + // + // fmt.Printf("\nDB Schema after migration: table count: %v\n", len(tables)) + // + // for _, table := range tables { + // fmt.Printf("\nTable: %v \n", table.Name) + // for _, column := range table.Columns() { + // fmt.Printf("\t %v \n", column.String(x.Dialect())) + // } + // + // if len(table.Indexes) > 0 { + // fmt.Printf("\n\tIndexes:\n") + // for _, index := range table.Indexes { + // fmt.Printf("\t %v (%v) %v \n", index.Name, strings.Join(index.Cols, ","), indexTypes[index.Type]) + // } + // } + // } }) } } diff --git a/pkg/services/sqlstore/org_test.go b/pkg/services/sqlstore/org_test.go index 7d98da076e0..1b230e349ff 100644 --- a/pkg/services/sqlstore/org_test.go +++ b/pkg/services/sqlstore/org_test.go @@ -10,7 +10,6 @@ import ( ) func TestAccountDataAccess(t *testing.T) { - Convey("Testing Account DB Access", t, func() { InitTestDB(t) diff --git a/pkg/services/sqlstore/xorm.log b/pkg/services/sqlstore/xorm.log deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index b451aad634f..f3c738af780 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -122,7 +122,7 @@ type CommandLineArgs struct { func init() { IsWindows = runtime.GOOS == "windows" - log.NewLogger(0, "console", `{"level": 0}`) + //log.NewLogger(0, "console", `{"level": 0}`) } func parseAppUrlAndSubUrl(section *ini.Section) (string, string) { From f416e2d1ac9812e8236f13ec831fe6c01783074d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 1 May 2015 22:26:16 +0200 Subject: [PATCH 109/398] More middleware unit test, starting to look really good --- pkg/middleware/middleware_test.go | 92 ++++++++++++++++++++++++++----- pkg/setting/setting.go | 2 +- 2 files changed, 79 insertions(+), 15 deletions(-) diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go index 9bfa73d2df7..e8e75465c82 100644 --- a/pkg/middleware/middleware_test.go +++ b/pkg/middleware/middleware_test.go @@ -1,44 +1,68 @@ package middleware import ( + "encoding/json" "net/http" "net/http/httptest" + "path/filepath" "testing" "github.com/Unknwon/macaron" + "github.com/grafana/grafana/pkg/bus" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/util" "github.com/macaron-contrib/session" . "github.com/smartystreets/goconvey/convey" ) type scenarioContext struct { - m *macaron.Macaron - context *Context - resp *httptest.ResponseRecorder + m *macaron.Macaron + context *Context + resp *httptest.ResponseRecorder + apiKey string + respJson map[string]interface{} } func (sc *scenarioContext) PerformGet(url string) { req, err := http.NewRequest("GET", "/", nil) So(err, ShouldBeNil) + if sc.apiKey != "" { + req.Header.Add("Authorization", "Bearer "+sc.apiKey) + } sc.m.ServeHTTP(sc.resp, req) + + if sc.resp.Header().Get("Content-Type") == "application/json; charset=UTF-8" { + err := json.NewDecoder(sc.resp.Body).Decode(&sc.respJson) + So(err, ShouldBeNil) + } } type scenarioFunc func(c *scenarioContext) +type reqModifier func(c *http.Request) func middlewareScenario(desc string, fn scenarioFunc) { - sc := &scenarioContext{} + Convey(desc, func() { + sc := &scenarioContext{} + viewsPath, _ := filepath.Abs("../../public/views") - sc.m = macaron.New() - sc.m.Use(GetContextHandler()) - // mock out gc goroutine - startSessionGC = func() {} - sc.m.Use(Sessioner(&session.Options{})) + sc.m = macaron.New() + sc.m.Use(macaron.Renderer(macaron.RenderOptions{ + Directory: viewsPath, + Delims: macaron.Delims{Left: "[[", Right: "]]"}, + })) - sc.m.Get("/", func(c *Context) { - sc.context = c + sc.m.Use(GetContextHandler()) + // mock out gc goroutine + startSessionGC = func() {} + sc.m.Use(Sessioner(&session.Options{})) + + sc.m.Get("/", func(c *Context) { + sc.context = c + }) + + sc.resp = httptest.NewRecorder() + fn(sc) }) - - sc.resp = httptest.NewRecorder() - fn(sc) } func TestMiddlewareContext(t *testing.T) { @@ -54,5 +78,45 @@ func TestMiddlewareContext(t *testing.T) { So(sc.resp.Code, ShouldEqual, 200) }) + middlewareScenario("Non api request should init session", func(sc *scenarioContext) { + sc.PerformGet("/") + So(sc.resp.Header().Get("Set-Cookie"), ShouldContainSubstring, "grafana_sess") + }) + + middlewareScenario("Invalid api key", func(sc *scenarioContext) { + sc.apiKey = "invalid_key_test" + sc.PerformGet("/") + + Convey("Should not init session", func() { + So(sc.resp.Header().Get("Set-Cookie"), ShouldBeEmpty) + }) + + Convey("Should return 401", func() { + So(sc.resp.Code, ShouldEqual, 401) + So(sc.respJson["message"], ShouldEqual, "Invalid API key") + }) + }) + + middlewareScenario("Valid api key", func(sc *scenarioContext) { + sc.apiKey = "eyJrIjoidjVuQXdwTWFmRlA2em5hUzR1cmhkV0RMUzU1MTFNNDIiLCJuIjoiYXNkIiwiaWQiOjF9" + keyhash := util.EncodePassword("v5nAwpMafFP6znaS4urhdWDLS5511M42", "asd") + + bus.AddHandler("test", func(query *m.GetApiKeyByNameQuery) error { + query.Result = &m.ApiKey{OrgId: 12, Role: m.ROLE_EDITOR, Key: keyhash} + return nil + }) + + sc.PerformGet("/") + + Convey("Should return 200", func() { + So(sc.resp.Code, ShouldEqual, 200) + }) + + Convey("Should init middleware context", func() { + So(sc.context.OrgId, ShouldEqual, 12) + So(sc.context.OrgRole, ShouldEqual, m.ROLE_EDITOR) + }) + }) + }) } diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index f3c738af780..b451aad634f 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -122,7 +122,7 @@ type CommandLineArgs struct { func init() { IsWindows = runtime.GOOS == "windows" - //log.NewLogger(0, "console", `{"level": 0}`) + log.NewLogger(0, "console", `{"level": 0}`) } func parseAppUrlAndSubUrl(section *ini.Section) (string, string) { From ba883d25fe1f19c115cc3c3e4b6df33ca0f0a9bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 2 May 2015 09:24:56 +0200 Subject: [PATCH 110/398] More middleware unit tests cover all current auth mechanisms --- pkg/bus/bus.go | 4 + pkg/middleware/middleware.go | 3 + pkg/middleware/middleware_test.go | 251 +++++++++++++++++++++--------- 3 files changed, 181 insertions(+), 77 deletions(-) diff --git a/pkg/bus/bus.go b/pkg/bus/bus.go index 2865c740fd1..80b80698a1c 100644 --- a/pkg/bus/bus.go +++ b/pkg/bus/bus.go @@ -121,3 +121,7 @@ func Dispatch(msg Msg) error { func Publish(msg Msg) error { return globalBus.Publish(msg) } + +func ClearBusHandlers() { + globalBus = New() +} diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index b93cd517364..efeee0ac3e7 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -1,6 +1,7 @@ package middleware import ( + "fmt" "strconv" "strings" @@ -78,11 +79,13 @@ func initContextWithUserSessionCookie(ctx *Context) bool { var userId int64 if userId = getRequestUserId(ctx); userId == 0 { + fmt.Printf("Not userId") return false } query := m.GetSignedInUserQuery{UserId: userId} if err := bus.Dispatch(&query); err != nil { + log.Error(3, "Failed to get user with id %v", userId) return false } else { ctx.SignedInUser = query.Result diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go index e8e75465c82..ebbf0a1f038 100644 --- a/pkg/middleware/middleware_test.go +++ b/pkg/middleware/middleware_test.go @@ -10,38 +10,131 @@ import ( "github.com/Unknwon/macaron" "github.com/grafana/grafana/pkg/bus" m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/util" "github.com/macaron-contrib/session" . "github.com/smartystreets/goconvey/convey" ) -type scenarioContext struct { - m *macaron.Macaron - context *Context - resp *httptest.ResponseRecorder - apiKey string - respJson map[string]interface{} +func TestMiddlewareContext(t *testing.T) { + + Convey("Given the grafana middleware", t, func() { + middlewareScenario("middleware should add context to injector", func(sc *scenarioContext) { + sc.fakeReq("GET", "/").exec() + So(sc.context, ShouldNotBeNil) + }) + + middlewareScenario("Default middleware should allow get request", func(sc *scenarioContext) { + sc.fakeReq("GET", "/").exec() + So(sc.resp.Code, ShouldEqual, 200) + }) + + middlewareScenario("Non api request should init session", func(sc *scenarioContext) { + sc.fakeReq("GET", "/").exec() + So(sc.resp.Header().Get("Set-Cookie"), ShouldContainSubstring, "grafana_sess") + }) + + middlewareScenario("Invalid api key", func(sc *scenarioContext) { + sc.apiKey = "invalid_key_test" + sc.fakeReq("GET", "/").exec() + + Convey("Should not init session", func() { + So(sc.resp.Header().Get("Set-Cookie"), ShouldBeEmpty) + }) + + Convey("Should return 401", func() { + So(sc.resp.Code, ShouldEqual, 401) + So(sc.respJson["message"], ShouldEqual, "Invalid API key") + }) + }) + + middlewareScenario("Valid api key", func(sc *scenarioContext) { + keyhash := util.EncodePassword("v5nAwpMafFP6znaS4urhdWDLS5511M42", "asd") + + bus.AddHandler("test", func(query *m.GetApiKeyByNameQuery) error { + query.Result = &m.ApiKey{OrgId: 12, Role: m.ROLE_EDITOR, Key: keyhash} + return nil + }) + + sc.fakeReq("GET", "/").withValidApiKey().exec() + + Convey("Should return 200", func() { + So(sc.resp.Code, ShouldEqual, 200) + }) + + Convey("Should init middleware context", func() { + So(sc.context.IsSignedIn, ShouldEqual, true) + So(sc.context.OrgId, ShouldEqual, 12) + So(sc.context.OrgRole, ShouldEqual, m.ROLE_EDITOR) + }) + }) + + middlewareScenario("Valid api key, but does not match db hash", func(sc *scenarioContext) { + keyhash := "something_not_matching" + + bus.AddHandler("test", func(query *m.GetApiKeyByNameQuery) error { + query.Result = &m.ApiKey{OrgId: 12, Role: m.ROLE_EDITOR, Key: keyhash} + return nil + }) + + sc.fakeReq("GET", "/").withValidApiKey().exec() + + Convey("Should return api key invalid", func() { + So(sc.resp.Code, ShouldEqual, 401) + So(sc.respJson["message"], ShouldEqual, "Invalid API key") + }) + }) + + middlewareScenario("UserId in session", func(sc *scenarioContext) { + + sc.fakeReq("GET", "/").handler(func(c *Context) { + c.Session.Set(SESS_KEY_USERID, int64(12)) + }).exec() + + bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error { + query.Result = &m.SignedInUser{OrgId: 2, UserId: 12} + return nil + }) + + sc.fakeReq("GET", "/").exec() + + Convey("should init context with user info", func() { + So(sc.context.IsSignedIn, ShouldBeTrue) + So(sc.context.UserId, ShouldEqual, 12) + }) + }) + + middlewareScenario("When anonymous access is enabled", func(sc *scenarioContext) { + setting.AnonymousEnabled = true + setting.AnonymousOrgName = "test" + setting.AnonymousOrgRole = string(m.ROLE_EDITOR) + + bus.AddHandler("test", func(query *m.GetOrgByNameQuery) error { + So(query.Name, ShouldEqual, "test") + + query.Result = &m.Org{Id: 2, Name: "test"} + return nil + }) + + sc.fakeReq("GET", "/").exec() + + Convey("should init context with org info", func() { + So(sc.context.UserId, ShouldEqual, 0) + So(sc.context.OrgId, ShouldEqual, 2) + So(sc.context.OrgRole, ShouldEqual, m.ROLE_EDITOR) + }) + + Convey("context signed in should be false", func() { + So(sc.context.IsSignedIn, ShouldBeFalse) + }) + }) + }) } -func (sc *scenarioContext) PerformGet(url string) { - req, err := http.NewRequest("GET", "/", nil) - So(err, ShouldBeNil) - if sc.apiKey != "" { - req.Header.Add("Authorization", "Bearer "+sc.apiKey) - } - sc.m.ServeHTTP(sc.resp, req) - - if sc.resp.Header().Get("Content-Type") == "application/json; charset=UTF-8" { - err := json.NewDecoder(sc.resp.Body).Decode(&sc.respJson) - So(err, ShouldBeNil) - } -} - -type scenarioFunc func(c *scenarioContext) -type reqModifier func(c *http.Request) - func middlewareScenario(desc string, fn scenarioFunc) { Convey(desc, func() { + defer bus.ClearBusHandlers() + sc := &scenarioContext{} viewsPath, _ := filepath.Abs("../../public/views") @@ -58,65 +151,69 @@ func middlewareScenario(desc string, fn scenarioFunc) { sc.m.Get("/", func(c *Context) { sc.context = c + if sc.handlerFunc != nil { + sc.handlerFunc(sc.context) + } }) - sc.resp = httptest.NewRecorder() fn(sc) }) } -func TestMiddlewareContext(t *testing.T) { +type scenarioContext struct { + m *macaron.Macaron + context *Context + resp *httptest.ResponseRecorder + apiKey string + respJson map[string]interface{} + handlerFunc handlerFunc - Convey("Given grafana context", t, func() { - middlewareScenario("middleware should add context to injector", func(sc *scenarioContext) { - sc.PerformGet("/") - So(sc.context, ShouldNotBeNil) - }) - - middlewareScenario("Default middleware should allow get request", func(sc *scenarioContext) { - sc.PerformGet("/") - So(sc.resp.Code, ShouldEqual, 200) - }) - - middlewareScenario("Non api request should init session", func(sc *scenarioContext) { - sc.PerformGet("/") - So(sc.resp.Header().Get("Set-Cookie"), ShouldContainSubstring, "grafana_sess") - }) - - middlewareScenario("Invalid api key", func(sc *scenarioContext) { - sc.apiKey = "invalid_key_test" - sc.PerformGet("/") - - Convey("Should not init session", func() { - So(sc.resp.Header().Get("Set-Cookie"), ShouldBeEmpty) - }) - - Convey("Should return 401", func() { - So(sc.resp.Code, ShouldEqual, 401) - So(sc.respJson["message"], ShouldEqual, "Invalid API key") - }) - }) - - middlewareScenario("Valid api key", func(sc *scenarioContext) { - sc.apiKey = "eyJrIjoidjVuQXdwTWFmRlA2em5hUzR1cmhkV0RMUzU1MTFNNDIiLCJuIjoiYXNkIiwiaWQiOjF9" - keyhash := util.EncodePassword("v5nAwpMafFP6znaS4urhdWDLS5511M42", "asd") - - bus.AddHandler("test", func(query *m.GetApiKeyByNameQuery) error { - query.Result = &m.ApiKey{OrgId: 12, Role: m.ROLE_EDITOR, Key: keyhash} - return nil - }) - - sc.PerformGet("/") - - Convey("Should return 200", func() { - So(sc.resp.Code, ShouldEqual, 200) - }) - - Convey("Should init middleware context", func() { - So(sc.context.OrgId, ShouldEqual, 12) - So(sc.context.OrgRole, ShouldEqual, m.ROLE_EDITOR) - }) - }) - - }) + req *http.Request } + +func (sc *scenarioContext) withValidApiKey() *scenarioContext { + sc.apiKey = "eyJrIjoidjVuQXdwTWFmRlA2em5hUzR1cmhkV0RMUzU1MTFNNDIiLCJuIjoiYXNkIiwiaWQiOjF9" + return sc +} + +func (sc *scenarioContext) withInvalidApiKey() *scenarioContext { + sc.apiKey = "nvalidhhhhds" + return sc +} + +func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext { + sc.resp = httptest.NewRecorder() + req, err := http.NewRequest(method, url, nil) + So(err, ShouldBeNil) + sc.req = req + + // add session cookie from last request + if sc.context != nil { + if sc.context.Session.ID() != "" { + req.Header.Add("Cookie", "grafana_sess="+sc.context.Session.ID()+";") + } + } + + return sc +} + +func (sc *scenarioContext) handler(fn handlerFunc) *scenarioContext { + sc.handlerFunc = fn + return sc +} + +func (sc *scenarioContext) exec() { + if sc.apiKey != "" { + sc.req.Header.Add("Authorization", "Bearer "+sc.apiKey) + } + + sc.m.ServeHTTP(sc.resp, sc.req) + + if sc.resp.Header().Get("Content-Type") == "application/json; charset=UTF-8" { + err := json.NewDecoder(sc.resp.Body).Decode(&sc.respJson) + So(err, ShouldBeNil) + } +} + +type scenarioFunc func(c *scenarioContext) +type handlerFunc func(c *Context) From be589d81c71714a607c26bf33cd88578aafdc456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 2 May 2015 12:06:58 +0200 Subject: [PATCH 111/398] Auth: Support for user authentication via reverse proxy header (like X-Authenticated-User, or X-WEBAUTH-USER), Closes #1921 --- CHANGELOG.md | 2 +- pkg/middleware/auth_proxy.go | 67 +++++++++++++++++++++++++++ pkg/middleware/auth_test.go | 35 +++++++++++++++ pkg/middleware/middleware.go | 3 +- pkg/middleware/middleware_test.go | 75 +++++++++++++++++++++++++++---- pkg/models/user.go | 2 + pkg/services/sqlstore/user.go | 11 ++++- 7 files changed, 182 insertions(+), 13 deletions(-) create mode 100644 pkg/middleware/auth_proxy.go create mode 100644 pkg/middleware/auth_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 22e4f5482b3..a8f21eae095 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ **Backend** - [Issue #1905](https://github.com/grafana/grafana/issues/1905). Github OAuth: You can now configure a Github team membership requirement, thx @dewski - [Issue #1891](https://github.com/grafana/grafana/issues/1891). Security: New config option to disable the use of gravatar for profile images - +- [Issue #1921](https://github.com/grafana/grafana/issues/1921). Auth: Support for user authentication via reverse proxy header (like X-Authenticated-User, or X-WEBAUTH-USER) # 2.0.3 (unreleased - 2.0.x branch) diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go new file mode 100644 index 00000000000..d735779f694 --- /dev/null +++ b/pkg/middleware/auth_proxy.go @@ -0,0 +1,67 @@ +package middleware + +import ( + "github.com/grafana/grafana/pkg/bus" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" +) + +func initContextWithAuthProxy(ctx *Context) bool { + if !setting.AuthProxyEnabled { + return false + } + + proxyHeaderValue := ctx.Req.Header.Get(setting.AuthProxyHeaderName) + if len(proxyHeaderValue) <= 0 { + return false + } + + query := getSignedInUserQueryForProxyAuth(proxyHeaderValue) + if err := bus.Dispatch(query); err != nil { + if err != m.ErrUserNotFound { + ctx.Handle(500, "Failed find user specifed in auth proxy header", err) + return true + } + + if setting.AuthProxyAutoSignUp { + cmd := getCreateUserCommandForProxyAuth(proxyHeaderValue) + if err := bus.Dispatch(cmd); err != nil { + ctx.Handle(500, "Failed to create user specified in auth proxy header", err) + return true + } + query = &m.GetSignedInUserQuery{UserId: cmd.Result.Id} + if err := bus.Dispatch(query); err != nil { + ctx.Handle(500, "Failed find user after creation", err) + return true + } + } + } + + ctx.SignedInUser = query.Result + ctx.IsSignedIn = true + return true +} + +func getSignedInUserQueryForProxyAuth(headerVal string) *m.GetSignedInUserQuery { + query := m.GetSignedInUserQuery{} + if setting.AuthProxyHeaderProperty == "username" { + query.Login = headerVal + } else if setting.AuthProxyHeaderProperty == "email" { + query.Email = headerVal + } else { + panic("Auth proxy header property invalid") + } + return &query +} + +func getCreateUserCommandForProxyAuth(headerVal string) *m.CreateUserCommand { + cmd := m.CreateUserCommand{} + if setting.AuthProxyHeaderProperty == "username" { + cmd.Login = headerVal + } else if setting.AuthProxyHeaderProperty == "email" { + cmd.Email = headerVal + } else { + panic("Auth proxy header property invalid") + } + return &cmd +} diff --git a/pkg/middleware/auth_test.go b/pkg/middleware/auth_test.go new file mode 100644 index 00000000000..81b0f525e98 --- /dev/null +++ b/pkg/middleware/auth_test.go @@ -0,0 +1,35 @@ +package middleware + +import ( + "testing" + + . "github.com/smartystreets/goconvey/convey" +) + +func TestMiddlewareAuth(t *testing.T) { + + Convey("Given the grafana middleware", t, func() { + reqSignIn := Auth(&AuthOptions{ReqSignedIn: true}) + + middlewareScenario("ReqSignIn true and unauthenticated request", func(sc *scenarioContext) { + sc.m.Get("/secure", reqSignIn, sc.defaultHandler) + + sc.fakeReq("GET", "/secure").exec() + + Convey("Should redirect to login", func() { + So(sc.resp.Code, ShouldEqual, 302) + }) + }) + + middlewareScenario("ReqSignIn true and unauthenticated API request", func(sc *scenarioContext) { + sc.m.Get("/api/secure", reqSignIn, sc.defaultHandler) + + sc.fakeReq("GET", "/api/secure").exec() + + Convey("Should return 401", func() { + So(sc.resp.Code, ShouldEqual, 401) + }) + }) + + }) +} diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index efeee0ac3e7..2a6873076c6 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -1,7 +1,6 @@ package middleware import ( - "fmt" "strconv" "strings" @@ -41,6 +40,7 @@ func GetContextHandler() macaron.Handler { // then look for api key in session (special case for render calls via api) // then test if anonymous access is enabled if initContextWithApiKey(ctx) || + initContextWithAuthProxy(ctx) || initContextWithUserSessionCookie(ctx) || initContextWithApiKeyFromSession(ctx) || initContextWithAnonymousUser(ctx) { @@ -79,7 +79,6 @@ func initContextWithUserSessionCookie(ctx *Context) bool { var userId int64 if userId = getRequestUserId(ctx); userId == 0 { - fmt.Printf("Not userId") return false } diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go index ebbf0a1f038..212e250cc1c 100644 --- a/pkg/middleware/middleware_test.go +++ b/pkg/middleware/middleware_test.go @@ -128,6 +128,62 @@ func TestMiddlewareContext(t *testing.T) { So(sc.context.IsSignedIn, ShouldBeFalse) }) }) + + middlewareScenario("When auth_proxy is enabled enabled and user exists", func(sc *scenarioContext) { + setting.AuthProxyEnabled = true + setting.AuthProxyHeaderName = "X-WEBAUTH-USER" + setting.AuthProxyHeaderProperty = "username" + + bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error { + query.Result = &m.SignedInUser{OrgId: 2, UserId: 12} + return nil + }) + + sc.fakeReq("GET", "/") + sc.req.Header.Add("X-WEBAUTH-USER", "torkelo") + sc.exec() + + Convey("should init context with user info", func() { + So(sc.context.IsSignedIn, ShouldBeTrue) + So(sc.context.UserId, ShouldEqual, 12) + So(sc.context.OrgId, ShouldEqual, 2) + }) + }) + + middlewareScenario("When auth_proxy is enabled enabled and user does not exists", func(sc *scenarioContext) { + setting.AuthProxyEnabled = true + setting.AuthProxyHeaderName = "X-WEBAUTH-USER" + setting.AuthProxyHeaderProperty = "username" + setting.AuthProxyAutoSignUp = true + + bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error { + if query.UserId > 0 { + query.Result = &m.SignedInUser{OrgId: 4, UserId: 33} + return nil + } else { + return m.ErrUserNotFound + } + }) + + var createUserCmd *m.CreateUserCommand + bus.AddHandler("test", func(cmd *m.CreateUserCommand) error { + createUserCmd = cmd + cmd.Result = m.User{Id: 33} + return nil + }) + + sc.fakeReq("GET", "/") + sc.req.Header.Add("X-WEBAUTH-USER", "torkelo") + sc.exec() + + Convey("Should create user if auto sign up is enabled", func() { + So(sc.context.IsSignedIn, ShouldBeTrue) + So(sc.context.UserId, ShouldEqual, 33) + So(sc.context.OrgId, ShouldEqual, 4) + + }) + }) + }) } @@ -149,24 +205,27 @@ func middlewareScenario(desc string, fn scenarioFunc) { startSessionGC = func() {} sc.m.Use(Sessioner(&session.Options{})) - sc.m.Get("/", func(c *Context) { + sc.defaultHandler = func(c *Context) { sc.context = c if sc.handlerFunc != nil { sc.handlerFunc(sc.context) } - }) + } + + sc.m.Get("/", sc.defaultHandler) fn(sc) }) } type scenarioContext struct { - m *macaron.Macaron - context *Context - resp *httptest.ResponseRecorder - apiKey string - respJson map[string]interface{} - handlerFunc handlerFunc + m *macaron.Macaron + context *Context + resp *httptest.ResponseRecorder + apiKey string + respJson map[string]interface{} + handlerFunc handlerFunc + defaultHandler macaron.Handler req *http.Request } diff --git a/pkg/models/user.go b/pkg/models/user.go index cdc688d4c1f..68e0001b99c 100644 --- a/pkg/models/user.go +++ b/pkg/models/user.go @@ -89,6 +89,8 @@ type GetUserByIdQuery struct { type GetSignedInUserQuery struct { UserId int64 + Login string + Email string Result *SignedInUser } diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go index 61798d724ef..c2092e963f8 100644 --- a/pkg/services/sqlstore/user.go +++ b/pkg/services/sqlstore/user.go @@ -263,8 +263,15 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error { org.id as org_id FROM ` + dialect.Quote("user") + ` as u LEFT OUTER JOIN org_user on org_user.org_id = u.org_id and org_user.user_id = u.id - LEFT OUTER JOIN org on org.id = u.org_id - WHERE u.id=?` + LEFT OUTER JOIN org on org.id = u.org_id ` + + if query.UserId > 0 { + rawSql += "WHERE u.id=?" + } else if query.Login != "" { + rawSql += "WHERE u.login=?" + } else if query.Email != "" { + rawSql += "WHERE u.email=?" + } var user m.SignedInUser sess := x.Table("user") From 38fc85d6191b5cc948c26a8ae25829142bff52e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 2 May 2015 12:30:53 +0200 Subject: [PATCH 112/398] Final tweaks to auth proxy feature --- conf/defaults.ini | 2 +- conf/sample.ini | 7 +++++++ pkg/middleware/auth_proxy.go | 4 +++- pkg/services/sqlstore/user.go | 10 +++++----- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 88218240bac..b0a085dd991 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -164,7 +164,7 @@ allowed_domains = #################################### Auth Proxy ########################## [auth.proxy] -enabled = false; +enabled = false header_name = X-WEBAUTH-USER header_property = username auto_sign_up = true diff --git a/conf/sample.ini b/conf/sample.ini index aa333cdc5de..e86846da232 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -161,6 +161,13 @@ ;api_url = https://www.googleapis.com/oauth2/v1/userinfo ;allowed_domains = +#################################### Auth Proxy ########################## +[auth.proxy] +;enabled = false +;header_name = X-WEBAUTH-USER +;header_property = username +;auto_sign_up = true + #################################### Logging ########################## [log] # Either "console", "file", default is "console" diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go index d735779f694..42cd91a3ad1 100644 --- a/pkg/middleware/auth_proxy.go +++ b/pkg/middleware/auth_proxy.go @@ -12,7 +12,7 @@ func initContextWithAuthProxy(ctx *Context) bool { } proxyHeaderValue := ctx.Req.Header.Get(setting.AuthProxyHeaderName) - if len(proxyHeaderValue) <= 0 { + if len(proxyHeaderValue) == 0 { return false } @@ -34,6 +34,8 @@ func initContextWithAuthProxy(ctx *Context) bool { ctx.Handle(500, "Failed find user after creation", err) return true } + } else { + return false } } diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go index c2092e963f8..663496427ba 100644 --- a/pkg/services/sqlstore/user.go +++ b/pkg/services/sqlstore/user.go @@ -265,17 +265,17 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error { LEFT OUTER JOIN org_user on org_user.org_id = u.org_id and org_user.user_id = u.id LEFT OUTER JOIN org on org.id = u.org_id ` + sess := x.Table("user") if query.UserId > 0 { - rawSql += "WHERE u.id=?" + sess.Sql(rawSql+"WHERE u.id=?", query.UserId) } else if query.Login != "" { - rawSql += "WHERE u.login=?" + sess.Sql(rawSql+"WHERE u.login=?", query.Login) } else if query.Email != "" { - rawSql += "WHERE u.email=?" + sess.Sql(rawSql+"WHERE u.email=?", query.Email) } var user m.SignedInUser - sess := x.Table("user") - has, err := sess.Sql(rawSql, query.UserId).Get(&user) + has, err := sess.Get(&user) if err != nil { return err } else if !has { From a4a8cd05d298b0f67ca93f2f9f0c7f8f10b1082a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 2 May 2015 16:59:19 +0200 Subject: [PATCH 113/398] Updated to nodejs packages and karma code coverage setup --- package.json | 21 +++++++++------------ tasks/options/karma.js | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 8785632eaee..5016a6309eb 100644 --- a/package.json +++ b/package.json @@ -34,22 +34,19 @@ "grunt-string-replace": "~0.2.4", "grunt-usemin": "3.0.0", "jshint-stylish": "~0.1.5", - "karma": "~0.12.21", + "karma": "~0.12.31", "karma-chrome-launcher": "~0.1.4", "karma-coffee-preprocessor": "~0.1.2", - "karma-coverage": "^0.2.5", - "karma-coveralls": "^0.1.4", + "karma-coverage": "0.3.1", + "karma-coveralls": "0.1.5", "karma-expect": "~1.1.0", - "karma-firefox-launcher": "~0.1.3", - "karma-html2js-preprocessor": "~0.1.0", - "karma-jasmine": "~0.2.2", "karma-mocha": "~0.1.4", - "karma-phantomjs-launcher": "~0.1.4", - "karma-requirejs": "~0.2.1", - "karma-script-launcher": "~0.1.0", - "load-grunt-tasks": "~0.2.0", - "mocha": "~1.16.1", - "requirejs": "~2.1.14", + "karma-phantomjs-launcher": "0.1.4", + "karma-requirejs": "0.2.2", + "karma-script-launcher": "0.1.0", + "load-grunt-tasks": "0.2.0", + "mocha": "2.2.4", + "requirejs": "2.1.17", "rjs-build-analysis": "0.0.3" }, "engines": { diff --git a/tasks/options/karma.js b/tasks/options/karma.js index 630dc19878e..44f11d62a23 100644 --- a/tasks/options/karma.js +++ b/tasks/options/karma.js @@ -16,7 +16,7 @@ module.exports = function(config) { configFile: '<%= srcDir %>/test/karma.conf.js', reporters: ['dots','coverage','coveralls'], preprocessors: { - '<%= srcDir %>/app/**/*.js': ['coverage'] + 'public/app/**/*.js': ['coverage'] }, coverageReporter: { type: 'lcov', From b51a8f11d506f276baf56797b8f2fe66415ef2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 2 May 2015 17:05:07 +0200 Subject: [PATCH 114/398] Added back coveralls coverage --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index c2ea5920bb6..32ace393c8b 100644 --- a/circle.yml +++ b/circle.yml @@ -22,3 +22,4 @@ test: - godep go test -v ./pkg/... # js tests - ./node_modules/grunt-cli/bin/grunt test + - npm run coveralls From 697529d0e832fcfaa058698e87374f41dbec381c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 2 May 2015 17:24:03 +0200 Subject: [PATCH 115/398] Worked on golang code coverage via coveralls --- .gitignore | 1 + test.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100755 test.sh diff --git a/.gitignore b/.gitignore index c3eb5d8862c..99ed4c4adfd 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,5 @@ public/css/*.min.css conf/custom.ini fig.yml +profile.cov diff --git a/test.sh b/test.sh new file mode 100755 index 00000000000..881497029f9 --- /dev/null +++ b/test.sh @@ -0,0 +1,36 @@ +#!/bin/bash +# The script does automatic checking on a Go package and its sub-packages, including: +# 1. gofmt (http://golang.org/cmd/gofmt/) +# 2. goimports (https://github.com/bradfitz/goimports) +# 3. golint (https://github.com/golang/lint) +# 4. go vet (http://golang.org/cmd/vet) +# 5. race detector (http://blog.golang.org/race-detector) +# 6. test coverage (http://blog.golang.org/cover) + +set -e + +# Automatic checks +# test -z "$(gofmt -s -l . | grep -v Godeps/_workspace/src/ | tee /dev/stderr)" +# go vet ./pkg/... +# godep go test -v -race ./pkg/... + +echo "mode: count" > profile.cov + +# Standard go tooling behavior is to ignore dirs with leading underscors +for dir in $(find ./pkg/ -maxdepth 4 -type d); +do +if ls $dir/*.go &> /dev/null; then + godep go test -covermode=count -coverprofile=$dir/profile.tmp $dir + if [ -f $dir/profile.tmp ] + then + cat $dir/profile.tmp | tail -n +2 >> profile.cov + rm $dir/profile.tmp + fi +fi +done + +go tool cover -func profile.cov + +# To submit the test coverage result to coveralls.io, +# use goveralls (https://github.com/mattn/goveralls) +# goveralls -coverprofile=profile.cov -service=travis-ci From 020d7d4939695a80b6c1bae6d0e2bdce9e4528d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 3 May 2015 16:46:46 +0200 Subject: [PATCH 116/398] Update docs, fixed mistake in http api docs, Fixes #1928 --- docs/sources/reference/http_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/reference/http_api.md b/docs/sources/reference/http_api.md index f02741cb37b..c0b63050199 100644 --- a/docs/sources/reference/http_api.md +++ b/docs/sources/reference/http_api.md @@ -121,7 +121,7 @@ Will return the dashboard given the dashboard slug. Slug is the url friendly ver "isStarred": false, "slug": "production-overview" }, - "dashboard": { + "model": { "id": null, "title": "Production Overview", "tags": [ "templated" ], From 73ee8a59857706d027a3285f304d82079d0e89da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 4 May 2015 07:46:46 +0200 Subject: [PATCH 117/398] HTTP API: fix for POST /api/dashboards/db returned 200 ok when dashboard was not found, Fixes #1929 --- pkg/api/dashboard.go | 4 ++++ pkg/models/dashboards.go | 2 +- pkg/services/sqlstore/dashboard.go | 10 ++++++++-- pkg/services/sqlstore/dashboard_test.go | 15 +++++++++++++++ 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 278264f22d7..9ea5089ee7d 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -87,6 +87,10 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) { c.JSON(412, util.DynMap{"status": "version-mismatch", "message": err.Error()}) return } + if err == m.ErrDashboardNotFound { + c.JSON(404, util.DynMap{"status": "not-found", "message": err.Error()}) + return + } c.JsonApiErr(500, "Failed to save dashboard", err) return } diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go index 159d4e1a3c6..234ae74f04a 100644 --- a/pkg/models/dashboards.go +++ b/pkg/models/dashboards.go @@ -10,7 +10,7 @@ import ( // Typed errors var ( - ErrDashboardNotFound = errors.New("Account not found") + ErrDashboardNotFound = errors.New("Dashboard not found") ErrDashboardWithSameNameExists = errors.New("A dashboard with the same name already exists") ErrDashboardVersionMismatch = errors.New("The dashboard has been changed by someone else") ) diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go index 7dbebd94e4c..f4be6d55edf 100644 --- a/pkg/services/sqlstore/dashboard.go +++ b/pkg/services/sqlstore/dashboard.go @@ -48,13 +48,19 @@ func SaveDashboard(cmd *m.SaveDashboardCommand) error { } } + affectedRows := int64(0) + if dash.Id == 0 { metrics.M_Models_Dashboard_Insert.Inc(1) - _, err = sess.Insert(dash) + affectedRows, err = sess.Insert(dash) } else { dash.Version += 1 dash.Data["version"] = dash.Version - _, err = sess.Id(dash.Id).Update(dash) + affectedRows, err = sess.Id(dash.Id).Update(dash) + } + + if affectedRows == 0 { + return m.ErrDashboardNotFound } // delete existing tabs diff --git a/pkg/services/sqlstore/dashboard_test.go b/pkg/services/sqlstore/dashboard_test.go index c7a8053d528..4c6614ed774 100644 --- a/pkg/services/sqlstore/dashboard_test.go +++ b/pkg/services/sqlstore/dashboard_test.go @@ -51,6 +51,21 @@ func TestDashboardDataAccess(t *testing.T) { So(query.Result.Slug, ShouldEqual, "test-dash-23") }) + Convey("Should return error if no dashboard is updated", func() { + cmd := m.SaveDashboardCommand{ + OrgId: 1, + Overwrite: true, + Dashboard: map[string]interface{}{ + "id": float64(123412321), + "title": "Expect error", + "tags": []interface{}{}, + }, + } + + err := SaveDashboard(&cmd) + So(err, ShouldNotBeNil) + }) + Convey("Should be able to search for dashboard", func() { query := m.SearchDashboardsQuery{ Title: "test", From 38d851eb9859d556f99cfb65ef3606b819d579d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 4 May 2015 08:19:29 +0200 Subject: [PATCH 118/398] Another HTTP API fix --- pkg/services/sqlstore/dashboard.go | 38 ++++++++++++++++--------- pkg/services/sqlstore/dashboard_test.go | 18 ++++++++++++ 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go index f4be6d55edf..d34a6fcdd51 100644 --- a/pkg/services/sqlstore/dashboard.go +++ b/pkg/services/sqlstore/dashboard.go @@ -23,21 +23,17 @@ func SaveDashboard(cmd *m.SaveDashboardCommand) error { dash := cmd.GetDashboardModel() // try get existing dashboard - existing := m.Dashboard{Slug: dash.Slug, OrgId: dash.OrgId} - hasExisting, err := sess.Get(&existing) - if err != nil { - return err - } + var existing, sameTitle m.Dashboard - if hasExisting { - // another dashboard with same name - if dash.Id != existing.Id { - if cmd.Overwrite { - dash.Id = existing.Id - } else { - return m.ErrDashboardWithSameNameExists - } + if dash.Id > 0 { + dashWithIdExists, err := sess.Where("id=? AND org_id=?", dash.Id, dash.OrgId).Get(&existing) + if err != nil { + return err } + if !dashWithIdExists { + return m.ErrDashboardNotFound + } + // check for is someone else has written in between if dash.Version != existing.Version { if cmd.Overwrite { @@ -48,6 +44,22 @@ func SaveDashboard(cmd *m.SaveDashboardCommand) error { } } + sameTitleExists, err := sess.Where("org_id=? AND slug=?", dash.OrgId, dash.Slug).Get(&sameTitle) + if err != nil { + return err + } + + if sameTitleExists { + // another dashboard with same name + if dash.Id != sameTitle.Id { + if cmd.Overwrite { + dash.Id = sameTitle.Id + } else { + return m.ErrDashboardWithSameNameExists + } + } + } + affectedRows := int64(0) if dash.Id == 0 { diff --git a/pkg/services/sqlstore/dashboard_test.go b/pkg/services/sqlstore/dashboard_test.go index 4c6614ed774..ad4974af18b 100644 --- a/pkg/services/sqlstore/dashboard_test.go +++ b/pkg/services/sqlstore/dashboard_test.go @@ -66,6 +66,24 @@ func TestDashboardDataAccess(t *testing.T) { So(err, ShouldNotBeNil) }) + Convey("Should not be able to overwrite dashboard in another org", func() { + query := m.GetDashboardQuery{Slug: "test-dash-23", OrgId: 1} + GetDashboard(&query) + + cmd := m.SaveDashboardCommand{ + OrgId: 2, + Overwrite: true, + Dashboard: map[string]interface{}{ + "id": float64(query.Result.Id), + "title": "Expect error", + "tags": []interface{}{}, + }, + } + + err := SaveDashboard(&cmd) + So(err, ShouldNotBeNil) + }) + Convey("Should be able to search for dashboard", func() { query := m.SearchDashboardsQuery{ Title: "test", From e5c11691203fe68958e66693e429f6f5a3c77200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 4 May 2015 08:36:44 +0200 Subject: [PATCH 119/398] HTTP API: GET /api/dashboards/db/:slug response changed property to to match the POST request nameing, Fixes #1928 --- CHANGELOG.md | 3 +++ pkg/api/dashboard.go | 10 +++++----- pkg/api/dashboard_snapshot.go | 6 +++--- pkg/api/dtos/models.go | 6 +++--- public/app/features/dashboard/dashboardCtrl.js | 2 +- public/app/features/panel/soloPanelCtrl.js | 2 +- public/app/routes/dashLoadControllers.js | 12 ++++++------ public/test/specs/soloPanelCtrl-specs.js | 2 +- 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8f21eae095..148d4290907 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ - [Issue #1891](https://github.com/grafana/grafana/issues/1891). Security: New config option to disable the use of gravatar for profile images - [Issue #1921](https://github.com/grafana/grafana/issues/1921). Auth: Support for user authentication via reverse proxy header (like X-Authenticated-User, or X-WEBAUTH-USER) +**Breaking changes** +- [Issue #1928](https://github.com/grafana/grafana/issues/1928). HTTP API: GET /api/dashboards/db/:slug response changed property `model` to `dashboard` to match the POST request nameing + # 2.0.3 (unreleased - 2.0.x branch) **Fixes** diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 9ea5089ee7d..99c408c4e15 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -46,9 +46,9 @@ func GetDashboard(c *middleware.Context) { } dash := query.Result - dto := dtos.Dashboard{ - Model: dash.Data, - Meta: dtos.DashboardMeta{IsStarred: isStarred, Slug: slug}, + dto := dtos.DashboardFullWithMeta{ + Dashboard: dash.Data, + Meta: dtos.DashboardMeta{IsStarred: isStarred, Slug: slug}, } c.JSON(200, dto) @@ -108,10 +108,10 @@ func GetHomeDashboard(c *middleware.Context) { return } - dash := dtos.Dashboard{} + dash := dtos.DashboardFullWithMeta{} dash.Meta.IsHome = true jsonParser := json.NewDecoder(file) - if err := jsonParser.Decode(&dash.Model); err != nil { + if err := jsonParser.Decode(&dash.Dashboard); err != nil { c.JsonApiErr(500, "Failed to load home dashboard", err) return } diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go index fe628d580b1..7bdb6807890 100644 --- a/pkg/api/dashboard_snapshot.go +++ b/pkg/api/dashboard_snapshot.go @@ -45,8 +45,8 @@ func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapsho } func GetDashboardSnapshot(c *middleware.Context) { - key := c.Params(":key") + key := c.Params(":key") query := &m.GetDashboardSnapshotQuery{Key: key} err := bus.Dispatch(query) @@ -63,8 +63,8 @@ func GetDashboardSnapshot(c *middleware.Context) { return } - dto := dtos.Dashboard{ - Model: snapshot.Dashboard, + dto := dtos.DashboardFullWithMeta{ + Dashboard: snapshot.Dashboard, Meta: dtos.DashboardMeta{ IsSnapshot: true, Created: snapshot.Created, diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go index fea88f07550..ce0436eccfa 100644 --- a/pkg/api/dtos/models.go +++ b/pkg/api/dtos/models.go @@ -37,9 +37,9 @@ type DashboardMeta struct { Created time.Time `json:"created"` } -type Dashboard struct { - Meta DashboardMeta `json:"meta"` - Model map[string]interface{} `json:"model"` +type DashboardFullWithMeta struct { + Meta DashboardMeta `json:"meta"` + Dashboard map[string]interface{} `json:"dashboard"` } type DataSource struct { diff --git a/public/app/features/dashboard/dashboardCtrl.js b/public/app/features/dashboard/dashboardCtrl.js index f81b808a0e1..d8772fa3988 100644 --- a/public/app/features/dashboard/dashboardCtrl.js +++ b/public/app/features/dashboard/dashboardCtrl.js @@ -40,7 +40,7 @@ function (angular, $, config) { $rootScope.performance.panelsInitialized = 0; $rootScope.performance.panelsRendered = 0; - var dashboard = dashboardSrv.create(data.model, data.meta); + var dashboard = dashboardSrv.create(data.dashboard, data.meta); // init services timeSrv.init(dashboard); diff --git a/public/app/features/panel/soloPanelCtrl.js b/public/app/features/panel/soloPanelCtrl.js index f593f8ee950..977f634a905 100644 --- a/public/app/features/panel/soloPanelCtrl.js +++ b/public/app/features/panel/soloPanelCtrl.js @@ -41,7 +41,7 @@ function (angular, $) { }; $scope.initPanelScope = function(dashData) { - $scope.dashboard = dashboardSrv.create(dashData.model, dashData.meta); + $scope.dashboard = dashboardSrv.create(dashData.dashboard, dashData.meta); $scope.row = { height: ($(window).height() - 10) + 'px', diff --git a/public/app/routes/dashLoadControllers.js b/public/app/routes/dashLoadControllers.js index f85cee09d84..d26827248ce 100644 --- a/public/app/routes/dashLoadControllers.js +++ b/public/app/routes/dashLoadControllers.js @@ -13,7 +13,7 @@ function (angular, _, kbn, moment, $) { module.controller('DashFromDBCtrl', function($scope, $routeParams, backendSrv) { function dashboardLoadFailed(title) { - $scope.initDashboard({meta: {}, model: {title: title}}, $scope); + $scope.initDashboard({meta: {}, dashboard: {title: title}}, $scope); } if (!$routeParams.slug) { @@ -46,7 +46,7 @@ function (angular, _, kbn, moment, $) { canSave: false, canEdit: false, }, - model: { + dashboard: { title: 'Snapshot not found' } }, $scope); @@ -61,14 +61,14 @@ function (angular, _, kbn, moment, $) { } $scope.initDashboard({ meta: { canShare: false, canStar: false }, - model: window.grafanaImportDashboard + dashboard: window.grafanaImportDashboard }, $scope); }); module.controller('NewDashboardCtrl', function($scope) { $scope.initDashboard({ meta: { canStar: false, canShare: false }, - model: { + dashboard: { title: "New dashboard", rows: [{ height: '250px', panels:[] }] }, @@ -98,7 +98,7 @@ function (angular, _, kbn, moment, $) { file_load($routeParams.jsonFile).then(function(result) { $scope.initDashboard({ meta: { canSave: false, canDelete: false }, - model: result + dashboard: result }, $scope); }); @@ -146,7 +146,7 @@ function (angular, _, kbn, moment, $) { script_load($routeParams.jsFile).then(function(result) { $scope.initDashboard({ meta: {fromScript: true, canDelete: false, canSave: false}, - model: result.data + dashboard: result.data }, $scope); }); diff --git a/public/test/specs/soloPanelCtrl-specs.js b/public/test/specs/soloPanelCtrl-specs.js index 44c9f2080cc..09271c1be03 100644 --- a/public/test/specs/soloPanelCtrl-specs.js +++ b/public/test/specs/soloPanelCtrl-specs.js @@ -34,7 +34,7 @@ define([ beforeEach(function() { var dashboard = { - model: { + dashboard: { rows: [ { panels: [ From 385048b6200f3069b9d158958f70af4d64674f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 4 May 2015 10:13:12 +0200 Subject: [PATCH 120/398] Templating: You can now select multiple template variables values at the same time. Closes #1922 --- CHANGELOG.md | 1 + .../features/templating/templateValuesSrv.js | 4 ++ public/test/specs/helpers.js | 1 + public/test/specs/templateValuesSrv-specs.js | 50 ++++++++++++++++++- 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 148d4290907..523033ef243 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ **New dashboard features** - [Issue #1144](https://github.com/grafana/grafana/issues/1144). Templating: You can now select multiple template variables values at the same time. +- [Issue #1922](https://github.com/grafana/grafana/issues/1922). Templating: Specify multiple variable values via URL params. - [Issue #1888](https://github.com/grafana/grafana/issues/1144). Templating: Repeat panel or row for each selected template variable value **User or Organization admin** diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 9dea95fb083..6db5ce595a2 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -57,6 +57,10 @@ function (angular, _, kbn) { var option = _.findWhere(variable.options, { text: urlValue }); option = option || { text: urlValue, value: urlValue }; + if (_.isArray(urlValue)) { + option.text = urlValue.join(', '); + } + this.updateAutoInterval(variable); return this.setVariableValue(variable, option); }; diff --git a/public/test/specs/helpers.js b/public/test/specs/helpers.js index a9d8a09bfe4..0a0c7b77952 100644 --- a/public/test/specs/helpers.js +++ b/public/test/specs/helpers.js @@ -69,6 +69,7 @@ define([ self.timeSrv = new TimeSrvStub(); self.datasourceSrv = {}; self.backendSrv = {}; + self.$location = {}; self.$routeParams = {}; this.providePhase = function(mocks) { diff --git a/public/test/specs/templateValuesSrv-specs.js b/public/test/specs/templateValuesSrv-specs.js index 323b1495404..2ff287b8b6d 100644 --- a/public/test/specs/templateValuesSrv-specs.js +++ b/public/test/specs/templateValuesSrv-specs.js @@ -10,7 +10,7 @@ define([ var ctx = new helpers.ServiceTestContext(); beforeEach(module('grafana.services')); - beforeEach(ctx.providePhase(['datasourceSrv', 'timeSrv', 'templateSrv', "$routeParams"])); + beforeEach(ctx.providePhase(['datasourceSrv', 'timeSrv', 'templateSrv', '$location'])); beforeEach(ctx.createService('templateValuesSrv')); describe('update interval variable options', function() { @@ -27,11 +27,57 @@ define([ }); }); + describe('when template variable is present in url', function() { + var variable = { + name: 'apps', + current: {text: "test", value: "test"}, + options: [{text: "test", value: "test"}] + }; + + beforeEach(function() { + var dashboard = { templating: { list: [variable] } }; + var urlParams = {}; + urlParams["var-apps"] = "new"; + ctx.$location.search = sinon.stub().returns(urlParams); + ctx.service.init(dashboard); + }); + + it('should update current value', function() { + expect(variable.current.value).to.be("new"); + expect(variable.current.text).to.be("new"); + }); + }); + + describe('when template variable is present in url multiple times', function() { + var variable = { + name: 'apps', + multi: true, + current: {text: "test", value: "test"}, + options: [{text: "test", value: "test"}] + }; + + beforeEach(function() { + var dashboard = { templating: { list: [variable] } }; + var urlParams = {}; + urlParams["var-apps"] = ["new", "other"]; + ctx.$location.search = sinon.stub().returns(urlParams); + ctx.service.init(dashboard); + }); + + it('should update current value', function() { + expect(variable.current.value.length).to.be(2); + expect(variable.current.value[0]).to.be("new"); + expect(variable.current.value[1]).to.be("other"); + expect(variable.current.text).to.be("new, other"); + }); + }); + + function describeUpdateVariable(desc, fn) { describe(desc, function() { var scenario = {}; scenario.setup = function(setupFn) { - scenario.setupFn = setupFn; + scenario.setupFn = setupFn; }; beforeEach(function() { From c628ac9bbbf6943756f383ea9eea47ac7c13d44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 4 May 2015 14:36:46 +0200 Subject: [PATCH 121/398] Upgraded to JQuery 2.1.1 -> 2.1.3, and spectrum.js, Fixes #1932 --- public/app/components/require.config.js | 2 +- public/vendor/jquery/jquery-2.1.1.min.js | 4 - public/vendor/jquery/jquery-2.1.3.js | 9205 ++++++++++++++++++++++ public/vendor/spectrum.js | 841 +- 4 files changed, 9769 insertions(+), 283 deletions(-) delete mode 100644 public/vendor/jquery/jquery-2.1.1.min.js create mode 100644 public/vendor/jquery/jquery-2.1.3.js diff --git a/public/app/components/require.config.js b/public/app/components/require.config.js index c613d1cc705..bbe9674aecf 100644 --- a/public/app/components/require.config.js +++ b/public/app/components/require.config.js @@ -29,7 +29,7 @@ require.config({ 'lodash-src': '../vendor/lodash', bootstrap: '../vendor/bootstrap/bootstrap', - jquery: '../vendor/jquery/jquery-2.1.1.min', + jquery: '../vendor/jquery/jquery-2.1.3', 'extend-jquery': 'components/extend-jquery', diff --git a/public/vendor/jquery/jquery-2.1.1.min.js b/public/vendor/jquery/jquery-2.1.1.min.js deleted file mode 100644 index e5ace116b6f..00000000000 --- a/public/vendor/jquery/jquery-2.1.1.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ -!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
    ",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="    ","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+Math.random()}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b) -},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthx",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*\s*$/g,ib={option:[1,""],thead:[1,"","
    "],col:[2,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("'; - $scope.imageUrl = soloUrl.replace('/dashboard/', '/render/dashboard/'); + $scope.imageUrl = soloUrl.replace('/dashboard', '/render/dashboard'); $scope.imageUrl += '&width=1000'; $scope.imageUrl += '&height=500'; }; diff --git a/public/app/features/panel/soloPanelCtrl.js b/public/app/features/panel/soloPanelCtrl.js index 3d9ea3f499a..55e1c029200 100644 --- a/public/app/features/panel/soloPanelCtrl.js +++ b/public/app/features/panel/soloPanelCtrl.js @@ -7,16 +7,7 @@ function (angular, $) { var module = angular.module('grafana.routes'); - module.controller('SoloPanelCtrl', function( - $scope, - backendSrv, - $routeParams, - dashboardSrv, - timeSrv, - $location, - templateValuesSrv, - dashboardLoaderSrv, - contextSrv) { + module.controller('SoloPanelCtrl', function($scope, $routeParams, $location, dashboardLoaderSrv, contextSrv) { var panelId; @@ -28,7 +19,6 @@ function (angular, $) { dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug).then(function(result) { $scope.initDashboard(result, $scope); - }); $scope.onAppEvent("dashboard-loaded", $scope.initPanelScope); @@ -49,10 +39,7 @@ function (angular, $) { } $scope.panel.span = 12; - $scope.dashboardViewState = { registerPanel: function() { }, state: {}}; - - timeSrv.init($scope.dashboard); - templateValuesSrv.init($scope.dashboard, $scope.dashboardViewState); + $scope.dashboardViewState = {registerPanel: function() { }, state: {}}; }; if (!$scope.skipAutoInit) { diff --git a/public/app/partials/search.html b/public/app/partials/search.html index 1a28ddc74a2..85383042a21 100644 --- a/public/app/partials/search.html +++ b/public/app/partials/search.html @@ -67,7 +67,7 @@ New - + Import diff --git a/public/test/specs/soloPanelCtrl-specs.js b/public/test/specs/soloPanelCtrl-specs.js deleted file mode 100644 index 09271c1be03..00000000000 --- a/public/test/specs/soloPanelCtrl-specs.js +++ /dev/null @@ -1,73 +0,0 @@ -define([ - 'helpers', - 'features/panel/soloPanelCtrl', - 'features/dashboard/dashboardSrv', -], function(helpers) { - 'use strict'; - - describe('SoloPanelCtrl', function() { - var ctx = new helpers.ControllerTestContext(); - var backendSrv = {}; - var routeParams = {}; - var search = {}; - var contextSrv = { - hasRole: sinon.stub().returns(true) - }; - - beforeEach(module('grafana.routes')); - beforeEach(module('grafana.services')); - beforeEach(ctx.providePhase({ - $routeParams: routeParams, - contextSrv: contextSrv, - $location: { - search: function() { - return search; - } - }, - templateValuesSrv: { init: sinon.stub() }, - backendSrv: backendSrv - })); - - beforeEach(ctx.createControllerPhase('SoloPanelCtrl')); - - describe('setting up solo panel scope', function() { - - beforeEach(function() { - var dashboard = { - dashboard: { - rows: [ - { - panels: [ - { - id: 23, - some: 'prop' - } - ] - } - ] - }, - meta: {} - }; - - routeParams.slug = "my dash"; - search.panelId = 23; - backendSrv.getDashboard = sinon.stub().returns(ctx.$q.when(dashboard)); - - ctx.scope.init(); - ctx.scope.$digest(); - }); - - it('should load dashboard and extract panel and setup panel scope', function() { - expect(ctx.scope.panel.id).to.be(23); - expect(ctx.scope.panel.some).to.be('prop'); - }); - - it('should hide sidemenu', function() { - expect(contextSrv.sidemenu).to.be(false); - }); - - }); - - }); - -}); diff --git a/public/test/test-main.js b/public/test/test-main.js index c49c47429f9..3e944c3c36f 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -139,7 +139,6 @@ require([ 'specs/kbn-format-specs', 'specs/dashboardSrv-specs', 'specs/dashboardViewStateSrv-specs', - 'specs/soloPanelCtrl-specs', 'specs/singlestat-specs', 'specs/dynamicDashboardSrv-specs', 'specs/unsavedChangesSrv-specs', From 187834b17c938b911d5e825133284fc6ab93d836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 May 2015 09:58:45 +0200 Subject: [PATCH 161/398] Trying to get dashboard loading and dashboard meta flags like canSave, canStar more managable --- CHANGELOG.md | 1 + pkg/api/dashboard.go | 4 ++-- pkg/api/dashboard_snapshot.go | 1 + pkg/api/dtos/models.go | 1 + pkg/api/stars.go | 5 +++++ pkg/models/dashboards.go | 7 ++++--- public/app/features/dashboard/dashboardCtrl.js | 2 +- public/app/features/dashboard/dashboardLoaderSrv.js | 8 +++----- public/app/features/dashboard/dashboardSrv.js | 3 +-- .../app/features/dashboard/partials/dashboardTopNav.html | 5 ++--- 10 files changed, 21 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9594718abc..72d97aa2f98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ **Breaking changes** - [Issue #1928](https://github.com/grafana/grafana/issues/1928). HTTP API: GET /api/dashboards/db/:slug response changed property `model` to `dashboard` to match the POST request nameing +- Backend render URL changed from `/render/dashboard/solo` `render/dashboard-solo/` (in order to have consistent dashboard url `/dashboard/:type/:slug`) # 2.0.3 (unreleased - 2.0.x branch) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 5b6c839fa97..9de62566d4a 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -53,7 +53,8 @@ func GetDashboard(c *middleware.Context) { IsStarred: isStarred, Slug: slug, Type: m.DashTypeDB, - CanSave: c.OrgRole != m.ROLE_VIEWER, + CanStar: c.IsSignedIn, + CanSave: c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR, }, } @@ -136,7 +137,6 @@ func GetDashboardFromJsonFile(c *middleware.Context) { dash := dtos.DashboardFullWithMeta{Dashboard: dashboard.Data} dash.Meta.Type = m.DashTypeJson - dash.Meta.CanSave = false c.JSON(200, &dash) } diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go index 7bdb6807890..0061a2eba19 100644 --- a/pkg/api/dashboard_snapshot.go +++ b/pkg/api/dashboard_snapshot.go @@ -66,6 +66,7 @@ func GetDashboardSnapshot(c *middleware.Context) { dto := dtos.DashboardFullWithMeta{ Dashboard: snapshot.Dashboard, Meta: dtos.DashboardMeta{ + Type: m.DashTypeSnapshot, IsSnapshot: true, Created: snapshot.Created, Expires: snapshot.Expires, diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go index 1d773932a6f..d5e294cc983 100644 --- a/pkg/api/dtos/models.go +++ b/pkg/api/dtos/models.go @@ -34,6 +34,7 @@ type DashboardMeta struct { IsSnapshot bool `json:"isSnapshot,omitempty"` Type string `json:"type,omitempty"` CanSave bool `json:"canSave"` + CanStar bool `json:"canStar"` Slug string `json:"slug"` Expires time.Time `json:"expires"` Created time.Time `json:"created"` diff --git a/pkg/api/stars.go b/pkg/api/stars.go index 2b5e64ce8e0..42a096ff4fb 100644 --- a/pkg/api/stars.go +++ b/pkg/api/stars.go @@ -7,6 +7,11 @@ import ( ) func StarDashboard(c *middleware.Context) { + if !c.IsSignedIn { + c.JsonApiErr(412, "You need to sign in to star dashboards", nil) + return + } + var cmd = m.StarDashboardCommand{ UserId: c.UserId, DashboardId: c.ParamsInt64(":id"), diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go index 91db356879a..5d21533f960 100644 --- a/pkg/models/dashboards.go +++ b/pkg/models/dashboards.go @@ -16,9 +16,10 @@ var ( ) var ( - DashTypeJson = "file" - DashTypeDB = "db" - DashTypeScript = "script" + DashTypeJson = "file" + DashTypeDB = "db" + DashTypeScript = "script" + DashTypeSnapshot = "snapshot" ) // Dashboard model diff --git a/public/app/features/dashboard/dashboardCtrl.js b/public/app/features/dashboard/dashboardCtrl.js index ffead046211..3d2b3edbaab 100644 --- a/public/app/features/dashboard/dashboardCtrl.js +++ b/public/app/features/dashboard/dashboardCtrl.js @@ -70,7 +70,7 @@ function (angular, $, config) { }; $scope.updateTopNavPartial = function() { - if ($scope.dashboard.meta.isSnapshot) { + if ($scope.dashboard.meta.type === 'snapshot') { $scope.topNavPartial = 'app/features/dashboard/partials/snapshotTopNav.html'; } }; diff --git a/public/app/features/dashboard/dashboardLoaderSrv.js b/public/app/features/dashboard/dashboardLoaderSrv.js index 48ca279d221..f2fc3c9c03f 100644 --- a/public/app/features/dashboard/dashboardLoaderSrv.js +++ b/public/app/features/dashboard/dashboardLoaderSrv.js @@ -19,7 +19,7 @@ function (angular, moment, _, $, kbn) { var self = this; this._dashboardLoadFailed = function(title) { - return {meta: {}, dashboard: {title: title}}; + return {meta: {canStar: false, canDelete: false, canSave: false}, dashboard: {title: title}}; }; this.loadDashboard = function(type, slug) { @@ -28,9 +28,7 @@ function (angular, moment, _, $, kbn) { } if (type === 'snapshot') { - return backendSrv.get('/api/snapshots/' + $routeParams.slug).then(function(result) { - return result; - }, function() { + return backendSrv.get('/api/snapshots/' + $routeParams.slug).catch(function() { return {meta:{isSnapshot: true, canSave: false, canEdit: false}, dashboard: {title: 'Snapshot not found'}}; }); } @@ -45,7 +43,7 @@ function (angular, moment, _, $, kbn) { return $http({ url: url, method: "GET" }) .then(this._executeScript).then(function(result) { - return { meta: { fromScript: true, canDelete: false, canSave: false}, dashboard: result.data }; + return { meta: { fromScript: true, canDelete: false, canSave: false, canStar: false}, dashboard: result.data }; }, function(err) { console.log('Script dashboard error '+ err); $rootScope.appEvent('alert-error', ["Script Error", "Please make sure it exists and returns a valid dashboard"]); diff --git a/public/app/features/dashboard/dashboardSrv.js b/public/app/features/dashboard/dashboardSrv.js index 4d79d06675a..9ddce2dbea8 100644 --- a/public/app/features/dashboard/dashboardSrv.js +++ b/public/app/features/dashboard/dashboardSrv.js @@ -56,9 +56,8 @@ function (angular, $, kbn, _, moment) { meta.canShare = meta.canShare === false ? false : true; meta.canSave = meta.canSave === false ? false : true; - meta.canEdit = meta.canEdit === false ? false : true; meta.canStar = meta.canStar === false ? false : true; - meta.canDelete = meta.canDelete === false ? false : true; + meta.canEdit = meta.canEdit === false ? false : true; if (!this.editable) { meta.canEdit = false; diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html index 89a6a185759..58445abf505 100644 --- a/public/app/features/dashboard/partials/dashboardTopNav.html +++ b/public/app/features/dashboard/partials/dashboardTopNav.html @@ -15,7 +15,6 @@ - From fb35f7210cef5746c5a4b89e6802d698c908dd6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 May 2015 10:06:06 +0200 Subject: [PATCH 162/398] Fixed failing golang test --- pkg/services/search/json_index_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/search/json_index_test.go b/pkg/services/search/json_index_test.go index ddae1f20ace..a18c19b92a7 100644 --- a/pkg/services/search/json_index_test.go +++ b/pkg/services/search/json_index_test.go @@ -20,7 +20,7 @@ func TestJsonDashIndex(t *testing.T) { res, err := index.Search(&Query{Title: "", Tag: ""}) So(err, ShouldBeNil) - So(len(res), ShouldEqual, 4) + So(len(res), ShouldEqual, 3) }) Convey("Should be able to search index by title", func() { From bb7d79e6d21c1551fd8e9f5595b56e5d6879080b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 May 2015 10:45:53 +0200 Subject: [PATCH 163/398] Refactoring search to support more than just db dashboards --- CHANGELOG.md | 1 + pkg/api/api.go | 1 + pkg/api/dashboard.go | 11 +++++ pkg/api/search.go | 47 +++++-------------- pkg/services/search/json_index.go | 19 ++++++-- pkg/services/sqlstore/dashboard.go | 1 + public/app/controllers/search.js | 18 +++---- .../app/features/dashboard/dashboardCtrl.js | 2 +- public/app/partials/search.html | 19 ++++---- 9 files changed, 61 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d97aa2f98..de405e1232b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ **Breaking changes** - [Issue #1928](https://github.com/grafana/grafana/issues/1928). HTTP API: GET /api/dashboards/db/:slug response changed property `model` to `dashboard` to match the POST request nameing - Backend render URL changed from `/render/dashboard/solo` `render/dashboard-solo/` (in order to have consistent dashboard url `/dashboard/:type/:slug`) +- Search HTTP API response has changed (simplified), tags list moved to seperate HTTP resource URI # 2.0.3 (unreleased - 2.0.x branch) diff --git a/pkg/api/api.go b/pkg/api/api.go index 7213be5fe87..14e693752b9 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -102,6 +102,7 @@ func Register(r *macaron.Macaron) { r.Post("/db", reqEditorRole, bind(m.SaveDashboardCommand{}), PostDashboard) r.Get("/file/:file", GetDashboardFromJsonFile) r.Get("/home", GetHomeDashboard) + r.Get("/tags", GetDashboardTags) }) // Search diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 9de62566d4a..3f05d53f3b5 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -140,3 +140,14 @@ func GetDashboardFromJsonFile(c *middleware.Context) { c.JSON(200, &dash) } + +func GetDashboardTags(c *middleware.Context) { + query := m.GetDashboardTagsQuery{OrgId: c.OrgId} + err := bus.Dispatch(&query) + if err != nil { + c.JsonApiErr(500, "Failed to get tags from database", err) + return + } + + c.JSON(200, query.Result) +} diff --git a/pkg/api/search.go b/pkg/api/search.go index 588708e2de9..68b24fca38e 100644 --- a/pkg/api/search.go +++ b/pkg/api/search.go @@ -3,14 +3,12 @@ package api import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/middleware" - m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/services/search" ) func Search(c *middleware.Context) { query := c.Query("query") tag := c.Query("tag") - tagcloud := c.Query("tagcloud") starred := c.Query("starred") limit := c.QueryInt("limit") @@ -18,41 +16,20 @@ func Search(c *middleware.Context) { limit = 200 } - result := m.SearchResult{ - Dashboards: []*m.DashboardSearchHit{}, - Tags: []*m.DashboardTagCloudItem{}, + searchQuery := search.Query{ + Title: query, + Tag: tag, + UserId: c.UserId, + Limit: limit, + IsStarred: starred == "true", + OrgId: c.OrgId, } - if tagcloud == "true" { - - query := m.GetDashboardTagsQuery{OrgId: c.OrgId} - err := bus.Dispatch(&query) - if err != nil { - c.JsonApiErr(500, "Failed to get tags from database", err) - return - } - result.Tags = query.Result - result.TagsOnly = true - - } else { - - query := search.Query{ - Title: query, - Tag: tag, - UserId: c.UserId, - Limit: limit, - IsStarred: starred == "true", - OrgId: c.OrgId, - } - - err := bus.Dispatch(&query) - if err != nil { - c.JsonApiErr(500, "Search failed", err) - return - } - - result.Dashboards = query.Result + err := bus.Dispatch(&searchQuery) + if err != nil { + c.JsonApiErr(500, "Search failed", err) + return } - c.JSON(200, result) + c.JSON(200, searchQuery.Result) } diff --git a/pkg/services/search/json_index.go b/pkg/services/search/json_index.go index c08dece7e71..ac8482f77e1 100644 --- a/pkg/services/search/json_index.go +++ b/pkg/services/search/json_index.go @@ -24,11 +24,10 @@ type JsonDashIndexItem struct { } func NewJsonDashIndex(path string, orgIds string) *JsonDashIndex { + log.Info("Creating json dashboard index for path: ", path) + index := JsonDashIndex{} index.path = path - // if orgIds != "" || orgIds != "*" { - // } - index.updateIndex() return &index } @@ -37,8 +36,21 @@ func (index *JsonDashIndex) Search(query *Query) ([]*m.DashboardSearchHit, error results := make([]*m.DashboardSearchHit, 0) for _, item := range index.items { + if len(results) > query.Limit { + break + } + + // filter out results with tag filter + if query.Tag != "" { + if !strings.Contains(item.TagsCsv, query.Tag) { + continue + } + } + + // add results with matchig title filter if strings.Contains(item.TitleLower, query.Title) { results = append(results, &m.DashboardSearchHit{ + Type: m.DashTypeJson, Title: item.Dashboard.Title, Tags: item.Dashboard.GetTags(), Uri: "file/" + item.Path, @@ -60,7 +72,6 @@ func (index *JsonDashIndex) GetDashboard(path string) *m.Dashboard { } func (index *JsonDashIndex) updateIndex() error { - log.Info("Updating JSON dashboard index, path: %v", index.path) index.items = make([]*JsonDashIndexItem, 0) diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go index 9cd56bab7b5..56e462fe2f6 100644 --- a/pkg/services/sqlstore/dashboard.go +++ b/pkg/services/sqlstore/dashboard.go @@ -176,6 +176,7 @@ func SearchDashboards(query *m.SearchDashboardsQuery) error { Id: item.Id, Title: item.Title, Uri: "db/" + item.Slug, + Type: m.DashTypeDB, Tags: []string{}, } query.Result = append(query.Result, hit) diff --git a/public/app/controllers/search.js b/public/app/controllers/search.js index c013b829e54..c4785c6dd8f 100644 --- a/public/app/controllers/search.js +++ b/public/app/controllers/search.js @@ -61,21 +61,21 @@ function (angular, _, config) { }; $scope.searchDashboards = function() { + $scope.tagsMode = false; $scope.currentSearchId = $scope.currentSearchId + 1; var localSearchId = $scope.currentSearchId; return backendSrv.search($scope.query).then(function(results) { if (localSearchId < $scope.currentSearchId) { return; } - $scope.resultCount = results.tagsOnly ? results.tags.length : results.dashboards.length; - $scope.results.tags = results.tags; - $scope.results.dashboards = _.map(results.dashboards, function(dash) { + $scope.resultCount = results.length; + $scope.results = _.map(results, function(dash) { dash.url = 'dashboard/' + dash.uri; return dash; }); if ($scope.queryHasNoFilters()) { - $scope.results.dashboards.unshift({ title: 'Home', url: config.appSubUrl + '/', isHome: true }); + $scope.results.unshift({ title: 'Home', url: config.appSubUrl + '/', isHome: true }); } }); }; @@ -96,10 +96,12 @@ function (angular, _, config) { } }; - $scope.showTags = function() { - $scope.query.tagcloud = !$scope.query.tagcloud; - $scope.giveSearchFocus = $scope.giveSearchFocus + 1; - $scope.search(); + $scope.getTags = function() { + $scope.tagsMode = true; + return backendSrv.get('/api/dashboards/tags').then(function(results) { + $scope.resultCount = results.length; + $scope.results = results; + }); }; $scope.showStarred = function() { diff --git a/public/app/features/dashboard/dashboardCtrl.js b/public/app/features/dashboard/dashboardCtrl.js index 3d2b3edbaab..ffead046211 100644 --- a/public/app/features/dashboard/dashboardCtrl.js +++ b/public/app/features/dashboard/dashboardCtrl.js @@ -70,7 +70,7 @@ function (angular, $, config) { }; $scope.updateTopNavPartial = function() { - if ($scope.dashboard.meta.type === 'snapshot') { + if ($scope.dashboard.meta.isSnapshot) { $scope.topNavPartial = 'app/features/dashboard/partials/snapshotTopNav.html'; } }; diff --git a/public/app/partials/search.html b/public/app/partials/search.html index 85383042a21..ad1dcf0d1ba 100644 --- a/public/app/partials/search.html +++ b/public/app/partials/search.html @@ -11,8 +11,8 @@ starred | - - + + tags @@ -25,10 +25,10 @@
    -
    +
    -
    @@ -40,11 +40,11 @@
    -
    -
    No dashboards matching your query were found.
    +
    +
    No dashboards matching your query were found.
    -     + @@ -54,8 +54,7 @@ - - + From c8146e759f110e38f31600fdd04c8e67031ae445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 May 2015 10:57:18 +0200 Subject: [PATCH 164/398] Fixed json index unit test --- pkg/services/search/json_index_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/services/search/json_index_test.go b/pkg/services/search/json_index_test.go index a18c19b92a7..13add2a667d 100644 --- a/pkg/services/search/json_index_test.go +++ b/pkg/services/search/json_index_test.go @@ -17,14 +17,14 @@ func TestJsonDashIndex(t *testing.T) { }) Convey("Should be able to search index", func() { - res, err := index.Search(&Query{Title: "", Tag: ""}) + res, err := index.Search(&Query{Title: "", Tag: "", Limit: 20}) So(err, ShouldBeNil) So(len(res), ShouldEqual, 3) }) Convey("Should be able to search index by title", func() { - res, err := index.Search(&Query{Title: "home", Tag: ""}) + res, err := index.Search(&Query{Title: "home", Tag: "", Limit: 20}) So(err, ShouldBeNil) So(len(res), ShouldEqual, 1) From 448a8b8d1c879988f8c250f8bffe84ec2ad199f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 May 2015 13:36:13 +0200 Subject: [PATCH 165/398] Major refactorings around searching, moved to seperate package, trying to move stuff out of models package, extend search support searching different types of entities and different types of dashboards, #960 --- conf/defaults.ini | 3 +- conf/sample.ini | 8 +++ main.go | 2 +- pkg/api/dashboard.go | 2 +- pkg/api/search.go | 2 +- pkg/models/dashboards.go | 10 ++++ pkg/models/search.go | 29 +---------- .../search/search.go => search/handlers.go} | 23 +++----- pkg/{services => }/search/json_index.go | 15 +++--- pkg/{services => }/search/json_index_test.go | 2 +- pkg/search/models.go | 47 +++++++++++++++++ pkg/services/sqlstore/dashboard.go | 11 ++-- pkg/services/sqlstore/dashboard_test.go | 9 ++-- public/app/controllers/search.js | 37 ++++--------- public/app/features/dashlinks/module.js | 4 +- public/app/panels/dashlist/module.html | 2 +- public/app/panels/dashlist/module.js | 2 +- public/app/partials/search.html | 52 +++++++++---------- public/css/less/search.less | 11 +++- 19 files changed, 143 insertions(+), 128 deletions(-) rename pkg/{services/search/search.go => search/handlers.go} (78%) rename pkg/{services => }/search/json_index.go (87%) rename pkg/{services => }/search/json_index_test.go (91%) create mode 100644 pkg/search/models.go diff --git a/conf/defaults.ini b/conf/defaults.ini index b4e5a1ddfae..628df5360e4 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -216,7 +216,6 @@ exchange = grafana_events #################################### Dashboard JSON files ########################## [dashboards.json] enabled = false -path = dashboards -orgs = * +path = /var/lib/grafana/dashboards diff --git a/conf/sample.ini b/conf/sample.ini index fc2d5a1c8f2..df204a7f45d 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -211,3 +211,11 @@ ;enabled = false ;rabbitmq_url = amqp://localhost/ ;exchange = grafana_events + +;#################################### Dashboard JSON files ########################## +[dashboards.json] +;enabled = false +;path = /var/lib/grafana/dashboards + + + diff --git a/main.go b/main.go index e794e4dfe4e..d31979b5ad2 100644 --- a/main.go +++ b/main.go @@ -14,8 +14,8 @@ import ( "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/plugins" + "github.com/grafana/grafana/pkg/search" "github.com/grafana/grafana/pkg/services/eventpublisher" - "github.com/grafana/grafana/pkg/services/search" "github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/social" diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 3f05d53f3b5..b439bd67ac7 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -10,7 +10,7 @@ import ( "github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" - "github.com/grafana/grafana/pkg/services/search" + "github.com/grafana/grafana/pkg/search" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/util" ) diff --git a/pkg/api/search.go b/pkg/api/search.go index 68b24fca38e..10329f445bd 100644 --- a/pkg/api/search.go +++ b/pkg/api/search.go @@ -3,7 +3,7 @@ package api import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/middleware" - "github.com/grafana/grafana/pkg/services/search" + "github.com/grafana/grafana/pkg/search" ) func Search(c *middleware.Context) { diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go index 5d21533f960..b802eba7e1e 100644 --- a/pkg/models/dashboards.go +++ b/pkg/models/dashboards.go @@ -126,3 +126,13 @@ type GetDashboardQuery struct { Result *Dashboard } + +type DashboardTagCloudItem struct { + Term string `json:"term"` + Count int `json:"count"` +} + +type GetDashboardTagsQuery struct { + OrgId int64 + Result []*DashboardTagCloudItem +} diff --git a/pkg/models/search.go b/pkg/models/search.go index 6e6d88ed828..8bd4744f07b 100644 --- a/pkg/models/search.go +++ b/pkg/models/search.go @@ -1,12 +1,6 @@ package models -type SearchResult struct { - Dashboards []*DashboardSearchHit `json:"dashboards"` - Tags []*DashboardTagCloudItem `json:"tags"` - TagsOnly bool `json:"tagsOnly"` -} - -type DashboardSearchHit struct { +type SearchHit struct { Id int64 `json:"id"` Title string `json:"title"` Uri string `json:"uri"` @@ -14,24 +8,3 @@ type DashboardSearchHit struct { Tags []string `json:"tags"` IsStarred bool `json:"isStarred"` } - -type DashboardTagCloudItem struct { - Term string `json:"term"` - Count int `json:"count"` -} - -type SearchDashboardsQuery struct { - Title string - Tag string - OrgId int64 - UserId int64 - Limit int - IsStarred bool - - Result []*DashboardSearchHit -} - -type GetDashboardTagsQuery struct { - OrgId int64 - Result []*DashboardTagCloudItem -} diff --git a/pkg/services/search/search.go b/pkg/search/handlers.go similarity index 78% rename from pkg/services/search/search.go rename to pkg/search/handlers.go index 4ab7d7bd0ba..bbafffb8743 100644 --- a/pkg/services/search/search.go +++ b/pkg/search/handlers.go @@ -2,23 +2,13 @@ package search import ( "path/filepath" + "sort" "github.com/grafana/grafana/pkg/bus" m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" ) -type Query struct { - Title string - Tag string - OrgId int64 - UserId int64 - Limit int - IsStarred bool - - Result []*m.DashboardSearchHit -} - var jsonDashIndex *JsonDashIndex func Init() { @@ -33,15 +23,14 @@ func Init() { jsonFilesPath = filepath.Join(setting.HomePath, jsonFilesPath) } - orgIds := jsonIndexCfg.Key("org_ids").String() - jsonDashIndex = NewJsonDashIndex(jsonFilesPath, orgIds) + jsonDashIndex = NewJsonDashIndex(jsonFilesPath) } } func searchHandler(query *Query) error { - hits := make([]*m.DashboardSearchHit, 0) + hits := make(HitList, 0) - dashQuery := m.SearchDashboardsQuery{ + dashQuery := FindPersistedDashboardsQuery{ Title: query.Title, Tag: query.Tag, UserId: query.UserId, @@ -65,6 +54,8 @@ func searchHandler(query *Query) error { hits = append(hits, jsonHits...) } + sort.Sort(hits) + if err := setIsStarredFlagOnSearchResults(query.UserId, hits); err != nil { return err } @@ -73,7 +64,7 @@ func searchHandler(query *Query) error { return nil } -func setIsStarredFlagOnSearchResults(userId int64, hits []*m.DashboardSearchHit) error { +func setIsStarredFlagOnSearchResults(userId int64, hits []*Hit) error { query := m.GetUserStarsQuery{UserId: userId} if err := bus.Dispatch(&query); err != nil { return err diff --git a/pkg/services/search/json_index.go b/pkg/search/json_index.go similarity index 87% rename from pkg/services/search/json_index.go rename to pkg/search/json_index.go index ac8482f77e1..5a500d2f688 100644 --- a/pkg/services/search/json_index.go +++ b/pkg/search/json_index.go @@ -11,9 +11,8 @@ import ( ) type JsonDashIndex struct { - path string - orgsIds []int64 - items []*JsonDashIndexItem + path string + items []*JsonDashIndexItem } type JsonDashIndexItem struct { @@ -23,7 +22,7 @@ type JsonDashIndexItem struct { Dashboard *m.Dashboard } -func NewJsonDashIndex(path string, orgIds string) *JsonDashIndex { +func NewJsonDashIndex(path string) *JsonDashIndex { log.Info("Creating json dashboard index for path: ", path) index := JsonDashIndex{} @@ -32,8 +31,8 @@ func NewJsonDashIndex(path string, orgIds string) *JsonDashIndex { return &index } -func (index *JsonDashIndex) Search(query *Query) ([]*m.DashboardSearchHit, error) { - results := make([]*m.DashboardSearchHit, 0) +func (index *JsonDashIndex) Search(query *Query) ([]*Hit, error) { + results := make([]*Hit, 0) for _, item := range index.items { if len(results) > query.Limit { @@ -49,8 +48,8 @@ func (index *JsonDashIndex) Search(query *Query) ([]*m.DashboardSearchHit, error // add results with matchig title filter if strings.Contains(item.TitleLower, query.Title) { - results = append(results, &m.DashboardSearchHit{ - Type: m.DashTypeJson, + results = append(results, &Hit{ + Type: DashHitJson, Title: item.Dashboard.Title, Tags: item.Dashboard.GetTags(), Uri: "file/" + item.Path, diff --git a/pkg/services/search/json_index_test.go b/pkg/search/json_index_test.go similarity index 91% rename from pkg/services/search/json_index_test.go rename to pkg/search/json_index_test.go index 13add2a667d..9c4d27e6233 100644 --- a/pkg/services/search/json_index_test.go +++ b/pkg/search/json_index_test.go @@ -9,7 +9,7 @@ import ( func TestJsonDashIndex(t *testing.T) { Convey("Given the json dash index", t, func() { - index := NewJsonDashIndex("../../../public/dashboards/", "*") + index := NewJsonDashIndex("../../public/dashboards/", "*") Convey("Should be able to update index", func() { err := index.updateIndex() diff --git a/pkg/search/models.go b/pkg/search/models.go new file mode 100644 index 00000000000..157d9a292e3 --- /dev/null +++ b/pkg/search/models.go @@ -0,0 +1,47 @@ +package search + +type HitType string + +const ( + DashHitDB HitType = "dash-db" + DashHitHome HitType = "dash-home" + DashHitJson HitType = "dash-json" + DashHitScripted HitType = "dash-scripted" +) + +type Hit struct { + Id int64 `json:"id"` + Title string `json:"title"` + Uri string `json:"uri"` + Type HitType `json:"type"` + Tags []string `json:"tags"` + IsStarred bool `json:"isStarred"` +} + +type HitList []*Hit + +func (s HitList) Len() int { return len(s) } +func (s HitList) Swap(i, j int) { s[i], s[j] = s[j], s[i] } +func (s HitList) Less(i, j int) bool { return s[i].Title < s[j].Title } + +type Query struct { + Title string + Tag string + OrgId int64 + UserId int64 + Limit int + IsStarred bool + + Result HitList +} + +type FindPersistedDashboardsQuery struct { + Title string + Tag string + OrgId int64 + UserId int64 + Limit int + IsStarred bool + + Result HitList +} diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go index 56e462fe2f6..027f2cd2fac 100644 --- a/pkg/services/sqlstore/dashboard.go +++ b/pkg/services/sqlstore/dashboard.go @@ -8,6 +8,7 @@ import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/metrics" m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/search" ) func init() { @@ -119,7 +120,7 @@ type DashboardSearchProjection struct { Term string } -func SearchDashboards(query *m.SearchDashboardsQuery) error { +func SearchDashboards(query *search.FindPersistedDashboardsQuery) error { var sql bytes.Buffer params := make([]interface{}, 0) @@ -166,17 +167,17 @@ func SearchDashboards(query *m.SearchDashboardsQuery) error { return err } - query.Result = make([]*m.DashboardSearchHit, 0) - hits := make(map[int64]*m.DashboardSearchHit) + query.Result = make([]*search.Hit, 0) + hits := make(map[int64]*search.Hit) for _, item := range res { hit, exists := hits[item.Id] if !exists { - hit = &m.DashboardSearchHit{ + hit = &search.Hit{ Id: item.Id, Title: item.Title, Uri: "db/" + item.Slug, - Type: m.DashTypeDB, + Type: search.DashHitDB, Tags: []string{}, } query.Result = append(query.Result, hit) diff --git a/pkg/services/sqlstore/dashboard_test.go b/pkg/services/sqlstore/dashboard_test.go index ad4974af18b..70675f9c42b 100644 --- a/pkg/services/sqlstore/dashboard_test.go +++ b/pkg/services/sqlstore/dashboard_test.go @@ -6,6 +6,7 @@ import ( . "github.com/smartystreets/goconvey/convey" m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/search" ) func insertTestDashboard(title string, orgId int64, tags ...interface{}) *m.Dashboard { @@ -85,7 +86,7 @@ func TestDashboardDataAccess(t *testing.T) { }) Convey("Should be able to search for dashboard", func() { - query := m.SearchDashboardsQuery{ + query := search.FindPersistedDashboardsQuery{ Title: "test", OrgId: 1, } @@ -99,8 +100,8 @@ func TestDashboardDataAccess(t *testing.T) { }) Convey("Should be able to search for dashboards using tags", func() { - query1 := m.SearchDashboardsQuery{Tag: "webapp", OrgId: 1} - query2 := m.SearchDashboardsQuery{Tag: "tagdoesnotexist", OrgId: 1} + query1 := search.FindPersistedDashboardsQuery{Tag: "webapp", OrgId: 1} + query2 := search.FindPersistedDashboardsQuery{Tag: "tagdoesnotexist", OrgId: 1} err := SearchDashboards(&query1) err = SearchDashboards(&query2) @@ -146,7 +147,7 @@ func TestDashboardDataAccess(t *testing.T) { }) Convey("Should be able to search for starred dashboards", func() { - query := m.SearchDashboardsQuery{OrgId: 1, UserId: 10, IsStarred: true} + query := search.FindPersistedDashboardsQuery{OrgId: 1, UserId: 10, IsStarred: true} err := SearchDashboards(&query) So(err, ShouldBeNil) diff --git a/public/app/controllers/search.js b/public/app/controllers/search.js index c4785c6dd8f..9083ef74705 100644 --- a/public/app/controllers/search.js +++ b/public/app/controllers/search.js @@ -40,15 +40,15 @@ function (angular, _, config) { $scope.moveSelection(-1); } if (evt.keyCode === 13) { - if ($scope.query.tagcloud) { - var tag = $scope.results.tags[$scope.selectedIndex]; + if ($scope.tagMode) { + var tag = $scope.results[$scope.selectedIndex]; if (tag) { $scope.filterByTag(tag.term); } return; } - var selectedDash = $scope.results.dashboards[$scope.selectedIndex]; + var selectedDash = $scope.results[$scope.selectedIndex]; if (selectedDash) { $location.search({}); $location.path(selectedDash.url); @@ -57,7 +57,9 @@ function (angular, _, config) { }; $scope.moveSelection = function(direction) { - $scope.selectedIndex = Math.max(Math.min($scope.selectedIndex + direction, $scope.resultCount - 1), 0); + var max = ($scope.results || []).length; + var newIndex = $scope.selectedIndex + direction; + $scope.selectedIndex = ((newIndex %= max) < 0) ? newIndex + max : newIndex; }; $scope.searchDashboards = function() { @@ -68,14 +70,13 @@ function (angular, _, config) { return backendSrv.search($scope.query).then(function(results) { if (localSearchId < $scope.currentSearchId) { return; } - $scope.resultCount = results.length; $scope.results = _.map(results, function(dash) { dash.url = 'dashboard/' + dash.uri; return dash; }); if ($scope.queryHasNoFilters()) { - $scope.results.unshift({ title: 'Home', url: config.appSubUrl + '/', isHome: true }); + $scope.results.unshift({ title: 'Home', url: config.appSubUrl + '/', type: 'dash-home' }); } }); }; @@ -97,10 +98,10 @@ function (angular, _, config) { }; $scope.getTags = function() { - $scope.tagsMode = true; return backendSrv.get('/api/dashboards/tags').then(function(results) { - $scope.resultCount = results.length; + $scope.tagsMode = true; $scope.results = results; + $scope.giveSearchFocus = $scope.giveSearchFocus + 1; }); }; @@ -116,26 +117,6 @@ function (angular, _, config) { $scope.searchDashboards(); }; - $scope.addMetricToCurrentDashboard = function (metricId) { - $scope.dashboard.rows.push({ - title: '', - height: '250px', - editable: true, - panels: [ - { - type: 'graphite', - title: 'test', - span: 12, - targets: [{ target: metricId }] - } - ] - }); - }; - - $scope.toggleImport = function () { - $scope.showImport = !$scope.showImport; - }; - $scope.newDashboard = function() { $location.url('dashboard/new'); }; diff --git a/public/app/features/dashlinks/module.js b/public/app/features/dashlinks/module.js index fbf5104799c..e33d5406fc2 100644 --- a/public/app/features/dashlinks/module.js +++ b/public/app/features/dashlinks/module.js @@ -133,12 +133,12 @@ function (angular, _) { $scope.searchDashboards = function(link) { return backendSrv.search({tag: link.tag}).then(function(results) { - return _.reduce(results.dashboards, function(memo, dash) { + return _.reduce(results, function(memo, dash) { // do not add current dashboard if (dash.id !== currentDashId) { memo.push({ title: dash.title, - url: 'dashboard/db/'+ dash.slug, + url: 'dashboard/' + dash.uri, icon: 'fa fa-th-large', keepTime: link.keepTime, includeVars: link.includeVars diff --git a/public/app/panels/dashlist/module.html b/public/app/panels/dashlist/module.html index a7b114b31d2..de0e23a9ea5 100644 --- a/public/app/panels/dashlist/module.html +++ b/public/app/panels/dashlist/module.html @@ -1,7 +1,7 @@
    - + {{dash.title}} diff --git a/public/app/panels/dashlist/module.js b/public/app/panels/dashlist/module.js index 098f5acd956..da409fb3bde 100644 --- a/public/app/panels/dashlist/module.js +++ b/public/app/panels/dashlist/module.js @@ -62,7 +62,7 @@ function (angular, app, _, config, PanelMeta) { } return backendSrv.search(params).then(function(result) { - $scope.dashList = result.dashboards; + $scope.dashList = result; }); }; diff --git a/public/app/partials/search.html b/public/app/partials/search.html index ad1dcf0d1ba..66e5fd3b7f4 100644 --- a/public/app/partials/search.html +++ b/public/app/partials/search.html @@ -24,41 +24,39 @@
    -
    -
    -
    -
    -
    - - - {{tag.term}}  ({{tag.count}}) - -
    +
    +
    +
    +
    + + + {{tag.term}}  ({{tag.count}}) +
    +
    -
    -
    No dashboards matching your query were found.
    +
    +
    No dashboards matching your query were found.
    - + - - - {{tag}} - - + + + {{tag}} + + - - - - - -
    + + + + +
    diff --git a/public/css/less/search.less b/public/css/less/search.less index 7182333bd16..b72a7ca0e70 100644 --- a/public/css/less/search.less +++ b/public/css/less/search.less @@ -41,7 +41,7 @@ display: block; line-height: 28px; - .search-result-item:hover, .search-result-item.selected { + .search-item:hover, .search-item.selected { background-color: @grafanaListHighlight; } @@ -67,12 +67,19 @@ } } - .search-result-item { + .search-item { display: block; padding: 3px 10px; white-space: nowrap; background-color: @grafanaListBackground; margin-bottom: 4px; + .search-result-icon:before { + content: "\f009"; + } + + &.search-item-dash-home .search-result-icon:before { + content: "\f015"; + } } .search-result-tags { From 1a401780bab7a73a7c96ddaad65ec16ea0181c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 May 2015 14:01:42 +0200 Subject: [PATCH 166/398] Updated changelog with completed story, JSON dashboards added to search, Closes #960 --- CHANGELOG.md | 1 + pkg/search/handlers.go | 1 + pkg/search/json_index.go | 35 +++++++++++++++++++++-------------- pkg/search/json_index_test.go | 2 +- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de405e1232b..5c5ada93d58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - [Issue #1905](https://github.com/grafana/grafana/issues/1905). Github OAuth: You can now configure a Github team membership requirement, thx @dewski - [Issue #1891](https://github.com/grafana/grafana/issues/1891). Security: New config option to disable the use of gravatar for profile images - [Issue #1921](https://github.com/grafana/grafana/issues/1921). Auth: Support for user authentication via reverse proxy header (like X-Authenticated-User, or X-WEBAUTH-USER) +- [Issue #960](https://github.com/grafana/grafana/issues/960). Search: Backend can now index a folder with json files, will be available in search (saving back to folder is not supported, this feature is meant for static generated json dashboards) **Breaking changes** - [Issue #1928](https://github.com/grafana/grafana/issues/1928). HTTP API: GET /api/dashboards/db/:slug response changed property `model` to `dashboard` to match the POST request nameing diff --git a/pkg/search/handlers.go b/pkg/search/handlers.go index bbafffb8743..874b85994ca 100644 --- a/pkg/search/handlers.go +++ b/pkg/search/handlers.go @@ -24,6 +24,7 @@ func Init() { } jsonDashIndex = NewJsonDashIndex(jsonFilesPath) + go jsonDashIndex.updateLoop() } } diff --git a/pkg/search/json_index.go b/pkg/search/json_index.go index 5a500d2f688..0b4c335e703 100644 --- a/pkg/search/json_index.go +++ b/pkg/search/json_index.go @@ -5,6 +5,7 @@ import ( "os" "path/filepath" "strings" + "time" "github.com/grafana/grafana/pkg/log" m "github.com/grafana/grafana/pkg/models" @@ -23,7 +24,7 @@ type JsonDashIndexItem struct { } func NewJsonDashIndex(path string) *JsonDashIndex { - log.Info("Creating json dashboard index for path: ", path) + log.Info("Creating json dashboard index for path: %v", path) index := JsonDashIndex{} index.path = path @@ -31,6 +32,18 @@ func NewJsonDashIndex(path string) *JsonDashIndex { return &index } +func (index *JsonDashIndex) updateLoop() { + ticker := time.NewTicker(time.Minute) + for { + select { + case <-ticker.C: + if err := index.updateIndex(); err != nil { + log.Error(3, "Failed to update dashboard json index %v", err) + } + } + } +} + func (index *JsonDashIndex) Search(query *Query) ([]*Hit, error) { results := make([]*Hit, 0) @@ -71,8 +84,7 @@ func (index *JsonDashIndex) GetDashboard(path string) *m.Dashboard { } func (index *JsonDashIndex) updateIndex() error { - - index.items = make([]*JsonDashIndexItem, 0) + var items = make([]*JsonDashIndexItem, 0) visitor := func(path string, f os.FileInfo, err error) error { if err != nil { @@ -81,12 +93,16 @@ func (index *JsonDashIndex) updateIndex() error { if f.IsDir() { return nil } + if strings.HasSuffix(f.Name(), ".json") { - err = index.loadDashboardIntoCache(path) + dash, err := loadDashboardFromFile(path) if err != nil { return err } + + items = append(items, dash) } + return nil } @@ -94,16 +110,7 @@ func (index *JsonDashIndex) updateIndex() error { return err } - return nil -} - -func (index *JsonDashIndex) loadDashboardIntoCache(filename string) error { - dash, err := loadDashboardFromFile(filename) - if err != nil { - return err - } - - index.items = append(index.items, dash) + index.items = items return nil } diff --git a/pkg/search/json_index_test.go b/pkg/search/json_index_test.go index 9c4d27e6233..38fbf7207d9 100644 --- a/pkg/search/json_index_test.go +++ b/pkg/search/json_index_test.go @@ -9,7 +9,7 @@ import ( func TestJsonDashIndex(t *testing.T) { Convey("Given the json dash index", t, func() { - index := NewJsonDashIndex("../../public/dashboards/", "*") + index := NewJsonDashIndex("../../public/dashboards/") Convey("Should be able to update index", func() { err := index.updateIndex() From ea54f6923bb134e7e1acecb5690bfeea9490f51a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 May 2015 16:32:33 +0200 Subject: [PATCH 167/398] Added graphite function changed, closes #1961 --- public/app/plugins/datasource/graphite/gfunc.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/public/app/plugins/datasource/graphite/gfunc.js b/public/app/plugins/datasource/graphite/gfunc.js index 063fc473f88..4730719d1b5 100644 --- a/public/app/plugins/datasource/graphite/gfunc.js +++ b/public/app/plugins/datasource/graphite/gfunc.js @@ -327,6 +327,13 @@ function (_, $) { defaultParams: [100] }); + addFuncDef({ + name: "changed", + category: categories.Special, + params: [], + defaultParams: [] + }); + addFuncDef({ name: 'scale', category: categories.Transform, From bfafb836049cb28db57678a6db1b584f19640095 Mon Sep 17 00:00:00 2001 From: jeff martinez Date: Wed, 13 May 2015 09:58:58 -0700 Subject: [PATCH 168/398] Fix minor grammar issue in docs index page --- docs/sources/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/index.md b/docs/sources/index.md index 24ba087575e..fe367c7f87a 100644 --- a/docs/sources/index.md +++ b/docs/sources/index.md @@ -4,7 +4,7 @@ page_keywords: grafana, introduction, documentation, about # About Grafana -Grafana is a leading open source applications for visualizing large-scale measurement data. +Grafana is a leading open source application for visualizing large-scale measurement data. It provides a powerful and elegant way to create, share, and explore data and dashboards from your disparate metric databases, either with your team or the world. From 2dac9758053f514a7160fa14d35a04ae18de5b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 13 May 2015 21:34:50 +0200 Subject: [PATCH 169/398] began work on color by regex / series override for color, #590 --- .../app/panels/graph/seriesOverridesCtrl.js | 28 +++++++++++++++++-- public/app/panels/graph/styleEditor.html | 4 ++- public/app/partials/colorpicker.html | 11 ++++++++ public/app/services/popoverSrv.js | 10 ++++++- public/css/less/graph.less | 1 + 5 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 public/app/partials/colorpicker.html diff --git a/public/app/panels/graph/seriesOverridesCtrl.js b/public/app/panels/graph/seriesOverridesCtrl.js index 80fb2ead6c2..6105402ce05 100644 --- a/public/app/panels/graph/seriesOverridesCtrl.js +++ b/public/app/panels/graph/seriesOverridesCtrl.js @@ -1,14 +1,15 @@ define([ 'angular', + 'jquery', 'app', 'lodash', -], function(angular, app, _) { +], function(angular, jquery, app, _) { 'use strict'; var module = angular.module('grafana.panels.graph', []); app.useModule(module); - module.controller('SeriesOverridesCtrl', function($scope) { + module.controller('SeriesOverridesCtrl', function($scope, $element, popoverSrv, $timeout) { $scope.overrideMenu = []; $scope.currentOverrides = []; $scope.override = $scope.override || {}; @@ -37,10 +38,32 @@ define([ $scope.addSeriesOverride({ alias: subItem.value, lines: false }); } + if (item.propertyName === 'color') { + $scope.openColorSelector(); + } + $scope.updateCurrentOverrides(); $scope.render(); }; + $scope.colorSelected = function(color) { + $scope.override['color'] = color; + $scope.updateCurrentOverrides(); + $scope.render(); + }; + + $scope.openColorSelector = function() { + var popoverScope = $scope.$new(); + popoverScope.colorSelected = $scope.colorSelected; + + popoverSrv.show({ + element: $element.find(".dropdown"), + placement: 'top', + templateUrl: 'app/partials/colorpicker.html', + scope: popoverScope + }); + }; + $scope.removeOverride = function(option) { delete $scope.override[option.propertyName]; $scope.updateCurrentOverrides(); @@ -75,6 +98,7 @@ define([ $scope.addOverrideOption('Points', 'points', [true, false]); $scope.addOverrideOption('Points Radius', 'pointradius', [1,2,3,4,5]); $scope.addOverrideOption('Stack', 'stack', [true, false, 2, 3, 4, 5]); + $scope.addOverrideOption('Color', 'color', ['change']); $scope.addOverrideOption('Y-axis', 'yaxis', [1, 2]); $scope.addOverrideOption('Z-index', 'zindex', [-1,-2,-3,0,1,2,3]); $scope.updateCurrentOverrides(); diff --git a/public/app/panels/graph/styleEditor.html b/public/app/panels/graph/styleEditor.html index a5d82bba262..d646b766f70 100644 --- a/public/app/panels/graph/styleEditor.html +++ b/public/app/panels/graph/styleEditor.html @@ -94,6 +94,8 @@
    - +
    diff --git a/public/app/partials/colorpicker.html b/public/app/partials/colorpicker.html new file mode 100644 index 00000000000..f687b740bbf --- /dev/null +++ b/public/app/partials/colorpicker.html @@ -0,0 +1,11 @@ +
    + × + +
    +   +
    + +
    + diff --git a/public/app/services/popoverSrv.js b/public/app/services/popoverSrv.js index a1e60525e2d..0fb94b06ebe 100644 --- a/public/app/services/popoverSrv.js +++ b/public/app/services/popoverSrv.js @@ -21,12 +21,20 @@ function (angular, _) { return; } + options.scope.dismiss = function() { + popover = options.element.data('popover'); + if (popover) { + popover.destroy(); + } + options.scope.$destroy(); + }; + this.getTemplate(options.templateUrl).then(function(result) { var template = _.isString(result) ? result : result.data; options.element.popover({ content: template, - placement: 'bottom', + placement: options.placement || 'bottom', html: true }); diff --git a/public/css/less/graph.less b/public/css/less/graph.less index a56fe968017..1b29816fa12 100644 --- a/public/css/less/graph.less +++ b/public/css/less/graph.less @@ -164,6 +164,7 @@ .graph-legend-popover { width: 200px; + min-height: 100px; label { display: inline-block; } From 1c9993f185906fcde01990864c6d453ba4462140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 14 May 2015 10:15:46 +0200 Subject: [PATCH 170/398] Backend configuration: When unknown key was detected the log error was not visible in log file due to logging was initialized after user config file is loaded, logging is now initialized twice, once based on defaults and command line arguments, then then again after user config file, Fixes #1992 --- pkg/setting/setting.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 389b6b933b9..77445dd6c4c 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -289,10 +289,13 @@ func loadConfiguration(args *CommandLineArgs) { // command line props commandLineProps := getCommandLineProperties(args.Args) - // load default overrides applyCommandLineDefaultProperties(commandLineProps) + // init logging before specific config so we can log errors from here on + DataPath = makeAbsolute(Cfg.Section("paths").Key("data").String(), HomePath) + initLogging(args) + // load specified config file loadSpecifedConfigFile(args.Config) @@ -304,6 +307,10 @@ func loadConfiguration(args *CommandLineArgs) { // evaluate config values containing environment variables evalConfigValues() + + // update data path and logging config + DataPath = makeAbsolute(Cfg.Section("paths").Key("data").String(), HomePath) + initLogging(args) } func pathExists(path string) bool { @@ -339,9 +346,6 @@ func NewConfigContext(args *CommandLineArgs) { setHomePath(args) loadConfiguration(args) - DataPath = makeAbsolute(Cfg.Section("paths").Key("data").String(), HomePath) - initLogging(args) - AppName = Cfg.Section("").Key("app_name").MustString("Grafana") Env = Cfg.Section("").Key("app_mode").MustString("development") From fb56bc59f2483bc05d88f3f50e3bc0d384ecb076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 14 May 2015 10:33:56 +0200 Subject: [PATCH 171/398] Create pid file before runtime init, Fixes #1990 --- docker/rpmtest/Dockerfile | 6 ------ main.go | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 docker/rpmtest/Dockerfile diff --git a/docker/rpmtest/Dockerfile b/docker/rpmtest/Dockerfile deleted file mode 100644 index 3c18cfa1797..00000000000 --- a/docker/rpmtest/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM centos:latest - -RUN yum install -y initscripts - -ADD *.rpm /tmp/ - diff --git a/main.go b/main.go index d31979b5ad2..5d5bddb7273 100644 --- a/main.go +++ b/main.go @@ -49,8 +49,8 @@ func main() { flag.Parse() - initRuntime() writePIDFile() + initRuntime() search.Init() social.NewOAuthService() From 8c0e1060e628696e3eca078cd06f77fb74cac763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 14 May 2015 12:34:30 +0200 Subject: [PATCH 172/398] Graph: Define series color using regex rule, Closes #590 --- CHANGELOG.md | 1 + package.json | 2 +- public/app/components/timeSeries.js | 1 + public/app/panels/graph/legend.js | 2 +- public/app/panels/graph/legend.popover.html | 3 +- .../app/panels/graph/seriesOverridesCtrl.js | 12 +++-- public/app/panels/graph/styleEditor.html | 17 +++---- public/app/services/popoverSrv.js | 47 +++++++++++-------- public/css/less/graph.less | 2 +- .../test/specs/seriesOverridesCtrl-specs.js | 6 ++- 10 files changed, 54 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c5ada93d58..dbf01ab78c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - [Issue #1922](https://github.com/grafana/grafana/issues/1922). Templating: Specify multiple variable values via URL params. - [Issue #1888](https://github.com/grafana/grafana/issues/1144). Templating: Repeat panel or row for each selected template variable value - [Issue #1888](https://github.com/grafana/grafana/issues/1944). Dashboard: Custom Navigation links & dynamic links to related dashboards +- [Issue #590](https://github.com/grafana/grafana/issues/590). Graph: Define series color using regex rule **User or Organization admin** - [Issue #1899](https://github.com/grafana/grafana/issues/1899). Organization: You can now update the organization user role directly (without removing and readding the organization user). diff --git a/package.json b/package.json index 5016a6309eb..71eb75b732b 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "karma-coverage": "0.3.1", "karma-coveralls": "0.1.5", "karma-expect": "~1.1.0", - "karma-mocha": "~0.1.4", + "karma-mocha": "~0.1.10", "karma-phantomjs-launcher": "0.1.4", "karma-requirejs": "0.2.2", "karma-script-launcher": "0.1.0", diff --git a/public/app/components/timeSeries.js b/public/app/components/timeSeries.js index c356ddea63b..679777bfb92 100644 --- a/public/app/components/timeSeries.js +++ b/public/app/components/timeSeries.js @@ -53,6 +53,7 @@ function (_, kbn) { if (override.steppedLine !== void 0) { this.lines.steps = override.steppedLine; } if (override.zindex !== void 0) { this.zindex = override.zindex; } if (override.fillBelowTo !== void 0) { this.fillBelowTo = override.fillBelowTo; } + if (override.color !== void 0) { this.color = override.color; } if (override.yaxis !== void 0) { this.yaxis = override.yaxis; diff --git a/public/app/panels/graph/legend.js b/public/app/panels/graph/legend.js index fb07275310d..1f016f2c3a3 100644 --- a/public/app/panels/graph/legend.js +++ b/public/app/panels/graph/legend.js @@ -41,7 +41,7 @@ function (angular, app, _, kbn, $) { var popoverScope = scope.$new(); popoverScope.series = seriesInfo; popoverSrv.show({ - element: $(':first-child', el), + element: el, templateUrl: 'app/panels/graph/legend.popover.html', scope: popoverScope }); diff --git a/public/app/panels/graph/legend.popover.html b/public/app/panels/graph/legend.popover.html index 4d24136309e..5410af2d1d1 100644 --- a/public/app/panels/graph/legend.popover.html +++ b/public/app/panels/graph/legend.popover.html @@ -16,8 +16,7 @@
    -   diff --git a/public/app/panels/graph/seriesOverridesCtrl.js b/public/app/panels/graph/seriesOverridesCtrl.js index 6105402ce05..81cb41a8572 100644 --- a/public/app/panels/graph/seriesOverridesCtrl.js +++ b/public/app/panels/graph/seriesOverridesCtrl.js @@ -9,7 +9,7 @@ define([ var module = angular.module('grafana.panels.graph', []); app.useModule(module); - module.controller('SeriesOverridesCtrl', function($scope, $element, popoverSrv, $timeout) { + module.controller('SeriesOverridesCtrl', function($scope, $element, popoverSrv) { $scope.overrideMenu = []; $scope.currentOverrides = []; $scope.override = $scope.override || {}; @@ -29,6 +29,12 @@ define([ }; $scope.setOverride = function(item, subItem) { + // handle color overrides + if (item.propertyName === 'color') { + $scope.openColorSelector(); + return; + } + $scope.override[item.propertyName] = subItem.value; // automatically disable lines for this series and the fill bellow to series @@ -38,10 +44,6 @@ define([ $scope.addSeriesOverride({ alias: subItem.value, lines: false }); } - if (item.propertyName === 'color') { - $scope.openColorSelector(); - } - $scope.updateCurrentOverrides(); $scope.render(); }; diff --git a/public/app/panels/graph/styleEditor.html b/public/app/panels/graph/styleEditor.html index d646b766f70..5d5f2fd7401 100644 --- a/public/app/panels/graph/styleEditor.html +++ b/public/app/panels/graph/styleEditor.html @@ -73,22 +73,23 @@
  • alias or regex
    • +
  • - +
    • +
  • - {{option.name}}: {{option.value}} + + Color: + + + {{option.name}}: {{option.value}} +
    • -
    diff --git a/public/app/services/popoverSrv.js b/public/app/services/popoverSrv.js index 0fb94b06ebe..cec294178c0 100644 --- a/public/app/services/popoverSrv.js +++ b/public/app/services/popoverSrv.js @@ -1,8 +1,9 @@ define([ 'angular', 'lodash', + 'jquery', ], -function (angular, _) { +function (angular, _, $) { 'use strict'; var module = angular.module('grafana.services'); @@ -14,12 +15,16 @@ function (angular, _) { }; this.show = function(options) { - var popover = options.element.data('popover'); - if (popover) { - popover.scope.$destroy(); - popover.destroy(); - return; - } + var popover; + + // hide other popovers + $('.popover').each(function() { + popover = $(this).prev().data('popover'); + if (popover) { + popover.scope.$destroy(); + popover.destroy(); + } + }); options.scope.dismiss = function() { popover = options.element.data('popover'); @@ -30,22 +35,24 @@ function (angular, _) { }; this.getTemplate(options.templateUrl).then(function(result) { - var template = _.isString(result) ? result : result.data; + $timeout(function() { + var template = _.isString(result) ? result : result.data; - options.element.popover({ - content: template, - placement: options.placement || 'bottom', - html: true - }); + options.element.popover({ + content: template, + placement: options.placement || 'bottom', + html: true + }); - popover = options.element.data('popover'); - popover.hasContent = function () { - return template; - }; + popover = options.element.data('popover'); + popover.hasContent = function () { + return template; + }; - popover.toggle(); - popover.scope = options.scope; - $compile(popover.$tip)(popover.scope); + popover.toggle(); + popover.scope = options.scope; + $compile(popover.$tip)(popover.scope); + }, 1); }); }; diff --git a/public/css/less/graph.less b/public/css/less/graph.less index 1b29816fa12..b96e466eea1 100644 --- a/public/css/less/graph.less +++ b/public/css/less/graph.less @@ -114,7 +114,7 @@ th { text-align: right; - padding: 5px 10px; + padding: 0px 10px 1px 0; font-weight: bold; color: @blue; font-size: 85%; diff --git a/public/test/specs/seriesOverridesCtrl-specs.js b/public/test/specs/seriesOverridesCtrl-specs.js index ec7cc70159c..7386083e87b 100644 --- a/public/test/specs/seriesOverridesCtrl-specs.js +++ b/public/test/specs/seriesOverridesCtrl-specs.js @@ -6,11 +6,15 @@ define([ describe('SeriesOverridesCtrl', function() { var ctx = new helpers.ControllerTestContext(); + var popoverSrv = {}; beforeEach(module('grafana.services')); beforeEach(module('grafana.panels.graph')); - beforeEach(ctx.providePhase()); + beforeEach(ctx.providePhase({ + popoverSrv: popoverSrv + })); + beforeEach(ctx.createControllerPhase('SeriesOverridesCtrl')); beforeEach(function() { ctx.scope.render = function() {}; From a258e2e60842398d0f286ad160ff248775693f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 14 May 2015 17:39:31 +0200 Subject: [PATCH 173/398] Added log base 2 graph y axis scale --- public/app/panels/graph/graph.js | 2 +- public/app/panels/graph/module.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/panels/graph/graph.js b/public/app/panels/graph/graph.js index e63bd6536c3..e090ce4e85e 100755 --- a/public/app/panels/graph/graph.js +++ b/public/app/panels/graph/graph.js @@ -369,7 +369,7 @@ function (angular, $, kbn, moment, _, GraphTooltip) { if (_.findWhere(data, {yaxis: 2})) { var secondY = _.clone(defaults); secondY.index = 2, - secondY.logBase = scope.panel.grid.rightLogBase || 2, + secondY.logBase = scope.panel.grid.rightLogBase || 1, secondY.position = 'right'; secondY.min = scope.panel.grid.rightMin; secondY.max = scope.panel.percentage && scope.panel.stack ? 100 : scope.panel.grid.rightMax; diff --git a/public/app/panels/graph/module.js b/public/app/panels/graph/module.js index 6671ef33289..867f864123c 100644 --- a/public/app/panels/graph/module.js +++ b/public/app/panels/graph/module.js @@ -116,7 +116,7 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) { _.defaults($scope.panel.grid, _d.grid); _.defaults($scope.panel.legend, _d.legend); - $scope.logScales = {'linear': 1, 'log (base 10)': 10, 'log (base 32)': 32, 'log (base 1024)': 1024}; + $scope.logScales = {'linear': 1, 'log (base 2)': 2, 'log (base 10)': 10, 'log (base 32)': 32, 'log (base 1024)': 1024}; $scope.hiddenSeries = {}; $scope.seriesList = []; From 11c8e80ea9f0e4474507b9b7aa912aba25362161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 May 2015 11:38:22 +0200 Subject: [PATCH 174/398] Working on new query editor for influxdb 0.9, #1525 --- public/app/directives/all.js | 2 +- .../{graphiteSegment.js => metric.segment.js} | 13 +- .../graphite/partials/query.editor.html | 4 +- .../plugins/datasource/graphite/queryCtrl.js | 17 +- .../plugins/datasource/influxdb/funcEditor.js | 2 +- .../influxdb/partials/query.editor.html | 59 +++++-- .../plugins/datasource/influxdb/queryCtrl.js | 147 +++++++----------- public/css/less/grafana.less | 7 + public/test/specs/graphiteTargetCtrl-specs.js | 6 +- 9 files changed, 132 insertions(+), 125 deletions(-) rename public/app/directives/{graphiteSegment.js => metric.segment.js} (92%) diff --git a/public/app/directives/all.js b/public/app/directives/all.js index 4ab92d111d6..cd294c3df25 100644 --- a/public/app/directives/all.js +++ b/public/app/directives/all.js @@ -12,7 +12,7 @@ define([ './bootstrap-tagsinput', './bodyClass', './variableValueSelect', - './graphiteSegment', + './metric.segment', './grafanaVersionCheck', './dropdown.typeahead', './topnav', diff --git a/public/app/directives/graphiteSegment.js b/public/app/directives/metric.segment.js similarity index 92% rename from public/app/directives/graphiteSegment.js rename to public/app/directives/metric.segment.js index c8ad131e6c7..5510dea6657 100644 --- a/public/app/directives/graphiteSegment.js +++ b/public/app/directives/metric.segment.js @@ -9,7 +9,7 @@ function (angular, app, _, $) { angular .module('grafana.directives') - .directive('graphiteSegment', function($compile, $sce) { + .directive('metricSegment', function($compile, $sce) { var inputTemplate = ''; @@ -17,6 +17,12 @@ function (angular, app, _, $) { var buttonTemplate = ''; return { + scope: { + segment: "=", + getAltSegments: "&", + onValueChanged: "&" + }, + link: function($scope, elem) { var $input = $(inputTemplate); var $button = $(buttonTemplate); @@ -46,7 +52,7 @@ function (angular, app, _, $) { segment.expandable = true; segment.fake = false; } - $scope.segmentValueChanged(segment, $scope.$index); + $scope.onValueChanged(); }); }; @@ -69,7 +75,8 @@ function (angular, app, _, $) { if (options) { return options; } $scope.$apply(function() { - $scope.getAltSegments($scope.$index).then(function() { + $scope.getAltSegments().then(function(altSegments) { + $scope.altSegments = altSegments; options = _.map($scope.altSegments, function(alt) { return alt.value; }); // add custom values diff --git a/public/app/plugins/datasource/graphite/partials/query.editor.html b/public/app/plugins/datasource/graphite/partials/query.editor.html index 48446049e65..dcbbdc69a8a 100755 --- a/public/app/plugins/datasource/graphite/partials/query.editor.html +++ b/public/app/plugins/datasource/graphite/partials/query.editor.html @@ -74,7 +74,9 @@ ng-show="showTextEditor" /> - + +
    diff --git a/public/app/plugins/datasource/influxdb/queryCtrl.js b/public/app/plugins/datasource/influxdb/queryCtrl.js index 00e12ea05bd..e78c100b5c5 100644 --- a/public/app/plugins/datasource/influxdb/queryCtrl.js +++ b/public/app/plugins/datasource/influxdb/queryCtrl.js @@ -7,19 +7,39 @@ function (angular, _) { var module = angular.module('grafana.controllers'); - module.controller('InfluxQueryCtrl', function($scope, $timeout, $sce, templateSrv, $q) { + module.controller('InfluxQueryCtrl', function($scope, $timeout, $sce, templateSrv) { + + $scope.functionList = [ + 'count', 'mean', 'sum', 'min', + 'max', 'mode', 'distinct', 'median', + 'derivative', 'stddev', 'first', 'last', + 'difference' + ]; + + $scope.functionMenu = _.map($scope.functionList, function(func) { + return { text: func, click: "changeFunction('" + func + "');" }; + }); $scope.init = function() { - $scope.segments = $scope.target.segments || []; + var target = $scope.target; + target.function = target.function || 'mean'; - $scope.functionsSelect = [ - 'count', 'mean', 'sum', 'min', - 'max', 'mode', 'distinct', 'median', - 'derivative', 'stddev', 'first', 'last', - 'difference' - ]; + if (!target.measurement) { + $scope.measurementSegment = MetricSegment.newSelectMeasurement(); + } else { + $scope.measurementSegment = new MetricSegment(target.measurement); + } + }; - checkOtherSegments(0); + $scope.changeFunction = function(func) { + $scope.target.function = func; + $scope.$parent.get_data(); + }; + + $scope.measurementChanged = function() { + $scope.target.measurement = $scope.measurementSegment.value; + console.log('measurement updated', $scope.target.measurement); + $scope.$parent.get_data(); }; $scope.toggleQueryMode = function () { @@ -35,103 +55,44 @@ function (angular, _) { $scope.panel.targets.push(clone); }; - $scope.getAltSegments = function (index) { - $scope.altSegments = []; - - var measurement = $scope.segments[0].value; - var queryType, query; - if (index === 0) { - queryType = 'MEASUREMENTS'; - query = 'SHOW MEASUREMENTS'; - } else if (index % 2 === 1) { - queryType = 'TAG_KEYS'; - query = 'SHOW TAG KEYS FROM "' + measurement + '"'; - } else { - queryType = 'TAG_VALUES'; - query = 'SHOW TAG VALUES FROM "' + measurement + '" WITH KEY = ' + $scope.segments[$scope.segments.length - 2].value; - } - - console.log('getAltSegments: query' , query); - - return $scope.datasource.metricFindQuery(query, queryType).then(function(results) { + $scope.getMeasurements = function () { + // var measurement = $scope.segments[0].value; + // var queryType, query; + // if (index === 0) { + // queryType = 'MEASUREMENTS'; + // query = 'SHOW MEASUREMENTS'; + // } else if (index % 2 === 1) { + // queryType = 'TAG_KEYS'; + // query = 'SHOW TAG KEYS FROM "' + measurement + '"'; + // } else { + // queryType = 'TAG_VALUES'; + // query = 'SHOW TAG VALUES FROM "' + measurement + '" WITH KEY = ' + $scope.segments[$scope.segments.length - 2].value; + // } + // + // console.log('getAltSegments: query' , query); + // + console.log('get measurements'); + return $scope.datasource.metricFindQuery('SHOW MEASUREMENTS', 'MEASUREMENTS').then(function(results) { console.log('get alt segments: response', results); - $scope.altSegments = _.map(results, function(segment) { + var measurements = _.map(results, function(segment) { return new MetricSegment({ value: segment.text, expandable: segment.expandable }); }); _.each(templateSrv.variables, function(variable) { - $scope.altSegments.unshift(new MetricSegment({ + measurements.unshift(new MetricSegment({ type: 'template', value: '$' + variable.name, expandable: true, })); }); + + return measurements; }, function(err) { $scope.parserError = err.message || 'Failed to issue metric query'; + return []; }); }; - $scope.segmentValueChanged = function (segment, segmentIndex) { - delete $scope.parserError; - - if (segment.expandable) { - return checkOtherSegments(segmentIndex + 1).then(function () { - setSegmentFocus(segmentIndex + 1); - $scope.targetChanged(); - }); - } - else { - $scope.segments = $scope.segments.splice(0, segmentIndex + 1); - } - - setSegmentFocus(segmentIndex + 1); - $scope.targetChanged(); - }; - - $scope.targetChanged = function() { - if ($scope.parserError) { - return; - } - - $scope.target.measurement = ''; - $scope.target.tags = {}; - $scope.target.measurement = $scope.segments[0].value; - - for (var i = 1; i+1 < $scope.segments.length; i += 2) { - var key = $scope.segments[i].value; - $scope.target.tags[key] = $scope.segments[i+1].value; - } - - $scope.$parent.get_data(); - }; - - function checkOtherSegments(fromIndex) { - if (fromIndex === 0) { - $scope.segments.push(MetricSegment.newSelectMetric()); - return; - } - - if ($scope.segments.length === 0) { - throw('should always have a scope segment?'); - } - - if (_.last($scope.segments).fake) { - return $q.when([]); - } else if ($scope.segments.length % 2 === 1) { - $scope.segments.push(MetricSegment.newSelectTag()); - return $q.when([]); - } else { - $scope.segments.push(MetricSegment.newSelectTagValue()); - return $q.when([]); - } - } - - function setSegmentFocus(segmentIndex) { - _.each($scope.segments, function(segment, index) { - segment.focus = segmentIndex === index; - }); - } - function MetricSegment(options) { if (options === '*' || options.value === '*') { this.value = '*'; @@ -153,8 +114,8 @@ function (angular, _) { this.html = $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value)); } - MetricSegment.newSelectMetric = function() { - return new MetricSegment({value: 'select metric', fake: true}); + MetricSegment.newSelectMeasurement = function() { + return new MetricSegment({value: 'select measurement', fake: true}); }; MetricSegment.newSelectTag = function() { diff --git a/public/css/less/grafana.less b/public/css/less/grafana.less index 9efdf3dd360..9be157f80d0 100644 --- a/public/css/less/grafana.less +++ b/public/css/less/grafana.less @@ -337,3 +337,10 @@ text-overflow: ellipsis; } } + +.query-keyword { + font-weight: bold; + color: @blue; +} + + diff --git a/public/test/specs/graphiteTargetCtrl-specs.js b/public/test/specs/graphiteTargetCtrl-specs.js index a5217376098..31916cc2802 100644 --- a/public/test/specs/graphiteTargetCtrl-specs.js +++ b/public/test/specs/graphiteTargetCtrl-specs.js @@ -141,13 +141,15 @@ define([ ctx.scope.target.target = 'test.count'; ctx.scope.datasource.metricFindQuery.returns(ctx.$q.when([])); ctx.scope.init(); - ctx.scope.getAltSegments(1); + ctx.scope.getAltSegments(1).then(function(results) { + ctx.altSegments = results; + }); ctx.scope.$digest(); ctx.scope.$parent = { get_data: sinon.spy() }; }); it('should have no segments', function() { - expect(ctx.scope.altSegments.length).to.be(0); + expect(ctx.altSegments.length).to.be(0); }); }); From 5ca8d590bd9a769397afc24de5529f8b1c9ad429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 May 2015 15:58:07 +0200 Subject: [PATCH 175/398] Working on new query editor for influxdb 0.9, looking good! #1525 --- public/app/directives/metric.segment.js | 3 +- .../influxdb/partials/query.editor.html | 13 +- .../datasource/influxdb/queryBuilder.js | 4 +- .../plugins/datasource/influxdb/queryCtrl.js | 177 ++++++++++++++---- .../test/specs/influx09-querybuilder-specs.js | 2 +- public/test/specs/influxdbQueryCtrl-specs.js | 120 ++++++++++++ public/test/test-main.js | 1 + 7 files changed, 270 insertions(+), 50 deletions(-) create mode 100644 public/test/specs/influxdbQueryCtrl-specs.js diff --git a/public/app/directives/metric.segment.js b/public/app/directives/metric.segment.js index 5510dea6657..05bf7e485e3 100644 --- a/public/app/directives/metric.segment.js +++ b/public/app/directives/metric.segment.js @@ -14,7 +14,8 @@ function (angular, app, _, $) { ' class="tight-form-clear-input input-medium"' + ' spellcheck="false" style="display:none">'; - var buttonTemplate = ''; + var buttonTemplate = ''; return { scope: { diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html index 7210cfc24dc..494eaff5520 100644 --- a/public/app/plugins/datasource/influxdb/partials/query.editor.html +++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html @@ -83,15 +83,16 @@
  • WHERE
    • -
  • - +
  • +
  • GROUP BY - time($interval), + time($interval) +
    • +
  • +
    • -
  • @@ -106,7 +107,7 @@
  • fill (null)
  • fill (0)
    • - + diff --git a/public/app/plugins/datasource/influxdb/queryBuilder.js b/public/app/plugins/datasource/influxdb/queryBuilder.js index e8eaefda61a..9317cea4574 100644 --- a/public/app/plugins/datasource/influxdb/queryBuilder.js +++ b/public/app/plugins/datasource/influxdb/queryBuilder.js @@ -33,8 +33,8 @@ function (_) { query += aggregationFunc + '(value)'; query += ' FROM ' + measurement + ' WHERE $timeFilter'; - query += _.map(target.tags, function(value, key) { - return ' AND ' + key + '=' + "'" + value + "'"; + query += _.map(target.tags, function(tag) { + return ' AND ' + tag.key + '=' + "'" + tag.value + "'"; }).join(''); query += ' GROUP BY time($interval)'; diff --git a/public/app/plugins/datasource/influxdb/queryCtrl.js b/public/app/plugins/datasource/influxdb/queryCtrl.js index e78c100b5c5..5aeb68f00e7 100644 --- a/public/app/plugins/datasource/influxdb/queryCtrl.js +++ b/public/app/plugins/datasource/influxdb/queryCtrl.js @@ -7,13 +7,11 @@ function (angular, _) { var module = angular.module('grafana.controllers'); - module.controller('InfluxQueryCtrl', function($scope, $timeout, $sce, templateSrv) { + module.controller('InfluxQueryCtrl', function($scope, $timeout, $sce, templateSrv, $q) { $scope.functionList = [ - 'count', 'mean', 'sum', 'min', - 'max', 'mode', 'distinct', 'median', - 'derivative', 'stddev', 'first', 'last', - 'difference' + 'count', 'mean', 'sum', 'min', 'max', 'mode', 'distinct', 'median', + 'derivative', 'stddev', 'first', 'last', 'difference' ]; $scope.functionMenu = _.map($scope.functionList, function(func) { @@ -23,12 +21,41 @@ function (angular, _) { $scope.init = function() { var target = $scope.target; target.function = target.function || 'mean'; + target.tags = target.tags || []; + target.groupByTags = target.groupByTags || []; if (!target.measurement) { $scope.measurementSegment = MetricSegment.newSelectMeasurement(); } else { $scope.measurementSegment = new MetricSegment(target.measurement); } + + $scope.tagSegments = []; + _.each(target.tags, function(tag) { + if (tag.condition) { + $scope.tagSegments.push(MetricSegment.newCondition(tag.condition)); + } + $scope.tagSegments.push(new MetricSegment({value: tag.key, type: 'key' })); + $scope.tagSegments.push(new MetricSegment({fake: true, value: "="})); + $scope.tagSegments.push(new MetricSegment({value: tag.value, type: 'value'})); + }); + + if ($scope.tagSegments.length % 3 === 0) { + $scope.tagSegments.push(MetricSegment.newPlusButton()); + } + + $scope.groupBySegments = []; + _.each(target.groupByTags, function(tag) { + $scope.groupBySegments.push(new MetricSegment(tag)); + }); + + $scope.groupBySegments.push(MetricSegment.newPlusButton()); + }; + + $scope.groupByTagUpdated = function(segment, index) { + if (index === $scope.groupBySegments.length-1) { + $scope.groupBySegments.push(MetricSegment.newPlusButton()); + } }; $scope.changeFunction = function(func) { @@ -56,43 +83,107 @@ function (angular, _) { }; $scope.getMeasurements = function () { - // var measurement = $scope.segments[0].value; - // var queryType, query; - // if (index === 0) { - // queryType = 'MEASUREMENTS'; - // query = 'SHOW MEASUREMENTS'; - // } else if (index % 2 === 1) { - // queryType = 'TAG_KEYS'; - // query = 'SHOW TAG KEYS FROM "' + measurement + '"'; - // } else { - // queryType = 'TAG_VALUES'; - // query = 'SHOW TAG VALUES FROM "' + measurement + '" WITH KEY = ' + $scope.segments[$scope.segments.length - 2].value; - // } - // - // console.log('getAltSegments: query' , query); - // - console.log('get measurements'); - return $scope.datasource.metricFindQuery('SHOW MEASUREMENTS', 'MEASUREMENTS').then(function(results) { - console.log('get alt segments: response', results); - var measurements = _.map(results, function(segment) { - return new MetricSegment({ value: segment.text, expandable: segment.expandable }); - }); + return $scope.datasource.metricFindQuery('SHOW MEASUREMENTS', 'MEASUREMENTS') + .then($scope.transformToSegments) + .then($scope.addTemplateVariableSegments) + .then(null, $scope.handleQueryError); + }; - _.each(templateSrv.variables, function(variable) { - measurements.unshift(new MetricSegment({ - type: 'template', - value: '$' + variable.name, - expandable: true, - })); - }); + $scope.handleQueryError = function(err) { + $scope.parserError = err.message || 'Failed to issue metric query'; + return []; + }; - return measurements; - }, function(err) { - $scope.parserError = err.message || 'Failed to issue metric query'; - return []; + $scope.transformToSegments = function(results) { + return _.map(results, function(segment) { + return new MetricSegment({ value: segment.text, expandable: segment.expandable }); }); }; + $scope.addTemplateVariableSegments = function(segments) { + _.each(templateSrv.variables, function(variable) { + segments.unshift(new MetricSegment({ type: 'template', value: '$' + variable.name, expandable: true })); + }); + return segments; + }; + + $scope.getTagsOrValues = function(segment, index) { + var query, queryType; + if (segment.type === 'key' || segment.type === 'plus-button') { + queryType = 'TAG_KEYS'; + query = 'SHOW TAG KEYS FROM "' + $scope.target.measurement + '"'; + } else if (segment.type === 'value') { + queryType = 'TAG_VALUES'; + query = 'SHOW TAG VALUES FROM "' + $scope.target.measurement + '" WITH KEY = ' + $scope.tagSegments[index-2].value; + } else if (segment.type === 'condition') { + return $q.when([new MetricSegment('AND'), new MetricSegment('OR')]); + } + else { + return $q.when([]); + } + + return $scope.datasource.metricFindQuery(query, queryType) + .then($scope.transformToSegments) + .then($scope.addTemplateVariableSegments) + .then(function(results) { + if (queryType === 'TAG_KEYS' && segment.type !== 'plus-button') { + results.push(new MetricSegment({fake: true, value: 'remove tag filter'})); + } + return results; + }) + .then(null, $scope.handleQueryError); + }; + + $scope.tagSegmentUpdated = function(segment, index) { + $scope.tagSegments[index] = segment; + + if (segment.value === 'remove tag filter') { + $scope.tagSegments.splice(index, 3); + if ($scope.tagSegments.length === 0) { + $scope.tagSegments.push(MetricSegment.newPlusButton()); + } else { + $scope.tagSegments.splice(index-1, 1); + $scope.tagSegments.push(MetricSegment.newPlusButton()); + } + } + else { + if (segment.type === 'plus-button') { + if (index > 2) { + $scope.tagSegments.splice(index, 0, MetricSegment.newCondition('AND')); + } + $scope.tagSegments.push(new MetricSegment({fake: true, value: '=', type: 'operator'})); + $scope.tagSegments.push(new MetricSegment({fake: true, value: 'select tag value', type: 'value' })); + segment.type = 'key'; + } + + if ((index+1) === $scope.tagSegments.length) { + $scope.tagSegments.push(MetricSegment.newPlusButton()); + } + } + + $scope.rebuildTargetTagConditions(); + }; + + $scope.rebuildTargetTagConditions = function() { + var tags = [{}]; + var tagIndex = 0; + _.each($scope.tagSegments, function(segment2) { + if (segment2.type === 'key') { + tags[tagIndex].key = segment2.value; + } + else if (segment2.type === 'value') { + tags[tagIndex].value = segment2.value; + } + else if (segment2.type === 'condition') { + tags.push({ condition: segment2.value }); + tagIndex += 1; + } + }); + + $scope.target.tags = tags; + $scope.$parent.get_data(); + }; + function MetricSegment(options) { if (options === '*' || options.value === '*') { this.value = '*'; @@ -107,19 +198,25 @@ function (angular, _) { return; } + this.cssClass = options.cssClass; + this.type = options.type; this.fake = options.fake; this.value = options.value; this.type = options.type; this.expandable = options.expandable; - this.html = $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value)); + this.html = options.html || $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value)); } MetricSegment.newSelectMeasurement = function() { return new MetricSegment({value: 'select measurement', fake: true}); }; - MetricSegment.newSelectTag = function() { - return new MetricSegment({value: 'select tag', fake: true}); + MetricSegment.newCondition = function(condition) { + return new MetricSegment({value: condition, type: 'condition', cssClass: 'query-keyword' }); + }; + + MetricSegment.newPlusButton = function() { + return new MetricSegment({fake: true, html: '', type: 'plus-button' }); }; MetricSegment.newSelectTagValue = function() { diff --git a/public/test/specs/influx09-querybuilder-specs.js b/public/test/specs/influx09-querybuilder-specs.js index 09fb343171a..bec2035760f 100644 --- a/public/test/specs/influx09-querybuilder-specs.js +++ b/public/test/specs/influx09-querybuilder-specs.js @@ -21,7 +21,7 @@ define([ describe('series with tags only', function() { var builder = new InfluxQueryBuilder({ measurement: 'cpu', - tags: {'hostname': 'server1'} + tags: [{key: 'hostname', value: 'server1'}] }); var query = builder.build(); diff --git a/public/test/specs/influxdbQueryCtrl-specs.js b/public/test/specs/influxdbQueryCtrl-specs.js new file mode 100644 index 00000000000..0e177a6aebe --- /dev/null +++ b/public/test/specs/influxdbQueryCtrl-specs.js @@ -0,0 +1,120 @@ +define([ + 'helpers', + 'plugins/datasource/influxdb/queryCtrl' +], function(helpers) { + 'use strict'; + + describe('InfluxDBQueryCtrl', function() { + var ctx = new helpers.ControllerTestContext(); + + beforeEach(module('grafana.controllers')); + beforeEach(ctx.providePhase()); + beforeEach(ctx.createControllerPhase('InfluxQueryCtrl')); + + beforeEach(function() { + ctx.scope.target = {}; + ctx.scope.$parent = { get_data: sinon.spy() }; + + ctx.scope.datasource = ctx.datasource; + ctx.scope.datasource.metricFindQuery = sinon.stub().returns(ctx.$q.when([])); + }); + + describe('init', function() { + beforeEach(function() { + ctx.scope.init(); + }); + + it('should init tagSegments', function() { + expect(ctx.scope.tagSegments.length).to.be(1); + }); + + it('should init measurementSegment', function() { + expect(ctx.scope.measurementSegment.value).to.be('select measurement'); + }); + }); + + describe('when first tag segment is updated', function() { + beforeEach(function() { + ctx.scope.init(); + ctx.scope.tagSegmentUpdated({value: 'asd', type: 'plus-button'}, 0); + }); + + it('should update tag key', function() { + expect(ctx.scope.target.tags[0].key).to.be('asd'); + expect(ctx.scope.tagSegments[0].type).to.be('key'); + }); + + it('should add tagSegments', function() { + expect(ctx.scope.tagSegments.length).to.be(3); + }); + }); + + describe('when last tag value segment is updated', function() { + beforeEach(function() { + ctx.scope.init(); + ctx.scope.tagSegmentUpdated({value: 'asd', type: 'plus-button'}, 0); + ctx.scope.tagSegmentUpdated({value: 'server1', type: 'value'}, 2); + }); + + it('should update tag value', function() { + expect(ctx.scope.target.tags[0].value).to.be('server1'); + }); + + it('should add plus button for another filter', function() { + expect(ctx.scope.tagSegments[3].fake).to.be(true); + }); + }); + + describe('when second tag key is added', function() { + beforeEach(function() { + ctx.scope.init(); + ctx.scope.tagSegmentUpdated({value: 'asd', type: 'plus-button' }, 0); + ctx.scope.tagSegmentUpdated({value: 'server1', type: 'value'}, 2); + ctx.scope.tagSegmentUpdated({value: 'key2', type: 'plus-button'}, 3); + }); + + it('should update tag key', function() { + expect(ctx.scope.target.tags[1].key).to.be('key2'); + }); + + it('should add AND segment', function() { + expect(ctx.scope.tagSegments[3].value).to.be('AND'); + }); + }); + + describe('when condition is changed', function() { + beforeEach(function() { + ctx.scope.init(); + ctx.scope.tagSegmentUpdated({value: 'asd', type: 'plus-button' }, 0); + ctx.scope.tagSegmentUpdated({value: 'server1', type: 'value'}, 2); + ctx.scope.tagSegmentUpdated({value: 'key2', type: 'plus-button'}, 3); + ctx.scope.tagSegmentUpdated({value: 'OR', type: 'condition'}, 3); + }); + + it('should update tag condition', function() { + expect(ctx.scope.target.tags[1].condition).to.be('OR'); + }); + + it('should update AND segment', function() { + expect(ctx.scope.tagSegments[3].value).to.be('OR'); + expect(ctx.scope.tagSegments.length).to.be(7); + }); + }); + + describe('when deleting is changed', function() { + beforeEach(function() { + ctx.scope.init(); + ctx.scope.tagSegmentUpdated({value: 'asd', type: 'plus-button' }, 0); + ctx.scope.tagSegmentUpdated({value: 'server1', type: 'value'}, 2); + ctx.scope.tagSegmentUpdated({value: 'key2', type: 'plus-button'}, 3); + ctx.scope.tagSegmentUpdated({value: 'remove tag filter', type: 'key'}, 4); + }); + + it('should remove all segment after 2 and replace with plus button', function() { + expect(ctx.scope.tagSegments.length).to.be(4); + expect(ctx.scope.tagSegments[3].type).to.be('plus-button'); + }); + }); + + }); +}); diff --git a/public/test/test-main.js b/public/test/test-main.js index 3e944c3c36f..86196069265 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -128,6 +128,7 @@ require([ 'specs/influxQueryBuilder-specs', 'specs/influx09-querybuilder-specs', 'specs/influxdb-datasource-specs', + 'specs/influxdbQueryCtrl-specs', 'specs/graph-ctrl-specs', 'specs/graph-specs', 'specs/graph-tooltip-specs', From 09b0e6e388dc802b090ce016838bf0ef4ccb4874 Mon Sep 17 00:00:00 2001 From: "Haneysmith, Nathan" Date: Fri, 15 May 2015 11:11:02 -0700 Subject: [PATCH 176/398] Addresses #1853, redact session provider secrets In cases where a database is used for session storage, redact the session_provider config value. I assumed "@" as the marker for a database vs file/memory. --- pkg/api/admin_settings.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/admin_settings.go b/pkg/api/admin_settings.go index 21615219acd..71ed229bba7 100644 --- a/pkg/api/admin_settings.go +++ b/pkg/api/admin_settings.go @@ -17,7 +17,7 @@ func AdminGetSettings(c *middleware.Context) { for _, key := range section.Keys() { keyName := key.Name() value := key.Value() - if strings.Contains(keyName, "secret") || strings.Contains(keyName, "password") { + if strings.Contains(keyName, "secret") || strings.Contains(keyName, "password") || (strings.Contains(keyName, "provider_config") && strings.Contains(value, "@")) { value = "************" } From 2af28b90c2a3e9c4fbd5280af90eae490bf1b591 Mon Sep 17 00:00:00 2001 From: "Haneysmith, Nathan" Date: Fri, 15 May 2015 13:25:41 -0700 Subject: [PATCH 177/398] whitespace update per gofmt --- pkg/api/admin_settings.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/admin_settings.go b/pkg/api/admin_settings.go index 71ed229bba7..06413d6a0b1 100644 --- a/pkg/api/admin_settings.go +++ b/pkg/api/admin_settings.go @@ -17,7 +17,7 @@ func AdminGetSettings(c *middleware.Context) { for _, key := range section.Keys() { keyName := key.Name() value := key.Value() - if strings.Contains(keyName, "secret") || strings.Contains(keyName, "password") || (strings.Contains(keyName, "provider_config") && strings.Contains(value, "@")) { + if strings.Contains(keyName, "secret") || strings.Contains(keyName, "password") || (strings.Contains(keyName, "provider_config") && strings.Contains(value, "@")) { value = "************" } From 6fd37779b8538981dde8fe9d147d285819930209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 15 May 2015 19:04:49 +0200 Subject: [PATCH 178/398] More work on new influxdb query editor, #1525 --- .../influxdb/partials/query.editor.html | 2 +- .../datasource/influxdb/queryBuilder.js | 16 ++-- .../plugins/datasource/influxdb/queryCtrl.js | 79 +++++++++++++---- public/css/less/grafana.less | 12 +++ .../test/specs/influx09-querybuilder-specs.js | 35 +++++++- public/test/specs/influxdbQueryCtrl-specs.js | 86 ++++++++++++++++++- 6 files changed, 203 insertions(+), 27 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html index 494eaff5520..8ea612b0924 100644 --- a/public/app/plugins/datasource/influxdb/partials/query.editor.html +++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html @@ -91,7 +91,7 @@ time($interval)
  • - +
  • diff --git a/public/app/plugins/datasource/influxdb/queryBuilder.js b/public/app/plugins/datasource/influxdb/queryBuilder.js index 9317cea4574..461408307d3 100644 --- a/public/app/plugins/datasource/influxdb/queryBuilder.js +++ b/public/app/plugins/datasource/influxdb/queryBuilder.js @@ -1,5 +1,5 @@ define([ - 'lodash' + 'lodash' ], function (_) { 'use strict'; @@ -32,12 +32,18 @@ function (_) { } query += aggregationFunc + '(value)'; - query += ' FROM ' + measurement + ' WHERE $timeFilter'; - query += _.map(target.tags, function(tag) { - return ' AND ' + tag.key + '=' + "'" + tag.value + "'"; - }).join(''); + query += ' FROM ' + measurement + ' WHERE '; + var conditions = _.map(target.tags, function(tag) { + return tag.key + '=' + "'" + tag.value + "' "; + }); + conditions.push('$timeFilter'); + + query += conditions.join('AND '); query += ' GROUP BY time($interval)'; + if (target.groupByTags && target.groupByTags.length > 0) { + query += ', ' + target.groupByTags.join(); + } if (target.fill) { query += ' fill(' + target.fill + ')'; diff --git a/public/app/plugins/datasource/influxdb/queryCtrl.js b/public/app/plugins/datasource/influxdb/queryCtrl.js index 5aeb68f00e7..e68d10a2067 100644 --- a/public/app/plugins/datasource/influxdb/queryCtrl.js +++ b/public/app/plugins/datasource/influxdb/queryCtrl.js @@ -35,14 +35,12 @@ function (angular, _) { if (tag.condition) { $scope.tagSegments.push(MetricSegment.newCondition(tag.condition)); } - $scope.tagSegments.push(new MetricSegment({value: tag.key, type: 'key' })); - $scope.tagSegments.push(new MetricSegment({fake: true, value: "="})); - $scope.tagSegments.push(new MetricSegment({value: tag.value, type: 'value'})); + $scope.tagSegments.push(new MetricSegment({value: tag.key, type: 'key', cssClass: 'query-segment-key' })); + $scope.tagSegments.push(new MetricSegment({fake: true, value: "=", cssClass: 'query-segment-operator'})); + $scope.tagSegments.push(new MetricSegment({value: tag.value, type: 'value', cssClass: 'query-segment-value'})); }); - if ($scope.tagSegments.length % 3 === 0) { - $scope.tagSegments.push(MetricSegment.newPlusButton()); - } + $scope.fixTagSegments(); $scope.groupBySegments = []; _.each(target.groupByTags, function(tag) { @@ -50,12 +48,37 @@ function (angular, _) { }); $scope.groupBySegments.push(MetricSegment.newPlusButton()); + + $scope.removeTagFilterSegment = new MetricSegment({fake: true, value: 'remove tag filter'}); + $scope.removeGroupBySegment = new MetricSegment({fake: true, value: 'remove group by'}); + }; + + $scope.fixTagSegments = function() { + var count = $scope.tagSegments.length; + var lastSegment = $scope.tagSegments[Math.max(count-1, 0)]; + + if (!lastSegment || lastSegment.type !== 'plus-button') { + $scope.tagSegments.push(MetricSegment.newPlusButton()); + } }; $scope.groupByTagUpdated = function(segment, index) { + if (segment.value === $scope.removeGroupBySegment.value) { + $scope.target.groupByTags.splice(index, 1); + $scope.groupBySegments.splice(index, 1); + $scope.$parent.get_data(); + return; + } + if (index === $scope.groupBySegments.length-1) { $scope.groupBySegments.push(MetricSegment.newPlusButton()); } + + segment.type = 'group-by-key'; + segment.fake = false; + + $scope.target.groupByTags[index] = segment.value; + $scope.$parent.get_data(); }; $scope.changeFunction = function(func) { @@ -65,7 +88,6 @@ function (angular, _) { $scope.measurementChanged = function() { $scope.target.measurement = $scope.measurementSegment.value; - console.log('measurement updated', $scope.target.measurement); $scope.$parent.get_data(); }; @@ -126,8 +148,23 @@ function (angular, _) { .then($scope.transformToSegments) .then($scope.addTemplateVariableSegments) .then(function(results) { - if (queryType === 'TAG_KEYS' && segment.type !== 'plus-button') { - results.push(new MetricSegment({fake: true, value: 'remove tag filter'})); + if (queryType === 'TAG_KEYS' && segment.type === 'key') { + results.push(angular.copy($scope.removeTagFilterSegment)); + } + return results; + }) + .then(null, $scope.handleQueryError); + }; + + $scope.getGroupByTagSegments = function(segment) { + var query = 'SHOW TAG KEYS FROM "' + $scope.target.measurement + '"'; + + return $scope.datasource.metricFindQuery(query, 'TAG_KEYS') + .then($scope.transformToSegments) + .then($scope.addTemplateVariableSegments) + .then(function(results) { + if (segment.type !== 'plus-button') { + results.push(angular.copy($scope.removeGroupBySegment)); } return results; }) @@ -137,13 +174,15 @@ function (angular, _) { $scope.tagSegmentUpdated = function(segment, index) { $scope.tagSegments[index] = segment; - if (segment.value === 'remove tag filter') { + if (segment.value === $scope.removeTagFilterSegment.value) { $scope.tagSegments.splice(index, 3); if ($scope.tagSegments.length === 0) { $scope.tagSegments.push(MetricSegment.newPlusButton()); - } else { - $scope.tagSegments.splice(index-1, 1); - $scope.tagSegments.push(MetricSegment.newPlusButton()); + } else if ($scope.tagSegments.length > 2) { + $scope.tagSegments.splice(Math.max(index-1, 0), 1); + if ($scope.tagSegments[$scope.tagSegments.length-1].type !== 'plus-button') { + $scope.tagSegments.push(MetricSegment.newPlusButton()); + } } } else { @@ -151,9 +190,10 @@ function (angular, _) { if (index > 2) { $scope.tagSegments.splice(index, 0, MetricSegment.newCondition('AND')); } - $scope.tagSegments.push(new MetricSegment({fake: true, value: '=', type: 'operator'})); - $scope.tagSegments.push(new MetricSegment({fake: true, value: 'select tag value', type: 'value' })); + $scope.tagSegments.push(MetricSegment.newFake('=', 'operator', 'query-segment-operator')); + $scope.tagSegments.push(MetricSegment.newFake('select tag value', 'value', 'query-segment-value')); segment.type = 'key'; + segment.cssClass = 'query-segment-key'; } if ((index+1) === $scope.tagSegments.length) { @@ -165,10 +205,13 @@ function (angular, _) { }; $scope.rebuildTargetTagConditions = function() { - var tags = [{}]; + var tags = []; var tagIndex = 0; _.each($scope.tagSegments, function(segment2) { if (segment2.type === 'key') { + if (tags.length === 0) { + tags.push({}); + } tags[tagIndex].key = segment2.value; } else if (segment2.type === 'value') { @@ -211,6 +254,10 @@ function (angular, _) { return new MetricSegment({value: 'select measurement', fake: true}); }; + MetricSegment.newFake = function(text, type, cssClass) { + return new MetricSegment({value: text, fake: true, type: type, cssClass: cssClass}); + }; + MetricSegment.newCondition = function(condition) { return new MetricSegment({value: condition, type: 'condition', cssClass: 'query-keyword' }); }; diff --git a/public/css/less/grafana.less b/public/css/less/grafana.less index 9be157f80d0..681702315c0 100644 --- a/public/css/less/grafana.less +++ b/public/css/less/grafana.less @@ -343,4 +343,16 @@ color: @blue; } +.query-segment-key { + border-right: none; + padding-right: 1px; +} + +.query-segment-operator { + padding-right: 1px; + border-right: none; + color: @orange; +} + + diff --git a/public/test/specs/influx09-querybuilder-specs.js b/public/test/specs/influx09-querybuilder-specs.js index bec2035760f..1b126b0bdf9 100644 --- a/public/test/specs/influx09-querybuilder-specs.js +++ b/public/test/specs/influx09-querybuilder-specs.js @@ -18,7 +18,7 @@ define([ }); - describe('series with tags only', function() { + describe('series with single tag only', function() { var builder = new InfluxQueryBuilder({ measurement: 'cpu', tags: [{key: 'hostname', value: 'server1'}] @@ -27,12 +27,41 @@ define([ var query = builder.build(); it('should generate correct query', function() { - expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE $timeFilter ' + - 'AND hostname=\'server1\' GROUP BY time($interval) ORDER BY asc'); + expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE hostname=\'server1\' AND $timeFilter' + + ' GROUP BY time($interval) ORDER BY asc'); }); }); + describe('series with multiple tags only', function() { + var builder = new InfluxQueryBuilder({ + measurement: 'cpu', + tags: [{key: 'hostname', value: 'server1'}, {key: 'app', value: 'email', condition: "AND"}] + }); + + var query = builder.build(); + + it('should generate correct query', function() { + expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE hostname=\'server1\' AND app=\'email\' AND ' + + '$timeFilter GROUP BY time($interval) ORDER BY asc'); + }); + }); + + describe('series with groupByTag', function() { + var builder = new InfluxQueryBuilder({ + measurement: 'cpu', + tags: [], + groupByTags: ["host"] + }); + + var query = builder.build(); + + it('should generate correct query', function() { + expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE $timeFilter ' + + 'GROUP BY time($interval), host ORDER BY asc'); + }); + }); + }); }); diff --git a/public/test/specs/influxdbQueryCtrl-specs.js b/public/test/specs/influxdbQueryCtrl-specs.js index 0e177a6aebe..2b106952160 100644 --- a/public/test/specs/influxdbQueryCtrl-specs.js +++ b/public/test/specs/influxdbQueryCtrl-specs.js @@ -101,13 +101,31 @@ define([ }); }); - describe('when deleting is changed', function() { + describe('when deleting first tag filter after value is selected', function() { + beforeEach(function() { + ctx.scope.init(); + ctx.scope.tagSegmentUpdated({value: 'asd', type: 'plus-button' }, 0); + ctx.scope.tagSegmentUpdated({value: 'server1', type: 'value'}, 2); + ctx.scope.tagSegmentUpdated(ctx.scope.removeTagFilterSegment, 0); + }); + + it('should remove tags', function() { + expect(ctx.scope.target.tags.length).to.be(0); + }); + + it('should remove all segment after 2 and replace with plus button', function() { + expect(ctx.scope.tagSegments.length).to.be(1); + expect(ctx.scope.tagSegments[0].type).to.be('plus-button'); + }); + }); + + describe('when deleting second tag value before second tag value is complete', function() { beforeEach(function() { ctx.scope.init(); ctx.scope.tagSegmentUpdated({value: 'asd', type: 'plus-button' }, 0); ctx.scope.tagSegmentUpdated({value: 'server1', type: 'value'}, 2); ctx.scope.tagSegmentUpdated({value: 'key2', type: 'plus-button'}, 3); - ctx.scope.tagSegmentUpdated({value: 'remove tag filter', type: 'key'}, 4); + ctx.scope.tagSegmentUpdated(ctx.scope.removeTagFilterSegment, 4); }); it('should remove all segment after 2 and replace with plus button', function() { @@ -116,5 +134,69 @@ define([ }); }); + describe('when deleting second tag value before second tag value is complete', function() { + beforeEach(function() { + ctx.scope.init(); + ctx.scope.tagSegmentUpdated({value: 'asd', type: 'plus-button' }, 0); + ctx.scope.tagSegmentUpdated({value: 'server1', type: 'value'}, 2); + ctx.scope.tagSegmentUpdated({value: 'key2', type: 'plus-button'}, 3); + ctx.scope.tagSegmentUpdated(ctx.scope.removeTagFilterSegment, 4); + }); + + it('should remove all segment after 2 and replace with plus button', function() { + expect(ctx.scope.tagSegments.length).to.be(4); + expect(ctx.scope.tagSegments[3].type).to.be('plus-button'); + }); + }); + + describe('when deleting second tag value after second tag filter is complete', function() { + beforeEach(function() { + ctx.scope.init(); + ctx.scope.tagSegmentUpdated({value: 'asd', type: 'plus-button' }, 0); + ctx.scope.tagSegmentUpdated({value: 'server1', type: 'value'}, 2); + ctx.scope.tagSegmentUpdated({value: 'key2', type: 'plus-button'}, 3); + ctx.scope.tagSegmentUpdated({value: 'value', type: 'value'}, 6); + ctx.scope.tagSegmentUpdated(ctx.scope.removeTagFilterSegment, 4); + }); + + it('should remove all segment after 2 and replace with plus button', function() { + expect(ctx.scope.tagSegments.length).to.be(4); + expect(ctx.scope.tagSegments[3].type).to.be('plus-button'); + }); + }); + + describe('when adding group by', function() { + beforeEach(function() { + ctx.scope.init(); + ctx.scope.groupByTagUpdated({value: 'host', type: 'plus-button' }, 0); + }); + + it('should add group by', function() { + expect(ctx.scope.target.groupByTags.length).to.be(1); + expect(ctx.scope.target.groupByTags[0]).to.be('host'); + }); + + it('should add another plus button segment', function() { + expect(ctx.scope.groupBySegments[1].type).to.be('plus-button'); + }); + }); + + describe('when removing group by', function() { + beforeEach(function() { + ctx.scope.init(); + ctx.scope.groupByTagUpdated({value: 'host', type: 'plus-button' }, 0); + ctx.scope.groupByTagUpdated(ctx.scope.removeGroupBySegment, 0); + }); + + it('should add group by', function() { + expect(ctx.scope.target.groupByTags.length).to.be(0); + }); + + it('should remove segment', function() { + expect(ctx.scope.groupBySegments.length).to.be(1); + expect(ctx.scope.groupBySegments[0].type).to.be('plus-button'); + }); + }); + }); }); From 7a41ecb63f032344cfe46d9c77963a2105261c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 16 May 2015 16:08:13 +0200 Subject: [PATCH 179/398] Minor work on InfluxDB 0.9 query editor, #1525, hit a roadblock with the new InfluxDB query language, does not support tag and tag values discovery queries with filters, not sure if I need to move to SHOW SERIES style queries --- .../plugins/datasource/influxdb/queryCtrl.js | 20 ++++++++++++++----- public/test/specs/influxdbQueryCtrl-specs.js | 18 +++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/queryCtrl.js b/public/app/plugins/datasource/influxdb/queryCtrl.js index e68d10a2067..00729391b59 100644 --- a/public/app/plugins/datasource/influxdb/queryCtrl.js +++ b/public/app/plugins/datasource/influxdb/queryCtrl.js @@ -49,8 +49,8 @@ function (angular, _) { $scope.groupBySegments.push(MetricSegment.newPlusButton()); - $scope.removeTagFilterSegment = new MetricSegment({fake: true, value: 'remove tag filter'}); - $scope.removeGroupBySegment = new MetricSegment({fake: true, value: 'remove group by'}); + $scope.removeTagFilterSegment = new MetricSegment({fake: true, value: '-- remove tag filter --'}); + $scope.removeGroupBySegment = new MetricSegment({fake: true, value: '-- remove group by --'}); }; $scope.fixTagSegments = function() { @@ -129,11 +129,21 @@ function (angular, _) { return segments; }; + $scope.buildTagKeysQuery = function(target) { + var query = 'SHOW TAG KEYS'; + + if (target.measurement) { + query += ' FROM "' + target.measurement + '"'; + } + + return query; + }; + $scope.getTagsOrValues = function(segment, index) { var query, queryType; if (segment.type === 'key' || segment.type === 'plus-button') { queryType = 'TAG_KEYS'; - query = 'SHOW TAG KEYS FROM "' + $scope.target.measurement + '"'; + query = $scope.buildTagKeysQuery($scope.target, segment); } else if (segment.type === 'value') { queryType = 'TAG_VALUES'; query = 'SHOW TAG VALUES FROM "' + $scope.target.measurement + '" WITH KEY = ' + $scope.tagSegments[index-2].value; @@ -149,7 +159,7 @@ function (angular, _) { .then($scope.addTemplateVariableSegments) .then(function(results) { if (queryType === 'TAG_KEYS' && segment.type === 'key') { - results.push(angular.copy($scope.removeTagFilterSegment)); + results.splice(0, 0, angular.copy($scope.removeTagFilterSegment)); } return results; }) @@ -164,7 +174,7 @@ function (angular, _) { .then($scope.addTemplateVariableSegments) .then(function(results) { if (segment.type !== 'plus-button') { - results.push(angular.copy($scope.removeGroupBySegment)); + results.splice(0, 0, angular.copy($scope.removeGroupBySegment)); } return results; }) diff --git a/public/test/specs/influxdbQueryCtrl-specs.js b/public/test/specs/influxdbQueryCtrl-specs.js index 2b106952160..2c9915c6760 100644 --- a/public/test/specs/influxdbQueryCtrl-specs.js +++ b/public/test/specs/influxdbQueryCtrl-specs.js @@ -198,5 +198,23 @@ define([ }); }); + describe('when building tag keys query', function() { + + describe('given picked measurement', function() { + it('build query with measurement filter', function() { + var query = ctx.scope.buildTagKeysQuery({ measurement: 'cpu', tags: [] }, {type: 'key'}); + expect(query).to.be('SHOW TAG KEYS FROM "cpu"'); + }); + }); + + describe('given no picked measurement', function() { + it('build query without filter', function() { + var query = ctx.scope.buildTagKeysQuery({ measurement: '', tags: [] }, {type: 'key'}); + expect(query).to.be('SHOW TAG KEYS'); + }); + }); + + }); + }); }); From 05d725d0b85ae9f8a0d1d1b34814c7ce3c11a894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 16 May 2015 16:46:24 +0200 Subject: [PATCH 180/398] Slight refactoring, #1525 --- .../datasource/influxdb/queryBuilder.js | 12 +++++++- .../plugins/datasource/influxdb/queryCtrl.js | 19 ++++--------- .../test/specs/influx09-querybuilder-specs.js | 28 +++++++++++++++++++ public/test/specs/influxdbQueryCtrl-specs.js | 17 ----------- 4 files changed, 45 insertions(+), 31 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/queryBuilder.js b/public/app/plugins/datasource/influxdb/queryBuilder.js index 461408307d3..fa2069ea35d 100644 --- a/public/app/plugins/datasource/influxdb/queryBuilder.js +++ b/public/app/plugins/datasource/influxdb/queryBuilder.js @@ -14,6 +14,16 @@ function (_) { return this.target.rawQuery ? this._modifyRawQuery() : this._buildQuery(); }; + p.showTagsQuery = function() { + var query = 'SHOW TAG KEYS'; + + if (this.target.measurement) { + query += ' FROM "' + this.target.measurement + '"'; + } + + return query; + }; + p._buildQuery = function() { var target = this.target; @@ -27,7 +37,7 @@ function (_) { var measurement = target.measurement; var aggregationFunc = target.function || 'mean'; - if(!measurement.match('^/.*/') && !measurement.match(/^merge\(.*\)/)) { + if (!measurement.match('^/.*/') && !measurement.match(/^merge\(.*\)/)) { measurement = '"' + measurement+ '"'; } diff --git a/public/app/plugins/datasource/influxdb/queryCtrl.js b/public/app/plugins/datasource/influxdb/queryCtrl.js index 00729391b59..826ef26565d 100644 --- a/public/app/plugins/datasource/influxdb/queryCtrl.js +++ b/public/app/plugins/datasource/influxdb/queryCtrl.js @@ -1,8 +1,9 @@ define([ 'angular', - 'lodash' + 'lodash', + './queryBuilder', ], -function (angular, _) { +function (angular, _, InfluxQueryBuilder) { 'use strict'; var module = angular.module('grafana.controllers'); @@ -24,6 +25,8 @@ function (angular, _) { target.tags = target.tags || []; target.groupByTags = target.groupByTags || []; + $scope.queryBuilder = new InfluxQueryBuilder(target); + if (!target.measurement) { $scope.measurementSegment = MetricSegment.newSelectMeasurement(); } else { @@ -129,21 +132,11 @@ function (angular, _) { return segments; }; - $scope.buildTagKeysQuery = function(target) { - var query = 'SHOW TAG KEYS'; - - if (target.measurement) { - query += ' FROM "' + target.measurement + '"'; - } - - return query; - }; - $scope.getTagsOrValues = function(segment, index) { var query, queryType; if (segment.type === 'key' || segment.type === 'plus-button') { queryType = 'TAG_KEYS'; - query = $scope.buildTagKeysQuery($scope.target, segment); + query = $scope.queryBuilder.showTagsQuery(); } else if (segment.type === 'value') { queryType = 'TAG_VALUES'; query = 'SHOW TAG VALUES FROM "' + $scope.target.measurement + '" WITH KEY = ' + $scope.tagSegments[index-2].value; diff --git a/public/test/specs/influx09-querybuilder-specs.js b/public/test/specs/influx09-querybuilder-specs.js index 1b126b0bdf9..81602da51f7 100644 --- a/public/test/specs/influx09-querybuilder-specs.js +++ b/public/test/specs/influx09-querybuilder-specs.js @@ -62,6 +62,34 @@ define([ }); }); + describe('when building tag keys query', function() { + + describe('given picked measurement', function() { + it('build query with measurement filter', function() { + var builder = new InfluxQueryBuilder({ measurement: 'cpu', tags: [] }); + var query = builder.showTagsQuery(); + expect(query).to.be('SHOW TAG KEYS FROM "cpu"'); + }); + }); + + describe('given no picked measurement', function() { + it('build query without filter', function() { + var builder = new InfluxQueryBuilder({ measurement: '', tags: [] }); + var query = builder.showTagsQuery(); + expect(query).to.be('SHOW TAG KEYS'); + }); + }); + + describe('given an existing tag', function() { + it('build query with filter', function() { + var builder = new InfluxQueryBuilder({ measurement: '', tags: [{key: 'host', value: 'se1'}] }); + var query = builder.showTagsQuery(); + expect(query).to.be('SHOW TAG KEYS'); + }); + }); + + }); + }); }); diff --git a/public/test/specs/influxdbQueryCtrl-specs.js b/public/test/specs/influxdbQueryCtrl-specs.js index 2c9915c6760..4ce9b0e6696 100644 --- a/public/test/specs/influxdbQueryCtrl-specs.js +++ b/public/test/specs/influxdbQueryCtrl-specs.js @@ -198,23 +198,6 @@ define([ }); }); - describe('when building tag keys query', function() { - - describe('given picked measurement', function() { - it('build query with measurement filter', function() { - var query = ctx.scope.buildTagKeysQuery({ measurement: 'cpu', tags: [] }, {type: 'key'}); - expect(query).to.be('SHOW TAG KEYS FROM "cpu"'); - }); - }); - - describe('given no picked measurement', function() { - it('build query without filter', function() { - var query = ctx.scope.buildTagKeysQuery({ measurement: '', tags: [] }, {type: 'key'}); - expect(query).to.be('SHOW TAG KEYS'); - }); - }); - - }); }); }); From 41a73a7adb654b49a713a5c7c35a864608bc1bfc Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Sun, 17 May 2015 21:46:14 +0900 Subject: [PATCH 181/398] Expand variables in KairosDB Plugin --- .../app/plugins/datasource/kairosdb/datasource.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index b97a06fea04..0c5ab6068f1 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -9,7 +9,7 @@ function (angular, _, kbn) { var module = angular.module('grafana.services'); - module.factory('KairosDBDatasource', function($q, $http) { + module.factory('KairosDBDatasource', function($q, $http, templateSrv) { function KairosDBDatasource(datasource) { this.type = datasource.type; @@ -186,7 +186,7 @@ function (angular, _, kbn) { } var query = { - name: target.metric + name: templateSrv.replace(target.metric) }; query.aggregators = []; @@ -236,13 +236,20 @@ function (angular, _, kbn) { if (target.tags) { query.tags = angular.copy(target.tags); + _.forOwn(query.tags, function(value, key) { + query.tags[key] = _.map(value, function(tag) { return templateSrv.replace(tag); }); + }); } if (target.groupByTags || target.nonTagGroupBys) { query.group_by = []; if (target.groupByTags) { - query.group_by.push({name: "tag", tags: angular.copy(target.groupByTags)}); + query.group_by.push({ + name: "tag", + tags: _.map(angular.copy(target.groupByTags), function(tag) { return templateSrv.replace(tag); }) + }); } + if (target.nonTagGroupBys) { _.each(target.nonTagGroupBys, function(rawGroupBy) { var formattedGroupBy = angular.copy(rawGroupBy); @@ -261,6 +268,8 @@ function (angular, _, kbn) { ////////////////////////////////////////////////////////////////////// KairosDBDatasource.prototype.convertToKairosInterval = function(intervalString) { + intervalString = templateSrv.replace(intervalString); + var interval_regex = /(\d+(?:\.\d+)?)([Mwdhmsy])/; var interval_regex_ms = /(\d+(?:\.\d+)?)(ms)/; var matches = intervalString.match(interval_regex_ms); From a6d993ecdca3a2d923dfd207d63a79131e67eca3 Mon Sep 17 00:00:00 2001 From: anryko Date: Sun, 17 May 2015 18:12:20 +0200 Subject: [PATCH 182/398] Update latest.json --- latest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latest.json b/latest.json index a6613c11634..4d3c471727e 100644 --- a/latest.json +++ b/latest.json @@ -1,3 +1,3 @@ { - "version": "2.0.1", + "version": "2.0.2", } From 1302630abef69451918d4b30435169a23e9dddb2 Mon Sep 17 00:00:00 2001 From: fffw Date: Mon, 18 May 2015 14:47:00 +0800 Subject: [PATCH 183/398] fix mac.md for incorrect href --- docs/sources/installation/mac.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md index a585b748630..48f8ca075a3 100644 --- a/docs/sources/installation/mac.md +++ b/docs/sources/installation/mac.md @@ -7,7 +7,7 @@ page_keywords: grafana, installation, mac, osx, guide # Installing on Mac There is currently no binary build for Mac. But read the [build from -source](../project/building_from_source) page for instructions on how to +source](/project/building_from_source) page for instructions on how to build it yourself. From b61f30de94eaa01c9a956d1edba4052a2d0889d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 May 2015 10:49:34 +0200 Subject: [PATCH 184/398] Lots of progress on InfluxDB Query Editor, show tag keys, values and measurement dropdowns now take into account already selected tags or measurements, so you can start with tag keys and the select measurement, #1525 --- .../plugins/datasource/influxdb/datasource.js | 30 ++++------ .../datasource/influxdb/queryBuilder.js | 38 +++++++++++-- .../plugins/datasource/influxdb/queryCtrl.js | 20 +++---- .../test/specs/influx09-querybuilder-specs.js | 56 ++++++++++++------- 4 files changed, 93 insertions(+), 51 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/datasource.js b/public/app/plugins/datasource/influxdb/datasource.js index 35fb495c740..56b01772c55 100644 --- a/public/app/plugins/datasource/influxdb/datasource.js +++ b/public/app/plugins/datasource/influxdb/datasource.js @@ -74,7 +74,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { }); }; - InfluxDatasource.prototype.metricFindQuery = function (query, queryType) { + InfluxDatasource.prototype.metricFindQuery = function (query) { var interpolated; try { interpolated = templateSrv.replace(query); @@ -83,39 +83,33 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { return $q.reject(err); } - console.log('metricFindQuery called with: ' + [query, queryType].join(', ')); - - return this._seriesQuery(interpolated, queryType).then(function (results) { + return this._seriesQuery(interpolated).then(function (results) { if (!results || results.results.length === 0) { return []; } var influxResults = results.results[0]; if (!influxResults.series) { return []; } - - console.log('metric find query response', results); var series = influxResults.series[0]; - switch (queryType) { - case 'MEASUREMENTS': + if (query.indexOf('SHOW MEASUREMENTS') === 0) { return _.map(series.values, function(value) { return { text: value[0], expandable: true }; }); - case 'TAG_KEYS': - var tagKeys = _.flatten(series.values); - return _.map(tagKeys, function(tagKey) { return { text: tagKey, expandable: true }; }); - case 'TAG_VALUES': - var tagValues = _.flatten(series.values); - return _.map(tagValues, function(tagValue) { return { text: tagValue, expandable: true }; }); - default: // template values service does not pass in a a query type - var flattenedValues = _.flatten(series.values); - return _.map(flattenedValues, function(value) { return { text: value, expandable: true }; }); } + + var flattenedValues = _.flatten(series.values); + return _.map(flattenedValues, function(value) { return { text: value, expandable: true }; }); }); }; function retry(deferred, callback, delay) { return callback().then(undefined, function(reason) { if (reason.status !== 0 || reason.status >= 300) { - reason.message = 'InfluxDB Error:
    ' + reason.data; + if (reason.data && reason.data.error) { + reason.message = 'InfluxDB Error Response: ' + reason.data.error; + } + else { + reason.message = 'InfluxDB Error: ' + reason.message; + } deferred.reject(reason); } else { diff --git a/public/app/plugins/datasource/influxdb/queryBuilder.js b/public/app/plugins/datasource/influxdb/queryBuilder.js index fa2069ea35d..1b522ba8eca 100644 --- a/public/app/plugins/datasource/influxdb/queryBuilder.js +++ b/public/app/plugins/datasource/influxdb/queryBuilder.js @@ -14,11 +14,41 @@ function (_) { return this.target.rawQuery ? this._modifyRawQuery() : this._buildQuery(); }; - p.showTagsQuery = function() { - var query = 'SHOW TAG KEYS'; + p.buildExploreQuery = function(type, withKey) { + var query; + var measurement; - if (this.target.measurement) { - query += ' FROM "' + this.target.measurement + '"'; + if (type === 'TAG_KEYS') { + query = 'SHOW TAG KEYS'; + measurement= this.target.measurement; + } else if (type === 'TAG_VALUES') { + query = 'SHOW TAG VALUES'; + measurement= this.target.measurement; + } else if (type === 'MEASUREMENTS') { + query = 'SHOW MEASUREMENTS'; + } + + if (measurement) { + query += ' FROM "' + measurement + '"'; + } + + if (withKey) { + query += ' WITH KEY = "' + withKey + '"'; + } + + if (this.target.tags && this.target.tags.length > 0) { + var whereConditions = _.reduce(this.target.tags, function(memo, tag) { + // do not add a condition for the key we want to explore for + if (tag.key === withKey) { + return memo; + } + memo.push(' ' + tag.key + '=' + "'" + tag.value + "'"); + return memo; + }, []); + + if (whereConditions.length > 0) { + query += ' WHERE' + whereConditions.join('AND'); + } } return query; diff --git a/public/app/plugins/datasource/influxdb/queryCtrl.js b/public/app/plugins/datasource/influxdb/queryCtrl.js index 826ef26565d..828ab3809b0 100644 --- a/public/app/plugins/datasource/influxdb/queryCtrl.js +++ b/public/app/plugins/datasource/influxdb/queryCtrl.js @@ -108,7 +108,8 @@ function (angular, _, InfluxQueryBuilder) { }; $scope.getMeasurements = function () { - return $scope.datasource.metricFindQuery('SHOW MEASUREMENTS', 'MEASUREMENTS') + var query = $scope.queryBuilder.buildExploreQuery('MEASUREMENTS'); + return $scope.datasource.metricFindQuery(query) .then($scope.transformToSegments) .then($scope.addTemplateVariableSegments) .then(null, $scope.handleQueryError); @@ -133,13 +134,12 @@ function (angular, _, InfluxQueryBuilder) { }; $scope.getTagsOrValues = function(segment, index) { - var query, queryType; + var query; + if (segment.type === 'key' || segment.type === 'plus-button') { - queryType = 'TAG_KEYS'; - query = $scope.queryBuilder.showTagsQuery(); + query = $scope.queryBuilder.buildExploreQuery('TAG_KEYS'); } else if (segment.type === 'value') { - queryType = 'TAG_VALUES'; - query = 'SHOW TAG VALUES FROM "' + $scope.target.measurement + '" WITH KEY = ' + $scope.tagSegments[index-2].value; + query = $scope.queryBuilder.buildExploreQuery('TAG_VALUES', $scope.tagSegments[index-2].value); } else if (segment.type === 'condition') { return $q.when([new MetricSegment('AND'), new MetricSegment('OR')]); } @@ -147,11 +147,11 @@ function (angular, _, InfluxQueryBuilder) { return $q.when([]); } - return $scope.datasource.metricFindQuery(query, queryType) + return $scope.datasource.metricFindQuery(query) .then($scope.transformToSegments) .then($scope.addTemplateVariableSegments) .then(function(results) { - if (queryType === 'TAG_KEYS' && segment.type === 'key') { + if (segment.type === 'key') { results.splice(0, 0, angular.copy($scope.removeTagFilterSegment)); } return results; @@ -160,9 +160,9 @@ function (angular, _, InfluxQueryBuilder) { }; $scope.getGroupByTagSegments = function(segment) { - var query = 'SHOW TAG KEYS FROM "' + $scope.target.measurement + '"'; + var query = $scope.queryBuilder.buildExploreQuery('TAG_KEYS'); - return $scope.datasource.metricFindQuery(query, 'TAG_KEYS') + return $scope.datasource.metricFindQuery(query) .then($scope.transformToSegments) .then($scope.addTemplateVariableSegments) .then(function(results) { diff --git a/public/test/specs/influx09-querybuilder-specs.js b/public/test/specs/influx09-querybuilder-specs.js index 81602da51f7..2b1660f0a90 100644 --- a/public/test/specs/influx09-querybuilder-specs.js +++ b/public/test/specs/influx09-querybuilder-specs.js @@ -62,30 +62,48 @@ define([ }); }); - describe('when building tag keys query', function() { + describe('when building explore queries', function() { - describe('given picked measurement', function() { - it('build query with measurement filter', function() { - var builder = new InfluxQueryBuilder({ measurement: 'cpu', tags: [] }); - var query = builder.showTagsQuery(); - expect(query).to.be('SHOW TAG KEYS FROM "cpu"'); - }); + it('should only have measurement condition in tag keys query given query with measurement', function() { + var builder = new InfluxQueryBuilder({ measurement: 'cpu', tags: [] }); + var query = builder.buildExploreQuery('TAG_KEYS'); + expect(query).to.be('SHOW TAG KEYS FROM "cpu"'); }); - describe('given no picked measurement', function() { - it('build query without filter', function() { - var builder = new InfluxQueryBuilder({ measurement: '', tags: [] }); - var query = builder.showTagsQuery(); - expect(query).to.be('SHOW TAG KEYS'); - }); + it('should have no conditions in tags keys query given query with no measurement or tag', function() { + var builder = new InfluxQueryBuilder({ measurement: '', tags: [] }); + var query = builder.buildExploreQuery('TAG_KEYS'); + expect(query).to.be('SHOW TAG KEYS'); }); - describe('given an existing tag', function() { - it('build query with filter', function() { - var builder = new InfluxQueryBuilder({ measurement: '', tags: [{key: 'host', value: 'se1'}] }); - var query = builder.showTagsQuery(); - expect(query).to.be('SHOW TAG KEYS'); - }); + it('should have where condition in tag keys query with tags', function() { + var builder = new InfluxQueryBuilder({ measurement: '', tags: [{key: 'host', value: 'se1'}] }); + var query = builder.buildExploreQuery('TAG_KEYS'); + expect(query).to.be("SHOW TAG KEYS WHERE host='se1'"); + }); + + it('should have no conditions in measurement query for query with no tags', function() { + var builder = new InfluxQueryBuilder({ measurement: '', tags: [] }); + var query = builder.buildExploreQuery('MEASUREMENTS'); + expect(query).to.be('SHOW MEASUREMENTS'); + }); + + it('should have where condition in measurement query for query with tags', function() { + var builder = new InfluxQueryBuilder({measurement: '', tags: [{key: 'app', value: 'email'}]}); + var query = builder.buildExploreQuery('MEASUREMENTS'); + expect(query).to.be("SHOW MEASUREMENTS WHERE app='email'"); + }); + + it('should have where tag name IN filter in tag values query for query with one tag', function() { + var builder = new InfluxQueryBuilder({measurement: '', tags: [{key: 'app', value: 'asdsadsad'}]}); + var query = builder.buildExploreQuery('TAG_VALUES', 'app'); + expect(query).to.be('SHOW TAG VALUES WITH KEY = "app"'); + }); + + it('should have measurement tag condition and tag name IN filter in tag values query', function() { + var builder = new InfluxQueryBuilder({measurement: 'cpu', tags: [{key: 'app', value: 'email'}, {key: 'host', value: 'server1'}]}); + var query = builder.buildExploreQuery('TAG_VALUES', 'app'); + expect(query).to.be('SHOW TAG VALUES FROM "cpu" WITH KEY = "app" WHERE host=\'server1\''); }); }); From 84618a60763a94bd82e01c1a404ed3e4140cfe72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 May 2015 11:40:50 +0200 Subject: [PATCH 185/398] Style and layout changes for InfluxDB 0.9 editor #1525 --- .../influxdb/partials/query.editor.html | 89 +++++++++++++------ .../plugins/datasource/influxdb/queryCtrl.js | 2 +- public/css/less/tightform.less | 10 ++- 3 files changed, 71 insertions(+), 30 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html index 8ea612b0924..0881921078d 100644 --- a/public/app/plugins/datasource/influxdb/partials/query.editor.html +++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html @@ -1,22 +1,19 @@
    -
    - +
    +
    - - -
    -
    +
    • + diff --git a/public/app/plugins/datasource/influxdb/queryCtrl.js b/public/app/plugins/datasource/influxdb/queryCtrl.js index 828ab3809b0..a6d530fe68f 100644 --- a/public/app/plugins/datasource/influxdb/queryCtrl.js +++ b/public/app/plugins/datasource/influxdb/queryCtrl.js @@ -266,7 +266,7 @@ function (angular, _, InfluxQueryBuilder) { }; MetricSegment.newPlusButton = function() { - return new MetricSegment({fake: true, html: '', type: 'plus-button' }); + return new MetricSegment({fake: true, html: '', type: 'plus-button' }); }; MetricSegment.newSelectTagValue = function() { diff --git a/public/css/less/tightform.less b/public/css/less/tightform.less index 72bcfb547fa..41630400cf7 100644 --- a/public/css/less/tightform.less +++ b/public/css/less/tightform.less @@ -20,6 +20,14 @@ } } +.tight-form-container-no-item-borders { + border: 1px solid @grafanaTargetBorder; + + .tight-form, .tight-form-item { + border: none; + } +} + .spaced-form { .tight-form { margin: 7px 0; @@ -85,9 +93,9 @@ &.last { border-right: none; } - } + .tight-form-item-icon { i { width: 15px; From f41c31432974a54258e6f197dd6817d06d3a3a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 May 2015 11:47:12 +0200 Subject: [PATCH 186/398] Minor layout fix to templating editor, making input fields a little less wide --- public/app/features/templating/partials/editor.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index 0ead15dbb99..11769e34dfc 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -65,7 +65,7 @@ Name
  • - +
  • Type @@ -139,7 +139,7 @@ Query
  • - +
    • @@ -151,7 +151,7 @@ Optional, if you want to extract part of a series name or metric node segment
  • - +
    • @@ -163,7 +163,7 @@
  • - +
  • All format From 5896903bd37739ca4b04186cc18a1982ad27e1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 May 2015 15:01:05 +0200 Subject: [PATCH 187/398] Began work on alias support and alias patterns for InfluxDB 0.9, #1525 --- .../plugins/datasource/influxdb/datasource.js | 15 +- .../datasource/influxdb/influxSeries.js | 19 +- .../influxdb/partials/query.editor.html | 89 +++++++ public/css/less/tightform.less | 2 +- public/test/specs/influxSeries-specs.js | 245 +++--------------- public/test/specs/influxSeries08-specs.js | 220 ++++++++++++++++ public/test/test-main.js | 1 + 7 files changed, 373 insertions(+), 218 deletions(-) create mode 100644 public/test/specs/influxSeries08-specs.js diff --git a/public/app/plugins/datasource/influxdb/datasource.js b/public/app/plugins/datasource/influxdb/datasource.js index 56b01772c55..de7379d6367 100644 --- a/public/app/plugins/datasource/influxdb/datasource.js +++ b/public/app/plugins/datasource/influxdb/datasource.js @@ -69,8 +69,11 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { var query = annotation.query.replace('$timeFilter', timeFilter); query = templateSrv.replace(query); - return this._seriesQuery(query).then(function(results) { - return new InfluxSeries({ seriesList: results, annotation: annotation }).getAnnotations(); + return this._seriesQuery(query).then(function(data) { + if (!data || !data.results || !data.results[0]) { + throw { message: 'No results in response from InfluxDB' }; + } + return new InfluxSeries({ series: data.results[0].series, annotation: annotation }).getAnnotations(); }); }; @@ -168,9 +171,11 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { return deferred.promise; }; - function handleInfluxQueryResponse(alias, seriesList) { - var influxSeries = new InfluxSeries({ seriesList: seriesList, alias: alias }); - return influxSeries.getTimeSeries(); + function handleInfluxQueryResponse(alias, data) { + if (!data || !data.results || !data.results[0]) { + throw { message: 'No results in response from InfluxDB' }; + } + return new InfluxSeries({ series: data.results[0].series, alias: alias }).getTimeSeries(); } function getTimeFilter(options) { diff --git a/public/app/plugins/datasource/influxdb/influxSeries.js b/public/app/plugins/datasource/influxdb/influxSeries.js index cca01459fc4..45e4325c016 100644 --- a/public/app/plugins/datasource/influxdb/influxSeries.js +++ b/public/app/plugins/datasource/influxdb/influxSeries.js @@ -5,8 +5,7 @@ function (_) { 'use strict'; function InfluxSeries(options) { - this.seriesList = options.seriesList && options.seriesList.results && options.seriesList.results.length > 0 - ? options.seriesList.results[0].series || [] : []; + this.series = options.series; this.alias = options.alias; this.annotation = options.annotation; } @@ -17,23 +16,25 @@ function (_) { var output = []; var self = this; - console.log(self.seriesList); - if (self.seriesList.length === 0) { + if (self.series.length === 0) { return output; } - _.each(self.seriesList, function(series) { + _.each(self.series, function(series) { var datapoints = []; for (var i = 0; i < series.values.length; i++) { datapoints[i] = [series.values[i][1], new Date(series.values[i][0]).getTime()]; } var seriesName = series.name; - var tags = _.map(series.tags, function(value, key) { - return key + ': ' + value; - }); - if (tags.length > 0) { + if (self.alias) { + seriesName = self.alias; + } else if (series.tags) { + var tags = _.map(series.tags, function(value, key) { + return key + ': ' + value; + }); + seriesName = seriesName + ' {' + tags.join(', ') + '}'; } diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html index 0881921078d..9a9fca802ea 100644 --- a/public/app/plugins/datasource/influxdb/partials/query.editor.html +++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html @@ -141,14 +141,103 @@
    • +
      +
    • + Alias pattern +
      • +
    • + +
      • +
    +
    +
    +
      +
    • + +
      • +
    • + Group by time interval +
      • +
    • + +
      • +
    • + +
      • +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    Alias patterns
    +
      +
    • $m = replaced with measurement name
      • +
    • $measurement = replaced with measurement name
      • +
    • $tag_hostname = replaced with the value of the hostname tag
      • +
    • You can also use [[tag_hostname]] pattern replacement syntax
      • +
    +
    + +
    +
    Stacking and fill
    +
      +
    • When stacking is enabled it important that points align
      • +
    • If there are missing points for one series it can cause gaps or missing bars
      • +
    • You must use fill(0), and select a group by time low limit
      • +
    • Use the group by time option below your queries and specify for example >10s if your metrics are written every 10 seconds
      • +
    • This will insert zeros for series that are missing measurements and will make stacking work properly
      • +
    +
    + +
    +
    Group by time
    +
      +
    • Group by time is important, otherwise the query could return many thousands of datapoints that will slow down Grafana
      • +
    • Leave the group by time field empty for each query and it will be calculated based on time range and pixel width of the graph
      • +
    • If you use fill(0) or fill(null) set a low limit for the auto group by time interval
      • +
    • The low limit can only be set in the group by time option below your queries
      • +
    • You set a low limit by adding a greater sign before the interval
      • +
    • Example: >60s if you write metrics to InfluxDB every 60 seconds
      • +
    +
    + +
    + diff --git a/public/css/less/tightform.less b/public/css/less/tightform.less index 41630400cf7..5bd9cda8f43 100644 --- a/public/css/less/tightform.less +++ b/public/css/less/tightform.less @@ -23,7 +23,7 @@ .tight-form-container-no-item-borders { border: 1px solid @grafanaTargetBorder; - .tight-form, .tight-form-item { + .tight-form, .tight-form-item, [type=text].tight-form-input { border: none; } } diff --git a/public/test/specs/influxSeries-specs.js b/public/test/specs/influxSeries-specs.js index 47fb77b67b3..b68a3a95e8c 100644 --- a/public/test/specs/influxSeries-specs.js +++ b/public/test/specs/influxSeries-specs.js @@ -1,218 +1,57 @@ define([ - 'plugins/datasource/influxdb_08/influxSeries' + 'plugins/datasource/influxdb/influxSeries' ], function(InfluxSeries) { 'use strict'; describe('when generating timeseries from influxdb response', function() { describe('given two series', function() { - var series = new InfluxSeries({ - seriesList: [ - { - columns: ['time', 'mean', 'sequence_number'], - name: 'prod.server1.cpu', - points: [[1402596000, 10, 1], [1402596001, 12, 2]] - }, - { - columns: ['time', 'mean', 'sequence_number'], - name: 'prod.server2.cpu', - points: [[1402596000, 15, 1], [1402596001, 16, 2]] - } - ] - }); - - var result = series.getTimeSeries(); - - it('should generate two time series', function() { - expect(result.length).to.be(2); - expect(result[0].target).to.be('prod.server1.cpu.mean'); - expect(result[0].datapoints[0][0]).to.be(10); - expect(result[0].datapoints[0][1]).to.be(1402596000); - expect(result[0].datapoints[1][0]).to.be(12); - expect(result[0].datapoints[1][1]).to.be(1402596001); - - expect(result[1].target).to.be('prod.server2.cpu.mean'); - expect(result[1].datapoints[0][0]).to.be(15); - expect(result[1].datapoints[0][1]).to.be(1402596000); - expect(result[1].datapoints[1][0]).to.be(16); - expect(result[1].datapoints[1][1]).to.be(1402596001); - }); - - }); - - describe('given an alias format', function() { - var series = new InfluxSeries({ - seriesList: [ - { - columns: ['time', 'mean', 'sequence_number'], - name: 'prod.server1.cpu', - points: [[1402596000, 10, 1], [1402596001, 12, 2]] - } - ], - alias: '$s.testing' - }); - - var result = series.getTimeSeries(); - - it('should generate correct series name', function() { - expect(result[0].target).to.be('prod.server1.cpu.testing'); - }); - - }); - - describe('given an alias format with segment numbers', function() { - var series = new InfluxSeries({ - seriesList: [ - { - columns: ['time', 'mean', 'sequence_number'], - name: 'prod.server1.cpu', - points: [[1402596000, 10, 1], [1402596001, 12, 2]] - } - ], - alias: '$1.mean' - }); - - var result = series.getTimeSeries(); - - it('should generate correct series name', function() { - expect(result[0].target).to.be('server1.mean'); - }); - - }); - - describe('given an alias format and many segments', function() { - var series = new InfluxSeries({ - seriesList: [ - { - columns: ['time', 'mean', 'sequence_number'], - name: 'a0.a1.a2.a3.a4.a5.a6.a7.a8.a9.a10.a11.a12', - points: [[1402596000, 10, 1], [1402596001, 12, 2]] - } - ], - alias: '$5.$11.mean' - }); - - var result = series.getTimeSeries(); - - it('should generate correct series name', function() { - expect(result[0].target).to.be('a5.a11.mean'); - }); - - }); - - - describe('given an alias format with group by field', function() { - var series = new InfluxSeries({ - seriesList: [ - { - columns: ['time', 'mean', 'host'], - name: 'prod.cpu', - points: [[1402596000, 10, 'A']] - } - ], - groupByField: 'host', - alias: '$g.$1' - }); - - var result = series.getTimeSeries(); - - it('should generate correct series name', function() { - expect(result[0].target).to.be('A.cpu'); - }); - - }); - - describe('given group by column', function() { - var series = new InfluxSeries({ - seriesList: [ - { - columns: ['time', 'mean', 'host'], - name: 'prod.cpu', - points: [ - [1402596000, 10, 'A'], - [1402596001, 11, 'A'], - [1402596000, 5, 'B'], - [1402596001, 6, 'B'], - ] - } - ], - groupByField: 'host' - }); - - var result = series.getTimeSeries(); - - it('should generate two time series', function() { - expect(result.length).to.be(2); - expect(result[0].target).to.be('prod.cpu.A'); - expect(result[0].datapoints[0][0]).to.be(10); - expect(result[0].datapoints[0][1]).to.be(1402596000); - expect(result[0].datapoints[1][0]).to.be(11); - expect(result[0].datapoints[1][1]).to.be(1402596001); - - expect(result[1].target).to.be('prod.cpu.B'); - expect(result[1].datapoints[0][0]).to.be(5); - expect(result[1].datapoints[0][1]).to.be(1402596000); - expect(result[1].datapoints[1][0]).to.be(6); - expect(result[1].datapoints[1][1]).to.be(1402596001); - }); - - }); - - }); - - describe("when creating annotations from influxdb response", function() { - describe('given column mapping for all columns', function() { - var series = new InfluxSeries({ - seriesList: [ - { - columns: ['time', 'text', 'sequence_number', 'title', 'tags'], - name: 'events1', - points: [[1402596000000, 'some text', 1, 'Hello', 'B'], [1402596001000, 'asd', 2, 'Hello2', 'B']] - } - ], - annotation: { - query: 'select', - titleColumn: 'title', - tagsColumn: 'tags', - textColumn: 'text', + var options = { series: [ + { + name: 'cpu', + tags: {app: 'test'}, + columns: ['time', 'mean'], + values: [["2015-05-18T10:57:05Z", 10], ["2015-05-18T10:57:06Z", 12]] + }, + { + name: 'cpu', + tags: {app: 'test2'}, + columns: ['time', 'mean'], + values: [["2015-05-18T10:57:05Z", 15], ["2015-05-18T10:57:06Z", 16]] } + ]}; + + describe('and no alias', function() { + + it('should generate two time series', function() { + var series = new InfluxSeries(options); + var result = series.getTimeSeries(); + + expect(result.length).to.be(2); + expect(result[0].target).to.be('cpu {app: test}'); + expect(result[0].datapoints[0][0]).to.be(10); + expect(result[0].datapoints[0][1]).to.be(1431946625000); + expect(result[0].datapoints[1][0]).to.be(12); + expect(result[0].datapoints[1][1]).to.be(1431946626000); + + expect(result[1].target).to.be('cpu {app: test2}'); + expect(result[1].datapoints[0][0]).to.be(15); + expect(result[1].datapoints[0][1]).to.be(1431946625000); + expect(result[1].datapoints[1][0]).to.be(16); + expect(result[1].datapoints[1][1]).to.be(1431946626000); + }); }); - var result = series.getAnnotations(); + describe('and simple alias', function() { + it('should use alias', function() { + options.alias = 'new series'; + var series = new InfluxSeries(options); + var result = series.getTimeSeries(); + + expect(result[0].target).to.be('new series'); + }); - it(' should generate 2 annnotations ', function() { - expect(result.length).to.be(2); - expect(result[0].annotation.query).to.be('select'); - expect(result[0].title).to.be('Hello'); - expect(result[0].time).to.be(1402596000000); - expect(result[0].tags).to.be('B'); - expect(result[0].text).to.be('some text'); }); - - }); - - describe('given no column mapping', function() { - var series = new InfluxSeries({ - seriesList: [ - { - columns: ['time', 'text', 'sequence_number'], - name: 'events1', - points: [[1402596000000, 'some text', 1]] - } - ], - annotation: { query: 'select' } - }); - - var result = series.getAnnotations(); - - it('should generate 1 annnotation', function() { - expect(result.length).to.be(1); - expect(result[0].title).to.be('some text'); - expect(result[0].time).to.be(1402596000000); - expect(result[0].tags).to.be(undefined); - expect(result[0].text).to.be(undefined); - }); - }); }); diff --git a/public/test/specs/influxSeries08-specs.js b/public/test/specs/influxSeries08-specs.js new file mode 100644 index 00000000000..47fb77b67b3 --- /dev/null +++ b/public/test/specs/influxSeries08-specs.js @@ -0,0 +1,220 @@ +define([ + 'plugins/datasource/influxdb_08/influxSeries' +], function(InfluxSeries) { + 'use strict'; + + describe('when generating timeseries from influxdb response', function() { + + describe('given two series', function() { + var series = new InfluxSeries({ + seriesList: [ + { + columns: ['time', 'mean', 'sequence_number'], + name: 'prod.server1.cpu', + points: [[1402596000, 10, 1], [1402596001, 12, 2]] + }, + { + columns: ['time', 'mean', 'sequence_number'], + name: 'prod.server2.cpu', + points: [[1402596000, 15, 1], [1402596001, 16, 2]] + } + ] + }); + + var result = series.getTimeSeries(); + + it('should generate two time series', function() { + expect(result.length).to.be(2); + expect(result[0].target).to.be('prod.server1.cpu.mean'); + expect(result[0].datapoints[0][0]).to.be(10); + expect(result[0].datapoints[0][1]).to.be(1402596000); + expect(result[0].datapoints[1][0]).to.be(12); + expect(result[0].datapoints[1][1]).to.be(1402596001); + + expect(result[1].target).to.be('prod.server2.cpu.mean'); + expect(result[1].datapoints[0][0]).to.be(15); + expect(result[1].datapoints[0][1]).to.be(1402596000); + expect(result[1].datapoints[1][0]).to.be(16); + expect(result[1].datapoints[1][1]).to.be(1402596001); + }); + + }); + + describe('given an alias format', function() { + var series = new InfluxSeries({ + seriesList: [ + { + columns: ['time', 'mean', 'sequence_number'], + name: 'prod.server1.cpu', + points: [[1402596000, 10, 1], [1402596001, 12, 2]] + } + ], + alias: '$s.testing' + }); + + var result = series.getTimeSeries(); + + it('should generate correct series name', function() { + expect(result[0].target).to.be('prod.server1.cpu.testing'); + }); + + }); + + describe('given an alias format with segment numbers', function() { + var series = new InfluxSeries({ + seriesList: [ + { + columns: ['time', 'mean', 'sequence_number'], + name: 'prod.server1.cpu', + points: [[1402596000, 10, 1], [1402596001, 12, 2]] + } + ], + alias: '$1.mean' + }); + + var result = series.getTimeSeries(); + + it('should generate correct series name', function() { + expect(result[0].target).to.be('server1.mean'); + }); + + }); + + describe('given an alias format and many segments', function() { + var series = new InfluxSeries({ + seriesList: [ + { + columns: ['time', 'mean', 'sequence_number'], + name: 'a0.a1.a2.a3.a4.a5.a6.a7.a8.a9.a10.a11.a12', + points: [[1402596000, 10, 1], [1402596001, 12, 2]] + } + ], + alias: '$5.$11.mean' + }); + + var result = series.getTimeSeries(); + + it('should generate correct series name', function() { + expect(result[0].target).to.be('a5.a11.mean'); + }); + + }); + + + describe('given an alias format with group by field', function() { + var series = new InfluxSeries({ + seriesList: [ + { + columns: ['time', 'mean', 'host'], + name: 'prod.cpu', + points: [[1402596000, 10, 'A']] + } + ], + groupByField: 'host', + alias: '$g.$1' + }); + + var result = series.getTimeSeries(); + + it('should generate correct series name', function() { + expect(result[0].target).to.be('A.cpu'); + }); + + }); + + describe('given group by column', function() { + var series = new InfluxSeries({ + seriesList: [ + { + columns: ['time', 'mean', 'host'], + name: 'prod.cpu', + points: [ + [1402596000, 10, 'A'], + [1402596001, 11, 'A'], + [1402596000, 5, 'B'], + [1402596001, 6, 'B'], + ] + } + ], + groupByField: 'host' + }); + + var result = series.getTimeSeries(); + + it('should generate two time series', function() { + expect(result.length).to.be(2); + expect(result[0].target).to.be('prod.cpu.A'); + expect(result[0].datapoints[0][0]).to.be(10); + expect(result[0].datapoints[0][1]).to.be(1402596000); + expect(result[0].datapoints[1][0]).to.be(11); + expect(result[0].datapoints[1][1]).to.be(1402596001); + + expect(result[1].target).to.be('prod.cpu.B'); + expect(result[1].datapoints[0][0]).to.be(5); + expect(result[1].datapoints[0][1]).to.be(1402596000); + expect(result[1].datapoints[1][0]).to.be(6); + expect(result[1].datapoints[1][1]).to.be(1402596001); + }); + + }); + + }); + + describe("when creating annotations from influxdb response", function() { + describe('given column mapping for all columns', function() { + var series = new InfluxSeries({ + seriesList: [ + { + columns: ['time', 'text', 'sequence_number', 'title', 'tags'], + name: 'events1', + points: [[1402596000000, 'some text', 1, 'Hello', 'B'], [1402596001000, 'asd', 2, 'Hello2', 'B']] + } + ], + annotation: { + query: 'select', + titleColumn: 'title', + tagsColumn: 'tags', + textColumn: 'text', + } + }); + + var result = series.getAnnotations(); + + it(' should generate 2 annnotations ', function() { + expect(result.length).to.be(2); + expect(result[0].annotation.query).to.be('select'); + expect(result[0].title).to.be('Hello'); + expect(result[0].time).to.be(1402596000000); + expect(result[0].tags).to.be('B'); + expect(result[0].text).to.be('some text'); + }); + + }); + + describe('given no column mapping', function() { + var series = new InfluxSeries({ + seriesList: [ + { + columns: ['time', 'text', 'sequence_number'], + name: 'events1', + points: [[1402596000000, 'some text', 1]] + } + ], + annotation: { query: 'select' } + }); + + var result = series.getAnnotations(); + + it('should generate 1 annnotation', function() { + expect(result.length).to.be(1); + expect(result[0].title).to.be('some text'); + expect(result[0].time).to.be(1402596000000); + expect(result[0].tags).to.be(undefined); + expect(result[0].text).to.be(undefined); + }); + + }); + + }); + +}); diff --git a/public/test/test-main.js b/public/test/test-main.js index 86196069265..f064b81bab2 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -125,6 +125,7 @@ require([ 'specs/graphiteTargetCtrl-specs', 'specs/graphiteDatasource-specs', 'specs/influxSeries-specs', + 'specs/influxSeries08-specs', 'specs/influxQueryBuilder-specs', 'specs/influx09-querybuilder-specs', 'specs/influxdb-datasource-specs', From e9f38b9fc0d27c5f1ad4945fed19fd9e5b426f19 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Mon, 18 May 2015 10:01:58 -0400 Subject: [PATCH 188/398] no unbound recursion in publish() unbound recursion approach can blow up call stack, and - I think - allocate memory unboundedly as well. We can simply loop until err != nil I didn't actually test this live, though tests succeed --- pkg/services/eventpublisher/eventpublisher.go | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkg/services/eventpublisher/eventpublisher.go b/pkg/services/eventpublisher/eventpublisher.go index 14e527b2cc7..2854b63a9a5 100644 --- a/pkg/services/eventpublisher/eventpublisher.go +++ b/pkg/services/eventpublisher/eventpublisher.go @@ -109,25 +109,26 @@ func Setup() error { } func publish(routingKey string, msgString []byte) { - err := channel.Publish( - exchange, //exchange - routingKey, // routing key - false, // mandatory - false, // immediate - amqp.Publishing{ - ContentType: "application/json", - Body: msgString, - }, - ) - if err != nil { + for { + err := channel.Publish( + exchange, //exchange + routingKey, // routing key + false, // mandatory + false, // immediate + amqp.Publishing{ + ContentType: "application/json", + Body: msgString, + }, + ) + if err == nil { + return + } // failures are most likely because the connection was lost. // the connection will be re-established, so just keep // retrying every 2seconds until we successfully publish. time.Sleep(2 * time.Second) fmt.Println("publish failed, retrying.") - publish(routingKey, msgString) } - return } func eventListener(event interface{}) error { From 5270c4bc740371468b0af536a20d28935eb72fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 18 May 2015 17:28:15 +0200 Subject: [PATCH 189/398] refactorin api code for user routes, preparation for admin improvements, #2014 --- pkg/api/api.go | 12 +- pkg/api/common.go | 111 ++++++++++++++++++ pkg/api/index.go | 2 +- pkg/api/user.go | 45 ++++--- pkg/models/org.go | 7 +- .../features/admin/partials/edit_user.html | 4 +- .../app/features/admin/partials/new_user.html | 6 +- .../features/profile/partials/profile.html | 4 +- 8 files changed, 159 insertions(+), 32 deletions(-) create mode 100644 pkg/api/common.go diff --git a/pkg/api/api.go b/pkg/api/api.go index 14e693752b9..cfc1f50b98e 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -55,15 +55,21 @@ func Register(r *macaron.Macaron) { r.Group("/api", func() { // user r.Group("/user", func() { - r.Get("/", GetUser) + r.Get("/", wrap(GetSignedInUser)) r.Put("/", bind(m.UpdateUserCommand{}), UpdateUser) r.Post("/using/:id", UserSetUsingOrg) - r.Get("/orgs", GetUserOrgList) + r.Get("/orgs", wrap(GetSignedInUserOrgList)) r.Post("/stars/dashboard/:id", StarDashboard) r.Delete("/stars/dashboard/:id", UnstarDashboard) r.Put("/password", bind(m.ChangeUserPasswordCommand{}), ChangeUserPassword) }) + // users + r.Group("/users", func() { + r.Get("/:id/", wrap(GetUserById)) + r.Get("/:id/org", wrap(GetUserOrgList)) + }, reqGrafanaAdmin) + // account r.Group("/org", func() { r.Get("/", GetOrg) @@ -127,5 +133,5 @@ func Register(r *macaron.Macaron) { // rendering r.Get("/render/*", reqSignedIn, RenderToPng) - r.NotFound(NotFound) + r.NotFound(NotFoundHandler) } diff --git a/pkg/api/common.go b/pkg/api/common.go new file mode 100644 index 00000000000..8757318159e --- /dev/null +++ b/pkg/api/common.go @@ -0,0 +1,111 @@ +package api + +import ( + "encoding/json" + "net/http" + + "github.com/Unknwon/macaron" + "github.com/grafana/grafana/pkg/log" + "github.com/grafana/grafana/pkg/metrics" + "github.com/grafana/grafana/pkg/middleware" + "github.com/grafana/grafana/pkg/setting" +) + +var ( + NotFound = ApiError(404, "Not found", nil) + ServerError = ApiError(500, "Server error", nil) +) + +type Response interface { + WriteTo(out http.ResponseWriter) +} + +type NormalResponse struct { + status int + body []byte + header http.Header +} + +func wrap(action func(c *middleware.Context) Response) macaron.Handler { + return func(c *middleware.Context) { + res := action(c) + if res == nil { + res = ServerError + } + res.WriteTo(c.Resp) + } +} + +func (r *NormalResponse) WriteTo(out http.ResponseWriter) { + header := out.Header() + for k, v := range r.header { + header[k] = v + } + out.WriteHeader(r.status) + out.Write(r.body) +} + +func (r *NormalResponse) Cache(ttl string) *NormalResponse { + return r.Header("Cache-Control", "public,max-age="+ttl) +} + +func (r *NormalResponse) Header(key, value string) *NormalResponse { + r.header.Set(key, value) + return r +} + +// functions to create responses + +func Empty(status int) *NormalResponse { + return Respond(status, nil) +} + +func Json(status int, body interface{}) *NormalResponse { + return Respond(status, body).Header("Content-Type", "application/json") +} + +func ApiError(status int, message string, err error) *NormalResponse { + resp := make(map[string]interface{}) + + if err != nil { + log.Error(4, "%s: %v", message, err) + if setting.Env != setting.PROD { + resp["error"] = err.Error() + } + } + + switch status { + case 404: + resp["message"] = "Not Found" + metrics.M_Api_Status_500.Inc(1) + case 500: + metrics.M_Api_Status_404.Inc(1) + resp["message"] = "Internal Server Error" + } + + if message != "" { + resp["message"] = message + } + + return Json(status, resp) +} + +func Respond(status int, body interface{}) *NormalResponse { + var b []byte + var err error + switch t := body.(type) { + case []byte: + b = t + case string: + b = []byte(t) + default: + if b, err = json.Marshal(body); err != nil { + return ApiError(500, "body json marshal", err) + } + } + return &NormalResponse{ + body: b, + status: status, + header: make(http.Header), + } +} diff --git a/pkg/api/index.go b/pkg/api/index.go index 386bb3351df..8f486c4b785 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -59,7 +59,7 @@ func Index(c *middleware.Context) { c.HTML(200, "index") } -func NotFound(c *middleware.Context) { +func NotFoundHandler(c *middleware.Context) { if c.IsApiRequest() { c.JsonApiErr(404, "Not found", nil) return diff --git a/pkg/api/user.go b/pkg/api/user.go index 9d870a10a1b..e7cc8ff0366 100644 --- a/pkg/api/user.go +++ b/pkg/api/user.go @@ -7,15 +7,24 @@ import ( "github.com/grafana/grafana/pkg/util" ) -func GetUser(c *middleware.Context) { - query := m.GetUserProfileQuery{UserId: c.UserId} +// GET /api/user (current authenticated user) +func GetSignedInUser(c *middleware.Context) Response { + return getUserUserProfile(c.UserId) +} + +// GET /api/user/:id +func GetUserById(c *middleware.Context) Response { + return getUserUserProfile(c.ParamsInt64(":id")) +} + +func getUserUserProfile(userId int64) Response { + query := m.GetUserProfileQuery{UserId: userId} if err := bus.Dispatch(&query); err != nil { - c.JsonApiErr(500, "Failed to get user", err) - return + return ApiError(500, "Failed to get user", err) } - c.JSON(200, query.Result) + return Json(200, query.Result) } func UpdateUser(c *middleware.Context, cmd m.UpdateUserCommand) { @@ -29,22 +38,24 @@ func UpdateUser(c *middleware.Context, cmd m.UpdateUserCommand) { c.JsonOK("User updated") } -func GetUserOrgList(c *middleware.Context) { - query := m.GetUserOrgListQuery{UserId: c.UserId} +// GET /api/user/orgs +func GetSignedInUserOrgList(c *middleware.Context) Response { + return getUserOrgList(c.UserId) +} + +// GET /api/user/:id/orgs +func GetUserOrgList(c *middleware.Context) Response { + return getUserOrgList(c.ParamsInt64(":id")) +} + +func getUserOrgList(userId int64) Response { + query := m.GetUserOrgListQuery{UserId: userId} if err := bus.Dispatch(&query); err != nil { - c.JsonApiErr(500, "Failed to get user organizations", err) - return + return ApiError(500, "Faile to get user organziations", err) } - for _, ac := range query.Result { - if ac.OrgId == c.OrgId { - ac.IsUsing = true - break - } - } - - c.JSON(200, query.Result) + return Json(200, query.Result) } func validateUsingOrg(userId int64, orgId int64) bool { diff --git a/pkg/models/org.go b/pkg/models/org.go index ab6d97b9ae8..a8ee08ea69b 100644 --- a/pkg/models/org.go +++ b/pkg/models/org.go @@ -58,8 +58,7 @@ type OrgDTO struct { } type UserOrgDTO struct { - OrgId int64 `json:"orgId"` - Name string `json:"name"` - Role RoleType `json:"role"` - IsUsing bool `json:"isUsing"` + OrgId int64 `json:"orgId"` + Name string `json:"name"` + Role RoleType `json:"role"` } diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html index 9b2a18fd010..c82d7705b8d 100644 --- a/public/app/features/admin/partials/edit_user.html +++ b/public/app/features/admin/partials/edit_user.html @@ -25,7 +25,7 @@
    -
    +
    • Email @@ -36,7 +36,7 @@
    -
    +
    • Username diff --git a/public/app/features/admin/partials/new_user.html b/public/app/features/admin/partials/new_user.html index 48f78fb76b6..73877f9bda4 100644 --- a/public/app/features/admin/partials/new_user.html +++ b/public/app/features/admin/partials/new_user.html @@ -24,7 +24,7 @@
    -
    +
    • Email @@ -35,7 +35,7 @@
    -
    +
    • Username @@ -46,7 +46,7 @@
    -
    +
    • Password diff --git a/public/app/features/profile/partials/profile.html b/public/app/features/profile/partials/profile.html index d8758ae9c09..5512245b275 100644 --- a/public/app/features/profile/partials/profile.html +++ b/public/app/features/profile/partials/profile.html @@ -71,10 +71,10 @@
    		Name: {{org.name}} Role: {{org.role}} - + Current - + Select
    + + + + + +
    Name: {{org.name}}Role: {{org.role}} + + Current + +
    +
    • From 788e7fd36d09dfa5487e536d715d733be33bb82e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 19 May 2015 10:16:32 +0200 Subject: [PATCH 196/398] Lots of api refactoring for org routes, #2014 --- pkg/api/api.go | 35 ++++-- pkg/api/org.go | 50 ++++++--- pkg/api/org_users.go | 105 ++++++++++++------ pkg/models/user.go | 1 + pkg/services/sqlstore/user.go | 1 + .../features/admin/partials/edit_user.html | 25 +++-- public/app/features/admin/partials/users.html | 2 +- public/app/features/org/newOrgCtrl.js | 2 +- .../app/features/org/partials/orgUsers.html | 2 +- .../datasource/influxdb/queryBuilder.js | 2 - .../test/specs/influx09-querybuilder-specs.js | 15 ++- 11 files changed, 155 insertions(+), 85 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index f45da26d9c2..1c63ad3a541 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -13,7 +13,7 @@ func Register(r *macaron.Macaron) { reqSignedIn := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true}) reqGrafanaAdmin := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true, ReqGrafanaAdmin: true}) reqEditorRole := middleware.RoleAuth(m.ROLE_EDITOR, m.ROLE_ADMIN) - reqAccountAdmin := middleware.RoleAuth(m.ROLE_ADMIN) + regOrgAdmin := middleware.RoleAuth(m.ROLE_ADMIN) bind := binding.Bind // not logged in views @@ -71,23 +71,34 @@ func Register(r *macaron.Macaron) { r.Put("/:id", bind(m.UpdateUserCommand{}), wrap(UpdateUser)) }, reqGrafanaAdmin) - // account + // current org r.Group("/org", func() { - r.Get("/", GetOrg) - r.Post("/", bind(m.CreateOrgCommand{}), CreateOrg) - r.Put("/", bind(m.UpdateOrgCommand{}), UpdateOrg) - r.Post("/users", bind(m.AddOrgUserCommand{}), AddOrgUser) - r.Get("/users", GetOrgUsers) - r.Patch("/users/:id", bind(m.UpdateOrgUserCommand{}), UpdateOrgUser) - r.Delete("/users/:id", RemoveOrgUser) - }, reqAccountAdmin) + r.Get("/", wrap(GetOrgCurrent)) + r.Put("/", bind(m.UpdateOrgCommand{}), wrap(UpdateOrgCurrent)) + r.Post("/users", bind(m.AddOrgUserCommand{}), wrap(AddOrgUserToCurrentOrg)) + r.Get("/users", wrap(GetOrgUsersForCurrentOrg)) + r.Patch("/users/:userId", bind(m.UpdateOrgUserCommand{}), wrap(UpdateOrgUserForCurrentOrg)) + r.Delete("/users/:userId", wrap(RemoveOrgUserForCurrentOrg)) + }, regOrgAdmin) + + // create new org + r.Post("/orgs", bind(m.CreateOrgCommand{}), wrap(CreateOrg)) + + // orgs (admin routes) + r.Group("/orgs/:orgId", func() { + r.Put("/", bind(m.UpdateOrgCommand{}), wrap(UpdateOrg)) + r.Get("/users", wrap(GetOrgUsers)) + r.Post("/users", bind(m.AddOrgUserCommand{}), wrap(AddOrgUser)) + r.Patch("/users/:userId", bind(m.UpdateOrgUserCommand{}), wrap(UpdateOrgUser)) + r.Delete("/users/:userId", wrap(RemoveOrgUser)) + }, reqGrafanaAdmin) // auth api keys r.Group("/auth/keys", func() { r.Get("/", wrap(GetApiKeys)) r.Post("/", bind(m.AddApiKeyCommand{}), wrap(AddApiKey)) r.Delete("/:id", wrap(DeleteApiKey)) - }, reqAccountAdmin) + }, regOrgAdmin) // Data sources r.Group("/datasources", func() { @@ -98,7 +109,7 @@ func Register(r *macaron.Macaron) { r.Delete("/:id", DeleteDataSource) r.Get("/:id", GetDataSourceById) r.Get("/plugins", GetDataSourcePlugins) - }, reqAccountAdmin) + }, regOrgAdmin) r.Get("/frontend/settings/", GetFrontendSettings) r.Any("/datasources/proxy/:id/*", reqSignedIn, ProxyDataSourceRequest) diff --git a/pkg/api/org.go b/pkg/api/org.go index ac8727c9e49..5b9e1a9aef8 100644 --- a/pkg/api/org.go +++ b/pkg/api/org.go @@ -8,17 +8,25 @@ import ( "github.com/grafana/grafana/pkg/setting" ) -func GetOrg(c *middleware.Context) { - query := m.GetOrgByIdQuery{Id: c.OrgId} +// GET /api/org +func GetOrgCurrent(c *middleware.Context) Response { + return getOrgHelper(c.OrgId) +} + +// GET /api/orgs/:orgId +func GetOrgById(c *middleware.Context) Response { + return getOrgHelper(c.ParamsInt64(":orgId")) +} + +func getOrgHelper(orgId int64) Response { + query := m.GetOrgByIdQuery{Id: orgId} if err := bus.Dispatch(&query); err != nil { if err == m.ErrOrgNotFound { - c.JsonApiErr(404, "Organization not found", err) - return + return ApiError(404, "Organization not found", err) } - c.JsonApiErr(500, "Failed to get organization", err) - return + return ApiError(500, "Failed to get organization", err) } org := m.OrgDTO{ @@ -26,33 +34,41 @@ func GetOrg(c *middleware.Context) { Name: query.Result.Name, } - c.JSON(200, &org) + return Json(200, &org) } -func CreateOrg(c *middleware.Context, cmd m.CreateOrgCommand) { +// POST /api/orgs +func CreateOrg(c *middleware.Context, cmd m.CreateOrgCommand) Response { if !setting.AllowUserOrgCreate && !c.IsGrafanaAdmin { - c.JsonApiErr(401, "Access denied", nil) - return + return ApiError(401, "Access denied", nil) } cmd.UserId = c.UserId if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "Failed to create organization", err) - return + return ApiError(500, "Failed to create organization", err) } metrics.M_Api_Org_Create.Inc(1) - c.JsonOK("Organization created") + return ApiSuccess("Organization created") } -func UpdateOrg(c *middleware.Context, cmd m.UpdateOrgCommand) { +// PUT /api/org +func UpdateOrgCurrent(c *middleware.Context, cmd m.UpdateOrgCommand) Response { cmd.OrgId = c.OrgId + return updateOrgHelper(cmd) +} +// PUT /api/orgs/:orgId +func UpdateOrg(c *middleware.Context, cmd m.UpdateOrgCommand) Response { + cmd.OrgId = c.ParamsInt64(":orgId") + return updateOrgHelper(cmd) +} + +func updateOrgHelper(cmd m.UpdateOrgCommand) Response { if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "Failed to update organization", err) - return + return ApiError(500, "Failed to update organization", err) } - c.JsonOK("Organization updated") + return ApiSuccess("Organization updated") } diff --git a/pkg/api/org_users.go b/pkg/api/org_users.go index 8a372c791b9..c88df600450 100644 --- a/pkg/api/org_users.go +++ b/pkg/api/org_users.go @@ -6,77 +6,112 @@ import ( m "github.com/grafana/grafana/pkg/models" ) -func AddOrgUser(c *middleware.Context, cmd m.AddOrgUserCommand) { +// POST /api/org/users +func AddOrgUserToCurrentOrg(c *middleware.Context, cmd m.AddOrgUserCommand) Response { + cmd.OrgId = c.OrgId + return addOrgUserHelper(cmd) +} + +// POST /api/orgs/:orgId/users +func AddOrgUser(c *middleware.Context, cmd m.AddOrgUserCommand) Response { + cmd.OrgId = c.ParamsInt64(":orgId") + return addOrgUserHelper(cmd) +} + +func addOrgUserHelper(cmd m.AddOrgUserCommand) Response { if !cmd.Role.IsValid() { - c.JsonApiErr(400, "Invalid role specified", nil) - return + return ApiError(400, "Invalid role specified", nil) } userQuery := m.GetUserByLoginQuery{LoginOrEmail: cmd.LoginOrEmail} err := bus.Dispatch(&userQuery) if err != nil { - c.JsonApiErr(404, "User not found", nil) - return + return ApiError(404, "User not found", nil) } userToAdd := userQuery.Result - if userToAdd.Id == c.UserId { - c.JsonApiErr(400, "Cannot add yourself as user", nil) - return - } + // if userToAdd.Id == c.UserId { + // return ApiError(400, "Cannot add yourself as user", nil) + // } - cmd.OrgId = c.OrgId cmd.UserId = userToAdd.Id if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "Could not add user to organization", err) - return + return ApiError(500, "Could not add user to organization", err) } - c.JsonOK("User added to organization") + return ApiSuccess("User added to organization") } -func GetOrgUsers(c *middleware.Context) { - query := m.GetOrgUsersQuery{OrgId: c.OrgId} +// GET /api/org/users +func GetOrgUsersForCurrentOrg(c *middleware.Context) Response { + return getOrgUsersHelper(c.OrgId) +} + +// GET /api/orgs/:orgId/users +func GetOrgUsers(c *middleware.Context) Response { + return getOrgUsersHelper(c.ParamsInt64(":orgId")) +} + +func getOrgUsersHelper(orgId int64) Response { + query := m.GetOrgUsersQuery{OrgId: orgId} if err := bus.Dispatch(&query); err != nil { - c.JsonApiErr(500, "Failed to get account user", err) - return + return ApiError(500, "Failed to get account user", err) } - c.JSON(200, query.Result) + return Json(200, query.Result) } -func UpdateOrgUser(c *middleware.Context, cmd m.UpdateOrgUserCommand) { - if !cmd.Role.IsValid() { - c.JsonApiErr(400, "Invalid role specified", nil) - return - } - - cmd.UserId = c.ParamsInt64(":id") +// PATCH /api/org/users/:userId +func UpdateOrgUserForCurrentOrg(c *middleware.Context, cmd m.UpdateOrgUserCommand) Response { cmd.OrgId = c.OrgId + cmd.UserId = c.ParamsInt64(":userId") + return updateOrgUserHelper(cmd) +} + +// PATCH /api/orgs/:orgId/users/:userId +func UpdateOrgUser(c *middleware.Context, cmd m.UpdateOrgUserCommand) Response { + cmd.OrgId = c.ParamsInt64(":orgId") + cmd.UserId = c.ParamsInt64(":userId") + return updateOrgUserHelper(cmd) +} + +func updateOrgUserHelper(cmd m.UpdateOrgUserCommand) Response { + if !cmd.Role.IsValid() { + return ApiError(400, "Invalid role specified", nil) + } if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "Failed update org user", err) - return + return ApiError(500, "Failed update org user", err) } - c.JsonOK("Organization user updated") + return ApiSuccess("Organization user updated") } -func RemoveOrgUser(c *middleware.Context) { - userId := c.ParamsInt64(":id") +// DELETE /api/org/users/:userId +func RemoveOrgUserForCurrentOrg(c *middleware.Context) Response { + userId := c.ParamsInt64(":userId") + return removeOrgUserHelper(c.OrgId, userId) +} - cmd := m.RemoveOrgUserCommand{OrgId: c.OrgId, UserId: userId} +// DELETE /api/orgs/:orgId/users/:userId +func RemoveOrgUser(c *middleware.Context) Response { + userId := c.ParamsInt64(":userId") + orgId := c.ParamsInt64(":orgId") + return removeOrgUserHelper(orgId, userId) +} + +func removeOrgUserHelper(orgId int64, userId int64) Response { + cmd := m.RemoveOrgUserCommand{OrgId: orgId, UserId: userId} if err := bus.Dispatch(&cmd); err != nil { if err == m.ErrLastOrgAdmin { - c.JsonApiErr(400, "Cannot remove last organization admin", nil) - return + return ApiError(400, "Cannot remove last organization admin", nil) } - c.JsonApiErr(500, "Failed to remove user from organization", err) + return ApiError(500, "Failed to remove user from organization", err) } - c.JsonOK("User removed from organization") + return ApiSuccess("User removed from organization") } diff --git a/pkg/models/user.go b/pkg/models/user.go index 68e0001b99c..5efecc8deef 100644 --- a/pkg/models/user.go +++ b/pkg/models/user.go @@ -133,6 +133,7 @@ type UserProfileDTO struct { Name string `json:"name"` Login string `json:"login"` Theme string `json:"theme"` + OrgId int64 `json:"orgId"` IsGrafanaAdmin bool `json:"isGrafanaAdmin"` } diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go index 9f79081783b..f5df6f9ff1f 100644 --- a/pkg/services/sqlstore/user.go +++ b/pkg/services/sqlstore/user.go @@ -236,6 +236,7 @@ func GetUserProfile(query *m.GetUserProfileQuery) error { Login: user.Login, Theme: user.Theme, IsGrafanaAdmin: user.IsAdmin, + OrgId: user.OrgId, } return err diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html index 712aee26d5d..e72bd5b57c9 100644 --- a/public/app/features/admin/partials/edit_user.html +++ b/public/app/features/admin/partials/edit_user.html @@ -98,17 +98,26 @@ Organizations - +
    + + + + + - - - + +
    NameRole
    Name: {{org.name}}Role: {{org.role}} - - Current - + + {{org.name}} Current + + + + + +
    -
    diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html index 14bcd922b5e..6d4f7a8671c 100644 --- a/public/app/features/admin/partials/users.html +++ b/public/app/features/admin/partials/users.html @@ -1,4 +1,4 @@ - +
    • Overview
    • Create user
      • diff --git a/public/app/features/org/newOrgCtrl.js b/public/app/features/org/newOrgCtrl.js index 2dbee087687..9d81e226dce 100644 --- a/public/app/features/org/newOrgCtrl.js +++ b/public/app/features/org/newOrgCtrl.js @@ -11,7 +11,7 @@ function (angular) { $scope.newOrg = {name: ''}; $scope.createOrg = function() { - backendSrv.post('/api/org/', $scope.newOrg).then($scope.getUserOrgs); + backendSrv.post('/api/orgs/', $scope.newOrg).then($scope.getUserOrgs); }; }); diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html index 8b1829437c7..b32ff031caa 100644 --- a/public/app/features/org/partials/orgUsers.html +++ b/public/app/features/org/partials/orgUsers.html @@ -7,7 +7,7 @@
      -

      Account users

      +

      Organization users

      diff --git a/public/app/plugins/datasource/influxdb/queryBuilder.js b/public/app/plugins/datasource/influxdb/queryBuilder.js index 1b522ba8eca..37106d0729e 100644 --- a/public/app/plugins/datasource/influxdb/queryBuilder.js +++ b/public/app/plugins/datasource/influxdb/queryBuilder.js @@ -57,8 +57,6 @@ function (_) { p._buildQuery = function() { var target = this.target; - console.log('Build Query: target = ', target); - if (!target.measurement) { throw "Metric measurement is missing"; } diff --git a/public/test/specs/influx09-querybuilder-specs.js b/public/test/specs/influx09-querybuilder-specs.js index 2b1660f0a90..83f897ddb67 100644 --- a/public/test/specs/influx09-querybuilder-specs.js +++ b/public/test/specs/influx09-querybuilder-specs.js @@ -48,15 +48,14 @@ define([ }); describe('series with groupByTag', function() { - var builder = new InfluxQueryBuilder({ - measurement: 'cpu', - tags: [], - groupByTags: ["host"] - }); - - var query = builder.build(); - it('should generate correct query', function() { + var builder = new InfluxQueryBuilder({ + measurement: 'cpu', + tags: [], + groupByTags: ["host"] + }); + + var query = builder.build(); expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE $timeFilter ' + 'GROUP BY time($interval), host ORDER BY asc'); }); From a8aab0cb2b04b42da5000eb96a3501e42588c620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 19 May 2015 11:47:14 +0200 Subject: [PATCH 197/398] Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014 --- pkg/api/admin_users.go | 10 ---- pkg/api/api.go | 10 +++- pkg/api/org.go | 15 +++++ pkg/api/org_users.go | 3 + pkg/api/user.go | 10 ++++ pkg/models/org.go | 9 ++- pkg/services/sqlstore/org.go | 17 +++++- pkg/services/sqlstore/org_test.go | 9 ++- pkg/services/sqlstore/org_users.go | 32 +++++++---- .../app/features/admin/adminEditUserCtrl.js | 42 +++++++++++++- public/app/features/admin/adminUsersCtrl.js | 2 +- .../features/admin/partials/edit_user.html | 57 ++++++++++++++----- 12 files changed, 169 insertions(+), 47 deletions(-) diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go index 23cfc826ed2..a293032c200 100644 --- a/pkg/api/admin_users.go +++ b/pkg/api/admin_users.go @@ -9,16 +9,6 @@ import ( "github.com/grafana/grafana/pkg/util" ) -func AdminSearchUsers(c *middleware.Context) { - query := m.SearchUsersQuery{Query: "", Page: 0, Limit: 1000} - if err := bus.Dispatch(&query); err != nil { - c.JsonApiErr(500, "Failed to fetch users", err) - return - } - - c.JSON(200, query.Result) -} - func AdminCreateUser(c *middleware.Context, form dtos.AdminCreateUserForm) { cmd := m.CreateUserCommand{ Login: form.Login, diff --git a/pkg/api/api.go b/pkg/api/api.go index 1c63ad3a541..2b0ad858f46 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -53,7 +53,8 @@ func Register(r *macaron.Macaron) { // authed api r.Group("/api", func() { - // user + + // user (signed in) r.Group("/user", func() { r.Get("/", wrap(GetSignedInUser)) r.Put("/", bind(m.UpdateUserCommand{}), wrap(UpdateSignedInUser)) @@ -64,8 +65,9 @@ func Register(r *macaron.Macaron) { r.Put("/password", bind(m.ChangeUserPasswordCommand{}), ChangeUserPassword) }) - // users + // users (admin permission required) r.Group("/users", func() { + r.Get("/", wrap(SearchUsers)) r.Get("/:id", wrap(GetUserById)) r.Get("/:id/orgs", wrap(GetUserOrgList)) r.Put("/:id", bind(m.UpdateUserCommand{}), wrap(UpdateUser)) @@ -84,6 +86,9 @@ func Register(r *macaron.Macaron) { // create new org r.Post("/orgs", bind(m.CreateOrgCommand{}), wrap(CreateOrg)) + // search all orgs + r.Get("/orgs", reqGrafanaAdmin, wrap(SearchOrgs)) + // orgs (admin routes) r.Group("/orgs/:orgId", func() { r.Put("/", bind(m.UpdateOrgCommand{}), wrap(UpdateOrg)) @@ -133,7 +138,6 @@ func Register(r *macaron.Macaron) { // admin api r.Group("/api/admin", func() { r.Get("/settings", AdminGetSettings) - r.Get("/users", AdminSearchUsers) r.Post("/users", bind(dtos.AdminCreateUserForm{}), AdminCreateUser) r.Put("/users/:id/password", bind(dtos.AdminUpdateUserPasswordForm{}), AdminUpdateUserPassword) r.Put("/users/:id/permissions", bind(dtos.AdminUpdateUserPermissionsForm{}), AdminUpdateUserPermissions) diff --git a/pkg/api/org.go b/pkg/api/org.go index 5b9e1a9aef8..75499f33f61 100644 --- a/pkg/api/org.go +++ b/pkg/api/org.go @@ -72,3 +72,18 @@ func updateOrgHelper(cmd m.UpdateOrgCommand) Response { return ApiSuccess("Organization updated") } + +func SearchOrgs(c *middleware.Context) Response { + query := m.SearchOrgsQuery{ + Query: c.Query("query"), + Name: c.Query("name"), + Page: 0, + Limit: 1000, + } + + if err := bus.Dispatch(&query); err != nil { + return ApiError(500, "Failed to search orgs", err) + } + + return Json(200, query.Result) +} diff --git a/pkg/api/org_users.go b/pkg/api/org_users.go index c88df600450..03570619e6b 100644 --- a/pkg/api/org_users.go +++ b/pkg/api/org_users.go @@ -84,6 +84,9 @@ func updateOrgUserHelper(cmd m.UpdateOrgUserCommand) Response { } if err := bus.Dispatch(&cmd); err != nil { + if err == m.ErrLastOrgAdmin { + return ApiError(400, "Cannot change role so that there is no organization admin left", nil) + } return ApiError(500, "Failed update org user", err) } diff --git a/pkg/api/user.go b/pkg/api/user.go index 1b5654ce1f0..4ce19d1f7ba 100644 --- a/pkg/api/user.go +++ b/pkg/api/user.go @@ -142,3 +142,13 @@ func ChangeUserPassword(c *middleware.Context, cmd m.ChangeUserPasswordCommand) c.JsonOK("User password changed") } + +// GET /api/users +func SearchUsers(c *middleware.Context) Response { + query := m.SearchUsersQuery{Query: "", Page: 0, Limit: 1000} + if err := bus.Dispatch(&query); err != nil { + return ApiError(500, "Failed to fetch users", err) + } + + return Json(200, query.Result) +} diff --git a/pkg/models/org.go b/pkg/models/org.go index a8ee08ea69b..b2d18be9537 100644 --- a/pkg/models/org.go +++ b/pkg/models/org.go @@ -48,8 +48,13 @@ type GetOrgByNameQuery struct { Result *Org } -type GetOrgListQuery struct { - Result []*Org +type SearchOrgsQuery struct { + Query string + Name string + Limit int + Page int + + Result []*OrgDTO } type OrgDTO struct { diff --git a/pkg/services/sqlstore/org.go b/pkg/services/sqlstore/org.go index 18284feccac..725a21d7fad 100644 --- a/pkg/services/sqlstore/org.go +++ b/pkg/services/sqlstore/org.go @@ -14,12 +14,23 @@ func init() { bus.AddHandler("sql", CreateOrg) bus.AddHandler("sql", UpdateOrg) bus.AddHandler("sql", GetOrgByName) - bus.AddHandler("sql", GetOrgList) + bus.AddHandler("sql", SearchOrgs) bus.AddHandler("sql", DeleteOrg) } -func GetOrgList(query *m.GetOrgListQuery) error { - return x.Find(&query.Result) +func SearchOrgs(query *m.SearchOrgsQuery) error { + query.Result = make([]*m.OrgDTO, 0) + sess := x.Table("org") + if query.Query != "" { + sess.Where("name LIKE ?", query.Query+"%") + } + if query.Name != "" { + sess.Where("name=?", query.Name) + } + sess.Limit(query.Limit, query.Limit*query.Page) + sess.Cols("id", "name") + err := sess.Find(&query.Result) + return err } func GetOrgById(query *m.GetOrgByIdQuery) error { diff --git a/pkg/services/sqlstore/org_test.go b/pkg/services/sqlstore/org_test.go index 1b230e349ff..f52175c2e5c 100644 --- a/pkg/services/sqlstore/org_test.go +++ b/pkg/services/sqlstore/org_test.go @@ -142,11 +142,18 @@ func TestAccountDataAccess(t *testing.T) { }) }) - Convey("Cannot delete last admin account user", func() { + Convey("Cannot delete last admin org user", func() { cmd := m.RemoveOrgUserCommand{OrgId: ac1.OrgId, UserId: ac1.Id} err := RemoveOrgUser(&cmd) So(err, ShouldEqual, m.ErrLastOrgAdmin) }) + + Convey("Cannot update role so no one is admin user", func() { + cmd := m.UpdateOrgUserCommand{OrgId: ac1.OrgId, UserId: ac1.Id, Role: m.ROLE_VIEWER} + err := UpdateOrgUser(&cmd) + So(err, ShouldEqual, m.ErrLastOrgAdmin) + }) + }) }) }) diff --git a/pkg/services/sqlstore/org_users.go b/pkg/services/sqlstore/org_users.go index 3502cd97d60..2e8fc40cb7c 100644 --- a/pkg/services/sqlstore/org_users.go +++ b/pkg/services/sqlstore/org_users.go @@ -48,7 +48,11 @@ func UpdateOrgUser(cmd *m.UpdateOrgUserCommand) error { orgUser.Role = cmd.Role orgUser.Updated = time.Now() _, err = sess.Id(orgUser.Id).Update(&orgUser) - return err + if err != nil { + return err + } + + return validateOneAdminLeftInOrg(cmd.OrgId, sess) }) } @@ -72,16 +76,20 @@ func RemoveOrgUser(cmd *m.RemoveOrgUserCommand) error { return err } - // validate that there is an admin user left - res, err := sess.Query("SELECT 1 from org_user WHERE org_id=? and role='Admin'", cmd.OrgId) - if err != nil { - return err - } - - if len(res) == 0 { - return m.ErrLastOrgAdmin - } - - return err + return validateOneAdminLeftInOrg(cmd.OrgId, sess) }) } + +func validateOneAdminLeftInOrg(orgId int64, sess *xorm.Session) error { + // validate that there is an admin user left + res, err := sess.Query("SELECT 1 from org_user WHERE org_id=? and role='Admin'", orgId) + if err != nil { + return err + } + + if len(res) == 0 { + return m.ErrLastOrgAdmin + } + + return err +} diff --git a/public/app/features/admin/adminEditUserCtrl.js b/public/app/features/admin/adminEditUserCtrl.js index dc8839f0f84..d8500a845d3 100644 --- a/public/app/features/admin/adminEditUserCtrl.js +++ b/public/app/features/admin/adminEditUserCtrl.js @@ -1,13 +1,15 @@ define([ 'angular', + 'lodash', ], -function (angular) { +function (angular, _) { 'use strict'; var module = angular.module('grafana.controllers'); module.controller('AdminEditUserCtrl', function($scope, $routeParams, backendSrv, $location) { $scope.user = {}; + $scope.newOrg = { name: '', role: 'Editor' }; $scope.permissions = {}; $scope.init = function() { @@ -64,6 +66,44 @@ function (angular) { }); }; + $scope.updateOrgUser= function(orgUser) { + backendSrv.patch('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id, orgUser).then(function() { + }); + }; + + $scope.removeOrgUser = function(orgUser) { + backendSrv.delete('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id).then(function() { + $scope.getUserOrgs($scope.user_id); + }); + }; + + $scope.orgsSearchCache = []; + + $scope.searchOrgs = function(queryStr, callback) { + if ($scope.orgsSearchCache.length > 0) { + callback(_.pluck($scope.orgsSearchCache, "name")); + return; + } + + backendSrv.get('/api/orgs', {query: ''}).then(function(result) { + $scope.orgsSearchCache = result; + callback(_.pluck(result, "name")); + }); + }; + + $scope.addOrgUser = function() { + if (!$scope.addOrgForm.$valid) { return; } + + var orgInfo = _.findWhere($scope.orgsSearchCache, {name: $scope.newOrg.name}); + if (!orgInfo) { return; } + + $scope.newOrg.loginOrEmail = $scope.user.login; + + backendSrv.post('/api/orgs/' + orgInfo.id + '/users/', $scope.newOrg).then(function() { + $scope.getUserOrgs($scope.user_id); + }); + }; + $scope.init(); }); diff --git a/public/app/features/admin/adminUsersCtrl.js b/public/app/features/admin/adminUsersCtrl.js index c9be0238fd4..737812c5474 100644 --- a/public/app/features/admin/adminUsersCtrl.js +++ b/public/app/features/admin/adminUsersCtrl.js @@ -13,7 +13,7 @@ function (angular) { }; $scope.getUsers = function() { - backendSrv.get('/api/admin/users').then(function(users) { + backendSrv.get('/api/users').then(function(users) { $scope.users = users; }); }; diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html index e72bd5b57c9..5d08292605e 100644 --- a/public/app/features/admin/partials/edit_user.html +++ b/public/app/features/admin/partials/edit_user.html @@ -80,24 +80,52 @@ Permissions -
      -
        -
      • - Grafana Admin  - - -
        • -
      -
      +
      +
      +
        +
      • + Grafana Admin  + + +
        • +
      +
      +
      +
      + +
      -
      -

      Organizations

      + +
      +
        +
      • + Add organization +
        • +
      • + +
        • +
      • + Role +
        • +
      • + +
        • +
      • + +
        • +
        +
      +
      + + @@ -109,15 +137,16 @@ {{org.name}} Current
      Name - - +
      +
      From 25c6b64fedf2c62b5c5b3cbe897080071b5730a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 19 May 2015 16:54:08 +0200 Subject: [PATCH 198/398] Began working on exploring variable value groups/tags --- public/app/controllers/search.js | 28 ----------- public/app/directives/tip.js | 41 +++++++++++++++- .../partials/variableValueSelect.html | 21 +++++--- public/app/features/templating/editorCtrl.js | 8 +++ public/app/partials/search.html | 2 +- public/css/less/overrides.less | 5 +- public/css/less/sidemenu.less | 1 - public/css/less/submenu.less | 49 +++++++++++++------ 8 files changed, 101 insertions(+), 54 deletions(-) diff --git a/public/app/controllers/search.js b/public/app/controllers/search.js index 9083ef74705..1a88b25ef3f 100644 --- a/public/app/controllers/search.js +++ b/public/app/controllers/search.js @@ -123,32 +123,4 @@ function (angular, _, config) { }); - module.directive('tagColorFromName', function() { - - function djb2(str) { - var hash = 5381; - for (var i = 0; i < str.length; i++) { - hash = ((hash << 5) + hash) + str.charCodeAt(i); /* hash * 33 + c */ - } - return hash; - } - - return { - scope: { tag: "=" }, - link: function (scope, element) { - var name = scope.tag; - var hash = djb2(name.toLowerCase()); - var colors = [ - "#E24D42","#1F78C1","#BA43A9","#705DA0","#466803", - "#508642","#447EBC","#C15C17","#890F02","#757575", - "#0A437C","#6D1F62","#584477","#629E51","#2F4F4F", - "#BF1B00","#806EB7","#8a2eb8", "#699e00","#000000", - "#3F6833","#2F575E","#99440A","#E0752D","#0E4AB4", - "#58140C","#052B51","#511749","#3F2B5B", - ]; - var color = colors[Math.abs(hash % colors.length)]; - element.css("background-color", color); - } - }; - }); }); diff --git a/public/app/directives/tip.js b/public/app/directives/tip.js index 8553faad279..a58adce981d 100644 --- a/public/app/directives/tip.js +++ b/public/app/directives/tip.js @@ -78,4 +78,43 @@ function (angular, kbn) { }; }); -}); + angular + .module('grafana.directives') + .directive('tagColorFromName', function() { + + function djb2(str) { + var hash = 5381; + for (var i = 0; i < str.length; i++) { + hash = ((hash << 5) + hash) + str.charCodeAt(i); /* hash * 33 + c */ + } + return hash; + } + + return { + scope: { tagColorFromName: "=" }, + link: function (scope, element) { + var hash = djb2(scope.tagColorFromName.toLowerCase()); + var colors = [ + "#E24D42","#1F78C1","#BA43A9","#705DA0","#466803", + "#508642","#447EBC","#C15C17","#890F02","#757575", + "#0A437C","#6D1F62","#584477","#629E51","#2F4F4F", + "#BF1B00","#806EB7","#8a2eb8", "#699e00","#000000", + "#3F6833","#2F575E","#99440A","#E0752D","#0E4AB4", + "#58140C","#052B51","#511749","#3F2B5B", + ]; + var borderColors = [ + "#FF7368","#459EE7","#E069CF","#9683C6","#6C8E29", + "#76AC68","#6AA4E2","#E7823D","#AF3528","#9B9B9B", + "#3069A2","#934588","#7E6A9D","#88C477","#557575", + "#E54126","#A694DD","#B054DE", "#8FC426","#262626", + "#658E59","#557D84","#BF6A30","#FF9B53","#3470DA", + "#7E3A32","#2B5177","#773D6F","#655181", + ]; + var color = colors[Math.abs(hash % colors.length)]; + var borderColor = borderColors[Math.abs(hash % borderColors.length)]; + + element.css("background-color", color); + element.css("border-color", borderColor); + } + }; + });}); diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index 30a61072626..c055c1151ae 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -15,12 +15,21 @@
      -
      - - {{option.text}} - - +
      +
      + + {{option.text}} + + +
      +
      + + + {{key}} + + +
      diff --git a/public/app/features/templating/editorCtrl.js b/public/app/features/templating/editorCtrl.js index f48452e4569..1363a774ef5 100644 --- a/public/app/features/templating/editorCtrl.js +++ b/public/app/features/templating/editorCtrl.js @@ -82,6 +82,14 @@ function (angular, _) { }; $scope.update = function() { + $scope.current.tags = { + "Europe": ["backend_03", "backend_04"], + "USA": ["backend_01", "backend_02"], + "Asia": ["backend_01"], + "South America": ["backend_02"], + "Africa": ["backend_03"], + }; + if ($scope.isValid()) { $scope.runQuery().then(function() { $scope.reset(); diff --git a/public/app/partials/search.html b/public/app/partials/search.html index 66e5fd3b7f4..18754010f0d 100644 --- a/public/app/partials/search.html +++ b/public/app/partials/search.html @@ -46,7 +46,7 @@ ng-class="{'selected': $index == selectedIndex}" ng-href="{{row.url}}"> - + {{tag}} diff --git a/public/css/less/overrides.less b/public/css/less/overrides.less index 345837e01e8..425777f1597 100644 --- a/public/css/less/overrides.less +++ b/public/css/less/overrides.less @@ -542,10 +542,13 @@ div.flot-text { .label-tag { background-color: @purple; color: darken(@white, 5%); + white-space: nowrap; border-radius: 2px; text-shadow: none; font-size: 13px; - padding: 4px 6px; + padding: 2px 6px; + border-width: 1px; + border-style: solid; .icon-tag { position: relative; top: 1px; diff --git a/public/css/less/sidemenu.less b/public/css/less/sidemenu.less index 4b1e5f481e7..1b8ee3f1fdd 100644 --- a/public/css/less/sidemenu.less +++ b/public/css/less/sidemenu.less @@ -91,7 +91,6 @@ display: block; padding: 8px 0 4px 22px; background-color: @navbarBackground; - border-right: 3px solid @bodyBackground; img { border-radius: 50%; background: @iconContainerBackground; diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index a9fecffefcf..4fefa50d5e7 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -55,31 +55,48 @@ border-radius: 3px 3px 0 0; } -.variable-options-container { - max-height: 350px; - overflow: auto; - display: block; - line-height: 26px; +.variable-options-wrapper { + display: table; + width: 100%; } -.variable-option { +.variable-options-column { + max-height: 350px; + overflow: auto; + display: table-cell; + line-height: 26px; + &:nth-child(2) { + border-left: 1px solid @grafanaTargetFuncBackground; + } +} + +.variable-option-tag, +.variable-option, +.variable-options-column-header { display: block; - padding: 0 8px; + padding: 0 27px 0 8px; + position: relative; - &:hover, &.highlighted { - background-color: @blueDark; - } - - .fa { - line-height: 26px; - float: right; - padding-left: 4px; - } + .variable-option-icon { display: none } &.selected { .variable-option-icon:before { content: "\f00c"; } + .variable-option-icon { + display: block; + padding-left: 4px; + line-height: 26px; + position: absolute; + right: 0; + top: 0; + } + } +} + +.variable-option { + &:hover, &.highlighted { + background-color: @blueDark; } } From 7cf9046dc53dc8dc57d5f51ef058bd57c695d75c Mon Sep 17 00:00:00 2001 From: "Heinz N. Gies" Date: Tue, 19 May 2015 23:47:39 +0200 Subject: [PATCH 199/398] fixing #2021 This tiny commit fixes a routing problem for proxy requests. The router was expecting a url path behind the proxy id, if none was given (read: the service proxied was at the root of a host) then the router would return a 404. With this patch it now propperly uses ProxyDataSourceRequest. --- pkg/api/api.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/api/api.go b/pkg/api/api.go index 6482beb075c..7f9e17838f7 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -94,6 +94,7 @@ func Register(r *macaron.Macaron) { r.Get("/frontend/settings/", GetFrontendSettings) r.Any("/datasources/proxy/:id/*", reqSignedIn, ProxyDataSourceRequest) + r.Any("/datasources/proxy/:id", reqSignedIn, ProxyDataSourceRequest) // Dashboard r.Group("/dashboards", func() { From 3354365177f28cabff810cd75042b93382ebfa02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 20 May 2015 14:59:38 +0200 Subject: [PATCH 200/398] Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling --- pkg/api/api.go | 8 ++--- pkg/api/stars.go | 34 +++++++------------ pkg/api/user.go | 32 +++++++---------- .../plugins/datasource/influxdb/datasource.js | 2 +- 4 files changed, 29 insertions(+), 47 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 9cdbbf2aba8..f5da406a8a5 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -58,11 +58,11 @@ func Register(r *macaron.Macaron) { r.Group("/user", func() { r.Get("/", wrap(GetSignedInUser)) r.Put("/", bind(m.UpdateUserCommand{}), wrap(UpdateSignedInUser)) - r.Post("/using/:id", UserSetUsingOrg) + r.Post("/using/:id", wrap(UserSetUsingOrg)) r.Get("/orgs", wrap(GetSignedInUserOrgList)) - r.Post("/stars/dashboard/:id", StarDashboard) - r.Delete("/stars/dashboard/:id", UnstarDashboard) - r.Put("/password", bind(m.ChangeUserPasswordCommand{}), ChangeUserPassword) + r.Post("/stars/dashboard/:id", wrap(StarDashboard)) + r.Delete("/stars/dashboard/:id", wrap(UnstarDashboard)) + r.Put("/password", bind(m.ChangeUserPasswordCommand{}), wrap(ChangeUserPassword)) }) // users (admin permission required) diff --git a/pkg/api/stars.go b/pkg/api/stars.go index 42a096ff4fb..c6f9d037eba 100644 --- a/pkg/api/stars.go +++ b/pkg/api/stars.go @@ -6,45 +6,35 @@ import ( m "github.com/grafana/grafana/pkg/models" ) -func StarDashboard(c *middleware.Context) { +func StarDashboard(c *middleware.Context) Response { if !c.IsSignedIn { - c.JsonApiErr(412, "You need to sign in to star dashboards", nil) - return + return ApiError(412, "You need to sign in to star dashboards", nil) } - var cmd = m.StarDashboardCommand{ - UserId: c.UserId, - DashboardId: c.ParamsInt64(":id"), - } + cmd := m.StarDashboardCommand{UserId: c.UserId, DashboardId: c.ParamsInt64(":id")} if cmd.DashboardId <= 0 { - c.JsonApiErr(400, "Missing dashboard id", nil) - return + return ApiError(400, "Missing dashboard id", nil) } if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "Failed to star dashboard", err) - return + return ApiError(500, "Failed to star dashboard", err) } - c.JsonOK("Dashboard starred!") + return ApiSuccess("Dashboard starred!") } -func UnstarDashboard(c *middleware.Context) { - var cmd = m.UnstarDashboardCommand{ - UserId: c.UserId, - DashboardId: c.ParamsInt64(":id"), - } +func UnstarDashboard(c *middleware.Context) Response { + + cmd := m.UnstarDashboardCommand{UserId: c.UserId, DashboardId: c.ParamsInt64(":id")} if cmd.DashboardId <= 0 { - c.JsonApiErr(400, "Missing dashboard id", nil) - return + return ApiError(400, "Missing dashboard id", nil) } if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "Failed to unstar dashboard", err) - return + return ApiError(500, "Failed to unstar dashboard", err) } - c.JsonOK("Dashboard unstarred") + return ApiSuccess("Dashboard unstarred") } diff --git a/pkg/api/user.go b/pkg/api/user.go index 4ce19d1f7ba..5af243eeb22 100644 --- a/pkg/api/user.go +++ b/pkg/api/user.go @@ -92,55 +92,47 @@ func validateUsingOrg(userId int64, orgId int64) bool { return valid } -func UserSetUsingOrg(c *middleware.Context) { +// POST /api/user/using/:id +func UserSetUsingOrg(c *middleware.Context) Response { orgId := c.ParamsInt64(":id") if !validateUsingOrg(c.UserId, orgId) { - c.JsonApiErr(401, "Not a valid organization", nil) - return + return ApiError(401, "Not a valid organization", nil) } - cmd := m.SetUsingOrgCommand{ - UserId: c.UserId, - OrgId: orgId, - } + cmd := m.SetUsingOrgCommand{UserId: c.UserId, OrgId: orgId} if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "Failed change active organization", err) - return + return ApiError(500, "Failed change active organization", err) } - c.JsonOK("Active organization changed") + return ApiSuccess("Active organization changed") } -func ChangeUserPassword(c *middleware.Context, cmd m.ChangeUserPasswordCommand) { +func ChangeUserPassword(c *middleware.Context, cmd m.ChangeUserPasswordCommand) Response { userQuery := m.GetUserByIdQuery{Id: c.UserId} if err := bus.Dispatch(&userQuery); err != nil { - c.JsonApiErr(500, "Could not read user from database", err) - return + return ApiError(500, "Could not read user from database", err) } passwordHashed := util.EncodePassword(cmd.OldPassword, userQuery.Result.Salt) if passwordHashed != userQuery.Result.Password { - c.JsonApiErr(401, "Invalid old password", nil) - return + return ApiError(401, "Invalid old password", nil) } if len(cmd.NewPassword) < 4 { - c.JsonApiErr(400, "New password too short", nil) - return + return ApiError(400, "New password too short", nil) } cmd.UserId = c.UserId cmd.NewPassword = util.EncodePassword(cmd.NewPassword, userQuery.Result.Salt) if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "Failed to change user password", err) - return + return ApiError(500, "Failed to change user password", err) } - c.JsonOK("User password changed") + return ApiSuccess("User password changed") } // GET /api/users diff --git a/public/app/plugins/datasource/influxdb/datasource.js b/public/app/plugins/datasource/influxdb/datasource.js index de7379d6367..ffed5e0c520 100644 --- a/public/app/plugins/datasource/influxdb/datasource.js +++ b/public/app/plugins/datasource/influxdb/datasource.js @@ -172,7 +172,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { }; function handleInfluxQueryResponse(alias, data) { - if (!data || !data.results || !data.results[0]) { + if (!data || !data.results || !data.results[0].series) { throw { message: 'No results in response from InfluxDB' }; } return new InfluxSeries({ series: data.results[0].series, alias: alias }).getTimeSeries(); From 2202094e41856606238d609515b95c26ec85a72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 20 May 2015 18:18:03 +0200 Subject: [PATCH 201/398] work on tags in variables --- public/app/directives/variableValueSelect.js | 5 ++- .../partials/variableValueSelect.html | 4 +-- .../features/templating/partials/editor.html | 36 +++++++++++++++++++ .../features/templating/templateValuesSrv.js | 15 +++++++- 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index fa0e56acebc..0afb2a40509 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -9,7 +9,7 @@ function (angular, app, _) { angular .module('grafana.directives') - .directive('variableValueSelect', function($compile, $window, $timeout) { + .directive('variableValueSelect', function($compile, $window, $timeout, datasourceSrv) { return { scope: { variable: "=", @@ -132,6 +132,9 @@ function (angular, app, _) { } }; + scope.selectTag = function(tag) { + }; + scope.hide = function() { scope.selectorOpen = false; bodyEl.off('click', scope.bodyOnClick); diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index c055c1151ae..481f2734876 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -25,8 +25,8 @@
    - - {{key}} + + {{tag}}
    diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index a0549414b6a..6883410cd01 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -226,6 +226,42 @@
    +
    +
    +
    Value Groups/Tags
    +
    +
      +
    • + Tags query +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + Tags values query +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + +
      • +
    +
    +
    +
    +
    +
    Preview of values (shows max 20)
    diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 6db5ce595a2..7330be1b5cd 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -120,7 +120,7 @@ function (angular, _, kbn) { } return datasourceSrv.get(variable.datasource).then(function(datasource) { - return datasource.metricFindQuery(variable.query).then(function (results) { + var queryPromise = datasource.metricFindQuery(variable.query).then(function (results) { variable.options = self.metricNamesToVariableValues(variable, results); if (variable.includeAll) { @@ -138,6 +138,19 @@ function (angular, _, kbn) { return self.setVariableValue(variable, variable.options[0]); }); + + if (variable.useTags) { + return queryPromise.then(function() { + datasource.metricFindQuery(variable.tagsQuery).then(function (results) { + variable.tags = []; + for (var i = 0; i < results.length; i++) { + variable.tags.push(results[i].text); + } + }); + }); + } else { + return queryPromise; + } }); }; From 592330b5a74983f9e094ba9f9a18bdaff549e00e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 20 May 2015 18:29:20 +0200 Subject: [PATCH 202/398] Expose data source extended properties (jsonData), to the frontend, Closes #2023 --- pkg/api/frontendsettings.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index 3af191a7af7..ea154320608 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -54,6 +54,10 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro defaultDatasource = ds.Name } + if len(ds.JsonData) > 0 { + dsMap["jsonData"] = ds.JsonData + } + if ds.Access == m.DS_ACCESS_DIRECT { if ds.BasicAuth { dsMap["basicAuth"] = util.GetBasicAuthHeader(ds.BasicAuthUser, ds.BasicAuthPassword) From 9bedd83f396f6e4423006d9ded39cd031930c2cc Mon Sep 17 00:00:00 2001 From: Felix Rabe Date: Thu, 21 May 2015 00:13:50 +0200 Subject: [PATCH 203/398] Fix latest.json The trailing comma trips up both Python and JS JSON parsers. --- latest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latest.json b/latest.json index 4d3c471727e..a85d79df539 100644 --- a/latest.json +++ b/latest.json @@ -1,3 +1,3 @@ { - "version": "2.0.2", + "version": "2.0.2" } From ba3f6f9d3e12882f3df96e320f118253c90b0776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 21 May 2015 10:20:49 +0200 Subject: [PATCH 204/398] InfluxDB 09 fix, do not treat empty results as an error --- public/app/plugins/datasource/influxdb/datasource.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/datasource.js b/public/app/plugins/datasource/influxdb/datasource.js index ffed5e0c520..2ff0f8beb0e 100644 --- a/public/app/plugins/datasource/influxdb/datasource.js +++ b/public/app/plugins/datasource/influxdb/datasource.js @@ -43,7 +43,6 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { // build query var queryBuilder = new InfluxQueryBuilder(target); var query = queryBuilder.build(); - console.log('query builder result:' + query); // replace grafana variables query = query.replace('$timeFilter', timeFilter); @@ -173,7 +172,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { function handleInfluxQueryResponse(alias, data) { if (!data || !data.results || !data.results[0].series) { - throw { message: 'No results in response from InfluxDB' }; + return []; } return new InfluxSeries({ series: data.results[0].series, alias: alias }).getTimeSeries(); } From 1821809e69d9339672e9d8a58e702f83a9e384e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20K=C3=B6hler?= Date: Thu, 21 May 2015 12:46:26 +0200 Subject: [PATCH 205/398] listing of all none admin methods --- docs/sources/reference/http_api.md | 204 ++++++++++++++++++++++++++++- 1 file changed, 203 insertions(+), 1 deletion(-) diff --git a/docs/sources/reference/http_api.md b/docs/sources/reference/http_api.md index c0b63050199..3f5fa6392f9 100644 --- a/docs/sources/reference/http_api.md +++ b/docs/sources/reference/http_api.md @@ -141,12 +141,214 @@ Will return the dashboard given the dashboard slug. Slug is the url friendly ver The above will delete the dashboard with the specified slug. The slug is the url friendly (unique) version of the dashboard title. +### Gets the home dashboard + +`GET /api/dashboards/home` + +### Tags for Dashboard + +`GET /api/dashboards/tags` + +### Dashboard from JSON file + +`GET /file/:file` + +### Search Dashboards + +`GET /api/search/` + +Status Codes: + +- **query** – Search Query +- **tags** – Tags to use +- **starred** – Flag indicating if only starred Dashboards should be returned +- **tagcloud** - Flag indicating if a tagcloud should be returned + +**Example Request**: + + GET /api/search?query=MyDashboard&starred=true&tag=prod HTTP/1.1 + Accept: application/json + Content-Type: application/json + Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk + ## Data sources +### Get all datasources + +`GET /api/datasources` + +### Get a single data sources by Id + +`GET /api/datasources/:datasourceId` + ### Create data source -## Organizations +`PUT /api/datasources` + +**Example Response**: + + HTTP/1.1 200 + Content-Type: application/json + + {"message":"Datasource added"} + +### Edit an existing data source + +`POST /api/datasources` + +### Delete an existing data source + +`DELETE /api/datasources/:datasourceId` + +**Example Response**: + + HTTP/1.1 200 + Content-Type: application/json + + {"message":"Data source deleted"} + +### Available data source types + +`GET /api/datasources/plugins` + +## Data source proxy calls + +`GET /api/datasources/proxy/:datasourceId/*` + +Proxies all calls to the actual datasource. + +## Organisation + +### Get current Organisation + +`GET /api/org` + +### Get all users within the actual organisation + +`GET /api/org/users` + +### Add a new user to the actual organisation + +`POST /api/org/users` + +Adds a global user to the actual organisation. + +### Updates the given user + +`PATCH /api/org/users/:userId` + +### Delete user in actual organisation + +`DELETE /api/org/users/:userId` + +### Get all Users + +`GET /api/org/users` + +## Organisations + +### Search all Organisations + +`GET /api/orgs` + +### Update Organisation + +`PUT /api/orgs/:orgId` + +### Get Users in Organisation + +`GET /api/orgs/:orgId/users` + +### Add User in Organisation + +`POST /api/orgs/:orgId/users` + +### Update Users in Organisation + +`PATCH /api/orgs/:orgId/users/:userId` + +### Delete User in Organisation + +`DELETE /api/orgs/:orgId/users/:userId` ## Users +### Search Users +`GET /api/users` + +### Get single user by Id + +`GET /api/users/:id` + +### User Update + +`PUT /api/users/:id` + +### Get Organisations for user + +`GET /api/users/:id/orgs` + +## User + +### Change Password + +`PUT /api/user/password` + +Changes the password for the user + +### Actual User + +`GET /api/user` + +The above will return the current user. + +### Switch user context + +`POST /api/user/using/:organisationId` + +Switch user context to the given organisation. + +### Organisations of the actual User + +`GET /api/user/orgs` + +The above will return a list of all organisations of the current user. + +### Star a dashboard + +`POST /api/user/stars/dashboard/:dashboardId` + +Stars the given Dashboard for the actual user. + +### Unstar a dashboard + +`DELETE /api/user/stars/dashboard/:dashboardId` + +Deletes the staring of the given Dashboard for the actual user. + +## Snapshots + +### Create new snapshot + +`POST /api/snapshots` + +### Get Snapshot by Id + +`GET /api/snapshots/:key` + +### Delete Snapshot by Id + +`DELETE /api/snapshots-delete/:key` + +## Frontend Settings + +### Get Settings + +`GET /api/frontend/settings` + +## Login + +### Renew session based on remember cookie + +`GET /api/login/ping` \ No newline at end of file From 3c6b647398ac8ba49259316f7965889ea053aa5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20K=C3=B6hler?= Date: Thu, 21 May 2015 12:56:30 +0200 Subject: [PATCH 206/398] added admin stuff --- docs/sources/reference/http_api.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/docs/sources/reference/http_api.md b/docs/sources/reference/http_api.md index 3f5fa6392f9..d888071bd35 100644 --- a/docs/sources/reference/http_api.md +++ b/docs/sources/reference/http_api.md @@ -351,4 +351,26 @@ Deletes the staring of the given Dashboard for the actual user. ### Renew session based on remember cookie -`GET /api/login/ping` \ No newline at end of file +`GET /api/login/ping` + +## Admin + +### Settings + +`GET /api/admin/settings` + +### Global Users + +`POST /api/admin/users` + +### Password for User + +`PUT /api/admin/users/:id/password` + +### Permissions + +`PUT /api/admin/users/:id/permissions` + +### Delete global User + +`DELETE /api/admin/users/:id` From 2191921690ff89fd1680bbac742133b439d62213 Mon Sep 17 00:00:00 2001 From: David Raifaizen Date: Thu, 21 May 2015 14:36:35 -0400 Subject: [PATCH 207/398] Fixed variable name for annotations --- public/app/plugins/datasource/influxdb/influxSeries.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/influxdb/influxSeries.js b/public/app/plugins/datasource/influxdb/influxSeries.js index 45e4325c016..949ef88efeb 100644 --- a/public/app/plugins/datasource/influxdb/influxSeries.js +++ b/public/app/plugins/datasource/influxdb/influxSeries.js @@ -48,7 +48,7 @@ function (_) { var list = []; var self = this; - _.each(this.seriesList, function (series) { + _.each(this.series, function (series) { var titleCol = null; var timeCol = null; var tagsCol = null; From 3dc2a114fadc57e21bcf17fd0e7468255d34d978 Mon Sep 17 00:00:00 2001 From: robert jakub Date: Fri, 22 May 2015 17:08:10 +0200 Subject: [PATCH 208/398] add pps (packet per second) format --- public/app/components/kbn.js | 2 ++ public/app/panels/graph/graph.js | 3 +++ 2 files changed, 5 insertions(+) diff --git a/public/app/components/kbn.js b/public/app/components/kbn.js index 15a4c7637c3..c9d2900f53b 100644 --- a/public/app/components/kbn.js +++ b/public/app/components/kbn.js @@ -383,6 +383,7 @@ function($, _, moment) { kbn.valueFormats.mbytes = kbn.formatFuncCreator(1024, [' MiB', ' GiB', ' TiB', ' PiB', ' EiB', ' ZiB', ' YiB']); kbn.valueFormats.gbytes = kbn.formatFuncCreator(1024, [' GiB', ' TiB', ' PiB', ' EiB', ' ZiB', ' YiB']); kbn.valueFormats.bps = kbn.formatFuncCreator(1000, [' bps', ' Kbps', ' Mbps', ' Gbps', ' Tbps', ' Pbps', ' Ebps', ' Zbps', ' Ybps']); + kbn.valueFormats.pps = kbn.formatFuncCreator(1000, [' pps', ' Kpps', ' Mpps', ' Gpps', ' Tpps', ' Ppps', ' Epps', ' Zpps', ' Ypps']); kbn.valueFormats.Bps = kbn.formatFuncCreator(1000, [' Bps', ' KBps', ' MBps', ' GBps', ' TBps', ' PBps', ' EBps', ' ZBps', ' YBps']); kbn.valueFormats.short = kbn.formatFuncCreator(1000, ['', ' K', ' Mil', ' Bil', ' Tri', ' Quadr', ' Quint', ' Sext', ' Sept']); kbn.valueFormats.joule = kbn.formatFuncCreator(1000, [' J', ' kJ', ' MJ', ' GJ', ' TJ', ' PJ', ' EJ', ' ZJ', ' YJ']); @@ -564,6 +565,7 @@ function($, _, moment) { { text: 'data rate', submenu: [ + {text: 'packets/sec', value: 'pps'}, {text: 'bits/sec', value: 'bps'}, {text: 'bytes/sec', value: 'Bps'}, ] diff --git a/public/app/panels/graph/graph.js b/public/app/panels/graph/graph.js index e090ce4e85e..c6ca8ec7227 100755 --- a/public/app/panels/graph/graph.js +++ b/public/app/panels/graph/graph.js @@ -480,6 +480,9 @@ function (angular, $, kbn, moment, _, GraphTooltip) { case 'bps': url += '&yUnitSystem=si'; break; + case 'pps': + url += '&yUnitSystem=si'; + break; case 'Bps': url += '&yUnitSystem=si'; break; From b55d9350e7518462e1424fe97f355b6e1409d757 Mon Sep 17 00:00:00 2001 From: Indrek Juhkam Date: Sat, 23 May 2015 17:06:51 +0300 Subject: [PATCH 209/398] Add github organizations support --- conf/defaults.ini | 1 + conf/sample.ini | 3 +- pkg/api/login_oauth.go | 2 + pkg/social/social.go | 135 ++++++++++++++++++++++++++++++++--------- 4 files changed, 112 insertions(+), 29 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 628df5360e4..258a0198155 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -153,6 +153,7 @@ token_url = https://github.com/login/oauth/access_token api_url = https://api.github.com/user team_ids = allowed_domains = +allowed_organizations = #################################### Google Auth ########################## [auth.google] diff --git a/conf/sample.ini b/conf/sample.ini index df204a7f45d..3c2773fa674 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -146,12 +146,13 @@ ;allow_sign_up = false ;client_id = some_id ;client_secret = some_secret -;scopes = user:email +;scopes = user:email,read:org ;auth_url = https://github.com/login/oauth/authorize ;token_url = https://github.com/login/oauth/access_token ;api_url = https://api.github.com/user ;team_ids = ;allowed_domains = +;allowed_organizations = #################################### Google Auth ########################## [auth.google] diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go index 505c17ddde8..796599df864 100644 --- a/pkg/api/login_oauth.go +++ b/pkg/api/login_oauth.go @@ -48,6 +48,8 @@ func OAuthLogin(ctx *middleware.Context) { if err != nil { if err == social.ErrMissingTeamMembership { ctx.Redirect(setting.AppSubUrl + "/login?failedMsg=" + url.QueryEscape("Required Github team membership not fulfilled")) + } else if err == social.ErrMissingOrganizationMembership { + ctx.Redirect(setting.AppSubUrl + "/login?failedMsg=" + url.QueryEscape("Required Github organization membership not fulfilled")) } else { ctx.Handle(500, fmt.Sprintf("login.OAuthLogin(get info from %s)", name), err) } diff --git a/pkg/social/social.go b/pkg/social/social.go index 355f85b54b6..49812ddd87f 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -78,12 +78,14 @@ func NewOAuthService() { if name == "github" { setting.OAuthService.GitHub = true teamIds := sec.Key("team_ids").Ints(",") + allowedOrganizations := sec.Key("allowed_organizations").Strings(" ") SocialMap["github"] = &SocialGithub{ - Config: &config, - allowedDomains: info.AllowedDomains, - apiUrl: info.ApiUrl, - allowSignup: info.AllowSignup, - teamIds: teamIds, + Config: &config, + allowedDomains: info.AllowedDomains, + apiUrl: info.ApiUrl, + allowSignup: info.AllowSignup, + teamIds: teamIds, + allowedOrganizations: allowedOrganizations, } } @@ -115,16 +117,21 @@ func isEmailAllowed(email string, allowedDomains []string) bool { type SocialGithub struct { *oauth2.Config - allowedDomains []string - apiUrl string - allowSignup bool - teamIds []int + allowedDomains []string + allowedOrganizations []string + apiUrl string + allowSignup bool + teamIds []int } var ( ErrMissingTeamMembership = errors.New("User not a member of one of the required teams") ) +var ( + ErrMissingOrganizationMembership = errors.New("User not a member of one of the required organizations") +) + func (s *SocialGithub) Type() int { return int(models.GITHUB) } @@ -137,26 +144,100 @@ func (s *SocialGithub) IsSignupAllowed() bool { return s.allowSignup } -func (s *SocialGithub) IsTeamMember(client *http.Client, username string, teamId int) bool { - var data struct { - Url string `json:"url"` - State string `json:"state"` +func (s *SocialGithub) IsTeamMember(client *http.Client) bool { + if len(s.teamIds) == 0 { + return true } - membershipUrl := fmt.Sprintf("https://api.github.com/teams/%d/memberships/%s", teamId, username) - r, err := client.Get(membershipUrl) + teamMemberships, err := s.FetchTeamMemberships(client) if err != nil { return false } - defer r.Body.Close() + for _, teamId := range s.teamIds { + for _, membershipId := range teamMemberships { + if teamId == membershipId { + return true + } + } + } - if err = json.NewDecoder(r.Body).Decode(&data); err != nil { + return false +} + +func (s *SocialGithub) IsOrganizationMember(client *http.Client) bool { + if len(s.allowedOrganizations) == 0 { + return true + } + + organizations, err := s.FetchOrganizations(client) + if err != nil { return false } - active := data.State == "active" - return active + for _, allowedOrganization := range s.allowedOrganizations { + for _, organization := range organizations { + if organization == allowedOrganization { + return true + } + } + } + + return false +} + +func (s *SocialGithub) FetchTeamMemberships(client *http.Client) ([]int, error) { + type Record struct { + Id int `json:"id"` + } + + membershipUrl := fmt.Sprintf("https://api.github.com/user/teams") + r, err := client.Get(membershipUrl) + if err != nil { + return nil, err + } + + defer r.Body.Close() + + var records []Record + + if err = json.NewDecoder(r.Body).Decode(&records); err != nil { + return nil, err + } + + var ids = make([]int, len(records)) + for i, record := range records { + ids[i] = record.Id + } + + return ids, nil +} + +func (s *SocialGithub) FetchOrganizations(client *http.Client) ([]string, error) { + type Record struct { + Login string `json:"login"` + } + + url := fmt.Sprintf("https://api.github.com/user/orgs") + r, err := client.Get(url) + if err != nil { + return nil, err + } + + defer r.Body.Close() + + var records []Record + + if err = json.NewDecoder(r.Body).Decode(&records); err != nil { + return nil, err + } + + var logins = make([]string, len(records)) + for i, record := range records { + logins[i] = record.Login + } + + return logins, nil } func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { @@ -185,17 +266,15 @@ func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { Email: data.Email, } - if len(s.teamIds) > 0 { - for _, teamId := range s.teamIds { - if s.IsTeamMember(client, data.Name, teamId) { - return userInfo, nil - } - } - + if !s.IsTeamMember(client) { return nil, ErrMissingTeamMembership - } else { - return userInfo, nil } + + if !s.IsOrganizationMember(client) { + return nil, ErrMissingOrganizationMembership + } + + return userInfo, nil } // ________ .__ From b2a0ae0f83e1c3d98a8f7822fabefac86b0230ab Mon Sep 17 00:00:00 2001 From: Brandon Turner Date: Mon, 25 May 2015 01:50:29 -0500 Subject: [PATCH 210/398] Render panel images with any SSL protocol This uses any available SSL protocol (instead the phantomjs default: SSLv3) to render panels to PNGs. This is useful when reverse proxing grafana and SSLv3 is disabled due to security vulnerabilities or other reasons. --- pkg/components/renderer/renderer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go index aa9e0c92525..9d5ddd00d73 100644 --- a/pkg/components/renderer/renderer.go +++ b/pkg/components/renderer/renderer.go @@ -26,7 +26,7 @@ func RenderToPng(params *RenderOpts) (string, error) { pngPath, _ := filepath.Abs(filepath.Join(setting.ImagesDir, util.GetRandomString(20))) pngPath = pngPath + ".png" - cmd := exec.Command(binPath, "--ignore-ssl-errors=true", scriptPath, "url="+params.Url, "width="+params.Width, + cmd := exec.Command(binPath, "--ignore-ssl-errors=true", "--ssl-protocol=any", scriptPath, "url="+params.Url, "width="+params.Width, "height="+params.Height, "png="+pngPath, "cookiename="+setting.SessionOptions.CookieName, "domain="+setting.Domain, "sessionid="+params.SessionId) stdout, err := cmd.StdoutPipe() From 0047ce067dc4a194e2ac475f624cdfb4c64963e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 25 May 2015 10:23:32 +0200 Subject: [PATCH 211/398] SingleStatPanel: fix for color thresholds and value to text mapping combo, Fixes #2044 --- public/app/panels/singlestat/module.js | 13 +++++++------ public/app/partials/login.html | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/public/app/panels/singlestat/module.js b/public/app/panels/singlestat/module.js index 3c698bfd553..24855634ba6 100644 --- a/public/app/panels/singlestat/module.js +++ b/public/app/panels/singlestat/module.js @@ -190,7 +190,12 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) { data.flotpairs = $scope.series[0].flotpairs; } - // first check value to text mappings + var decimalInfo = $scope.getDecimalsForValue(data.value); + var formatFunc = kbn.valueFormats[$scope.panel.format]; + data.valueFormated = formatFunc(data.value, decimalInfo.decimals, decimalInfo.scaledDecimals); + data.valueRounded = kbn.roundValue(data.value, decimalInfo.decimals); + + // check value to text mappings for(var i = 0; i < $scope.panel.valueMaps.length; i++) { var map = $scope.panel.valueMaps[i]; // special null case @@ -201,6 +206,7 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) { } continue; } + // value/number to text mapping var value = parseFloat(map.value); if (value === data.value) { @@ -212,11 +218,6 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) { if (data.value === null || data.value === void 0) { data.valueFormated = "no value"; } - - var decimalInfo = $scope.getDecimalsForValue(data.value); - var formatFunc = kbn.valueFormats[$scope.panel.format]; - data.valueFormated = formatFunc(data.value, decimalInfo.decimals, decimalInfo.scaledDecimals); - data.valueRounded = kbn.roundValue(data.value, decimalInfo.decimals); }; $scope.removeValueMap = function(map) { diff --git a/public/app/partials/login.html b/public/app/partials/login.html index 8db858dac8d..437588dd652 100644 --- a/public/app/partials/login.html +++ b/public/app/partials/login.html @@ -19,7 +19,7 @@
    -
    -
    -
    Value Groups/Tags
    -
    -
      -
    • - Tags query -
      • -
    • - -
      • -
    -
    -
    -
    -
      -
    • - Tags values query -
      • -
    • - -
      • -
    -
    -
    -
    -
      -
    • - -
      • -
    -
    -
    -
    -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    From 494ede5bbfddc7dc143c76703c7fde0ff5c207da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 27 May 2015 13:11:32 +0200 Subject: [PATCH 218/398] Big refactoring/rewrite for how annotation tooltips are shown, also work on #1474 --- ' | 36 +++++++++++++++++ public/app/components/extend-jquery.js | 16 +++++++- public/app/directives/all.js | 1 + public/app/directives/annotationTooltip.js | 40 +++++++++++++++++++ public/app/directives/tags.js | 1 - .../features/annotations/annotationsSrv.js | 24 ++--------- public/app/features/dashboard/timeSrv.js | 2 +- public/app/partials/search.html | 2 +- .../plugins/datasource/graphite/datasource.js | 10 ++++- public/css/less/graph.less | 5 +++ public/vendor/jquery/jquery.flot.events.js | 8 ++-- 11 files changed, 114 insertions(+), 31 deletions(-) create mode 100644 ' create mode 100644 public/app/directives/annotationTooltip.js diff --git a/' b/' new file mode 100644 index 00000000000..b179a2b8b5a --- /dev/null +++ b/' @@ -0,0 +1,36 @@ +define([ + 'angular', + 'lodash' +], +function (angular) { + 'use strict'; + + angular + .module('grafana.directives') + .directive('annotationTooltip', function($sanitize, dashboardSrv) { + return { + scope: { tagColorFromName: "=" }, + link: function (scope, element) { + var title = $sanitize(scope.annoation.title); + var dashboard = dashboardSrv.getCurrent(); + var time = '' + dashboard.formatDate(scope.annotation.time) + ''; + + var tooltip = '
    '+ title + ' ' + time + '
    ' ; + + if (options.tags) { + var tags = $sanitize(options.tags); + tooltip += '' + (tags || '') + '
    '; + } + + if (options.text) { + var text = $sanitize(options.text); + tooltip += text.replace(/\n/g, '
    '); + } + + tooltip += "    "; + } + }; + }); + +}); + diff --git a/public/app/components/extend-jquery.js b/public/app/components/extend-jquery.js index ce5c8afb1a9..3e1f6b0c054 100644 --- a/public/app/components/extend-jquery.js +++ b/public/app/components/extend-jquery.js @@ -1,5 +1,5 @@ -define(['jquery'], -function ($) { +define(['jquery', 'angular', 'lodash'], +function ($, angular, _) { 'use strict'; /** @@ -14,6 +14,7 @@ function ($) { return function (x, y, opts) { opts = $.extend(true, {}, defaults, opts); + return this.each(function () { var $tooltip = $(this), width, height; @@ -22,6 +23,17 @@ function ($) { $("#tooltip").remove(); $tooltip.appendTo(document.body); + if (opts.compile) { + angular.element(document).injector().invoke(function($compile, $rootScope) { + var tmpScope = $rootScope.$new(true); + _.extend(tmpScope, opts.scopeData); + + $compile($tooltip)(tmpScope); + tmpScope.$digest(); + //tmpScope.$destroy(); + }); + } + width = $tooltip.outerWidth(true); height = $tooltip.outerHeight(true); diff --git a/public/app/directives/all.js b/public/app/directives/all.js index 7e95b6f26dc..b92bc59ca41 100644 --- a/public/app/directives/all.js +++ b/public/app/directives/all.js @@ -17,4 +17,5 @@ define([ './dropdown.typeahead', './topnav', './giveFocus', + './annotationTooltip', ], function () {}); diff --git a/public/app/directives/annotationTooltip.js b/public/app/directives/annotationTooltip.js new file mode 100644 index 00000000000..f84df88dd26 --- /dev/null +++ b/public/app/directives/annotationTooltip.js @@ -0,0 +1,40 @@ +define([ + 'angular', + 'jquery', + 'lodash' +], +function (angular, $) { + 'use strict'; + + angular + .module('grafana.directives') + .directive('annotationTooltip', function($sanitize, dashboardSrv, $compile) { + return { + link: function (scope, element) { + var event = scope.event; + var title = $sanitize(event.title); + var dashboard = dashboardSrv.getCurrent(); + var time = '' + dashboard.formatDate(event.min) + ''; + + var tooltip = '
    ' + title + ' ' + time + '
    ' ; + + if (event.text) { + var text = $sanitize(event.text); + tooltip += text.replace(/\n/g, '
    ') + '
    '; + } + + if (event.tags && event.tags.length > 0) { + tooltip += '{{tag}}
    '; + } + + tooltip += "
    "; + + var $tooltip = $(tooltip); + $tooltip.appendTo(element); + + $compile(element.contents())(scope); + } + }; + }); + +}); diff --git a/public/app/directives/tags.js b/public/app/directives/tags.js index 3f77fc6ba12..4f8825a010b 100644 --- a/public/app/directives/tags.js +++ b/public/app/directives/tags.js @@ -41,7 +41,6 @@ function (angular, $) { angular .module('grafana.directives') .directive('tagColorFromName', function() { - return { scope: { tagColorFromName: "=" }, link: function (scope, element) { diff --git a/public/app/features/annotations/annotationsSrv.js b/public/app/features/annotations/annotationsSrv.js index 0ba30f1ef8b..a4529de2019 100644 --- a/public/app/features/annotations/annotationsSrv.js +++ b/public/app/features/annotations/annotationsSrv.js @@ -7,7 +7,7 @@ define([ var module = angular.module('grafana.services'); - module.service('annotationsSrv', function(datasourceSrv, $q, alertSrv, $rootScope, $sanitize) { + module.service('annotationsSrv', function(datasourceSrv, $q, alertSrv, $rootScope) { var promiseCached; var list = []; var self = this; @@ -57,30 +57,14 @@ define([ }; this.addAnnotation = function(options) { - var title = $sanitize(options.title); - var time = '' + self.dashboard.formatDate(options.time) + ''; - - var tooltip = '
    '+ title + ' ' + time + '
    ' ; - - if (options.tags) { - var tags = $sanitize(options.tags); - tooltip += '' + (tags || '') + '
    '; - } - - if (options.text) { - var text = $sanitize(options.text); - tooltip += text.replace(/\n/g, '
    '); - } - - tooltip += ""; - list.push({ annotation: options.annotation, min: options.time, max: options.time, eventType: options.annotation.name, - title: null, - description: tooltip, + title: options.title, + tags: options.tags, + text: options.text, score: 1 }); }; diff --git a/public/app/features/dashboard/timeSrv.js b/public/app/features/dashboard/timeSrv.js index 7df83f7fcab..6bb9ccde223 100644 --- a/public/app/features/dashboard/timeSrv.js +++ b/public/app/features/dashboard/timeSrv.js @@ -93,7 +93,7 @@ define([ _.extend(this.time, time); // disable refresh if we have an absolute time - if (time.to && time.to.indexOf('now') === -1) { + if (_.isString(time.to) && time.to.indexOf('now') === -1) { this.old_refresh = this.dashboard.refresh || this.old_refresh; this.set_interval(false); } diff --git a/public/app/partials/search.html b/public/app/partials/search.html index 18754010f0d..9c644e96d25 100644 --- a/public/app/partials/search.html +++ b/public/app/partials/search.html @@ -16,7 +16,7 @@ tags - | + | {{query.tag}} diff --git a/public/app/plugins/datasource/graphite/datasource.js b/public/app/plugins/datasource/graphite/datasource.js index dfd096cdb0a..3697cade07b 100644 --- a/public/app/plugins/datasource/graphite/datasource.js +++ b/public/app/plugins/datasource/graphite/datasource.js @@ -111,11 +111,19 @@ function (angular, _, $, config, kbn, moment) { var list = []; for (var i = 0; i < results.data.length; i++) { var e = results.data[i]; + var tags = []; + if (e.tags) { + tags = e.tags.split(','); + if (tags.length === 1) { + tags = e.tags.split(' '); + } + } + list.push({ annotation: annotation, time: e.when * 1000, title: e.what, - tags: e.tags, + tags: tags, text: e.data }); } diff --git a/public/css/less/graph.less b/public/css/less/graph.less index b96e466eea1..a0350d5d16c 100644 --- a/public/css/less/graph.less +++ b/public/css/less/graph.less @@ -212,6 +212,11 @@ top: -3px; } + .label-tag { + margin-right: 4px; + margin-top: 8px; + } + .graph-tooltip-list-item { display: table-row; } diff --git a/public/vendor/jquery/jquery.flot.events.js b/public/vendor/jquery/jquery.flot.events.js index 4924b16d03b..48ebf2b67fd 100644 --- a/public/vendor/jquery/jquery.flot.events.js +++ b/public/vendor/jquery/jquery.flot.events.js @@ -191,14 +191,12 @@ console.log(tooltip); */ - // @rashidkpc - hack to work with our normal tooltip placer - var $tooltip = $('
    '); + // grafana addition + var $tooltip = $('
    '); if (event) { $tooltip .html(event.description) - .place_tt(x, y, { - offset: 10 - }); + .place_tt(x, y, {offset: 10, compile: true, scopeData: {event: event}}); } else { $tooltip.remove(); } From 96bd66e8119e79e3b4da1104abeb662d618a8ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 27 May 2015 14:30:23 +0200 Subject: [PATCH 219/398] Made the annotation tags support more cross datasource compatible --- public/app/directives/annotationTooltip.js | 15 ++++++++++++--- .../app/plugins/datasource/graphite/datasource.js | 9 +-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/public/app/directives/annotationTooltip.js b/public/app/directives/annotationTooltip.js index f84df88dd26..25059d08274 100644 --- a/public/app/directives/annotationTooltip.js +++ b/public/app/directives/annotationTooltip.js @@ -3,7 +3,7 @@ define([ 'jquery', 'lodash' ], -function (angular, $) { +function (angular, $, _) { 'use strict'; angular @@ -23,8 +23,17 @@ function (angular, $) { tooltip += text.replace(/\n/g, '
    ') + '
    '; } - if (event.tags && event.tags.length > 0) { - tooltip += '{{tag}}
    '; + var tags = event.tags; + if (_.isString(event.tags)) { + tags = event.tags.split(','); + if (tags.length === 1) { + tags = event.tags.split(' '); + } + } + + if (tags && tags.length) { + scope.tags = tags; + tooltip += '{{tag}}
    '; } tooltip += "
    "; diff --git a/public/app/plugins/datasource/graphite/datasource.js b/public/app/plugins/datasource/graphite/datasource.js index 3697cade07b..9315b5a5b33 100644 --- a/public/app/plugins/datasource/graphite/datasource.js +++ b/public/app/plugins/datasource/graphite/datasource.js @@ -111,19 +111,12 @@ function (angular, _, $, config, kbn, moment) { var list = []; for (var i = 0; i < results.data.length; i++) { var e = results.data[i]; - var tags = []; - if (e.tags) { - tags = e.tags.split(','); - if (tags.length === 1) { - tags = e.tags.split(' '); - } - } list.push({ annotation: annotation, time: e.when * 1000, title: e.what, - tags: tags, + tags: e.tags, text: e.data }); } From aeb8bc875584ae884adafcea3b3ab2074ded0a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 28 May 2015 09:35:47 +0200 Subject: [PATCH 220/398] Share link should always have absolute time range, Closes #2060 --- .../app/features/dashboard/shareModalCtrl.js | 6 ++--- public/test/specs/shareModalCtrl-specs.js | 26 +++++-------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/public/app/features/dashboard/shareModalCtrl.js b/public/app/features/dashboard/shareModalCtrl.js index 1dd99dbb126..55ec0c8a410 100644 --- a/public/app/features/dashboard/shareModalCtrl.js +++ b/public/app/features/dashboard/shareModalCtrl.js @@ -43,9 +43,9 @@ function (angular, _, require, config) { var params = angular.copy($location.search()); - var range = timeSrv.timeRangeForUrl(); - params.from = range.from; - params.to = range.to; + var range = timeSrv.timeRange(); + params.from = range.from.getTime(); + params.to = range.to.getTime(); if ($scope.options.includeTemplateVars) { templateSrv.fillVariableValuesForUrl(params); diff --git a/public/test/specs/shareModalCtrl-specs.js b/public/test/specs/shareModalCtrl-specs.js index d0d69479a13..c9d5131d11a 100644 --- a/public/test/specs/shareModalCtrl-specs.js +++ b/public/test/specs/shareModalCtrl-specs.js @@ -9,10 +9,10 @@ define([ var ctx = new helpers.ControllerTestContext(); function setTime(range) { - ctx.timeSrv.timeRangeForUrl = sinon.stub().returns(range); + ctx.timeSrv.timeRange = sinon.stub().returns(range); } - setTime({ from: 'now-1h', to: 'now' }); + setTime({ from: new Date(1000), to: new Date(2000) }); beforeEach(module('grafana.controllers')); beforeEach(module('grafana.services')); @@ -23,57 +23,43 @@ define([ describe('shareUrl with current time range and panel', function() { - it('should generate share url relative time', function() { - ctx.$location.path('/test'); - ctx.scope.panel = { id: 22 }; - - setTime({ from: 'now-1h', to: 'now' }); - - ctx.scope.init(); - expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now&panelId=22&fullscreen'); - }); - it('should generate share url absolute time', function() { ctx.$location.path('/test'); ctx.scope.panel = { id: 22 }; - setTime({ from: 1362178800000, to: 1396648800000 }); ctx.scope.init(); - expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1362178800000&to=1396648800000&panelId=22&fullscreen'); + expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000&panelId=22&fullscreen'); }); it('should remove panel id when no panel in scope', function() { ctx.$location.path('/test'); ctx.scope.options.forCurrent = true; ctx.scope.panel = null; - setTime({ from: 'now-1h', to: 'now' }); ctx.scope.init(); - expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now'); + expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000'); }); it('should add theme when specified', function() { ctx.$location.path('/test'); ctx.scope.options.theme = 'light'; ctx.scope.panel = null; - setTime({ from: 'now-1h', to: 'now' }); ctx.scope.init(); - expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now&theme=light'); + expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000&theme=light'); }); it('should include template variables in url', function() { ctx.$location.path('/test'); ctx.scope.options.includeTemplateVars = true; - setTime({ from: 'now-1h', to: 'now' }); ctx.templateSrv.fillVariableValuesForUrl = function(params) { params['var-app'] = 'mupp'; params['var-server'] = 'srv-01'; }; ctx.scope.buildUrl(); - expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now&var-app=mupp&var-server=srv-01'); + expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1000&to=2000&var-app=mupp&var-server=srv-01'); }); }); From 57fac6b9aaf0a10b36a5f2a71582fb113da738aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 28 May 2015 11:41:32 +0200 Subject: [PATCH 221/398] Removed invalid scripted dashboard example, Closes #2063 --- public/dashboards/scripted_gen_and_save.js | 95 ---------------------- 1 file changed, 95 deletions(-) delete mode 100644 public/dashboards/scripted_gen_and_save.js diff --git a/public/dashboards/scripted_gen_and_save.js b/public/dashboards/scripted_gen_and_save.js deleted file mode 100644 index b7ad24bc25c..00000000000 --- a/public/dashboards/scripted_gen_and_save.js +++ /dev/null @@ -1,95 +0,0 @@ -/* global _ */ - -/* - * Complex scripted dashboard - * This script generates a dashboard object that Grafana can load. It also takes a number of user - * supplied URL parameters (in the ARGS variable) - * - * Return a dashboard object, or a function - * - * For async scripts, return a function, this function must take a single callback function as argument, - * call this callback function with the dashboard object (look at scripted_async.js for an example) - */ - -'use strict'; - -// accessible variables in this scope -var window, document, ARGS, $, jQuery, moment, kbn, services, _; - -// default datasource -var datasource = services.datasourceSrv.default; -// get datasource used for saving dashboards -var dashboardDB = services.datasourceSrv.getGrafanaDB(); - -var targets = []; - -function getTargets(path) { - return datasource.metricFindQuery(path + '.*').then(function(result) { - if (!result) { - return null; - } - - if (targets.length === 10) { - return null; - } - - var promises = _.map(result, function(metric) { - if (metric.expandable) { - return getTargets(path + "." + metric.text); - } - else { - targets.push(path + '.' + metric.text); - } - return null; - }); - - return services.$q.all(promises); - }); -} - -function createDashboard(target, index) { - // Intialize a skeleton with nothing but a rows array and service object - var dashboard = { rows : [] }; - dashboard.title = 'Scripted dash ' + index; - dashboard.time = { - from: "now-6h", - to: "now" - }; - - dashboard.rows.push({ - title: 'Chart', - height: '300px', - panels: [ - { - title: 'Events', - type: 'graph', - span: 12, - targets: [ {target: target} ] - } - ] - }); - - return dashboard; -} - -function saveDashboard(dashboard) { - var model = services.dashboardSrv.create(dashboard); - dashboardDB.saveDashboard(model); -} - -return function(callback) { - - getTargets('apps').then(function() { - console.log('targets: ', targets); - _.each(targets, function(target, index) { - var dashboard = createDashboard(target, index); - saveDashboard(dashboard); - - if (index === targets.length - 1) { - callback(dashboard); - } - }); - }); - -}; - From cf147cdeafb4e299984e0552d423bad4d7660481 Mon Sep 17 00:00:00 2001 From: Andrea Bernardo Ciddio Date: Thu, 28 May 2015 16:47:20 +0100 Subject: [PATCH 222/398] GitHub users without a public email should be authenticated using their primary private email address --- pkg/social/social.go | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/pkg/social/social.go b/pkg/social/social.go index 49812ddd87f..1a00934b937 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -186,6 +186,37 @@ func (s *SocialGithub) IsOrganizationMember(client *http.Client) bool { return false } +func (s *SocialGithub) FetchPrivateEmail(client *http.Client) (string, error) { + type Record struct { + Email string `json:"email"` + Primary bool `json:"primary"` + Verified bool `json:"verified"` + } + + emailsUrl := fmt.Sprintf("https://api.github.com/user/emails") + r, err := client.Get(emailsUrl) + if err != nil { + return "", err + } + + defer r.Body.Close() + + var records []Record + + if err = json.NewDecoder(r.Body).Decode(&records); err != nil { + return "", err + } + + var email = "" + for _, record := range records { + if record.Primary { + email = record.Email + } + } + + return email, nil +} + func (s *SocialGithub) FetchTeamMemberships(client *http.Client) ([]int, error) { type Record struct { Id int `json:"id"` @@ -274,6 +305,13 @@ func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { return nil, ErrMissingOrganizationMembership } + if userInfo.Email == "" { + userInfo.Email, err = s.FetchPrivateEmail(client) + if err != nil { + return nil, err + } + } + return userInfo, nil } From 0108dfa80327396545c8a00b1ddfb402602b3acc Mon Sep 17 00:00:00 2001 From: yinchuan Date: Fri, 29 May 2015 11:23:14 +0800 Subject: [PATCH 223/398] Update configuration.md --- docs/sources/installation/configuration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 4665803960a..6e13398566b 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -296,12 +296,12 @@ Secret. Specify these in the Grafana configuration file. For example: scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email auth_url = https://accounts.google.com/o/oauth2/auth token_url = https://accounts.google.com/o/oauth2/token - allowed_domains = mycompany.com + allowed_domains = mycompany.com mycompany.org allow_sign_up = false Restart the Grafana back-end. You should now see a Google login button on the login page. You can now login or sign up with your Google -accounts. The `allowed_domains` option is optional. +accounts. The `allowed_domains` option is optional, and domains is seperated by space. You may allow users to sign-up via Google authentication by setting the `allow_sign_up` option to `true`. When this option is set to `true`, any From ed974a808bac3d5cf5f77b387185eb3b2770e273 Mon Sep 17 00:00:00 2001 From: yinchuan Date: Fri, 29 May 2015 11:39:59 +0800 Subject: [PATCH 224/398] Update configuration.md --- docs/sources/installation/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 6e13398566b..e27a3e80f6a 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -301,7 +301,7 @@ Secret. Specify these in the Grafana configuration file. For example: Restart the Grafana back-end. You should now see a Google login button on the login page. You can now login or sign up with your Google -accounts. The `allowed_domains` option is optional, and domains is seperated by space. +accounts. The `allowed_domains` option is optional, and domains were seperated by space. You may allow users to sign-up via Google authentication by setting the `allow_sign_up` option to `true`. When this option is set to `true`, any From fc43ce657c91a7bcaaeb95c1e806b60dc3c6cc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Jun 2015 11:00:05 +0200 Subject: [PATCH 225/398] allow data source proxy to proxy requests over self signed https connections, Closes #2069 --- pkg/api/dataproxy.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkg/api/dataproxy.go b/pkg/api/dataproxy.go index 81318cdc536..11075294b66 100644 --- a/pkg/api/dataproxy.go +++ b/pkg/api/dataproxy.go @@ -1,9 +1,12 @@ package api import ( + "crypto/tls" + "net" "net/http" "net/http/httputil" "net/url" + "time" "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/middleware" @@ -11,6 +14,16 @@ import ( "github.com/grafana/grafana/pkg/util" ) +var dataProxyTransport = &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + Proxy: http.ProxyFromEnvironment, + Dial: (&net.Dialer{ + Timeout: 30 * time.Second, + KeepAlive: 30 * time.Second, + }).Dial, + TLSHandshakeTimeout: 10 * time.Second, +} + func NewReverseProxy(ds *m.DataSource, proxyPath string) *httputil.ReverseProxy { target, _ := url.Parse(ds.Url) @@ -56,5 +69,6 @@ func ProxyDataSourceRequest(c *middleware.Context) { proxyPath := c.Params("*") proxy := NewReverseProxy(&query.Result, proxyPath) + proxy.Transport = dataProxyTransport proxy.ServeHTTP(c.RW(), c.Req.Request) } From e2f6633d57624664654463578e8d2502bfd7ffef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Jun 2015 12:15:49 +0200 Subject: [PATCH 226/398] Began work on data source test / validation, #1997 & #2043 --- CHANGELOG.md | 1 + pkg/api/api.go | 7 ++- pkg/api/datasources.go | 4 +- pkg/models/datasource.go | 2 +- public/app/features/org/datasourceEditCtrl.js | 46 +++++++++++++------ .../features/org/partials/datasourceEdit.html | 21 +++++++-- .../plugins/datasource/graphite/datasource.js | 16 +++++++ public/css/less/overrides.less | 45 +++++++++--------- 8 files changed, 95 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed6265738ef..f03c7f34891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - [Issue #1928](https://github.com/grafana/grafana/issues/1928). HTTP API: GET /api/dashboards/db/:slug response changed property `model` to `dashboard` to match the POST request nameing - Backend render URL changed from `/render/dashboard/solo` `render/dashboard-solo/` (in order to have consistent dashboard url `/dashboard/:type/:slug`) - Search HTTP API response has changed (simplified), tags list moved to seperate HTTP resource URI +- Datasource HTTP api breaking change, ADD datasource is now POST /api/datasources/, update is now PUT /api/datasources/:id # 2.0.3 (unreleased - 2.0.x branch) diff --git a/pkg/api/api.go b/pkg/api/api.go index f5da406a8a5..6ecaa51652e 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -107,10 +107,9 @@ func Register(r *macaron.Macaron) { // Data sources r.Group("/datasources", func() { - r.Combo("/"). - Get(GetDataSources). - Put(bind(m.AddDataSourceCommand{}), AddDataSource). - Post(bind(m.UpdateDataSourceCommand{}), UpdateDataSource) + r.Get("/", GetDataSources) + r.Post("/", bind(m.AddDataSourceCommand{}), AddDataSource) + r.Put("/:id", bind(m.UpdateDataSourceCommand{}), UpdateDataSource) r.Delete("/:id", DeleteDataSource) r.Get("/:id", GetDataSourceById) r.Get("/plugins", GetDataSourcePlugins) diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go index 76a9bddd253..e0253df3cdb 100644 --- a/pkg/api/datasources.go +++ b/pkg/api/datasources.go @@ -6,6 +6,7 @@ import ( "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/plugins" + "github.com/grafana/grafana/pkg/util" ) func GetDataSources(c *middleware.Context) { @@ -94,11 +95,12 @@ func AddDataSource(c *middleware.Context, cmd m.AddDataSourceCommand) { return } - c.JsonOK("Datasource added") + c.JSON(200, util.DynMap{"message": "Datasource added", "id": cmd.Result.Id}) } func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) { cmd.OrgId = c.OrgId + cmd.Id = c.ParamsInt64(":id") err := bus.Dispatch(&cmd) if err != nil { diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go index 2ba236cd56b..c756faaba59 100644 --- a/pkg/models/datasource.go +++ b/pkg/models/datasource.go @@ -69,7 +69,6 @@ type AddDataSourceCommand struct { // Also acts as api DTO type UpdateDataSourceCommand struct { - Id int64 `json:"id" binding:"Required"` Name string `json:"name" binding:"Required"` Type string `json:"type" binding:"Required"` Access DsAccess `json:"access" binding:"Required"` @@ -84,6 +83,7 @@ type UpdateDataSourceCommand struct { JsonData map[string]interface{} `json:"jsonData"` OrgId int64 `json:"-"` + Id int64 `json:"-"` } type DeleteDataSourceCommand struct { diff --git a/public/app/features/org/datasourceEditCtrl.js b/public/app/features/org/datasourceEditCtrl.js index 780aee3e843..12d552c985b 100644 --- a/public/app/features/org/datasourceEditCtrl.js +++ b/public/app/features/org/datasourceEditCtrl.js @@ -25,7 +25,6 @@ function (angular, config) { $scope.loadDatasourceTypes().then(function() { if ($routeParams.id) { - $scope.isNew = false; $scope.getDatasourceById($routeParams.id); } else { $scope.current = angular.copy(defaults); @@ -48,6 +47,7 @@ function (angular, config) { $scope.getDatasourceById = function(id) { backendSrv.get('/api/datasources/' + id).then(function(ds) { + $scope.isNew = false; $scope.current = ds; $scope.typeChanged(); }); @@ -65,26 +65,46 @@ function (angular, config) { }); }; - $scope.update = function() { - if (!$scope.editForm.$valid) { - return; - } + $scope.testDatasource = function() { + $scope.testing = { done: false }; - backendSrv.post('/api/datasources', $scope.current).then(function() { - $scope.updateFrontendSettings(); - $location.path("datasources"); + datasourceSrv.get($scope.current.name).then(function(datasource) { + if (!datasource.testDatasource) { + $scope.testing.message = 'Data source does not support test connection feature.'; + $scope.testing.status = 'warning'; + $scope.testing.title = 'Unknown'; + return; + } + return datasource.testDatasource().then(function(result) { + $scope.testing.message = result.message; + $scope.testing.status = result.status; + $scope.testing.title = result.title; + }); + }).finally(function() { + $scope.testing.done = true; }); }; - $scope.add = function() { + $scope.saveChanges = function(test) { if (!$scope.editForm.$valid) { return; } - backendSrv.put('/api/datasources', $scope.current).then(function() { - $scope.updateFrontendSettings(); - $location.path("datasources"); - }); + if ($scope.current.id) { + return backendSrv.put('/api/datasources/' + $scope.current.id, $scope.current).then(function() { + $scope.updateFrontendSettings(); + if (test) { + $scope.testDatasource(); + } else { + $location.path('datasources'); + } + }); + } else { + return backendSrv.post('/api/datasources', $scope.current).then(function(result) { + $scope.updateFrontendSettings(); + $location.path('datasources/edit/' + result.id); + }); + } }; $scope.init(); diff --git a/public/app/features/org/partials/datasourceEdit.html b/public/app/features/org/partials/datasourceEdit.html index 12b46ee284b..6ea33e5a43c 100644 --- a/public/app/features/org/partials/datasourceEdit.html +++ b/public/app/features/org/partials/datasourceEdit.html @@ -43,11 +43,22 @@
    -
    -
    -
    - - + +
    +
    Testing....
    +
    Test results
    +
    +
    {{testing.title}}
    +
    +
    +
    + +
    + + + Cancel

    diff --git a/public/app/plugins/datasource/graphite/datasource.js b/public/app/plugins/datasource/graphite/datasource.js index 9315b5a5b33..ff06d9f46aa 100644 --- a/public/app/plugins/datasource/graphite/datasource.js +++ b/public/app/plugins/datasource/graphite/datasource.js @@ -196,6 +196,22 @@ function (angular, _, $, config, kbn, moment) { }); }; + GraphiteDatasource.prototype.testDatasource = function() { + return this.metricFindQuery('*').then(function () { + return { status: "success", message: "Data source is working", title: "Success" }; + }, function(err) { + var message, title; + if (err.statusText) { + message = err.statusText; + title = "HTTP Error"; + } else { + message = err; + title = "Unknown error"; + } + return { status: "error", message: message, title: title }; + }); + }; + GraphiteDatasource.prototype.listDashboards = function(query) { return this.doGraphiteRequest({ method: 'GET', url: '/dashboard/find/', params: {query: query || ''} }) .then(function(results) { diff --git a/public/css/less/overrides.less b/public/css/less/overrides.less index 425777f1597..b03cb7f7e6b 100644 --- a/public/css/less/overrides.less +++ b/public/css/less/overrides.less @@ -315,38 +315,37 @@ div.flot-text { position: fixed; right: 20px; top: 56px; +} - .alert { - color: @white; - padding-bottom: 13px; - position: relative; - } +.alert { + color: @white; + padding-bottom: 13px; + position: relative; +} - .alert-close { - position: absolute; - top: -4px; - right: -2px; - width: 19px; - height: 19px; - padding: 0; - background: @grayLighter; - border-radius: 50%; - border: none; - font-size: 1.1rem; - color: @grayDarker; - } +.alert-close { + position: absolute; + top: -4px; + right: -2px; + width: 19px; + height: 19px; + padding: 0; + background: @grayLighter; + border-radius: 50%; + border: none; + font-size: 1.1rem; + color: @grayDarker; +} - .alert-title { - font-weight: bold; - padding-bottom: 2px; - } +.alert-title { + font-weight: bold; + padding-bottom: 2px; } .alert-warning { background-color: @warningBackground; border-color: @warningBorder; - color: @warningText; } /* =================================================== From afede880e6900ad192fb8ba0c9fece2e7c5f3fe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Jun 2015 14:02:24 +0200 Subject: [PATCH 227/398] added url validation when adding data source, Fixes #2043 --- .../org/partials/datasourceHttpConfig.html | 2 +- .../plugins/datasource/influxdb/datasource.js | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/public/app/features/org/partials/datasourceHttpConfig.html b/public/app/features/org/partials/datasourceHttpConfig.html index 88923e77b3d..94c208d8370 100644 --- a/public/app/features/org/partials/datasourceHttpConfig.html +++ b/public/app/features/org/partials/datasourceHttpConfig.html @@ -6,7 +6,7 @@ Url
  • - +
  • Access Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request diff --git a/public/app/plugins/datasource/influxdb/datasource.js b/public/app/plugins/datasource/influxdb/datasource.js index 2ff0f8beb0e..c483e28b288 100644 --- a/public/app/plugins/datasource/influxdb/datasource.js +++ b/public/app/plugins/datasource/influxdb/datasource.js @@ -126,6 +126,22 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { return this._influxRequest('GET', '/query', {q: query}); }; + InfluxDatasource.prototype.testDatasource = function() { + return this.metricFindQuery('SHOW MEASUREMENTS LIMIT 1').then(function () { + return { status: "success", message: "Data source is working", title: "Success" }; + }, function(err) { + var message, title; + if (err.statusText) { + message = err.statusText; + title = "HTTP Error"; + } else { + message = err; + title = "Unknown error"; + } + return { status: "error", message: message, title: title }; + }); + }; + InfluxDatasource.prototype._influxRequest = function(method, url, data) { var self = this; var deferred = $q.defer(); From 50645cc36bfdec608c12f36a2acfc610e5b08df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Jun 2015 14:16:59 +0200 Subject: [PATCH 228/398] Added test connection action to all data sources, Closes #1997 --- public/app/features/org/datasourceEditCtrl.js | 9 +++++++++ public/app/plugins/datasource/graphite/datasource.js | 10 ---------- public/app/plugins/datasource/influxdb/datasource.js | 10 ---------- .../app/plugins/datasource/influxdb_08/datasource.js | 6 ++++++ public/app/plugins/datasource/opentsdb/datasource.js | 6 ++++++ 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/public/app/features/org/datasourceEditCtrl.js b/public/app/features/org/datasourceEditCtrl.js index 12d552c985b..f2af6325a20 100644 --- a/public/app/features/org/datasourceEditCtrl.js +++ b/public/app/features/org/datasourceEditCtrl.js @@ -75,10 +75,19 @@ function (angular, config) { $scope.testing.title = 'Unknown'; return; } + return datasource.testDatasource().then(function(result) { $scope.testing.message = result.message; $scope.testing.status = result.status; $scope.testing.title = result.title; + }, function(err) { + if (err.statusText) { + $scope.testing.message = err.statusText; + $scope.testing.title = "HTTP Error"; + } else { + $scope.testing.message = err.message; + $scope.testing.title = "Unknown error"; + } }); }).finally(function() { $scope.testing.done = true; diff --git a/public/app/plugins/datasource/graphite/datasource.js b/public/app/plugins/datasource/graphite/datasource.js index ff06d9f46aa..a3255584879 100644 --- a/public/app/plugins/datasource/graphite/datasource.js +++ b/public/app/plugins/datasource/graphite/datasource.js @@ -199,16 +199,6 @@ function (angular, _, $, config, kbn, moment) { GraphiteDatasource.prototype.testDatasource = function() { return this.metricFindQuery('*').then(function () { return { status: "success", message: "Data source is working", title: "Success" }; - }, function(err) { - var message, title; - if (err.statusText) { - message = err.statusText; - title = "HTTP Error"; - } else { - message = err; - title = "Unknown error"; - } - return { status: "error", message: message, title: title }; }); }; diff --git a/public/app/plugins/datasource/influxdb/datasource.js b/public/app/plugins/datasource/influxdb/datasource.js index c483e28b288..a8656114fdf 100644 --- a/public/app/plugins/datasource/influxdb/datasource.js +++ b/public/app/plugins/datasource/influxdb/datasource.js @@ -129,16 +129,6 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { InfluxDatasource.prototype.testDatasource = function() { return this.metricFindQuery('SHOW MEASUREMENTS LIMIT 1').then(function () { return { status: "success", message: "Data source is working", title: "Success" }; - }, function(err) { - var message, title; - if (err.statusText) { - message = err.statusText; - title = "HTTP Error"; - } else { - message = err; - title = "Unknown error"; - } - return { status: "error", message: message, title: title }; }); }; diff --git a/public/app/plugins/datasource/influxdb_08/datasource.js b/public/app/plugins/datasource/influxdb_08/datasource.js index 8ff01c8553f..0e4adba072c 100644 --- a/public/app/plugins/datasource/influxdb_08/datasource.js +++ b/public/app/plugins/datasource/influxdb_08/datasource.js @@ -99,6 +99,12 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { }); }; + InfluxDatasource.prototype.testDatasource = function() { + return this.metricFindQuery('list series').then(function () { + return { status: "success", message: "Data source is working", title: "Success" }; + }); + }; + InfluxDatasource.prototype.metricFindQuery = function (query) { var interpolated; try { diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js index 936500be0f0..1e60bf1e54e 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.js +++ b/public/app/plugins/datasource/opentsdb/datasource.js @@ -90,6 +90,12 @@ function (angular, _, kbn) { }); }; + OpenTSDBDatasource.prototype.testDatasource = function() { + return this.performSuggestQuery('cpu', 'metrics').then(function () { + return { status: "success", message: "Data source is working", title: "Success" }; + }); + }; + function transformMetricData(md, groupByTags, options) { var metricLabel = createMetricLabel(md, options, groupByTags); var dps = []; From 85c3a0aa1441bd37c7fc455ab51effbc7bf53741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Jun 2015 16:29:45 +0200 Subject: [PATCH 229/398] Panel menu now hides edit actions for users with role Viewer, Closes #1826 --- ' | 36 ------------- pkg/api/dashboard.go | 1 + pkg/api/dtos/models.go | 1 + pkg/api/frontendsettings.go | 1 + pkg/setting/setting.go | 2 + public/app/components/panelmeta.js | 12 ++--- public/app/features/panel/panelMenu.js | 70 +++++++++++++++----------- public/app/services/contextSrv.js | 2 +- public/css/less/panel.less | 1 - 9 files changed, 54 insertions(+), 72 deletions(-) delete mode 100644 ' diff --git a/' b/' deleted file mode 100644 index b179a2b8b5a..00000000000 --- a/' +++ /dev/null @@ -1,36 +0,0 @@ -define([ - 'angular', - 'lodash' -], -function (angular) { - 'use strict'; - - angular - .module('grafana.directives') - .directive('annotationTooltip', function($sanitize, dashboardSrv) { - return { - scope: { tagColorFromName: "=" }, - link: function (scope, element) { - var title = $sanitize(scope.annoation.title); - var dashboard = dashboardSrv.getCurrent(); - var time = '' + dashboard.formatDate(scope.annotation.time) + ''; - - var tooltip = '
    '+ title + ' ' + time + '
    ' ; - - if (options.tags) { - var tags = $sanitize(options.tags); - tooltip += '' + (tags || '') + '
    '; - } - - if (options.text) { - var text = $sanitize(options.text); - tooltip += text.replace(/\n/g, '
    '); - } - - tooltip += ""; - } - }; - }); - -}); - diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index b439bd67ac7..00ae26744d9 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -55,6 +55,7 @@ func GetDashboard(c *middleware.Context) { Type: m.DashTypeDB, CanStar: c.IsSignedIn, CanSave: c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR, + CanEdit: c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR, }, } diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go index d5e294cc983..3e1826f56fb 100644 --- a/pkg/api/dtos/models.go +++ b/pkg/api/dtos/models.go @@ -34,6 +34,7 @@ type DashboardMeta struct { IsSnapshot bool `json:"isSnapshot,omitempty"` Type string `json:"type,omitempty"` CanSave bool `json:"canSave"` + CanEdit bool `json:"canEdit"` CanStar bool `json:"canStar"` Slug string `json:"slug"` Expires time.Time `json:"expires"` diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index ea154320608..4dd6ba06819 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -99,6 +99,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro "defaultDatasource": defaultDatasource, "datasources": datasources, "appSubUrl": setting.AppSubUrl, + "viewerRoleMode": setting.ViewerRoleMode, "buildInfo": map[string]interface{}{ "version": setting.BuildVersion, "commit": setting.BuildCommit, diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 77445dd6c4c..6768f9aabd9 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -79,6 +79,7 @@ var ( AllowUserOrgCreate bool AutoAssignOrg bool AutoAssignOrgRole string + ViewerRoleMode string // Http auth AdminUser string @@ -383,6 +384,7 @@ func NewConfigContext(args *CommandLineArgs) { AllowUserOrgCreate = users.Key("allow_org_create").MustBool(true) AutoAssignOrg = users.Key("auto_assign_org").MustBool(true) AutoAssignOrgRole = users.Key("auto_assign_org_role").In("Editor", []string{"Editor", "Admin", "Viewer"}) + ViewerRoleMode = users.Key("viewer_role_mode").In("default", []string{"default", "strinct"}) // anonymous access AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false) diff --git a/public/app/components/panelmeta.js b/public/app/components/panelmeta.js index 4ee4a9b9b55..013919c174a 100644 --- a/public/app/components/panelmeta.js +++ b/public/app/components/panelmeta.js @@ -16,8 +16,8 @@ function () { this.addMenuItem('view', 'icon-eye-open', 'toggleFullscreen(false); dismiss();'); } - this.addMenuItem('edit', 'icon-cog', 'editPanel(); dismiss();'); - this.addMenuItem('duplicate', 'icon-copy', 'duplicatePanel()'); + this.addMenuItem('edit', 'icon-cog', 'editPanel(); dismiss();', 'Editor'); + this.addMenuItem('duplicate', 'icon-copy', 'duplicatePanel()', 'Editor'); this.addMenuItem('share', 'icon-share', 'sharePanel(); dismiss();'); this.addEditorTab('General', 'app/partials/panelgeneral.html'); @@ -29,12 +29,12 @@ function () { this.addExtendedMenuItem('Panel JSON', '', 'editPanelJson(); dismiss();'); } - PanelMeta.prototype.addMenuItem = function(text, icon, click) { - this.menu.push({text: text, icon: icon, click: click}); + PanelMeta.prototype.addMenuItem = function(text, icon, click, role) { + this.menu.push({text: text, icon: icon, click: click, role: role}); }; - PanelMeta.prototype.addExtendedMenuItem = function(text, icon, click) { - this.extendedMenu.push({text: text, icon: icon, click: click}); + PanelMeta.prototype.addExtendedMenuItem = function(text, icon, click, role) { + this.extendedMenu.push({text: text, icon: icon, click: click, role: role}); }; PanelMeta.prototype.addEditorTab = function(title, src) { diff --git a/public/app/features/panel/panelMenu.js b/public/app/features/panel/panelMenu.js index 27152ef2b94..03ee78491ab 100644 --- a/public/app/features/panel/panelMenu.js +++ b/public/app/features/panel/panelMenu.js @@ -8,7 +8,7 @@ function (angular, $, _) { angular .module('grafana.directives') - .directive('panelMenu', function($compile, linkSrv) { + .directive('panelMenu', function($compile, linkSrv, contextSrv) { var linkTemplate = '' + '{{panel.title | interpolateTemplateVars:this}}' + @@ -18,18 +18,26 @@ function (angular, $, _) { function createMenuTemplate($scope) { var template = '
    '; - template += '
    '; - template += '
    '; - template += ''; - template += ''; - template += ''; - template += '
    '; - template += '
    '; + + if ($scope.dashboardMeta.canEdit && contextSrv.isEditor) { + template += '
    '; + template += '
    '; + template += ''; + template += ''; + template += ''; + template += '
    '; + template += '
    '; + } template += '
    '; template += ''; _.each($scope.panelMeta.menu, function(item) { + // skip edit actions if not editor + if (item.role === 'Editor' && (!contextSrv.isEditor || !$scope.dashboardMeta.canEdit)) { + return; + } + template += ' 0) { - menuLeftPos -= stickingOut + 10; - } - if (panelLeftPos + menuLeftPos < 0) { - menuLeftPos = 0; - } - var menuTemplate = createMenuTemplate($scope); $menu = $(menuTemplate); - $menu.css('left', menuLeftPos); $menu.mouseleave(function() { dismiss(1000); }); @@ -136,15 +130,35 @@ function (angular, $, _) { dismiss(null, true); }; - $('.panel-menu').remove(); - elem.append($menu); - $scope.$apply(function() { - $compile($menu.contents())(menuScope); - }); - $(".panel-container").removeClass('panel-highlight'); $panelContainer.toggleClass('panel-highlight'); + $('.panel-menu').remove(); + + elem.append($menu); + + $scope.$apply(function() { + $compile($menu.contents())(menuScope); + + var menuWidth = $menu[0].offsetWidth; + var menuHeight = $menu[0].offsetHeight; + + var windowWidth = $(window).width(); + var panelLeftPos = $(elem).offset().left; + var panelWidth = $(elem).width(); + + var menuLeftPos = (panelWidth / 2) - (menuWidth/2); + var stickingOut = panelLeftPos + menuLeftPos + menuWidth - windowWidth; + if (stickingOut > 0) { + menuLeftPos -= stickingOut + 10; + } + if (panelLeftPos + menuLeftPos < 0) { + menuLeftPos = 0; + } + + $menu.css({'left': menuLeftPos, top: -menuHeight}); + }); + dismiss(2200); }; diff --git a/public/app/services/contextSrv.js b/public/app/services/contextSrv.js index b3f8a1ed164..aa844ee5113 100644 --- a/public/app/services/contextSrv.js +++ b/public/app/services/contextSrv.js @@ -60,6 +60,6 @@ function (angular, _, store, config) { store.set('grafana.sidemenu', false); } - this.isEditor = this.hasRole('Editor') || this.hasRole('Admin'); + this.isEditor = this.hasRole('Editor') || this.hasRole('Admin') || this.hasRole('Read Only Editor'); }); }); diff --git a/public/css/less/panel.less b/public/css/less/panel.less index 17b8ff0cd52..6f011b2978f 100644 --- a/public/css/less/panel.less +++ b/public/css/less/panel.less @@ -130,7 +130,6 @@ position: absolute; background: @grafanaTargetFuncBackground; border: 1px solid black; - top: -62px; .panel-menu-row { white-space: nowrap; From 83e7c48767ce8f07d4e53e05af9de4ae705cfa9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Jun 2015 16:39:01 +0200 Subject: [PATCH 230/398] User role 'Viewer' are now prohibited from entering edit mode (and doing other transient dashboard edits). A new role will replace the old Viewer behavior --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f03c7f34891..bc4c86878d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - [Issue #960](https://github.com/grafana/grafana/issues/960). Search: Backend can now index a folder with json files, will be available in search (saving back to folder is not supported, this feature is meant for static generated json dashboards) **Breaking changes** +- [Issue #1826](https://github.com/grafana/grafana/issues/1826). User role 'Viewer' are now prohibited from entering edit mode (and doing other transient dashboard edits). A new role `Read Only Editor` will replace the old Viewer behavior - [Issue #1928](https://github.com/grafana/grafana/issues/1928). HTTP API: GET /api/dashboards/db/:slug response changed property `model` to `dashboard` to match the POST request nameing - Backend render URL changed from `/render/dashboard/solo` `render/dashboard-solo/` (in order to have consistent dashboard url `/dashboard/:type/:slug`) - Search HTTP API response has changed (simplified), tags list moved to seperate HTTP resource URI From 86f5152092cb28051566107d76df2d3d11883fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Jun 2015 16:49:14 +0200 Subject: [PATCH 231/398] When role is viewer and edit URL is loaded view mode will be loaded instead, Closes #2089 --- public/app/features/dashboard/viewStateSrv.js | 7 ++++--- public/app/features/panel/panelMenu.js | 6 +++--- public/app/features/panel/panelSrv.js | 8 -------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/public/app/features/dashboard/viewStateSrv.js b/public/app/features/dashboard/viewStateSrv.js index ef7669e387c..e87a942a6de 100644 --- a/public/app/features/dashboard/viewStateSrv.js +++ b/public/app/features/dashboard/viewStateSrv.js @@ -130,10 +130,11 @@ function (angular, _, $) { var docHeight = $(window).height(); var editHeight = Math.floor(docHeight * 0.3); var fullscreenHeight = Math.floor(docHeight * 0.7); - this.oldTimeRange = panelScope.range; - panelScope.height = this.state.edit ? editHeight : fullscreenHeight; - panelScope.editMode = this.state.edit; + panelScope.editMode = this.state.edit && this.$scope.dashboardMeta.canEdit; + panelScope.height = panelScope.editMode ? editHeight : fullscreenHeight; + + this.oldTimeRange = panelScope.range; this.fullscreenPanel = panelScope; $(window).scrollTop(0); diff --git a/public/app/features/panel/panelMenu.js b/public/app/features/panel/panelMenu.js index 03ee78491ab..5a701084ff3 100644 --- a/public/app/features/panel/panelMenu.js +++ b/public/app/features/panel/panelMenu.js @@ -8,7 +8,7 @@ function (angular, $, _) { angular .module('grafana.directives') - .directive('panelMenu', function($compile, linkSrv, contextSrv) { + .directive('panelMenu', function($compile, linkSrv) { var linkTemplate = '' + '{{panel.title | interpolateTemplateVars:this}}' + @@ -19,7 +19,7 @@ function (angular, $, _) { function createMenuTemplate($scope) { var template = '
    '; - if ($scope.dashboardMeta.canEdit && contextSrv.isEditor) { + if ($scope.dashboardMeta.canEdit) { template += '
    '; template += '
    '; template += ''; @@ -34,7 +34,7 @@ function (angular, $, _) { _.each($scope.panelMeta.menu, function(item) { // skip edit actions if not editor - if (item.role === 'Editor' && (!contextSrv.isEditor || !$scope.dashboardMeta.canEdit)) { + if (item.role === 'Editor' && !$scope.dashboardMeta.canEdit) { return; } diff --git a/public/app/features/panel/panelSrv.js b/public/app/features/panel/panelSrv.js index d29866033ee..b863518ff72 100644 --- a/public/app/features/panel/panelSrv.js +++ b/public/app/features/panel/panelSrv.js @@ -71,14 +71,6 @@ function (angular, _, config) { }; $scope.toggleFullscreen = function(edit) { - if (edit && $scope.dashboardMeta.canEdit === false) { - $scope.appEvent('alert-warning', [ - 'Dashboard not editable', - 'Use Save As.. feature to create an editable copy of this dashboard.' - ]); - return; - } - $scope.dashboardViewState.update({ fullscreen: true, edit: edit, panelId: $scope.panel.id }); }; From ff3843bc7fe894178c21953447dae6a16985bf20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Jun 2015 17:01:04 +0200 Subject: [PATCH 232/398] Roles: New user role that replaces the old role behavior, Closes #2088 --- CHANGELOG.md | 1 + pkg/api/dashboard.go | 2 +- pkg/models/org_user.go | 9 +++++---- public/app/features/org/partials/orgUsers.html | 6 +++--- public/app/services/contextSrv.js | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc4c86878d4..9096744be61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ **User or Organization admin** - [Issue #1899](https://github.com/grafana/grafana/issues/1899). Organization: You can now update the organization user role directly (without removing and readding the organization user). +- [Issue #2088](https://github.com/grafana/grafana/issues/2088). Roles: New user role `Read Only Editor` that replaces the old `Viewer` role behavior **Backend** - [Issue #1905](https://github.com/grafana/grafana/issues/1905). Github OAuth: You can now configure a Github team membership requirement, thx @dewski diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 00ae26744d9..b010f32cdcb 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -55,7 +55,7 @@ func GetDashboard(c *middleware.Context) { Type: m.DashTypeDB, CanStar: c.IsSignedIn, CanSave: c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR, - CanEdit: c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR, + CanEdit: c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR || c.OrgRole == m.ROLE_READ_ONLY_EDITOR, }, } diff --git a/pkg/models/org_user.go b/pkg/models/org_user.go index 3e40fd24b68..afbb10386c8 100644 --- a/pkg/models/org_user.go +++ b/pkg/models/org_user.go @@ -15,13 +15,14 @@ var ( type RoleType string const ( - ROLE_VIEWER RoleType = "Viewer" - ROLE_EDITOR RoleType = "Editor" - ROLE_ADMIN RoleType = "Admin" + ROLE_VIEWER RoleType = "Viewer" + ROLE_EDITOR RoleType = "Editor" + ROLE_READ_ONLY_EDITOR RoleType = "Read Only Editor" + ROLE_ADMIN RoleType = "Admin" ) func (r RoleType) IsValid() bool { - return r == ROLE_VIEWER || r == ROLE_ADMIN || r == ROLE_EDITOR + return r == ROLE_VIEWER || r == ROLE_ADMIN || r == ROLE_EDITOR || r == ROLE_READ_ONLY_EDITOR } type OrgUser struct { diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html index b32ff031caa..b32ffb67081 100644 --- a/public/app/features/org/partials/orgUsers.html +++ b/public/app/features/org/partials/orgUsers.html @@ -12,7 +12,7 @@
      -
    • +
    • Username or Email
    • @@ -22,7 +22,7 @@ role
    • -
    • @@ -46,7 +46,7 @@ {{user.login}} {{user.email}} - diff --git a/public/app/services/contextSrv.js b/public/app/services/contextSrv.js index aa844ee5113..b3f8a1ed164 100644 --- a/public/app/services/contextSrv.js +++ b/public/app/services/contextSrv.js @@ -60,6 +60,6 @@ function (angular, _, store, config) { store.set('grafana.sidemenu', false); } - this.isEditor = this.hasRole('Editor') || this.hasRole('Admin') || this.hasRole('Read Only Editor'); + this.isEditor = this.hasRole('Editor') || this.hasRole('Admin'); }); }); From 153ab4afaa13b5bf21f0ca88973cae60a170282b Mon Sep 17 00:00:00 2001 From: robert jakub Date: Mon, 1 Jun 2015 20:26:41 +0200 Subject: [PATCH 233/398] new role Read Only Editor - admin (small fix for #2088) --- public/app/features/admin/partials/edit_user.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html index 5d08292605e..a1a4cb989cd 100644 --- a/public/app/features/admin/partials/edit_user.html +++ b/public/app/features/admin/partials/edit_user.html @@ -115,7 +115,7 @@ Role
    • -
    • @@ -137,7 +137,7 @@ {{org.name}} Current - From 2446168356d6b6b4d16087ad7517ba0a15b588ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 2 Jun 2015 09:00:17 +0200 Subject: [PATCH 234/398] Sort tags in search results, Closes #2091 --- pkg/search/handlers.go | 11 +++++++-- pkg/search/handlers_test.go | 49 +++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 pkg/search/handlers_test.go diff --git a/pkg/search/handlers.go b/pkg/search/handlers.go index 874b85994ca..d0f9ae56833 100644 --- a/pkg/search/handlers.go +++ b/pkg/search/handlers.go @@ -55,12 +55,19 @@ func searchHandler(query *Query) error { hits = append(hits, jsonHits...) } - sort.Sort(hits) - + // add isStarred info if err := setIsStarredFlagOnSearchResults(query.UserId, hits); err != nil { return err } + // sort main result array + sort.Sort(hits) + + // sort tags + for _, hit := range hits { + sort.Strings(hit.Tags) + } + query.Result = hits return nil } diff --git a/pkg/search/handlers_test.go b/pkg/search/handlers_test.go new file mode 100644 index 00000000000..ebfade4dc06 --- /dev/null +++ b/pkg/search/handlers_test.go @@ -0,0 +1,49 @@ +package search + +import ( + "testing" + + "github.com/grafana/grafana/pkg/bus" + m "github.com/grafana/grafana/pkg/models" + . "github.com/smartystreets/goconvey/convey" +) + +func TestSearch(t *testing.T) { + + Convey("Given search query", t, func() { + jsonDashIndex = NewJsonDashIndex("../../public/dashboards/") + query := Query{} + + bus.AddHandler("test", func(query *FindPersistedDashboardsQuery) error { + query.Result = HitList{ + &Hit{Id: 16, Title: "CCAA", Tags: []string{"BB", "AA"}}, + &Hit{Id: 10, Title: "AABB", Tags: []string{"CC", "AA"}}, + &Hit{Id: 15, Title: "BBAA", Tags: []string{"EE", "AA", "BB"}}, + } + return nil + }) + + bus.AddHandler("test", func(query *m.GetUserStarsQuery) error { + query.Result = map[int64]bool{10: true, 12: true} + return nil + }) + + Convey("That is empty", func() { + err := searchHandler(&query) + So(err, ShouldBeNil) + + Convey("should return sorted results", func() { + So(query.Result[0].Title, ShouldEqual, "AABB") + So(query.Result[1].Title, ShouldEqual, "BBAA") + So(query.Result[2].Title, ShouldEqual, "CCAA") + }) + + Convey("should return sorted tags", func() { + So(query.Result[1].Tags[0], ShouldEqual, "AA") + So(query.Result[1].Tags[1], ShouldEqual, "BB") + So(query.Result[1].Tags[2], ShouldEqual, "EE") + }) + }) + + }) +} From dc607b8e8a8563e04cb09fa9b13f4397a486460a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 2 Jun 2015 10:24:20 +0200 Subject: [PATCH 235/398] Dashboard search now supports filtering by multiple dashboard tags, Closes #2095 --- CHANGELOG.md | 1 + pkg/api/search.go | 4 +-- pkg/search/handlers.go | 41 +++++++++++++++++++++---- pkg/search/handlers_test.go | 12 ++++++++ pkg/search/json_index.go | 7 ----- pkg/search/json_index_test.go | 6 ++-- pkg/search/models.go | 3 +- pkg/services/sqlstore/dashboard.go | 7 +---- pkg/services/sqlstore/dashboard_test.go | 12 -------- public/app/controllers/search.js | 15 ++++++--- public/app/partials/search.html | 13 +++++--- 11 files changed, 74 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9096744be61..13b18a51fcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - [Issue #2088](https://github.com/grafana/grafana/issues/2088). Roles: New user role `Read Only Editor` that replaces the old `Viewer` role behavior **Backend** +- [Issue #2095](https://github.com/grafana/grafana/issues/2095). Search: Search now supports filtering by multiple dashboard tags - [Issue #1905](https://github.com/grafana/grafana/issues/1905). Github OAuth: You can now configure a Github team membership requirement, thx @dewski - [Issue #2052](https://github.com/grafana/grafana/issues/2052). Github OAuth: You can now configure a Github organization requirement, thx @indrekj - [Issue #1891](https://github.com/grafana/grafana/issues/1891). Security: New config option to disable the use of gravatar for profile images diff --git a/pkg/api/search.go b/pkg/api/search.go index 10329f445bd..4c2ba9195b6 100644 --- a/pkg/api/search.go +++ b/pkg/api/search.go @@ -8,7 +8,7 @@ import ( func Search(c *middleware.Context) { query := c.Query("query") - tag := c.Query("tag") + tags := c.QueryStrings("tag") starred := c.Query("starred") limit := c.QueryInt("limit") @@ -18,7 +18,7 @@ func Search(c *middleware.Context) { searchQuery := search.Query{ Title: query, - Tag: tag, + Tags: tags, UserId: c.UserId, Limit: limit, IsStarred: starred == "true", diff --git a/pkg/search/handlers.go b/pkg/search/handlers.go index d0f9ae56833..3b4fcb1c59f 100644 --- a/pkg/search/handlers.go +++ b/pkg/search/handlers.go @@ -33,7 +33,6 @@ func searchHandler(query *Query) error { dashQuery := FindPersistedDashboardsQuery{ Title: query.Title, - Tag: query.Tag, UserId: query.UserId, Limit: query.Limit, IsStarred: query.IsStarred, @@ -55,6 +54,22 @@ func searchHandler(query *Query) error { hits = append(hits, jsonHits...) } + // filter out results with tag filter + if len(query.Tags) > 0 { + filtered := HitList{} + for _, hit := range hits { + if hasRequiredTags(query.Tags, hit.Tags) { + filtered = append(filtered, hit) + } + } + hits = filtered + } + + // sort tags + for _, hit := range hits { + sort.Strings(hit.Tags) + } + // add isStarred info if err := setIsStarredFlagOnSearchResults(query.UserId, hits); err != nil { return err @@ -63,15 +78,29 @@ func searchHandler(query *Query) error { // sort main result array sort.Sort(hits) - // sort tags - for _, hit := range hits { - sort.Strings(hit.Tags) - } - query.Result = hits return nil } +func stringInSlice(a string, list []string) bool { + for _, b := range list { + if b == a { + return true + } + } + return false +} + +func hasRequiredTags(queryTags, hitTags []string) bool { + for _, queryTag := range queryTags { + if !stringInSlice(queryTag, hitTags) { + return false + } + } + + return true +} + func setIsStarredFlagOnSearchResults(userId int64, hits []*Hit) error { query := m.GetUserStarsQuery{UserId: userId} if err := bus.Dispatch(&query); err != nil { diff --git a/pkg/search/handlers_test.go b/pkg/search/handlers_test.go index ebfade4dc06..193ba73f94a 100644 --- a/pkg/search/handlers_test.go +++ b/pkg/search/handlers_test.go @@ -45,5 +45,17 @@ func TestSearch(t *testing.T) { }) }) + Convey("That filters by tag", func() { + query.Tags = []string{"BB", "AA"} + err := searchHandler(&query) + So(err, ShouldBeNil) + + Convey("should return correct results", func() { + So(len(query.Result), ShouldEqual, 2) + So(query.Result[0].Title, ShouldEqual, "BBAA") + So(query.Result[1].Title, ShouldEqual, "CCAA") + }) + + }) }) } diff --git a/pkg/search/json_index.go b/pkg/search/json_index.go index edf791562c9..a0fc02343e2 100644 --- a/pkg/search/json_index.go +++ b/pkg/search/json_index.go @@ -56,13 +56,6 @@ func (index *JsonDashIndex) Search(query *Query) ([]*Hit, error) { break } - // filter out results with tag filter - if query.Tag != "" { - if !strings.Contains(item.TagsCsv, query.Tag) { - continue - } - } - // add results with matchig title filter if strings.Contains(item.TitleLower, query.Title) { results = append(results, &Hit{ diff --git a/pkg/search/json_index_test.go b/pkg/search/json_index_test.go index 52741cc6806..afd584fffbd 100644 --- a/pkg/search/json_index_test.go +++ b/pkg/search/json_index_test.go @@ -17,14 +17,14 @@ func TestJsonDashIndex(t *testing.T) { }) Convey("Should be able to search index", func() { - res, err := index.Search(&Query{Title: "", Tag: "", Limit: 20}) + res, err := index.Search(&Query{Title: "", Limit: 20}) So(err, ShouldBeNil) So(len(res), ShouldEqual, 3) }) Convey("Should be able to search index by title", func() { - res, err := index.Search(&Query{Title: "home", Tag: "", Limit: 20}) + res, err := index.Search(&Query{Title: "home", Limit: 20}) So(err, ShouldBeNil) So(len(res), ShouldEqual, 1) @@ -32,7 +32,7 @@ func TestJsonDashIndex(t *testing.T) { }) Convey("Should not return when starred is filtered", func() { - res, err := index.Search(&Query{Title: "", Tag: "", IsStarred: true}) + res, err := index.Search(&Query{Title: "", IsStarred: true}) So(err, ShouldBeNil) So(len(res), ShouldEqual, 0) diff --git a/pkg/search/models.go b/pkg/search/models.go index 157d9a292e3..e65428f14b0 100644 --- a/pkg/search/models.go +++ b/pkg/search/models.go @@ -26,7 +26,7 @@ func (s HitList) Less(i, j int) bool { return s[i].Title < s[j].Title } type Query struct { Title string - Tag string + Tags []string OrgId int64 UserId int64 Limit int @@ -37,7 +37,6 @@ type Query struct { type FindPersistedDashboardsQuery struct { Title string - Tag string OrgId int64 UserId int64 Limit int diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go index 027f2cd2fac..8756c25e13e 100644 --- a/pkg/services/sqlstore/dashboard.go +++ b/pkg/services/sqlstore/dashboard.go @@ -150,13 +150,8 @@ func SearchDashboards(query *search.FindPersistedDashboardsQuery) error { params = append(params, "%"+query.Title+"%") } - if len(query.Tag) > 0 { - sql.WriteString(" AND dashboard_tag.term=?") - params = append(params, query.Tag) - } - if query.Limit == 0 || query.Limit > 10000 { - query.Limit = 300 + query.Limit = 1000 } sql.WriteString(fmt.Sprintf(" ORDER BY dashboard.title ASC LIMIT %d", query.Limit)) diff --git a/pkg/services/sqlstore/dashboard_test.go b/pkg/services/sqlstore/dashboard_test.go index 70675f9c42b..0ddd0db0df6 100644 --- a/pkg/services/sqlstore/dashboard_test.go +++ b/pkg/services/sqlstore/dashboard_test.go @@ -99,18 +99,6 @@ func TestDashboardDataAccess(t *testing.T) { So(len(hit.Tags), ShouldEqual, 2) }) - Convey("Should be able to search for dashboards using tags", func() { - query1 := search.FindPersistedDashboardsQuery{Tag: "webapp", OrgId: 1} - query2 := search.FindPersistedDashboardsQuery{Tag: "tagdoesnotexist", OrgId: 1} - - err := SearchDashboards(&query1) - err = SearchDashboards(&query2) - So(err, ShouldBeNil) - - So(len(query1.Result), ShouldEqual, 1) - So(len(query2.Result), ShouldEqual, 0) - }) - Convey("Should not be able to save dashboard with same name", func() { cmd := m.SaveDashboardCommand{ OrgId: 1, diff --git a/public/app/controllers/search.js b/public/app/controllers/search.js index b980297df16..a762af0f887 100644 --- a/public/app/controllers/search.js +++ b/public/app/controllers/search.js @@ -14,7 +14,7 @@ function (angular, _, config) { $scope.giveSearchFocus = 0; $scope.selectedIndex = -1; $scope.results = []; - $scope.query = { query: '', tag: '', starred: false }; + $scope.query = { query: '', tag: [], starred: false }; $scope.currentSearchId = 0; if ($scope.dashboardViewState.fullscreen) { @@ -82,12 +82,11 @@ function (angular, _, config) { $scope.queryHasNoFilters = function() { var query = $scope.query; - return query.query === '' && query.starred === false && query.tag === ''; + return query.query === '' && query.starred === false && query.tag.length === 0; }; $scope.filterByTag = function(tag, evt) { - $scope.query.tag = tag; - $scope.query.tagcloud = false; + $scope.query.tag.push(tag); $scope.search(); $scope.giveSearchFocus = $scope.giveSearchFocus + 1; if (evt) { @@ -96,6 +95,14 @@ function (angular, _, config) { } }; + $scope.removeTag = function(tag, evt) { + $scope.query.tag = _.without($scope.query.tag, tag); + $scope.search(); + $scope.giveSearchFocus = $scope.giveSearchFocus + 1; + evt.stopPropagation(); + evt.preventDefault(); + }; + $scope.getTags = function() { return backendSrv.get('/api/dashboards/tags').then(function(results) { $scope.tagsMode = true; diff --git a/public/app/partials/search.html b/public/app/partials/search.html index 9c644e96d25..9eaa8d253d2 100644 --- a/public/app/partials/search.html +++ b/public/app/partials/search.html @@ -15,11 +15,14 @@ tags - - | - - {{query.tag}} - + + | + + + + {{tagName}} + +
    From 6df9012141f78f14213c6528ad131050c2bb928e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 2 Jun 2015 10:35:10 +0200 Subject: [PATCH 236/398] Updated dashboard links feature to support search by my multiple tags, #1944 --- public/app/features/dashlinks/editor.html | 3 ++- public/app/features/dashlinks/module.js | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/public/app/features/dashlinks/editor.html b/public/app/features/dashlinks/editor.html index 576cde9c408..2d563c23c71 100644 --- a/public/app/features/dashlinks/editor.html +++ b/public/app/features/dashlinks/editor.html @@ -25,7 +25,8 @@
  • With tag
  • - + +
  • diff --git a/public/app/features/dashlinks/module.js b/public/app/features/dashlinks/module.js index e33d5406fc2..7be8ffbd87b 100644 --- a/public/app/features/dashlinks/module.js +++ b/public/app/features/dashlinks/module.js @@ -89,7 +89,7 @@ function (angular, _) { function buildLinks(linkDef) { if (linkDef.type === 'dashboards') { - if (!linkDef.tag) { + if (!linkDef.tags) { console.log('Dashboard link missing tag'); return $q.when([]); } @@ -97,7 +97,7 @@ function (angular, _) { if (linkDef.asDropdown) { return $q.when([{ title: linkDef.title, - tag: linkDef.tag, + tags: linkDef.tags, keepTime: linkDef.keepTime, includeVars: linkDef.includeVars, icon: "fa fa-bars", @@ -132,7 +132,7 @@ function (angular, _) { } $scope.searchDashboards = function(link) { - return backendSrv.search({tag: link.tag}).then(function(results) { + return backendSrv.search({tag: link.tags}).then(function(results) { return _.reduce(results, function(memo, dash) { // do not add current dashboard if (dash.id !== currentDashId) { From 50a1feb90a5535ff2ec4f6242e47e4e9209d7575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 2 Jun 2015 11:04:06 +0200 Subject: [PATCH 237/398] Dashboard list panel: Now supports search by multiple tags, Closes #2096 --- CHANGELOG.md | 1 + pkg/api/search.go | 2 +- pkg/search/handlers.go | 13 +++++++++---- pkg/search/handlers_test.go | 2 +- pkg/search/models.go | 1 - pkg/services/sqlstore/dashboard.go | 6 +----- public/app/directives/tags.js | 9 ++++++++- public/app/panels/dashlist/editor.html | 6 +++--- public/app/panels/dashlist/module.js | 7 +++++-- 9 files changed, 29 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13b18a51fcb..5988579123a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [Issue #1888](https://github.com/grafana/grafana/issues/1144). Templating: Repeat panel or row for each selected template variable value - [Issue #1888](https://github.com/grafana/grafana/issues/1944). Dashboard: Custom Navigation links & dynamic links to related dashboards - [Issue #590](https://github.com/grafana/grafana/issues/590). Graph: Define series color using regex rule +- [Issue #2096](https://github.com/grafana/grafana/issues/2096). Dashboard list panel: Now supports search by multiple tags **User or Organization admin** - [Issue #1899](https://github.com/grafana/grafana/issues/1899). Organization: You can now update the organization user role directly (without removing and readding the organization user). diff --git a/pkg/api/search.go b/pkg/api/search.go index 4c2ba9195b6..e451ac398d6 100644 --- a/pkg/api/search.go +++ b/pkg/api/search.go @@ -13,7 +13,7 @@ func Search(c *middleware.Context) { limit := c.QueryInt("limit") if limit == 0 { - limit = 200 + limit = 1000 } searchQuery := search.Query{ diff --git a/pkg/search/handlers.go b/pkg/search/handlers.go index 3b4fcb1c59f..a3cd01e2508 100644 --- a/pkg/search/handlers.go +++ b/pkg/search/handlers.go @@ -1,6 +1,7 @@ package search import ( + "fmt" "path/filepath" "sort" @@ -34,7 +35,6 @@ func searchHandler(query *Query) error { dashQuery := FindPersistedDashboardsQuery{ Title: query.Title, UserId: query.UserId, - Limit: query.Limit, IsStarred: query.IsStarred, OrgId: query.OrgId, } @@ -65,6 +65,14 @@ func searchHandler(query *Query) error { hits = filtered } + // sort main result array + sort.Sort(hits) + + fmt.Printf("Length: %d", len(hits)) + if len(hits) > query.Limit { + hits = hits[0 : query.Limit-1] + } + // sort tags for _, hit := range hits { sort.Strings(hit.Tags) @@ -75,9 +83,6 @@ func searchHandler(query *Query) error { return err } - // sort main result array - sort.Sort(hits) - query.Result = hits return nil } diff --git a/pkg/search/handlers_test.go b/pkg/search/handlers_test.go index 193ba73f94a..dc9835caa44 100644 --- a/pkg/search/handlers_test.go +++ b/pkg/search/handlers_test.go @@ -12,7 +12,7 @@ func TestSearch(t *testing.T) { Convey("Given search query", t, func() { jsonDashIndex = NewJsonDashIndex("../../public/dashboards/") - query := Query{} + query := Query{Limit: 2000} bus.AddHandler("test", func(query *FindPersistedDashboardsQuery) error { query.Result = HitList{ diff --git a/pkg/search/models.go b/pkg/search/models.go index e65428f14b0..9b8c7627f89 100644 --- a/pkg/search/models.go +++ b/pkg/search/models.go @@ -39,7 +39,6 @@ type FindPersistedDashboardsQuery struct { Title string OrgId int64 UserId int64 - Limit int IsStarred bool Result HitList diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go index 8756c25e13e..01eacb8436a 100644 --- a/pkg/services/sqlstore/dashboard.go +++ b/pkg/services/sqlstore/dashboard.go @@ -150,11 +150,7 @@ func SearchDashboards(query *search.FindPersistedDashboardsQuery) error { params = append(params, "%"+query.Title+"%") } - if query.Limit == 0 || query.Limit > 10000 { - query.Limit = 1000 - } - - sql.WriteString(fmt.Sprintf(" ORDER BY dashboard.title ASC LIMIT %d", query.Limit)) + sql.WriteString(fmt.Sprintf(" ORDER BY dashboard.title ASC LIMIT 1000")) var res []DashboardSearchProjection err := x.Sql(sql.String(), params...).Find(&res) diff --git a/public/app/directives/tags.js b/public/app/directives/tags.js index 4f8825a010b..f408a5e3864 100644 --- a/public/app/directives/tags.js +++ b/public/app/directives/tags.js @@ -70,7 +70,8 @@ function (angular, $) { return { restrict: 'EA', scope: { - model: '=ngModel' + model: '=ngModel', + onTagsUpdated: "&", }, template: '', replace: false, @@ -99,6 +100,9 @@ function (angular, $) { select.on('itemAdded', function(event) { if (scope.model.indexOf(event.item) === -1) { scope.model.push(event.item); + if (scope.onTagsUpdated) { + scope.onTagsUpdated(); + } } var tagElement = select.next().children("span").filter(function() { return $(this).text() === event.item; }); setColor(event.item, tagElement); @@ -108,6 +112,9 @@ function (angular, $) { var idx = scope.model.indexOf(event.item); if (idx !== -1) { scope.model.splice(idx, 1); + if (scope.onTagsUpdated) { + scope.onTagsUpdated(); + } } }); diff --git a/public/app/panels/dashlist/editor.html b/public/app/panels/dashlist/editor.html index 578d9e4b2d2..12598da9e56 100644 --- a/public/app/panels/dashlist/editor.html +++ b/public/app/panels/dashlist/editor.html @@ -27,11 +27,11 @@ ng-model="panel.query" ng-change="get_data()" ng-model-onblur>
  • - Tag + Tags
  • - + +
    • diff --git a/public/app/panels/dashlist/module.js b/public/app/panels/dashlist/module.js index da409fb3bde..9b4e1ebc045 100644 --- a/public/app/panels/dashlist/module.js +++ b/public/app/panels/dashlist/module.js @@ -32,7 +32,7 @@ function (angular, app, _, config, PanelMeta) { mode: 'starred', query: '', limit: 10, - tag: '', + tags: [] }; $scope.modes = ['starred', 'search']; @@ -43,6 +43,9 @@ function (angular, app, _, config, PanelMeta) { $scope.init = function() { panelSrv.init($scope); + if ($scope.panel.tag) { + $scope.panel.tags = [$scope.panel.tag]; + } if ($scope.isNewPanel()) { $scope.panel.title = "Starred Dashboards"; @@ -58,7 +61,7 @@ function (angular, app, _, config, PanelMeta) { params.starred = "true"; } else { params.query = $scope.panel.query; - params.tag = $scope.panel.tag; + params.tag = $scope.panel.tags; } return backendSrv.search(params).then(function(result) { From 8cfbd2f8bfd580c0e9489b45071b1c1e4ea66117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 2 Jun 2015 11:05:48 +0200 Subject: [PATCH 238/398] Increased width of query input field in dashlist panel editor --- public/app/features/dashlinks/editor.html | 2 +- public/app/panels/dashlist/editor.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/dashlinks/editor.html b/public/app/features/dashlinks/editor.html index 2d563c23c71..69f2c067330 100644 --- a/public/app/features/dashlinks/editor.html +++ b/public/app/features/dashlinks/editor.html @@ -20,7 +20,7 @@
  • Type
  • - +
  • With tag
    • diff --git a/public/app/panels/dashlist/editor.html b/public/app/panels/dashlist/editor.html index 12598da9e56..ff2e75fd95c 100644 --- a/public/app/panels/dashlist/editor.html +++ b/public/app/panels/dashlist/editor.html @@ -23,7 +23,7 @@ Query
  • -
  • From bfe5a56a47ec6380127b2f0435ebfe470c922a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 2 Jun 2015 12:52:31 +0200 Subject: [PATCH 239/398] Updated dashboard links editor, just changed With tag > With tags --- public/app/features/dashlinks/editor.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/dashlinks/editor.html b/public/app/features/dashlinks/editor.html index 69f2c067330..886550d9b9c 100644 --- a/public/app/features/dashlinks/editor.html +++ b/public/app/features/dashlinks/editor.html @@ -20,10 +20,10 @@
  • Type
  • - +
    • -
  • With tag
    • +
  • With tags
  • From 5c8b571c3f510c4cceeb0309c6b7291344acaa22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 2 Jun 2015 13:44:46 +0200 Subject: [PATCH 240/398] Fixed look of tag cloud in search --- public/app/partials/search.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/partials/search.html b/public/app/partials/search.html index 9eaa8d253d2..d4fc65afa38 100644 --- a/public/app/partials/search.html +++ b/public/app/partials/search.html @@ -33,7 +33,7 @@
    - + {{tag.term}}  ({{tag.count}}) From 7b69b789b8f8217236591a61bdbd396f6ae8fc26 Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Tue, 2 Jun 2015 16:45:44 +0100 Subject: [PATCH 241/398] Fixed typos --- README.md | 2 +- docs/sources/datasources/opentsdb.md | 2 +- docs/sources/guides/gettingstarted.md | 4 ++-- docs/sources/installation/configuration.md | 2 +- docs/sources/project/building_from_source.md | 2 +- docs/sources/reference/annotations.md | 4 ++-- docs/sources/reference/graph.md | 2 +- docs/sources/reference/http_api.md | 4 ++-- docs/sources/reference/scripting.md | 2 +- docs/sources/reference/timerange.md | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 5f0fb88b951..0a7db318338 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ go get github.com/grafana/grafana ``` cd $GOPATH/src/github.com/grafana/grafana go run build.go setup (only needed once to install godep) -godep restore (will pull down all golang lib dependecies in your current GOPATH) +godep restore (will pull down all golang lib dependencies in your current GOPATH) go build . ``` diff --git a/docs/sources/datasources/opentsdb.md b/docs/sources/datasources/opentsdb.md index 09b9f647a5f..4e85bdc9555 100644 --- a/docs/sources/datasources/opentsdb.md +++ b/docs/sources/datasources/opentsdb.md @@ -27,7 +27,7 @@ Open a graph in edit mode by click the title. ![](/img/v2/opentsdb_query_editor.png) -For details on opentsdb metric queries checkout the offical [OpenTSDB documentation](http://opentsdb.net/docs/build/html/index.html) +For details on opentsdb metric queries checkout the official [OpenTSDB documentation](http://opentsdb.net/docs/build/html/index.html) diff --git a/docs/sources/guides/gettingstarted.md b/docs/sources/guides/gettingstarted.md index b0037668f56..641dc9516f5 100644 --- a/docs/sources/guides/gettingstarted.md +++ b/docs/sources/guides/gettingstarted.md @@ -19,7 +19,7 @@ The image above shows you the top header for a dashboard. 1. Side menubar toggle: This toggles the side menu, allowing you to focus on the data presented in the dashboard. The side menu provides access to features unrelated to a Dashboard such as Users, Organizations, and Data Sources. 2. Dashboard dropdown: This dropdown shows you which Dashboard you are currently viewing, and allows you to easily switch to a new Dashboard. From here you can also create a new Dashboard, Import existing Dashboards, and manage Dashboard playlists. -3. Star Dashboard: Star (or unstar) the current Dashboar. Starred Dashboards will show up on your own Home Dashboard by default, and are a convenient way to mark Dashboards that you're interested in. +3. Star Dashboard: Star (or unstar) the current Dashboard. Starred Dashboards will show up on your own Home Dashboard by default, and are a convenient way to mark Dashboards that you're interested in. 4. Share Dashboard: Share the current dashboard by creating a link or create a static Snapshot of it. Make sure the Dashboard is saved before sharing. 5. Save dashboard: The current Dashboard will be saved with the current Dashboard name. 6. Settings: Manage Dashboard settings and features such as Templating and Annotations. @@ -28,7 +28,7 @@ The image above shows you the top header for a dashboard. Dashboards are at the core of what Grafana is all about. Dashboards are composed of individual Panels arranged on a number of Rows. By adjusting the display properties of Panels and Rows, you can customize the perfect Dashboard for your exact needs. Each panel can interact with data from any configured Grafana Data Source (currently InfluxDB, Graphite, OpenTSDB, and KairosDB). -This allows you to create a single dashboard that unifies the data across your organization. Panels use the time range specificed +This allows you to create a single dashboard that unifies the data across your organization. Panels use the time range specified in the main Time Picker in the upper right, but they can also have relative time overrides. diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index e27a3e80f6a..80ad5909a34 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -301,7 +301,7 @@ Secret. Specify these in the Grafana configuration file. For example: Restart the Grafana back-end. You should now see a Google login button on the login page. You can now login or sign up with your Google -accounts. The `allowed_domains` option is optional, and domains were seperated by space. +accounts. The `allowed_domains` option is optional, and domains were separated by space. You may allow users to sign-up via Google authentication by setting the `allow_sign_up` option to `true`. When this option is set to `true`, any diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md index 8466dbd2736..8401bf543de 100644 --- a/docs/sources/project/building_from_source.md +++ b/docs/sources/project/building_from_source.md @@ -72,4 +72,4 @@ You only need to add the options you want to override. Config files are applied ## Create a pull requests -Before or after your create a pull requests, sign the [contributor license aggrement](/docs/contributing/cla.html). +Before or after your create a pull requests, sign the [contributor license agreement](/docs/contributing/cla.html). diff --git a/docs/sources/reference/annotations.md b/docs/sources/reference/annotations.md index 41d7bf411a3..51c9ac1ba32 100644 --- a/docs/sources/reference/annotations.md +++ b/docs/sources/reference/annotations.md @@ -18,9 +18,9 @@ dropdown. This will open the `Annotations` edit view. Click the `Add` tab to add Graphite supports two ways to query annotations. - A regular metric query, use the `Graphite target expression` text input for this -- Graphite events query, use the `Graphite event tags` text input, especify an tag or wildcard (leave empty should also work) +- Graphite events query, use the `Graphite event tags` text input, specify an tag or wildcard (leave empty should also work) -## Elasticsearch annoations +## Elasticsearch annotations ![](/img/v2/annotations_es.png) Grafana can query any Elasticsearch index for annotation events. The index name can be the name of an alias or an index wildcard pattern. diff --git a/docs/sources/reference/graph.md b/docs/sources/reference/graph.md index 61bebd6b37b..9de23332a99 100644 --- a/docs/sources/reference/graph.md +++ b/docs/sources/reference/graph.md @@ -62,7 +62,7 @@ The ``Left Y`` and ``Right Y`` can be customized using: - ``Unit`` - The display unit for the Y value - ``Grid Max`` - The maximum Y value. (default auto) -- ``Grid Min`` - The minium Y value. (default auto) +- ``Grid Min`` - The minimum Y value. (default auto) - ``Label`` - The Y axis label (default "") Axes can also be hidden by unchecking the appropriate box from `Show Axis`. diff --git a/docs/sources/reference/http_api.md b/docs/sources/reference/http_api.md index d888071bd35..9e24ccb39d7 100644 --- a/docs/sources/reference/http_api.md +++ b/docs/sources/reference/http_api.md @@ -84,8 +84,8 @@ Status Codes: - **401** – Unauthorized - **412** – Precondition failed -The **412** status code is used when a newer dashboard already exists (newer, its version is greater than the verison that was sent). The -same status code is also used if another dashboar exists with the same title. The response body will look like this: +The **412** status code is used when a newer dashboard already exists (newer, its version is greater than the version that was sent). The +same status code is also used if another dashboard exists with the same title. The response body will look like this: HTTP/1.1 412 Precondition Failed Content-Type: application/json; charset=UTF-8 diff --git a/docs/sources/reference/scripting.md b/docs/sources/reference/scripting.md index 45158eeadcd..d896a2c7650 100644 --- a/docs/sources/reference/scripting.md +++ b/docs/sources/reference/scripting.md @@ -12,7 +12,7 @@ With scripted dashboards you can dynamically create your dashboards using javasc under `public/dashboards/` there is a file named `scripted.js`. This file contains an example of a scripted dashboard. You can access it by using the url: `http://grafana_url/dashboard/script/scripted.js?rows=3&name=myName` -If you open scripted.js you can see how it reads url paramters from ARGS variable and then adds rows and panels. +If you open scripted.js you can see how it reads url parameters from ARGS variable and then adds rows and panels. ## Example diff --git a/docs/sources/reference/timerange.md b/docs/sources/reference/timerange.md index 47c9186e119..d2f05f5a9d6 100644 --- a/docs/sources/reference/timerange.md +++ b/docs/sources/reference/timerange.md @@ -24,7 +24,7 @@ All of this applies to all Panels in the Dashboard (except those with Panel Time It's possible to customize the options displayed for relative time and the auto-refresh options. -From Dashboard setttings, click the Timepicker tab. From here you can specify the relative and auto refresh intervals. The Timepicker tab settings are saved on a per Dashboard basis. Entries are comma seperated and accept a number followed by one of the following units: s (seconds), m (minutes), h (hours), d (days), w (weeks), M (months), y (years). +From Dashboard settings, click the Timepicker tab. From here you can specify the relative and auto refresh intervals. The Timepicker tab settings are saved on a per Dashboard basis. Entries are comma separated and accept a number followed by one of the following units: s (seconds), m (minutes), h (hours), d (days), w (weeks), M (months), y (years). ![](/img/v1/timepicker_editor.png) From f582ac88b382f72f102b43aeab33a167454590c7 Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Tue, 2 Jun 2015 17:12:12 +0100 Subject: [PATCH 242/398] Fixed menu --- docs/mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 2ff90577f07..5024fd33afe 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -61,7 +61,7 @@ pages: - ['datasources/influxdb.md', 'Data Sources', 'InfluxDB'] - ['datasources/opentsdb.md', 'Data Sources', 'OpenTSDB'] -- ['project/building_from_source.md', 'Project', 'Building from souce'] +- ['project/building_from_source.md', 'Project', 'Building from source'] - ['project/cla.md', 'Project', 'Contributor License Agreement'] - ['jsearch.md', '**HIDDEN**'] From 483ef20527a2168628342b22b39fadbe1d6f60e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 28 May 2015 11:16:16 +0200 Subject: [PATCH 243/398] Reworking variable value dropdown, take3 --- public/app/directives/metric.segment.js | 2 +- public/app/directives/variableValueSelect.js | 96 ++++++++++++------- .../partials/variableValueSelect.html | 39 ++++---- .../features/templating/partials/editor.html | 70 +++++++------- public/css/less/submenu.less | 31 +++--- public/css/less/tightform.less | 3 +- 6 files changed, 133 insertions(+), 108 deletions(-) diff --git a/public/app/directives/metric.segment.js b/public/app/directives/metric.segment.js index 05bf7e485e3..4f5677ca3ed 100644 --- a/public/app/directives/metric.segment.js +++ b/public/app/directives/metric.segment.js @@ -68,7 +68,7 @@ function (angular, app, _, $) { else { // need to have long delay because the blur // happens long before the click event on the typeahead options - cancelBlur = setTimeout($scope.switchToLink, 350); + cancelBlur = setTimeout($scope.switchToLink, 50); } }; diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index fa0e56acebc..42724a79df9 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -10,23 +10,72 @@ function (angular, app, _) { angular .module('grafana.directives') .directive('variableValueSelect', function($compile, $window, $timeout) { + + function openDropdown(inputEl, linkEl) { + inputEl.css('width', (linkEl.width() + 16) + 'px'); + + linkEl.hide(); + inputEl.show(); + inputEl.focus(); + }; + return { scope: { variable: "=", onUpdated: "&" }, + templateUrl: 'app/features/dashboard/partials/variableValueSelect.html', + link: function(scope, elem) { var bodyEl = angular.element($window.document.body); + var linkEl = elem.find('.variable-value-link'); + var inputEl = elem.find('input'); var variable = scope.variable; + var cancelBlur = null; - scope.show = function() { - if (scope.selectorOpen) { - return; + scope.openDropdown = function() { + inputEl.show(); + linkEl.hide(); + scope.dropdownVisible = true; + + inputEl.css('width', (linkEl.width() + 16) + 'px'); + + linkEl.hide(); + inputEl.show(); + inputEl.focus(); + + $timeout(function() { bodyEl.on('click', scope.bodyOnClick); }, 0, false); + }; + + scope.switchToLink = function(now) { + if (now === true || cancelBlur) { + clearTimeout(cancelBlur); + cancelBlur = null; + inputEl.hide(); + linkEl.show(); + scope.dropdownVisible = false; + scope.$digest(); + + scope.updateLinkText(); + scope.onUpdated(); + } + else { + // need to have long delay because the blur + // happens long before the click event on the typeahead options + cancelBlur = setTimeout(scope.switchToLink, 50); } - scope.selectorOpen = true; - scope.giveFocus = 1; + bodyEl.off('click', scope.bodyOnClick); + }; + + scope.bodyOnClick = function(e) { + if (elem.has(e.target).length === 0) { + scope.switchToLink(); + } + }; + + scope.show = function() { scope.oldCurrentText = variable.current.text; scope.highlightIndex = -1; @@ -45,9 +94,7 @@ function (angular, app, _) { scope.search = {query: '', options: scope.options}; - $timeout(function() { - bodyEl.on('click', scope.bodyOnClick); - }, 0, false); + scope.openDropdown(); }; scope.queryChanged = function() { @@ -79,7 +126,7 @@ function (angular, app, _) { scope.optionSelected = function(option, event) { option.selected = !option.selected; - var hideAfter = true; + var hideAfter = false; var setAllExceptCurrentTo = function(newValue) { _.each(scope.options, function(other) { if (option !== other) { other.selected = newValue; } @@ -91,13 +138,10 @@ function (angular, app, _) { } else if (!variable.multi) { setAllExceptCurrentTo(false); - } else { - if (event.ctrlKey || event.metaKey || event.shiftKey) { - hideAfter = false; - } - else { - setAllExceptCurrentTo(false); - } + hideAfter = true; + } else if (event.ctrlKey || event.metaKey || event.shiftKey) { + hideAfter = true; + setAllExceptCurrentTo(false); } var selected = _.filter(scope.options, {selected: true}); @@ -124,23 +168,8 @@ function (angular, app, _) { variable.current.value = selected[0].value; } - scope.updateLinkText(); - scope.onUpdated(); - if (hideAfter) { - scope.hide(); - } - }; - - scope.hide = function() { - scope.selectorOpen = false; - bodyEl.off('click', scope.bodyOnClick); - }; - - scope.bodyOnClick = function(e) { - var dropdown = elem.find('.variable-value-dropdown'); - if (dropdown.has(e.target).length === 0) { - scope.$apply(scope.hide); + scope.switchToLink(); } }; @@ -152,6 +181,9 @@ function (angular, app, _) { scope.$watchGroup(['variable.hideLabel', 'variable.name', 'variable.label', 'variable.current.text'], function() { scope.updateLinkText(); }); + + linkEl.click(scope.openDropdown); + //inputEl.blur(scope.switchToLink); }, }; }); diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index 481f2734876..afa4bdbe649 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -1,35 +1,28 @@ - + {{labelText}}:
    - + {{linkText}} + -
    -
    - - - +
    +
    + + + + {{option.text}} +
    - -
    -
    - - {{option.text}} - - -
    -
    - - - {{tag}} - - -
    +
    + + + + {{tag}}    +
    diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index d1232c72dcf..99b50d45866 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -226,41 +226,41 @@
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    +
    +
    value groups/tags
    +
    +
      +
    • + tags query +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + tags values query +
      • +
    • + +
      • +
    +
    +
    +
    +
      +
    • + +
      • +
    +
    +
    +
    +
    diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index 4fefa50d5e7..a92cb163537 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -20,7 +20,7 @@ } .submenu-item { - padding: 8px 7px; +// padding: 8px 7px; margin-right: 20px; display: inline-block; border-radius: 3px; @@ -43,10 +43,10 @@ .variable-value-dropdown { position: absolute; - top: 27px; + top: 47px; min-width: 150px; max-height: 400px; - background: @grafanaPanelBackground; + background: @dropdownBackground; box-shadow: 0px 0px 55px 0px black; border: 1px solid @grafanaTargetFuncBackground; z-index: 1000; @@ -74,22 +74,23 @@ .variable-option, .variable-options-column-header { display: block; - padding: 0 27px 0 8px; + padding: 2px 27px 0 8px; position: relative; + white-space: nowrap; + min-width: 115px; - .variable-option-icon { display: none } + .variable-option-icon { + display: inline-block; + width: 24px; + height: 18px; + position: relative; + top: 4px; + background: url(@checkboxImageUrl) left top no-repeat; + } &.selected { - .variable-option-icon:before { - content: "\f00c"; - } - .variable-option-icon { - display: block; - padding-left: 4px; - line-height: 26px; - position: absolute; - right: 0; - top: 0; + .variable-option-icon{ + background: url(@checkboxImageUrl) 0px -18px no-repeat; } } } diff --git a/public/css/less/tightform.less b/public/css/less/tightform.less index 5bd9cda8f43..71457a62141 100644 --- a/public/css/less/tightform.less +++ b/public/css/less/tightform.less @@ -23,7 +23,7 @@ .tight-form-container-no-item-borders { border: 1px solid @grafanaTargetBorder; - .tight-form, .tight-form-item, [type=text].tight-form-input { + .tight-form, .tight-form-item, [type=text].tight-form-input, [type=text].tight-form-clear-input { border: none; } } @@ -132,7 +132,6 @@ input[type=text].tight-form-clear-input { border: none; margin: 0px; background: transparent; - float: left; color: @grafanaTargetColor; border-radius: 0; border-right: 1px solid @grafanaTargetSegmentBorder; From a433e0e79c10a74264b0d456f5596ef7c5092180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 28 May 2015 11:39:08 +0200 Subject: [PATCH 244/398] More work on variable dropdown --- public/app/directives/variableValueSelect.js | 27 +++++++++++++++----- public/app/features/templating/editorCtrl.js | 1 + 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index 42724a79df9..43c1014160e 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -115,7 +115,10 @@ function (angular, app, _) { scope.moveHighlight(-1); } if (evt.keyCode === 13) { - scope.optionSelected(scope.search.options[scope.highlightIndex], {}); + scope.optionSelected(scope.search.options[scope.highlightIndex], {}, true, false); + } + if (evt.keyCode === 32) { + scope.optionSelected(scope.search.options[scope.highlightIndex], {}, false, false); } }; @@ -123,24 +126,34 @@ function (angular, app, _) { scope.highlightIndex = (scope.highlightIndex + direction) % scope.search.options.length; }; - scope.optionSelected = function(option, event) { + scope.optionSelected = function(option, event, commitChange, excludeOthers) { + if (!option) { return; } + option.selected = !option.selected; - var hideAfter = false; + commitChange = commitChange || false; + excludeOthers = excludeOthers || false; + var setAllExceptCurrentTo = function(newValue) { _.each(scope.options, function(other) { if (option !== other) { other.selected = newValue; } }); }; - if (option.text === 'All') { + // commit action (enter key), should not deselect it + if (commitChange) { + option.selected = true; + } + + if (option.text === 'All' || excludeOthers) { setAllExceptCurrentTo(false); + commitChange = true; } else if (!variable.multi) { setAllExceptCurrentTo(false); - hideAfter = true; + commitChange = true; } else if (event.ctrlKey || event.metaKey || event.shiftKey) { - hideAfter = true; + commitChange = true; setAllExceptCurrentTo(false); } @@ -168,7 +181,7 @@ function (angular, app, _) { variable.current.value = selected[0].value; } - if (hideAfter) { + if (commitChange) { scope.switchToLink(); } }; diff --git a/public/app/features/templating/editorCtrl.js b/public/app/features/templating/editorCtrl.js index f48452e4569..aeb27b3c832 100644 --- a/public/app/features/templating/editorCtrl.js +++ b/public/app/features/templating/editorCtrl.js @@ -82,6 +82,7 @@ function (angular, _) { }; $scope.update = function() { + $scope.current.tags = []; if ($scope.isValid()) { $scope.runQuery().then(function() { $scope.reset(); From 9a741051037398f3937fe646694fd8d4709d24c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 28 May 2015 12:52:47 +0200 Subject: [PATCH 245/398] Trying out dark headers and footers for template dropdown --- public/app/directives/variableValueSelect.js | 5 ++- .../partials/variableValueSelect.html | 32 ++++++++++++------- public/css/less/submenu.less | 29 ++++++++++------- 3 files changed, 42 insertions(+), 24 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index 43c1014160e..e74564369c2 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -93,6 +93,7 @@ function (angular, app, _) { }); scope.search = {query: '', options: scope.options}; + scope.selectedValuesCount = currentValues.length; scope.openDropdown(); }; @@ -176,8 +177,10 @@ function (angular, app, _) { value: _.pluck(selected, 'value'), }; + scope.selectedValuesCount = variable.current.value.length; + // only single value - if (variable.current.value.length === 1) { + if (scope.selectedValuesCount === 1) { variable.current.value = selected[0].value; } diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index afa4bdbe649..3bbc5060c0e 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -10,19 +10,27 @@
    -
    - - - - {{option.text}} - +
    +
    +
    + Selected ({{selectedValuesCount}}) +
    + + + {{option.text}} + +
    +
    +
    Tags
    + + + {{tag}}    + +
    -
    - - - - {{tag}}    - +
    + Update / + Cancel
    diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index a92cb163537..de12ca4a108 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -46,7 +46,10 @@ top: 47px; min-width: 150px; max-height: 400px; + min-height: 150px; background: @dropdownBackground; + overflow-y: auto; + overflow-x: hidden; box-shadow: 0px 0px 55px 0px black; border: 1px solid @grafanaTargetFuncBackground; z-index: 1000; @@ -62,7 +65,6 @@ .variable-options-column { max-height: 350px; - overflow: auto; display: table-cell; line-height: 26px; &:nth-child(2) { @@ -95,22 +97,27 @@ } } +.variable-options-column-header { + background-color: @bodyBackground; + text-align: center; + padding-top: 5px; + padding-bottom: 5px; + margin-bottom: 5px; +} + +.variable-options-footer { + background-color: @bodyBackground; + text-align: center; + padding-top: 5px; + padding-bottom: 5px; +} + .variable-option { &:hover, &.highlighted { background-color: @blueDark; } } -.variable-search-wrapper { - input { - width: 100%; - padding: 7px 8px; - height: 100%; - box-sizing: border-box; - margin-bottom: 6px; - } -} - .dash-nav-link { color: @textColor; } From 0bd50c06d77015fa9826e6f082daac9b488b9f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 28 May 2015 13:02:01 +0200 Subject: [PATCH 246/398] Template varaible dropdown work --- .../features/dashboard/partials/variableValueSelect.html | 4 ---- public/css/less/submenu.less | 8 -------- 2 files changed, 12 deletions(-) diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index 3bbc5060c0e..de22c9cc54e 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -28,9 +28,5 @@
    -
    - Update / - Cancel -
    diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index de12ca4a108..cbdff413a0b 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -98,20 +98,12 @@ } .variable-options-column-header { - background-color: @bodyBackground; text-align: center; padding-top: 5px; padding-bottom: 5px; margin-bottom: 5px; } -.variable-options-footer { - background-color: @bodyBackground; - text-align: center; - padding-top: 5px; - padding-bottom: 5px; -} - .variable-option { &:hover, &.highlighted { background-color: @blueDark; From 7d25d6f1915e56477504416584ccdf8f48ad5d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 28 May 2015 18:38:53 +0200 Subject: [PATCH 247/398] progress on tag selection in variable dropdown --- public/app/directives/variableValueSelect.js | 47 ++++++++++++++++++- .../partials/variableValueSelect.html | 8 +++- public/app/features/templating/editorCtrl.js | 1 - public/css/less/overrides.less | 2 +- public/css/less/submenu.less | 3 ++ 5 files changed, 55 insertions(+), 6 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index e74564369c2..c22154f68a6 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -95,6 +95,12 @@ function (angular, app, _) { scope.search = {query: '', options: scope.options}; scope.selectedValuesCount = currentValues.length; + if (!scope.tags) { + scope.tags = _.map(variable.tags, function(value) { + return { text: value, selected: false }; + }); + } + scope.openDropdown(); }; @@ -158,11 +164,15 @@ function (angular, app, _) { setAllExceptCurrentTo(false); } + scope.selectionsChanged(option, commitChange); + }; + + scope.selectionsChanged = function(defaultItem, commitChange) { var selected = _.filter(scope.options, {selected: true}); if (selected.length === 0) { - option.selected = true; - selected = [option]; + defaultItem.selected = true; + selected = [defaultItem]; } if (selected.length > 1 && selected.length !== scope.options.length) { @@ -177,6 +187,18 @@ function (angular, app, _) { value: _.pluck(selected, 'value'), }; + var valuesNotInTag = _.filter(selected, function(test) { + for (var i = 0; i < scope.selectedTags.length; i++) { + var tag = scope.selectedTags[i]; + if (_.indexOf(tag.values, test.value) !== -1) { + return false; + } + } + return true; + }); + + variable.current.text = _.pluck(valuesNotInTag, 'text').join(', '); + scope.selectedValuesCount = variable.current.value.length; // only single value @@ -189,6 +211,27 @@ function (angular, app, _) { } }; + scope.selectTag = function(tag) { + tag.selected = !tag.selected; + if (!tag.values) { + if (tag.text === 'backend') { + tag.values = ['backend_01', 'backend_02', 'backend_03', 'backend_04']; + } else { + tag.values = ['web_server_01', 'web_server_02', 'web_server_03', 'web_server_04']; + } + console.log('querying for tag values'); + } + + _.each(scope.options, function(option) { + if (_.indexOf(tag.values, option.value) !== -1) { + option.selected = tag.selected; + } + }); + + scope.selectedTags = _.filter(scope.tags, {selected: true}); + scope.selectionsChanged(scope.options[0], false); + }; + scope.updateLinkText = function() { scope.labelText = variable.label || '$' + variable.name; scope.linkText = variable.current.text; diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index de22c9cc54e..bb4f0ac03e6 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -5,6 +5,10 @@
    Tags
    - + - {{tag}}    + {{tag.text}}   
    diff --git a/public/app/features/templating/editorCtrl.js b/public/app/features/templating/editorCtrl.js index aeb27b3c832..f48452e4569 100644 --- a/public/app/features/templating/editorCtrl.js +++ b/public/app/features/templating/editorCtrl.js @@ -82,7 +82,6 @@ function (angular, _) { }; $scope.update = function() { - $scope.current.tags = []; if ($scope.isValid()) { $scope.runQuery().then(function() { $scope.reset(); diff --git a/public/css/less/overrides.less b/public/css/less/overrides.less index b03cb7f7e6b..6ac6a385b60 100644 --- a/public/css/less/overrides.less +++ b/public/css/less/overrides.less @@ -542,7 +542,7 @@ div.flot-text { background-color: @purple; color: darken(@white, 5%); white-space: nowrap; - border-radius: 2px; + border-radius: 3px; text-shadow: none; font-size: 13px; padding: 2px 6px; diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index cbdff413a0b..e2d6b0639dd 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -39,6 +39,9 @@ .variable-value-link { font-size: 16px; padding-right: 10px; + .label-tag { + margin: 0 5px; + } } .variable-value-dropdown { From 6ed17fe62fe692a9a9961849b4c19653fc8efc3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 29 May 2015 08:21:44 +0200 Subject: [PATCH 248/398] Removed selection state for single select variables --- public/app/directives/variableValueSelect.js | 15 ++------ .../partials/variableValueSelect.html | 9 ++--- public/css/less/submenu.less | 34 +++++++++++-------- 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index c22154f68a6..f51c706bfe5 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -11,20 +11,8 @@ function (angular, app, _) { .module('grafana.directives') .directive('variableValueSelect', function($compile, $window, $timeout) { - function openDropdown(inputEl, linkEl) { - inputEl.css('width', (linkEl.width() + 16) + 'px'); - - linkEl.hide(); - inputEl.show(); - inputEl.focus(); - }; - return { - scope: { - variable: "=", - onUpdated: "&" - }, - + scope: { variable: "=", onUpdated: "&" }, templateUrl: 'app/features/dashboard/partials/variableValueSelect.html', link: function(scope, elem) { @@ -94,6 +82,7 @@ function (angular, app, _) { scope.search = {query: '', options: scope.options}; scope.selectedValuesCount = currentValues.length; + scope.selectedTags = scope.selectedTag || []; if (!scope.tags) { scope.tags = _.map(variable.tags, function(value) { diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index bb4f0ac03e6..303e1756033 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -2,7 +2,7 @@ {{labelText}}: -
    +
    {{linkText}} @@ -11,6 +11,7 @@ +
    @@ -19,12 +20,12 @@
    Selected ({{selectedValuesCount}})
    - - + + {{option.text}}
    -
    +
    Tags
    diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index e2d6b0639dd..7a4989545c5 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -44,6 +44,11 @@ } } +.variable-link-wrapper { + display: inline-block; + position: relative; +} + .variable-value-dropdown { position: absolute; top: 47px; @@ -57,7 +62,6 @@ border: 1px solid @grafanaTargetFuncBackground; z-index: 1000; font-size: @baseFontSize; - padding: 0; border-radius: 3px 3px 0 0; } @@ -84,20 +88,22 @@ white-space: nowrap; min-width: 115px; - .variable-option-icon { - display: inline-block; - width: 24px; - height: 18px; - position: relative; - top: 4px; - background: url(@checkboxImageUrl) left top no-repeat; - } + &.multi { + .variable-option-icon { + display: inline-block; + width: 24px; + height: 18px; + position: relative; + top: 4px; + background: url(@checkboxImageUrl) left top no-repeat; + } - &.selected { - .variable-option-icon{ - background: url(@checkboxImageUrl) 0px -18px no-repeat; - } - } + &.selected { + .variable-option-icon{ + background: url(@checkboxImageUrl) 0px -18px no-repeat; + } + } + } } .variable-options-column-header { From 6f783f5a3b8d434a73df35c9143c8b125e29612a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 29 May 2015 08:40:14 +0200 Subject: [PATCH 249/398] Single variable select state highlight fixed, Closes #2073 --- .../partials/variableValueSelect.html | 4 +- public/css/less/submenu.less | 42 +++++++++++-------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index 303e1756033..a910d647059 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -14,13 +14,13 @@ -
    +
    Selected ({{selectedValuesCount}})
    -     + {{option.text}} diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index 7a4989545c5..bd0a14da22f 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -55,7 +55,7 @@ min-width: 150px; max-height: 400px; min-height: 150px; - background: @dropdownBackground; + background-color: @dropdownBackground; overflow-y: auto; overflow-x: hidden; box-shadow: 0px 0px 55px 0px black; @@ -63,6 +63,29 @@ z-index: 1000; font-size: @baseFontSize; border-radius: 3px 3px 0 0; + + &.multi { + .variable-option-icon { + display: inline-block; + width: 24px; + height: 18px; + position: relative; + top: 4px; + background: url(@checkboxImageUrl) left top no-repeat; + } + + .selected { + .variable-option-icon{ + background: url(@checkboxImageUrl) 0px -18px no-repeat; + } + } + } + + &.single { + .selected { + background-color: @grafanaTargetFuncHightlight; + } + } } .variable-options-wrapper { @@ -87,23 +110,6 @@ position: relative; white-space: nowrap; min-width: 115px; - - &.multi { - .variable-option-icon { - display: inline-block; - width: 24px; - height: 18px; - position: relative; - top: 4px; - background: url(@checkboxImageUrl) left top no-repeat; - } - - &.selected { - .variable-option-icon{ - background: url(@checkboxImageUrl) 0px -18px no-repeat; - } - } - } } .variable-options-column-header { From 137cbe5bb4572959f0a8144fde7b43cc82a12543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 29 May 2015 10:00:53 +0200 Subject: [PATCH 250/398] work on variable multi select --- public/app/directives/variableValueSelect.js | 9 +++++- .../partials/variableValueSelect.html | 9 ++++-- public/css/less/submenu.less | 27 +++++++++++------- public/img/checkbox.png | Bin 870 -> 1461 bytes 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index f51c706bfe5..1b25544bb50 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -200,6 +200,14 @@ function (angular, app, _) { } }; + scope.clearSelections = function() { + _.each(scope.options, function(option) { + option.selected = false; + }); + + scope.selectionsChanged(scope.options[0], false); + }; + scope.selectTag = function(tag) { tag.selected = !tag.selected; if (!tag.values) { @@ -231,7 +239,6 @@ function (angular, app, _) { }); linkEl.click(scope.openDropdown); - //inputEl.blur(scope.switchToLink); }, }; }); diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index a910d647059..e0a4cf2f3c2 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -17,16 +17,19 @@
    -
    + + Selected ({{selectedValuesCount}}) -
    + {{option.text}}
    -
    Tags
    +
    + Tags +
    {{tag.text}}    diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index bd0a14da22f..6efcf4fe4aa 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -65,15 +65,6 @@ border-radius: 3px 3px 0 0; &.multi { - .variable-option-icon { - display: inline-block; - width: 24px; - height: 18px; - position: relative; - top: 4px; - background: url(@checkboxImageUrl) left top no-repeat; - } - .selected { .variable-option-icon{ background: url(@checkboxImageUrl) 0px -18px no-repeat; @@ -82,12 +73,24 @@ } &.single { + .variable-option-icon { + display: none; + } .selected { background-color: @grafanaTargetFuncHightlight; } } } +.variable-option-icon { + display: inline-block; + width: 24px; + height: 18px; + position: relative; + top: 4px; + background: url(@checkboxImageUrl) left top no-repeat; +} + .variable-options-wrapper { display: table; width: 100%; @@ -113,10 +116,14 @@ } .variable-options-column-header { - text-align: center; padding-top: 5px; padding-bottom: 5px; margin-bottom: 5px; + &.many-selected { + .variable-option-icon { + background: url(@checkboxImageUrl) 0px -36px no-repeat; + } + } } .variable-option { diff --git a/public/img/checkbox.png b/public/img/checkbox.png index 86927a0d3cb92195c21733c75ac0d047f35b9f93..a1256ec8b95ec93a31883140e5afafb09f4458d6 100644 GIT binary patch delta 1394 zcmV-&1&#XV2DJ;27aTeW1^@s6QuAUm00006VoOIv0RI600RN!9r<0K(9tz(D9S0vb zHHW!;kx3_i1szF5K~z}7?Uy@j990xR&->1Loe+Ou9Xl}?K?Dv#AW$L-gajcVXlQ6a z6qMo9pWeP%f|{>KuF}+vE%*E&U=?))|<7xc5DS` z;7LzfX?D)MdH23^@4(+U6ySH=GWjCN(@Low8@Wk;M9zYGd+OAQmw>bbyJd3n6>ID> z);Y8`Xsy--#VEuW$XYG3kiB~9#EEA+uv>TUsV0dpTI(=Iqm*VXoB$$`5F%ODqS;Jq zCx8C2f9bl7F%-2n7^5-9w$=Buh0-u zN3x;g6k@fTc>FK!5wRm%sbPM&;gm4Ygj3Z?xAc;JIiDD6K$xxBb8C{!yf zfjZUzNLwj``|e@l&=Gz(v%timBb|qT^a8n%5qc>Iz*)!4H(w)PeviNYCZ^9-JHVBo zf(Y6<8jZ#prA{gO6wDkuO#0iI4rC>$s1-?)T-mfqQlO~yGT?HMCP@lwnpQ72Z6rw& ziduDmD_68>(>m)YG@HyEI}AWU1ZO=Vgw2_DDRH&Y^tCID(wbJ*+PrC1nFT5Sy4n#-mIMCr>gkxuWaVkC-c8#%6VHmyVX0=iIu zwzj3cniymLTLD_3tVVlJ>|tXoBKUpxqi4_4KRm#;y?Y6b2I;~AcI#Gu{Jg;K9kd-pZmu03dfYmti=@|@Ya4XG?bbrH4>fJEftEI3C@`l+0q0$CmetBfK1 zdJ6sfFNk-jC?JA32U!LtkF3&p?ukUm0%_JFEth-L0BgZnP#WcQw+3>ncIDi}qF`_x=@#8<}T+Qx||r9ky?9@Um9= zj5Y=-6;g_ILC$%cv&7XZv5l`ho0>XXhwVS`Qz;CCq}B$dBtl49;XL5I!&*liSBauZ zdHU(Uo0iA5b2cfZLMe$-Y6&JgGi*5tphB;IS|4(4ToI$ z5<;}`VuF@okY6)@HNL~X0Oo6X^yyMsn%k^t0Pj5BJG>XQJX$Yl-BNdJky>kmbrxY| zEsuO#;GK{&b*(0M_gTKE6~~mY~7Y3 z)!Toq@tT#=x!%6C>g`XT1hJ#Nck^%X{6UoemH(@Kk!h`ew|_mKnR&Rt@Ql)x!{Aq%qLu-T93Z*nks-}H;vnZ<2cl-ngFa1X6?*5_I z5AK_;&dz(PtGoMR7$$0<+5)vC$<U@kp@uZ#VomrF{;J<>1;Op zK{i{o5Cjwo`L;lDsc49v z5k=%C#sElokI@0v+RrnsRFaO`4 Date: Fri, 29 May 2015 10:52:38 +0200 Subject: [PATCH 251/398] Breaking out logic for variable dropdown into a controller, this needs some unit tests --- public/app/directives/variableValueSelect.js | 367 +++++++++--------- .../partials/variableValueSelect.html | 22 +- public/css/less/submenu.less | 18 +- 3 files changed, 210 insertions(+), 197 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index 1b25544bb50..c2dd2f3fa51 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -8,24 +8,206 @@ function (angular, app, _) { 'use strict'; angular + .module('grafana.controllers') + .controller('VariableSelectCtrl', function($scope) { + var vm = this; + + vm.beforeDropdownShow = function() { + vm.oldCurrentText = vm.variable.current.text; + vm.highlightIndex = -1; + + var currentValues = vm.variable.current.value; + + if (_.isString(currentValues)) { + currentValues = [currentValues]; + } + + vm.options = _.map(vm.variable.options, function(option) { + if (_.indexOf(currentValues, option.value) >= 0) { + option.selected = true; + } + return option; + }); + + vm.search = {query: '', options: vm.options}; + vm.selectedValuesCount = currentValues.length; + vm.selectedTags = vm.selectedTag || []; + + if (!vm.tags) { + vm.tags = _.map(vm.variable.tags, function(value) { + return { text: value, selected: false }; + }); + } + }; + + vm.updateLinkText = function() { + vm.labelText = vm.variable.label || '$' + vm.variable.name; + vm.linkText = vm.variable.current.text; + }; + + vm.clearSelections = function() { + _.each(vm.options, function(option) { + option.selected = false; + }); + + vm.selectionsChanged(vm.options[0], false); + }; + + vm.selectTag = function(tag) { + tag.selected = !tag.selected; + if (!tag.values) { + if (tag.text === 'backend') { + tag.values = ['backend_01', 'backend_02', 'backend_03', 'backend_04']; + } else { + tag.values = ['web_server_01', 'web_server_02', 'web_server_03', 'web_server_04']; + } + console.log('querying for tag values'); + } + + _.each(vm.options, function(option) { + if (_.indexOf(tag.values, option.value) !== -1) { + option.selected = tag.selected; + } + }); + + vm.selectedTags = _.filter(vm.tags, {selected: true}); + vm.selectionsChanged(vm.options[0], false); + }; + + vm.keyDown = function (evt) { + if (evt.keyCode === 27) { + vm.hide(); + } + if (evt.keyCode === 40) { + vm.moveHighlight(1); + } + if (evt.keyCode === 38) { + vm.moveHighlight(-1); + } + if (evt.keyCode === 13) { + vm.optionSelected(vm.search.options[vm.highlightIndex], {}, true, false); + } + if (evt.keyCode === 32) { + vm.optionSelected(vm.search.options[vm.highlightIndex], {}, false, false); + } + }; + + vm.moveHighlight = function(direction) { + vm.highlightIndex = (vm.highlightIndex + direction) % vm.search.options.length; + }; + + vm.optionSelected = function(option, event, commitChange, excludeOthers) { + if (!option) { return; } + + option.selected = !option.selected; + + commitChange = commitChange || false; + excludeOthers = excludeOthers || false; + + var setAllExceptCurrentTo = function(newValue) { + _.each(vm.options, function(other) { + if (option !== other) { other.selected = newValue; } + }); + }; + + // commit action (enter key), should not deselect it + if (commitChange) { + option.selected = true; + } + + if (option.text === 'All' || excludeOthers) { + setAllExceptCurrentTo(false); + commitChange = true; + } + else if (!vm.variable.multi) { + setAllExceptCurrentTo(false); + commitChange = true; + } else if (event.ctrlKey || event.metaKey || event.shiftKey) { + commitChange = true; + setAllExceptCurrentTo(false); + } + + vm.selectionsChanged(option, commitChange); + }; + + vm.selectionsChanged = function(defaultItem, commitChange) { + var selected = _.filter(vm.options, {selected: true}); + + if (selected.length === 0) { + defaultItem.selected = true; + selected = [defaultItem]; + } + + if (selected.length > 1 && selected.length !== vm.options.length) { + if (selected[0].text === 'All') { + selected[0].selected = false; + selected = selected.slice(1, selected.length); + } + } + + vm.variable.current = { + text: _.pluck(selected, 'text').join(', '), + value: _.pluck(selected, 'value'), + }; + + var valuesNotInTag = _.filter(selected, function(test) { + for (var i = 0; i < vm.selectedTags.length; i++) { + var tag = vm.selectedTags[i]; + if (_.indexOf(tag.values, test.value) !== -1) { + return false; + } + } + return true; + }); + + vm.variable.current.text = _.pluck(valuesNotInTag, 'text').join(', '); + + vm.selectedValuesCount = vm.variable.current.value.length; + + // only single value + if (vm.selectedValuesCount === 1) { + vm.variable.current.value = selected[0].value; + } + + if (commitChange) { + vm.switchToLink(); + } + }; + + vm.queryChanged = function() { + vm.highlightIndex = -1; + vm.search.options = _.filter(vm.options, function(option) { + return option.text.toLowerCase().indexOf(vm.search.query.toLowerCase()) !== -1; + }); + }; + + $scope.$watchGroup(['vm.variable.hideLabel', 'vm.variable.name', 'vm.variable.label', 'vm.variable.current.text'], function() { + vm.updateLinkText(); + }); + + }); + + angular .module('grafana.directives') .directive('variableValueSelect', function($compile, $window, $timeout) { return { scope: { variable: "=", onUpdated: "&" }, templateUrl: 'app/features/dashboard/partials/variableValueSelect.html', - + controller: 'VariableSelectCtrl', + controllerAs: 'vm', + bindToController: true, link: function(scope, elem) { + var vm = scope.vm; var bodyEl = angular.element($window.document.body); var linkEl = elem.find('.variable-value-link'); var inputEl = elem.find('input'); - var variable = scope.variable; var cancelBlur = null; scope.openDropdown = function() { inputEl.show(); linkEl.hide(); - scope.dropdownVisible = true; + vm.dropdownVisible = true; inputEl.css('width', (linkEl.width() + 16) + 'px'); @@ -42,11 +224,12 @@ function (angular, app, _) { cancelBlur = null; inputEl.hide(); linkEl.show(); - scope.dropdownVisible = false; + + vm.dropdownVisible = false; scope.$digest(); - scope.updateLinkText(); - scope.onUpdated(); + scope.vm.updateLinkText(); + scope.vm.onUpdated(); } else { // need to have long delay because the blur @@ -64,180 +247,10 @@ function (angular, app, _) { }; scope.show = function() { - scope.oldCurrentText = variable.current.text; - scope.highlightIndex = -1; - - var currentValues = variable.current.value; - - if (_.isString(currentValues)) { - currentValues = [currentValues]; - } - - scope.options = _.map(variable.options, function(option) { - if (_.indexOf(currentValues, option.value) >= 0) { - option.selected = true; - } - return option; - }); - - scope.search = {query: '', options: scope.options}; - scope.selectedValuesCount = currentValues.length; - scope.selectedTags = scope.selectedTag || []; - - if (!scope.tags) { - scope.tags = _.map(variable.tags, function(value) { - return { text: value, selected: false }; - }); - } - + vm.beforeDropdownShow(); scope.openDropdown(); }; - scope.queryChanged = function() { - scope.highlightIndex = -1; - scope.search.options = _.filter(scope.options, function(option) { - return option.text.toLowerCase().indexOf(scope.search.query.toLowerCase()) !== -1; - }); - }; - - scope.keyDown = function (evt) { - if (evt.keyCode === 27) { - scope.hide(); - } - if (evt.keyCode === 40) { - scope.moveHighlight(1); - } - if (evt.keyCode === 38) { - scope.moveHighlight(-1); - } - if (evt.keyCode === 13) { - scope.optionSelected(scope.search.options[scope.highlightIndex], {}, true, false); - } - if (evt.keyCode === 32) { - scope.optionSelected(scope.search.options[scope.highlightIndex], {}, false, false); - } - }; - - scope.moveHighlight = function(direction) { - scope.highlightIndex = (scope.highlightIndex + direction) % scope.search.options.length; - }; - - scope.optionSelected = function(option, event, commitChange, excludeOthers) { - if (!option) { return; } - - option.selected = !option.selected; - - commitChange = commitChange || false; - excludeOthers = excludeOthers || false; - - var setAllExceptCurrentTo = function(newValue) { - _.each(scope.options, function(other) { - if (option !== other) { other.selected = newValue; } - }); - }; - - // commit action (enter key), should not deselect it - if (commitChange) { - option.selected = true; - } - - if (option.text === 'All' || excludeOthers) { - setAllExceptCurrentTo(false); - commitChange = true; - } - else if (!variable.multi) { - setAllExceptCurrentTo(false); - commitChange = true; - } else if (event.ctrlKey || event.metaKey || event.shiftKey) { - commitChange = true; - setAllExceptCurrentTo(false); - } - - scope.selectionsChanged(option, commitChange); - }; - - scope.selectionsChanged = function(defaultItem, commitChange) { - var selected = _.filter(scope.options, {selected: true}); - - if (selected.length === 0) { - defaultItem.selected = true; - selected = [defaultItem]; - } - - if (selected.length > 1 && selected.length !== scope.options.length) { - if (selected[0].text === 'All') { - selected[0].selected = false; - selected = selected.slice(1, selected.length); - } - } - - variable.current = { - text: _.pluck(selected, 'text').join(', '), - value: _.pluck(selected, 'value'), - }; - - var valuesNotInTag = _.filter(selected, function(test) { - for (var i = 0; i < scope.selectedTags.length; i++) { - var tag = scope.selectedTags[i]; - if (_.indexOf(tag.values, test.value) !== -1) { - return false; - } - } - return true; - }); - - variable.current.text = _.pluck(valuesNotInTag, 'text').join(', '); - - scope.selectedValuesCount = variable.current.value.length; - - // only single value - if (scope.selectedValuesCount === 1) { - variable.current.value = selected[0].value; - } - - if (commitChange) { - scope.switchToLink(); - } - }; - - scope.clearSelections = function() { - _.each(scope.options, function(option) { - option.selected = false; - }); - - scope.selectionsChanged(scope.options[0], false); - }; - - scope.selectTag = function(tag) { - tag.selected = !tag.selected; - if (!tag.values) { - if (tag.text === 'backend') { - tag.values = ['backend_01', 'backend_02', 'backend_03', 'backend_04']; - } else { - tag.values = ['web_server_01', 'web_server_02', 'web_server_03', 'web_server_04']; - } - console.log('querying for tag values'); - } - - _.each(scope.options, function(option) { - if (_.indexOf(tag.values, option.value) !== -1) { - option.selected = tag.selected; - } - }); - - scope.selectedTags = _.filter(scope.tags, {selected: true}); - scope.selectionsChanged(scope.options[0], false); - }; - - scope.updateLinkText = function() { - scope.labelText = variable.label || '$' + variable.name; - scope.linkText = variable.current.text; - }; - - scope.$watchGroup(['variable.hideLabel', 'variable.name', 'variable.label', 'variable.current.text'], function() { - scope.updateLinkText(); - }); - linkEl.click(scope.openDropdown); }, }; diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index e0a4cf2f3c2..411416fb767 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -1,36 +1,36 @@ - - {{labelText}}: + + {{vm.labelText}}:
    - {{linkText}} - + {{vm.linkText}} + {{tag.text}}     - + -
    +
    - + - Selected ({{selectedValuesCount}}) + Selected ({{vm.selectedValuesCount}}) - + {{option.text}}
    -
    +
    Tags
    - + {{tag.text}}    diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index 6efcf4fe4aa..dde7dae481a 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -82,15 +82,6 @@ } } -.variable-option-icon { - display: inline-block; - width: 24px; - height: 18px; - position: relative; - top: 4px; - background: url(@checkboxImageUrl) left top no-repeat; -} - .variable-options-wrapper { display: table; width: 100%; @@ -126,6 +117,15 @@ } } +.variable-option-icon { + display: inline-block; + width: 24px; + height: 18px; + position: relative; + top: 4px; + background: url(@checkboxImageUrl) left top no-repeat; +} + .variable-option { &:hover, &.highlighted { background-color: @blueDark; From 53ed407448afa8addbaba1f40858472db87375d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 29 May 2015 11:50:24 +0200 Subject: [PATCH 252/398] Lots of refactoring of variable dropdown trying to clean up code and make it unit testable --- public/app/directives/variableValueSelect.js | 86 ++++++++++--------- .../partials/variableValueSelect.html | 6 +- public/app/features/dashboard/submenuCtrl.js | 4 +- public/app/partials/submenu.html | 3 + public/test/specs/selectDropdownCtrl-specs.js | 32 +++++++ public/test/test-main.js | 1 + 6 files changed, 86 insertions(+), 46 deletions(-) create mode 100644 public/test/specs/selectDropdownCtrl-specs.js diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index c2dd2f3fa51..173429a8a1f 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -9,10 +9,10 @@ function (angular, app, _) { angular .module('grafana.controllers') - .controller('VariableSelectCtrl', function($scope) { + .controller('SelectDropdownCtrl', function() { var vm = this; - vm.beforeDropdownShow = function() { + vm.show = function() { vm.oldCurrentText = vm.variable.current.text; vm.highlightIndex = -1; @@ -38,10 +38,11 @@ function (angular, app, _) { return { text: value, selected: false }; }); } + + vm.dropdownVisible = true; }; vm.updateLinkText = function() { - vm.labelText = vm.variable.label || '$' + vm.variable.name; vm.linkText = vm.variable.current.text; }; @@ -50,7 +51,7 @@ function (angular, app, _) { option.selected = false; }); - vm.selectionsChanged(vm.options[0], false); + vm.selectionsChanged(false); }; vm.selectTag = function(tag) { @@ -71,7 +72,7 @@ function (angular, app, _) { }); vm.selectedTags = _.filter(vm.tags, {selected: true}); - vm.selectionsChanged(vm.options[0], false); + vm.selectionsChanged(false); }; vm.keyDown = function (evt) { @@ -127,17 +128,12 @@ function (angular, app, _) { setAllExceptCurrentTo(false); } - vm.selectionsChanged(option, commitChange); + vm.selectionsChanged(commitChange); }; - vm.selectionsChanged = function(defaultItem, commitChange) { + vm.selectionsChanged = function(commitChange) { var selected = _.filter(vm.options, {selected: true}); - if (selected.length === 0) { - defaultItem.selected = true; - selected = [defaultItem]; - } - if (selected.length > 1 && selected.length !== vm.options.length) { if (selected[0].text === 'All') { selected[0].selected = false; @@ -170,10 +166,22 @@ function (angular, app, _) { } if (commitChange) { - vm.switchToLink(); + vm.commitChanges(); } }; + vm.commitChanges = function() { + // make sure one option is selected + var selected = _.filter(vm.options, {selected: true}); + if (selected.length === 0) { + vm.options[0].selected = true; + vm.selectionsChanged(false); + } + + vm.dropdownVisible = false; + vm.updateLinkText(); + }; + vm.queryChanged = function() { vm.highlightIndex = -1; vm.search.options = _.filter(vm.options, function(option) { @@ -181,9 +189,9 @@ function (angular, app, _) { }); }; - $scope.$watchGroup(['vm.variable.hideLabel', 'vm.variable.name', 'vm.variable.label', 'vm.variable.current.text'], function() { + vm.init = function() { vm.updateLinkText(); - }); + }; }); @@ -194,64 +202,62 @@ function (angular, app, _) { return { scope: { variable: "=", onUpdated: "&" }, templateUrl: 'app/features/dashboard/partials/variableValueSelect.html', - controller: 'VariableSelectCtrl', + controller: 'SelectDropdownCtrl', controllerAs: 'vm', bindToController: true, link: function(scope, elem) { - var vm = scope.vm; var bodyEl = angular.element($window.document.body); var linkEl = elem.find('.variable-value-link'); var inputEl = elem.find('input'); var cancelBlur = null; - scope.openDropdown = function() { + function openDropdown() { + inputEl.css('width', Math.max(linkEl.width(), 30) + 'px'); + inputEl.show(); linkEl.hide(); - vm.dropdownVisible = true; - - inputEl.css('width', (linkEl.width() + 16) + 'px'); linkEl.hide(); inputEl.show(); inputEl.focus(); - $timeout(function() { bodyEl.on('click', scope.bodyOnClick); }, 0, false); - }; + $timeout(function() { bodyEl.on('click', bodyOnClick); }, 0, false); + } - scope.switchToLink = function(now) { + function switchToLink(now) { if (now === true || cancelBlur) { clearTimeout(cancelBlur); cancelBlur = null; inputEl.hide(); linkEl.show(); - vm.dropdownVisible = false; - scope.$digest(); - - scope.vm.updateLinkText(); - scope.vm.onUpdated(); - } + } else { // need to have long delay because the blur // happens long before the click event on the typeahead options cancelBlur = setTimeout(scope.switchToLink, 50); } - bodyEl.off('click', scope.bodyOnClick); - }; + bodyEl.off('click', bodyOnClick); + } - scope.bodyOnClick = function(e) { + function bodyOnClick (e) { if (elem.has(e.target).length === 0) { - scope.switchToLink(); + scope.$apply(function() { + scope.vm.commitChanges(); + }); } - }; + } - scope.show = function() { - vm.beforeDropdownShow(); - scope.openDropdown(); - }; + scope.$watch('vm.dropdownVisible', function(newValue) { + if (newValue) { + openDropdown(); + } { + switchToLink(); + } + }); - linkEl.click(scope.openDropdown); + scope.vm.init(); }, }; }); diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index 411416fb767..169e868337b 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -1,9 +1,5 @@ - - {{vm.labelText}}: - -
    - + {{vm.linkText}} {{tag.text}} diff --git a/public/app/features/dashboard/submenuCtrl.js b/public/app/features/dashboard/submenuCtrl.js index 545fed01d23..84764ef7f31 100644 --- a/public/app/features/dashboard/submenuCtrl.js +++ b/public/app/features/dashboard/submenuCtrl.js @@ -17,8 +17,10 @@ function (angular, _) { $scope.init = function() { $scope.panel = $scope.pulldown; $scope.row = $scope.pulldown; - $scope.variables = $scope.dashboard.templating.list; $scope.annotations = $scope.dashboard.templating.list; + $scope.variables = _.map($scope.dashboard.templating.list, function(variable) { + return variable; + }); }; $scope.disableAnnotation = function (annotation) { diff --git a/public/app/partials/submenu.html b/public/app/partials/submenu.html index 0de2bb1adc4..3e99f21dd86 100644 --- a/public/app/partials/submenu.html +++ b/public/app/partials/submenu.html @@ -3,6 +3,9 @@
    • + + {{variable.label || variable.name}}: +
    diff --git a/public/test/specs/selectDropdownCtrl-specs.js b/public/test/specs/selectDropdownCtrl-specs.js new file mode 100644 index 00000000000..bd9f0919d20 --- /dev/null +++ b/public/test/specs/selectDropdownCtrl-specs.js @@ -0,0 +1,32 @@ +define([ + 'directives/variableValueSelect', +], +function () { + 'use strict'; + + + describe("SelectDropdownCtrl", function() { + var scope; + var ctrl; + + beforeEach(module('grafana.controllers')); + beforeEach(inject(function($controller, $rootScope) { + scope = $rootScope.$new(); + ctrl = $controller('SelectDropdownCtrl', {$scope: scope}); + })); + + describe("Given simple variable", function() { + beforeEach(function() { + ctrl.variable = {current: {text: 'hej', value: 'hej' }}; + ctrl.init(); + }); + + it("Should init labelText and linkText", function() { + expect(ctrl.linkText).to.be("hej"); + }); + + }); + + }); + +}); diff --git a/public/test/test-main.js b/public/test/test-main.js index f064b81bab2..6b62df02102 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -144,6 +144,7 @@ require([ 'specs/singlestat-specs', 'specs/dynamicDashboardSrv-specs', 'specs/unsavedChangesSrv-specs', + 'specs/selectDropdownCtrl-specs', ]; var pluginSpecs = (config.plugins.specs || []).map(function (spec) { From 0992b6a616fd575e3593ff174e493b1009a753b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 29 May 2015 14:53:16 +0200 Subject: [PATCH 253/398] Progress on template variable dropdown, lots of unit tests for selection behavior, --- public/app/directives/variableValueSelect.js | 78 +++++++++---------- public/app/features/dashboard/submenuCtrl.js | 4 + public/app/partials/submenu.html | 2 +- public/test/specs/selectDropdownCtrl-specs.js | 74 +++++++++++++++++- 4 files changed, 114 insertions(+), 44 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index 173429a8a1f..f77510afc0d 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -9,7 +9,7 @@ function (angular, app, _) { angular .module('grafana.controllers') - .controller('SelectDropdownCtrl', function() { + .controller('SelectDropdownCtrl', function($q) { var vm = this; vm.show = function() { @@ -56,23 +56,29 @@ function (angular, app, _) { vm.selectTag = function(tag) { tag.selected = !tag.selected; + var tagValuesPromise; if (!tag.values) { - if (tag.text === 'backend') { - tag.values = ['backend_01', 'backend_02', 'backend_03', 'backend_04']; - } else { - tag.values = ['web_server_01', 'web_server_02', 'web_server_03', 'web_server_04']; - } - console.log('querying for tag values'); + tagValuesPromise = vm.getValuesForTag({tagKey: tag.text}); + // if (tag.text === 'backend') { + // tag.values = ['backend_01', 'backend_02', 'backend_03', 'backend_04']; + // } else { + // tag.values = ['web_server_01', 'web_server_02', 'web_server_03', 'web_server_04']; + // } + } else { + tagValuesPromise = $q.when(tag.values); } - _.each(vm.options, function(option) { - if (_.indexOf(tag.values, option.value) !== -1) { - option.selected = tag.selected; - } - }); + tagValuesPromise.then(function(values) { + tag.values = values; + _.each(vm.options, function(option) { + if (_.indexOf(tag.values, option.value) !== -1) { + option.selected = tag.selected; + } + }); - vm.selectedTags = _.filter(vm.tags, {selected: true}); - vm.selectionsChanged(false); + vm.selectedTags = _.filter(vm.tags, {selected: true}); + vm.selectionsChanged(false); + }); }; vm.keyDown = function (evt) { @@ -141,10 +147,16 @@ function (angular, app, _) { } } - vm.variable.current = { - text: _.pluck(selected, 'text').join(', '), - value: _.pluck(selected, 'value'), - }; + // validate selected tags + _.each(vm.selectedTags, function(tag) { + _.each(tag.values, function(value) { + if (!_.findWhere(selected, {value: value})) { + tag.selected = false; + } + }); + }); + + vm.selectedTags = _.filter(vm.tags, {selected: true}); var valuesNotInTag = _.filter(selected, function(test) { for (var i = 0; i < vm.selectedTags.length; i++) { @@ -156,8 +168,9 @@ function (angular, app, _) { return true; }); + vm.variable.current = {}; + vm.variable.current.value = _.pluck(selected, 'value'); vm.variable.current.text = _.pluck(valuesNotInTag, 'text').join(', '); - vm.selectedValuesCount = vm.variable.current.value.length; // only single value @@ -195,12 +208,12 @@ function (angular, app, _) { }); - angular + angular .module('grafana.directives') .directive('variableValueSelect', function($compile, $window, $timeout) { return { - scope: { variable: "=", onUpdated: "&" }, + scope: { variable: "=", onUpdated: "&", getValuesForTag: "&" }, templateUrl: 'app/features/dashboard/partials/variableValueSelect.html', controller: 'SelectDropdownCtrl', controllerAs: 'vm', @@ -209,7 +222,6 @@ function (angular, app, _) { var bodyEl = angular.element($window.document.body); var linkEl = elem.find('.variable-value-link'); var inputEl = elem.find('input'); - var cancelBlur = null; function openDropdown() { inputEl.css('width', Math.max(linkEl.width(), 30) + 'px'); @@ -217,27 +229,13 @@ function (angular, app, _) { inputEl.show(); linkEl.hide(); - linkEl.hide(); - inputEl.show(); inputEl.focus(); - $timeout(function() { bodyEl.on('click', bodyOnClick); }, 0, false); } - function switchToLink(now) { - if (now === true || cancelBlur) { - clearTimeout(cancelBlur); - cancelBlur = null; - inputEl.hide(); - linkEl.show(); - - } - else { - // need to have long delay because the blur - // happens long before the click event on the typeahead options - cancelBlur = setTimeout(scope.switchToLink, 50); - } - + function switchToLink() { + inputEl.hide(); + linkEl.show(); bodyEl.off('click', bodyOnClick); } @@ -252,7 +250,7 @@ function (angular, app, _) { scope.$watch('vm.dropdownVisible', function(newValue) { if (newValue) { openDropdown(); - } { + } else { switchToLink(); } }); diff --git a/public/app/features/dashboard/submenuCtrl.js b/public/app/features/dashboard/submenuCtrl.js index 84764ef7f31..6f423ebbe59 100644 --- a/public/app/features/dashboard/submenuCtrl.js +++ b/public/app/features/dashboard/submenuCtrl.js @@ -28,6 +28,10 @@ function (angular, _) { $rootScope.$broadcast('refresh'); }; + $scope.getValuesForTag = function() { + return $q.when(['backend_01', 'backend_02']); + }; + $scope.variableUpdated = function(variable) { templateValuesSrv.variableUpdated(variable).then(function() { dynamicDashboardSrv.update($scope.dashboard); diff --git a/public/app/partials/submenu.html b/public/app/partials/submenu.html index 3e99f21dd86..43a5581e0b5 100644 --- a/public/app/partials/submenu.html +++ b/public/app/partials/submenu.html @@ -6,7 +6,7 @@ {{variable.label || variable.name}}: - +
    • diff --git a/public/test/specs/selectDropdownCtrl-specs.js b/public/test/specs/selectDropdownCtrl-specs.js index bd9f0919d20..c919b3b8bee 100644 --- a/public/test/specs/selectDropdownCtrl-specs.js +++ b/public/test/specs/selectDropdownCtrl-specs.js @@ -8,11 +8,17 @@ function () { describe("SelectDropdownCtrl", function() { var scope; var ctrl; + var tagValuesMap = {}; + var rootScope; beforeEach(module('grafana.controllers')); - beforeEach(inject(function($controller, $rootScope) { + beforeEach(inject(function($controller, $rootScope, $q) { + rootScope = $rootScope; scope = $rootScope.$new(); ctrl = $controller('SelectDropdownCtrl', {$scope: scope}); + ctrl.getValuesForTag = function(obj) { + return $q.when(tagValuesMap[obj.tagKey]); + }; })); describe("Given simple variable", function() { @@ -24,9 +30,71 @@ function () { it("Should init labelText and linkText", function() { expect(ctrl.linkText).to.be("hej"); }); - }); - }); + describe("Given variable with tags and dropdown is opened", function() { + beforeEach(function() { + ctrl.variable = { + current: {text: 'hej', value: 'hej'}, + options: [ + {text: 'server-1', value: 'server-1'}, + {text: 'server-2', value: 'server-2'}, + {text: 'server-3', value: 'server-3'}, + ], + tags: ["key1", "key2", "key3"] + }; + tagValuesMap.key1 = ['server-1', 'server-3']; + tagValuesMap.key2 = ['server-2', 'server-3']; + tagValuesMap.key3 = ['server-1', 'server-2', 'server-3']; + ctrl.init(); + ctrl.show(); + }); + it("should init tags model", function() { + expect(ctrl.tags.length).to.be(3); + expect(ctrl.tags[0].text).to.be("key1"); + }); + + it("should init options model", function() { + expect(ctrl.options.length).to.be(3); + }); + + describe('When tag is selected', function() { + beforeEach(function() { + ctrl.selectTag(ctrl.tags[0]); + rootScope.$digest(); + }); + + it("should select tag", function() { + expect(ctrl.selectedTags.length).to.be(1); + }); + + it("should select values", function() { + expect(ctrl.options[0].selected).to.be(true); + expect(ctrl.options[2].selected).to.be(true); + }); + + describe('and then unselected', function() { + beforeEach(function() { + ctrl.selectTag(ctrl.tags[0]); + rootScope.$digest(); + }); + + it("should deselect tag", function() { + expect(ctrl.selectedTags.length).to.be(0); + }); + }); + + describe('and then value is unselected', function() { + beforeEach(function() { + ctrl.optionSelected(ctrl.options[0]); + }); + + it("should deselect tag", function() { + expect(ctrl.selectedTags.length).to.be(0); + }); + }); + }); + }); + }); }); From 650d3d504687bfb4934890a96017f0bef8eddf05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 29 May 2015 17:51:07 +0200 Subject: [PATCH 254/398] Fixed tag selection issues --- public/app/directives/variableValueSelect.js | 6 ++---- public/app/features/templating/templateValuesSrv.js | 2 +- public/test/specs/selectDropdownCtrl-specs.js | 12 ++++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index f77510afc0d..41f8d5b1322 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -31,7 +31,7 @@ function (angular, app, _) { vm.search = {query: '', options: vm.options}; vm.selectedValuesCount = currentValues.length; - vm.selectedTags = vm.selectedTag || []; + vm.selectedTags = vm.selectedTags || []; if (!vm.tags) { vm.tags = _.map(vm.variable.tags, function(value) { @@ -76,7 +76,6 @@ function (angular, app, _) { } }); - vm.selectedTags = _.filter(vm.tags, {selected: true}); vm.selectionsChanged(false); }); }; @@ -168,10 +167,9 @@ function (angular, app, _) { return true; }); - vm.variable.current = {}; vm.variable.current.value = _.pluck(selected, 'value'); vm.variable.current.text = _.pluck(valuesNotInTag, 'text').join(', '); - vm.selectedValuesCount = vm.variable.current.value.length; + vm.selectedValuesCount = selected.length; // only single value if (vm.selectedValuesCount === 1) { diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 7330be1b5cd..2fd17f4aa65 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -78,7 +78,7 @@ function (angular, _, kbn) { }; this.setVariableValue = function(variable, option) { - variable.current = option; + variable.current = angular.copy(option); templateSrv.updateTemplateData(); return this.updateOptionsInChildVariables(variable); }; diff --git a/public/test/specs/selectDropdownCtrl-specs.js b/public/test/specs/selectDropdownCtrl-specs.js index c919b3b8bee..968320b8e4f 100644 --- a/public/test/specs/selectDropdownCtrl-specs.js +++ b/public/test/specs/selectDropdownCtrl-specs.js @@ -74,6 +74,18 @@ function () { expect(ctrl.options[2].selected).to.be(true); }); + describe('and then dropdown is opened and closed without changes', function() { + beforeEach(function() { + ctrl.show(); + ctrl.commitChanges(); + rootScope.$digest(); + }); + + it("should still have selected tag", function() { + expect(ctrl.selectedTags.length).to.be(1); + }); + }); + describe('and then unselected', function() { beforeEach(function() { ctrl.selectTag(ctrl.tags[0]); From f48d0fcb13b193e5006b2bb54b7a6877eb7fa27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 30 May 2015 09:34:11 +0200 Subject: [PATCH 255/398] More work on tags in variable dropdown, now the actual tag values query is hooked up and works, #2080 --- public/app/directives/variableValueSelect.js | 5 ++++- public/app/features/dashboard/submenuCtrl.js | 8 +++----- .../features/templating/partials/editor.html | 20 +++++++++---------- .../features/templating/templateValuesSrv.js | 11 ++++++++++ public/app/partials/submenu.html | 2 +- 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index 41f8d5b1322..bdc914c144d 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -13,7 +13,7 @@ function (angular, app, _) { var vm = this; vm.show = function() { - vm.oldCurrentText = vm.variable.current.text; + vm.oldLinkText = vm.variable.current.text; vm.highlightIndex = -1; var currentValues = vm.variable.current.value; @@ -44,6 +44,9 @@ function (angular, app, _) { vm.updateLinkText = function() { vm.linkText = vm.variable.current.text; + if (vm.oldLinkText && vm.oldLinkText !== vm.linkText) { + vm.onUpdated(); + } }; vm.clearSelections = function() { diff --git a/public/app/features/dashboard/submenuCtrl.js b/public/app/features/dashboard/submenuCtrl.js index 6f423ebbe59..b8e609c061e 100644 --- a/public/app/features/dashboard/submenuCtrl.js +++ b/public/app/features/dashboard/submenuCtrl.js @@ -18,9 +18,7 @@ function (angular, _) { $scope.panel = $scope.pulldown; $scope.row = $scope.pulldown; $scope.annotations = $scope.dashboard.templating.list; - $scope.variables = _.map($scope.dashboard.templating.list, function(variable) { - return variable; - }); + $scope.variables = $scope.dashboard.templating.list; }; $scope.disableAnnotation = function (annotation) { @@ -28,8 +26,8 @@ function (angular, _) { $rootScope.$broadcast('refresh'); }; - $scope.getValuesForTag = function() { - return $q.when(['backend_01', 'backend_02']); + $scope.getValuesForTag = function(variable, tagKey) { + return templateValuesSrv.getValuesForTag(variable, tagKey); }; $scope.variableUpdated = function(variable) { diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index 99b50d45866..382790e0f21 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -228,25 +228,25 @@
    -
    value groups/tags
    -
    +
    Value groups/tags
    +
      -
    • - tags query +
    • + Tags query
    • - +
    -
    +
      -
    • - tags values query +
    • + Tag values query
    • - +
    @@ -254,7 +254,7 @@
    • - +
    diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 2fd17f4aa65..8b61b40688d 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -154,6 +154,17 @@ function (angular, _, kbn) { }); }; + this.getValuesForTag = function(variable, tagKey) { + return datasourceSrv.get(variable.datasource).then(function(datasource) { + var query = variable.tagValuesQuery.replace('$tag', tagKey); + return datasource.metricFindQuery(query).then(function (results) { + return _.map(results, function(value) { + return value.text; + }); + }); + }); + }; + this.metricNamesToVariableValues = function(variable, metricNames) { var regex, options, i, matches; options = {}; // use object hash to remove duplicates diff --git a/public/app/partials/submenu.html b/public/app/partials/submenu.html index 43a5581e0b5..5f5d29e87ba 100644 --- a/public/app/partials/submenu.html +++ b/public/app/partials/submenu.html @@ -6,7 +6,7 @@ {{variable.label || variable.name}}: - + From b5a846154a3ca821c4f781591987c2cc295e7c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Jun 2015 10:43:25 +0200 Subject: [PATCH 256/398] Trying to make progres on persisting selection state, restoring selection state for new multi variable dropdown, proving to be really complex --- public/app/directives/variableValueSelect.js | 88 +++++++++---------- .../partials/variableValueSelect.html | 4 +- .../features/templating/templateValuesSrv.js | 4 + public/test/specs/selectDropdownCtrl-specs.js | 33 ++++++- 4 files changed, 79 insertions(+), 50 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index bdc914c144d..0c3ff0e3507 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -13,24 +13,20 @@ function (angular, app, _) { var vm = this; vm.show = function() { - vm.oldLinkText = vm.variable.current.text; + vm.oldVariableText = vm.variable.current.text; vm.highlightIndex = -1; var currentValues = vm.variable.current.value; - if (_.isString(currentValues)) { currentValues = [currentValues]; } vm.options = _.map(vm.variable.options, function(option) { - if (_.indexOf(currentValues, option.value) >= 0) { - option.selected = true; - } + if (_.indexOf(currentValues, option.value) >= 0) { option.selected = true; } return option; }); - vm.search = {query: '', options: vm.options}; - vm.selectedValuesCount = currentValues.length; + vm.selectedValues = _.filter(vm.options, {selected: true}); vm.selectedTags = vm.selectedTags || []; if (!vm.tags) { @@ -39,14 +35,26 @@ function (angular, app, _) { }); } + vm.search = {query: '', options: vm.options}; vm.dropdownVisible = true; }; vm.updateLinkText = function() { + // var currentValues = vm.variable.current.text; + // + // if (vm.variable.current.tags) { + // selectedOptions = _.filter(selectedOptions, function(test) { + // for (var i = 0; i < vm.variable.current.tags; i++) { + // var tag = vm.selectedTags[i]; + // if (_.indexOf(tag.values, test.text) !== -1) { + // return false; + // } + // } + // return true; + // }); + // } + // vm.linkText = vm.variable.current.text; - if (vm.oldLinkText && vm.oldLinkText !== vm.linkText) { - vm.onUpdated(); - } }; vm.clearSelections = function() { @@ -62,17 +70,13 @@ function (angular, app, _) { var tagValuesPromise; if (!tag.values) { tagValuesPromise = vm.getValuesForTag({tagKey: tag.text}); - // if (tag.text === 'backend') { - // tag.values = ['backend_01', 'backend_02', 'backend_03', 'backend_04']; - // } else { - // tag.values = ['web_server_01', 'web_server_02', 'web_server_03', 'web_server_04']; - // } } else { tagValuesPromise = $q.when(tag.values); } tagValuesPromise.then(function(values) { tag.values = values; + tag.valuesText = values.join(', '); _.each(vm.options, function(option) { if (_.indexOf(tag.values, option.value) !== -1) { option.selected = tag.selected; @@ -105,7 +109,7 @@ function (angular, app, _) { vm.highlightIndex = (vm.highlightIndex + direction) % vm.search.options.length; }; - vm.optionSelected = function(option, event, commitChange, excludeOthers) { + vm.selectValue = function(option, event, commitChange, excludeOthers) { if (!option) { return; } option.selected = !option.selected; @@ -140,43 +144,34 @@ function (angular, app, _) { }; vm.selectionsChanged = function(commitChange) { - var selected = _.filter(vm.options, {selected: true}); + vm.selectedValues = _.filter(vm.options, {selected: true}); - if (selected.length > 1 && selected.length !== vm.options.length) { - if (selected[0].text === 'All') { - selected[0].selected = false; - selected = selected.slice(1, selected.length); + if (vm.selectedValues.length > 1 && vm.selectedValues.length !== vm.options.length) { + if (vm.selectedValues[0].text === 'All') { + vm.selectedValues[0].selected = false; + vm.selectedValues = vm.selectedValues.slice(1, vm.selectedValues.length); } } // validate selected tags - _.each(vm.selectedTags, function(tag) { - _.each(tag.values, function(value) { - if (!_.findWhere(selected, {value: value})) { - tag.selected = false; - } - }); + _.each(vm.tags, function(tag) { + if (tag.selected) { + _.each(tag.values, function(value) { + if (!_.findWhere(vm.selectedValues, {value: value})) { + tag.selected = false; + } + }); + } }); vm.selectedTags = _.filter(vm.tags, {selected: true}); - - var valuesNotInTag = _.filter(selected, function(test) { - for (var i = 0; i < vm.selectedTags.length; i++) { - var tag = vm.selectedTags[i]; - if (_.indexOf(tag.values, test.value) !== -1) { - return false; - } - } - return true; - }); - - vm.variable.current.value = _.pluck(selected, 'value'); - vm.variable.current.text = _.pluck(valuesNotInTag, 'text').join(', '); - vm.selectedValuesCount = selected.length; + vm.variable.current.value = _.pluck(vm.selectedValues, 'value'); + vm.variable.current.text = _.pluck(vm.selectedValues, 'text').join(' + '); + vm.variable.current.tags = vm.selectedTags; // only single value - if (vm.selectedValuesCount === 1) { - vm.variable.current.value = selected[0].value; + if (vm.selectedValues.length === 1) { + vm.variable.current.value = vm.selectedValues[0].value; } if (commitChange) { @@ -186,14 +181,17 @@ function (angular, app, _) { vm.commitChanges = function() { // make sure one option is selected - var selected = _.filter(vm.options, {selected: true}); - if (selected.length === 0) { + if (vm.selectedValues.length === 0) { vm.options[0].selected = true; vm.selectionsChanged(false); } vm.dropdownVisible = false; vm.updateLinkText(); + + if (vm.variable.current.text !== vm.oldVariableText) { + vm.onUpdated(); + } }; vm.queryChanged = function() { diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index 169e868337b..011522d6afe 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -15,9 +15,9 @@
    - Selected ({{vm.selectedValuesCount}}) + Selected ({{vm.selectedValues.length}}) - + {{option.text}} diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 8b61b40688d..1cfa9bfc4ad 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -130,6 +130,10 @@ function (angular, _, kbn) { // if parameter has current value // if it exists in options array keep value if (variable.current) { + // if current value is an array do not do anything + if (_.isArray(variable.current.value)) { + return $q.when([]); + } var currentOption = _.findWhere(variable.options, { text: variable.current.text }); if (currentOption) { return self.setVariableValue(variable, currentOption); diff --git a/public/test/specs/selectDropdownCtrl-specs.js b/public/test/specs/selectDropdownCtrl-specs.js index 968320b8e4f..603acc9a5fb 100644 --- a/public/test/specs/selectDropdownCtrl-specs.js +++ b/public/test/specs/selectDropdownCtrl-specs.js @@ -19,6 +19,7 @@ function () { ctrl.getValuesForTag = function(obj) { return $q.when(tagValuesMap[obj.tagKey]); }; + ctrl.onUpdated = sinon.spy(); })); describe("Given simple variable", function() { @@ -35,13 +36,14 @@ function () { describe("Given variable with tags and dropdown is opened", function() { beforeEach(function() { ctrl.variable = { - current: {text: 'hej', value: 'hej'}, + current: {text: 'server-1', value: 'server-1'}, options: [ {text: 'server-1', value: 'server-1'}, {text: 'server-2', value: 'server-2'}, {text: 'server-3', value: 'server-3'}, ], - tags: ["key1", "key2", "key3"] + tags: ["key1", "key2", "key3"], + multi: true }; tagValuesMap.key1 = ['server-1', 'server-3']; tagValuesMap.key2 = ['server-2', 'server-3']; @@ -59,10 +61,30 @@ function () { expect(ctrl.options.length).to.be(3); }); + it("should init selected values array", function() { + expect(ctrl.selectedValues.length).to.be(1); + }); + + it("should set linkText", function() { + expect(ctrl.linkText).to.be('server-1'); + }); + + describe('after adititional value is selected', function() { + beforeEach(function() { + ctrl.selectValue(ctrl.options[2], {}); + ctrl.commitChanges(); + }); + + it('should update link text', function() { + expect(ctrl.linkText).to.be('server-1 + server-3'); + }); + }); + describe('When tag is selected', function() { beforeEach(function() { ctrl.selectTag(ctrl.tags[0]); rootScope.$digest(); + ctrl.commitChanges(); }); it("should select tag", function() { @@ -72,6 +94,11 @@ function () { it("should select values", function() { expect(ctrl.options[0].selected).to.be(true); expect(ctrl.options[2].selected).to.be(true); + expect(ctrl.linkText).to.be('server-1 + server-2'); + }); + + it("link text should not include tag values", function() { + expect(ctrl.linkText).to.not.contain('server-1'); }); describe('and then dropdown is opened and closed without changes', function() { @@ -99,7 +126,7 @@ function () { describe('and then value is unselected', function() { beforeEach(function() { - ctrl.optionSelected(ctrl.options[0]); + ctrl.selectValue(ctrl.options[0], {}); }); it("should deselect tag", function() { From b0451dc1b3483b875f5973f8e817574907139e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Jun 2015 19:32:50 +0200 Subject: [PATCH 257/398] More refinements of tag selection and state restoration after dashboard load --- public/app/directives/variableValueSelect.js | 48 ++++++++++++------- public/test/specs/selectDropdownCtrl-specs.js | 3 +- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index 0c3ff0e3507..c89485130aa 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -27,7 +27,6 @@ function (angular, app, _) { }); vm.selectedValues = _.filter(vm.options, {selected: true}); - vm.selectedTags = vm.selectedTags || []; if (!vm.tags) { vm.tags = _.map(vm.variable.tags, function(value) { @@ -40,21 +39,37 @@ function (angular, app, _) { }; vm.updateLinkText = function() { - // var currentValues = vm.variable.current.text; - // - // if (vm.variable.current.tags) { - // selectedOptions = _.filter(selectedOptions, function(test) { - // for (var i = 0; i < vm.variable.current.tags; i++) { - // var tag = vm.selectedTags[i]; - // if (_.indexOf(tag.values, test.text) !== -1) { - // return false; - // } - // } - // return true; - // }); - // } - // - vm.linkText = vm.variable.current.text; + var current = vm.variable.current; + var currentValues = current.value; + + if (_.isArray(currentValues) && current.tags.length) { + // filer out values that are in selected tags + currentValues = _.filter(currentValues, function(test) { + for (var i = 0; i < current.tags.length; i++) { + if (_.indexOf(current.tags[i].values, test) !== -1) { + return false; + } + } + return true; + }); + // convert values to text + var currentTexts = _.map(currentValues, function(value) { + for (var i = 0; i < vm.variable.options.length; i++) { + var option = vm.variable.options[i]; + if (option.value === value) { + return option.text; + } + } + return value; + }); + // join texts + vm.linkText = currentTexts.join(' + '); + if (vm.linkText.length > 0) { + vm.linkText += ' + '; + } + } else { + vm.linkText = vm.variable.current.text; + } }; vm.clearSelections = function() { @@ -202,6 +217,7 @@ function (angular, app, _) { }; vm.init = function() { + vm.selectedTags = vm.variable.current.tags || []; vm.updateLinkText(); }; diff --git a/public/test/specs/selectDropdownCtrl-specs.js b/public/test/specs/selectDropdownCtrl-specs.js index 603acc9a5fb..3aae3429a7c 100644 --- a/public/test/specs/selectDropdownCtrl-specs.js +++ b/public/test/specs/selectDropdownCtrl-specs.js @@ -94,11 +94,10 @@ function () { it("should select values", function() { expect(ctrl.options[0].selected).to.be(true); expect(ctrl.options[2].selected).to.be(true); - expect(ctrl.linkText).to.be('server-1 + server-2'); }); it("link text should not include tag values", function() { - expect(ctrl.linkText).to.not.contain('server-1'); + expect(ctrl.linkText).to.be(''); }); describe('and then dropdown is opened and closed without changes', function() { From 8934c83742a8a6cc0dc5126cc3bbcacfddb21efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 2 Jun 2015 14:39:21 +0200 Subject: [PATCH 258/398] Small fixes for template variable groups (tags) --- public/app/directives/variableValueSelect.js | 2 ++ public/app/features/dashboard/partials/variableValueSelect.html | 2 +- public/app/features/templating/templateValuesSrv.js | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index c89485130aa..2ddb0dd932c 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -26,6 +26,8 @@ function (angular, app, _) { return option; }); + _.sortBy(vm.options, 'text'); + vm.selectedValues = _.filter(vm.options, {selected: true}); if (!vm.tags) { diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index 011522d6afe..25d220ab3a5 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -2,8 +2,8 @@ {{vm.linkText}} - {{tag.text}}     + {{tag.text}} diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 1cfa9bfc4ad..267a465cd89 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -153,6 +153,7 @@ function (angular, _, kbn) { }); }); } else { + delete variable.tags; return queryPromise; } }); From cb63344394c7048bb44153b16695588a7bf36d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 2 Jun 2015 19:51:12 +0200 Subject: [PATCH 259/398] Added hover tooltip for tags --- public/app/directives/variableValueSelect.js | 2 +- .../features/dashboard/partials/variableValueSelect.html | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index 2ddb0dd932c..94984977c7a 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -93,7 +93,7 @@ function (angular, app, _) { tagValuesPromise.then(function(values) { tag.values = values; - tag.valuesText = values.join(', '); + tag.valuesText = values.join(' + '); _.each(vm.options, function(option) { if (_.indexOf(tag.values, option.value) !== -1) { option.selected = tag.selected; diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html index 25d220ab3a5..2c291448573 100644 --- a/public/app/features/dashboard/partials/variableValueSelect.html +++ b/public/app/features/dashboard/partials/variableValueSelect.html @@ -1,9 +1,11 @@
    {{vm.linkText}} - -     - {{tag.text}} + + +     + {{tag.text}} + From 8cfe89eaf94747b22b1e9f1f9e4e2475ac674d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 3 Jun 2015 09:48:36 +0200 Subject: [PATCH 260/398] Updated variable dropdown --- public/app/directives/variableValueSelect.js | 10 ++++------ public/css/less/submenu.less | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index 94984977c7a..3bee64ed807 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -30,11 +30,9 @@ function (angular, app, _) { vm.selectedValues = _.filter(vm.options, {selected: true}); - if (!vm.tags) { - vm.tags = _.map(vm.variable.tags, function(value) { - return { text: value, selected: false }; - }); - } + vm.tags = _.map(vm.variable.tags, function(value) { + return { text: value, selected: false }; + }); vm.search = {query: '', options: vm.options}; vm.dropdownVisible = true; @@ -225,7 +223,7 @@ function (angular, app, _) { }); - angular + angular .module('grafana.directives') .directive('variableValueSelect', function($compile, $window, $timeout) { diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index dde7dae481a..aba2c97d0a8 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -55,14 +55,14 @@ min-width: 150px; max-height: 400px; min-height: 150px; - background-color: @dropdownBackground; overflow-y: auto; overflow-x: hidden; - box-shadow: 0px 0px 55px 0px black; - border: 1px solid @grafanaTargetFuncBackground; + background-color: @dropdownBackground; + box-shadow: 0 0 25px 0 rgba(0,0,0,0.4); z-index: 1000; font-size: @baseFontSize; border-radius: 3px 3px 0 0; + border: 1px solid @grafanaTargetFuncBackground; &.multi { .selected { From 1c38619d8c7ce2d06685bf9ef457a99c9fe865a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 3 Jun 2015 11:07:30 +0200 Subject: [PATCH 261/398] Fixed intendation --- public/app/directives/variableValueSelect.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/variableValueSelect.js index 3bee64ed807..ae08ad55ee4 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/variableValueSelect.js @@ -223,7 +223,7 @@ function (angular, app, _) { }); - angular + angular .module('grafana.directives') .directive('variableValueSelect', function($compile, $window, $timeout) { From c821568ac72b5aeb93bf33d58fbf8c77c27a8e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 3 Jun 2015 12:03:12 +0200 Subject: [PATCH 262/398] Merged new template dropdown --- public/app/features/templating/partials/editor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index 382790e0f21..b515f2a7535 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -228,7 +228,7 @@
    -
    Value groups/tags
    +
    Value groups/tags (Experimental feature)
    • From 83279604c6f3f8db800d0f1ea7dff9c49d53806e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 3 Jun 2015 14:53:40 +0200 Subject: [PATCH 263/398] updated search handler --- pkg/search/handlers.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/search/handlers.go b/pkg/search/handlers.go index a3cd01e2508..326924f05f4 100644 --- a/pkg/search/handlers.go +++ b/pkg/search/handlers.go @@ -1,7 +1,6 @@ package search import ( - "fmt" "path/filepath" "sort" @@ -68,9 +67,8 @@ func searchHandler(query *Query) error { // sort main result array sort.Sort(hits) - fmt.Printf("Length: %d", len(hits)) if len(hits) > query.Limit { - hits = hits[0 : query.Limit-1] + hits = hits[0:query.Limit] } // sort tags From e9a842259a5031ab43678090e8ae0432ed56a284 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Wed, 3 Jun 2015 22:27:45 +0900 Subject: [PATCH 264/398] Add metricFindQuery in KairosDBDatasource --- .../plugins/datasource/kairosdb/datasource.js | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index 0c5ab6068f1..d7a85c99d1e 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -112,6 +112,30 @@ function (angular, _, kbn) { }); }; + KairosDBDatasource.prototype.metricFindQuery = function(query) { + var interpolated; + try { + interpolated = templateSrv.replace(query); + } + catch (err) { + return $q.reject(err); + } + + return this.performMetricSuggestQuery().then(function(metrics) { + return _.chain(metrics) + .filter(function(metric) { + return metric.indexOf(interpolated) >= 0; + }) + .map(function(metric) { + return { + text: metric, + expandable: true + }; + }) + .value(); + }); + }; + ///////////////////////////////////////////////////////////////////////// /// Formatting methods //////////////////////////////////////////////////////////////////////// From 4d0c04b80d0d011afc2d975ef0cbab6e941d5ac9 Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Thu, 4 Jun 2015 01:23:58 +0900 Subject: [PATCH 265/398] Add tag support --- .../plugins/datasource/kairosdb/datasource.js | 79 ++++++++++++++++--- 1 file changed, 66 insertions(+), 13 deletions(-) diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index d7a85c99d1e..09864e0548a 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -91,6 +91,34 @@ function (angular, _, kbn) { }); }; + KairosDBDatasource.prototype.performListTagNames = function() { + var options = { + url : this.url + '/api/v1/tagnames', + method : 'GET' + }; + + return $http(options).then(function(response) { + if (!response.data) { + return []; + } + return response.data.results; + }); + }; + + KairosDBDatasource.prototype.performListTagValues = function() { + var options = { + url : this.url + '/api/v1/tagvalues', + method : 'GET' + }; + + return $http(options).then(function(response) { + if (!response.data) { + return []; + } + return response.data.results; + }); + }; + KairosDBDatasource.prototype.performTagSuggestQuery = function(metricname) { var options = { url : this.url + '/api/v1/datapoints/query/tags', @@ -113,6 +141,20 @@ function (angular, _, kbn) { }; KairosDBDatasource.prototype.metricFindQuery = function(query) { + function format(results, query) { + return _.chain(results) + .filter(function(result) { + return result.indexOf(query) >= 0; + }) + .map(function(result) { + return { + text: result, + expandable: true + }; + }) + .value(); + } + var interpolated; try { interpolated = templateSrv.replace(query); @@ -121,19 +163,30 @@ function (angular, _, kbn) { return $q.reject(err); } - return this.performMetricSuggestQuery().then(function(metrics) { - return _.chain(metrics) - .filter(function(metric) { - return metric.indexOf(interpolated) >= 0; - }) - .map(function(metric) { - return { - text: metric, - expandable: true - }; - }) - .value(); - }); + var metrics_regex = /metrics\((.*)\)/; + var tag_names_regex = /tag_names\((.*)\)/; + var tag_values_regex = /tag_values\((.*)\)/; + + var metrics_query = interpolated.match(metrics_regex); + if (metrics_query) { + return this.performMetricSuggestQuery().then(function(metrics) { + return format(metrics, metrics_query[1]); + }); + } + + var tag_names_query = interpolated.match(tag_names_regex); + if (tag_names_query) { + return this.performListTagNames().then(function(tag_names) { + return format(tag_names, tag_names_query[1]); + }); + } + + var tag_values_query = interpolated.match(tag_values_regex); + if (tag_values_query) { + return this.performListTagValues().then(function(tag_values) { + return format(tag_values, tag_values_query[1]); + }); + } }; ///////////////////////////////////////////////////////////////////////// From 3f5ab189cda00c5d87e1fd16eac7cd08f7214e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 4 Jun 2015 14:29:39 +0200 Subject: [PATCH 266/398] Began work on emailing service #1456 --- docker/blocks/smtp/Dockerfile | 13 ++ docker/blocks/smtp/bootstrap.sh | 27 ++++ docker/blocks/smtp/fig | 4 + main.go | 2 + pkg/api/apikey.go | 7 + pkg/models/emails.go | 24 ++++ pkg/services/mailer/mailer.go | 243 ++++++++++++++++++++++++++++++++ pkg/setting/setting.go | 3 + pkg/setting/setting_smtp.go | 11 ++ 9 files changed, 334 insertions(+) create mode 100644 docker/blocks/smtp/Dockerfile create mode 100755 docker/blocks/smtp/bootstrap.sh create mode 100644 docker/blocks/smtp/fig create mode 100644 pkg/models/emails.go create mode 100644 pkg/services/mailer/mailer.go create mode 100644 pkg/setting/setting_smtp.go diff --git a/docker/blocks/smtp/Dockerfile b/docker/blocks/smtp/Dockerfile new file mode 100644 index 00000000000..c1a3adba7c8 --- /dev/null +++ b/docker/blocks/smtp/Dockerfile @@ -0,0 +1,13 @@ +FROM centos:centos7 +MAINTAINER Przemyslaw Ozgo + +RUN \ + yum update -y && \ + yum install -y net-snmp net-snmp-utils && \ + yum clean all + +COPY bootstrap.sh /tmp/bootstrap.sh + +EXPOSE 161 + +ENTRYPOINT ["/tmp/bootstrap.sh"] diff --git a/docker/blocks/smtp/bootstrap.sh b/docker/blocks/smtp/bootstrap.sh new file mode 100755 index 00000000000..a78f9d6dc16 --- /dev/null +++ b/docker/blocks/smtp/bootstrap.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +set -u + +# User params +USER_PARAMS=$@ + +# Internal params +RUN_CMD="snmpd -f ${USER_PARAMS}" + +####################################### +# Echo/log function +# Arguments: +# String: value to log +####################################### +log() { + if [[ "$@" ]]; then echo "[`date +'%Y-%m-%d %T'`] $@"; + else echo; fi +} + +# Launch +log $RUN_CMD +$RUN_CMD + +# Exit immidiately in case of any errors or when we have interactive terminal +if [[ $? != 0 ]] || test -t 0; then exit $?; fi +log diff --git a/docker/blocks/smtp/fig b/docker/blocks/smtp/fig new file mode 100644 index 00000000000..c2d37e01c21 --- /dev/null +++ b/docker/blocks/smtp/fig @@ -0,0 +1,4 @@ +snmpd: + build: blocks/snmpd + ports: + - "161:161" diff --git a/main.go b/main.go index 5d5bddb7273..97f9262eb52 100644 --- a/main.go +++ b/main.go @@ -16,6 +16,7 @@ import ( "github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/search" "github.com/grafana/grafana/pkg/services/eventpublisher" + "github.com/grafana/grafana/pkg/services/mailer" "github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/social" @@ -56,6 +57,7 @@ func main() { social.NewOAuthService() eventpublisher.Init() plugins.Init() + mailer.Init() if setting.ReportingEnabled { go metrics.StartUsageReportLoop() diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go index b2097104aba..9c2210f11d2 100644 --- a/pkg/api/apikey.go +++ b/pkg/api/apikey.go @@ -24,6 +24,13 @@ func GetApiKeys(c *middleware.Context) Response { } } + bus.Dispatch(&m.SendEmailCommand{ + To: []string{"torkel@raintank.io"}, + From: "grafana@test.com", + Subject: "Test from Grafana2", + Body: "Body! hej hoppas allt är bra", + }) + return Json(200, result) } diff --git a/pkg/models/emails.go b/pkg/models/emails.go new file mode 100644 index 00000000000..342d220d2f5 --- /dev/null +++ b/pkg/models/emails.go @@ -0,0 +1,24 @@ +package models + +type SendEmailCommand struct { + To []string + From string + Subject string + Body string + Type string + Massive bool + Info string +} + +// create mail content +func (m *SendEmailCommand) Content() string { + // set mail type + contentType := "text/plain; charset=UTF-8" + if m.Type == "html" { + contentType = "text/html; charset=UTF-8" + } + + // create mail content + content := "From: " + m.From + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body + return content +} diff --git a/pkg/services/mailer/mailer.go b/pkg/services/mailer/mailer.go new file mode 100644 index 00000000000..27e4dc36d87 --- /dev/null +++ b/pkg/services/mailer/mailer.go @@ -0,0 +1,243 @@ +package mailer + +import ( + "crypto/tls" + "fmt" + "net" + "net/mail" + "net/smtp" + "os" + "strings" + + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/log" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" +) + +var mailQueue chan *m.SendEmailCommand + +func Init() { + bus.AddHandler("email", handleEmailCommand) + + mailQueue = make(chan *m.SendEmailCommand, 10) + + setting.Smtp = setting.SmtpSettings{ + Host: "smtp.gmail.com:587", + User: "torkel.odegaard@gmail.com", + Password: "peslpwstnnloiksq", + FromAddress: "grafana@grafana.org", + } + + go processMailQueue() +} + +func processMailQueue() { + for { + select { + case msg := <-mailQueue: + num, err := buildAndSend(msg) + tos := strings.Join(msg.To, "; ") + info := "" + if err != nil { + if len(msg.Info) > 0 { + info = ", info: " + msg.Info + } + log.Error(4, fmt.Sprintf("Async sent email %d succeed, not send emails: %s%s err: %s", num, tos, info, err)) + } else { + log.Trace(fmt.Sprintf("Async sent email %d succeed, sent emails: %s%s", num, tos, info)) + } + } + } +} + +func encodeRFC2047(text string) string { + // use mail's rfc2047 to encode any string + addr := mail.Address{Address: text} + return strings.Trim(addr.String(), " <>") +} + +func handleEmailCommand(cmd *m.SendEmailCommand) error { + log.Info("Sending on queue") + mailQueue <- cmd + return nil +} + +func sendToSmtpServer(recipients []string, msgContent []byte) error { + host, port, err := net.SplitHostPort(setting.Smtp.Host) + if err != nil { + return err + } + + tlsconfig := &tls.Config{ + InsecureSkipVerify: setting.Smtp.SkipVerify, + ServerName: host, + } + + if setting.Smtp.CertFile != "" { + cert, err := tls.LoadX509KeyPair(setting.Smtp.CertFile, setting.Smtp.KeyFile) + if err != nil { + return err + } + tlsconfig.Certificates = []tls.Certificate{cert} + } + + conn, err := net.Dial("tcp", net.JoinHostPort(host, port)) + if err != nil { + return err + } + defer conn.Close() + + isSecureConn := false + // Start TLS directly if the port ends with 465 (SMTPS protocol) + if strings.HasSuffix(port, "465") { + conn = tls.Client(conn, tlsconfig) + isSecureConn = true + } + + client, err := smtp.NewClient(conn, host) + if err != nil { + return err + } + + hostname, err := os.Hostname() + if err != nil { + return err + } + + if err = client.Hello(hostname); err != nil { + return err + } + + // If not using SMTPS, alway use STARTTLS if available + hasStartTLS, _ := client.Extension("STARTTLS") + if !isSecureConn && hasStartTLS { + if err = client.StartTLS(tlsconfig); err != nil { + return err + } + } + + canAuth, options := client.Extension("AUTH") + + if canAuth && len(setting.Smtp.User) > 0 { + var auth smtp.Auth + + if strings.Contains(options, "CRAM-MD5") { + auth = smtp.CRAMMD5Auth(setting.Smtp.User, setting.Smtp.Password) + } else if strings.Contains(options, "PLAIN") { + auth = smtp.PlainAuth("", setting.Smtp.User, setting.Smtp.Password, host) + } + + if auth != nil { + if err = client.Auth(auth); err != nil { + return err + } + } + } + + if fromAddress, err := mail.ParseAddress(setting.Smtp.FromAddress); err != nil { + return err + } else { + if err = client.Mail(fromAddress.Address); err != nil { + return err + } + } + + for _, rec := range recipients { + if err = client.Rcpt(rec); err != nil { + return err + } + } + + w, err := client.Data() + if err != nil { + return err + } + if _, err = w.Write([]byte(msgContent)); err != nil { + return err + } + + if err = w.Close(); err != nil { + return err + } + + return client.Quit() + // smtpServer := "smtp.gmail.com" + // auth := smtp.PlainAuth( + // "", + // "torkel.odegaard@gmail.com", + // "peslpwstnnloiksq", + // smtpServer, + // ) + // + // from := mail.Address{Name: "test", Address: "torkel@test.com"} + // to := mail.Address{Name: "Torkel Ödegaard", Address: "torkel@raintank.io"} + // title := "Message from Grafana" + // + // body := "Testing email sending" + // + // header := make(map[string]string) + // header["From"] = from.String() + // header["To"] = to.String() + // header["Subject"] = encodeRFC2047(title) + // header["MIME-Version"] = "1.0" + // header["Content-Type"] = "text/plain; charset=\"utf-8\"" + // header["Content-Transfer-Encoding"] = "base64" + // + // message := "" + // for k, v := range header { + // message += fmt.Sprintf("%s: %s\r\n", k, v) + // } + // message += "\r\n" + base64.StdEncoding.EncodeToString([]byte(body)) + // + // // Connect to the server, authenticate, set the sender and recipient, + // // and send the email all in one step. + // err := smtp.SendMail( + // smtpServer+":587", + // auth, + // from.Address, + // []string{to.Address}, + // []byte(message), + // ) + // if err != nil { + // log.Info("Failed to send email: %v", err) + // } + // kkkk +} + +func buildAndSend(msg *m.SendEmailCommand) (int, error) { + log.Trace("Sending mails to: %s", strings.Join(msg.To, "; ")) + + // get message body + content := msg.Content() + + if len(msg.To) == 0 { + return 0, fmt.Errorf("empty receive emails") + } else if len(msg.Body) == 0 { + return 0, fmt.Errorf("empty email body") + } + + if msg.Massive { + // send mail to multiple emails one by one + num := 0 + for _, to := range msg.To { + body := []byte("To: " + to + "\r\n" + content) + err := sendToSmtpServer([]string{to}, body) + if err != nil { + return num, err + } + num++ + } + return num, nil + } else { + body := []byte("To: " + strings.Join(msg.To, ";") + "\r\n" + content) + + // send to multiple emails in one message + err := sendToSmtpServer(msg.To, body) + if err != nil { + return 0, err + } else { + return 1, nil + } + } +} diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 6768f9aabd9..2a8ae91941c 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -114,6 +114,9 @@ var ( ReportingEnabled bool GoogleAnalyticsId string + + // SMTP email settings + Smtp SmtpSettings ) type CommandLineArgs struct { diff --git a/pkg/setting/setting_smtp.go b/pkg/setting/setting_smtp.go new file mode 100644 index 00000000000..e392c164ee3 --- /dev/null +++ b/pkg/setting/setting_smtp.go @@ -0,0 +1,11 @@ +package setting + +type SmtpSettings struct { + Host string + User string + Password string + CertFile string + KeyFile string + FromAddress string + SkipVerify bool +} From 3706d0dedd572c104f5cdffe5aa4eaa0704e8822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 4 Jun 2015 17:23:46 +0200 Subject: [PATCH 267/398] More work on email and notification infra #1456 --- pkg/models/emails.go | 24 ----------- pkg/notifications/email.go | 66 ++++++++++++++++++++++++++++++ pkg/notifications/notifications.go | 11 +++++ pkg/services/mailer/mailer.go | 12 ++++-- pkg/setting/setting.go | 2 - 5 files changed, 85 insertions(+), 30 deletions(-) delete mode 100644 pkg/models/emails.go create mode 100644 pkg/notifications/email.go create mode 100644 pkg/notifications/notifications.go diff --git a/pkg/models/emails.go b/pkg/models/emails.go deleted file mode 100644 index 342d220d2f5..00000000000 --- a/pkg/models/emails.go +++ /dev/null @@ -1,24 +0,0 @@ -package models - -type SendEmailCommand struct { - To []string - From string - Subject string - Body string - Type string - Massive bool - Info string -} - -// create mail content -func (m *SendEmailCommand) Content() string { - // set mail type - contentType := "text/plain; charset=UTF-8" - if m.Type == "html" { - contentType = "text/html; charset=UTF-8" - } - - // create mail content - content := "From: " + m.From + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body - return content -} diff --git a/pkg/notifications/email.go b/pkg/notifications/email.go new file mode 100644 index 00000000000..bf15b1bd9dd --- /dev/null +++ b/pkg/notifications/email.go @@ -0,0 +1,66 @@ +package notifications + +import ( + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" +) + +type SendEmailCommand struct { + To []string + From string + Subject string + Body string + Type string + Massive bool + Info string +} + +type SendResetPasswordEmailCommand struct { + Email string +} + +// create mail content +func (m *SendEmailCommand) Content() string { + // set mail type + contentType := "text/plain; charset=UTF-8" + if m.Type == "html" { + contentType = "text/html; charset=UTF-8" + } + + // create mail content + content := "From: " + m.From + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body + return content +} + +// Create html mail command +func NewSendEmailCommand(To []string, From, Subject, Body string) SendEmailCommand { + return SendEmailCommand{ + To: To, + From: From, + Subject: Subject, + Body: Body, + Type: "html", + } +} + +// Create New mail message use MailFrom and MailUser +func NewMailMessageFrom(To []string, from, subject, body string) SendEmailCommand { + return NewSendEmailCommand(To, from, subject, body) +} + +// Create New mail message use MailFrom and MailUser +func NewMailMessage(To string, subject, body string) SendEmailCommand { + return NewMailMessageFrom([]string{To}, setting.Smtp.FromAddress, subject, body) +} + +func GetMailTmplData(u *m.User) map[interface{}]interface{} { + data := make(map[interface{}]interface{}, 10) + data["AppUrl"] = setting.AppUrl + data["BuildVersion"] = setting.BuildVersion + data["BuildStamp"] = setting.BuildStamp + data["BuildCommit"] = setting.BuildCommit + if u != nil { + data["User"] = u + } + return data +} diff --git a/pkg/notifications/notifications.go b/pkg/notifications/notifications.go new file mode 100644 index 00000000000..5850277731d --- /dev/null +++ b/pkg/notifications/notifications.go @@ -0,0 +1,11 @@ +package notifications + +import "github.com/grafana/grafana/pkg/bus" + +func Init() { + bus.AddHandler("email", sendResetPasswordEmail) +} + +func sendResetPasswordEmail(cmd *SendResetPasswordEmailCommand) error { + email := NewMailMessage("") +} diff --git a/pkg/services/mailer/mailer.go b/pkg/services/mailer/mailer.go index 27e4dc36d87..ffd60698e7f 100644 --- a/pkg/services/mailer/mailer.go +++ b/pkg/services/mailer/mailer.go @@ -1,3 +1,7 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package mailer import ( @@ -11,16 +15,16 @@ import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/log" - m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/notifications" "github.com/grafana/grafana/pkg/setting" ) -var mailQueue chan *m.SendEmailCommand +var mailQueue chan *notifications.SendEmailCommand func Init() { bus.AddHandler("email", handleEmailCommand) - mailQueue = make(chan *m.SendEmailCommand, 10) + mailQueue = make(chan *notifications.SendEmailCommand, 10) setting.Smtp = setting.SmtpSettings{ Host: "smtp.gmail.com:587", @@ -57,7 +61,7 @@ func encodeRFC2047(text string) string { return strings.Trim(addr.String(), " <>") } -func handleEmailCommand(cmd *m.SendEmailCommand) error { +func handleEmailCommand(cmd *notifications.SendEmailCommand) error { log.Info("Sending on queue") mailQueue <- cmd return nil diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 2a8ae91941c..fc430e65c50 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -38,7 +38,6 @@ const ( var ( // App settings. Env string = DEV - AppName string AppUrl string AppSubUrl string @@ -350,7 +349,6 @@ func NewConfigContext(args *CommandLineArgs) { setHomePath(args) loadConfiguration(args) - AppName = Cfg.Section("").Key("app_name").MustString("Grafana") Env = Cfg.Section("").Key("app_mode").MustString("development") server := Cfg.Section("server") From 77215182f7f5df77b298124fb9a207c73aace935 Mon Sep 17 00:00:00 2001 From: "Haneysmith, Nathan" Date: Thu, 4 Jun 2015 11:01:04 -0700 Subject: [PATCH 268/398] fixing up init script exit codes --- packaging/deb/init.d/grafana-server | 12 +++++++----- packaging/rpm/init.d/grafana-server | 21 ++++++++++++++------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/packaging/deb/init.d/grafana-server b/packaging/deb/init.d/grafana-server index 6daebdb4331..6d021092de3 100755 --- a/packaging/deb/init.d/grafana-server +++ b/packaging/deb/init.d/grafana-server @@ -38,7 +38,12 @@ DAEMON=/usr/sbin/$NAME if [ `id -u` -ne 0 ]; then echo "You need root privileges to run this script" - exit 1 + exit 4 +fi + +if [ ! -x $DAEMON ]; then + echo "Program not installed or not executable" + exit 5 fi . /lib/lsb/init-functions @@ -54,9 +59,6 @@ fi DAEMON_OPTS="--pidfile=${PID_FILE} --config=${CONF_FILE} cfg:default.paths.data=${DATA_DIR} cfg:default.paths.logs=${LOG_DIR}" -# Check DAEMON exists -test -x $DAEMON || exit 0 - case "$1" in start) @@ -137,7 +139,7 @@ case "$1" in ;; *) log_success_msg "Usage: $0 {start|stop|restart|force-reload|status}" - exit 1 + exit 3 ;; esac diff --git a/packaging/rpm/init.d/grafana-server b/packaging/rpm/init.d/grafana-server index 60f8d0ff46c..ee99c8d7382 100755 --- a/packaging/rpm/init.d/grafana-server +++ b/packaging/rpm/init.d/grafana-server @@ -35,6 +35,16 @@ MAX_OPEN_FILES=10000 PID_FILE=/var/run/$NAME.pid DAEMON=/usr/sbin/$NAME +if [ `id -u` -ne 0 ]; then + echo "You need root privileges to run this script" + exit 4 +fi + +if [ ! -x $DAEMON ]; then + echo "Program not installed or not executable" + exit 5 +fi + # # init.d / servicectl compatibility (openSUSE) # @@ -55,9 +65,6 @@ fi DAEMON_OPTS="--pidfile=${PID_FILE} --config=${CONF_FILE} cfg:default.paths.data=${DATA_DIR} cfg:default.paths.logs=${LOG_DIR}" -# Check DAEMON exists -test -x $DAEMON || exit 0 - function isRunning() { status -p $PID_FILE $NAME > /dev/null 2>&1 } @@ -69,7 +76,7 @@ case "$1" in isRunning if [ $? -eq 0 ]; then echo "Already running." - exit 2 + exit 0 fi # Prepare environment @@ -90,7 +97,7 @@ case "$1" in # check if pid file has been written two if ! [[ -s $PID_FILE ]]; then echo "FAILED" - exit 3 + exit 1 fi i=0 timeout=10 @@ -101,7 +108,7 @@ case "$1" in i=$(($i + 1)) if [ $i -gt $timeout ]; then echo "FAILED" - exit 4 + exit 1 fi done fi @@ -141,6 +148,6 @@ case "$1" in ;; *) echo -n "Usage: $0 {start|stop|restart|force-reload|status}" - exit 1 + exit 3 ;; esac From fcba62894bb6d4b3500b4efa6aae72a776704473 Mon Sep 17 00:00:00 2001 From: "Haneysmith, Nathan" Date: Thu, 4 Jun 2015 11:40:49 -0700 Subject: [PATCH 269/398] remove trailing exit 0 from deb init --- packaging/deb/init.d/grafana-server | 2 -- 1 file changed, 2 deletions(-) diff --git a/packaging/deb/init.d/grafana-server b/packaging/deb/init.d/grafana-server index 6d021092de3..a4f6423a68d 100755 --- a/packaging/deb/init.d/grafana-server +++ b/packaging/deb/init.d/grafana-server @@ -142,5 +142,3 @@ case "$1" in exit 3 ;; esac - -exit 0 From 463a750c0772312b825b6646477acff2d9bcca47 Mon Sep 17 00:00:00 2001 From: Lex Herbert Date: Thu, 4 Jun 2015 17:45:09 -0700 Subject: [PATCH 270/398] OpenTSDB: Restrict typeahead tag keys and values When selecting metric tag keys, we only are interested in keys which are associated with this metric. Likewise, when selecting a value for a certain key, we only want to consider values which apply to the given key and metric. --- .../plugins/datasource/opentsdb/datasource.js | 49 +++++++++++++++++++ .../plugins/datasource/opentsdb/queryCtrl.js | 4 +- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js index 1e60bf1e54e..57559cc6687 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.js +++ b/public/app/plugins/datasource/opentsdb/datasource.js @@ -90,6 +90,55 @@ function (angular, _, kbn) { }); }; + OpenTSDBDatasource.prototype.performMetricKeyValueLookup = function(metric, key) { + if(metric === "") { + throw "Metric not set."; + } else if(key === "") { + throw "Key not set."; + } + var m = metric + "{" + key + "=*}"; + var options = { + method: 'GET', + url: this.url + '/api/search/lookup', + params: { + m: m, + } + }; + return backendSrv.datasourceRequest(options).then(function(result) { + result = result.data.results; + var tagvs = []; + _.each(result, function(r) { + tagvs.push(r.tags[key]); + }); + return tagvs; + }); + }; + + OpenTSDBDatasource.prototype.performMetricKeyLookup = function(metric) { + if(metric === "") { + throw "Metric not set."; + } + var options = { + method: 'GET', + url: this.url + '/api/search/lookup', + params: { + m: metric, + } + }; + return backendSrv.datasourceRequest(options).then(function(result) { + result = result.data.results; + var tagks = []; + _.each(result, function(r) { + _.each(r.tags, function(tagv, tagk) { + if(tagks.indexOf(tagk) === -1) { + tagks.push(tagk); + } + }); + }); + return tagks; + }); + }; + OpenTSDBDatasource.prototype.testDatasource = function() { return this.performSuggestQuery('cpu', 'metrics').then(function () { return { status: "success", message: "Data source is working", title: "Success" }; diff --git a/public/app/plugins/datasource/opentsdb/queryCtrl.js b/public/app/plugins/datasource/opentsdb/queryCtrl.js index 576517a50b6..17a2f4bd640 100644 --- a/public/app/plugins/datasource/opentsdb/queryCtrl.js +++ b/public/app/plugins/datasource/opentsdb/queryCtrl.js @@ -50,13 +50,13 @@ function (angular, _, kbn) { $scope.suggestTagKeys = function(query, callback) { $scope.datasource - .performSuggestQuery(query, 'tagk') + .performMetricKeyLookup($scope.target.metric) .then(callback); }; $scope.suggestTagValues = function(query, callback) { $scope.datasource - .performSuggestQuery(query, 'tagv') + .performMetricKeyValueLookup($scope.target.metric, $scope.target.currentTagKey) .then(callback); }; From c709a28f029cec5e1bfb1721f4ce97f80aa89d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 5 Jun 2015 08:15:38 +0200 Subject: [PATCH 271/398] More work on email and notification infra #1456 --- main.go | 2 +- pkg/api/apikey.go | 12 +++--- pkg/api/dashboard.go | 2 +- pkg/api/search.go | 2 +- pkg/models/emails.go | 39 +++++++++++++++++++ pkg/services/mailer/mailer.go | 8 ++-- pkg/{ => services}/notifications/email.go | 0 .../notifications/notifications.go | 2 +- pkg/{ => services}/search/handlers.go | 0 pkg/{ => services}/search/handlers_test.go | 0 pkg/{ => services}/search/json_index.go | 0 pkg/{ => services}/search/json_index_test.go | 0 pkg/{ => services}/search/models.go | 0 pkg/services/sqlstore/dashboard.go | 2 +- 14 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 pkg/models/emails.go rename pkg/{ => services}/notifications/email.go (100%) rename pkg/{ => services}/notifications/notifications.go (87%) rename pkg/{ => services}/search/handlers.go (100%) rename pkg/{ => services}/search/handlers_test.go (100%) rename pkg/{ => services}/search/json_index.go (100%) rename pkg/{ => services}/search/json_index_test.go (100%) rename pkg/{ => services}/search/models.go (100%) diff --git a/main.go b/main.go index 97f9262eb52..4573d3f9566 100644 --- a/main.go +++ b/main.go @@ -14,9 +14,9 @@ import ( "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/plugins" - "github.com/grafana/grafana/pkg/search" "github.com/grafana/grafana/pkg/services/eventpublisher" "github.com/grafana/grafana/pkg/services/mailer" + "github.com/grafana/grafana/pkg/services/search" "github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/social" diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go index 9c2210f11d2..cedc2529f79 100644 --- a/pkg/api/apikey.go +++ b/pkg/api/apikey.go @@ -24,12 +24,12 @@ func GetApiKeys(c *middleware.Context) Response { } } - bus.Dispatch(&m.SendEmailCommand{ - To: []string{"torkel@raintank.io"}, - From: "grafana@test.com", - Subject: "Test from Grafana2", - Body: "Body! hej hoppas allt är bra", - }) + // bus.Dispatch(&m.SendEmailCommand{ + // To: []string{"torkel@raintank.io"}, + // From: "grafana@test.com", + // Subject: "Test from Grafana2", + // Body: "Body! hej hoppas allt är bra", + // }) return Json(200, result) } diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index b010f32cdcb..60139fd3b84 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -10,7 +10,7 @@ import ( "github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" - "github.com/grafana/grafana/pkg/search" + "github.com/grafana/grafana/pkg/services/search" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/util" ) diff --git a/pkg/api/search.go b/pkg/api/search.go index e451ac398d6..035e59fa3f4 100644 --- a/pkg/api/search.go +++ b/pkg/api/search.go @@ -3,7 +3,7 @@ package api import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/middleware" - "github.com/grafana/grafana/pkg/search" + "github.com/grafana/grafana/pkg/services/search" ) func Search(c *middleware.Context) { diff --git a/pkg/models/emails.go b/pkg/models/emails.go new file mode 100644 index 00000000000..321219598ee --- /dev/null +++ b/pkg/models/emails.go @@ -0,0 +1,39 @@ +package models + +type SendEmailCommand struct { + To []string + From string + Subject string + Body string + Type string + Massive bool + Info string +} + +type SendResetPasswordEmailCommand struct { + Email string +} + +// create mail content +func (m *SendEmailCommand) Content() string { + // set mail type + contentType := "text/plain; charset=UTF-8" + if m.Type == "html" { + contentType = "text/html; charset=UTF-8" + } + + // create mail content + content := "From: " + m.From + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body + return content +} + +// Create html mail command +func NewSendEmailCommand(To []string, From, Subject, Body string) SendEmailCommand { + return SendEmailCommand{ + To: To, + From: From, + Subject: Subject, + Body: Body, + Type: "html", + } +} diff --git a/pkg/services/mailer/mailer.go b/pkg/services/mailer/mailer.go index ffd60698e7f..91e57fe9505 100644 --- a/pkg/services/mailer/mailer.go +++ b/pkg/services/mailer/mailer.go @@ -15,16 +15,16 @@ import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/log" - "github.com/grafana/grafana/pkg/notifications" + m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" ) -var mailQueue chan *notifications.SendEmailCommand +var mailQueue chan *m.SendEmailCommand func Init() { bus.AddHandler("email", handleEmailCommand) - mailQueue = make(chan *notifications.SendEmailCommand, 10) + mailQueue = make(chan *m.SendEmailCommand, 10) setting.Smtp = setting.SmtpSettings{ Host: "smtp.gmail.com:587", @@ -61,7 +61,7 @@ func encodeRFC2047(text string) string { return strings.Trim(addr.String(), " <>") } -func handleEmailCommand(cmd *notifications.SendEmailCommand) error { +func handleEmailCommand(cmd *m.SendEmailCommand) error { log.Info("Sending on queue") mailQueue <- cmd return nil diff --git a/pkg/notifications/email.go b/pkg/services/notifications/email.go similarity index 100% rename from pkg/notifications/email.go rename to pkg/services/notifications/email.go diff --git a/pkg/notifications/notifications.go b/pkg/services/notifications/notifications.go similarity index 87% rename from pkg/notifications/notifications.go rename to pkg/services/notifications/notifications.go index 5850277731d..ccc0495ff41 100644 --- a/pkg/notifications/notifications.go +++ b/pkg/services/notifications/notifications.go @@ -7,5 +7,5 @@ func Init() { } func sendResetPasswordEmail(cmd *SendResetPasswordEmailCommand) error { - email := NewMailMessage("") + return nil } diff --git a/pkg/search/handlers.go b/pkg/services/search/handlers.go similarity index 100% rename from pkg/search/handlers.go rename to pkg/services/search/handlers.go diff --git a/pkg/search/handlers_test.go b/pkg/services/search/handlers_test.go similarity index 100% rename from pkg/search/handlers_test.go rename to pkg/services/search/handlers_test.go diff --git a/pkg/search/json_index.go b/pkg/services/search/json_index.go similarity index 100% rename from pkg/search/json_index.go rename to pkg/services/search/json_index.go diff --git a/pkg/search/json_index_test.go b/pkg/services/search/json_index_test.go similarity index 100% rename from pkg/search/json_index_test.go rename to pkg/services/search/json_index_test.go diff --git a/pkg/search/models.go b/pkg/services/search/models.go similarity index 100% rename from pkg/search/models.go rename to pkg/services/search/models.go diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go index 01eacb8436a..7fdaace316e 100644 --- a/pkg/services/sqlstore/dashboard.go +++ b/pkg/services/sqlstore/dashboard.go @@ -8,7 +8,7 @@ import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/metrics" m "github.com/grafana/grafana/pkg/models" - "github.com/grafana/grafana/pkg/search" + "github.com/grafana/grafana/pkg/services/search" ) func init() { From 901685bb6358bac19fe7b6c7b0950457a66ff029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 5 Jun 2015 08:18:17 +0200 Subject: [PATCH 272/398] Updated sample config and config docs with example for postgres session provider_config string, #2118 --- conf/defaults.ini | 1 + conf/sample.ini | 1 + docs/sources/installation/configuration.md | 1 + 3 files changed, 3 insertions(+) diff --git a/conf/defaults.ini b/conf/defaults.ini index 258a0198155..7293eb147d7 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -73,6 +73,7 @@ provider = file # memory: not have any config yet # file: session dir path, is relative to grafana data_path # redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana` +# postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable # mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name` provider_config = sessions diff --git a/conf/sample.ini b/conf/sample.ini index 3c2773fa674..a3ac34206bf 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -74,6 +74,7 @@ # file: session dir path, is relative to grafana data_path # redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana` # mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name` +# postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable ;provider_config = sessions # Session cookie name diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 80ad5909a34..28af21ebf89 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -323,6 +323,7 @@ session provider you have configured. - **file:** session file path, e.g. `data/sessions` - **mysql:** go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name` +- **postgres:** ex: user=a password=b host=localhost port=5432 dbname=c sslmode=disable If you use MySQL or Postgres as the session store you need to create the session table manually. From 89418a155a250309acfff8e2b14991817fba8208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 5 Jun 2015 11:08:19 +0200 Subject: [PATCH 273/398] More work on email and notification infra #1456 --- main.go | 5 ++ pkg/api/apikey.go | 7 -- pkg/models/emails.go | 2 +- pkg/services/notifications/codes.go | 69 +++++++++++++++++ pkg/services/notifications/email.go | 51 ++----------- pkg/services/notifications/notifications.go | 74 ++++++++++++++++++- .../notifications/notifications_test.go | 37 ++++++++++ pkg/services/search/handlers_test.go | 2 +- pkg/services/search/json_index_test.go | 2 +- pkg/services/sqlstore/dashboard_test.go | 2 +- pkg/setting/setting.go | 11 +-- pkg/setting/setting_test.go | 1 - pkg/util/validation.go | 18 +++++ public/emails/reset_password.html | 5 ++ 14 files changed, 221 insertions(+), 65 deletions(-) create mode 100644 pkg/services/notifications/codes.go create mode 100644 pkg/services/notifications/notifications_test.go create mode 100644 pkg/util/validation.go create mode 100644 public/emails/reset_password.html diff --git a/main.go b/main.go index 4573d3f9566..e49ec8b4fa9 100644 --- a/main.go +++ b/main.go @@ -16,6 +16,7 @@ import ( "github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/services/eventpublisher" "github.com/grafana/grafana/pkg/services/mailer" + "github.com/grafana/grafana/pkg/services/notifications" "github.com/grafana/grafana/pkg/services/search" "github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/setting" @@ -59,6 +60,10 @@ func main() { plugins.Init() mailer.Init() + if err := notifications.Init(); err != nil { + log.Fatal(3, "Notification service failed to initialize", err) + } + if setting.ReportingEnabled { go metrics.StartUsageReportLoop() } diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go index cedc2529f79..b2097104aba 100644 --- a/pkg/api/apikey.go +++ b/pkg/api/apikey.go @@ -24,13 +24,6 @@ func GetApiKeys(c *middleware.Context) Response { } } - // bus.Dispatch(&m.SendEmailCommand{ - // To: []string{"torkel@raintank.io"}, - // From: "grafana@test.com", - // Subject: "Test from Grafana2", - // Body: "Body! hej hoppas allt är bra", - // }) - return Json(200, result) } diff --git a/pkg/models/emails.go b/pkg/models/emails.go index 321219598ee..99c31aa6423 100644 --- a/pkg/models/emails.go +++ b/pkg/models/emails.go @@ -11,7 +11,7 @@ type SendEmailCommand struct { } type SendResetPasswordEmailCommand struct { - Email string + User *User } // create mail content diff --git a/pkg/services/notifications/codes.go b/pkg/services/notifications/codes.go new file mode 100644 index 00000000000..12c9a4c8172 --- /dev/null +++ b/pkg/services/notifications/codes.go @@ -0,0 +1,69 @@ +package notifications + +import ( + "crypto/sha1" + "encoding/hex" + "fmt" + "time" + + "github.com/Unknwon/com" + "github.com/grafana/grafana/pkg/setting" +) + +// create a time limit code +// code format: 12 length date time string + 6 minutes string + 40 sha1 encoded string +func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string { + format := "200601021504" + + var start, end time.Time + var startStr, endStr string + + if startInf == nil { + // Use now time create code + start = time.Now() + startStr = start.Format(format) + } else { + // use start string create code + startStr = startInf.(string) + start, _ = time.ParseInLocation(format, startStr, time.Local) + startStr = start.Format(format) + } + + end = start.Add(time.Minute * time.Duration(minutes)) + endStr = end.Format(format) + + // create sha1 encode string + sh := sha1.New() + sh.Write([]byte(data + setting.SecretKey + startStr + endStr + com.ToStr(minutes))) + encoded := hex.EncodeToString(sh.Sum(nil)) + + code := fmt.Sprintf("%s%06d%s", startStr, minutes, encoded) + return code +} + +// verify time limit code +func VerifyTimeLimitCode(data string, minutes int, code string) bool { + if len(code) <= 18 { + return false + } + + // split code + start := code[:12] + lives := code[12:18] + if d, err := com.StrTo(lives).Int(); err == nil { + minutes = d + } + + // right active code + retCode := CreateTimeLimitCode(data, minutes, start) + if retCode == code && minutes > 0 { + // check time is expired or not + before, _ := time.ParseInLocation("200601021504", start, time.Local) + now := time.Now() + if before.Add(time.Minute*time.Duration(minutes)).Unix() > now.Unix() { + return true + } + } + + return false +} diff --git a/pkg/services/notifications/email.go b/pkg/services/notifications/email.go index bf15b1bd9dd..22cac1c2301 100644 --- a/pkg/services/notifications/email.go +++ b/pkg/services/notifications/email.go @@ -5,60 +5,23 @@ import ( "github.com/grafana/grafana/pkg/setting" ) -type SendEmailCommand struct { - To []string - From string - Subject string - Body string - Type string - Massive bool - Info string -} - -type SendResetPasswordEmailCommand struct { - Email string -} - -// create mail content -func (m *SendEmailCommand) Content() string { - // set mail type - contentType := "text/plain; charset=UTF-8" - if m.Type == "html" { - contentType = "text/html; charset=UTF-8" - } - - // create mail content - content := "From: " + m.From + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body - return content -} - -// Create html mail command -func NewSendEmailCommand(To []string, From, Subject, Body string) SendEmailCommand { - return SendEmailCommand{ - To: To, - From: From, - Subject: Subject, - Body: Body, - Type: "html", - } +// Create New mail message use MailFrom and MailUser +func newMailMessageFrom(To []string, from, subject, body string) m.SendEmailCommand { + return m.NewSendEmailCommand(To, from, subject, body) } // Create New mail message use MailFrom and MailUser -func NewMailMessageFrom(To []string, from, subject, body string) SendEmailCommand { - return NewSendEmailCommand(To, from, subject, body) +func newMailMessage(To string, subject, body string) m.SendEmailCommand { + return newMailMessageFrom([]string{To}, setting.Smtp.FromAddress, subject, body) } -// Create New mail message use MailFrom and MailUser -func NewMailMessage(To string, subject, body string) SendEmailCommand { - return NewMailMessageFrom([]string{To}, setting.Smtp.FromAddress, subject, body) -} - -func GetMailTmplData(u *m.User) map[interface{}]interface{} { +func getMailTmplData(u *m.User) map[interface{}]interface{} { data := make(map[interface{}]interface{}, 10) data["AppUrl"] = setting.AppUrl data["BuildVersion"] = setting.BuildVersion data["BuildStamp"] = setting.BuildStamp data["BuildCommit"] = setting.BuildCommit + data["Subject"] = map[string]interface{}{} if u != nil { data["User"] = u } diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go index ccc0495ff41..702bc0032c3 100644 --- a/pkg/services/notifications/notifications.go +++ b/pkg/services/notifications/notifications.go @@ -1,11 +1,77 @@ package notifications -import "github.com/grafana/grafana/pkg/bus" +import ( + "bytes" + "encoding/hex" + "errors" + "html/template" + "path/filepath" -func Init() { + "github.com/Unknwon/com" + "github.com/grafana/grafana/pkg/bus" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" + "github.com/grafana/grafana/pkg/util" +) + +var mailTemplates *template.Template +var tmplResetPassword = "reset_password.html" + +func Init() error { bus.AddHandler("email", sendResetPasswordEmail) -} -func sendResetPasswordEmail(cmd *SendResetPasswordEmailCommand) error { + mailTemplates = template.New("name") + mailTemplates.Funcs(template.FuncMap{ + "Subject": subjectTemplateFunc, + }) + + templatePattern := filepath.Join(setting.StaticRootPath, "emails/*.html") + _, err := mailTemplates.ParseGlob(templatePattern) + if err != nil { + return err + } + + if !util.IsEmail(setting.Smtp.FromAddress) { + return errors.New("Invalid email address for smpt from_adress config") + } + return nil } + +var dispatchMail = func(cmd *m.SendEmailCommand) error { + return bus.Dispatch(cmd) +} + +func subjectTemplateFunc(obj map[string]interface{}, value string) string { + obj["value"] = value + return "" +} + +func sendResetPasswordEmail(cmd *m.SendResetPasswordEmailCommand) error { + var buffer bytes.Buffer + + var data = getMailTmplData(nil) + code := CreateUserActiveCode(cmd.User, nil) + data["Code"] = code + + mailTemplates.ExecuteTemplate(&buffer, tmplResetPassword, data) + + dispatchMail(&m.SendEmailCommand{ + To: []string{cmd.User.Email}, + From: setting.Smtp.FromAddress, + Subject: data["Subject"].(map[string]interface{})["value"].(string), + Body: buffer.String(), + }) + + return nil +} + +func CreateUserActiveCode(u *m.User, startInf interface{}) string { + minutes := setting.EmailCodeValidMinutes + data := com.ToStr(u.Id) + u.Email + u.Login + u.Password + u.Rands + code := CreateTimeLimitCode(data, minutes, startInf) + + // add tail hex username + code += hex.EncodeToString([]byte(u.Login)) + return code +} diff --git a/pkg/services/notifications/notifications_test.go b/pkg/services/notifications/notifications_test.go new file mode 100644 index 00000000000..04dd8785f96 --- /dev/null +++ b/pkg/services/notifications/notifications_test.go @@ -0,0 +1,37 @@ +package notifications + +import ( + "testing" + + "github.com/grafana/grafana/pkg/bus" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" + . "github.com/smartystreets/goconvey/convey" +) + +func TestNotifications(t *testing.T) { + + Convey("Given the notifications service", t, func() { + bus.ClearBusHandlers() + + setting.StaticRootPath = "../../../public/" + setting.Smtp.FromAddress = "from@address.com" + + err := Init() + So(err, ShouldBeNil) + + var sentMail *m.SendEmailCommand + dispatchMail = func(cmd *m.SendEmailCommand) error { + sentMail = cmd + return nil + } + + Convey("When sending reset email password", func() { + sendResetPasswordEmail(&m.SendResetPasswordEmailCommand{User: &m.User{Email: "asd@asd.com"}}) + So(sentMail.Body, ShouldContainSubstring, "h2") + So(sentMail.Subject, ShouldEqual, "Welcome to Grafana") + So(sentMail.Body, ShouldNotContainSubstring, "Subject") + }) + }) + +} diff --git a/pkg/services/search/handlers_test.go b/pkg/services/search/handlers_test.go index dc9835caa44..bb355ec146f 100644 --- a/pkg/services/search/handlers_test.go +++ b/pkg/services/search/handlers_test.go @@ -11,7 +11,7 @@ import ( func TestSearch(t *testing.T) { Convey("Given search query", t, func() { - jsonDashIndex = NewJsonDashIndex("../../public/dashboards/") + jsonDashIndex = NewJsonDashIndex("../../../public/dashboards/") query := Query{Limit: 2000} bus.AddHandler("test", func(query *FindPersistedDashboardsQuery) error { diff --git a/pkg/services/search/json_index_test.go b/pkg/services/search/json_index_test.go index afd584fffbd..145e1ac1e99 100644 --- a/pkg/services/search/json_index_test.go +++ b/pkg/services/search/json_index_test.go @@ -9,7 +9,7 @@ import ( func TestJsonDashIndex(t *testing.T) { Convey("Given the json dash index", t, func() { - index := NewJsonDashIndex("../../public/dashboards/") + index := NewJsonDashIndex("../../../public/dashboards/") Convey("Should be able to update index", func() { err := index.updateIndex() diff --git a/pkg/services/sqlstore/dashboard_test.go b/pkg/services/sqlstore/dashboard_test.go index 0ddd0db0df6..0d4eb111868 100644 --- a/pkg/services/sqlstore/dashboard_test.go +++ b/pkg/services/sqlstore/dashboard_test.go @@ -6,7 +6,7 @@ import ( . "github.com/smartystreets/goconvey/convey" m "github.com/grafana/grafana/pkg/models" - "github.com/grafana/grafana/pkg/search" + "github.com/grafana/grafana/pkg/services/search" ) func insertTestDashboard(title string, orgId int64, tags ...interface{}) *m.Dashboard { diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index fc430e65c50..ee11955bbf5 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -67,11 +67,12 @@ var ( EnforceDomain bool // Security settings. - SecretKey string - LogInRememberDays int - CookieUserName string - CookieRememberName string - DisableGravatar bool + SecretKey string + LogInRememberDays int + CookieUserName string + CookieRememberName string + DisableGravatar bool + EmailCodeValidMinutes int // User settings AllowUserSignUp bool diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go index 73ccabd2dbc..00da9b4f416 100644 --- a/pkg/setting/setting_test.go +++ b/pkg/setting/setting_test.go @@ -15,7 +15,6 @@ func TestLoadingSettings(t *testing.T) { Convey("Given the default ini files", func() { NewConfigContext(&CommandLineArgs{HomePath: "../../"}) - So(AppName, ShouldEqual, "Grafana") So(AdminUser, ShouldEqual, "admin") }) diff --git a/pkg/util/validation.go b/pkg/util/validation.go new file mode 100644 index 00000000000..dd7404e6de4 --- /dev/null +++ b/pkg/util/validation.go @@ -0,0 +1,18 @@ +package util + +import ( + "regexp" + "strings" +) + +const ( + emailRegexPattern string = "^(((([a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])+(\\.([a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])+)*)|((\\x22)((((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(([\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]|\\x21|[\\x23-\\x5b]|[\\x5d-\\x7e]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(\\([\\x01-\\x09\\x0b\\x0c\\x0d-\\x7f]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}]))))*(((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(\\x22)))@((([a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(([a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])([a-zA-Z]|\\d|-|\\.|_|~|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])*([a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])))\\.)+(([a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(([a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])([a-zA-Z]|\\d|-|\\.|_|~|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])*([a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])))\\.?$" +) + +var ( + regexEmail = regexp.MustCompile(emailRegexPattern) +) + +func IsEmail(str string) bool { + return regexEmail.MatchString(strings.ToLower(str)) +} diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html new file mode 100644 index 00000000000..3b4190f8f41 --- /dev/null +++ b/public/emails/reset_password.html @@ -0,0 +1,5 @@ +{{Subject .Subject "Welcome to Grafana"}} + +

      + {{.BuildVersion}} +

      From e40b462040c0f2d9dbeca3defec58cf2a7c6394c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 5 Jun 2015 11:44:52 +0200 Subject: [PATCH 274/398] began work on reset password view, and angular controller --- public/app/controllers/all.js | 1 + public/app/controllers/resetPasswordCtrl.js | 28 ++++++++++++++ public/app/partials/login.html | 10 ++++- public/app/partials/reset_password.html | 41 +++++++++++++++++++++ public/app/routes/all.js | 4 ++ public/css/less/login.less | 2 +- 6 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 public/app/controllers/resetPasswordCtrl.js create mode 100644 public/app/partials/reset_password.html diff --git a/public/app/controllers/all.js b/public/app/controllers/all.js index f735963e886..99b9a496484 100644 --- a/public/app/controllers/all.js +++ b/public/app/controllers/all.js @@ -6,6 +6,7 @@ define([ './inspectCtrl', './jsonEditorCtrl', './loginCtrl', + './resetPasswordCtrl', './sidemenuCtrl', './errorCtrl', ], function () {}); diff --git a/public/app/controllers/resetPasswordCtrl.js b/public/app/controllers/resetPasswordCtrl.js new file mode 100644 index 00000000000..385a52320d1 --- /dev/null +++ b/public/app/controllers/resetPasswordCtrl.js @@ -0,0 +1,28 @@ +define([ + 'angular', + 'app', + 'lodash' +], +function (angular, app, _) { + 'use strict'; + + var module = angular.module('grafana.controllers'); + + module.controller('ResetPasswordCtrl', function($scope, contextSrv, backendSrv) { + + contextSrv.sidemenu = false; + $scope.sendMode = true; + $scope.formModel = {}; + + $scope.sendResetEmail = function() { + if (!$scope.loginForm.$valid) { + return; + } + + backendSrv.post('/api/user/password/send-reset-email', $scope.formModel).then(function() { + }); + }; + + }); + +}); diff --git a/public/app/partials/login.html b/public/app/partials/login.html index 437588dd652..ded98e6bd67 100644 --- a/public/app/partials/login.html +++ b/public/app/partials/login.html @@ -91,7 +91,15 @@
    -
    +
    +
    + + Forgot your password? + +
    +
    + +
    Grafana version: {{buildInfo.version}}, commit: {{buildInfo.commit}}, build date: {{buildInfo.buildstamp | date: 'yyyy-MM-dd HH:mm:ss' }} diff --git a/public/app/partials/reset_password.html b/public/app/partials/reset_password.html new file mode 100644 index 00000000000..28feb2b61d0 --- /dev/null +++ b/public/app/partials/reset_password.html @@ -0,0 +1,41 @@ +
    + + +
    + diff --git a/public/app/routes/all.js b/public/app/routes/all.js index 5d6842f12cc..fe534cbe723 100644 --- a/public/app/routes/all.js +++ b/public/app/routes/all.js @@ -97,6 +97,10 @@ define([ templateUrl: 'app/partials/login.html', controller : 'LoginCtrl', }) + .when('/reset-password/send', { + templateUrl: 'app/partials/reset_password.html', + controller : 'ResetPasswordCtrl', + }) .otherwise({ templateUrl: 'app/partials/error.html', controller: 'ErrorCtrl' diff --git a/public/css/less/login.less b/public/css/less/login.less index 1611f294e4f..efd52df294f 100644 --- a/public/css/less/login.less +++ b/public/css/less/login.less @@ -74,7 +74,7 @@ padding: 9px 7px; font-size: 14px; font-weight: bold; - width: 150px; + min-width: 150px; display: inline-block; border: 1px solid lighten(@btnInverseBackground, 10%); } From aa4d60c21ea5997b5c288242b7b51b1106c5a466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 8 Jun 2015 10:57:01 +0200 Subject: [PATCH 275/398] Worked on reset password views, refactored out password strength to a reusable directive --- pkg/api/api.go | 7 +++ pkg/api/dtos/user.go | 4 ++ pkg/api/password.go | 27 +++++++++ pkg/models/emails.go | 10 +--- pkg/models/user.go | 10 ++++ pkg/services/mailer/mailer.go | 47 ---------------- pkg/services/notifications/email.go | 4 +- pkg/services/notifications/notifications.go | 38 ++++++++++++- .../notifications/notifications_test.go | 4 +- public/app/controllers/loginCtrl.js | 24 -------- public/app/controllers/resetPasswordCtrl.js | 27 +++++++-- public/app/directives/all.js | 1 + public/app/directives/passwordStrenght.js | 47 ++++++++++++++++ public/app/partials/login.html | 16 +++--- public/app/partials/reset_password.html | 55 ++++++++++++++++++- public/app/routes/all.js | 6 +- public/css/less/login.less | 7 +-- public/emails/reset_password.html | 37 +++++++++++-- 18 files changed, 259 insertions(+), 112 deletions(-) create mode 100644 pkg/api/password.go create mode 100644 public/app/directives/passwordStrenght.js diff --git a/pkg/api/api.go b/pkg/api/api.go index 6ecaa51652e..8be5bfe054f 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -41,6 +41,13 @@ func Register(r *macaron.Macaron) { r.Get("/signup", Index) r.Post("/api/user/signup", bind(m.CreateUserCommand{}), SignUp) + // reset password + r.Get("/user/password/send-reset-email", Index) + r.Get("/user/password/reset", Index) + + r.Post("/api/user/password/send-reset-email", bind(dtos.SendResetPasswordEmailForm{}), wrap(SendResetPasswordEmail)) + r.Post("/api/user/password/reset", wrap(ViewResetPasswordForm)) + // dashboard snapshots r.Post("/api/snapshots/", bind(m.CreateDashboardSnapshotCommand{}), CreateDashboardSnapshot) r.Get("/dashboard/snapshot/*", Index) diff --git a/pkg/api/dtos/user.go b/pkg/api/dtos/user.go index 0224ced599d..4a569f9c492 100644 --- a/pkg/api/dtos/user.go +++ b/pkg/api/dtos/user.go @@ -27,3 +27,7 @@ type AdminUserListItem struct { Login string `json:"login"` IsGrafanaAdmin bool `json:"isGrafanaAdmin"` } + +type SendResetPasswordEmailForm struct { + UserOrEmail string `json:"userOrEmail" binding:"Required"` +} diff --git a/pkg/api/password.go b/pkg/api/password.go new file mode 100644 index 00000000000..0957e130a61 --- /dev/null +++ b/pkg/api/password.go @@ -0,0 +1,27 @@ +package api + +import ( + "github.com/grafana/grafana/pkg/api/dtos" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" +) + +func SendResetPasswordEmail(c *middleware.Context, form dtos.SendResetPasswordEmailForm) Response { + userQuery := m.GetUserByLoginQuery{LoginOrEmail: form.UserOrEmail} + + if err := bus.Dispatch(&userQuery); err != nil { + return ApiError(404, "User does not exist", err) + } + + emailCmd := m.SendResetPasswordEmailCommand{User: userQuery.Result} + if err := bus.Dispatch(&emailCmd); err != nil { + return ApiError(500, "Failed to send email", err) + } + + return ApiSuccess("Email sent") +} + +func ViewResetPasswordForm(c *middleware.Context) Response { + return ApiSuccess("Email sent") +} diff --git a/pkg/models/emails.go b/pkg/models/emails.go index 99c31aa6423..e2ef777a5a6 100644 --- a/pkg/models/emails.go +++ b/pkg/models/emails.go @@ -5,7 +5,6 @@ type SendEmailCommand struct { From string Subject string Body string - Type string Massive bool Info string } @@ -16,13 +15,7 @@ type SendResetPasswordEmailCommand struct { // create mail content func (m *SendEmailCommand) Content() string { - // set mail type - contentType := "text/plain; charset=UTF-8" - if m.Type == "html" { - contentType = "text/html; charset=UTF-8" - } - - // create mail content + contentType := "text/html; charset=UTF-8" content := "From: " + m.From + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body return content } @@ -34,6 +27,5 @@ func NewSendEmailCommand(To []string, From, Subject, Body string) SendEmailComma From: From, Subject: Subject, Body: Body, - Type: "html", } } diff --git a/pkg/models/user.go b/pkg/models/user.go index 5efecc8deef..bf697676b32 100644 --- a/pkg/models/user.go +++ b/pkg/models/user.go @@ -30,6 +30,16 @@ type User struct { Updated time.Time } +func (u *User) NameOrFallback() string { + if u.Name != "" { + return u.Name + } else if u.Login != "" { + return u.Login + } else { + return u.Email + } +} + // --------------------- // COMMANDS diff --git a/pkg/services/mailer/mailer.go b/pkg/services/mailer/mailer.go index 91e57fe9505..c3a1fe3ce63 100644 --- a/pkg/services/mailer/mailer.go +++ b/pkg/services/mailer/mailer.go @@ -55,12 +55,6 @@ func processMailQueue() { } } -func encodeRFC2047(text string) string { - // use mail's rfc2047 to encode any string - addr := mail.Address{Address: text} - return strings.Trim(addr.String(), " <>") -} - func handleEmailCommand(cmd *m.SendEmailCommand) error { log.Info("Sending on queue") mailQueue <- cmd @@ -166,47 +160,6 @@ func sendToSmtpServer(recipients []string, msgContent []byte) error { } return client.Quit() - // smtpServer := "smtp.gmail.com" - // auth := smtp.PlainAuth( - // "", - // "torkel.odegaard@gmail.com", - // "peslpwstnnloiksq", - // smtpServer, - // ) - // - // from := mail.Address{Name: "test", Address: "torkel@test.com"} - // to := mail.Address{Name: "Torkel Ödegaard", Address: "torkel@raintank.io"} - // title := "Message from Grafana" - // - // body := "Testing email sending" - // - // header := make(map[string]string) - // header["From"] = from.String() - // header["To"] = to.String() - // header["Subject"] = encodeRFC2047(title) - // header["MIME-Version"] = "1.0" - // header["Content-Type"] = "text/plain; charset=\"utf-8\"" - // header["Content-Transfer-Encoding"] = "base64" - // - // message := "" - // for k, v := range header { - // message += fmt.Sprintf("%s: %s\r\n", k, v) - // } - // message += "\r\n" + base64.StdEncoding.EncodeToString([]byte(body)) - // - // // Connect to the server, authenticate, set the sender and recipient, - // // and send the email all in one step. - // err := smtp.SendMail( - // smtpServer+":587", - // auth, - // from.Address, - // []string{to.Address}, - // []byte(message), - // ) - // if err != nil { - // log.Info("Failed to send email: %v", err) - // } - // kkkk } func buildAndSend(msg *m.SendEmailCommand) (int, error) { diff --git a/pkg/services/notifications/email.go b/pkg/services/notifications/email.go index 22cac1c2301..299b6315f17 100644 --- a/pkg/services/notifications/email.go +++ b/pkg/services/notifications/email.go @@ -20,10 +20,10 @@ func getMailTmplData(u *m.User) map[interface{}]interface{} { data["AppUrl"] = setting.AppUrl data["BuildVersion"] = setting.BuildVersion data["BuildStamp"] = setting.BuildStamp - data["BuildCommit"] = setting.BuildCommit + data["EmailCodeValidHours"] = setting.EmailCodeValidMinutes / 60 data["Subject"] = map[string]interface{}{} if u != nil { - data["User"] = u + data["Name"] = u.NameOrFallback() } return data } diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go index 702bc0032c3..0475b0704ad 100644 --- a/pkg/services/notifications/notifications.go +++ b/pkg/services/notifications/notifications.go @@ -35,6 +35,10 @@ func Init() error { return errors.New("Invalid email address for smpt from_adress config") } + if setting.EmailCodeValidMinutes == 0 { + setting.EmailCodeValidMinutes = 120 + } + return nil } @@ -50,7 +54,7 @@ func subjectTemplateFunc(obj map[string]interface{}, value string) string { func sendResetPasswordEmail(cmd *m.SendResetPasswordEmailCommand) error { var buffer bytes.Buffer - var data = getMailTmplData(nil) + var data = getMailTmplData(cmd.User) code := CreateUserActiveCode(cmd.User, nil) data["Code"] = code @@ -75,3 +79,35 @@ func CreateUserActiveCode(u *m.User, startInf interface{}) string { code += hex.EncodeToString([]byte(u.Login)) return code } + +// // verify active code when active account +// func VerifyUserActiveCode(code string) (user *User) { +// minutes := setting.Service.ActiveCodeLives +// +// if user = getVerifyUser(code); user != nil { +// // time limit code +// prefix := code[:base.TimeLimitCodeLength] +// data := com.ToStr(user.Id) + user.Email + user.LowerName + user.Passwd + user.Rands +// +// if base.VerifyTimeLimitCode(data, minutes, prefix) { +// return user +// } +// } +// return nil +// } +// +// // verify active code when active account +// func VerifyUserActiveCode(code string) (user *User) { +// minutes := setting.Service.ActiveCodeLives +// +// if user = getVerifyUser(code); user != nil { +// // time limit code +// prefix := code[:base.TimeLimitCodeLength] +// data := com.ToStr(user.Id) + user.Email + user.LowerName + user.Passwd + user.Rands +// +// if base.VerifyTimeLimitCode(data, minutes, prefix) { +// return user +// } +// } +// return nil +// } diff --git a/pkg/services/notifications/notifications_test.go b/pkg/services/notifications/notifications_test.go index 04dd8785f96..8470aa06b83 100644 --- a/pkg/services/notifications/notifications_test.go +++ b/pkg/services/notifications/notifications_test.go @@ -28,8 +28,8 @@ func TestNotifications(t *testing.T) { Convey("When sending reset email password", func() { sendResetPasswordEmail(&m.SendResetPasswordEmailCommand{User: &m.User{Email: "asd@asd.com"}}) - So(sentMail.Body, ShouldContainSubstring, "h2") - So(sentMail.Subject, ShouldEqual, "Welcome to Grafana") + So(sentMail.Body, ShouldContainSubstring, "body") + So(sentMail.Subject, ShouldEqual, "Reset your Grafana password") So(sentMail.Body, ShouldNotContainSubstring, "Subject") }) }) diff --git a/public/app/controllers/loginCtrl.js b/public/app/controllers/loginCtrl.js index 767f788cea3..40e8009b399 100644 --- a/public/app/controllers/loginCtrl.js +++ b/public/app/controllers/loginCtrl.js @@ -21,13 +21,10 @@ function (angular, config) { $scope.disableUserSignUp = config.disableUserSignUp; $scope.loginMode = true; - $scope.submitBtnClass = 'btn-inverse'; $scope.submitBtnText = 'Log in'; - $scope.strengthClass = ''; $scope.init = function() { $scope.$watch("loginMode", $scope.loginModeChanged); - $scope.passwordChanged(); var params = $location.search(); if (params.failedMsg) { @@ -56,27 +53,6 @@ function (angular, config) { $scope.submitBtnText = newValue ? 'Log in' : 'Sign up'; }; - $scope.passwordChanged = function(newValue) { - if (!newValue) { - $scope.strengthText = ""; - $scope.strengthClass = "hidden"; - return; - } - if (newValue.length < 4) { - $scope.strengthText = "strength: weak sauce."; - $scope.strengthClass = "password-strength-bad"; - return; - } - if (newValue.length <= 8) { - $scope.strengthText = "strength: you can do better."; - $scope.strengthClass = "password-strength-ok"; - return; - } - - $scope.strengthText = "strength: strong like a bull."; - $scope.strengthClass = "password-strength-good"; - }; - $scope.signUp = function() { if (!$scope.loginForm.$valid) { return; diff --git a/public/app/controllers/resetPasswordCtrl.js b/public/app/controllers/resetPasswordCtrl.js index 385a52320d1..5d183d891ae 100644 --- a/public/app/controllers/resetPasswordCtrl.js +++ b/public/app/controllers/resetPasswordCtrl.js @@ -1,25 +1,40 @@ define([ 'angular', - 'app', - 'lodash' ], -function (angular, app, _) { +function (angular) { 'use strict'; var module = angular.module('grafana.controllers'); - module.controller('ResetPasswordCtrl', function($scope, contextSrv, backendSrv) { + module.controller('ResetPasswordCtrl', function($scope, contextSrv, backendSrv, $location) { contextSrv.sidemenu = false; - $scope.sendMode = true; $scope.formModel = {}; + $scope.mode = 'send'; + + if ($location.search().code) { + $scope.mode = 'reset'; + } $scope.sendResetEmail = function() { - if (!$scope.loginForm.$valid) { + if (!$scope.sendResetForm.$valid) { + return; + } + backendSrv.post('/api/user/password/send-reset-email', $scope.formModel).then(function() { + $scope.mode = 'email-sent'; + }); + }; + + $scope.submitReset = function() { + if (!$scope.resetForm.$valid) { return; } + + if ($scope.formModel.newPassword !== $scope.formModel.confirmPassword) { + $scope.appEvent('alert-warning', ['New passwords do not match', '']); return; } backendSrv.post('/api/user/password/send-reset-email', $scope.formModel).then(function() { + $location.path('login'); }); }; diff --git a/public/app/directives/all.js b/public/app/directives/all.js index b92bc59ca41..21ca137b92b 100644 --- a/public/app/directives/all.js +++ b/public/app/directives/all.js @@ -18,4 +18,5 @@ define([ './topnav', './giveFocus', './annotationTooltip', + './passwordStrenght', ], function () {}); diff --git a/public/app/directives/passwordStrenght.js b/public/app/directives/passwordStrenght.js new file mode 100644 index 00000000000..f75a8fe8854 --- /dev/null +++ b/public/app/directives/passwordStrenght.js @@ -0,0 +1,47 @@ +define([ + 'angular', +], +function (angular) { + 'use strict'; + + angular + .module('grafana.directives') + .directive('passwordStrength', function() { + var template = '
    ' + + '{{strengthText}}' + + '
    '; + return { + template: template, + scope: { + password: "=", + }, + link: function($scope) { + + $scope.strengthClass = ''; + + function passwordChanged(newValue) { + if (!newValue) { + $scope.strengthText = ""; + $scope.strengthClass = "hidden"; + return; + } + if (newValue.length < 4) { + $scope.strengthText = "strength: weak sauce."; + $scope.strengthClass = "password-strength-bad"; + return; + } + if (newValue.length <= 8) { + $scope.strengthText = "strength: you can do better."; + $scope.strengthClass = "password-strength-ok"; + return; + } + + $scope.strengthText = "strength: strong like a bull."; + $scope.strengthClass = "password-strength-good"; + } + + $scope.$watch("password", passwordChanged); + } + }; + }); +}); diff --git a/public/app/partials/login.html b/public/app/partials/login.html index ded98e6bd67..aa99daf85a6 100644 --- a/public/app/partials/login.html +++ b/public/app/partials/login.html @@ -42,7 +42,7 @@
      -
    • +
    • Email
    • @@ -54,24 +54,22 @@
        -
      • +
      • Password
      • - +
      -
      - {{strengthText}} +
      +
      - @@ -93,7 +91,7 @@
      - + Forgot your password?
      diff --git a/public/app/partials/reset_password.html b/public/app/partials/reset_password.html index 28feb2b61d0..2b1cee241ef 100644 --- a/public/app/partials/reset_password.html +++ b/public/app/partials/reset_password.html @@ -3,7 +3,9 @@
      diff --git a/public/app/routes/all.js b/public/app/routes/all.js index fe534cbe723..026eccc1d45 100644 --- a/public/app/routes/all.js +++ b/public/app/routes/all.js @@ -97,7 +97,11 @@ define([ templateUrl: 'app/partials/login.html', controller : 'LoginCtrl', }) - .when('/reset-password/send', { + .when('/user/password/send-reset-email', { + templateUrl: 'app/partials/reset_password.html', + controller : 'ResetPasswordCtrl', + }) + .when('/user/password/reset', { templateUrl: 'app/partials/reset_password.html', controller : 'ResetPasswordCtrl', }) diff --git a/public/css/less/login.less b/public/css/less/login.less index efd52df294f..7fa677c6a78 100644 --- a/public/css/less/login.less +++ b/public/css/less/login.less @@ -50,19 +50,18 @@ .password-strength { display: block; - width: 50px; + width: 15%; overflow: visible; white-space: nowrap; padding-top: 3px; - margin-left: 97px; color: darken(@textColor, 20%); border-top: 3px solid @red; &.password-strength-ok { - width: 170px; + width: 40%; border-top: 3px solid lighten(@yellow, 10%); } &.password-strength-good { - width: 254px; + width: 100%; border-top: 3px solid lighten(@green, 10%); } } diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index 3b4190f8f41..8753b441c56 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -1,5 +1,34 @@ -{{Subject .Subject "Welcome to Grafana"}} +{{Subject .Subject "Reset your Grafana password"}} -

      - {{.BuildVersion}} -

      + + + + +{{.Name}}, please reset your password + + +
      +
      +
      +
      +
      +
      + Hi {{.Name}}, +
      +
      +

      Please click the following link to reset your password within {{.EmailCodeValidHours}} hours.

      +

      + {{.AppUrl}}user/password/reset?code={{.Code}} +

      +

      Not working? Try copying and pasting it to your browser.

      +
      +
      +
      +
      +
      + © 2014 Grafana +
      +
      +
      + + From c8bc0b3bf8f856c9dbc1dee2bcfb6ad1cc083bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 8 Jun 2015 13:39:02 +0200 Subject: [PATCH 276/398] Lots of work on user password reset, #1456 --- pkg/api/api.go | 2 +- pkg/api/dtos/user.go | 6 +++ pkg/api/password.go | 26 ++++++++- pkg/models/emails.go | 9 ++++ pkg/services/notifications/codes.go | 35 ++++++++++-- pkg/services/notifications/codes_test.go | 35 ++++++++++++ pkg/services/notifications/notifications.go | 60 +++++++-------------- public/app/controllers/resetPasswordCtrl.js | 6 ++- 8 files changed, 129 insertions(+), 50 deletions(-) create mode 100644 pkg/services/notifications/codes_test.go diff --git a/pkg/api/api.go b/pkg/api/api.go index 8be5bfe054f..7a96b095348 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -46,7 +46,7 @@ func Register(r *macaron.Macaron) { r.Get("/user/password/reset", Index) r.Post("/api/user/password/send-reset-email", bind(dtos.SendResetPasswordEmailForm{}), wrap(SendResetPasswordEmail)) - r.Post("/api/user/password/reset", wrap(ViewResetPasswordForm)) + r.Post("/api/user/password/reset", bind(dtos.ResetUserPasswordForm{}), wrap(ResetPassword)) // dashboard snapshots r.Post("/api/snapshots/", bind(m.CreateDashboardSnapshotCommand{}), CreateDashboardSnapshot) diff --git a/pkg/api/dtos/user.go b/pkg/api/dtos/user.go index 4a569f9c492..a30bebf137f 100644 --- a/pkg/api/dtos/user.go +++ b/pkg/api/dtos/user.go @@ -31,3 +31,9 @@ type AdminUserListItem struct { type SendResetPasswordEmailForm struct { UserOrEmail string `json:"userOrEmail" binding:"Required"` } + +type ResetUserPasswordForm struct { + Code string `json:"code"` + NewPassword string `json:"newPassword"` + ConfirmPassword string `json:"confirmPassword"` +} diff --git a/pkg/api/password.go b/pkg/api/password.go index 0957e130a61..f3c2b0b7058 100644 --- a/pkg/api/password.go +++ b/pkg/api/password.go @@ -5,6 +5,7 @@ import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/util" ) func SendResetPasswordEmail(c *middleware.Context, form dtos.SendResetPasswordEmailForm) Response { @@ -22,6 +23,27 @@ func SendResetPasswordEmail(c *middleware.Context, form dtos.SendResetPasswordEm return ApiSuccess("Email sent") } -func ViewResetPasswordForm(c *middleware.Context) Response { - return ApiSuccess("Email sent") +func ResetPassword(c *middleware.Context, form dtos.ResetUserPasswordForm) Response { + query := m.ValidateResetPasswordCodeQuery{Code: form.Code} + + if err := bus.Dispatch(&query); err != nil { + if err == m.ErrInvalidEmailCode { + return ApiError(400, "Invalid or expired reset password code", nil) + } + return ApiError(500, "Unknown error validating email code", err) + } + + if form.NewPassword != form.ConfirmPassword { + return ApiError(400, "Passwords do not match", nil) + } + + cmd := m.ChangeUserPasswordCommand{} + cmd.UserId = query.Result.Id + cmd.NewPassword = util.EncodePassword(form.NewPassword, query.Result.Salt) + + if err := bus.Dispatch(&cmd); err != nil { + return ApiError(500, "Failed to change user password", err) + } + + return ApiSuccess("User password changed") } diff --git a/pkg/models/emails.go b/pkg/models/emails.go index e2ef777a5a6..b7812e756f4 100644 --- a/pkg/models/emails.go +++ b/pkg/models/emails.go @@ -1,5 +1,9 @@ package models +import "errors" + +var ErrInvalidEmailCode = errors.New("Invalid or expired email code") + type SendEmailCommand struct { To []string From string @@ -13,6 +17,11 @@ type SendResetPasswordEmailCommand struct { User *User } +type ValidateResetPasswordCodeQuery struct { + Code string + Result *User +} + // create mail content func (m *SendEmailCommand) Content() string { contentType := "text/html; charset=UTF-8" diff --git a/pkg/services/notifications/codes.go b/pkg/services/notifications/codes.go index 12c9a4c8172..4dbe76c1cad 100644 --- a/pkg/services/notifications/codes.go +++ b/pkg/services/notifications/codes.go @@ -7,12 +7,15 @@ import ( "time" "github.com/Unknwon/com" + m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" ) +const timeLimitCodeLength = 12 + 6 + 40 + // create a time limit code // code format: 12 length date time string + 6 minutes string + 40 sha1 encoded string -func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string { +func createTimeLimitCode(data string, minutes int, startInf interface{}) string { format := "200601021504" var start, end time.Time @@ -42,11 +45,14 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string } // verify time limit code -func VerifyTimeLimitCode(data string, minutes int, code string) bool { +func validateUserEmailCode(user *m.User, code string) bool { if len(code) <= 18 { return false } + minutes := setting.EmailCodeValidMinutes + code = code[:timeLimitCodeLength] + // split code start := code[:12] lives := code[12:18] @@ -55,7 +61,9 @@ func VerifyTimeLimitCode(data string, minutes int, code string) bool { } // right active code - retCode := CreateTimeLimitCode(data, minutes, start) + data := com.ToStr(user.Id) + user.Email + user.Login + user.Password + user.Rands + retCode := createTimeLimitCode(data, minutes, start) + fmt.Printf("code : %s\ncode2: %s", retCode, code) if retCode == code && minutes > 0 { // check time is expired or not before, _ := time.ParseInLocation("200601021504", start, time.Local) @@ -67,3 +75,24 @@ func VerifyTimeLimitCode(data string, minutes int, code string) bool { return false } + +func getLoginForEmailCode(code string) string { + if len(code) <= timeLimitCodeLength { + return "" + } + + // use tail hex username query user + hexStr := code[timeLimitCodeLength:] + b, _ := hex.DecodeString(hexStr) + return string(b) +} + +func createUserEmailCode(u *m.User, startInf interface{}) string { + minutes := setting.EmailCodeValidMinutes + data := com.ToStr(u.Id) + u.Email + u.Login + u.Password + u.Rands + code := createTimeLimitCode(data, minutes, startInf) + + // add tail hex username + code += hex.EncodeToString([]byte(u.Login)) + return code +} diff --git a/pkg/services/notifications/codes_test.go b/pkg/services/notifications/codes_test.go new file mode 100644 index 00000000000..be1fc91153b --- /dev/null +++ b/pkg/services/notifications/codes_test.go @@ -0,0 +1,35 @@ +package notifications + +import ( + "testing" + + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" + . "github.com/smartystreets/goconvey/convey" +) + +func TestEmailCodes(t *testing.T) { + + Convey("When generating code", t, func() { + setting.EmailCodeValidMinutes = 120 + + user := &m.User{Id: 10, Email: "t@a.com", Login: "asd", Password: "1", Rands: "2"} + code := createUserEmailCode(user, nil) + + Convey("getLoginForCode should return login", func() { + login := getLoginForEmailCode(code) + So(login, ShouldEqual, "asd") + }) + + Convey("Can verify valid code", func() { + So(validateUserEmailCode(user, code), ShouldBeTrue) + }) + + Convey("Cannot verify in-valid code", func() { + code = "ASD" + So(validateUserEmailCode(user, code), ShouldBeFalse) + }) + + }) + +} diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go index 0475b0704ad..8a162455248 100644 --- a/pkg/services/notifications/notifications.go +++ b/pkg/services/notifications/notifications.go @@ -2,12 +2,10 @@ package notifications import ( "bytes" - "encoding/hex" "errors" "html/template" "path/filepath" - "github.com/Unknwon/com" "github.com/grafana/grafana/pkg/bus" m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" @@ -19,6 +17,7 @@ var tmplResetPassword = "reset_password.html" func Init() error { bus.AddHandler("email", sendResetPasswordEmail) + bus.AddHandler("email", validateResetPasswordCode) mailTemplates = template.New("name") mailTemplates.Funcs(template.FuncMap{ @@ -55,7 +54,7 @@ func sendResetPasswordEmail(cmd *m.SendResetPasswordEmailCommand) error { var buffer bytes.Buffer var data = getMailTmplData(cmd.User) - code := CreateUserActiveCode(cmd.User, nil) + code := createUserEmailCode(cmd.User, nil) data["Code"] = code mailTemplates.ExecuteTemplate(&buffer, tmplResetPassword, data) @@ -70,44 +69,21 @@ func sendResetPasswordEmail(cmd *m.SendResetPasswordEmailCommand) error { return nil } -func CreateUserActiveCode(u *m.User, startInf interface{}) string { - minutes := setting.EmailCodeValidMinutes - data := com.ToStr(u.Id) + u.Email + u.Login + u.Password + u.Rands - code := CreateTimeLimitCode(data, minutes, startInf) +func validateResetPasswordCode(query *m.ValidateResetPasswordCodeQuery) error { + login := getLoginForEmailCode(query.Code) + if login == "" { + return m.ErrInvalidEmailCode + } - // add tail hex username - code += hex.EncodeToString([]byte(u.Login)) - return code + userQuery := m.GetUserByLoginQuery{LoginOrEmail: login} + if err := bus.Dispatch(&userQuery); err != nil { + return err + } + + if !validateUserEmailCode(userQuery.Result, query.Code) { + return m.ErrInvalidEmailCode + } + + query.Result = userQuery.Result + return nil } - -// // verify active code when active account -// func VerifyUserActiveCode(code string) (user *User) { -// minutes := setting.Service.ActiveCodeLives -// -// if user = getVerifyUser(code); user != nil { -// // time limit code -// prefix := code[:base.TimeLimitCodeLength] -// data := com.ToStr(user.Id) + user.Email + user.LowerName + user.Passwd + user.Rands -// -// if base.VerifyTimeLimitCode(data, minutes, prefix) { -// return user -// } -// } -// return nil -// } -// -// // verify active code when active account -// func VerifyUserActiveCode(code string) (user *User) { -// minutes := setting.Service.ActiveCodeLives -// -// if user = getVerifyUser(code); user != nil { -// // time limit code -// prefix := code[:base.TimeLimitCodeLength] -// data := com.ToStr(user.Id) + user.Email + user.LowerName + user.Passwd + user.Rands -// -// if base.VerifyTimeLimitCode(data, minutes, prefix) { -// return user -// } -// } -// return nil -// } diff --git a/public/app/controllers/resetPasswordCtrl.js b/public/app/controllers/resetPasswordCtrl.js index 5d183d891ae..ed693f0d45a 100644 --- a/public/app/controllers/resetPasswordCtrl.js +++ b/public/app/controllers/resetPasswordCtrl.js @@ -12,8 +12,10 @@ function (angular) { $scope.formModel = {}; $scope.mode = 'send'; - if ($location.search().code) { + var params = $location.search(); + if (params.code) { $scope.mode = 'reset'; + $scope.formModel.code = params.code; } $scope.sendResetEmail = function() { @@ -33,7 +35,7 @@ function (angular) { return; } - backendSrv.post('/api/user/password/send-reset-email', $scope.formModel).then(function() { + backendSrv.post('/api/user/password/reset', $scope.formModel).then(function() { $location.path('login'); }); }; From 42fc68baa5cfc56d9758c9bf4c3dcc343fa40142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 8 Jun 2015 16:51:25 +0200 Subject: [PATCH 277/398] Simplified emailing system and combined mailer and notifications packages --- main.go | 2 -- pkg/models/emails.go | 28 +++------------ pkg/services/notifications/email.go | 22 +++++++----- .../{mailer => notifications}/mailer.go | 20 ++++------- pkg/services/notifications/notifications.go | 35 ++++++++++++------- .../notifications/notifications_test.go | 13 ++++--- 6 files changed, 54 insertions(+), 66 deletions(-) rename pkg/services/{mailer => notifications}/mailer.go (90%) diff --git a/main.go b/main.go index e49ec8b4fa9..a732e1a166f 100644 --- a/main.go +++ b/main.go @@ -15,7 +15,6 @@ import ( "github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/services/eventpublisher" - "github.com/grafana/grafana/pkg/services/mailer" "github.com/grafana/grafana/pkg/services/notifications" "github.com/grafana/grafana/pkg/services/search" "github.com/grafana/grafana/pkg/services/sqlstore" @@ -58,7 +57,6 @@ func main() { social.NewOAuthService() eventpublisher.Init() plugins.Init() - mailer.Init() if err := notifications.Init(); err != nil { log.Fatal(3, "Notification service failed to initialize", err) diff --git a/pkg/models/emails.go b/pkg/models/emails.go index b7812e756f4..74da180f7d8 100644 --- a/pkg/models/emails.go +++ b/pkg/models/emails.go @@ -5,12 +5,11 @@ import "errors" var ErrInvalidEmailCode = errors.New("Invalid or expired email code") type SendEmailCommand struct { - To []string - From string - Subject string - Body string - Massive bool - Info string + To []string + Template string + Data map[string]interface{} + Massive bool + Info string } type SendResetPasswordEmailCommand struct { @@ -21,20 +20,3 @@ type ValidateResetPasswordCodeQuery struct { Code string Result *User } - -// create mail content -func (m *SendEmailCommand) Content() string { - contentType := "text/html; charset=UTF-8" - content := "From: " + m.From + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body - return content -} - -// Create html mail command -func NewSendEmailCommand(To []string, From, Subject, Body string) SendEmailCommand { - return SendEmailCommand{ - To: To, - From: From, - Subject: Subject, - Body: Body, - } -} diff --git a/pkg/services/notifications/email.go b/pkg/services/notifications/email.go index 299b6315f17..f81f3e1007b 100644 --- a/pkg/services/notifications/email.go +++ b/pkg/services/notifications/email.go @@ -5,18 +5,23 @@ import ( "github.com/grafana/grafana/pkg/setting" ) -// Create New mail message use MailFrom and MailUser -func newMailMessageFrom(To []string, from, subject, body string) m.SendEmailCommand { - return m.NewSendEmailCommand(To, from, subject, body) +type Message struct { + To []string + From string + Subject string + Body string + Massive bool + Info string } -// Create New mail message use MailFrom and MailUser -func newMailMessage(To string, subject, body string) m.SendEmailCommand { - return newMailMessageFrom([]string{To}, setting.Smtp.FromAddress, subject, body) +// create mail content +func (m *Message) Content() string { + contentType := "text/html; charset=UTF-8" + content := "From: " + m.From + "\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body + return content } -func getMailTmplData(u *m.User) map[interface{}]interface{} { - data := make(map[interface{}]interface{}, 10) +func setDefaultTemplateData(data map[string]interface{}, u *m.User) { data["AppUrl"] = setting.AppUrl data["BuildVersion"] = setting.BuildVersion data["BuildStamp"] = setting.BuildStamp @@ -25,5 +30,4 @@ func getMailTmplData(u *m.User) map[interface{}]interface{} { if u != nil { data["Name"] = u.NameOrFallback() } - return data } diff --git a/pkg/services/mailer/mailer.go b/pkg/services/notifications/mailer.go similarity index 90% rename from pkg/services/mailer/mailer.go rename to pkg/services/notifications/mailer.go index c3a1fe3ce63..597b536dca1 100644 --- a/pkg/services/mailer/mailer.go +++ b/pkg/services/notifications/mailer.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package mailer +package notifications import ( "crypto/tls" @@ -13,18 +13,14 @@ import ( "os" "strings" - "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/log" - m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" ) -var mailQueue chan *m.SendEmailCommand +var mailQueue chan *Message -func Init() { - bus.AddHandler("email", handleEmailCommand) - - mailQueue = make(chan *m.SendEmailCommand, 10) +func initMailQueue() { + mailQueue = make(chan *Message, 10) setting.Smtp = setting.SmtpSettings{ Host: "smtp.gmail.com:587", @@ -55,10 +51,8 @@ func processMailQueue() { } } -func handleEmailCommand(cmd *m.SendEmailCommand) error { - log.Info("Sending on queue") - mailQueue <- cmd - return nil +var addToMailQueue = func(msg *Message) { + mailQueue <- msg } func sendToSmtpServer(recipients []string, msgContent []byte) error { @@ -162,7 +156,7 @@ func sendToSmtpServer(recipients []string, msgContent []byte) error { return client.Quit() } -func buildAndSend(msg *m.SendEmailCommand) (int, error) { +func buildAndSend(msg *Message) (int, error) { log.Trace("Sending mails to: %s", strings.Join(msg.To, "; ")) // get message body diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go index 8a162455248..c78a6dd1350 100644 --- a/pkg/services/notifications/notifications.go +++ b/pkg/services/notifications/notifications.go @@ -16,8 +16,11 @@ var mailTemplates *template.Template var tmplResetPassword = "reset_password.html" func Init() error { + initMailQueue() + bus.AddHandler("email", sendResetPasswordEmail) bus.AddHandler("email", validateResetPasswordCode) + bus.AddHandler("email", sendEmailCommandHandler) mailTemplates = template.New("name") mailTemplates.Funcs(template.FuncMap{ @@ -41,26 +44,23 @@ func Init() error { return nil } -var dispatchMail = func(cmd *m.SendEmailCommand) error { - return bus.Dispatch(cmd) -} - func subjectTemplateFunc(obj map[string]interface{}, value string) string { obj["value"] = value return "" } -func sendResetPasswordEmail(cmd *m.SendResetPasswordEmailCommand) error { +func sendEmailCommandHandler(cmd *m.SendEmailCommand) error { var buffer bytes.Buffer + data := cmd.Data + if data == nil { + data = make(map[string]interface{}, 10) + } - var data = getMailTmplData(cmd.User) - code := createUserEmailCode(cmd.User, nil) - data["Code"] = code + setDefaultTemplateData(data, nil) + mailTemplates.ExecuteTemplate(&buffer, cmd.Template, data) - mailTemplates.ExecuteTemplate(&buffer, tmplResetPassword, data) - - dispatchMail(&m.SendEmailCommand{ - To: []string{cmd.User.Email}, + addToMailQueue(&Message{ + To: cmd.To, From: setting.Smtp.FromAddress, Subject: data["Subject"].(map[string]interface{})["value"].(string), Body: buffer.String(), @@ -69,6 +69,17 @@ func sendResetPasswordEmail(cmd *m.SendResetPasswordEmailCommand) error { return nil } +func sendResetPasswordEmail(cmd *m.SendResetPasswordEmailCommand) error { + return sendEmailCommandHandler(&m.SendEmailCommand{ + To: []string{cmd.User.Email}, + Template: tmplResetPassword, + Data: map[string]interface{}{ + "Code": createUserEmailCode(cmd.User, nil), + "Name": cmd.User.NameOrFallback(), + }, + }) +} + func validateResetPasswordCode(query *m.ValidateResetPasswordCodeQuery) error { login := getLoginForEmailCode(query.Code) if login == "" { diff --git a/pkg/services/notifications/notifications_test.go b/pkg/services/notifications/notifications_test.go index 8470aa06b83..ef600b63126 100644 --- a/pkg/services/notifications/notifications_test.go +++ b/pkg/services/notifications/notifications_test.go @@ -20,17 +20,16 @@ func TestNotifications(t *testing.T) { err := Init() So(err, ShouldBeNil) - var sentMail *m.SendEmailCommand - dispatchMail = func(cmd *m.SendEmailCommand) error { - sentMail = cmd - return nil + var sentMsg *Message + addToMailQueue = func(msg *Message) { + sentMsg = msg } Convey("When sending reset email password", func() { sendResetPasswordEmail(&m.SendResetPasswordEmailCommand{User: &m.User{Email: "asd@asd.com"}}) - So(sentMail.Body, ShouldContainSubstring, "body") - So(sentMail.Subject, ShouldEqual, "Reset your Grafana password") - So(sentMail.Body, ShouldNotContainSubstring, "Subject") + So(sentMsg.Body, ShouldContainSubstring, "body") + So(sentMsg.Subject, ShouldEqual, "Reset your Grafana password") + So(sentMsg.Body, ShouldNotContainSubstring, "Subject") }) }) From db0c442eaf94f0293dc15d87bdc1c966efe9ed8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 8 Jun 2015 17:56:56 +0200 Subject: [PATCH 278/398] Added configuration options for smtp --- conf/defaults.ini | 14 ++++++++++ conf/sample.ini | 14 ++++++++++ pkg/api/signup.go | 8 ++++++ pkg/events/events.go | 8 ++++++ pkg/services/notifications/mailer.go | 8 ------ pkg/services/notifications/notifications.go | 25 +++++++++++++++++ pkg/setting/setting.go | 1 + pkg/setting/setting_smtp.go | 18 +++++++++++++ public/emails/welcome_on_signup.html | 30 +++++++++++++++++++++ 9 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 public/emails/welcome_on_signup.html diff --git a/conf/defaults.ini b/conf/defaults.ini index 258a0198155..5423399d201 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -174,6 +174,20 @@ header_name = X-WEBAUTH-USER header_property = username auto_sign_up = true +#################################### SMTP / Emailing ########################## +[smtp] +enabled = false +host = localhost:25 +user = +password = +cert_file = +key_file = +skip_verify = false +from_address = admin@grafana.localhost + +[emails] +welcome_email_on_sign_up = false + #################################### Logging ########################## [log] # Either "console", "file", default is "console" diff --git a/conf/sample.ini b/conf/sample.ini index 3c2773fa674..49a9440872e 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -173,6 +173,20 @@ ;header_property = username ;auto_sign_up = true +#################################### SMTP / Emailing ########################## +[smtp] +;enabled = false +;host = localhost:25 +;user = +;password = +;cert_file = +;key_file = +;skip_verify = false +;from_address = admin@grafana.localhost + +[emails] +;welcome_email_on_sign_up = false + #################################### Logging ########################## [log] # Either "console", "file", default is "console" diff --git a/pkg/api/signup.go b/pkg/api/signup.go index 63bb34c72ac..d2723cee95c 100644 --- a/pkg/api/signup.go +++ b/pkg/api/signup.go @@ -2,6 +2,7 @@ package api import ( "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/events" "github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" @@ -24,6 +25,13 @@ func SignUp(c *middleware.Context, cmd m.CreateUserCommand) { user := cmd.Result + bus.Publish(&events.UserSignedUp{ + Id: user.Id, + Name: user.Name, + Email: user.Email, + Login: user.Login, + }) + loginUserWithUser(&user, c) c.JsonOK("User created and logged in") diff --git a/pkg/events/events.go b/pkg/events/events.go index c3dcac3e2b5..d34350f3834 100644 --- a/pkg/events/events.go +++ b/pkg/events/events.go @@ -70,6 +70,14 @@ type UserCreated struct { Email string `json:"email"` } +type UserSignedUp struct { + Timestamp time.Time `json:"timestamp"` + Id int64 `json:"id"` + Name string `json:"name"` + Login string `json:"login"` + Email string `json:"email"` +} + type UserUpdated struct { Timestamp time.Time `json:"timestamp"` Id int64 `json:"id"` diff --git a/pkg/services/notifications/mailer.go b/pkg/services/notifications/mailer.go index 597b536dca1..309436cb7d9 100644 --- a/pkg/services/notifications/mailer.go +++ b/pkg/services/notifications/mailer.go @@ -21,14 +21,6 @@ var mailQueue chan *Message func initMailQueue() { mailQueue = make(chan *Message, 10) - - setting.Smtp = setting.SmtpSettings{ - Host: "smtp.gmail.com:587", - User: "torkel.odegaard@gmail.com", - Password: "peslpwstnnloiksq", - FromAddress: "grafana@grafana.org", - } - go processMailQueue() } diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go index c78a6dd1350..a50fc5e1af0 100644 --- a/pkg/services/notifications/notifications.go +++ b/pkg/services/notifications/notifications.go @@ -7,6 +7,8 @@ import ( "path/filepath" "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/events" + "github.com/grafana/grafana/pkg/log" m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/util" @@ -14,6 +16,7 @@ import ( var mailTemplates *template.Template var tmplResetPassword = "reset_password.html" +var tmplWelcomeOnSignUp = "welcome_on_signup.html" func Init() error { initMailQueue() @@ -22,6 +25,8 @@ func Init() error { bus.AddHandler("email", validateResetPasswordCode) bus.AddHandler("email", sendEmailCommandHandler) + bus.AddEventListener(userSignedUpHandler) + mailTemplates = template.New("name") mailTemplates.Funcs(template.FuncMap{ "Subject": subjectTemplateFunc, @@ -50,6 +55,10 @@ func subjectTemplateFunc(obj map[string]interface{}, value string) string { } func sendEmailCommandHandler(cmd *m.SendEmailCommand) error { + if !setting.Smtp.Enabled { + return errors.New("Grafana mailing/smtp options not configured, contact your Grafana admin") + } + var buffer bytes.Buffer data := cmd.Data if data == nil { @@ -98,3 +107,19 @@ func validateResetPasswordCode(query *m.ValidateResetPasswordCodeQuery) error { query.Result = userQuery.Result return nil } + +func userSignedUpHandler(evt *events.UserSignedUp) error { + log.Info("User signed up: %s, send_option: %s", evt.Email, setting.Smtp.SendWelcomeEmailOnSignUp) + + if evt.Email == "" || !setting.Smtp.SendWelcomeEmailOnSignUp { + return nil + } + + return sendEmailCommandHandler(&m.SendEmailCommand{ + To: []string{evt.Email}, + Template: tmplWelcomeOnSignUp, + Data: map[string]interface{}{ + "Name": evt.Login, + }, + }) +} diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index ee11955bbf5..b53cfac472a 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -409,6 +409,7 @@ func NewConfigContext(args *CommandLineArgs) { GoogleAnalyticsId = analytics.Key("google_analytics_ua_id").String() readSessionConfig() + readSmtpSettings() } func readSessionConfig() { diff --git a/pkg/setting/setting_smtp.go b/pkg/setting/setting_smtp.go index e392c164ee3..904c76d09dd 100644 --- a/pkg/setting/setting_smtp.go +++ b/pkg/setting/setting_smtp.go @@ -1,6 +1,7 @@ package setting type SmtpSettings struct { + Enabled bool Host string User string Password string @@ -8,4 +9,21 @@ type SmtpSettings struct { KeyFile string FromAddress string SkipVerify bool + + SendWelcomeEmailOnSignUp bool +} + +func readSmtpSettings() { + sec := Cfg.Section("smtp") + Smtp.Enabled = sec.Key("enabled").MustBool(false) + Smtp.Host = sec.Key("host").String() + Smtp.User = sec.Key("user").String() + Smtp.Password = sec.Key("password").String() + Smtp.CertFile = sec.Key("cert_file").String() + Smtp.KeyFile = sec.Key("key_file").String() + Smtp.FromAddress = sec.Key("from_address").String() + Smtp.SkipVerify = sec.Key("skip_verify").MustBool(false) + + emails := Cfg.Section("emails") + Smtp.SendWelcomeEmailOnSignUp = emails.Key("welcome_email_on_sign_up").MustBool(false) } diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html new file mode 100644 index 00000000000..5018930da57 --- /dev/null +++ b/public/emails/welcome_on_signup.html @@ -0,0 +1,30 @@ +{{Subject .Subject "Welcome to Grafana"}} + + + + + +{{.Name}} Welcome to Grafana + + +
      +
      +
      +
      +
      +
      + Hi {{.Name}}, +
      +
      + +
      +
      +
      +
      +
      + © 2014 Grafana +
      +
      +
      + + From bb2d810709128a37463bdc7e2513c902e6d7ec35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 8 Jun 2015 18:25:04 +0200 Subject: [PATCH 279/398] Final work password reset email, Closes #1456 --- conf/defaults.ini | 1 + pkg/services/notifications/notifications.go | 2 +- pkg/services/notifications/notifications_test.go | 5 ++++- pkg/setting/setting_smtp.go | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index f182ab130b1..5d1d1831cb3 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -188,6 +188,7 @@ from_address = admin@grafana.localhost [emails] welcome_email_on_sign_up = false +templates_pattern = emails/*.html #################################### Logging ########################## [log] diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go index a50fc5e1af0..57c84df8d63 100644 --- a/pkg/services/notifications/notifications.go +++ b/pkg/services/notifications/notifications.go @@ -32,7 +32,7 @@ func Init() error { "Subject": subjectTemplateFunc, }) - templatePattern := filepath.Join(setting.StaticRootPath, "emails/*.html") + templatePattern := filepath.Join(setting.StaticRootPath, setting.Smtp.TemplatesPattern) _, err := mailTemplates.ParseGlob(templatePattern) if err != nil { return err diff --git a/pkg/services/notifications/notifications_test.go b/pkg/services/notifications/notifications_test.go index ef600b63126..a674d0b14c8 100644 --- a/pkg/services/notifications/notifications_test.go +++ b/pkg/services/notifications/notifications_test.go @@ -15,6 +15,8 @@ func TestNotifications(t *testing.T) { bus.ClearBusHandlers() setting.StaticRootPath = "../../../public/" + setting.Smtp.Enabled = true + setting.Smtp.TemplatesPattern = "emails/*.html" setting.Smtp.FromAddress = "from@address.com" err := Init() @@ -26,7 +28,8 @@ func TestNotifications(t *testing.T) { } Convey("When sending reset email password", func() { - sendResetPasswordEmail(&m.SendResetPasswordEmailCommand{User: &m.User{Email: "asd@asd.com"}}) + err := sendResetPasswordEmail(&m.SendResetPasswordEmailCommand{User: &m.User{Email: "asd@asd.com"}}) + So(err, ShouldBeNil) So(sentMsg.Body, ShouldContainSubstring, "body") So(sentMsg.Subject, ShouldEqual, "Reset your Grafana password") So(sentMsg.Body, ShouldNotContainSubstring, "Subject") diff --git a/pkg/setting/setting_smtp.go b/pkg/setting/setting_smtp.go index 904c76d09dd..e84b61634cc 100644 --- a/pkg/setting/setting_smtp.go +++ b/pkg/setting/setting_smtp.go @@ -11,6 +11,7 @@ type SmtpSettings struct { SkipVerify bool SendWelcomeEmailOnSignUp bool + TemplatesPattern string } func readSmtpSettings() { @@ -26,4 +27,5 @@ func readSmtpSettings() { emails := Cfg.Section("emails") Smtp.SendWelcomeEmailOnSignUp = emails.Key("welcome_email_on_sign_up").MustBool(false) + Smtp.TemplatesPattern = emails.Key("templates_pattern").MustString("emails/*.html") } From c20fa85b82aade5215aed399a94ee9dd8d7e2e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 9 Jun 2015 09:45:24 +0200 Subject: [PATCH 280/398] Renamed variable value select to select dropdown --- public/app/directives/all.js | 2 +- .../directives/{variableValueSelect.js => selectDropDown.js} | 4 ++-- .../variableValueSelect.html => partials/selectDropdown.html} | 0 public/app/partials/submenu.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename public/app/directives/{variableValueSelect.js => selectDropDown.js} (98%) rename public/app/{features/dashboard/partials/variableValueSelect.html => partials/selectDropdown.html} (100%) diff --git a/public/app/directives/all.js b/public/app/directives/all.js index 21ca137b92b..0a9ac603c57 100644 --- a/public/app/directives/all.js +++ b/public/app/directives/all.js @@ -11,7 +11,7 @@ define([ './spectrumPicker', './tags', './bodyClass', - './variableValueSelect', + './selectDropDown', './metric.segment', './grafanaVersionCheck', './dropdown.typeahead', diff --git a/public/app/directives/variableValueSelect.js b/public/app/directives/selectDropDown.js similarity index 98% rename from public/app/directives/variableValueSelect.js rename to public/app/directives/selectDropDown.js index ae08ad55ee4..312b6cdd7d1 100644 --- a/public/app/directives/variableValueSelect.js +++ b/public/app/directives/selectDropDown.js @@ -225,11 +225,11 @@ function (angular, app, _) { angular .module('grafana.directives') - .directive('variableValueSelect', function($compile, $window, $timeout) { + .directive('selectDropdown', function($compile, $window, $timeout) { return { scope: { variable: "=", onUpdated: "&", getValuesForTag: "&" }, - templateUrl: 'app/features/dashboard/partials/variableValueSelect.html', + templateUrl: 'app/partials/selectDropdown.html', controller: 'SelectDropdownCtrl', controllerAs: 'vm', bindToController: true, diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/partials/selectDropdown.html similarity index 100% rename from public/app/features/dashboard/partials/variableValueSelect.html rename to public/app/partials/selectDropdown.html diff --git a/public/app/partials/submenu.html b/public/app/partials/submenu.html index 5f5d29e87ba..0246d4a7673 100644 --- a/public/app/partials/submenu.html +++ b/public/app/partials/submenu.html @@ -6,7 +6,7 @@ {{variable.label || variable.name}}: - +
    From f6845cd107c1a59c3d11199a1b4499a5f23b2197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 9 Jun 2015 10:06:36 +0200 Subject: [PATCH 281/398] Variable value select fixes and refactorings --- public/app/directives/all.js | 2 +- ...lectDropDown.js => valueSelectDropdown.js} | 16 +++++++---- public/app/partials/submenu.html | 2 +- ...Dropdown.html => valueSelectDropdown.html} | 0 ...-specs.js => valueSelectDropdown-specs.js} | 27 +++++++++++++++++-- public/test/test-main.js | 2 +- 6 files changed, 39 insertions(+), 10 deletions(-) rename public/app/directives/{selectDropDown.js => valueSelectDropdown.js} (94%) rename public/app/partials/{selectDropdown.html => valueSelectDropdown.html} (100%) rename public/test/specs/{selectDropdownCtrl-specs.js => valueSelectDropdown-specs.js} (83%) diff --git a/public/app/directives/all.js b/public/app/directives/all.js index 0a9ac603c57..13a8accffbd 100644 --- a/public/app/directives/all.js +++ b/public/app/directives/all.js @@ -11,7 +11,7 @@ define([ './spectrumPicker', './tags', './bodyClass', - './selectDropDown', + './valueSelectDropdown', './metric.segment', './grafanaVersionCheck', './dropdown.typeahead', diff --git a/public/app/directives/selectDropDown.js b/public/app/directives/valueSelectDropdown.js similarity index 94% rename from public/app/directives/selectDropDown.js rename to public/app/directives/valueSelectDropdown.js index 312b6cdd7d1..14791eba0f3 100644 --- a/public/app/directives/selectDropDown.js +++ b/public/app/directives/valueSelectDropdown.js @@ -9,7 +9,7 @@ function (angular, app, _) { angular .module('grafana.controllers') - .controller('SelectDropdownCtrl', function($q) { + .controller('ValueSelectDropdownCtrl', function($q) { var vm = this; vm.show = function() { @@ -31,7 +31,13 @@ function (angular, app, _) { vm.selectedValues = _.filter(vm.options, {selected: true}); vm.tags = _.map(vm.variable.tags, function(value) { - return { text: value, selected: false }; + var tag = { text: value, selected: false }; + _.each(vm.variable.current.tags, function(tagObj) { + if (tagObj.text === value) { + tag.selected = true; + } + }); + return tag; }); vm.search = {query: '', options: vm.options}; @@ -225,12 +231,12 @@ function (angular, app, _) { angular .module('grafana.directives') - .directive('selectDropdown', function($compile, $window, $timeout) { + .directive('valueSelectDropdown', function($compile, $window, $timeout) { return { scope: { variable: "=", onUpdated: "&", getValuesForTag: "&" }, - templateUrl: 'app/partials/selectDropdown.html', - controller: 'SelectDropdownCtrl', + templateUrl: 'app/partials/valueSelectDropdown.html', + controller: 'ValueSelectDropdownCtrl', controllerAs: 'vm', bindToController: true, link: function(scope, elem) { diff --git a/public/app/partials/submenu.html b/public/app/partials/submenu.html index 0246d4a7673..2feec7edbca 100644 --- a/public/app/partials/submenu.html +++ b/public/app/partials/submenu.html @@ -6,7 +6,7 @@ {{variable.label || variable.name}}: - + diff --git a/public/app/partials/selectDropdown.html b/public/app/partials/valueSelectDropdown.html similarity index 100% rename from public/app/partials/selectDropdown.html rename to public/app/partials/valueSelectDropdown.html diff --git a/public/test/specs/selectDropdownCtrl-specs.js b/public/test/specs/valueSelectDropdown-specs.js similarity index 83% rename from public/test/specs/selectDropdownCtrl-specs.js rename to public/test/specs/valueSelectDropdown-specs.js index 3aae3429a7c..9fadb893467 100644 --- a/public/test/specs/selectDropdownCtrl-specs.js +++ b/public/test/specs/valueSelectDropdown-specs.js @@ -1,5 +1,5 @@ define([ - 'directives/variableValueSelect', + 'directives/valueSelectDropdown', ], function () { 'use strict'; @@ -15,7 +15,7 @@ function () { beforeEach(inject(function($controller, $rootScope, $q) { rootScope = $rootScope; scope = $rootScope.$new(); - ctrl = $controller('SelectDropdownCtrl', {$scope: scope}); + ctrl = $controller('ValueSelectDropdownCtrl', {$scope: scope}); ctrl.getValuesForTag = function(obj) { return $q.when(tagValuesMap[obj.tagKey]); }; @@ -134,5 +134,28 @@ function () { }); }); }); + + describe("Given variable with selected tags", function() { + beforeEach(function() { + ctrl.variable = { + current: {text: 'server-1', value: 'server-1', tags: [{text: 'key1'}] }, + options: [ + {text: 'server-1', value: 'server-1'}, + {text: 'server-2', value: 'server-2'}, + {text: 'server-3', value: 'server-3'}, + ], + tags: ["key1", "key2", "key3"], + multi: true + }; + ctrl.init(); + ctrl.show(); + }); + + it("should set tag as selected", function() { + expect(ctrl.tags[0].selected).to.be(true); + }); + + }); + }); }); diff --git a/public/test/test-main.js b/public/test/test-main.js index 6b62df02102..bbc6b239fa0 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -144,7 +144,7 @@ require([ 'specs/singlestat-specs', 'specs/dynamicDashboardSrv-specs', 'specs/unsavedChangesSrv-specs', - 'specs/selectDropdownCtrl-specs', + 'specs/valueSelectDropdown-specs', ]; var pluginSpecs = (config.plugins.specs || []).map(function (spec) { From 604f8a22f732b0b29aec1576f9ed5ebded01ab47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 9 Jun 2015 10:22:43 +0200 Subject: [PATCH 282/398] Fixed state issue with variable value dropdown, #2080 --- public/app/directives/valueSelectDropdown.js | 2 +- public/test/specs/valueSelectDropdown-specs.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/directives/valueSelectDropdown.js b/public/app/directives/valueSelectDropdown.js index 14791eba0f3..f1763514f25 100644 --- a/public/app/directives/valueSelectDropdown.js +++ b/public/app/directives/valueSelectDropdown.js @@ -34,7 +34,7 @@ function (angular, app, _) { var tag = { text: value, selected: false }; _.each(vm.variable.current.tags, function(tagObj) { if (tagObj.text === value) { - tag.selected = true; + tag = tagObj; } }); return tag; diff --git a/public/test/specs/valueSelectDropdown-specs.js b/public/test/specs/valueSelectDropdown-specs.js index 9fadb893467..f329e3f6738 100644 --- a/public/test/specs/valueSelectDropdown-specs.js +++ b/public/test/specs/valueSelectDropdown-specs.js @@ -138,7 +138,7 @@ function () { describe("Given variable with selected tags", function() { beforeEach(function() { ctrl.variable = { - current: {text: 'server-1', value: 'server-1', tags: [{text: 'key1'}] }, + current: {text: 'server-1', value: 'server-1', tags: [{text: 'key1', selected: true}] }, options: [ {text: 'server-1', value: 'server-1'}, {text: 'server-2', value: 'server-2'}, From fca6c85abbe51b5d87a1d6ea84c9fd93f6c99c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 9 Jun 2015 10:30:51 +0200 Subject: [PATCH 283/398] Fixed clear selections icon for new variable dropdown, #2080 --- public/app/partials/valueSelectDropdown.html | 2 +- public/css/less/submenu.less | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/public/app/partials/valueSelectDropdown.html b/public/app/partials/valueSelectDropdown.html index 2c291448573..4ecb46db14b 100644 --- a/public/app/partials/valueSelectDropdown.html +++ b/public/app/partials/valueSelectDropdown.html @@ -15,7 +15,7 @@
    - + Selected ({{vm.selectedValues.length}}) diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index aba2c97d0a8..9f4653600bc 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -20,7 +20,6 @@ } .submenu-item { -// padding: 8px 7px; margin-right: 20px; display: inline-block; border-radius: 3px; From 63cc794f37bc416de1c2183f939c51d884b7da27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 10 Jun 2015 08:27:38 +0200 Subject: [PATCH 284/398] Small style fix to login page --- public/app/partials/login.html | 120 +++++++++++++++++---------------- 1 file changed, 61 insertions(+), 59 deletions(-) diff --git a/public/app/partials/login.html b/public/app/partials/login.html index aa99daf85a6..a5894866d5a 100644 --- a/public/app/partials/login.html +++ b/public/app/partials/login.html @@ -17,53 +17,55 @@
    - -
    -
    - - Forgot your password? -
    -
    -
    -
    - Grafana version: {{buildInfo.version}}, commit: {{buildInfo.commit}}, - build date: {{buildInfo.buildstamp | date: 'yyyy-MM-dd HH:mm:ss' }} +
    +
    + + Forgot your password? + +
    + +
    +
    + Grafana version: {{buildInfo.version}}, commit: {{buildInfo.commit}}, + build date: {{buildInfo.buildstamp | date: 'yyyy-MM-dd HH:mm:ss' }} +
    +
    +
    -
    - From 2266ef680977d436a491786fc5b21c1672c07229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 10 Jun 2015 10:15:42 +0200 Subject: [PATCH 285/398] Minor api refactoring / code clean up --- pkg/api/api.go | 2 +- pkg/api/signup.go | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 7a96b095348..f33b08e6477 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -39,7 +39,7 @@ func Register(r *macaron.Macaron) { // sign up r.Get("/signup", Index) - r.Post("/api/user/signup", bind(m.CreateUserCommand{}), SignUp) + r.Post("/api/user/signup", bind(m.CreateUserCommand{}), wrap(SignUp)) // reset password r.Get("/user/password/send-reset-email", Index) diff --git a/pkg/api/signup.go b/pkg/api/signup.go index d2723cee95c..77305caba70 100644 --- a/pkg/api/signup.go +++ b/pkg/api/signup.go @@ -10,17 +10,15 @@ import ( ) // POST /api/user/signup -func SignUp(c *middleware.Context, cmd m.CreateUserCommand) { +func SignUp(c *middleware.Context, cmd m.CreateUserCommand) Response { if !setting.AllowUserSignUp { - c.JsonApiErr(401, "User signup is disabled", nil) - return + return ApiError(401, "User signup is disabled", nil) } cmd.Login = cmd.Email if err := bus.Dispatch(&cmd); err != nil { - c.JsonApiErr(500, "failed to create user", err) - return + return ApiError(500, "failed to create user", err) } user := cmd.Result @@ -34,7 +32,7 @@ func SignUp(c *middleware.Context, cmd m.CreateUserCommand) { loginUserWithUser(&user, c) - c.JsonOK("User created and logged in") - metrics.M_Api_User_SignUp.Inc(1) + + return ApiSuccess("User created and logged in") } From b5418c40bacdcc9bc72c315cb18c205753f3e3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 10 Jun 2015 14:44:42 +0200 Subject: [PATCH 286/398] fixed AMPQ -> AMQP typo --- pkg/events/events.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/events/events.go b/pkg/events/events.go index d34350f3834..5e82578b474 100644 --- a/pkg/events/events.go +++ b/pkg/events/events.go @@ -5,7 +5,7 @@ import ( "time" ) -// Events can be passed to external systems via for example AMPQ +// Events can be passed to external systems via for example AMQP // Treat these events as basically DTOs so changes has to be backward compatible type Priority string From 2c00267d589ca71b5dcc8ae7ec4e7b6c068577e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 10 Jun 2015 15:08:32 +0200 Subject: [PATCH 287/398] Changed to more strict sinon version to work around issue in latest sinon --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71eb75b732b..4200da6951a 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,6 @@ "grunt-jscs": "~1.5.x", "karma-sinon": "^1.0.3", "lodash": "^2.4.1", - "sinon": "^1.10.3" + "sinon": "1.10.3" } } From 5562651ef077aa339b75cb41426182b3b1dca054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 10 Jun 2015 17:03:16 +0200 Subject: [PATCH 288/398] Fixed spelling on graphite docs page --- docs/sources/datasources/graphite.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/datasources/graphite.md b/docs/sources/datasources/graphite.md index acf4a78aaa1..9074a2010a4 100644 --- a/docs/sources/datasources/graphite.md +++ b/docs/sources/datasources/graphite.md @@ -7,7 +7,7 @@ page_keywords: grafana, graphite, metrics, query, documentation # Graphite Grafana has an advanced graphite query editor that lets you quickly navigate the metric space, add functions. -Change function paramaters and much more. The editor cannot handle all types of queries yet. +Change function parameters and much more. The editor cannot handle all types of queries yet. To switch to a regular text box click the pen icon to the right. ## Adding the data source to Grafana From 6deaa87a4c20f8b445fb342df6f006a2280fdc27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 11 Jun 2015 07:59:57 +0200 Subject: [PATCH 289/398] mention fpm in build from source docs, Closes #2145 --- docs/sources/project/building_from_source.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md index 8401bf543de..dc08f5a261a 100644 --- a/docs/sources/project/building_from_source.md +++ b/docs/sources/project/building_from_source.md @@ -58,6 +58,8 @@ bra run Open grafana in your browser (default http://localhost:3000) and login with admin user (default user/pass = admin/admin). ## Creating optimized release packages +This step builds linux packages and requires that fpm is installed. Install fpm via `gem install fpm`. + ``` go run build.go build package ``` From b39f8fb4debe4fe22fa5422ab72723bc9fe7f5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 11 Jun 2015 08:05:33 +0200 Subject: [PATCH 290/398] Do not show Switch to Org item for current organization in the org dropdown, Fixes #2136 --- public/app/controllers/sidemenuCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/controllers/sidemenuCtrl.js b/public/app/controllers/sidemenuCtrl.js index f5a9197caac..cefddec2ab5 100644 --- a/public/app/controllers/sidemenuCtrl.js +++ b/public/app/controllers/sidemenuCtrl.js @@ -55,7 +55,7 @@ function (angular, _, $, config) { backendSrv.get('/api/user/orgs').then(function(orgs) { _.each(orgs, function(org) { - if (org.isUsing) { + if (org.orgId === contextSrv.user.orgId) { return; } From 5962bcbc6c5b74bc1426e0838f1b0d497b573d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 11 Jun 2015 08:16:09 +0200 Subject: [PATCH 291/398] Do not show create org link when allow_org_create is set to false, Fixes #2135 --- pkg/api/api.go | 1 + pkg/api/frontendsettings.go | 2 +- pkg/setting/setting.go | 2 -- public/app/controllers/sidemenuCtrl.js | 12 +++++++----- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index f33b08e6477..679c0d1f760 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -26,6 +26,7 @@ func Register(r *macaron.Macaron) { // authed views r.Get("/profile/", reqSignedIn, Index) r.Get("/org/", reqSignedIn, Index) + r.Get("/org/new", reqSignedIn, Index) r.Get("/datasources/", reqSignedIn, Index) r.Get("/datasources/edit/*", reqSignedIn, Index) r.Get("/org/users/", reqSignedIn, Index) diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index 4dd6ba06819..37a28077175 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -99,7 +99,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro "defaultDatasource": defaultDatasource, "datasources": datasources, "appSubUrl": setting.AppSubUrl, - "viewerRoleMode": setting.ViewerRoleMode, + "allowOrgCreate": setting.AllowUserOrgCreate || c.IsGrafanaAdmin, "buildInfo": map[string]interface{}{ "version": setting.BuildVersion, "commit": setting.BuildCommit, diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index b53cfac472a..b015062fa9b 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -79,7 +79,6 @@ var ( AllowUserOrgCreate bool AutoAssignOrg bool AutoAssignOrgRole string - ViewerRoleMode string // Http auth AdminUser string @@ -386,7 +385,6 @@ func NewConfigContext(args *CommandLineArgs) { AllowUserOrgCreate = users.Key("allow_org_create").MustBool(true) AutoAssignOrg = users.Key("auto_assign_org").MustBool(true) AutoAssignOrgRole = users.Key("auto_assign_org_role").In("Editor", []string{"Editor", "Admin", "Viewer"}) - ViewerRoleMode = users.Key("viewer_role_mode").In("default", []string{"default", "strinct"}) // anonymous access AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false) diff --git a/public/app/controllers/sidemenuCtrl.js b/public/app/controllers/sidemenuCtrl.js index cefddec2ab5..b7ba32f0d35 100644 --- a/public/app/controllers/sidemenuCtrl.js +++ b/public/app/controllers/sidemenuCtrl.js @@ -68,11 +68,13 @@ function (angular, _, $, config) { }); }); - $scope.orgMenu.push({ - text: "New Organization", - icon: "fa fa-fw fa-plus", - href: $scope.getUrl('/org/new') - }); + if (config.allowOrgCreate) { + $scope.orgMenu.push({ + text: "New Organization", + icon: "fa fa-fw fa-plus", + href: $scope.getUrl('/org/new') + }); + } }); }; From 3675b3fcaa033f9843ab93fd1d541a2960c47eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 11 Jun 2015 08:29:12 +0200 Subject: [PATCH 292/398] Fixed issue with clearing admin permissions, Fixes #2143 --- pkg/api/dtos/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/dtos/user.go b/pkg/api/dtos/user.go index a30bebf137f..9b407535429 100644 --- a/pkg/api/dtos/user.go +++ b/pkg/api/dtos/user.go @@ -18,7 +18,7 @@ type AdminUpdateUserPasswordForm struct { } type AdminUpdateUserPermissionsForm struct { - IsGrafanaAdmin bool `json:"IsGrafanaAdmin" binding:"Required"` + IsGrafanaAdmin bool `json:"IsGrafanaAdmin"` } type AdminUserListItem struct { From e5280d55b333d33b75fb82cb539a03482d692062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 11 Jun 2015 09:35:59 +0200 Subject: [PATCH 293/398] Make template variables work in row titles, #1956 --- .../features/dashboard/dynamicDashboardSrv.js | 2 + public/app/features/dashboard/rowCtrl.js | 40 ++++++------------- public/app/filters/all.js | 6 ++- public/app/partials/dashboard.html | 2 +- .../test/specs/dynamicDashboardSrv-specs.js | 5 +++ 5 files changed, 25 insertions(+), 30 deletions(-) diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index dcb4e31340c..1b3f2b13455 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -105,6 +105,8 @@ function (angular, _) { _.each(selected, function(option, index) { copy = self.getRowClone(row, index); + copy.scopedVars = {}; + copy.scopedVars[variable.name] = option; for (i = 0; i < copy.panels.length; i++) { panel = copy.panels[i]; diff --git a/public/app/features/dashboard/rowCtrl.js b/public/app/features/dashboard/rowCtrl.js index 1f839bd206a..c63017365bb 100644 --- a/public/app/features/dashboard/rowCtrl.js +++ b/public/app/features/dashboard/rowCtrl.js @@ -22,7 +22,6 @@ function (angular, app, _, config) { $scope.init = function() { $scope.editor = {index: 0}; - $scope.reset_panel(); }; $scope.togglePanelMenu = function(posX) { @@ -64,8 +63,18 @@ function (angular, app, _, config) { }; $scope.add_panel_default = function(type) { - $scope.reset_panel(type); - $scope.add_panel($scope.panel); + var defaultSpan = 12; + var _as = 12 - $scope.dashboard.rowSpan($scope.row); + + var panel = { + title: config.new_panel_title, + error: false, + span: _as < defaultSpan && _as > 0 ? _as : defaultSpan, + editable: true, + type: type + }; + + $scope.add_panel(panel); $timeout(function() { $scope.$broadcast('render'); @@ -105,31 +114,6 @@ function (angular, app, _, config) { }); }; - $scope.reset_panel = function(type) { - var defaultSpan = 12; - var _as = 12 - $scope.dashboard.rowSpan($scope.row); - - $scope.panel = { - title: config.new_panel_title, - error: false, - span: _as < defaultSpan && _as > 0 ? _as : defaultSpan, - editable: true, - type: type - }; - - function fixRowHeight(height) { - if (!height) { - return '200px'; - } - if (!_.isString(height)) { - return height + 'px'; - } - return height; - } - - $scope.row.height = fixRowHeight($scope.row.height); - }; - $scope.init(); }); diff --git a/public/app/filters/all.js b/public/app/filters/all.js index fd22061da66..c904c7c9449 100755 --- a/public/app/filters/all.js +++ b/public/app/filters/all.js @@ -57,7 +57,11 @@ define(['angular', 'jquery', 'lodash', 'moment'], function (angular, $, _, momen module.filter('interpolateTemplateVars', function(templateSrv) { function interpolateTemplateVars(text, scope) { - return templateSrv.replaceWithText(text, scope.panel.scopedVars); + if (scope.panel) { + return templateSrv.replaceWithText(text, scope.panel.scopedVars); + } else { + return templateSrv.replaceWithText(text, scope.row.scopedVars); + } } interpolateTemplateVars.$stateful = true; diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html index c9dca5c5f72..3ea34d0db0a 100644 --- a/public/app/partials/dashboard.html +++ b/public/app/partials/dashboard.html @@ -75,7 +75,7 @@
    -
    +
    diff --git a/public/test/specs/dynamicDashboardSrv-specs.js b/public/test/specs/dynamicDashboardSrv-specs.js index 905b8896cd4..7d0be5583cb 100644 --- a/public/test/specs/dynamicDashboardSrv-specs.js +++ b/public/test/specs/dynamicDashboardSrv-specs.js @@ -135,6 +135,11 @@ define([ expect(ctx.rows[1].repeat).to.be(null); }); + it('should add scopedVars to rows', function() { + expect(ctx.rows[0].scopedVars.servers.value).to.be('se1'); + expect(ctx.rows[1].scopedVars.servers.value).to.be('se2'); + }); + it('should generate a repeartRowId based on repeat row index', function() { expect(ctx.rows[1].repeatRowId).to.be(1); }); From 48175101c6b86d9c2f2de0abf4d783c08c371d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 11 Jun 2015 13:38:13 +0200 Subject: [PATCH 294/398] Fixes to template variable with tags and inital state after dashboard load, #2080 --- public/app/directives/valueSelectDropdown.js | 36 ++---- .../features/dashboard/dynamicDashboardSrv.js | 2 +- .../features/templating/templateValuesSrv.js | 107 ++++++++++-------- .../test/specs/valueSelectDropdown-specs.js | 2 +- 4 files changed, 73 insertions(+), 74 deletions(-) diff --git a/public/app/directives/valueSelectDropdown.js b/public/app/directives/valueSelectDropdown.js index f1763514f25..db62b6684f6 100644 --- a/public/app/directives/valueSelectDropdown.js +++ b/public/app/directives/valueSelectDropdown.js @@ -16,18 +16,7 @@ function (angular, app, _) { vm.oldVariableText = vm.variable.current.text; vm.highlightIndex = -1; - var currentValues = vm.variable.current.value; - if (_.isString(currentValues)) { - currentValues = [currentValues]; - } - - vm.options = _.map(vm.variable.options, function(option) { - if (_.indexOf(currentValues, option.value) >= 0) { option.selected = true; } - return option; - }); - - _.sortBy(vm.options, 'text'); - + vm.options = vm.variable.options; vm.selectedValues = _.filter(vm.options, {selected: true}); vm.tags = _.map(vm.variable.tags, function(value) { @@ -46,28 +35,23 @@ function (angular, app, _) { vm.updateLinkText = function() { var current = vm.variable.current; - var currentValues = current.value; - if (_.isArray(currentValues) && current.tags.length) { + if (current.tags && current.tags.length) { // filer out values that are in selected tags - currentValues = _.filter(currentValues, function(test) { - for (var i = 0; i < current.tags.length; i++) { - if (_.indexOf(current.tags[i].values, test) !== -1) { + var selectedAndNotInTag = _.filter(vm.variable.options, function(option) { + if (!option.selected) { return false; } + for (var i = 0; i < current.tags.length; i++) { + var tag = current.tags[i]; + if (_.indexOf(tag.values, option.value) !== -1) { return false; } } return true; }); + // convert values to text - var currentTexts = _.map(currentValues, function(value) { - for (var i = 0; i < vm.variable.options.length; i++) { - var option = vm.variable.options[i]; - if (option.value === value) { - return option.text; - } - } - return value; - }); + var currentTexts = _.pluck(selectedAndNotInTag, 'text'); + // join texts vm.linkText = currentTexts.join(' + '); if (vm.linkText.length > 0) { diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index 1b3f2b13455..8e10619aec8 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -91,7 +91,7 @@ function (angular, _) { // returns a new panel clone or reuses a clone from previous iteration this.repeatRow = function(row) { var variables = this.dashboard.templating.list; - var variable = _.findWhere(variables, {name: row.repeat.replace('$', '')}); + var variable = _.findWhere(variables, {name: row.repeat}); if (!variable) { return; } diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 267a465cd89..ac2f5bb5975 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -119,43 +119,58 @@ function (angular, _, kbn) { return $q.when([]); } - return datasourceSrv.get(variable.datasource).then(function(datasource) { - var queryPromise = datasource.metricFindQuery(variable.query).then(function (results) { - variable.options = self.metricNamesToVariableValues(variable, results); + return datasourceSrv.get(variable.datasource) + .then(_.partial(this.updateOptionsFromMetricFindQuery, variable)) + .then(_.partial(this.updateTags, variable)) + .then(_.partial(this.validateVariableSelectionState, variable)); + }; - if (variable.includeAll) { - self.addAllOption(variable); - } + this.validateVariableSelectionState = function(variable) { + if (!variable.current) { + return self.setVariableValue(variable, variable.options[0]); + } - // if parameter has current value - // if it exists in options array keep value - if (variable.current) { - // if current value is an array do not do anything - if (_.isArray(variable.current.value)) { - return $q.when([]); - } - var currentOption = _.findWhere(variable.options, { text: variable.current.text }); - if (currentOption) { - return self.setVariableValue(variable, currentOption); + if (_.isArray(variable.current.value)) { + for (var i = 0; i < variable.current.value.length; i++) { + var value = variable.current.value[i]; + for (var y = 0; y < variable.options.length; y++) { + var option = variable.options[y]; + if (option.value === value) { + option.selected = true; } } - - return self.setVariableValue(variable, variable.options[0]); - }); - - if (variable.useTags) { - return queryPromise.then(function() { - datasource.metricFindQuery(variable.tagsQuery).then(function (results) { - variable.tags = []; - for (var i = 0; i < results.length; i++) { - variable.tags.push(results[i].text); - } - }); - }); - } else { - delete variable.tags; - return queryPromise; } + } else { + var currentOption = _.findWhere(variable.options, { text: variable.current.text }); + if (currentOption) { + return self.setVariableValue(variable, currentOption); + } + } + }; + + this.updateTags = function(variable, datasource) { + if (variable.useTags) { + return datasource.metricFindQuery(variable.tagsQuery).then(function (results) { + variable.tags = []; + for (var i = 0; i < results.length; i++) { + variable.tags.push(results[i].text); + } + return datasource; + }); + } else { + delete variable.tags; + } + + return datasource; + }; + + this.updateOptionsFromMetricFindQuery = function(variable, datasource) { + return datasource.metricFindQuery(variable.query).then(function (results) { + variable.options = self.metricNamesToVariableValues(variable, results); + if (variable.includeAll) { + self.addAllOption(variable); + } + return datasource; }); }; @@ -192,7 +207,7 @@ function (angular, _, kbn) { options[value] = value; } - return _.map(_.keys(options), function(key) { + return _.map(_.keys(options).sort(), function(key) { return { text: key, value: key }; }); }; @@ -200,19 +215,19 @@ function (angular, _, kbn) { this.addAllOption = function(variable) { var allValue = ''; switch(variable.allFormat) { - case 'wildcard': - allValue = '*'; - break; - case 'regex wildcard': - allValue = '.*'; - break; - case 'regex values': - allValue = '(' + _.pluck(variable.options, 'text').join('|') + ')'; - break; - default: - allValue = '{'; - allValue += _.pluck(variable.options, 'text').join(','); - allValue += '}'; + case 'wildcard': + allValue = '*'; + break; + case 'regex wildcard': + allValue = '.*'; + break; + case 'regex values': + allValue = '(' + _.pluck(variable.options, 'text').join('|') + ')'; + break; + default: + allValue = '{'; + allValue += _.pluck(variable.options, 'text').join(','); + allValue += '}'; } variable.options.unshift({text: 'All', value: allValue}); diff --git a/public/test/specs/valueSelectDropdown-specs.js b/public/test/specs/valueSelectDropdown-specs.js index f329e3f6738..4a7a868d643 100644 --- a/public/test/specs/valueSelectDropdown-specs.js +++ b/public/test/specs/valueSelectDropdown-specs.js @@ -38,7 +38,7 @@ function () { ctrl.variable = { current: {text: 'server-1', value: 'server-1'}, options: [ - {text: 'server-1', value: 'server-1'}, + {text: 'server-1', value: 'server-1', selected: true}, {text: 'server-2', value: 'server-2'}, {text: 'server-3', value: 'server-3'}, ], From 7ce31bfaa058e7ce8c48d8a2425c3f8255e981a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 12 Jun 2015 08:53:20 +0200 Subject: [PATCH 295/398] changed dependency for gosimple/slug, they had finally removed the gopkgs dependency, Fixes #2153 --- Godeps/Godeps.json | 22 +- .../src/github.com/dalu/unidecode/README.md | 6 - .../src/github.com/dalu/unidecode/table.go | 5 - .../src/github.com/gosimple/slug/.gitignore | 2 + .../{dalu => gosimple}/slug/README.md | 10 +- .../slug/default_substitution.go | 0 .../github.com/{dalu => gosimple}/slug/doc.go | 6 +- .../slug/languages_substitution.go | 0 .../{dalu => gosimple}/slug/slug.go | 3 +- .../{dalu => gosimple}/slug/slug_test.go | 0 .../{dalu => rainycape}/unidecode/.gitignore | 0 .../{dalu => rainycape}/unidecode/LICENSE | 0 .../github.com/rainycape/unidecode/README.md | 6 + .../{dalu => rainycape}/unidecode/decode.go | 3 - .../unidecode/make_table.go | 0 .../github.com/rainycape/unidecode/table.go | 4 + .../{dalu => rainycape}/unidecode/table.txt | 0 .../unidecode/unidecode.go | 15 +- .../unidecode/unidecode_test.go | 0 .../src/gopkgs.com/pool.v1/.gitignore | 23 -- .../_workspace/src/gopkgs.com/pool.v1/LICENSE | 201 ------------------ .../src/gopkgs.com/pool.v1/README.md | 13 -- .../_workspace/src/gopkgs.com/pool.v1/doc.go | 3 - .../src/gopkgs.com/pool.v1/example_test.go | 23 -- .../src/gopkgs.com/pool.v1/gopkgs.go | 24 --- .../_workspace/src/gopkgs.com/pool.v1/pool.go | 37 ---- .../src/gopkgs.com/pool.v1/pool_go1.2.go | 57 ----- pkg/models/dashboards.go | 2 +- 28 files changed, 40 insertions(+), 425 deletions(-) delete mode 100644 Godeps/_workspace/src/github.com/dalu/unidecode/README.md delete mode 100644 Godeps/_workspace/src/github.com/dalu/unidecode/table.go create mode 100644 Godeps/_workspace/src/github.com/gosimple/slug/.gitignore rename Godeps/_workspace/src/github.com/{dalu => gosimple}/slug/README.md (72%) rename Godeps/_workspace/src/github.com/{dalu => gosimple}/slug/default_substitution.go (100%) rename Godeps/_workspace/src/github.com/{dalu => gosimple}/slug/doc.go (91%) rename Godeps/_workspace/src/github.com/{dalu => gosimple}/slug/languages_substitution.go (100%) rename Godeps/_workspace/src/github.com/{dalu => gosimple}/slug/slug.go (98%) rename Godeps/_workspace/src/github.com/{dalu => gosimple}/slug/slug_test.go (100%) rename Godeps/_workspace/src/github.com/{dalu => rainycape}/unidecode/.gitignore (100%) rename Godeps/_workspace/src/github.com/{dalu => rainycape}/unidecode/LICENSE (100%) create mode 100644 Godeps/_workspace/src/github.com/rainycape/unidecode/README.md rename Godeps/_workspace/src/github.com/{dalu => rainycape}/unidecode/decode.go (92%) rename Godeps/_workspace/src/github.com/{dalu => rainycape}/unidecode/make_table.go (100%) create mode 100644 Godeps/_workspace/src/github.com/rainycape/unidecode/table.go rename Godeps/_workspace/src/github.com/{dalu => rainycape}/unidecode/table.txt (100%) rename Godeps/_workspace/src/github.com/{dalu => rainycape}/unidecode/unidecode.go (86%) rename Godeps/_workspace/src/github.com/{dalu => rainycape}/unidecode/unidecode_test.go (100%) delete mode 100644 Godeps/_workspace/src/gopkgs.com/pool.v1/.gitignore delete mode 100644 Godeps/_workspace/src/gopkgs.com/pool.v1/LICENSE delete mode 100644 Godeps/_workspace/src/gopkgs.com/pool.v1/README.md delete mode 100644 Godeps/_workspace/src/gopkgs.com/pool.v1/doc.go delete mode 100644 Godeps/_workspace/src/gopkgs.com/pool.v1/example_test.go delete mode 100644 Godeps/_workspace/src/gopkgs.com/pool.v1/gopkgs.go delete mode 100644 Godeps/_workspace/src/gopkgs.com/pool.v1/pool.go delete mode 100644 Godeps/_workspace/src/gopkgs.com/pool.v1/pool_go1.2.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index dd08ac91121..063f0efedd7 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,6 +1,6 @@ { "ImportPath": "github.com/grafana/grafana", - "GoVersion": "go1.3", + "GoVersion": "go1.4.2", "Packages": [ "./pkg/..." ], @@ -13,14 +13,6 @@ "ImportPath": "github.com/Unknwon/macaron", "Rev": "93de4f3fad97bf246b838f828e2348f46f21f20a" }, - { - "ImportPath": "github.com/dalu/slug", - "Rev": "6dbd13912e9be466e2c1de349a2c7d1466c97e07" - }, - { - "ImportPath": "github.com/dalu/unidecode", - "Rev": "339814d47f3e32a6f7036a0a4c56ed9b373dd755" - }, { "ImportPath": "github.com/go-sql-driver/mysql", "Comment": "v1.2-26-g9543750", @@ -35,6 +27,10 @@ "Comment": "v0.4.2-58-ge2889e5", "Rev": "e2889e5517600b82905f1d2ba8b70deb71823ffe" }, + { + "ImportPath": "github.com/gosimple/slug", + "Rev": "8d258463b4459f161f51d6a357edacd3eef9d663" + }, { "ImportPath": "github.com/jtolds/gls", "Rev": "f1ac7f4f24f50328e6bc838ca4437d1612a0243c" @@ -56,6 +52,10 @@ "ImportPath": "github.com/mattn/go-sqlite3", "Rev": "e28cd440fabdd39b9520344bc26829f61db40ece" }, + { + "ImportPath": "github.com/rainycape/unidecode", + "Rev": "836ef0a715aedf08a12d595ed73ec8ed5b288cac" + }, { "ImportPath": "github.com/smartystreets/goconvey/convey", "Comment": "1.5.0-356-gfbc0a1c", @@ -87,10 +87,6 @@ "ImportPath": "gopkg.in/redis.v2", "Comment": "v2.3.2", "Rev": "e6179049628164864e6e84e973cfb56335748dea" - }, - { - "ImportPath": "gopkgs.com/pool.v1", - "Rev": "c850f092aad1780cbffff25f471c5cc32097932a" } ] } diff --git a/Godeps/_workspace/src/github.com/dalu/unidecode/README.md b/Godeps/_workspace/src/github.com/dalu/unidecode/README.md deleted file mode 100644 index 589d955593c..00000000000 --- a/Godeps/_workspace/src/github.com/dalu/unidecode/README.md +++ /dev/null @@ -1,6 +0,0 @@ -unidecode -========= - -Unicode transliterator in Golang - Replaces non-ASCII characters with their ASCII approximations. - -View other available versions, documentation and examples at http://gopkgs.com/unidecode diff --git a/Godeps/_workspace/src/github.com/dalu/unidecode/table.go b/Godeps/_workspace/src/github.com/dalu/unidecode/table.go deleted file mode 100644 index b7e41fa70ff..00000000000 --- a/Godeps/_workspace/src/github.com/dalu/unidecode/table.go +++ /dev/null @@ -1,5 +0,0 @@ -package unidecode - -// AUTOGENERATED - DO NOT EDIT! - -var tableData = "x\xda,\x9c\x05\\\x1cW\xd7\xc6\xf7\xcc\xec.]\x96e\x17[\xa8\x84\x92ThB\x02qwwwe\x80\t;\xd8\x00\xcbB ^\xb7\xd4ݛ\xba\xb7\x91\xb6\x91\xba[jI=\xa9\xbb\xc4]\xde\xef9\x0f\xdf\xef\xfd\x9d\xff\xb9\xf7̝;w\xce}\xe6\xec얼\x1e\x8f\xe8\xff\xc4\xf0\x88az\xc4\xf4z\xc4\xeb\xf3\x88\xcf\xef\x11\u007f\x92G\x92N\xf3\xc8i\x01\x8f\x04\x92=\x92\x1c\xf4H0\xc5#)!\x8f\x84R=\x92\x1a\xf6H8\xe2\x91H\x9aG\xd2\xd2=\x92\x9eᑌL\x8fdfy$+\xea\x91h\xb6G\xb2s<\x92s\xbaGN?\xc3#g\x9c\xe9\x913\xcf\xf2\xc8Ym<\xd2&\xd7#\xb9g{\xe4\xec<\x8f\xe4\xb5\xf5H\xdbv\x1eiw\x8eG\xce9\xd7#\xe7\x9e\xe7\x91\xf3\xce\xf7\xc8\xf9\xf9\x1eɿ\xc0#\x17\xb4\xf7H\xfb\x0e\x1e\xe9P\xe0\x91\x82\x8e\x1e\xe9\xd8\xc9#\x9d\n=RX䑢\xce\x1e\xe9\xdc\xc5#]\xbaz\xa4k7\x8ft\xeb\xee\x91\xee=<ң\xa7Gz\xf6\xf2H\xaf\xde\x1e\xe9\xdd\xc7#}\xfaz\xa4o?\x8f\xf4\xeb\xef\x91\xfe\x03<2`\xa0G\x06\x0e\xf2Ƞ\xc1\x1e\x19<\xc4#C\x86zd\xe80\x8f\f\x1b\xee\x91\xe1#<2b\xa4GF\x8e\xf2Ȩ\xd1\x1e\x19=\xc6#c\xc6zd\xec8\x8f\x8c\x1b\xef\x91\xf1\x13<2a\xa2G&N\xf2Ȥ\xc9\x1e\x99<\xc5#S\xa6zd\xea4\x8fL\x9b\xee\x91\xe93<2c\xa6Gf\xce\xf2Ȭ\xd9\x1e\x99=\xc7#s\xe6zd\xee<\x8f,\x98\xef\x91\xf9\v\xe0\x17zd\xe1\"\x8f,*\xf6H\xb1\xe5\x11\xab\xc4#%\xa5\x1e)-\xf3H\x99\xed\x11{\xb1G\x16\x97{\xa4<摘\xe3\x11\xa7\xc2#\x15\x95\x1e\xa9\xac\xf2HU\xb5G\xaak\x87m\x87\xed\x80}\x01\xfb\x12\xc9\xf8\n\xfekl\xd07\xb0oa\xdf\xc1vb\x83vy\x8c\xe9\xb1\xef=F<\xfe\x03\xee\xf1G\xd8O\xb0\x9fa\xbf\xc0~\x85\xfd\xe61,\xfbw\xec\xd1\x1f؟?a\u007f\xc1\xfe\x86\xfd\x83\xfd\xf9\x17\xf6\x1fl7l\x0f\xf6p/\xf6g\x1fnu?\xec\x00\xec \xec\x10\xec04{\x04\xfe(Rs\fv\x1cv\x02v\x12{t\xcac4\xc4\xfe\x87\x06\x9e\xc7!\"b\x19\xf0&\xbc\x17\xde\a\xef\x17\x19\x96$Rz\x1a|\x00>\x19>\b\x9f\x02\x1f\x82O\x15\x19\x1e\x16)\x8b\xc0\xa7\xc1\xa7\x8b\x8c\xc8\x10\xb13\xe1\xb3\xe0\xa3\xf0\xd9\xf09\xf0\xa7ß\x01\u007f&\xfcY\"\xa3ڈ\x94\xe7\u009f\r\x9f\a\xdf\x16\xbe\x1d\xfc9\xf0犌>O$v>|>\xfc\x05\"cڋ8\x1d\xe0\v\xe0;\xc2w\x82/\x84/\x82\xef\f\xdf\x05\xbe\xab\x18c\xc6v\x13é\xe8.2\xb6\x87HEO\x91q\xbdD*{\xc3\xfa\x88\x8c\xef+R\xd5\x0f\xbe?\xfc\x00\xf8\x81\xf0\x83\xe0\a\xc3#\x05\xe3\x87\xc2\x0f\x13\x998\\\xa4f\x04\xfcH\xf8Q\xf0\xa3\xe1Lj\x91_3V\x8c\x9a\xf2qbL\x1c5^d\xd2\x04\x11w\"\xfc$\xf8\xc9\xf0S\u09ca1i\xc441\\{\xba\xc8\xd4\x19\"\xf53\xe1g\xc1φ\x9f\x03?Wd\xda<\x91\xf8|\xf8\x05\xf0\v\xe1\x17\xc1\x17\xc3[\xf0%\"\xd3KE\x1a\xca\xe0m\xf8\xc5\xf0\xe5\xf01\x91\x19\x8eH\xa2\x02\xbe\x12\xbe\n\xbe\x1a\xbe\x06ޅ\xaf\x85\xaf\x83\xaf\x87\x8f\xc37\x88\xccJ\x8845\x8a\xcci\x12i^\x02\xdf,2\xb7E\xf0l\xc2/\x83_\x0e\xbf\x02~%\xae\xbbJ\xa4d\xb5\xc8\xd0\va\x17\xa1}\xb1H\xcfK`\x97\xe2\xce.Ö_\x8e-\xbf\x02[}%\xec*\xd8\xd5\xd8\xf25\xb0kD\xba]+2\xf8:l\xef\xf5\"#o\x10Y|#\xb6\xf2&\xd8\xcdb\xc4\x1ao\xc1\xfe\xdc\n\xbb\r\xbbq;v\xe2\x0ed\xf9N\xd8]X\xe0\xdd\xc8\xee=\xc8\uef78\xc8}\xb0\xfb\x91µH\xe1\x98\a\x90B\xe7A\x91\xc9\x0f\x89\xd4>,Ɯ\xa9\x8f\x88t}\x14\xf6\x98\x18\xd3F?.F<\xf6\x04\xb2\xf2$\xb2\xf3\x14\xfc\xd3\xf0\xcf\xe0Οŝ?\x87;]'2s=\xfc\x06\xdc\xf9F\xdc\xe5\xf3\xb8\xcb\x17Ę;\xfaE\xc5&1Zb\x9b\x15[0\xe3V\x91\x1e/\xc1^\x16\xa3!\xfe\nR\xf6\xaaȲ\xd7\xc4X\xb6\xecu`\xc0\x1b\"m\xdf\x14c\xf8ܷ\x80\x96\xb7\xc5(kyG\x8c\xf1c\xdf\x05*\xde\x13\xa3\xaa\xe2}(b\xec\a@Ň\x10H\xc5Gx\x80\xb6\xe1\x01\xfa\x187\xfd\t\x84\xf9)n\xec3\xdc\xd8\xe7X\xdfv\xaco\a\xfc\x17\xf0_\xc2\u007f\x05\xff5\xfc7\xf0\xdf\xc2\u007f\a\xbf\x13\xd9܅9\xbe\xc7\x1c?\xc0\xff\b\xff\x93\xa0\"\xfd,\xa8\t\xbf \xaf\xbf\xe21\xf9\r\xfew\xf8?\x90\xd6?\x91ֿp\x95\xbfq\x95\u007f\xe0\xff\x85\xffOot\xb7\xde\xe3\x1e<\n{\xf5\x06\xf6\xe9\r\xec\xd7\x1b8\x80\x93\x0f\xe2\xe4Cb\x8c\x9ey\x18\x1bq\x04\x1bq\x14\x1bq\f\xd7;\x8e\xeb\x9d\xd0\xeb\x9d\xd4\xeb\x9d\xc2|\xff\xc3|\x1e\x03e\xc2@\x99\x807\u1f46\x8c\xf0\x19b\xfb\xe1\x93\xe0O3dL\xc0\x10'\x19>\b\x9fbȤ\x90!n*|\x18>b\xc8\xd44C\xea\xd3\xe13\xe03\r\x99\x91eH\"\n\x9f\r\x9fcȴ\xd3\r\x89\x9fa\xc8\xf43\ri8ː9m\fi\xce5d\xf4ن\xc4\xf2\f\x99\xd8\u0590\xb2v\x861i\xc69\x86\xe1&\xce5d\xeey\x86\xb4\x9c\x8f\x15\xe5cE\x17`%\xed\xb1\x92\x0e\xb8b\x01\xae\xd8\x11\xbe\x13|!|\x11|g\xf8.\xf0]1s7\xcc\xdcݐ\xaa\x1e\x86\xd4\xf4\xc4\xd5z\x19R\xd1\xdb0\xcaJ\xfa\x18F]m_\xcc\xd8ϐa\xfd\r)\x1d`\xa0P`M\x83\xb0\xb6\xc1\xb8\xda\x10Ü7h\xc1Pr\x98!C\x87c\xfd#\fY8\x12W\x1f\x85\xab\x8f6d\xec\x18\xcc6\u0590\xbaq\xb0\xf1\xb8\xdf\t\xb8߉\xb8\xea$\\u2V:\x056\x156͐\x92\xe9X\xd1\f\\g&\xeem\x16l6\xe6\x98c\xc8\u0e70yhχ-\x80-\x84-¼ņ\x94\xa3V\x97\x97\xc0Jaeȝ\x8d\xb9\x17#G\xe5\xb0\x18r\xef\xc0*\xb0\x0f\x95\xb8\xc3*X5\xac\xc60\xaa溆̪\x85\xd5\x19R]\x8f[\x8f\xc3\x1a`\t,\xa2\x11\x89\x1dф\x1c-1dd3V\xdc\x02[\n[\x06[\x0e[\x01[\t[\x85;Z\r\xbb\x10\x19\xb9\b\xbbv1Vu\t\xfc\xa5\xb0ː\xcb\xcbaW`UW\"3W\x19\xd2x5\xb2\xb3Ɛ\xa6kp\xf7\xd7b\xa5\xd7!\x8b\xd7\xc3n\xc0\xfe\xdd\b\xbbɐA7\xc3n\x81݊\xac߆;\xbf\x1d\x99\xbd\x03\x19\xbdӐQwA\x01w\xe3\x1a\xf7\x18Ry/v\xe3>d\xf5~\x8c]\v{\x00{\xd6\xf2 0\xf7!m=l\xe0\x11~\x04\x98\xf6(0\xec1\xc3X<\xf1q\xdcx\xfc\t\xa0\xe5IØ5\xeb)\xc3X\xb0\xe0i$\xea\x19س\x98\xf29\xf8u\x98~=nm\x03l#\xecy\xd8\vX\xf2\x8bX\xf2&C\xf27\x1b\xd2n\x8b!\xc5[\xd1~\t\xfee\xd8+h\xbf\x8a%\xbc\x06{ݐ\xfeo\x182\xf0M\xdc\xea[\x86\xcc|\x1b\xfe\x1d\xf8w1\xe6=C:\xbdoH\xd1\a\x86\xcc\xffА\x8e\x1f\x19\xb2h\x1b\xda\x1f#\xf6\x89!}?5\xa4\xf03\xcc\xf79\xc6n\xc7y;p\xde\x17\x86\x14|\x89\xf3\xbeB\xfbk\x1c\xff\x06)\xf9\x16\xe7~gȊ\x9dX\xcb.\xa4\xff{Cf\xff\x80\xf4\xfc\x88\xcd\xfd\t[\xf1\xb3!K~\xc1Z\xfe\xc19\xff\x1a2\xe0?\x8c\xdbM\x99\xee!\xf7\x92\xfb\xc8\xfd\xe4\x01\xf2 y\x88\xb9\x80\\H.\"KM\xb1\xcaL\xb1mS\x9cŦ\xb8\xe5\xa6$b\xa6\x94:\xa6\x94U\x98\x12\xab4\xa5\xbaʔ\xfajS\x1ajLitMYR\xcb3\xeb\xc8z2N6\x98\x92\x9f0\xa5c#{M\xe4\x12\xb2\x99\\J.#\x97\x93+L\x19\xb4\x92\xadU\xe4j\xf2B\xf2\"\xf2RS\x86\\fJ\xbf\xcbM\x19q\x05\xecJS\xc6\\\xc5#W\x9b2i\r[ט2\xe3Z\xf4\xaeñ\xeb1\xfe\x06S\x86\xdeh\xe2cҔ\xe17\xe3\x9c[L\x99{+\xfcm&\xde\foǠ;L\x19w\xa7)\xe3\xef2e\xc2\xdd&>&Mc\\\xfc^\xccp\x9f)\x93\xef7e\xeaZ\xce\xfb\x80)\xd3\x1e4e\xfaC\x98\xffaӘ\x1c{\x04\xe3b\x8f\xa2\x15\u007f\f\x83\x1f\xc7LO\xe0ГH\xe1SH\xe1Ӱg\x90\xc6g\x91\xc2\xe7\x10[gJ\xc9zS\xca7 \x95\x1bq\xecy\x13\x9f\x93\xf0/\x9ax;܄\x81\x9bM\xa9\xdcbJ\xd5V\xe4\xf8%Sj^Fn_\xc1\x1e\xbcjJ\xedk\xc8\xf9\xeb\xa6\xc4߀\xbd\x89ܿ\x85I\xdf6\x8d\xda\xd8;\xa6Q\x19{\x17\xad\xf8{\x18\xfa>\xa6\xf9\x00\x87>D\xfb#\xf8m\xf0\x1fs\xf1\x9f\xe0\xea\x9f\xea\x95>\xc3\x12?\x87m\x87\xed\xd0\x19\xbe\xc0\xf4_\x9ar\xfeW\x1c\xf75\xf9\x8diLk\xf8\xd64\xe2\rߙ2k\xa7)M\xbbL\x99\xf2\xbd)u?\xe0H\xed\x8f8R\xfb\x13Z\xb1\x9fъ\xfdb\xca\xc8_MY\xfc\x9b\xe6\xe3w]\xd0\x1f\xa6\x8c\xfe\x13r\xf9\vi\xff\x1b\xf7\xfc\x8fi\f\x1b\xfd\xafi\x94\xc6\xfeCҝ\xddX\x88\xb3\a\xb7\xbb\x17\xb7\xb5\x0f\xf2\xdaoJ\xc5\x01^\xf9 y\x88t[\xfc^\x19\x93\xe45\xe68\xa7yel\xc0\x8b7\x8ad/\xde#\x82^sz<\x96\xe25\xc6U\x840\"\xd5+3\xc2^sxK,\xe2\x95!i^\x19\x9a\ue559\x19^\x19\x95\xe9\x95\xe1Y^\x19\x11\xf5\x1asc\xd9^\x99\x9b\x83\xe1\xa7\xc3\xce\xf0ʸ3\xbd2\xfe,\xafLh㕉\xb9^\x99t\xb6W&\xe7yej[\xafLk\xe7\x95\xe9\xe7`\xdas\xbd2\xf2<\\'v\xbeט\x1e\xcf\xf7\x1a\xc3b\x17x\x91\xc3\xf6^\xef\xb4Xi\xac\x83W\xf2\v\xbc2\xa7#|'\\\xa7\x10+O\x14\x01Vg\xafX]\xbcR\xd2\xd5+\x8dݼR\xde\xdd+e=\xbcb\xf7\xf4╣\x97WZz{\xc5\xe9\x03\xeb\xeb\x95\xca~^\xa9\xea\xef\x95\xea\x01^\xa9\x19\xe8\x15w\x90Wj\a{\xa5~\x88W\xe2C\xbd\xd20\xcc+\x89\xe1^Y<\u008b}\x1a\xe9E\x11\x1f\xe5ž\x8c\xf6b#\xc7x\xbdq\xacd,V0\xce+\xcd\xe3\xe1'\xe0:\x13\xbd\x86\x93\x98\x04X\x93\x01{\n\xe0N\xf5\x1ae\x15ӼFy\xc5t\x8d\xcd@\xb7e&\x960\xcbk4;\xb3\xbdR1Nj\u05f5\xb9^\xbc\xa4\xcd\xf3\x9a\r\xf1\xd8|\\\xafb\x01F,\xc4\x02\x16yͲ\x96X1\x12\x85\xef@n\t\xee\xb6\x14\xd7)ӽ\xb2u\xbaň\x94#\x12ӈ\xa3\x91\n\x8c\xad\xc4\xd8*\xdd\xdej]A\rR\x19w1k\xbc\u058bG\xb0\u038bg\xa0\x1e)\x8e\xe3\xe6\x1a\x90\xc7\x04\xee\xa0\x11\xbe\t~\t\xae\xd9\fk\xc1,K1\xcb2\xf8\xe5\xf0+\xbcƤ\x86\x95^\xc3mX\xe5\x95)\xab\xbdRw\xa1\xd7ߡK\xe7Ν;\\\xe6UI]\xee\rh\xb7P#Wx\x83\x1d\xbah\x8b\xbd+y\xfc*\xf2j\xaf\xb4[\x03\xbb\xc6kL\u037f\xd6k\xd4\xe7_\a\xed\xe5_\x8f\xf4\xe4ߠ\xad\x1b\xb5u\x93\xb6n\xd6\xd6-^sn,\xffV\xaf\xd9\x12˿\rrʿ\x1d;\x99\u007f\an(\xffN\xdcP\xfe]ں[[\xf7h\xeb^mݧ\xad\xfb\xb5\xb5\x16\xb2\xcd\u007f\x00\x99\xcd\u007f\x10\xad\xf2\x87\xd0*\u007f\x18)\xc8\u007f\x04)\xc8\u007fT\x15\xf6\x98n\xee\xe3\x10W\xfe\x13\xd8\xd7\xfc'!\xb8\xfc\xa7\xb0\xd7\xf9OC\x87\xcf \x11\xcfz\x8d\x19\xf9\xcfy\x8dD\xfe:\xaf9.\x96\xbf\xdekV\xc6\xf27\xe0Yh\x88o\xc4~5ğ\xf7\x9a\xc3b\xf9/x\xcd\xd2X\xfe\x8blob{\xb3WFo\xf1Jl\xab\xea\xf7%\x95\xce\xcb<\xfa\n\x8f\xbe\xea\x95\xe2\xd7\xf4\x01y]\xb5\xf9\x86\xae\xf9M]\xf3[\xcc\xd3\xdb\xe4;\xba\xfewu\xfd\xef\xb1\xff>\xf9\x81\xce\xf7\xa1\xce\xf7\x11\xfb\xdbȏ\xc9O\xf0\x00|\n\xfb\f\x8f\xe4\xe7\xf0۽\xc6\x10{\x87\x17\xaf\xcc_\xa8@\xbeT\x81|\xe5\x95\xc1_þ\x81}\v\xfbNW\xb1SW\xb1\v\xcf\xea\xf7xJ~\xd0*\xf0\xa3\n\xf5'<\xb5?C\x8a\xbf\xc0\xff\n\xff\x1b\xe4\xf0;\xe4\xf0\a\xfc\x9f\xf0\u007f\xc1\xff\r\xff\x0fd\xf8/d\xf8\x1f\xb2\xb6\x1bY\xdb\x03\xbf\x17~\x1f\xfc~\xf8\x03\xba惺\xe6C\\\xe7a\xf2\bDw\x14\xa2;\xc6\xdeq\xf2\x04y\x92\xd4g\x8c\x8a\r\xf3a\xbf\x86\xfbd\xc2\b\x9f\xcc\x19铉\xa3|\xa8\xbf\xa3}2i\x8c\x0f\x1a.\x1e\xeb\x93\xc9\xe3|2v\xbcϘ\x1a\x9b\xe0\x93i\x13}2s\x92O\xa6O\xf6\xc9\xd4)>|P\x14O\xf5ɬi>cr\xf1t\\\xa7x\x06N\x9d铑\xb3\xb8\xd8\xd9\xe4\x1c\x9f\xf4\x9f\xeb\x93\xfcy>)\x9a\uf4f6\v|\xd2q\xa1O\x06-\xf2Ia1GX>\xb1J|RR\xea\xc3w\n\x9f\x94\xd9>\xb1\x17\xfb\xa4\xa5\x1c>\x06s|FCq\x85\x0fҭ\xf4\x89S\xe5÷\n\x1f\x9e\xe7\x1a\x84\xe3\xaeO*k}\x12\xab\xf3A\xc7\xf5>\xa3<\x16\xf7A\u007f\r>\xa9N\xf8P\xf0|R\xd3\xe4C)_\xe2\x13\xb7هG\xb2\xb8\xc5'\xb5K}R\xb1\xccg\xd4ǖ\xfb$\xbe\xc2'\x8d+}Ұ\xca'\xf5\xab}\xa8\xcd\xc5\x17\xfa\xa4\xe9\"\x9fQ[|1\xaeS|\tN\xbd\xd4'\x8b/\xf3\x19v\xd3\xe5\\\xf1\x15X\xfb\x95>\xe9t\x15{W\x93k\xc8k\xc8k\xc9\xebȵ\xe4\xb3>\x19\xfc\x1c\xeee\x1d\xeeu=&܀;و\xfe\xf3\xb0\x17\x10{\x11\xb6\t\xf1\xcd\x1c\xbd\xc5'\x89\xad\xc8\xd9\x1b>\xe9\xfb\x16#o\x93\xef\x90\xef\x92\xef\x91\xef\x93\x1f\x90\x1f\x92\x1f\x91\xdbȏ\xc9O\x91\xdbϐ\xdbϑ\xdb\xed\xc8\xd5\x0e\xdc\xf0\x17\xc8\uf5daůp\xe7_#S\xdf \x91\xdf¾Czw\"{\xbb`\xdf#{?\xc0~D\x96~\xf2I\xf1\xcfH\xdd/\xb0_5\xf3\xbf)~\xf7I\xdd\x1f\xc8۟\x9a\xe3\xbf0\xd5\u07fc\xe2?\xe4\xbf\xe4\u007f\xe4nr\x0f\xf4\xb3\xd7g\xb8\xcd\xfbp\xfb\xfbq\x83\a|\xd2\xee \x0f\x1d\"\x0f\x93Gȣ\xe41\xf28y\x82\x15~9\xaf\xd2/\x85Uزj\xbft\xa8\xe1\xd9.Y\x875\xd4\xc3\xe2\xb0\x04\xac\xd1o\xe475\x01\x89%@s3\xf2\xd9\xd0\xe2\xc7\xc7yl)Ҽ\f)^\x8et\xad\xf0K\xedJM\xf5*\xbfQ\x12[\x8d\x91\xb1\v\x91\xf0\x8b\xfcFM\xf3\xc5Hv\xf3%\xe8]\xeaGY\xb9\xcco\x96\x96\xc6.G\xac\xec\n\xe4\xfaJ\xd8U~cx\xc3պ%k\xfcfYY\xec\x1a\xecе\x88_\a\xbb\xdeo\xd4\xd7\xdf\xe0\x97\xa97\xc2n\x82\xdd\f\xbb\x05v+\xec6\xec\xeb\xed\xf0w`\xe3\xee\x84\xdd\x05\xbb\x1bv\x0f\xec^\xac\xea>\xbf1j\xf4\xfd~\x19\xb9\x16\xf6\x00\xecA\xbf4>\x84\xfdz؏o)\x8f\xf8eʣ\xb0\xc7T\x15\x8fc\xf7\x9e\xf0˸'aOa\xd5\xe5O\xa3\xf1\x8c_ʟ\x85\x00\x9e\xf3\xcb\xc4u\xf0\xeba\x1b`\x1b\xfd2\xfey\xd8\v\xb0\x17a\x9bp|3l\vl+\xec%\xd8\xcb\xd8\xfeW\xfc\xf8px\xd5oĚ_C\xefu\xa4\xe0\r\xc8\xf2M\xec\xf6[~õ\xdfV\xbc\x03\r\xbc\v\xd5&\xdeS\xbc\x8fc\x1f`\x91\x1fB0\x1f\xf9e\xce6\xd8Lj}\x86\xfe\xe7\xaa\xed\xedض\x1dP\x92\xbd\x133\xed\xf2\xcb9\u007f\xfae\xe1\u007fܹ\xdd\xe4\x1eh`/4\xb0\x0f\x1a\xd8\x0f\r\x1c\x80\x06\x0eB\x03\x87\xa0\x81\xc3\xd0\xc0\x11h\xe0(4p̏ϩ\xe3\xc8\xf0\t$)v\xd2/\xe7\x9f\xf2\x1b\x05՞$\xa3\xa8H\x92\xa4\xc8H\x92\x8ef\x92\xb4\xf5\xc2|I\xd2ɏ~\x12\xec\xb4$\xe9\x17H\x92A\xc9I\xb2\"\x98$KS\x92dy(I:\xa4&\xf1qO\x92\xfc\xf4$)\xc9H\x92\xf2LXV\x92\x94Ea\xd9I\x12\xcbI\x92\xa6ӓ\xa4\xe5\x8c$\x19}f\x924\x9c\x05k\x93$\u0379IFs\xec\xec$\xa9\xccK\x92\xaa\xb6IR\xdd.Ij\xceI\x92\xf8\xb9\xb0\xf3\x92\xa4\xf8\xfc$\xa9͇]\x90$\xd3\xda'I]\x87$\xa9/H\xc2\x03\xdb\x113t\xe2u\v\xc9\"\xb2s\x12\xbe\xdb\xc0\xbaº%ɐ\xee\xb0\x1e\xb0\x9eIb\xf7\x82\xf5\x86\xf5I\x92\x11}\x93\xc4\xe9\a\xeb\x9f$\x89\x01\xb0\x81\xb0AI\xe2\x0e\xc1%\x87\xe2>F$\xc9\xec\x91I2eT\x92\f\x1e\r\x1b\x93$\xcb\xc6&I\xc18^e<9\x81\x9cHN\"'\x93Sȩ\xe44r:9\x83\x9cI\xce\"g\x93sȹ\xe4\xb9\x80\\H.\"\x8bI\x8b,!K\xc92\xd2&\x17\x93\xe5d\x8ct\xc8\n\xb2\x92\xac\"\xab\xc9\x1a\xd2%k\xc9:\xb2\x9e\x8c\x93\rd\x82l$\x9b\xc8%d3\xd9B.%\x97\x91\xcb\xc9\x15\xe4Jr\x15\x94\xb0Z7\xefB\xec\xf2E\xd8ɋ!\x97K\x92d\xfc\xa5P\xc0eH\xfb\xe5I\xd2x\x05Tpe\x92,\xbe*\tE\xe1\xea$ԕ5\xd0\xc65\x10ԵI\xa8(\xd7A\x18\xd7CU7@M7B\x037AE7C \xb7$IŭI(2\xb7ᔆۓ\x8cX\xec\x8e$<\xdcw\xea\fwa\xf0\xddz\xe1{p\xf6\xbd8\xfb>\x9cy?\x82k\xb1\xdf\x0f$\xe1\xb5\xe7Ah\xeb!\x88\xf4a\b\xe7\x91$ò\x1e\x85:\x1eK2l\xfbqH\xe3\x89$\xc3u\x9f\x84v\x9eB\xa4\xf9i\b\xe5\x19D\xac\xe7xW\xeb\xc8\xf5\xe4\x06r#\xf9<\xf9\x02\xf9\"\xb9\x89\xdcLn!\xb7\x92/\x91/\x93\xaf\x90\xaf\x92\xaf\x91\xaf\x93o\x90o\x92o\x91o\x93\xef\x90\xef\x92\xef\x91\xef\x93\x1f\x90\x1f\x92\x1f\x91\xdbȏ\xc9O\xc8O\xc9\xcf\xc8\xcf\xc9\xed\xe4\x0e\xf2\v\xf2K\xf2+\xf2k\xf2\x1b\xf2[\xf2;r'\xb9\x8b\xfc\x9e\xfc\x81\xfc\x91\xfc\x89\xfc\x99\xfc\x85\xfc\x95\xfc\x8d\xfc\x9d\xfc\x83\xfc\x93\xfc\x8b\xfc\x9b\xfc\x87\xfc\x97\xfc\x8f\xdcM\xee!\xf7\x92\xfb\xc8\xfd\xe4\x01\xf2 y\x88`\xd6\xd4\xd4t\bHmA\x00\x1fs\x1d\x03R\xd2)\x80O\xe5\u0080T\x17\x05\xa4\xb9s@\xea\xbb\x04\xf0\xb1\xda5 U\xdd`\xdd\x03fUUU\x8f\x804\xf6\f\xe0\xf9\xe8\x05\xc4{\a$\xde' \xb1\xbe\xbc\xf1~d\xff\x80\xe4\x0f\x80\r\xd4\x14\fB\n\x06k\n\x86 \x05C5\x05Ð\x82\xe1\x01c\xea\xd4\x11\x9a\x83\x91\xb8\xffQ\xb0њ\x831\x9a\x83\xb1\xb8\xffq\xb0\U0005a0c9\x9cq\x1299`\x0e\x991a\nf\x9e\n\x9b\x16\x90\xe2\xe9\xf03xl&9\x8b\x9c\x1d\x90\xba9\x01\xb32\x16\x9b\x1b0\xcbc\xb1y\x01i\x99\x1f\xf0\x96!\x1d\vp?\xb1\x85\x01Y\xbc(`47\x17\xeb*\xac\x801~|\t\xb6\xa4T\x1be\x013\xaf(\xcf\x0ex\xf3\x8a\x8a\xf2\x16\a\xa4sy@\xba\xc4\x02\xd2\xd5\tH\xb7\x8a\x80t\xaf\fH\x8f\xaa\x80\xf4\xac\x0eH\xaf\x9a\x80\xf4v\x03ҧ6 \x85u\xbct=\x19'\x1b\xc8\x04\xd9H6\x91K\xc8f\xb2\x85\\J.#\x97\x93+ȕ\xe4*r5\x14v!\xec\"\xa8\xecbF.\x81\xca.\xd5\x14_\x86\x14_\xae)\xbe\x02)\xbeRS|\x15R|\xb5\xde\xdc\x1a\x8e\xbc\x86\xbc\x16Y\xbeN\xb3|=\xbb7\x907\"\xd17i\xa2o\x86\xd8nQ\xb1\xdd\n\xb1ݦb\xbb]\xc5v\a\xc4v\xa7\x8a\xed.\x88\xedn\x15\xdb=*\xb6{Ul\xf7Ql\xf7\xab\xd8\xd6Rl\x0f\xa8\xd8\x1e\x84\xd8\x1eR\xb1=\f\xb1=\xa2b{\x14b{\x8cW{\x1cb{B\xc5\xf6$\xc4\xf6\x94\x8a\xedi\x88\xed\x19\x88\xedY\x88\xed9\x8eY\a\xa5\xadgk\x03\xb9\x91|^\x15\xf7\x82*\xeeE(n\x13\x14\xb7\x99\xf1-\xe4V\xe8\xe0%\xb6^ք\xbc\x82\x84\xbc\xaa\ty\r\ty]\x13\xf2\x06\x12\xf2\xa6&\xe4-\x8ez\x9b|\a\tyW\x13\xf2\x1e\xbb\xef\x93\x1f !\x1fjB\xb6\xb1\xfb1\xf9\t\xf9)\xf9\x19\xf99\xb9\x9d\xdcA~A~\x19\x90\x82\xaf\xd8\xfa\x9a\xfc\x86\xfc\x96\xfcN\x1f\xa6\x9d\xaa\xc0]\xec\u007f\xaf\x1a\xfcAW\xf5\xa3J\xef'h\xf0gm\xfc£\xbf\x92\xbfA\x82\xbfC\x82\u007f@\x82\u007fB\x82\u007fA\x82\u007fC\x82\xff@\x82\xffB\x82\xffA\x82\xbb!\xc1=\x986\u007f/P\xbc\x0f\x13\xc6\xf7+\x0e\x04\x8c.E\a\x03FעC\x01\xa3[\xd1\xe1\x80ѽ\xe8H )\xafK^\xa7\xbc.EG\x03fQ\x97\x9e\xc7y\x95\x13\xe4I\xf2\x14\xe9Ifi#\x8dd\x147\xb6\xbc\xa4/\x19\xe5-Y\xcb[2\xca[\xb2\x96\xb7d\x94\xb7d-o\x1c\x90B\x86\xc8T2\x9c\x8cO\xc7H\xb2\x969\xf6\xd3Ɍd|Tf&k\xa9KF\xa9K\xd6R\x97\x8cR\x97\xac\xa5.YK]2J]\xb2\x96\xbad\x94\xbad-u\xc9Z꒵\xd4%\xb3\xd4%k\xa9Kf\xa9K\xd6R\x97\x8cR\x97\xac\xa5.\x19\xa5.YK]2J\x1d/\xd7!\x19\xa5.YK]2J]\xb2QRR\x98\x8cR\x97\x8cR\x97\x8cR\xc71]\x93Q뒍\xaa\xaa\xee\xec\xf6HF\xb1K\xd6b\xc7n\xefdT\xbbdT;\xf6\xfa\x91\xfd\x93Q\xed\xd8\x1a\xa89\x19\x84\x9c\f֜\fAN\x86jN\x86\xf1\xe0pr\x049\x92\x1c\xa59\x19\xad9\x19\xc3\xfeXr\x9c\xe6d\xbc\xe6d\"\xfb\x93\xc8\xc9\xe4\x14r*9\x8d\x9cN\xce g\x92\xb3\xc8\xd9\xe4\x9cd\x16\xc1d\x16\xc1d\x14\xc1d\bp\x01\x0f-LF\rd\xab\x98\xb4\xc8\x12\xb2\x94,#mrq2\na2\na2\na2\na2\na2\na2\na2\na2\na2\n!\x94R\x97,\xa3\x1b\x92\xfd\xa3\nG\x14N*L\xf0\xf4F\xb2\x89\\B6\x93-\xe4Rr\x19\xb9\x9c\\A\xae$W\x91\xab1\U00045c0b0\xf9Ō\\\x02\x11^\xaa\t\xbf\f\t\xbf\\\x13~\x05\x12~\xa5&\xfc\xaadT?\x0eZ\x83\x14O\xbc\x86\xcdk\x93Q\xfd4\xd9\xd7#\xc1\x13o`\xec\xc6d\x14?M\xf5͐\xdf-*\xbf[!\xbf\xdbT~\xb7\xab\xfc\xee\x80\xfc\xeeT\xf9\xdd\x05\xf9ݭ\xf2\xbbG\xe5w\xaf\xca\xef>\xca\xef~\x95\xdfZ\xca\xef\x01\x95߃\x90\xdfC*\xbf\x87!\xbfGT~\x8fB~\x8f\xf1j\x8fC~O\xa8\xfc\x9e\x84\xfc\x9eJ\xd6\xe2\a\xf9=\x93l4[\xcfB\u007f\xcfq\xd0:\xe8o\xbd\xeao\x03\xbb\x1b\xa1\xbf\xe7U\u007f/$k\xe9\x83\xfc6A~\x9byl\v\xb9\x15\xf2{\t\xf6\xb2\xe6\xe2\x15\xe4\xe2U\xcd\xc5k\xc8\xc5뚋7\x90\x8b7\x93\xb5\xf0i*\xde\xe6)\xef \x15\xefj*\xde\xd3T\xbc\xcf\xd8\aHŇ\x9a\x8am\xec~L~\x92\xac\x1f\xb8\x9f\xb2\xfd\x19\xf99\xb9\x9d\xdcA~A~I~E~M~C~K~G\xee$w\x91ߓ?\xe8\xc2~d\xf3'\xf2g\xf2\x17\xf2W\xf27(\xefw(\xef\x0f(\xefO(\xef/(\xefo(\xef\x1f(\xef_(\xef?(o7\x94\xb7\x87\xa3\xf7\x92\xfb\xc8\xfd\xe4\x01\xf2 y\x88\b\x05>\xc4\xee\xc3\xe4#\xe4\xa3P\xe1cA\xfd\xc2\xf18T\xf8\x04cO\x92O\x91OC\x89\xcf@\x89\xcfB\x89\xcf鞭\x83\x10\u05eb\x107\x04\xf5[\xc7\xc6 \n!G\xbe\xa0j|\x11j\xdc\x045nfh\v\xb9\x95|\x89|Y\xf3\xf3\n\xf2\xf3\xaa\xe6\xe75\xe4\xe7u\xcd\xcf\x1b<\xf8&\xf9\x16\xf96\xf2\xf3\x8e\xe6\xe7]\xcd\xcf{\x8c\xbd\x8f\xfc|\xa0\xf9\xf9P\U000f3371\x8f\xc9O\xc8O\xc9\xcf\xc8\xcf\xc9\xed\xe4\x0e\xf2\v\xf2Kh\xf2+\xb6\xbe&\xbf!\xbf%\xbf#w\x92\xbb\xc8\xef\xc9\x1f\xc8\x1fɟȟ\xc9_\xc8_\xc9\xdf \xcc\xdf!\xcc? \xcc?!̿ ̿!\xcc\u007f \xcc\u007f!\xcc\xff \xcc\xdd\x10枠\xb7\xa0K炽A\x1f\\\xe7\x82}A\xbf\xfa\xce\x05\xfb9\xcb\x01\xf2 y\x88j\xf0~\xd5\xe0Zj\xf0\x01\xd5\xe0\x83\xd0\xe0C\xaa\xc1\x87\xa1\xc1GT\x83\x8fB\x83\x8f\xf1\x92\x8fC\x83O\xa8\x06\x9f\x84\x06\x9fR\r>\r\r>\x03\r>\v\r>\xa7\x1a\\\a\r\xaeW\rn\xe0\x19\x1b\xa1\xc1\xe7U\x83/\xa8\x06_\x84\x067A\x83\x9byl\v\xb9\x95|\x89|Ys\xf1\nr\xf1\xaa\xe6\xe25\xe4\xe2u\xcd\xc5\x1b\xc8ś\xba\xddoq\xd4\xdbH\xc6;\x9a\x8cw5\x19\xef1\xf6>\x92\xf1\x81&\xe3CM\xc66\xc6>&?!?%?#?'\xb7\x93;\xa0\xbf/`_\xb2\xf7\x15\xf95\xf9\r\xf9-\xf9\x1d\xb9\x93ܕ\xa2U\xfe{\xb6\u007f\xd0E\xfd\xa8\x1a\xfc\x89\xfd\x9f\xc9_\xc8_\xc9ߠ\xc1ߡ\xc1?\xa0\xc1?\xa1\xc1\xbf\xa0\xc1\xbf\xa1\xc1\u007f\xa0\xc1\u007f\xa1\xc1\xff\xa0\xc1\xdd\xd0\xe0\x1e\x8e\xdeK\xee#\xf7\x93\aȃ\xe4!\xf20y\x84#Uz\xccL\x95\x9e\xb3R\xa5\xd7\xecT\xe9='U\xfa\xccM\xe5\u007f\xab\x98\x97\xea\x83+ʛϋ- \x17\x92\x8b\xc8b\xd2\"K\xc8R\xb2\x8c\xb4\xc9\xc5d9\x19#\x1d\xb2\x82\xac$\xab\xc8j\xb2\x86t\xc9Z\xb2\x8e\xac'\xe3d\x03\x99 \x1b\xc9&r\t\xd9L\xb6\x90K\xc9e\xe4rr\x05\xb9\x92\\E\xae\x86\xc0.T1]\xc4\xee\xc5ڼ\x84\xcdK\xc9\xcbTc\x97\xab\x9c\xae`\xffJ\xec\xebUl]M\xae\xc1\xf1\xe6kؼ\x96\xbc\x8e\xbc\x9e\xbc\x81\xbc\x91\xbc\tr\xbb\x19\"\xb8EEv\xab\xe26\xc6o\x87\xde\xee\x80\xde\xee\x84\xde\xeeRu\xdd\r\x99ݣ\x8d{Ѹ\x8fc\xee\x87\xe0\xd6Bp\x0f@p\x0f2\xf2\x10d\xf50[\x8f@t\x8f\xb2\xf5\x18\xf98\x16\xf8\x04\xae\xf3${OAz\xcf@v\xcfBr\xebTr\xebUr\x1b \xb9\x8d*\xb9\xe71\xe9\v\xa9Fs\xf3\x8b\x10\xdc&\x15\xdcf\x9e\xb6\x05ZڊK\xbc\xa4w\xf72C\xaf\x90\xafBm\xaf\xa5\x1a\xb6\xf3:F\xbc\x81\xb9\x9a\xdfT\xb5\xbdŃoCn\xef\xb0\xf5\x11D\xb7\x8d\xad\x8f\xc9O \xbdO!\xbd\xcf \xbd\xcf!\xbd\xed\x90\xde\x0eH\xef\vH\xefKH\xef+H\xefkH\xef\x1b\x8e\xfe\x96\xfc.Ո\xd5\xec\x04\xaaw\xb1\xff=\xf9\x03\xf9#\xf9\x13\xf93\xf9\v\xf9+\xf9\x1b\xf9;\xf9\a\xf9'\xf9\x17\xf97\xf9\x0f\xf9/\xf9\x1f\xb9\x9b\xdcC\xee%\xf7\x91\xfb\xc9\x03\xe4A\xf2\x10y\x987\xac\u007f\x95?\x0f#[\xe6\x87\xf5\xaf\xf1\x17\x84\xa5ia\xd8h\x89-\nKKqX\xf2\xad\xb04\x97\x84\xa5\xbe4,Uea|P\xdba3\x1e\x8f-\x0eK\xbc<,\xb1XX,'lV\xc6\xe3\x15\x18T\xc9UV\x91\xd5d\r钵d]\x18\x0fS}X\x9cx\x18\xcfQCX\x12\x890\x1e\x9fưLm\n\xe3SpIX\xc67\x87\xf1I\xd8\x12\x16{i\x18\x9f\xcf\xcb\xc2\xe2.\x0f\xe3\xa3yEX&\xac\f\xcb\xe8U8{\xb5\x9e}5g\\C^C^K^\x87\x8c^\xaf\x19\xbd\x01\x19\xbdQ3z\x93f\xf4fd\xf4\x16\xcd\xe8\xad\xc8\xe8m\x1cy\xbbf\xf4\x0e\xcd\xe8\x9d\xcc\xe8]\x9aѻ\x99\xd1{4\xa3\xf7\"\xa3\xf7iF\xefGF\xd7jF\x1f@F\x1fDF\x1fҌ>\x8c\x8c>\xa2\x19}\x14\x19}L3\xfa83\xfa\x84f\xf4If\xf4)d\xf4i\xcd\xe83\xc8\xe8\xb3\xc8\xe8s\xc8\xe8:$k=2\xbaA3\xba\x11\x88?\x8f\x84\xbe\x80\x84\xbe\x88\x84nbB7\xe3\xc4-\x18\xbb\x15c_\xe2b_\x0e\xcb\xecW ⾳\xfb潪b\x9eT\x94\xf7\x9az\xb7(\xefu\xf8\xf9\xee\xfc\xbc7\xe0/\x98\xd4>\xef#\x9e\xb1\x8d\xfc\x84\xfc\x94\xfc\x8c\xfc\x9c\xdcN\xee \xbf \xbf$\xbf\"\xbf&\xbf!\xbf%\xbf#w\x92\xbb\xc8\xef\xc9\x1f\xc8\x1fɟȟ\xc9_\xc8_\xc9\xdf\xc8\xdf\xc9?\xc8?ɿȿ\xc9\u007f\xc8\u007f\xc9\xff\xc8\xdd\xe4\x1er/\xb9\x8f\xdcO\x1e \x0f\x92\x87\xc8\xc3\xe4\x11\xf2(y\x8c\xb9\x80\\H.\"\x8bI\x8b,!K\xc92\xd2&\x17\x93\xe5d\x8ct\xc8\n\xb2\x92\xac\"\xab\xc9\x1a\xd2%k\xc9:\xb2\x9e\x8c\x93\rd\x82l$\x9b\xc8%d3\xd9B.%\x97\x91\xcb\xc9\x15\xe4Jr\x15\xb9\x9a\xbc\x90\xbc\x88\xbc\x98\xbc\x84\xbc\x94\xbc\x8c\xbc\x9c\xbc\x82\xbc\x92\xbc\x8a\xbc\x9a\\C^C^K^G^O\xde@\xdeH\xdeD\xdeL\xdeB\xdeJ\xdeF\xdeN\xdeA\xdeI\xdeE\xdeM\xdeC\xdeK\xde\x17\x91!\xf7Gd\xe8ڈ\x8cz \"\xc3\x1f\x8cȈ\x87\"2\xf3\xe1\x88\xcc}$bL/~4\"c\x1e\x8bȸDZ\xabODd\u0093\xd0\xdeS\x11\x99\xf4tD&?\x131\xe6ƞž?\x17\x91i\xeb\"2}}Dfl\x88\x18\x93\x8b7F\x8cq\xc5\xcfG\x8cQ\xf9/Ddʋ\x11cZlSD\xff\x99\xc6\xe6\x881\xacx\v\xce\xcb\xdf\x1a\x91a/\xa1\x17{9\x82\xfa\x18\x91\xb1\xafFd\xf4k\xb8\xfc\xeb\x11\x99\xf3FDf\xbd\x191f\xc7ފ\x18\x93F\xbcͥ\xbeC\xbeK\xbeG\xbeO~@~H~Dn#?&?\xc1#\xf9)\x1e\xe0\xcfP*>\xc7\xe3\xbd\x1d\x8fՎ\x884~\x11\x91\x96/\xf1\xcc\x17\u007f\x85'\xefk\x14\x94o\xf0@\u007f\x8b\a\xfc;<\xfa;\xf1\x84\xee\xc2\xe3\xff}\x04\x9f\x00?\xe0i\xff\x11O\xf9O\x11i\xf8\x19O\xe7/\xa8\tſ\xa2\xfc\x14\xff\x86ғ\xff{D\xea\xfe\xd0\xe7\xe2ψ\xfe\x93\x8d\xbfP\x80\x8a\xff\xc6y\xf9\xff\xa0\x1c\xfd\xab\xe5迈,ٍ\x92\xb4\aeb/.\xbf\x0f%d?Jǁ\x88\xb1$v0b\xb8\xf6\xa1\x88,>\xcc\xe5\x1e!\x8f\x92\xc7\xc8㭏\xe3\tvN\x92\xa7HO\x9a\x94K\x9aQ^n\xa4I\x8d\x99&e\xde4\xd45_\x9a\xd4\xfbӤ:)MJNK3JJ\x02i\x12ON\xc3#\x9b\x92&\x15\xa14\xa3\xa2\"5MJ\xc3iR\x19I\x93\x86\xb44\xa9MO\x93XF\x1a\nh&P\x93\x05\x94E\x81\x92l\xccW\x9e\x93f\xd4ל\x0eԟ\x01\xc4\xce\x04&\x9e\x95fT\x97\xb4\x01&\xe6\xe2\n\xe5g\x035m\x81x\xbb4\xb3$^~\x8e\xb2\xe1\\e\xc9y\xca\xf8\xf9ʊ|\f\xa9\xb8\x00(m\x0f4t\x00j\v\x80\x89\x1dq\xb8db',\xb2\xbc\x10\xa8)\x02\xca:\x03\xf5]\x80\xea\xae@I\xb743^R\xde\x1d\x8c\xc7{\xe0\x96z\"X\xd1\v(\xed\rT\xf6\x01\x1a\xfa\x02\xb5\xfd\x80\xd8\xe04\x99;\x04\xf9\x19\x8a\xb4\fC6\x86#\x1b#p\xd6H\xc4G#\x0fc\x90\x82\xb1\xb8\xfdq\xb8\xfd\xf1i2q\x02bSӌ\xd2\xcai@lf\x9aQ[2\v\x988;͈\xc5\xe6\xa4ɔ\xb9i\xace\xe4|r\x01\xb9\x90\xb4\xd2\xc4*I×\xd2\xd24\xa3\xd9*K3\x9b-\xdbN3lwq\x9a\xd8\xe5\xe8\xdan\fGl'M܊4\xa3ɪL3\x9b,\xbb*\r{_\x8d\x03nM\x9a$\\\xc4l\xb7\x16\x87\xed:\xc0\xa9ǁD\x1c\xb3$\x1a\xd0r\x12i\xe24\xa6\x99V'\xb7I\x99X\x92\xe6mF\xa79\xcd\a\xd7춤ym\xb7\x93\xbb\x94.\xb1,\xcd\ag'\x96㨆W\xb4\xfa\xc4\xca4/\xc2\xee\xaa4\x13n\xb5v\x9a\xed\v\xb5\xe3^\xa4L\\\x8cq\x88Y\x97\xa4\xf9\xe9\xedK[\x1b\xb6{\x19.\x87a\x97\xd39W\xa4\x99\x89N֕i^о*-)щ\x97\xbbZ\x03\xcd\xf6\x1a=\x9a\xb8\x06Cq\xf8ZL\xa9\x87\xafc\u05fe\x1e\x13\xea\x18\xf7\x06ƛ\xed\x1b\x19O\xdcD\xe7܌\xf5\xa3w\v֏\xc1\x89[\x11u:%nK3\x9dN\xd6\xedi^\ak\xbaC;\xee\x9d\xca\xc4]\x1a\xb2\x13wkg\xc6=i2\xe3\xde4\xef\f\\\xec\xbe4sF\xa7\xc4\xfdJgm\x9a1c\xc6\x03ܧ\aɇȇ\xc9G\xc8G!\x95\xc7\xf4Qz\x1c\x88?\x81\xe7\xe9I<\x00\x15O\x01\xb1\xa7!\xa1gҤ\xea\xd94\xa3\xaa\xfc9\xa0z\x1dP\xb2\x1e\x88o\x00\x1a6\x02\xb5\xcf\x03\xb1\x17\xa0\xb4\x17\xa1\xb4M\xfa,l\x86ܶ\xe8s\xb7U\x1f\xad\x97 \xb0\x97!\xbaW\xf0ܽ\n\xe1\xbd\x06\u1f4e\xe7\xee\r\\\xb0\xea\xcd4\xb3<^\xfe\x96\x8e{[\x9f\xbew\x80\xf8\xbb\xc0\xdc\xf7\x80\x86\xf7\xf59\xfc \xcdh\xa8\xfa0ͬ*\x8f\u007f\x84k\xd5l\x03\xca>F\xbf!\xf6\t\x9aU\x9f\xa2Y]\xfe\x992\xfe9X\x12߮\x8c\xedH3\xeb'\xd6~\x81v<\xfe%\x06\xce\xfd\n\xa8\xfc\x1a\x98\xf2\r\x9e\xe0\xf2o\x81\xaa\xef\xf4\x81\xde\t\xc4w\xa5\x99\xd5\xf1\xf8\xf7h\xce\xfd\x01(\xfd\x11\x88\xfd\xa4\x8f\xfaϸ\xa9\xaa_\xf4\x99\xfd\x15OF\xec7}<~\xd7G\xf6\x0f}Z\xff\x04\xaa\xfe\xd2\a\xf5o\x05\x12\x9f\x01\xce\xe7\xe9f\xb1em\am{\a\x02\xf6\x17\x80\xfb%\x87~\x95n\xb4X_\x03\x89o\x00\xe7\xdbt\x13\xc5\xe2;жw\"`\xef\x02\xdc\xef\xd1o\xb2~\x00c֏\xca\xc4OJ\xe7\xe7t/\"\xd6/\xeal\xfbW\x8dٿ)\xdd\xdf5\xd4d\xfd\x91\x8e\xb7\x94?\x81\xc4_\x80\xf3w:\xdeW\xac\u007f@\xdb\xfe\x17\x01\xfb?\xc0\xddͅ\xecI7ʬ\xbd@b\x1f\xe0\xecO7\xcb,\xeb\x00h\xdb\a\x11\xb0\x0f\x01\xeea\xf4\x9b\xac#`\x99uT\x998\xa6t\x8e\xa7{\x11\xb1N\xa8\xb3\xed\x93\x1a\xb3O)\xdd\xffi\xa8\xc9\xf2d\x18\x15\x96\x00\t\x03p\xcc\f\xb3\x02\xb5\x1cD-G\xc0\xf6\x03n\x12\xfaM\xd6i\x19F\xb9\x15\x00\x12ɀ\x13\xcc0\xcbQ\xcbA\xd4r\x04\xecT\xc0\rg\xf0\xdf\xc6!\xdad\xa5\xb1\x9d\xaem'#Ë\x88\x95\xa9\x0e\xb5\\cv\x94dz\xc9\x1cDʭӕ\x893\x94Ι\x18\x8a\v\x9c\xa5\x0e\xf5\\cv\xae\xd2=\x9bg\xe4e\x98\r1\xab\xad2\xd1N霓\xe1E\xc4:W\x1d*\xba\xc6\xec\xf3\x95n\xbe\x86P\xd13\xf0\xfd\xc0j\xafLtP:\x05\x19^D\xac\x8e\xeaP\xd65f\x17*\xdd\"\r\xa1\xb2g\x98\xb51\xab\x8b2\xd1U\xe9t\xcb\xf0\"buW\x87\xf2\xae1\xbb\xa7\xd2\xed\xa5!Tx\\2n\xf5Q&\xfa*\x9d~\xb8<>\x10\xfa\xabC\x85ט=P\xe9\x0e\xd2\x10*<:-\xd6\x10eb\xa8\xd2\x19\x86\x03\x10\xdcpu(\xf3\x1a\xb3G*\xddQ\xbc\xfb\xd1\x19\xc6bk\f\x90\x18\v8\xe32\xcc\xc5(\xf2 j<\x02\xf6D\xc0\x9d\x84~\x9359è\xb5\xa6\x00\x89\xa9\x803\rkEu\aQ\xdc\x11\xb0g\x02\xee,\xf4\x9b\xac\xd9\x19f}\xb35'ìn\xb6\xe6\xe2\xe4fk\x1e\xaf6\x9f\\@.$\x17\x91Ť\x95!y%\x19RX\x9a!\x1d\xcb2\xa4\x9f\x9d!}\x17g\x98}\xfb\xe6\x95gȠX\x86QT\xe4dH\x97\x8a\f\xe9Z\x99!ݪ2\xa4{u\x86\xf4\xa8ɐ\x9en\x86\xf4\xaa͐\xdeu\x19ҧ>\xc3\xecҹ \x9eav\xed\\Аav\xeb\\\x90\xc80\xbbw.h\xcc0{t.h\xca0{v.X\x92a\xf6\xea\\Мa\xf6\xee\\Вa\xf6\xe9\\\xb04ë\u007f\x1d\xb6,#\xa9K\xe7\x8e\xfa\xe7a˹\xa6\x15\xe4Jr\x15\xb9\x9a\xbc\x90\xbc\x88\xbc\x98\xbc\x84\xbc\x94\xbc\x8c\xbc\x9c\xbc\x82\xbc\x92\xbc\x8a\xbc\x9a\\C^C^K^G^O\xde@\xdeH\xdeD\xdeL\xdeB\xdeJ\xdeF\xdeN\xdeA\xdeI\xdeE\xdeM\xdeC\xdeKޗ!\xd6\xfd\x19b\xaf\xcd\x10\xe7\x81\fq\x1f̐\xc4C\x19\xd2\xf8\xb0>\x90\x8fd\xa0\x86?\xaa\xcf\xdfc\xfaT>\xae\x0f\xe1\x13\xfa\x90>\t4>\x95\x81W\xb5\xa7\x01\xfb\x19\xc0y\x16p\x9f\x03\x12\xeb\x80\xc6\xf5\x19x;\xdb\x00\xd8\x1b\x01\xe7y\xc0}\x01H\xbc\b4n\xca\xc0\xdb\xd5f\xc0\xde\x028[\x01\xf7% \xf1r\x06>\xc0^\xc90c5֫\x19\xf8\xf0\x8a\xbd\x86\x80\xfd:\xe0\xbc\x01\xb8o\x02\x89\xb7\x80Ʒ3̺\x84\xf5\x8e\xd2~W鼧t\xdfW&>P6~\x98\x81w\xa7\x8f2$\xbe\r\r\xfbc\xc0\xf9\x04p?\x05\x12\x9f\x01\x8d\x9fg\xa0\x02n\xcf\xc0\a\xfd\x0e\xb4\xec/в\xbfD\xcb\xf9\n-\xe7k\xb4\xdco\x80ķ@\xe3w\x19fY\x95\xb5\x13\x8fJ\x95\xb5Ki\u007f\xaft~P\xba?*\x13?)\x1b\u007f\xe6s\xfa\v\x9f\xc6_\xf9\x9c\xfe\xc6g\xf2w>\xb9\u007f(\x1b\xff\xcc\xc0g\xcb_\x80\xfd7\xe0\xfc\x03\xb8\xff\x02\x89\xff\x80\xc6\xdd\x19\xa8\xe2{\x00{/\xe0\xec\x03\xdc\xfd@\xe2\x00\xd0x\x90\x9bw\x88\x9d3\xbd(GN\x17\xb4\x9d\xae\x99f\xad\xe3tC\xd3펦\xeb\xf6 {f\xeaW\x8b^\x99\x10po\x1c\xb3\xfadj\x05\xeb\v6\xd9\xfd\xc8\xfeJg\x009\x10\x13\xe2F\a\xb5\xba\xc1\x1as\x87\x90C5\xe4\xba\xc3Z\xddp\x8dY#ȑ\x1a\xb2\xacQ\xadnt\xab\x1b\x93)\xb5ca\xe32%6>\x13\x9a\x9b\x90\xe9\xc5˥3\x11mgR\xa6\xd9\xe08\x93\xd1t\xa7\xa0\xe9\xbaS\xc9i\x99\xfa\xb9<=\x13✁c\xd6\xccL}\x1f\x9d\x056ٳ\xc99Jg.9\x0f\x13b\x8d\xf3[\xdd\x02\x8d\xb9\v\xc9E\x1ar\xdd\xe2Vgi\xcc*!K5\x84\x17\xe7Vg\xb7\xba\xc5ؐr\x1cn\xb0cJ\xc7Q\xba\x15J\xab2\x13orU\x99^\xbc\xda9\xd5h;5\x99f\xa5\xe3\xb8h\xba\xb5h\xban\x1dY\x8f\x80\x15\xcf\xd4W\xc0\x86L}\x99K\x90\x8dJ\xa7\x89\\\x82Y\xb0\xd0\xe6Vע1w)\xb9LC\xae\xbb\xbcխИ\xb5\x92\\\x95\xc9\xd7\xc4խ\xee\xc2Vw\x11\xc4s1\xae\xd7t\t\xc6رKuE\xb1\xcbt\x19\xb1\xcbu\x05\xb1+2\xf1B~e\xa6\x17o\xe8\xceUh;Wg\x9a\xa5\x8e\xb3\x06M\xf7\x1a4]\xf7Z\xf2:\x04\xac\xeb3\xf5M\xfe\x06\xb0ɾ\x91\xbcI\xe9\xdcLނY\xb0\xda[[\xddm\x1aso'\xefА\xeb\xde\xd9\xea\xeeҘu7y\x8f\x86,\xeb\xdeVw_\xab\xbb\x1fr^\x8bM\x8d=\x90\x89\x9a\xf8`\xa6\x17_6\x9d\x87\xd0v\x1e\xce4\xab\x1d\xe7\x114\xddG\xd1t\xdd\xc7\xc8\xc7\x11\xb0\x9e\xc8\xd4/\xa5O\x82M\xf6S\xe4\xd3J\xe7\x19\xf2ŶU=\xd7\xea\xd6i\xcc]OnА\xebnlu\xcfk\xccz\x81|QC\x96\xb5\xa9\xd5mnu[2\xa5z+\xec%\\3\xf62\x1a\xaf\xc0^\xcdD]~-Ӌ\xef\x17\xce\xeb\x99Z\x9e3\xcd\x1a\xc7y\x13M\xf7-4]\xf7m\xf2\x1d\x04\xacw3\xf5{\xc8{`\x93\xfd>\xf9\x81\xd2\xfa\x90\xfc\b\xb3\xe02\xdbZ\xddǭ\xee\x13<\xee\x9f\xe2\xdc\xf2π\xd8\xe7\x99\xf8 ٞ\xe9\xc57|g\a\xda\xce\x17\x99f\x95\xe3|\x89\xa6\xfb\x15\x9a\xae\xfb5\xf9\r\x02ַ\x99\xfaK\xc0w`\x93\xbd\x93ܥt\xbe'\u007f\xc0,\xc8Ǐ\xad\xee'\x8d\xb9?\x93\xbfh\xc8u\u007fmu\xbfi\xcc\xfa\x9d\xfcCC\x96\xf5g\xab\xfb\v5\xe7o\xd8?\xb0\u007fQ\xa6\xec\xff2\xbdx\x05sv\xa3\xed\xec\xc94㎳\x17Mw\x1f\x9a\xae\xbb\x9f<\x80\x80u0S\xbf\xbb\x1f\x02\x9b\xec\xc3\xe4\x11\xa5s\x94<\x86Y\xb0\xa2\xe3\xad\xee\x84\xc6ܓ\xe4)\r\xb9\xee\xffZ\x9d'K\xbf\xeb\vid!dYf\xab\xf3\xb6:_\x96\xc4\xfd\xb0\xa4,#\xdet\x1a\x1a\x014*\x93qBeS\x10\xcdY)\x18\x87*\x14\x82\xc3\x13\x9e\n\x87\a'\f\a)F\xb2\xf47\x824\xa5\x93\x8eP\xccq2\xb4\xe3fj\aE];V4\x8b\xbf+d\xabk\xb2sZ\xdd\xe9t\xce\x19\xad\xee\xcc,\x9f:\xe7\xac\xff\xf7m\x18vs[\xddٌ\xban\xde\xff\xfb\xb6\f[\xedZ\xdd9\x8c\xe2u\xfb\xff\xfdyXu\xec\xfc,|\x18\xe6gy\xf1mƹ\x00m\xa7}\x96\xd9\xec8\x1d\xd0t\v\xd0tݎd'\x04\xac\xc2,\xfd\xd6S\x046ٝ\xc9.J\xa7+\xd9\r\xb3`I\xdd[]\x0f\x8d\xb9=\xc9^\x1ar\xddޭ\xae\x8fƬ\xbed?\r\xe1E\xbb\xd5\rhu\x03\xb3\xa4y\x10l0l\x88\xaeih\x96Qo\x0fS\fςdGdy\xeb\xb1ܑ\b8\xa3\xb2\xccz\xc7\x19\x8d\xa6;\x06M\xd7\x1d\x8b\x11\xee8\xf4\xad\xf1Y\xfa\xfb\xcf\x04\xf4\xad\x898\x03\x13Oju\x93\xb3\xa4~\nl*lZ\x16\u07bd\xa7gy\xf12\xee\xcc@ۙ\x99e.v\x9cYh\xba\xb3\xd1t\xdd9hZs\xb3\xf4u}\x1e\xc6\xe9o&\xadnA\x96,^\x98\xa5\xdfY\x16\x91\xc5J\xc7\"K\xb2\xf0\xfd\xc5qJ[]\x99\xc6\\[;\xae\xbbX;Vy\x16\xbf\xfaIJ|\xfa=\xc7r\xfe\xdfWd\xa1\\U\xe2\x18櫢s\xaa\xe9\xdc\x1a:\xcb\xcd\xd2\xff\x1c[\v6\xdbuJ\xa7^\xe9ƕVC\x16^\x1c\x13\x80Әe\xe2\xc2Mh\xbaK\xd0t\xddf4\xad\x96,\xfd\xe5oi\x96Ė\xc1\x96#T\xb9\"\xcb[\x87\xeb\xaf\xcc2\xea\x9cUYf\x9d\xe3\xacFӽ\x10M\u05fd\bM\xeb\xe2,\xfd\xf9\xea\x92,\xa9\xbb\x14k\xa8\x8aٗ\xd19\x97ӹW\xd0YW\xea\xf6\\\xa5[r\xb5n\xc6\x1a݁k\xb2|5\xf8F\xe8\\\x9be֔;\xd7eyA\xe7z\xed\xb87h\xc7uoԎu\x93v,\xeb\xe6,T\xa6[\xb2\xf4\x8f9o\xe5\x03s\x1b\x1f\x98\xdb\xf9\xa4\xdc\xc1G\xe4Nf\xfa.\xe6\xf8nf\xf5\x1e\xa6\xf3^\xcd\xdb}Y&\x96u\u007f\x96\x17t\xd6j\xc7}@;\xae\xfb\xa0v\xac\x87\xb4cY\x0fC\x11\xb1G8ѣ\x9c\xe8\xb1\xd6]z\x9c\xf3=ѺKOrڧZw\xe9i\x9d\xfd\x99,)y6K\xec\xe7\xb2\xc4Y\x97%\xee\xfa,\xb16d\xe1\xbdm#\xe0<\x0f\xb8/\x00\u058b\xb8\v{\x13\xe0l\x06\xdc-\x80\xb55\v\x1f\xe9/\x01\xceˀ\xfb\n`\xbd\xaa{\xf5\x9a\xee\xd5\xeb\xbaKo\xe8\xfe\xbc\x99e\x96\xc7\x12o)ݷ\x95\xf6;Y^\xd0~W;\xce{J\xeb}\xa46\xf1\x81&\xf9C\xcd\xf9GY\xfa\x03\xe76\xcd\xfcǚ\xf4O\xb0\x88ħ\xba\x9c\xcftu\x9fg\xe9\xef*\xdbu\x8d;ty_@\x02M\x89/\x95\xeeWJ\xfb\xeb,\xaf\xfe\x02\xf8\x8dv\x9co\x95\xd6wz\xf7\x89\x9dL\xc8.f\xea\xfb,~G\xff\x81\t\xfb\x91\xc9\xf9I\xa5\x98\xf8Y\xe9\xfe\xa2\xb4\u007fU\x8d\xda\xf6o\xdaq~WZ\u007fd\xe1k쟀\xfb\x17`\xff\x9d\xa5\xdfb\xffA\xd3\xf9\x17\xb0\xfe˒\xda\xddY\xf8\xf2\xb3\ap\xf7\x02\xf6\xbe,\xfd\x81b?\x9a\xce\x01\xc0:\x98eV\xc6\x12\x87\x94\xeea\xa5}$\xcb\v\xdaG\xb5\xe3\x1cSZ\xc7\xc1\xca\xc4\t\xa5{Ri\x9f\u00a0J\xdb\xfe\x9fv\x1cO\x14\xb4$jTV\x1aQ|\xd71\x01\xd7\vؾ\xa8\xfe\x8c\xe7G\xd3I\x02\xacӢ\xf8\xbe\x14\x00\xdcd\xc0\x0eF\xf5\xb7\xe9\x144\x9d\x10`\xa5F\xf1e!\f\xb8\x11\xc0N\x8b\xea\x0f@\xe9h:\x19\x80\x95\x195*\x12Y\x8a(\xe0f\x03vNT\u007f\x9b9\x1dM\xe7\fř\x80u\x16\x82\x15\x896J7Wi\x9f\x1d\xf5\x82v\x9ev\x9c\xb6J\xab]\x14\xdf\xec\xce\x01\xdcs\x01\xfb\xbc\xa8\xfe\n\u007f>\x9aN>`]\x10\xc5\x17\xa7D{\xa5\xdbAi\x17D\xbd\xa0\xddQ;N'\xa5U\x88\x93b\x89\"\xa5\xdbYiw\x89\xe2)\xb0\xed\xae\xdaq\xba)\xad\xeeQ}\x84\x13=\xe8ܞtv\xaf\xa8O\x9dݛ]\xa7\x0f\x9d\xd57\xaa\xdf\xc7\xfa)\xdd\xfeJ{\x80\x1e\xb0\xed\x81\xdaq\x06)\xad\xc1Q\xa3%1\x04p\x87\x02\xf6\xb0\xa8\xfe\b7\x1cMg\x04`\x8d\x8cJ\xcb(\xd8h\xac\xb0%1F\xe9\x8eU\xda\xe3p\x03\x18:^;\xce\x04\xa551\x8ao\x95\x93\x00w2`O\x89\xeao\xf4S\xd1t\xa6\x01\xd6\xf4\xa8\xfe.?C\xe9\xceTڳ\xa2\xfcY~\xb6v\x9c9Jk.F\xc6\xe6E\xf5[\xe2|\xa5\xbb@i/\x8c\xf2\xe7\x9dE\xdaq\x8a\x95\x96\x15՟\x9aJ\x94n\xa9\xd2.\x8b\xf2\x97&[;\xceb\xa5U\x8e\xf30U\x8c\xceu\xe8\xec\n\xa4Kg\xabdש\xa2\xb3\xaa\xa32\xbb&*\x85n\x145\u0529\x8dj\x9ds\xea\xe0P\t\xeb\xa3>uN\x9c]\xb7\x81]\xd7M\xb0k5\xb2kYMQ\xfe\x8d\x05\xd9L\xb6\x90K\xc9e\xe4rr\x05\xb9\x92\\\x15\x95\xbc\xd5Q)\xb90*U\x17Ee\xf1\xc5Q\x89_\x12\x95\x9aK\xa3\x12\xbb,*e\x97G\xa5ከ\x94^\x19\x95\xba\xab\xa2R}uT\xca\xd7@\xff\xe5\xd7`_\xae\x8dJ\xfduQ\xb1\xae\x8f\x8a{CT\x127Fž)*\xce\xcdQ\xa34vKT\xff85j\xd4\xc6n\x8bJ\xed\xedQYr\a\xfc\x9dQ\xe9\u007fWT\x06\xdeͫ\xdfC\xdeKއ\xab\xdf\x1f\x95Ƶ\x98\xe8\x01<#\xf5\x0fF\xa5\xf9\xa1\xa84=\xac\x13=\xa2x\x14\xd7z\f\xd7z\xb9\x80\\H.\"\x8bI\x8b,!K\xc92\xd2&\x17\x93\xe5d\x8ct\xc8\n\xb2\x92\xac\"\xab\xc9\x1a\xd2%k\xc9:\xb2\x9e\x8c\x93\rd\x82l$\x9b\xc8%d3\xd9B.%\x97\x91\xcb\xc9\x15\xe4JrU\xb6T\xae\xce6*c\x17fK\xf9E\xd9Fy\xec\xe2l<×dK\xe9\xa5\xd9\xfa\u007f\x12\x99-\x15\x97g\x1b\x15\xb1+\x10n\xbe2[\x1a\xae\xca\xd6w\U000abce5lM6\xff?\"q\xa0\xe6Z\x1c\xb8.\x1b\xd5\xedz\xc4o\xc86\xcab7fK\xcdM\xd9R{s6\x8a\xe7-\xd9Rrk\xb6Q\x12\xbb-[\xaaoϖ\xe6;\xb2\xa5\xfe\xcel\xa9\xba+[\x1a\xef\xce\xd6\xff+8 ~o\xb6\xc4\xef˖\xd8\xfd8\xb26[\xea\x1e\xc8\x16\xeb\xc1lò\x1e\xca\x16\xe7\xe1l\xc3q\x1eɖģ\xd9F\xa2\xf21 \xf1x\xb6\x99H4>\x91m\xd47?\x99m\xd677?\x95mT5?\x9dmV57?\x93-\xf6\xb38\xd7y.\xdbp\xddu\x8a\xf5\xe8&6`\u038d:\xe7\xf3\x8a\x170\xf1\x8b:\xf1&,js\xb6\xd1ܼ\x05Wت\x93\xbf\x04X/\xe3<\xfb\x15ĭW1\xca~\r\x93\xbe\x8e\xf3\xec7t\xe67uҷtҷ\xb3e\xc2;\xd92\xfa]t\x8a?Ľm˖\xb6۳\xa5pG6\xff6\xeb\x8bl\xe9\xfbe\xb6\x14|\x95m\x14\x14|\x9d\xad\u007f\xea\xfeMv\xeb\xbf&\xf96\xdb\x187\xf5\xbbl\xc9\xdf\xc9\xfd\xd8E~O\xfe\x90-\x9d\u007f̖.?eKן\xb3\xa5\xdb/\xd9\xd2\xfd\xd7l\xe9\xf1[\xb6\xf4\xfc=[z\xfd\x91-\xbd\xff̖>\u007fq\xf4\xdf\xe4?\xe4\xbf\xe4\u007f\xe4nr\x0f\xb9\x97\xdcG\xee'\x0f\x90\a\xc9C\xe4a\xf2\by\x94\x1b#\xe7\xe0\x92ss\x8c\x8a\xe6y\x98\xa7y~\x8eQֲ\x00WZ\x88+-\xca1\x9c\xe6b\\\xc2\xc2\xe5J\xf42\xa58\xa9\f'\xd98i1.W\xae7\x1a\xc3u\x1c\\\xa7\x02\x97\xa8\xc4}Ua@5\x06\xd4\xe8\xe5\\\xdcU-n\xbaN\x17Q\xaf7\x14\xc7\xcc\r\x98'\x81h#\x867ip\t\xb3\xdfL\xb6\x90K\xc9e\xe4rr\x05\xb9\x92\\E\xaeΑ\xd1\x17\xe6\xc8\xec\x8brd\xd6\xc592\xe1\x12(\xa8[ޥPP\xb7n\xdd\xf2.\xc3^^\x8e\x8b]\x81\x8b]\xa9\xab\xbf*GJ\xafƢ\x1a\xd6\xe4h\xe5\xb9\x06\xf7Zv-\x0e\xd4\\\x87;\xb8\x1ewp\x03n\xe9\xc6\x1c\x94\x99\x9bp_\xf1\x9bua\xb7`\xfd\xb7b\xa2\xdb0\xe4v\rܑ\x83\xd2v\xa7Nw\x17\xa6\xbb;G\xffA\xb9Ngݛ\xa3E\xec>\x8c\xbb\x1f\x13\xc7\xd6\xea\x14\x0f\u0b9b\x1f\xd4\xd3\x1e\xc2<\x0f#\x8d\x8f \xfd\x8f栀=\x96#\xf9\x8f\xf3.\x9e \x9f$\x9f\"\x9f&\x9f!\x9f%\x9f#ב\xeb\xc9\r\xe4F\xf2y\xf2\x05\xf2Er\x13\xb9\x99\xdcBn%_\"_&_!_%_#_'\xdf \xdf$\xdf\"\xdf&\xdf!\xdf%\xdf#\xdf'? ?$?\"\xb7\x91\x1f\x93\x9f\x90\x9f\x92\x9f\x91\x9f\x93\xdb\xc9\x1d\xe4\x17\xe4\x97\xe4W\xe4\xd7\xe47\xe4\xb7\xe4w\xe4Nr\x17\xf9=\xf9\x03\xf9#\xf9\x13\xf93\xf9\v\xf9+\xf9\x1b\xf9;\xf9\a\xf9'\xf9\x17\xf97\xf9\x0f\xf9/\xf9\x1f\xb9\x9b\xdcC\xee%\xf7\x91\xfb\xc9\x03\xe4A\xf2\x10y\x98\x04\x9f\n\x1f\x86\x8f\xc0\xa7\xc1\xa7\xc3g\xc0g\xe6ʈ\xac\\\xb1\xa3\xf0\xd9\xf09\xf0\xa7ß\x01\u007f&\xfcY\xf0m\xe0sse\xe4ٹ\xb28/WF\xb5͕\xf2v\xb92\xfa\x9c\\\x89\x9d\v\u007f\x1e\xfc\xf9\xf0\xf9\xf0\x17\xc0\xb7\x87\xef\x00_\x00\xdf1W\xc6t\xca\x15\xa7\x10\xbe\b\xbes\xae\x8c\xeb\x92+\x95]\xe1\xbb\xc1w\x87\xef\x01\xdf3W\xc6\xf7ʕ\xaa\xde\xf0}\xe0\xfb\xc2\xf7\x83\xef\x0f?\x00~`\xaeL\x18\x94+Ճ\xe1\x87\xc0\x0f\x85\x1f\x06?t\x01t!t\x11t1t\tt)t\x19t9t\x05t%t\x15t5t\rt-\xdcm\x1d\xdcm=t\x03t#\xaa{\x13\xaa{3t\vt+t\x1bt;t\at't\x17t7t\x0ft/t\x1ft?\xf4\x00\xf4 \xf4\x10\xf40\xf4\b\xf4(\xf4\x18\xf48\xf4\x04\xf4$\xaa\xeb\x14\xaa\xeb4\xf4\f\xf4,\xf4\x1c\xf4<\xf4\x02\xf4\"\xf4\x12\xf42\xf4\n\xf4*\xf4\x1a\xf4:\xaa\xe5\x06\x8a\xfb&\xf4\x16\xf46\xf4\x0e\xf4.\xf4\x1e\xf4>K\xfb\x01\xf9\x90|D>&\x9f(\xa5\x855\x98\tf\x86%\xc0\x12aE`Ea\xc5Ji\xf5\x8b\xc3J\xc0\x9e\x84=\x05{\x1a\xf6\f\xecY\xd8s\xa5\xb4\xc8\xf3\xb0\x17`/\xc2^\x82\xbd\f{\xa5\x14\x97\x9f\xe4k\xa5\xd0!\xc0ހ\xbd\t{\v\xf66\xac$\xaf\x96\"u<\x93\x04+\r+\x03K\x86\x95\x85\xbd\x03+\a\xb3\xe0\xfe\x14XyX\x05XEX%XeX\x15\x98\xb5\x94\x16\xb5\xc1RavXUX5XuX\r\x98\xa3\x94ּ&\xec]X-XmX\x1dX]X=\xd8{\xa5\xb4X}X\x03XCX#XcX\x13\xa6\xae)٬\x14fY\xb0\x16\xb0\x96\xb0V\xb04\x98\x93W]\xa4\xbb\x94\x16\xf7\xc0\xbc0\x1f\xcc\x0f\v\xc0\x82\xb0ְ6\xbc\xabm)-Ў\xa1\xf6\bu`(\x84PG\x86:!\xd4\x19\xef\x0eú\xc0\xd2a\x19\xb0\b\xac+,\x13\x96\x85\xf7Fa\xdd`\xddaٰ\x1cX.,\x06끺{\x1f\x96\x87\xb2ˇ\x15\xc0Ⱎ(\x8b^\xb0ވ\xa3\x0f\xac/\xd2\xd4\x0f\xd6\x1f\xe1\x01\xb0\x81L\xc1 \xf2\x03<\xff!l0l\bl(l\x18l8l\x04l$\xea\u007f\x14l4\xec#\xd8ǰO`\x9f\xc2>\x83}\x8e\xf7}\x01\xfb\x12\xf6\x15\xeck\xd87\xb0oa\xdf\xc1\xbeG\xbd\xfd\x00\xfb\x11\xf6\x13\xecg\xd8/\xb0_a\xbf\xc1~Gz\xfe\x80\xfd\t\x1b\x03\x1b\v\xfb\v6\x0e6\x1e6\x01\xf9\xfc\x1b6\x11\xf6\x0fl\x12l2l\nl*l\x1a\xd28\x1d6\x036\x136\v6\x9b9\x9b\x83п\xb0\xb9H\xe5<\xd8|\xd8\x02\xd8BآRZ\xb9\xc5(\xa1%Х\xa5\xb4\x81\xcbJ\x99J\x0f\\\x8e䮀\xad\x84\xadb\x14\xab\x11Z\x03[\x8b\x84\xae\x83\xad\x87m\x80m\x84m*e*\xd7y3Pn\v0p+b\xdb\x06\xdb\x0e\xdb\x01\xdb\xc9\bv\x91\xbbq\xbc\a\xb6\x17>\xb8\x0f\xb6\x1fv\x00v\x90W\x0f\x952u.wX\xe1\b0\xf0(*\xea\x18\xec8\xec\x04\xecd)\xcd{\nv\x1a\xe13\xb0\xb3p\x9cs\xb0\xf3\xb0\v\xb0\x8b\xb8v\t\xc9\xef|\x19(w\xa5\x94\xd6\xf9*\xa3\xbdF^G\x11ހ݄\xdd\xe2\x99\xdb\b݁\xddE\xe1݃݇=\x80=\x84=Bq\xb9\x80\\H.\"\x17\x93Kȥ\xe42r9\xb9\x82\\I\xae\"W\x93kȵ\xe4:r=\xb9\x81\xdcHn\"7\x93[ȓ\xe4)\xf24y\x86IkY!I\xab\x9f\x9a\xa45\xa9\x95\xc4}^\xb2\x0eY\x97\xacG\xbeG\xd6'\x1b\x90\r\xc9Fdc\xb2\tٔlF6'[\x90-\xc9Vd\x1a\xe9\xc4[]\f\xb9I\x0f\xe9%}I\x89\xba\xad\x8a]\xf7CS\xa1\x01\x1eWӃ<\xae\xa6\xb7\x86ڡm\xa0U\xa1my\xbd\xba\xde\x0eZ\rڞ\xc7\x0e\xbd\x03\xefs\xe8!\x9ew\xe8\x1d\xa15\xa0\x9d\x92̸\xde9Ik\x1eN25o\xde%\xc9ܼy\xf3t\x04\x83\x19IZ0\x92d\n6\xef\x9ad\x0e6o\x9e\x99\x94\x006\xcf¥6\xd1$\xadM\xb7$S\x9b\xe6ݓ\xccm\x9a7\xcfN\xd2Z\xe5$i\rs\x93\xb4F\xb1$-\xadG\x92\x16}?\xc9\x14\x8d\xe6%\x99\xa3\xd1h>\x82=\v\x92\xb4\x9e\xf1$S\xcfh\xcf$s\xcfh\xb4WR\x02\x18\xed\x8dK\xbd\xfb$i\xbd\xfb&\x99zG\xfb%\x99{G\xa3\xfd\x93\xb4\xec\x01IZ\xfa\xc0$-cP\x92\x96\xf3A\x92\xc9\xd2\xe8\xc3$S\xa3\x94\xc1I\x89\x16K\xff\x94\x94!IZ\xcaP\x96\xce0r89\x82\x1cI\x8e\"G\x93\x1f\x91\x1f\x93\x9f\x90\x9f\x92\x9f\x91\x9f'i\x95\xbeH\xd2\xfa\u007f\t\xfd\n\xfa5\xf4\x1b\xe8\xb7IZ\x87\uf4b4*\xdfC\u007f\x80\xfe\x88\xf3?\xc1~N\xd2\x06\xfe\x02\xfb\x15\xe1\xdfp\xdf\xef\xd0?\xa0\u007fB\xc7\xc0\xc6\xc2\xfe\xc2\xf18\xe8x\xe8\x04\xd8\xdf\bO\x84\xfd\x03\x9b\x04\x9b\f\x9b\x02\x9b\x8ak\xd3`\xd3a3`3a\xb3`\xb3as\x92\xb4\x8e\xff\xa2\x06\xe6\xe2\xfd\xf3\x92\xb4:\xf3\x11^\x80s\v\xf1\xdc\"\xd8bܳ\x04\xb6\x14\xe1e\xb0\xe5\b\xaf\x80\xadĽ\xab\xa0\xab\xa1k`k\x11^\a]\x0f\xdd\x00\xdd\b\xdb\x04\xdb\f\xdb\x02\xdb\nۆkۡ;\xa0;\xa1\xbb\xa0\xbb\xf1\xde=\xc8\xf7^\xe8>\xe8~\x9c?\x00;\x88\xbc\x1f\x82\x1d\xc6=G`G\xf1\xeec\xd0\xe3\xd0\x13Г\xd0S\xb0Ӱ38>\v=\a=\x0f\xbb\x00\xbb\b\xbb\x04\xbb\f\xbb\x02\xbb\x8a\xeb\xd7\xf0\x8e\xeb\xb0\x1b8\xbe\xc9Z\xb9E\xde&\xef\x90w\xc9{\xe4}\xf2\x01\xf9\x90|D>&\x9f(\xcd/a\xa4\x894\x93\td\"Y\x84,J\x16#\x8b\x93%\xc8'ɧȧ\xc9g\xc8g\xc9\xe7\xc8\xe7\xc9\x17\xc8\x17ɗȗ\xc9W\xc8W\xc9\xd7\xc8\xd7\xc97\xc87ɷȷɒd)R'\x93\xc8\xd2d\x192\x99,K\xbeC\x96#-d\nY\x9e\xac@V$+\x91\x95\xc9*\xa4\x95\xb4\x91\xa9\xa4\x9d\xacJV#\xab\x935H\aY\x93|\x97\xacE\xd6&\xeb\x90u\xc9z\xe4{d}\xb2\x01ِlD6&\x9b\x90M\xc9fds\xb2\x05ْlE\xa6\x91N\xd2E\xbaI\x0f\xe9%}\xa4\x9f\f\x90A\xb25نlK\xb6#ۓ\x1d\xc8\x10ّ\xecDv&\xc3d\x172\x9d\xcc #dW2\x93\xcc\"\xa3d7\xb2;\x99M搹d\x8c\xecA\xbeO\xe6\x91\xf9d\x01\x19'{\x92\xbd\xc8\xded\x1f\xb2/ُ\xecO\x0e \a\x92\x83\xc8\x0f\xc8\x0f\xc9\xc1\xe4\x10r(9\x8c\x1cN\x8e G\x92\xa3\xc8\xd1\xe4G\xe4\xc7\xe4'\xe4\xa7\xe4g\xe4\xe7\xe4\x17\xe4\x97\xe4W\xe4\xd7\xe47\xe4\xb7\xe4w\xe4\xf7\xe4\x0f\xe4\x8f\xe4O\xe4\xcf\xe4/\xe4\xaf\xe4o\xe4\xef\xe4\x1f\xe4\x9f\xe4\x18r,\xf9\x179\x8e\x1cON \xff&'\x92\xff\x90\x93\xc8\xc9\xe4\x14r*9\x8d\x9cN\xce g\x92\xb3\xc8\xd9\xe4\x1c\xf2_r.9\x8f\x9cO. \x17\x92\x8b\xc8\xc5\xe4\x12r)\xb9\x8c\\N\xae W\x92\xab\xc8\xd5\xe4\x1ar-\xb9\x8e\\On 7\x92\x9b\xc8\xcd\xe4\x16r+\xb9\x8d\xdcN\xee w\x92\xbb\xc8\xdd\xe4\x1er/\xb9\x8f\xdcO\x1e \x0f\x92\x87\xc8\xc3\xe4\x11\xf2(y\x8c \x1f\x92\x8f\xc8\xc7\xe4\x13e\xd8\xf3\x93&\xd2L&\x90\x89d\x11\xb2(Y\x8c,N\x96 \x9f$\x9f\"\x9f&\x9f!\x9f%\x9f#\x9f'_ _$_\"_&_!_%_#_'\xdf \xdf$\xdf\"\xdf&K\x92\xa5H\x9dL\"K\x93e\xc8d\xb2,\xf9\x0eY\x8e\xb4\x90)dy\xb2\x02Y\x91\xacDV&\xab\x90V\xd2F\xa6\x92v\xb2*Y\x8d\xacN\xd6 \x1ddM\xf2]\xb2\x16Y\x9b\xacC\xd6%\xeb\x91\xef\x91\xf5\xc9\x06dC\xb2\x11٘lB6%\x9b\x91\xcd\xc9\x16dK\xb2\x15\x99F:I\x17\xe9&=\xa4\x97\xf4\x91~2@\x06\xc9\xd6d\x1b\xb2-َlOv CdG\xb2\x13ٙ\f\x93]\xc8t2\x83\x8c\x90]\xc9L2\x8b\x8c\x92\xdd\xc8\xeed6\x99C\xe6\x921\xb2\a\xf9>\x99G\xe6\x93\x05d\x9c\xecI\xf6\"{\x93}Ⱦd?\xb2?9\x80\x1cH\x0e\"? ?$\a\x93Cȡ\xe40r89\x82\x1cI\x8e\"G\x93\x1f\x91\x1f\x93\x9f\x90\x9f\x92\x9f\x91\x9f\x93_\x90_\x92_\x91_\x93ߐߒߑߓ?\x90?\x92?\x91?\x93\xbf\x90\xbf\x92\xbf\x91\xbf\x93\u007f\x90\u007f\x92cȱ\xe4_\xe48r<9\x81\xfc\x9b\x9cH\xfeCN\"'\x93Sȩ\xe44r:9\x83\x9cI\xce\"g\x93s\xc8\u007fɹ\xe4\xb9\x80\\H.\"\x17\x93Kȥ\xe42r9\xb9\x82\\I\xae\"W\x93kȵ\xe4:r=\xb9\x81\xdcHn\"7\x93[ȭ\xe46r;\xb9\x83\xdcI\xee\"w\x93{Ƚ\xe4>r?y\x80\xf9\x80|H>\"\x1fK\u007f\x98\xcc\xfe\x90L!˓\x15Ȋd%\xb22Y\x85\xb4\x9262\x95\xb4\x93U\xc9jdu\xb2\x06\xe9 k\x92\uf4b5\xc8\xdad\x1d\xb2.Y\x8flI\xb6\"\xd3H'\xe9\"ݤ\x87\xf4\x92>\xd2O\x06\xc8 ٚlC\xb6%ۑ\xed\xc9\x0ed\x88\xecHv\"\xb7&k\xe1m\xc9Z\x97\xed\xc9Z\xfa\x8ed-cg\xb2\x16ٕ\xacuݝ\xace\xeeIֲ\xf6&k\xd1}\xc9Z\xb7\xfd\xc9Z\xf7\x03\xc9Z\xf6\xc1d-\xe7P\xb2\x96{8Y\x8b\x1dI\xd6z\x1cM\xd6\xde?\x96\xac\xe5\x1dO\xd6\xf2O$k\x05'\x93\xb5\xf8\xa9d\xad\xe7\xe9d\xadיd\xad\xf7\xd9d\xadϹd\xad\xef\xf9d\xcdz\x81o\xbcH^\"/\x93Wȫ\xe45\xf2:y\x83\xbcI\xde\"o\x93wȻ\xe4=\xf2>\xf9\x80|H>\"\x1f\x93O\x94\xd5*i0SY\xad\xbf\x19\x96\x80p\"\xac\b\xc2Ea\xc5\x10.\x0e+\x81\U00013c27\xcaj\x15\x9e\x86=\x03{\x16\xf6\x1c\xecy\xd8\v\xb0\x17a/\xc1^\x86\xbd\x02{\x15\xf6\x1a\xecu\xd8\x1b\xb07ao\xc1ކ\x95\x84\x95\x82\xe9\xb0$XiX\x19X2\xac,\xec\x1dX9\x98\x05\x96\x02+\x0f\xab\x00\xab\b\xab\x04\xab\f\xab\x02\xb3\xc2l\xb0T\x98\x1dV\x15V\rV\x1dV\x03\xe6\x80Մ\xbd\v\xab\x05\xab\r\xab\x03\xab\v\xab\a{\x0fV\x1f\xd6\x00\xd6\x10\xd6\b\xd6\x18\xd6\x04\xd6\x14\xd6\f\xd6\x1c\xd6\x02\xd6\x12\xd6\ne\x91\x06s\xa2,\\07\xc2\x1e\xa8\x17\xd7|0?,\x00\v\xc2Z\xc3\xda\xc0\xda\xc2\xda\xc1\xda\xc3:\xc0B\xb0\x8e\xb0N\xb0ΰ0\xac\v,\x1d\x96\x01\x8b\xc0\xba\xc22aY\xb0(\xac\x1b\xac;,\x1b\x96\x03˅\xc5`=`\xef\x97ժ\xe4\x95\xd5:\xe4\x97\xd5\xda\x14 =q\xa4\xa7'\xb4\x17\xb47\xb4\x0f\xb4/\xb4\x1f\xb4?t\x00t t\x10\xf4\x83\xb2Z\x99\x0fa\x83aC`Ca\xc3`\xc3a#`#a\xa3`\xa3a\x1f\xc1>\x86}\x02\xfb\x14\xf6\x19\xecs\xd8\x17\xb0/a_\xc1\xbeF\xbc\xdf \xdeo\xcbr\x14#\xbf'\u007f \u007f$\u007f\"\u007f&\u007f!\u007f%\u007f#\u007fG<\u007f\xc0\xfe\x84\x8d\x81\x8d\x85\xfd\x05\x1b\a\x1b\x0f\x9b\x00\xfb\x1b6\x11\xf6\x0fl\x12l2l\nl*l\x1al:lFY\xad\xe3L\xd8,\xd8l\u061c\xb2Z\xdd\u007fasa\xf3`\xf3a\v`\v\xcbj\xc1E\xb0Ű%\xb0\xa5e\xb5\xda\xcb`\xcba+`+a\xab`\xab\xcbj\xe5\xd7\xc0\xd6\xc2\xd6\xc1\xd6\xc36\xc06\xc26\xc16ö\xc0\xb6¶\xc1\xb6\xc3v\xc0v\xc2v\xc1v\xc3\xf6\xc0\xf6\xc2\xf6\xc1\xf6\xc3\x0e\xc0\x0e\xc2\x0e\xc1\x0eÎ\xc0\x8e\u008e\xc1\x8e\xc3N\xc0N\xc2N\xc1N\xc3\xce _ga\xe7`\xe7a\x17`\x17\x91\xb7K\xb0˰+e5\xd7U\x9c\xbb\x06\xbb\x0e\xbb\x01\xbb\t\xbb\x05\xbb\r\xbb\x03\xbb\xcbR\xbeG\xde'\x1f\x90\x0f\xc9G\xe4c\xf2\xa5w8/'_!_%_#\xf3\xc8|\xb2\x80\x8c\x93=\xc9^do\xb2\x0fٗ\xecG\xf6'\a\x90\x03\xc9A\xe4\a\xe4\x87\xe4`r\b9\x94\x1cF\x0e'G\x90#\xc9Q\xe4h\xf2#\xf2c\xf2\x13\xf2S\xf23\xf2s\xf2\v\xf2K\xf2+\xf2k\xf2\x1b\xf2[\xf2;\xf2{\xf2\a\xf2G\xf2'\xf2g\xf2\x17\xf2W\xf27\xf2w\xf2\x0f\xf2Or\f9\x96\xfc\x8b\x1cG\x8e''\x90\u007f\x93\x13\xc9\u007f\xc8I\xe4dr\n9\x95\x9cFN'g\x903\xc9Y\xe4lr\x0e\xf9/9\x97\x9cG\xce'\x17\x90\v\xc9E\xe4br\t\xb9\x94\\F.'W\x90+\xc9U\xe4jr\r\xb9\x96\\G\xae'7\x90\x1b\xc9M\xe4fr\v\xb9\x95\xdcFn'w\x90;\xc9]\xe4nr\x0f\xb9\x97\xdcG\xee'\x0f\x90\a\xc9C\xe4a\xf2\by\x94 \x1f\x92\x8f\xc8\xc7\xe4\x13\x16M\xd7,Z\xd8d\xd1lf\x8b\xd6%\xc1\xa2\x95K\xb4h\u074bX\xb4Ԣ\x16-\xbb\x98E{\xaf\xb8EK/aѢOZ\xb4\xaeOY\xb4*O[\xb4\x9cg,Z\xfe\xb3\x16\xad\xc7s\x16\xad\xf4\xf3\x16-\xf2\x82E\xb3\xbfhѲ^\xb2h5_\xb6h\xb1W,Z\xf5W-Z\xdek\x16\xad\xe3\xeb\x16-\xe3\r\x8b\xd6\xedM\x8b\x96\xf9\x96E\xab\xfb\xb6E\xcb-i\xd1\nJY\xb4\xf7u\x8bV1ɢ\x95/mѪ\x95\xb1h\xb5\x93-Z\xa5\xb2\x16-\xfe\x8eEs\x94\xb3h=-\x16\xadr\x8aE+[ޢ\xb5\xaf`ђ+Z0C\xb2h\xbd+[\xb4\xa4*\x16\xed\x1d\xabE\xabe\xb3h\xef\xa6Z\xb4\xaav\x8b֡\xaaE\xb3V\xb3h}\xab[\xb4\x1a5,\x9a\xc5a\xd1:մh\xf5\u07b5h\xbdjY\xb4Pm\x8bV\xa6\x8eE\xebSע\xa5Գhu\u07b3$\xb4Ϩ\x11\xaaoIl\x9fa\xab\x11j\xa04\xb5F\xa8\xa1\xa5\b\x8e\x11h\xa4N\xd8k\x84\x1a\xf3\x04\x02MT \x15\x81\xa6\x96\xa2\xea\x16\x84\x9a\xa9{\xaa\xd6\b5\xe7=\b\xb4\xe0=\b\xb4\x94{\x10j\xa5N\xd9\x11H\xe3)\x15r\xaaP\xaa\n\xb9,\xc5\x18\x15\x82n\x15W\xb5\x1a!\x0f\xe3B\xc0˸\x10\xf0I\\\b\xf9\x19\x17\x02\x01\x89\v\xa1\xa0ąPk#.\x04ۨ\xfb\xaa\"Ж\xf7\xa9P;ާB\xed\xe5>\x15\xec\xa0N\xdaU(ē\fvT\xc1T\x06;Y\x8aK\xf2\x10\xee\xac\xd2W\xbdF(\xcc\xf4!Ѕ\xe9C ]҇P\x06Ӈ@D҇PWI\x1fB\x99F\xfa\x10\xccb\xfa\x10\x88J\xfa\x10\xea&\xe9C\xa8\xbb\x91>\x04\xb3%}\b\xe5\x18\xe9C0\xd7H\x1f\x82\xb1\xc2\xf4!\xdcC\xc5Y\r\x81\xf7\x19\xa7\n\xe51N\x15ʗ8U\xb0\x80q\xaaP\\\xe2T\xc1\x9e\x12\xa7\n\xf62\xe2T\xe1\xde\xeaު*ԇ\xf72ؗ\xf72\xd8O\xeee\xb8\xbf:mgp\x00OKx\xa0\n\xa7Jx\x90\xa5\x84Q\x9c8\xf8@\xf9\x9f#\xf4!\xfd\xcf\x11\x1aL\xffs\x84\x86\x88\xff9BC\xe9\u007f\x8e\xd00\xf1?Gh\xb8\xf8\x9f#4\xc2\xf0?Gh$\xfd\xcf\x11\x1a%\xfe\xe7\b\x8d\x16\xffs\x84>2\xfc\xcf\x11\xfaX\xfc\xcf\x11\xfa\xc4\xf0?G\xe8S\xc3\xff\x1c\xa1\xcf\n\xfd\xcf\x11\xfa\x9c\xfe\xe7\b}!\xfe\xe7\b})\xfe\xe7\b}e\xf8\x9f#\xf4\xb5\xf8\x9f#\xf4\x8d\xe1\u007f\x8eз\x86\xff9B\xdf\x15\xfa\x9f#\xf4\xbd\xf8\x9f#\xf4\x83\xe1\u007f\x8eЏ\x86\xff9B?\x15\xfa\x9f#\xf4\xb3\xe1\u007f\x8e\xd0/\x85\xfe\xe7\b\xfdZ\xe8\u007f\x8e\xd0o\xff\xf9\x9f#\xf4;\xfd\xcf\x11\xfaC\xfc\xcf\x11\xfaS\xfc\xcf\x11\x1ac\xf8\x9f#4V\xfc\xcf\x11\xfa\xcb\xf0?Gh\x9c\xe1\u007f\x8e\xd0\xf8B\xffs\x84&\x88\xff9B\u007f\x1b\xfe\xe7\bM4\xfc\xcf\x11\xfa\xa7\xd0\xff\x1c\xa1I\x86\xff9B\x93\v\xfd\xcf\x11\x9aR\xe8\u007f\x8e\xd0\xd4\xff\xfc\xcf\x11\x9a&\xfe\xe7\bM7\xfc\xcf\x11\x9aa\xf8\x9f#4\xb3\xd0\xff\x1c\xa1Y\x86\xff9B\xb3\v\xfd\xcf\x11\x9aS\xe8\u007f\x8eп\xff\xf9\x9f#4\xd7\xf0?Gh^\xa1\xff9B\xf3\v\xfd\xcf\x11Z\xf0\x9f\xff9B\v\v\xfd\xcf\x11Z\xf4\x9f\xff9B\x8b\xff\xf3?Gh\xc9\xff\xfb\x9f#\xb4T\x95g\rGh\x19\xcb\x13\x81\xe5,O\x04VHy\"\xb4\x92\xe5\x89\xc0*)O\x84VKy\"\xb4\xc6(O\x04ײ<\x11X'\xe5\x89\xd0z)O\x846\x18\xe5\x89\xe0F)O\x846\x19\xe5\x89\xe0f\xa3<\x11\xdcRX\x9e\boey\"\xb0M\xca\x13\xa1\xedR\x9e\b\xed0\xca\x13\xc1\x9dR\x9e\b\xed2\xca\x13\xc1\xddFy\"\xb8\xa7\xb0<\x11\xde+\xe5\x89\xd0>\xa3<\x11\xdco\x94'\x82\a\n\xcb\x13\xe1\x83Fy\"x\xa8\xb0<\x11>\\X\x9e\b\x1f\xf9\xaf\xcb\xf4\xaa\xd09I\xaf\n\x9e\x97\xf4\xaa\xe0\x05#\xbd*|Qҫ\x82\x97\x8c\xf4\xaa\xf0e#\xbd*|\xa50\xbd\xeaઊ\xbb\x9a\n]c\xdc\f^g\xdc\fސ\xb8\x19\xbeɸ\x19\xbc%q3|[\xe2f\xf8\x8e\x117\x0f\xee\xaa\xfb\xab2x\x8f\xf7K\xf8>\xef\x97\xf0\x03\xb9_\x0e\x1e\xaa\vv\t?\xe2\x05\xe3\xe0\xb1:H5\x0e\xfegy\xf2\xbf\xee\xd3\x11\xea\\Qk\x15\xae\xa8ew\x81\xa6W\xd4\xdc\x19\x155o\xa4\xa2\x16\xeeZQ+Ȭ\xa85˪\xa8eE+j-\xbbUԺw\xaf\xa8\xb5ˮ\xa8\xf5ͭ\xa8\xa5\xc5*j\xf5\x9f\xa8\xcc\xefA\xa4\x894\x93\td\"Y\x84,J\x16#\x8b\x93%\xc8'ɧȧ\xc9g\xc8g\xc9\xe7\xc8\xe7\xc9\x17\xc8\x17ɗȗ\xc9W\xc8W\xc9\xd7\xc8\xd7\xc97\xc87ɷȷɒd)R'\x93\xc8\xd2d\x192\x99,K\xbeC\x96#-d\nY\x9e\xac@V$+\x91\x95\xc9*\xa4\x95\xb4\x91\xa9\xa4\x9d\xacJV#\xab\x935H\aY\x93|\x97\xacE\xd6&\xeb\x90u\xc9z\xe4{d}\xb2\x01ِlD6&\x9b\x90M\xc9fds\xb2\x05ْlE\xa6\x91N\xd2E\xbaI\x0f\xe9%}\xa4\x9f\f\x90A\xb25نlK\xb6#ۓ\x1d\xc8\x10ّ\xecDv&\xc3d\x172\x9d\xcc #dW2\x93\xcc\"\xa3d7\xb2;\x99M搹d\x8c\xecA\xbeO\xe6\x91\xf9d\x01\x19'{\x92\xbd\xc8\xded\x1f\xb2/ُ\xecO\x0e \a\x92\x83\xc8\x0f*'(/\xfaPd\xb0\xc8\x10\x91\xa1\"\xc3D\x86\x8b\x8c\x10\x19)2Jd\xb4\xc8G\"\x1f\x8b|\"\xf2\xa9\xc8g\"\x9f\x8b|!\xf2\xa5\xc8W\"_\x8b|#\xf2\xad\xc8w\"ߋ\xfc \xf2#\xd3\xfe\x93\x1c\xfc,\xf2\x8bȯ\"\xbf\x89\xfc.\xf2\x87ȟ\"cDƊ\xfc%2Nd\xbc\xc8\x04\x91\xbfE&\x8a\xfc#2Id\xb2\xc8\x14\x91\xa9\"\xd3D\xa6\x8b\xcc\x10\x99)2Kd\xb6\xc8\x1c\x91\u007fE\xe6\x8a\xcc\x13\x99/\xb2@d\xa1\xc8\"\x91\xc5\"KD\x96\x8a,\x13Y.\xb2Bd\xa5\xc8*\x91\xd5\"kD֊\xac\x13Y/\xb2Ad\xa3\xc8&\x91\xcd\"[D\xb6\x8al\x13\xd9.\xb2Cd\xa7\xc8.\x91\xdd\"{D\xf6\x8a\xec\x13\xd9/r@\xe4\xa0\xc8!\x91\xc3\"GD\x8e\x8a\x1c\x139.rB\xe4\xa4\xc8)\x91\xd3\"gDΊ\x9c\x139/rA\xe4\xa2\xc8%\x91\xcb\"WD\xae\x8a\\\x13\xb9.rC\xe4&\x9d\xee\x16y\x9b\xbcC\xde%\xef\x91\xf7\xc9\a\xe4C\xf2\x11\xf9\x98|\xa2\n#\xd2DL\"f\x91\x04\x91D\x91\"\"EE\x8a\x89\x14\x17)!\xf2\xa4\xc8S\"O\x8b<#\xf2\xac\xc8s\"ϋ\xbc \xf2\xa2\xc8K\"/\x8b\xbc\"\xf2\xaa\xc8k\"\xaf\x8b\xbc!\xf2\xa6\xc8[\"o\x8b\x94\x14)%\xa2\x8b$\x89\x94\x16)#\x92,RV\xe4\x1d\x91r\"\x16\x91\x14\x91\xf2\"\x15D*\x8aT\x12\xa9,RE\xc4*b\x13I\x15\xb1\x8bT\x15\xa9&R]\xa4\x86\x88C\xa4\xa6Ȼ\"\xb5Dj\x8b\xd4\x11\xa9+RO\xe4=\x91\xfa\"\rD\x1a\x8a4\x12i,\xd2D\xa4\xa9H3\x91\xe6\"-DZ\x8a\xb4\x12I\x13q\x8a\xb8D\xdc\"\x1e\x11\xaf\x88O\xc4/\x12\x10\t\x8a\xb4\x16i#\xd2V\xa4\x9dH{\x91\x0e\"!\x91\x8e\"\x9dD:\x8b\x84E\xba\x88\xa4\x8bd\x88DD\xba\x8ad\x8ad\x89DE\xba\x89t\x17\xc9\x16\xc9\x11\xc9\x15\x89\x89\xf4\x10y_$O$_\xa4@$.\xd2S\xa4\x97Ho\x91>\"}E\xfa\x89\xf4\x17\x19 2Pd\x90\xc8\a\"\x1f\x8a\f\x16\x19\"2Td\x98\xc8p\x91\x11\"#EF\x89\x8c\x16\xf9H\xe4c\x91OD>\x15\xf9L\xe4s\x91/D\xbe\x14\xf9J\xe4k\x91oD\xbe\x15\xf9N\xe4{\x91\x1fD~\x14\xf9I\xe4g\x91_D~\x15\xf9M\xe4w\x91?D\xfe\x14\x19#2V\xe4/\x91q\"\xe3E&\x88\xfc-2Q\xe4\x1f\x91I\"\x93E\xa6\x88L\x15\x99&2]d\x86\xc8L\x91Y\"\xb3E\xe6\x88\xfc+2Wd\x9e\xc8|\x91\x05\"\vE\x16\x89,\x16Y\"\xb2Td\x99\xc8r\x91\x15\"+EV\x89\xac\x16Y#\xb2Vd\x9d\xc8z\x91\r\"\x1bE6\x89l\x16\xd9\"\xb2Ud\x9b\xc8v\x91\x1d\";Ev\x89\xec\xae\u008dcr/\xb9\x8f\xdcO\x1e \x0f\x92\x87\xc8\xc3\xe4\x11\xf2(y\x8c\x84b~\x84b\x01\xab)?\x1c\xb4\x9a\xfa\x86[[\xd5\xff\v\xad\r\x82Ѷ8\x19o\x87P\xbc=B\x91\x0e\bEB\b\xc5:\"\x14\xebd5\x15\x84;[M\x19\xe1\xb0U\xfd\xffκ \x18M\xb7\xaa\xffqZ\x06\x19\xc1\x89xW\xdc\x15\xc9D(\x92\x85P,\x8aP\xac\x9bՔ\x1b\xee\x0eD\xb3\x81x\x0e\x10\xc9\x05b1\xab)+\xdc\xc3j\xea\x12~\xdfj\xea\x11\xce\xc3a4\x1f\x87\xd1\x02\x1cF\xe38\x8c\xf7\xc4a\xbc\x17\x0e\xe3\xbdq\x18\xe9\x83\xc3H_\x1cF\xfa\xe10\xd6\x1f\x87\xb1\x018\x8c\r\xb4\x9ar\u0083\x80\xe8\a@\xfcC 2\x18\x88\r\xb1\x9a\xfa\x84\x87*\f\x03\xe2\xc3\x15F\x00\xb1\x91\n\xa3\xac\xa6\xbc\xf0h \xfa\x11\x10\xff\x18\x88|\x02\xc4>\xb5\x9az\x85?S\xf8\x1c\x88~\x01D\xbe\x04b_Y\xb5ܯ\xad\xa6\x9e\xf1oXEߒߑߓ\xbf\xc0Y\u007f\x85\xfdƣ\xdf\xc9?P\x89\u007f\xc2Ơ\x12\xc7\xc2\xfeB%\x8e\x83\x8dG%N\x80\xfd\x8dJ\x9c\b\xfbGU\xe4$U\x91\x93UENQ\x159UU\xe44U\x91\xd3UE\xceP\x159SU\xe4,U\x91\xb3UE\xceQ\x15\xf9/+r\xae\xaa\xc8y\xaa\"竊\\\xa0*r\xa1\xaa\xc8E\xaa\"\x17\xab\x8a\\\xa2*r\xa9\xaa\xc8e\xac\xc8\xe5\xaa\"W\xb0\nW\x92\xabTE\xaeV\x15\xb9FU\xe4ZU\x91\xebTE\xaeW\x15\xb9AU\xe4FU\x91\x9bTEnV\x15\xb9EU\xe4VU\x91\xdbTEnW\x15\xb9CU\xe4NU\x91\xbbTE\xeeV\x15\xb9GU\xe4^U\x91\xfbTE\xeeW\x15y@U\xe4AU\x91\x87TE\x1eV\x15yDU\xe4QU\x91\xc7TE\x1eW\x15yB\xd5\xe1I\x85S\xaa\x0eO+\x9cQuxVᜪ\xc8\xf3\xaa\"/\xa8\x8a\xbc\xa8*\xf2\x92\xaa\xc8˪\x0e\xaf(\\U\x15yMU\xe4uU\x917P\x917UE\xdeR\x85~[\x95\xed\x1d\x1c\x86\xef\x02\xd1{@\xe4>\x10{\x84\xaa|\f{\xc2\xc6m\x1e\xd2D\x9a\xc9\x042Ѧ5(b\xd3\xdcEmZZ1\x9b֤\xb8MkT¦\xf9\x9f\xb4iΧlZ\xab\xa7mZ\xd3glZ\xcbgmZ\xb3\xe7lZ\x8b\xe7m\x9a\xe7\x05\x9b\xd6\xe6E\x9b\xa9]\xb3\x97l\xa6\x86\xcd^\xb6\x99|\xcd^\xb1i\xdeWmZ\xbb\xd7lZ\xc3\xd7m\x9a\xef\r\x9bV\xffM\x9b\xe6z˦5~\xdbfjܬ\xa4\xcdT\xbfy)\x84\x9a\xeb\b\x05\x92l&W\xa04B\xce28\xe7L\xb6\x99\xeb;\x9b\x96\xb5\x99\x1b;\x9b\xbe\x83\x13\xder6\xad\xb9Ŧ\x05Rl\xa6\xe6\x81\xf26-X\xc1fr6\xadh35uVb\xba+\x93UH+i\xb3i\x99\xa96Sf\xa6\x1dȯj\xd3r\xab\xd9L\xb9ݪ\x03Y5lZ\x86\xc3f\xcaȨi\xd3\xf2\u07b5\x99\xb23k\x019\xb5\x81.u\x80\xfc\xba@A=\xa0\xc7{6S^V}\x9b\x96\xd3\xc0\xa6uih3u\xe9\xd2\b\xc8ol\xd3\xf2\x9b\xd8L\xf9\xf9\xcdlZ\xb7\xe66S\xb7n-lZzK\x9bֽ\x95M+H\xb3i=\x9c6-\xcbe\xd3\xc2n\x9b)\x1c\xf1\xd8P\xdd^\x9b\xfa\xfbo>\x9b)\x12\xf3۴H\xc0\xa6\xfe\xfe[\x10W\"\xadmZ\xac\x8d\rU\xdb֦\xfe\xfe[;\x9b)\x16i\x8f\v\xb1\x0e6-\x1e\xb2\xa9\xbf\xff\xd6\x11\x97#\x9d\x80hg\\\x88\x87\x11K\xbc\vB\xd1t\x9b\x16\x8d S\xb9]\x81\x8cL ?\vh\x17\xb5\xa9\xbf\t\xd6\ry\xc8\xe8nS\u007f\xf7+\x1b\xc1v9\x80'\xd7f\xca\xe9\x12\x03\xf2{\x00\xed\xde\a\x9cy\xc8Uf\x81M\xfd\x9d\xbe\xb8bAO\x9c\xe8\xd6\v(\xe8\r8\xfb\xd8\xd4\xdf\xe2\xeb\x8b,g\xf6\x03r\xfb\x03\x19\x03\x80.\x03\x81n\x83P\xd9\x1f\xc2G\x06\xa3^\xf2\x87\x00\xed\x86\xdaL=\x9c\xc3l\xa6\xac\xac\xe1\xf0\x91\x116\xf9\x03r#m\xc6\x1f\x90\x1be\xe3\x1f\x8c\x1bm3\xfe\xec\xdbG6\xf9\xb3o\x1f\xdb\xf8\xf7\xde>Ae\u007fjS\u007f\xa6\xed3\xd6\xe6\xef6S\x83\xc0\x1fp\xb2\xe6\u007f\xdaL-\x9a\x8fA\xcd\a\xc6\xc23\x1a\xff\xa5\x9c\xc49\x0e\xfe\xe3\x1ao3\xbb\x9c\xce\tp\x11\xef\xdfʁ\x9c\x13m\xe6\xe6N\xe7?\x88\xc6霄\xd3i\x93mfgӦSl\t\xf5q~*\x04\x17\xa6\xc1\xebҦ\xe3\xf9\xb4\x19\xea\xf9\xa63m\t\xb8蜅F0\x1b\x8e?\a\xce\xfe/\x9c}.\x931\x8f\x9cO. \x17\x92\x8b\xc8\xc5\xe4\x12r)\xb9\x8c\\N\xae W\x92\xab\xc8\xd5\xe4\x1ar-\xb9\x8e\\On 7\x92\x9b\xc8\xcd\xe4\x16r+\xb9\x8d\xdcN\xee w\x92\xbb\xc8\xdd\xe4\x1er/\xb9\x8f\xdcO\x1e \x0f\x92\x87\xc8\xc3\xe4\x11\xf2(y\x8c \x1f\x92\x8f\xc8\xc7\xe4\x13\xa9fKf\x8a\x06榘\xc0\x8c\x143\x98\x97\x92\x00\xe6\xa4$\x82]R\x8a\x80\xf9)ESM\x96\x94b\bvK)\x0e\xa6\xa7\x94\x00\xbb\xa7<\t\x16\xa4<\x05\xf6Hy\x1a\xccJy&5\xc1\x92\x19Ny\x16\x92\x1bNy\x0e\x92\x11Ny\x1e\xa2\xfe\x14\x1b$'\x9c\xf2\"\xa4K8\xe5%H~8\xe5e<\x16Ny\x05\a\xdd\xc2)\xafB\xd2\xc3)\xafA\xba\x87S^\x87\x14\x84Sހ\xf4\b\xa7\xbc\t\xc9\n\xa7\xbc\xa5\ue327\xbc\x9d\xcaMm\xb2\x14\xa9\xe3\x82-EO\x82\xa4\xa6\xe8\xa5!\xf6\x14\xbd\f\xa4j\x8a\x9e\f\xa9\x96\xa2\x97\x85TO\xd1߁\xd4H\xd1\xcbA\x1c)\xba\x05R3EOIM\xb4ج)z\xf9\xd4\"\x96\xb6\xf1H\x8a^\x01\x81f\xf1X\x8a^1\xb5\xa8ŗ\x15\x8f\xa6\xe8\x95pOZ\xe2\x98}\xc51\xfb\x89c\xf6g\xca\a\x90\x03\xc9A\xa9\t-\x9b\xfb\xf4\x0f\xc41?\x14\xc7\x1c,\x8e9D\x1cs\xa88\xe60q\xcc\xe1\xe2\x98#\xc41G\x8ac\x8e2\x1cst\xa1c~T\xe8\x98\x1f\xff瘟\x18\x8e\xf9i\xa1c~f8\xe6\xe7\x86c~Q\xe8b_\x16:\xe6W\x85\x8e\xf9\xf5\u007f\x8e\xf9\x8d\xe1\x98\xdf\x16:\xe6w\x85O}_\xe8\x98?\xa8\x17\xe1ʏ8\xe1T^\xf8\x13N8q\xc7ό\x0eW~)|\xc1\xaf*\xa0\xd2\xf2[a,\xbf\xa7\x16\x83C\x86ի\xfe(\xf4\xcd?\v\xbdv\f.\xb6ˊ\xa8\x8bc\x11\xf4e\xf1\xbe\xbfx6\xa6\x82\xe3xg8E\x1f\xaf\xe2S\xf9\x9fP\xf8\xaa\xbf\x91\x88\xb6x\xf7Dd\xa5\x1do\xfe\xa7\xb0\xbdL\xfa\xaf\xbdL6\xda\xcb\x14\xa3\xbdL-|\xf34\xf54t:+m\x069\x93\x9cE\xce&\xe7\x90\xff\x92s\xc9y\xe4|r\x01\xb9\x90\\D.&\x97\x90KSM\xb6\xb4e\xa9\xa6Դ\xe5\xa9&{ڊTSմ\x95\xa9\xa6ji\xabRM\xd5\xd3V\xa7\x9aj\xa4\xadI59\xd2֦\x9aj\xa6\xadK5۬i\xebA[\xda\x0605m##\xd9Dn&\xb7\x90[S\xb5\xf0\xb6T-\xba=U\x8b\xef\x80\xedL\xd5b\xbbR1\xb3\xdd\rD\xf7\x00\xf1\xbd@d\x1f\x10۟\x8aU\xc3\x01 z\x10\x88\x1f\x02\"\x87\x81ؑT\xac\r\x8e\x02\xd1c@\xfc8\x109\x01\xc4N\xa6b\xea\u007f\n\x88\x9e\x06\xe2g\x80\xc8Y v.\x15S\xff\xf3@\xf4\x02\x10\xbf\bD.\x01\xb1˩\x98\xc8_\x01\xa2W\x81\xf85 r\x1d\x88\xddHŤ\xee&\x10\xbf\x05\xc4n\xa7b\xe6~\a\x88\xde\x05\xe2\xf7\x80\xc8} \xf6 \x153\xbb\x87@\xf4\x11\x10y\fĞ\xb0\x17\x0fc\xa1X\x90\x13\xc9-\xd0\xec\x89\xe1\xec\x1eYa\x93\xbdH8\xa7G$/b\xb6\x9b\xc3y\x91\x04{\x91hn.|8ў\x10\xcdM\xcf*b7\xf7\x8a\xe5\x16\xb5\x17\x89\xe4\xa7\xc73b\xc5\xec\t\xe1\xf4\xbcHq{b,\x9e\x9b\x1e)a7Dzr\x9e\xb4\x17\xe9\x1e\x8eVʋ>eOL\x0f\xe7\x85\v\x9e\xb6\x17M\x0fg\xc7\xf2\xa2\x91g\xecE2\xc3\xd9ٱ\xdcg퉙\u171c\xf0s\xf6\x84\xcchf\xf8y\x9c\x8fGs#\xe1\x17\xf0H\x1c7\xbeh/\x8a\x13\xd9\x19\x91\xbc\x97\xec\tݣٱ\x97\xedŔd\xe6\x85s^\xb1\x17W\xc1\x9cHA$\xefU9\xdd+\\P\xf0\x1a\xa2\xc2\xd5\xd7\xedŔ\xe8\x05\xb1\xdc7\xec\xc5\xd2\xf3\xe2}#Ѽ؛\xf6\xc4\xeey\xb1\xdc\xc8[\xf6\x84\xf4p~\xe4m$1\x96\x17\xcf\r\x97\xc4\xfbb\x95b=JA\xfb\xa4gGt$\x15\xa5\x11͉$ًa\x05\x98\x9d\x8d\xbc\x97\xc6Eu\xb2\f\x1e\x86&\xdb\x133b}#\xb9e\xed\t\x19\x91\xfc\xe8;\xf6\"\x19\xb1\xec\xecp^9\xbb\x19/\xb5\xd8\x13rù\xb1\x14$;7VP\xde^4+\x12\xcd\xcc*ȯ`/\x8abU\xcfW\xb4'\xaaRϯd/\xd2%\x9c\x97\x17ɮ\x8cK\xd1p>\xb2S\x05\x97\xa2\xe9\xf1l\xab=\x01\x1a\xb3ًuQ\xa5\x804\xa4\xda\x13\xbb\xa2,3\xec\xf6\x84\xae\x91HAU<\x1b\xcfϊdW\xc3\xf9\xbcpnzu\xf5\xa2\xf4\x02TY\r<\x1bɏ9\x10i\xd7\b\xea.\xb3\xa6=1+\x92W\xd0\xf7]D\x1eA-\xd5\xc2\r\xe1\xccHm{B\x97HA\xb8\x0e\xceƢ\xb9\x05u\xed\t=cXo\xd8\xcd\xe8\x14\xdeS'\xe3\xb9\x19\xf5\xed\tY\xa8\xaf\x06\x90X^nC{bN4=/\xd6Ȟ\x90\x13͎4\x86\x84ӳ\x9a(\xc9\xeb\xde\xd4^4'\x9c\x9b\x1f\x8d\xe56\xb3\x17\xe1m\xb9\xcd\xd5\xfd(\xc1\x16\xf6bT\xe4\xb6%n\x8ed\x86[\xe1f\b\x8a+\r\xf7\xa8\x8at\xda\x13\xfa\x84\xf32\\\"nH<\x9c\xeb\xb1'fGq\xd1kOȎ\xe6\x85}\xf6ļx\x8fHį\xb4Kv$`7\xe7Er\x82\xf6by1\x14kf$\xb7\xb5=AyB\x1b\xbbɚ\xd5\xd6n\xb2e\xb5\xb3\x9bR\xb3\xda\xdbM\xf6\xac\x0evSլ\x90\xddT-\xab\xa3\xddT=\xab\x93\xddT#\xab\xb3\xdd\xe4\xc8\n\xdbM5\xb3\xba\xd8\xd13d\xa5\x83\xb6\xac\f05+\x02ڳ\xba\x82U\xb32\xc1jYY`\xf5\xac(X#\xab\x1b\xe8\xc8\xea\x0e\xd6\xccʶ\x9bS\xadY9\xa0-+\x17L͊\x81\xf6\xac\x1e`լ\xf7\xed\xe6f\xee\xfayvSF8ߎEf\x81\u074cb\x88\xdbM\xb1`O\xbb\xa9Gz/;?\x13\x93}Ⱦd?{\x91f\x91h~$\xda\xdf^\xc4\xd7'\x16\xef\x15\x1e`/\xea\x0fG\xf3\x11\x1ehOL\x8bD\xbbE\a\xd9\x13\x9a\xe7\xa6W\xfe\x00\xf1\xd4\xff\xd0nʭ?X\x154J\x1e-x\x88ݔS\u007f\xa8\xddԽ\xfe0\xa0\xc1p\xbb)\xad\xc1\b\xbb\xa9i\x83\x91v3\x1a\xe3(\xb8'd4\x1em\xf2\x11\x1em\xf2\xb1\xbd\x04\x1fm\xa2\x9c\xec\x13{q\x1e\xa8\x86\xf4)\"\xca\xfc\fqd~n75\xeb\xfb\x85\xddܽY\xdf/\xed\xe6\xb4f}\xbf\xb2\x9b\x9b6\xeb\xfb\xb5\xdd\xeco\xd6\xf7\x1b\xe3y\xd6\u05f7x&\xfb;\xe49\xfb{<\x98\xfd\x83\xdd\xd45\xe7G\xbc%\xe7'\xe3.V\xf9ϸ+\xe7\x17\xbb)=\xe7Wܕ\xf3\x1b\\#\xa7c\xea\xefhd\x90?\xecf\xf0O$\x132\x86\x97\xaa\x8e\xe5%\xfb_\xea\x92}\x1c/\xd9\xc7\xe3\xa0J\xfe\x04xQ\x95\xfc\x8e\xa9\u007f\xdbM\xee\xf0D$\xd1\x1d\xfe\aIt\x87'!\x89\xee\xf0d8J8c\n\xdc&\x9cQ%\u007f\xaa\xbd(\xb5c\xea4d?\u007f:\x12\x96?\xc3\xfe$\x13\x96\x1fI\x8f\xe5f\xccD\xca\xf2g\xe1bp6.\x06\xe7\x18š\xdaǿ\xb8\x14\x9c\x8b\xf4\x06\xe7\xa1H\x83\xf3qS\xeb\x05\xb8\xa9\xf5B\xe3&個pS\xebŸ\xa9\xf5\x12\xdc\xd4z)\x92\xea\xca\xcaYfOH\x83,G\x9fY9\xa7\xf2\n\xbb\xa9\xc1\xfb+\x91\xfb\xf4U@\xc6j{B\xc3*\xdd3\xd7\xd8\xcd\rc\x95ע\xe8\x1a\xacCm\xf5Yoǀ\xb0\x01\x05\xef\xdeh7Es7\xd9\x13ZVnYy\xb3\xdd\xd42m\v\xe2/\xd8j7e\xe7l\x03r\xb7\xdb\xcd\xe8\x1ew \xd8{'^\xdfe\x97]\xfd_\x8bv\x83\xb1\xec=He\xb3\xbdh\xf6x\xef>\xbb\xd9\xedNۏ\x82\xf2\x1e\xb0\x9b\xf2\xf3\x0e\xdaM\xbe\x9e\x87\xec\xa6\xd6]\x0e\xd3\xf1\x8e\x90G\xd1z2\x8e\xa1\xf5d\x1cG\xeb\xc98\x81֓q\x12\xad'\xe3\x14ZO\xc6i\xb4\x9e\x8c3h=\x19g\xd1z2Ω֓q^\xb5\x9e\x8c\v\xaa\xf5d\\T\xad'\xe3\x92j=\x19\x97U\xebɸ\xa2ZO\xc6U\xd5z2\xae\xa9֓q]\xb5\x9e\x8c\x1b\xaa\xf5d\xdcT\xad'\xe3\x96j=\x19\xb7U\xebɸ\xa3ZO\xc6]\xb0Z\xc6=\xb0z\xc6}\xb0F\xc6\x03Б\xf1\x10\xac\x99\xf1\xc8n\xb6[3\x1e\x83\xb6\x8c'\xd2\xe4[\xae\x88I\xc4,\x92 \x92(RD\xa4\xa8H1\x91\xe2\"%D\x9e\x14yJ\xe4i\x91gD\x9e\x15yN\xe4y\x91\x17D^\x14yI\xe4e\x91WD^\x15yM\xe4u\x917D\xde\x14yK\xe4m\x91\x92\"\xa5Dt\x91$\x91\xd2\"eD\x92Eʊ\xbc#RN\xc4\"\x92\"R^\xa4\x82HE\x91J\"\x95E\xaa\x88XEl\"\xa9\"v\x91\xaa\"\xd5D\xaa\x8b\xd4\x10q\x88\xd4\x14yW\xa4\x96Hm\x91:\"uEꉼ'R_\xa4\x81HC\x91F\"\x8dE\x9a\x884\x15i&\xd2\\\xa4\x85HK\x91V\"i\"N\x11\x97\x88[\xc4#\xe2\x15\xf1\x89\xf8E\x02\"A\x91\xd6\"mDڊ\xb4\x13i/\xd2A$$\xd2Q\xa4\x93Hg\x91\xb0H\x17\x91t\x91\f\x91\x88HW\x91L\x91,\x91\xa8H7\x91\xee\"\xd9\"9\"\xb9\"1\x91\x1e\"\xef\x8b\xe4\x89\xe4\x8b\x14\x88\xc4Ez\x8a\xf4\x12\xe9-\xd2G\xa4\xafH?\x91\xfe\"\x03D\x06\x8a\f\x12\xf9@\xe4C\x91\xc1\"CD\x86\x8a\f\x13\x19.2Bd\xa4\xc8(\x91\xd1\"\x1f\x89|,\xf2\x89ȧ\"\x9f\x89|.\xf2\x85ȗ\"_\x89|-\xf2\x8dȷ\"߉|/\xf2\x83ȏ\"?\x89\xfc,\xf2\x8bȯ\"\xbf\x89\xfc.\xf2\x87ȟ\"cDƊ\xfc%2Nd\xbc\xc8\x04\x91\xbfE&\x8a\xfc#2Id\xb2\xc8\x14\x91\xa9\"\xd3D\xa6\x8b\xcc\x10\x99)2Kd\xb6Ȝ4.\x9fȹ\xe4\xb9\x80\\H.\"\x17\x93Kȥ\xe42r9\xb9\x82\\I\xae\"W\x93kȵ\xe4:r=\xb9\x81\xdcHn\"7\x93[ȭ\xe46r;\xb9\x83\xdcI\xee\"w\x93{Ƚ\xe4>r?y\x80\xf9\x80|H>\"\x1f\x93O8e\xbcr&6\xc2\xec^79\x13Z\x86c\xba\xd9i\xf6D\xf5\x04g\x11.\xd2\xf5Dg\x02\xd6\xe5z\x11\xb9\xb7\xa8Ӝ\x16Ӌ9\x8b\xb4\xe3\xc5\xe2\xce\x04_8W/Qx\xf3\x93r\xf3SNs\x8b\xa8\xfe\xb4\xd3\xdc \xae?\xe34\xb7\x8d\xeb\xcf:\x13ӰNןs&4\rG\xf5睉\r\xb3bq\xfd\x05C_T\x11b\xb2\xad\xbf\xe4L\xf0D#\xfa\xcbN\xb3;\xaa\xbf\x82س\xa2\xfa\xab\"\xaf\xa9Kq\xfdugb\x03\x95\xda7\x10oD\u007f\x13\x11\xc4p\xf4\x16\xf2\xa0\xf4m\xa7\xd9\x17\xd5K:\x8b4T\x9b\rz)gB#<\xa3ˣI\xce\"\xad\xd4\x06\x85^ZN\x97q&\xb4\xc5˓\vO\x97\xc51\xd2\xf0\x8e\xf1\x86r\xceD\x9f:mA\x9a\xe3\xb9z\x8a3\xa1\x05\x1e*\xef47\x8d\xe8\x15\xf0\xf6\xb0^\xd1Y\xc4\xc3'+\xa9\xf4\xab\xf7WfΫ\xa8[#\xbaՙ\xd8D\xa5\xc2\xe6Ll\xaa2\x97\xaa\x92\xa5\x02v\x95mhUgB\xabh\xae^͙\x88\xdc\xc7\xf4\xea\xce\x04\xa8^\xc3in\x16\xd6\x1d΄ָ\xa5&\x92\ny\x17G\x91\xa8^K\xee\xa8\xedLl\xa1RX\xc7in\x15\xd5\xeb\xe2\x9dq\xbd\x9e3\xc1\x8dw\xbe\xe747\x89\xeb\xf5\x91\xbc\xa8ހl\xe8Lp\xa2\xc8\x1b\xa9:\u009aRo,\xf9h\"\xd2T\xc5\x18ћ\xa9\xac\xc7\xf4\xe6|\xa2\x85\xd4uKu)\xaa\xb7r\x9a[\xc7\xf54u\x10֝H[\\w\xe1%aݍ\xb7GtOaֽ\xceD\xb7J\x94\x0f\xaa\xca\xc4\xefLD\xe1\xc4\xf4\x00\x1f\t\xb2\f\xa2z\xebªiS\x18h\xcbw\xb6C\x02P\x14\xed\xe5\xd5\x1d\x9c\ti\xc8LH\xd2ؑ\x1eى\x15\xde\xd9in\x13\xd5\xc3\xce\"\xdcjһ\x88?\xa5K\x85f8\x13\x9a\x85\xb3\xf5\x88D\xd2U\xf9M\\\xcft&\xfa{ų\xf5,q\xa3(k\xa8\x9b3ѩ\x9e\xef\xae\xde\x10ֳ\xe1\xfa\x91l=Gnɕ\xe7cN\xb3+[\uf064\xe0\r\xef;\x13[\xa9\xaa\xcbs&4\xc4+\xf2\x9dfo\\/\x80\xbb\xc7#z\\\xfc\xa6'\x8b\xbe\x97\x8a#\xac\xf7v\x9a\x9da\xbd\x8fJ^\xae\xde\x17\xe7b\xd9z?\xa7\xb9q\xb6\xde\x1f\x95\xaf\xd23@\xde2Pn\x19\x84x\xf1\xea\x0f\x94\xafE\xf5\x0f\xe5\xe4`\xe3\xa5C\xc4O\x86\xb2\xa4\x86!\xc9x\xe9p\\S\xc5;\x02-2\xac\x8fd+\x1b\xa5\xeaB\x95\xe9h\xc9\xc8G\"\x1f\xe3\xbdy\xfa'\xea\rq\xfdS\xde\xf9\x19\xf99\xf9\x05\x92\x0f\xff\xfe\x92\xf5\xf4\x15\xcb\xfak\xd6\xf97\x86\x9b}\xcbF\xf5\x1d\"CҾG\xd2\"\xb9\xfa\x0f\"?\xb2\x1d\xfc\xa4\x9a}D\xff\x99\a\xbf0\x86_\x19\xfe\x8d\x85\xfd\xbb3\xc1\x8fv\xf6\x873\xb1\xb5*\xf3?\x9d\x89-\x95\x8eq\x9a\xfda}\xacz\t\xf2\U00057abb\xa8>\x8ey\x1co4\x90\t\xce\xc4f*?\u007f#\x93q}\xa2\x94\xd8?\x85\x95?\xc9H\xdfd\u0530\xd2)\x85\ryj\xe1\x1dӌ;\xa6\xd3wf\xa8n W\x9f\x89~)\xa6ϒ\xc6?[\x92>G\x9aٿ,\xd4\\}.\x0e\xd1 \xe7I\xab\x9b\xefL\xf0\"\xaf\vD\x162O\x8b\xe0\xfca}\xb1\x91\xa5%L\xf5R)\xeeer\xdfr6\x8f\x15F\xe7\xba\xd2in\x17\xd1W)w\xcb\xd5W\xa3{\x8b\xebk\x8c\xceo-\xd2\x13\xd6\xd7\x15\xf6\xa9\xeb\xe5\x9e\r҇l4:\xa3M\xceD\xaf*\x89\xcdF\x87\xb7\x05\xce\x16ӷJ\xff\xbb\r\xfe\x81\x1a\u070e\xa3>a}\anQ\x11\xed\xc4+\xa3\xfa.I\xd4n\x16\xf6\x9e\u0097쥯\xees&\xaar\xd2\xf7\x1bz\x00\x15\x85l\x1fD\xa9\xabw\x1cB\xb9*=,\x19:\xc2\x06\x9d\xab\x1f\x15\xe7<\xc6<\x1fw\x9a\x1bE\xf5\x13\xaa\xf8\xa2\xfaIU|x\xe0\x14/\x9df%\xc6\xf43\xaa\xa5\xab\x97\x9e\x85\x1f\x85\xf5sR\x8b\xe7y\xcf\x05V\xecE\xb41\xbc\xe0\x92\xbc粴\xc9+\xc6\xe3W\x9d\x89m\xd5\xd3\u05cc\xd7_/\xecpnp\x90\xb8)\xfd\xe4-z\xecm:S\xae~G\n\xef\xae\xf4j\xf7\x8c~\xf8\xbeQ0\x0f\xe4=\x0f\x8d\xca{\xe4L\xc0e\xfd1s\xf2?ܫN>\xe12ޢ\xb9\x94;\x9b\\\tnx\x82٥\x1aL\x82\vu\x8ax\x13]\xf0\x92\\\xbd\x88\v^\x92\xab\x17u\xa9\f\x15s\xc1\x9fr\xf5\xe2.\xf1\xf1\x12<\xf9\xa4K\xb9\xccS.s}\x8c\x8a.\x95\xd0gx\xe6Y\x97\xaa\x85\xe7\\\xaa7}^=\x88\x11\xd1\xc5\xda\u007fѕ\xd0\x00\xef{\xc9E\xb7|\x99\xf7\xbd\xe2J\xf4\xab8_-L\xdak.\xba\xf0뮄f\xa8\xb57\x94D\xf57\x99ķ\\\t\rq\xf0\xb6\xcb\x18qJ\xba\xe8(\xa5\\th\xbd\xf0t\x12nC\xef_ڥ\x1ak\x19\x97xA\xb2\xcb\x18\xcd˺\x8c\x8a{\xc7E\xff*\xe7\x92\xf2\xb3 \xa9j@\x94\xac\x96\x978+\xb884Ut\xc9z\x0eq\xa9\x17Tv\x99\x9dq\xbd\x8aK\xb58\xab\xcb\xdc4\xae\xdbp&\xaa\xa7\x92v\x17\x1b_Ud\x16\xf7Vs\x99\xdb\xc4\xf5\xea.\xf1\xa1\x1a.\f\x8aȝÕ\xe8C\x9f\xa6\xd7D=\xc4\xf5w]\xaa+\xaa\xe5Jl\xa0*\xb46\x8f\xea\xb8\xe8/u]\xca\x1d\xea\xb1\xc0\xdf\xe3\x85\xfa,\xf0\x06.\xa3Sl\xc8j\xcb\xd5\x1b\xa1\xa0 \x8d]\xec؛H\x117\x95\xe47s\xa99Ks\xbe\xab\x05\xc2Q\xbd\xa5z?*\xbb\x95\xcb\xdc0\xaa\xa7If\x9d.\xe5+.y\xc6\rA\xf9{\xa46\xbc.qW\x9f\xcb\xec\x8f\xea~\x95\vD\x1fp\x99\x9bE\xf4 cl\xedb+k\x83*Aٷe}\xb5c\xb2ۻT\xa3\xee \xf1\x85\\\t-\x11_GW\xa2S\x95G'\x974\xc6\xce,\xb9\xb0Q\xbe]\x98\xd2t\xbcS]ˀo\x85\xf5\x88K\x1aJW\xa9\x8aL\x97\xb9eXϒ\x83\xa8\xf8q7Wb35\x1awg\xb2\xb2Q\xbd\xc8a\x8e\xcb\xe85s]j\x8a\x1332\xd2C\xd5\x0e\x06@zi\x9e+Q}M\xd2\xf3\xa5\xcc\v\\jd\x89\xbb\xa4\x8f\xeaI\xa7\xee\x85\xe2E}\xf5\x16\xaf\xec\xe3\xe2\x80\xd6\x17iR\xe9\xed\x87\\\xa8\xa6\xd3\xdf%\xbd\xfe\x00\x96\xea@\xe6~\x90\x8b=\xd5\a\xca\r\x11ۇF\xc5\x0f\x96\xe2\x1a\x82\xe2@\x04C]\x9c\x94\fsq\xdc\x1f\xaeR\x1e\xd5G\xf0\xf9\x91.\x0e\xa1\xa3pc<\xac\x8fv\x15Q\x93\xaeL\xfd#\x97\x9a$}\xec\xe2\xfc\xe2\x13yǧ.sZT\xffL\xea\xefs\xfa\xdd\x17R}_\xc2gr\xf5\xaf\xf0L\\\xff\x1a\x1e\x82S\xdf0\x93\xdfJ\x1b\xf8Ψ\x86\xef\xd5\xcb\xc2\xfa\x0f\xf2\xce\x1f\xa5E\xfc\xe4Jl\xaa.\xfel\xf8\xee/L\u05ef.5W\xf8\xcd%]\xd3\xef.N\x91\xff\x90\x02\xfc\x13I@\x06\xc6\xf0}cQS\x18\b\x8d\xa2\x19\xa7\"A\xfeǣ\x88\"\xfa\x04\x97̦\xfeFǢjn\xa2K\xf5\x8eQ\xfd\x1f\xc3=&Aի'K\xff1\x85\xbd\xccT\xd4\x01\x921\xcdU\xa4ET]\x9c\xee2\xe6\\3\x8c\xb8g\x8a\xab\xcdr\xc9H4\xdb\xc5\x01r\x0eS\xf3\xafKM+\xe7\xba8\x89\x9a\xe7\x92!v\xbeQ)\v\xa4R\x16\xb2a/ra\x86\x99\xab/V\xed*\xa6/Qހå\xea\x16\x8c\x86\xf4\xef\xe5.5m[\x81\xac\xc4\xf5\x95.Sc}\x95\x8bS\xf2\xd5,\xfb5\xae\"-YWkQ\x02q}\x1d\x13\xbf\x1e9A\x99n`\x19nd\x0f\xb8\t}\x83\xbam\xb3\xcb\xdc.\xaeo1\x8ad++x\x9b\xd1\x06\xb6+\xbf\xcb\xd5w\xb8d\xe4\xdfitj\xbb\xa4\x03\xdc\r\xffG\xa9\xedA\xff\x10\xd7\xf72\xd2}L\xda~Fr\x80g\x0e\xbad&{Hy~L?\xcc\x1c\x1ca\x97rTj\xef\x98t}ǥ\xcf>\xc1\x1bN\xb2\xc1\x9f\x92\x1e\xf5\xb4Q\xa2g\xa4ٝuq\x86x\x0e>\x84\xa7\xcf\xf3]\x17\xc4w/\xca\x1d\x97\f\xf7\xb8,Q^aB\xae\xb2y^cE\\gFb\xfa\r\xc9\xc1M\xe3\xfe[,\xed\x98~\xdb\xc5\xd9\xdd\x1d\x17Ʋ\xa8~\xd7%#\xde=v\xec\xf7\xe9\xd3\x0fdHy\xc8\xc4>\x92\fY\x13\xba\xd9Ƿu\xabѵ\x9d\x9b}S{7;\xda\x0en\xe9\x80B\xe2C\x1d\x99\xfbN\xee\"\xcd\xd8ot\x16\xd7\f\xbbe\xb4\xed\xe2\x96֗.\t\xc9p\xb3k\x8f\x18\xb9\xef\xeaV}N\xa6\x9b\v\xda,\xb7\x1a\x80\xa2n\xd5ܺ\xb9Uk\xe8.E\x9amTw\x8e[v.r\xddjp\x8b\xd1\xc5zH\xf2\xdfw\xb3\xd7\xcfs\xab\x9e!\x1fթ\n\xb3\xc0\xad\xba\xeb\xb8[:؞n\xb3\vkB7\x17@\xbdE\xfaH\x16\xfa\xa2\xde\xc3z?\xb7\xeak\xfbKI\x0f\x90r\x1c\xe8\xe6\x84tP\xa1\u007f~\xe0\x96E!*\x19\x8f\x0f\x96\xf4\rq\xab.l\xa8\x9b\xfd\xd10\xa6\u007f8\xea[%a\x84;ѫ\x92>ҭ\xfa\x99Qn5\xfc\x8cvs\x91\xf7\x11\xa2B\x1c\x1f\xbbբ\xf1\x13ԥ\x8a\xffS\xb7L\x8c>3*\xeas7;\xf2/$Q_\xbaU\xff\xf8\x95[M\x83r\xf5\xaf\r\xbf\xffFZ\xe6\xb7F\x83\xff\xce\xcd\xee\xe7{7{\xd9\x1f$\x87?\xba\xa5\xcb\xfa\xc9-]\xf3\xcfRK\xbfH\xdb\xfeU\xb5\u0098\xfe\x9b[\xa6\x19\xbf\xbb\xd5\xfc\xe2\x0fý\xfe\x14\x0f\x1c\xe3\xe6\xbab\xac\x9b\xa3\xe4_F\xfaƉ{\x8f\xc7[ЇM\x90W\xff\x8dւ\xe8&\xaa֒\xab\xff\x83\xa6\x87\x14L\x92\xbej\xb2\x91\x80)*\x9e\x98>ը\xdaiF72\xddh\xa03\xdc\xe6\xfa1}\xa6ۘ\x1cϢ\xc3\xcf6\xda\xdb\x1cD\x85\x92\xfb\xd7mL\x8e纍\xbd\x9fyF\xe72_:\xcd\x05\xd2\x14\x17\xba9\xc9\\\xe46\x16\\\x8b\x8d\xa6\xb9D\\r)]|\x19\x8bv9]`\x85\x94\xd9J\xb6\xa1\x98\xbe\xca-+E\xb7,H\xd7\xf0\x9e\xb5\xe8#q\xb0Ψ\x83\xf5n\x19\xdb6H\x81n4\x9a\xfb&\xa3c\xd9\xec66ն\xb8\x8d\x89\xddV\xa3\x12\xb7\xb9e\xe4\xdc\xee6&\x06;\xdc\x1c\xabw\xaa&\x87\xb1ҭ\x96\xa7\xbb\x99\xb8=n\xce\r\xf7\x16\xfa\xe2>\xb71\xad\xda\xef\x96\xfd\x87\x03\xecn\x0f❪(\x0f\xb9e\xe1~X<\xf9\b\x1b\xcdQ\xf8\xb3Z0\xba\xb9@9^X\xbe'\x8c\xf6x\xd2\xcd\x19\xf8)\xb7\xcc{N\xbb\xb9\xe9s\x06iU1\x9e\x95\xc6p\xce\xc8\xeby\xf1\xbb\v\xaa\x17\xb9h\xb3\xbbG\xedhe{d5\x94\xa3\xbc%\xae\xe7zT\u007f\x12\x13\xaf\xed!\xbe\xf8\xbeqK\x9eG\xa6\x84\xf9\x1e\x99)\x16xd\xa2\x17\xf7\x18+K\x8f\xeadzyԴ\xa8\xb7GF\xab>\x1e5o\xea\xeb)\xe2\xee\xd1\v5\xd4\xcf#\xe3H\u007f\xa3\t\rP\x99C\xae\x06zT\x174\x88\xcd\xef\x03\x86?4\xbcf\xb0\xc7\xe8\xfd\x86Hq\f\xf5$\xc0\x8b\xf4a\x92\xb5\xe1FU\x8f\x90\x8b#\x912\x15\xfd(\xb9i\xb4G\x8d\xf2\x1f\x15\xc6\xf01\x0f?\x91\x86\xf9\xa9\a\xc3uX\xff\xac\xf0\xe2\xe7\x12\xc3\x17\x1e\xe93\xbe\xf4pU\xf9\x95\x87#\xf1\xd7\x1e5\x19\xf9\xc6\xf0\x83o=j]\xfa\x9dG\xc6\xef\xef=\\\xb3\xfe\xe0\xe1l\xe3G\x0f'G?I\xff\xf2\xb3ѿ\xfc\u008c\xfd\xca\xe7~\x93\xba\xff\xdd(\xc4?\x8c6\xfd\xa7ǘލa\xf9\x8d52\xf6\x97G\x96\xf2\xe3<\xdcg\x18\xafj$G\x9f\xe0Q3\x89\xbf\xe5\x95\x13\x19\xed?F%L\xf2ȸ2Y\xba\x97)F\x89L\xf5H\x9f8\u0378m\xbaG\xed#\xcf(l\x183=\xec\xb0g\xf1\xec\xec\xc2Nb\x8eGu\xb5\xffzdF<׃5M\xae>\x8f\xef\x9e\xefag\xbc\xc0x\xdbB\xa3\x1d-\x92>g\xb1\x87\x13\x9e%F-/5\x9cu\x99\xb4\xfc\xe5x\x16u\xb7\x82\xadd%\x9df\x95G\xf5\xff\xabU\xe1\xa3\xd8\xd6xd\xa8_k<\xb7\xae\xd0q\xd7{d|\xde\xe0\x91\xbd\xbd\x8d\x1eن\xdad$c\xb3\x87+\x89-\xc6{\xb7J\xd5l\xf3pR\xb0\x9d\x95\xb0\x83\rf\xa7GfD\xbb\x8c\xe2ݭJ?\x8eV\xb6\xc7ù\xc8^\xb6\xdd}\x1en0\xef\x97^\xf8\x80\x87\x03\xd6A\x91CF\xef{\x98\r\xe6\b\xfbѣ\xf4\xdcc\x1e\x0e\xa4\xc7EN\x88\x9c4\xca\xff\x14k\xf7\xb4\xf4\x8cgT\a\xd7=\xa6\x9f5.\x9eSN\xd7]?\xefQ\xb3\xdd\v,\xe7\x8bƥK\x1eY\xed^6\x8e\xaf(?\x8b\xeaW\v\x1b\xfe59\xbe.\x05p\xc3#\x03\xfdM\xe3\xa9[\x1e\xb5\x01u\xbb\xb0\u05fbc\fdwY\x03\xf7\xef\x95\xfe\xe6\x05/F\x8e\xb0\xfe\xa2\x97\x8bڗ\xbc\xb2\xfa\xf4\xaaz}ŋ\x81 \xa2\xbf\xea\xa5\x1b\xbe\xe6e\x9f\xf6\xbaW\xed\xea\xbfᕖ\xf0\xe6\u007fI{˫J\xf8myaI\xaf*\xa2R^U=\xbaWf`I^:yi\xafxY\x19\xaf\xd1D\x93\xbdl\te\xbd\x18\xd4#\xfa;^\xce\xc0ˉX\xbc\x1cXS\x98\x9c\xf2FD\x15\xe4Ί^\xe9\xd3*yů+{\xd9\aU\xf1\xf2+\x8dU\n\xd2\xf6_\xfaRQ@\xf0E\xbbWm\xb7T\xf5\xd2\x17\xaby\xd58S\xdd\xcb\x11\xba\x86\x8a\x1e\x118\xbc\xd2\xc1\xd7\xf4r\x15\xf6\xaeW\xf9O-\xaf\x1a\xc2jK\xaa\xeax\xb98\xa9\xcb+\xf5\xe4\xe0=/]\xa6\xbeD܀%\xddЫV\x8a\x8d\x8c\xf45F\xf9\xa1\xe14\x91\xf45e16\xf3J\xc7\xd4\\UWLo\xe1\xe5ǵ\x96|Y+\xaf\xfaܒfT\xa8SR\xe3\xfa/?nɮ\xc7+\xad\xd3+1\xf8XR~\xbe8\xe0\xe5\xc6H\x10\xe5\x8b\xf7\xb66\x8a\xab\x8dWu\x11m\xff\x8b\xa7\x9dW\x8d)\xed\x8d\xfa\xec n\x10\xf2\xaaydG梓d\xa9\xb3Wz\x8b\xb0\x97co\x17\xaf\xac\xfbӍ\xf7g\xf0\xde\b\x9f\xeb*\xb7d\xb2\xfa\xb3\xbc\xdc\x14\x8dz\x8d\x05o7\xe3\x81\xee\x12m\xb6W\u05909^5\xf5ȕL\xc5\xe8K=\n\x1fy\xdfx$ϫ\xb6V\xf2\xbd\\\xc5\x16H\x81\xc7\xff\xcbHO\xaflZ\xf422\xdaۛ\xe8W\xc7}\xbcj\xae֗\x05\xd3\x0fE\x82\xb2\xe8ox\xd2\x00\xaf\xac<\x06z9\x1e\f\xf2ʤ\xf3\x03IŇ^\x99\a\x0f\x9661D\x1a\xcaPy\xfd0#\xffý\xb2Z\x19\xc1̎\xf4\xaa)\xf3(i)\xa3\xc53>2b\xfdX\x0e?12\U000e985fy\x8d\x15\xa8\x94\xd3\x17,\xc7/\x8d\x8b_\xb1\x85\u007fm\x1c}#\x8e\xfa\xad\x91\xc1\xef\xa0*\x83\xdf{\xd5\x0f\x14~`\x06\u007f\xf4r\u007f\xf7'\x1e\xfc\xec\xe5\xc7Iß\u007f\xf5\xf2\x93\xc3o^\x99\u007f\xfc\xee\xe5d\xff\x0f\x96\xfb\x9f^~\x18\x18#-}\xac\x97]\xf4_\xdeĖ\xaa\xf8\xc7y92\x8e\x97\xb7O\xf0\xca\xe8\xf0\xb7\xbci\xa2W}\xed\xf8G\x1a\xc6$6\xfb\xc9^\xf9|0\x85\x89\x9f*\xf7M\xf3\xaa\xe1>\xa6Og\xcaf\x18mb\xa6\x97K\xadY\"\xb3\x8d\x1a\x9c#\xd5\xf1\xafW\xa67s\xbdj\x8b\u007f\x9eWV\xd6\xf3\xbd\x9cK,\xf0\x1a\xc3\xeaBy\xf5\"I\xfab\xaf\xda>\\\xe2\xe5\xac`)\xdb\xd12\xe3]˽\x9ct\xaf\xa0\x8b\xae\x94\xceh\x95\x97\v\xd8\xd5^\xd9d]\xe3\x95E\xf3ZC\xd7ye\x8e\xb2\x9e\x11m\xf0r\xefc\xa3\x91\xcaMF\x83\xd8L\xff\xda\"\xadl\xabW& ۼ\xdc\x1c\xdc\xeeU\x1fDw\x88\xab\xee4b\xdbe\x94\xe0n\xaf\x9a\a\xed!\xf7J\xf7\xbd\x8f\xb5\xb1\x9f\x05w@^wЛؚ\xcb\xcc\xc2\xd6pX\n\xeb\x88W}F<ʗ\x1f3\xfc\xf8\xb8\xe4\xfb\x04}褗;ۧ\xbcƢ\xfd\xb4\xe1\x87g\f\u007f8k\x14\xef9\xbe\xed\xbc8\xf9\x05/\a؋F\x1e/yeyy\x99\xde}EF\x8e\xab\xe2\x0f\xd7\xc4g\xaeK2o\x88\xdcdzn\xb1\x92o{\xb9\xd5u\xc7++\x95\xbb\xc6{\xefI\x9f~\xdf\xf0\x92\a^\xae6\x1ez\xb9\x04~$\x17\x1f{9S\xfc\x1f\x8b\xe3\t\x1f\xef\xd0|\x89ij\xd6k\xf2%8\xc3}t\xb3\x8f\x9fC\x12D\x12}|\xae\x88O>\x15\x17\xf5ɯL}\xc6\x18]\xdc'\xdb\x1e%|*\x1fO\xfa0\x9b\x8b\xe9O\xf9Tw\xf2\xb4O\xad\xfc\x9f\xf1\xa9\xb5\xe4\xb3>\fE1\xfd9\x9f\xea~\x9e\xf7ICy\xc1gn\x84\xf1\xd1\xc7\xf4\xbd\xe43\x96\x87/\xfb\xd4\xc6\xd9+>\xf6\t\xaf\xfa\xb8\x91\xf1\x9aJYL\u007f\xddG\xa7z\xc3'{\xaboʓo\xf9T1\xbf\xedS;`%}\xc6*\xbc\x94O\xbe\x99\xea\x85'\x92|\x86[\x97\xf6\xa9\xc9c\x19\x1f\xa7~\xc9>ծ\xca\xfa\xe4+\xc3;>v$\xe5|\x9c\x04X|\x89\xed\xd4\x03)\x85O\x96\xf7\xb1ۯ\xc0\b*\xfa\xb8\xffVI\x1e\xa9,R\xc5\xc7Ţ\xd5\xc7\xea\xb4\xc9\xc9T\x9ftdvC\xab\xfa\x12}\xaa\xba\xaa\xf9\xd4d\xac\xbad\xa2\x06\x13\xe2\xf0\xa9YZM\x9f\xea\xeb\xde\xe5\x99Z\xcc\\m\x95\xa2\xb0^\xc7\xc7\uefee\x91\xdcz>\xb5\x90~\x8f\xf7\xd5\xf7\xd1A\x1b\xf8\xb8\xb2k蓱\xad\x91\x0f\xb3?\xb5)\xebS\x1f˛\xf8ԗ\x8e\xa6>\xc3ݛ\xf9\x94\x0f4\x97$\xb7\xf0\xb1\x0fk)Ѵb:\xd2|\x1c\xb2\x9cR\x15.\x1f\x9d\xd3-'=R1^F\xe9\xf3I\x97\xed\x97[\x02\x92\xfd\xa0\x8fn\xdc\xda\xc7\x0f:m\xe4d[\x9fjA\xed|\xaa\xabh\xafR\xa2&x\x1d|\xeaCi\xa8\xb0\x9c;\x1a\xf9\xeb\xc4ӝ}\xb2\x0f\x1b\x962\xe8\xe2S\xed \xdd\xc7\xe5~\x06\x0f\"LmW\x1fǖL\x9f\xda\x18Β\x94D}\xecº\x89t\xf7qݟ\xedK\xa8\xafV\x92\x85\x0e\x97\xebc\xf7\x1b\xf3qe\xd5\xc3\xc7\xc9\xf8\xfbro\x9eO\xdaR>\x93]\x80$\xa8\x9f\xe8\xf8\xe4\x974=\xa5\xb0z\xf9\xa4I\xf7\x96w\xf6\xf1\xa9n\xa7\xaf\x8f=}?y\xa2?\x8bz\x00#\x19\xe835\xd6\a\xf9\xa4\x8b\xfb\x80I\xffP\x1a\xd5`\x1f\xe7\xafC\x8c\f\x0fU7\x0e\xf3\xc9V\xf5p\x9fj\xf8#|\xfc\x81\xd5H\xb9q\x14ύ\xf6\xa9\xb1\xe8#\xf2cq\x90O|\xfc\x1a\xfc\xa9d\xec3\x1f\xc7\xd5\xcf}\xf2S\xaa/\xe4e_\xfaT\u007f\xfe\x15\x1f\xfbZn\xfcƧ\x16\x9e\xdf\x1a\xf7}\xe7SS\x9d\xef\xf9\x8e\x1f$\xc2\x1f}\xfc4\U00093466\x9f\xf1\x18\\\xe7\x17\x1f'H\xbfJ\xeb\xf8\xcd'\x13\xaf\xdf\x19\xd9\x1f\xc6џ>c\xd7p\x8c\xa4p,\xa3\xfd\xcbǮq\x9c\x8f[Q\xe3}\xb2\x16\x9f\xe0\x93=Xi\x18\x13}\xecl\xff\xf1\xa9\xd9\xff$iQ\x93%\x92)>\xb5\xfa\x99ʨ\xa6\xf9\x8c\xed\x8e\xe9>n\x06\xcc\xe0ٙr\xe3,\x91\xd9Fb\xe6\xf0\xb9\u007f\x8d^h\xae\x8f\v\xa5y>~C\x9c\xcfִ\x80\\\xe83\a\xba\xeb\x8b|\xdc\xcfY\xccֺ\xc4'\vȥ>c;t\x99\x8f\x9b\xd4\xcb}\xdc)^!\xb2Rd\x95\xc8j\x9f\xda\xd7[\xe3\xe3\xee\xf3Zq\xdcu>N:\xd7\xd3#6ȹ\x8d\xbe\xa2>\x99pm\xf2q\xac\xd8\xec\x93]\x87->\xf9\xb9\xdbV\x9f\xda\t\xd9\xe6S{\xdb\xdb}\xfcd\xb2C\\p\xa7\x8f+\xd6]F;\xdc\xcd\xe4\xef1\x1e\xdfk4\xa7}t\xcc\xfd>\xceN\x0e\xf8\xb868\xe8\xe3g\x80C\xaa\xaf\x8f\xe9\x87\xc5\xe9\x8f\xc8ɣH1\xfc\xf9\x98zST?n\f\x00'|\x9cB\x9c\xf4\xa9\x95\xf0)\xf6\xfa\xa7}\xb2\xf08#-\xf0\xac\f\x02\xe7\xe4\xc6\xf3\xe2[\x17|2F^\xf4\xc9\xd6\xd6%\xe6\xe5\xb2O~\xd0tŧ\xa6\x01W}\xdc\v\xb8&\xbd\xfcu\xc9\xda\r)\x9c\x9bR=\xb7\xd05\xc6\xf4\xdb\xd2\xd2\xee\xf88\xef\xb8\xcb\xea\xbc\xe7\xe3\xbe\xf5}y\xf8\x81OM\x0f\x1e\xfad\xed\xf7\x88\xc5\xfcX\x1c\xff\u007f>\xf9A\xd2\x13~\xfe,P\xf3\xabR1\xf9\x13\xd3Tɛ\xfd|<\xc1\xaf\x06\xb0D\xbfl\xa8\x16\xf1\xf3SCQ\xbf\x9a\xcf\x17\xf3\xabvS\xdcϥ\xa1_\xe2\u007f\xd2\xcf5\xe1S~\x19ӟ\xf6\xcbj\xfd\x19?\x9b˳~\xe5\x8a\xcf\xf9\xd5\"\xf6y\xbf\xd1\x0e^\xf0\xb3Q\xbe\xe8\xe70\xf4\x92_\xed`\xbc\xecW\xbd\xd9+~S}\xfdU\xbf\xfa\xa6\xf2\x9a_}\xf0y\xddϵ\xcb\x1b~~\x90\xf4s\xc7\xe6-\xbflǾ\xed\xa7\xf3\x96\xf4'\xf8q\xb6\x94\x9f}\x97\xeegKL\U000ab074\xb4\x9f\xed\xa7\x8cH\xb2\x9f=aY\xbf\xeaY\xdf\xf1s\xce^ί\xaa\xc2\xe2\xe7\xef\x8fR\xfc\\\a\x97\xf7\xa3\xef\xa9\xe0g7S\xd1/ͽ\x92?\xb1\x99Jze\xbfZ\xce\xe5\xeaU\xfcj\xbdc\xf5Kq\xda\xfc\xac\xe7T\xbfl\x03\xda\xfd\xaaǫJV\xf3ˏ\xaf\xaa\xfb\xcdΈ^C\xb2\xe3\xf0s\xa8\xf3\xcb\xc7\xd8w\xfd\xdc5\xac\xe5\xe7r\xba\xb6\x14\\\x1df\xbf.\xe3\xa8秇\xbe\xe7W\xfdU})\x84\x06,\xaf\x86*\xa9\x8dXa\x8d\xfdܱi\xe2W\r\xae)\x93\xd7\xcco|\xael\xcehZH4-\xfdj\x1e\xd2\xca/>\x99fd\xc1)\x95\xef\xf2\x1b\x03\xa4\x9b\xe9\xf5H\xd9z\xf9\x88\x8f\x95\xe0\xf7\xb3-\a\x98\xbe \xab\xb7\xb5\x9f\xfb\x9dm\xfc\xd2Ŵ\xf5\xcb\xd6E;\xbf\xfc{\n\xbf1U\xec\xc0T\x84T\x92;\xfa\xe9ߝ\xfc2y\xeb\xecO\xc0DJ\x0fK\tt\xf1\xab\xa1=\xddoJ\xd33\xfcҺ\"~n\x16v\xf5\xb3=d\xfa\xd57\x9f,\xbfl\x03F%\xaen\xc6aw$\x19\xb5\x9c\xcd\"\xcea\x92sY\x1a1\xbfl\xb4\xf4\xa0+\xbf\xefWm8\x8f\xe1|?\x9b~\x01[C\x9c>\xde\xd3\xcfIW/q\xd1\xde~\xfeا\x0fc\xeb\xeb\x97%C?\xa3\xb6\xfb\xfbՔh\x80\xe1\xf7\x03\xfdj^7ȯ:\xa1\x0f\xfc\xaa\x87\xf8\x10\xc5\x1e\xc9\xd1\a\xfb\xd5\x1cm\x88\x9f?\xf7\x18\xea\xe72u\x98\x9f\xd3\xfb\xe1~N\x10G\xd0gG\xb2\xacG\xf9e\x1a=\x9a\xa9\xf9H\x1a\xcc\xc7<\xf8\xc4\xcf\xdfw~\xea\xe7\x10\xf1\x99_\x16\x15\x9f\xf3\xb1/\xfc\x1cr\xbf4\xca\xe2+\xbfZ\xe3|\xedW\xbf[\xfa\x86\x19\xfe\x96\xe1\xef\xfc\xfc\"\xfc=[\xc2\x0f~\xf9\x14\xf0\xa3_\x16\x10?\xf9e\xd7\xecg$\x15/\xfdůz\x98_\xfd\xd2\xf7\xff\xe6\xe7z\xf2w\x96\xe8\x1f~\xb5\xd1\xf1\xa7\xaa\xd01~cs~\xac$\xf5/\x16\xff8\x16\xd8x?\x17Q\x13X\xd6\u007fK\xcf3\xd1\xcf\rQi7\x93\xa4\x8f\x99\xcc~e\x8a\x91\xf6\xa9\xf4\xeai~c\x9a4\xdd\xcf\xef\x063\x8c\u009f\xe9W\x9d\xe6,?\xe7o\xb3\xfd\xfc\xa1\xd2\x1c\xbf\xfc\x16\xeb_?\xfb\xe0\xb9F\x92\xe7\xa9\xf4\xcd7\xba\xb3\x05~\xfe*d!j\x1cw.\xf2sl\\\xec\xe7\xdag\tS\xbb\x94\rh\x19\xaa\x04]\xc6r\xa3\x8eW\x18\xbd\xdbJ\xa3\xb5\xac\xf2\x1bK\x80\xd5\xd2lְ\xa0\xd7\xfa\xd5\xef\xcd\xd7\xf9\xb9y\xbdޯ6\xf07\xd0U7\xfa\xf9S\x93M\x85\x1d\xe0f\xbec\x8b\x9f\xbf\xef\xda\xea7\xa6~\xdbؾ\xb7Ӂv\x18\xf9\xdcI\x9f\xd8\xe5\xe7\x96\xd9niP{\xfc\x9c\x93\xeeEф\xf3QR\xfb\x8c\xf6\xb6_\x9c\xea\x80\xdcu\x90\xa5y\xc8/\xbbۇ\xfd\\\xdf\x1e\xc1+b\xfaQ?ǎcF{=n8\xc0\t\xf1Ɠ\xc6pp\x8a\x15pZ\x95\xde\x19\xc9\xe5Y\xbfL\bϱ՟\xf7\xab\x1ff_\xf0\xabI\xf0Ez\xe6%\xbf\xda\x05\xbbl$\xfd\x8aQ\xfeW\xa5t\xaf\xf9մ\xf7\xba\x9f\x93\xb8\x1b\xe2%7\xfdƦ\xf1-v÷\xc57\xee\xf8\xd5\xf8u\xd7\xcfߖܓ~\xfa>]\xf5\x81t\xca\x0f\xfd\xf2c\xe6G\xfeĦJ\x1f\xb3S\x8e\xe9\xffc\x8a\x9f\b\xb0\x93\xd0\x02\xac[S@\xb9\xbd\x99L\b\xb0\x9fJ\f0\x96\"\x01~6/\x1a\x90\x9fj\x14\vp\xdb3\xa0j\xa6D\x80\xf3\x84'\x03j\xd8z* \xf9x:\xa0\xdc+W\u007f&\xa0r\xffl@9\xf8s\x01\xd9fy>\xc0\x06\xf5B\x80\x03\xf5\x8b\x01.Q_\n\xa8\xfe\xee\xe5\x00wd_\t\xa8\xca}5\xc0\xae\xfe\xb5\x80j>\xaf\a\x94o\xbc\x11\xe0\xe0\xf4f@\rzo\x050\x0f\xcf\xd6\xdf\x0e\x88\x9b\x95\x94\xdbK\x05\x12ZF\xf2u=\xc0\x82L\n\x14\xfe\xe3\v\xc9@\x19yA\xb2\x91\xbc\xb2\x01\xd9ux'\xc0\x89e\xb9\x80r\x03\x8b\xa4/%\xa0\xd6\a\xe5\x03\xb2?]!\xc0\x11\xb3b@\xf5_\x95\x98\xa4\xca\x01\x996U\t\xb0G\xb4\x06d\xf3\xd2\x160&\x98\xa9\x01\xd5\xe2\xed,\x81\xaa\x01\xa3_\xaf\x16P\xab\xdc\xea\x01\x8e\xae5\x02\xca\xc3\x1c\x01Y{\xd5\f\xa8F\xf0n@>J\xd5\np\xfb\xa2\xb6\xa4\xac\x0eK\xb0n\x80\x1db=&\xe2=\x96~\xfd\x80\xf4\x00\r\x02\tNHC\x95{,\xe7\x022\xbfklh\x93\x80\xf1\xfb\x81\xa6,\xc6f\x01\xf1\x89\xe6\x01N\x81[\x040\x91h\x19\x10Ol\x150\xda]Z\x80Ù\x93\x15\xe3\np\xb4q\a\xf85\xc1#\x89\xf22\x1d>\x16\x86\x9f\f\x04؛\x04\x03\\µ\x16i\x13Ps\x96\xb6\x01գ\xb5\v\xa8&\xda^\xa2\xe9@o\x8a顀j\x10\x1dY\xe9\x9d\x18O\xe7\x00=?\x1c\xe0Pҥ\xb0\x12\xd3\r\xef\xca\b\xa8uoDR\xd15\xa06i3\x03j37+ \xab\xa5h\x80\x13\xccn\xb8/\xacw\x97Ȳ\x03f_D\xcf\t\x18\xf3\xf1\\\x14\x18\xaa \xa6\xee\xc4b.\xc0\xef\xb5\xefK;\xc8c)\xe5\ad\xc0-\bp\xc2\x18\x0f\xa86\xd93 \x13\xd1^\x86\xe7\xf46\x8a\xadO@\xfe٠\xe1\xe3\xfd\x02\xec\x04\xfa\a\xd4\xd2h\x00\xeb|`\x80c\xd0 )\x94\x0f\x02\xaaO\xfe0 \x03\xd2`q\xa1!\x01\xae\x80\x87\x06dot\x18\x1db\xb8$\u007f\x04\xb39R\x1cgT\x80\xf3\x9e\xd1\xd28?\np\xfe\xfd\xb1\xe1\n\x9f\x04\xe4\xcb\xfb\xa7\x01\xf6۟\x05\xccވ\xfe9\xe3\xfaB\xbc\xf8\xcb\x00LJ\xaf\x02\x1cJ\xbe\xa6\xa3\u007f\x130>\x06\xb2R\xbf\vp\xc3\xe7\xfb\x80\xf1\xab\x89\x1f\x02\x1c<~4\xda\xcdO\x86\xfeL\xb7\xfc\x85\xf5\xf7+\x1b\xcfo\x01\xee\xf1\xff\x1e0>-\xfc!9\xfbS\xeajL@\xcd\x1a\xc6\x06\x8c\x8f<\u007f\x05\xd4Ri\x9c\xd4\xc4\xf8\x80\x8c:\x13\nk\xfbo&yb@\xfe=\xd4?R\xa2\x93\x02\xb2#O\x12?\x9f\xb9Z\xc0\xd7/\x94\x02_\x14\xe0\x97\x83\xc5\x01\xd5i/Af\x10\xc9\xd2\x00\x87\xf7e\xac\xe3\xe5R\x96+X\x14+U\x83Z\x15\xe0蹺\xb0寡\xff\xad5j|]@\xfd&d\xbd\xd1wm\bp\x9d\xb2\x91\xdd\xea&\xe9\xaa6\xb3\x93\xdb\x12\xe0\xfaok\x80\xf3\x98m\xf4\x9a\xed\x01\xf5\xaf*v\x18\x05\xb3\xd3\xe80v\x05ԧ\xf2\xdd\x01.\xc9\xf6\x04\xd4\x18\xbb\x97U\xb2/ \xeb\xf4\xfdl\xc9\a\x8c6t0\xc0\x99ࡀ\x1a\x06\x0e\xb3q\x1e\x91\xbc\x1e\x95\xb6p, \xbb\x9e\xc7\x19Չ\x80\x9aٜ\x94J8\x15\xe0\x98xZ\x12zF\x06\x80\xb3\x92\xc4sr\xf2\xbc\xf4\xd4\x17\xa4n/\xb2X.\xe1\xe9h\xbe~9\xc0\x1f\xae\\\t\x98\x9d\x99\xfaU\xbe\xffZ@\r\x8fו\x1f\x87\xf5\x1b\xec\xd8nJ\x83\xba\x15\x90\xc9\xc4mv\x1cw\x02jq\u007f\x97\xbc\x17\x90]\xb2\xfbҙ<\x90f\xf20\xa0v\xe2\x1fI)<\x16\xf9\x9f4\xe0'\x82\xaaUkA\xfeˊ\xa0\xcc\xe8\xcdA\xe3\x83q\x82q\"1ȍ\xe2\"A>R4\xc8E{\xb1 \xfc*\xa6\x17\x0f2\xa3%\x82*}O\x06\xa5\xe1?\x15\x94\x8dߧ\x83\xf4\x90g\x82\xe6\xa6a\xfd٠\x1aB\x9f3ny>\xa8\x9a\xd4\vA6\xa1\x17\x83\xecp^\n\xaa%\xc1\xcbA\xa9\x8cW\x82\xaa\xf7z5h\x8c\x1c\xaf\x05U3y=\xa8\x96\xb0o \xd5\x11\xfd\xcd G<\xf2mFW2\xc8݆RAՄt\xbe5)(\x9dO\xe9\xa0\xeap\xcb\x04\xe5\x9f+$\a\xc5\xd7\xcb\x06\xe1/\xc8\xda;FN\xcb\x05լ\xd2b\xa41%\xc8yR\xf9 \xb7\xe2*\x04\xb9\x84\xa8\x18\xe4HX)([\xb7\x95\x83\x1cS\xab\x18\x8fX\x83ʻlA~\\H\r\xca\xd2\xcd\x1ed\x13\xaa\x1a\xe4\x8eO5\xe3\xd6\xeaA\xe5=5\x82t\x1bGP;k\x06\xe5\x97\\\xef\x06\xa5A\xd7\n\xaaFW;\xc8FSG\x8a\xbf\xaeH\xbd\xa0\xaa\xd3\xf7\x82\xdcޮ\x1f\xc4\x1c\xabA\x90?\x19k\x18\xe4\xf6G\xa3 \xbd\xb2\xb1\x14p\x93 ;\xb7\xa6\xc1¯R͂\xea\xf7\xdf̓\xec)Z\x04\xf9{\xd2 ǶVAc͗f\x94\x89\x93%\xe7bR\xdct\x14\x8f\xa4\xd9\x1b\x14g\xf3\xb1f\xfcA\xf9\x1c\x1d\x907\x06\x83\xecU[\a\xd56v\x9b \xb7\xaa\xda\x06\xe9\xff\xed$\xd1\xed\x83l\x06\x1d\x82j\x1d\x1abat\f\xb2\x03\xebd\xd4N砚Ɇ%\x91]\x98\xc8\xf4\xa0\xf4\xe7\x19A\xee\x10F\x822;\xed\x1a\xe4\xfc6Sޝ\xc5TFU\xa1t\vrn\xd3=\xa8:\x91\xec \x9bw\x8e\x91\xb1ܠL_c\xf4\xdd\x1eA\xe9\x84ޗ\xb4\xe6\x05eN\x9c\xcf\xd7\x16\x04\xd9'ƃ\xfcz\xdb3\xa8\xdag\xaf w\x8b{\a\xb9\xf4\xef\x13\x94\xaf\xe9}\xf1\x0e\xb5u\x19d{\xee\x1fT\x83\xf2\x00r\xa0\x94\xc8 \xf1\x82\x0f\x82\xb2H\xfa\x90\rpp\x90\x93\x8e!AՉ\r\r\xb2\x0f\x1d\x16T}\xd7p)\xeb\x11A\xae#G\x06\xd5|`T\x90\xf3\xf4\xd1\xffG\xd4U\aJQ~m\x1a\x04\x15\x11\x10\x01\x91k\x80\x88\"\x16\x82\x8a\"(-!q\xb7c\xb6gwg/)e \n\x18\x94 )HwH\v(!)ݠ4\b\xd2)\x8d\xc0\xb7\xe7y\xce\xfe\xbe\u007ff\xee\xee\x9dy\xe3\xc4s\x9es\xdewf\xa1\x92\xef\xb2Y\xcc\xe8\x03\xcb\xebK\xb9\xf4\xe3]\xfd\xb3\x05\x86\ad\\\xe8\xfbl\x16/y\x1a\x946\x81tn\x87K\x06C\tC(\xbe\xa1\xd9\x12ԇe\x83\x05\x0f\xa7\x96Fp\xf0?\xc2\xcdF\xc2\xf6Fek\xc4\xfa)\x1b(3:[\"̘l,2\x8e\xcd\xce\xdf@\x1ck\\67r\x8dW\xa3\x9f\x80['Rϓp\xc7d\xf4=%\x9b9\xc4T8\xc24\xea|z6w\xa0\xcd\xc8F25\x13r\x9c\x95\xadd\xecg\xcai6\x9a\x9c\x03ḁd\xe6eKH\x9a\xcf^\x16ds]r\xa1Z\xd5/\xd9\\\xf8Y\x94͊\xe9\xe2l!\x11K \xfa_u\x98\xbf\xa9\x89,\xcd&\x1b[\x96\xcdؾ\x9c]\xae\xc8\xce\x140)\x9d\x95z\xdb*\x88t5\xa6\xb5F\xbb]\x9bM\xe6\xb1\x0e\xdf\xfe\x01C\\\x9f\x8dh\xb2A\x85\xb3\x91\u07b9)[\xc2\xdffLdK\xfa\uf72c\xadٺ\xc7%[R\xff\xedD\x95\x1d\xb4\x95\x9d\xecz\x97\xb6\xb1\x9bJ\xdd\xc3\xd3\xdel\x84\xf6?\xa9п\xa8\xbc}\xd9H.\xf6\xc3\xd5\x0e\xc8\xed\xa9\xac\x83\xda\xc3!^y\x986}\x847\x1c\xcd\x06\xf5:\x96\xcd\x15\xeb\xbf\xf5|\x9c\x16\u007f\"\x9b\x8bD\xff\xa8\x1b\x9d\xcc\xd6]V\xa7\xb2\xb9\xf9\xfct6\xf8ҙl\xd6>\xcf\xc2vα\xa3\xf3z\xd3\x05Z\xd9E\x06\x80K\x02\x94\xa9\xac\xcbz\xc7\x15\xce\xe2\xdflɢ\xae\xf2õl\xec\xef\xbf\xce\x1bn\xa4\xa7\x94\xfet3\xed*\xe9L/\x9b\xb5\x9e\xdb\b4wx\xc5\u007f\xd9(\x8b\xde\xe5\xa7{h\xea>;\xcde\xc3w\xb9m\x98l\x1e\x1b\x9e\x05\xc8k\x13\xc0\xcag\x13\xaf\xcfoc\x9eg\xe3X\v\xda\xd0u!\x1b)\xf0\x03\xb8\xa6\xb0\x8d\xec\xba\b\x1b{Ц\xe4\xf0!\x1b\x86\xfb\xb0\xde[Toz\xc4&\x96Y\xcc&F\xfe\xa8\xfe\xaf\xb8\x9eK\xd8ҀU\xd2&#|\f\xc7R8>n\xa3\xd8KK\xf7\xe1\xac26>\\h\x13CzBo-g\xe3\xa2ʓz.\x8f;\xb3l\x82\x16O\xe1\xef\xa7m\xacC>c\xd3\xfaܳ\x98h\x05\x9b8_E[\xbe\x86\xed̬\xe7p}%\x1b\xca\x0f\xcfs\x02\x95mx\xc8\x1es}\xd1&d\xa9\x8a\x8d\x8bv6qƪ\x18\xc6\xcb6\x01\xb1Wl\\7{Uϯٸ\xf3\xfeu\x1b\x13\xaej6B\xe4\x1b6\xacEU\xb7\x15\xac\x9d\xe8ء}Ǭ\x1a\xe9Y\x18\x96\x91\xf5\xa6M\v\x19o\xd9\x14\xb1\u07b6\t\x92״\xc1\xd4߱\x89\xa3\xbfk\x13\x9c\xabe\x03\xedxφ\xfaOm\x9e\xeaذ\f\xf7\xbe\r\xf1\xe5\x03\x1b\xd6\x18\xeb\xda\x10t\xea\xd9P\x9a\xadoC\U0007304d{\b\x1a\xda\x10\xf3\x1aٸ&ژ\x17}h\xc3\x13 Ml\x88\xb4MmX\x03o\x86\xf96\xb7\xf1\tC\xbd\xbf\x85M\x18XK\x1b\xf7,\xb5\x82\x18Z۸\xb0\x9f\x8d\x81\xdal\x8c#v\xfcϡ\xffs\xda\xe8v.v\xe1\xb6\t6xlR\xc3\xf0B\xc8>\x8e\xc4\x0fљY\x86MhO\xc0\x86e\x87\xa0\x8d\x94&d\x83\xb7\x84mR*\x8c\xb0\xa5(%\x11\xb3!)6m\xd8)\x16\xb7\xb1p\x99\xb0\x11\xf1\x926d\x82\x96Mʤ)\x1b\x1c$\a\xd3kcS\x1fnkc\xf9\xb0\x9dM\x9e\x83lo\x13r\xd9\xc1\x06h\xefh\x03\x8c|l\x93\x85\xfeN6!ߝmX\x17\xefbCq\xba+\xe6\xd1\xcd\xc6lφRƧ6\xfa\xe6g6`\xd8\xe7p\x80\xee6A\x84/8\xe4\x1e6\x16\xb3\xbf\xb4\t\x1c\u007fec8\xe8\xa9\xe7^\xb0\xd3\xde\x18\xc7\xd72\xe2.Y\xdf\xd8P\xf4\xfc\xd6ƗĨ\x0e\xfa\xd8X\x84\xec\v\xe9\xf7\xc3\xf0\xfa\xe3\xe6\x016\xd9\x17\xf5=\x875\xd0\x06\xa68Ȇe\xfa\x1f\b\x01\x83m\xc8 \x87ذ\xdbw\xa8\x8d\x8b-\xc30\xd6\xe16\xadO\x8e\xb0!\xa9\xf9цH3\x92\xa7Q\xf4\x89\x9flHLF\xab\xf0ưٱ6Ys\x1aG\x19\x8dW\x8f\x9d`C~:ц$g\x92\r%\x8a\xc9\x19\xf1O\xb1\xb1\x8c2U a\x9aM\xaa\x82\xd3Uy3lL\x8ff\xc2Nf\xd9P\xb9\xfc\x99B\x98mC\xa9a\x8e:\xda\\\x1bx\xfb<[\xfe\xfaF\"\x9c5߆\x92\xf4\x02\x9bd\xde\vU^\xbf\xd8ȶ\x17\xd9\x18\xe1\x16\xdb\xf8$\xca\x12\x1b\xca\f\xbfB\x97\xbf\xc1˗r:ˈ\x8a\xcbm\xc2\xfaV\xa8\xd6~O\xcf\\\x9e\xb4\xb7\xb1\xa0\xb6\xca&\x94j\xb5\x8d\x1cy\x8d\xba\xd7Z\x1b\x8a\xcb\xebl\xba\x9d\x85~\xba\x9e\xae\xbc\x01\x0e\xb2\xd1\x06\xae\xbd\xc9\xc6J\xc2f\x1b\xf3\xdf-6%\xa5[m\x88\xe9\xdbl\xa09\xdbm`\x1e;\xa8̝6\x94\x89w٤ҷ;sǞ\xf4\x90r,3k/\xbe\xfe\xd3\x06\n\xf8\x17\xbb\xdeG\xd0ޟ\x11\xfb\x01\x9bP݃6֞\x0eaD\x87\x01}Gp\xf7Q\x00\xe41\x1b\x97\xac\xff\xb6\xa1\xc0x\x1c\x9es\"\xd3\xdf?6,\xf1\x9f\xb4I\xe9\xfe\x14C\xc6i\x9b>\xf8|\xc6\xc6'\xd9\xce\xda4\xc5:\xa7\xe6zކE\x91\v\xf4\xe2\x8bP\xd1%\x1b\x1e7\xbbl\xc3\xf2\xe4\x15\x1bS\x97\u007f\tGW\xe95\xd7h\u007fס\xa0\x1b\xfc\xee&>ܢ\x02o\xc3\x0f\xeeظ\xe9\xf6?\xe0\xe9]\x1br\xf5{\x18\xe2}\xa0@.\xbbĥ\xdcvq\x97\x0f۹\xbb\xb8\xa8\x9d\x0fJ\xd8E\x8c\xc5\xec\f\x13\x8f\xf2\xcb\xe2v\x99s\t~(iǴ\x1e\xb3\xc3bK\xa1\x91\xc7\xed*\xe1\xd2v\xd8a\x19;\x02vY\xbb@\xf0\x13v\xe6\"\xe5\xec\xd0\xe8\x93vxWy\xbb\xf2\xb4,;<\xfb);\xb6\xe3<\xcd\xd33\x18\xf4\xb3v\xd1r\x05;\xf6/T\xb4s\x9b\xa7=\u007f\v\xb9\xad\x92L\xe8y;m\xba\xb2\x1d\x82\u007f\xc1\xceG\x96^\xc4\xddU\xecJ\x82_\x92K\xabځ\r/\xdba\xa4\xaf\xb0\x9bW\xed\xa2\x81\xd7\xecX]{ݮ\x91\xad\x9a\x1d\xfbW\xec\xc0\xe9\xea\x9cQ\r;\xeb\xaaoڵP\xf4\x16\x87\U000f6741\xb4\xa6\xfe\xff\x1d\x95\xfa\xbbv%\x1b\xb5T9\xef\xd9\v4\xef\"WԶ\x17l\x95\xd3\xce\f\x85\xb3\xeaؕ-\xbf\x9f\x19\xe9\a\xaa\x8c\xbavnq\xacG\x91\u05f7\xd3\xd5\x1a`\xb8\rqldg\xf0jl'u\xfe\xd0.$\xb9IF\x11M\xedt\xe4fv\xe0Ls\xbb\xf0\u05cfpla\x87\x9f\xb5\xb4K>\xdd\n\xb7\xb5\xb6\xb3v\x92\x9d\xb9\xdd\x06\xb5\xda\xd5\xda\x1cv\x80\x8333w\x97]b\xa2[\xad\xc9c',y\xedȫ|v\xee.\xf2\xd3\x1a\r;\xcb=\x01\xbb`b0\xd3A\xc8\x0e/\x0fۅ\xc2DT\x88Q\xbb@S\xcc\xce\xfd\v&U\x15\xa7n\x13\xdaN\xd2N\x90\xb6\xec\xa8\xf0\xa6\xec\x00\xe9\x1c;\xe2_\x1b{\xbe\xdai\xb2\xd2\xd6N\x88j\x97\xd1h{\x1dj\a;\x1d\xb5\xa3\x9d\xc9\xcb\xc7vI\xb5;\xd9%\x06u\xb6K\x85\xa3\x8bZ~W\xdaD7\xbb\xf0\x9aO2\xb6\xfa\xa9=\xb3\x93\xe13;<\xffs;\xaa(\xdd\xed\x88\\_\xd8\xf1\xe4Y\x0f;\x1f\xe7\xf9\xd2NF\xf1\x95]<\xbb'\xef\xe8\x05\x9b\xeem\xd7'\u07be\xe6\xec\xbeQu}kg$\xf9N\a\xd8\xc7\x0e\xd8\xe8k\x97ģ\x1f\x1d\xa8\xbf]+t\x03\xe8\xe8ߣŁv-\x99\x0f\xb2K\xf0\xff\xc1\x8e*\xd3`\xcap\b\xb4<4-f\x99\xfd0\x8cgx\xa6\x99\x11v-`\xfeHk\x1bi'\xb1\x19eg\xa5\xe3'\xbdm\xb4]\xa2\xca\x18;\x8b\xbdc\xf5<\xce.Qh\xbc]\x18\xeb\x04\xb5ɉv\"\xe7$;\xea\x1d\x93i>S ˩vd(\xd3x\x9a\xce\xd3\fLa\xa6]\xf9\xef,B\xcc\xcf<Ͷ\x03x\xe7\xd8YĘ\vC\x9ag\a\t\x9b\x9f\xf1\x9c\x05\xbch\xa1]\xca\x12\xbf\xd8%V,\x12\x81\xe7d-\xb6\xe7o\"\fv\t@\xe1\xd7̬\u007f\x83\x17-\xd59.\xb3#\xc8/\xb7c\x95\xd0.Q\xe3w\x80\xd7JU\xc8*\xbbn\xb7[\x8d\xb6ר\xbe\xd6\xda%\x1f_\xc7\xce\xff\xb0#\xfb[o\x17\xec\xde`\xe7\x82\xe5F;\x03\xfe&;S\xdb\xcdj`[\xe8\x00[y\xcf6(x\xbb]ʎ;\xe0\x05;\x01Ļ\xec\xa8j춣f\xb0G\xb1o\xafN\xe9O;\x82\xeb_v\xe5\xe6\xfb`\xc8\xfb\xa9\xf3\x03\x1c\xd4A;r\x85C:\x9c\xc3v\x92\xb6#z>j\xe7&\x18x\xf4\xdfvl\xba8\xaeC=\x91n!-\x94\u007f8ғl\xf6\x14\xfb<\r\xb5\x9f\xa1Ŝ%\xa2\x9c\xb3\xe3ك\xf3\xfc\U00082f60\x93\xber\xf1\u007f\u007f]\xcah\xf82\x04}\xc5\x0eF\xf1/B\xdbU;\xe8\xe7\xb5\xff]|\xdd.\x14\xf4\x06\x8e7\x19\xefn\xe1\xb6\xdb\xf8\xea\x0e\xcc\xf1?\xfe㮝\xa4잝\xeb\x9b\xf7\xed(\xb8\xe5r\xf0\xeb\xdc\x0e\xb9/\x8f\x03Δׁ\xf5B\a6c\xe5w\xa8^\v8\b\xe0\x05\x1d\xd8\xffW(\xfd\xef4\x91}\xc0\xc1-F\x85\x1d\xe0\x13E\x1c\xc8i\x1ft\x901?\xe4\x10\xfa\xf9\xb0\x03yGQ\a\xca@\x8f8t\xf5\xb8\x98\x83/\x1cu N\x16\xe7\u007fK8Pn,\xe9\x10u?\xe6\xc0\x82G)\a\x11\xedq\a\xe2\\i\x87\x80t\x19\al\xbf,OO8\xc4\xe8\xca9\x98\xcf>\xe9\xc8\u05faK\xfb\xac\xf2\x0e\xb0\xd6,\x9e\x9er\x88S?\xed\xe0f\xe2g\xf4\xfc\xac\x03ѫ\x82\x03\xb5\x91\x8a\x0e\xa2\xcas\x0e\xf1\x92J\x0e)\xe2>\xef \xaeVv \xd7x\x01Sz\xd1\xc1\x8dYU\x1c\b\x9a/9H\x9a\xab:\xb8Q\xe6e\a6\x9b\xbc\xe2\x80\xda_u %{\x8d\r\xbc\xee@jW\xcd\x01ky\xc3!NT\x1d\xe2\xaf\xe1\x00\x1f~\xd3\x01N\xf9\x16g\xf6v\xfa\xcbN\x1d\xb3j:Ԅ\xdfq\xa00\xf1./\xaa\xe5\x90\x05\xb1\xf7\x1cy릲j;H#\xea8Ȇ\xdfw\bf|\xc0~\xea:\x90p\xd4s0\x95\xaf\x0fa4p\xe0\xd5\x00\rU\xb3\x8d\x1c\b\x15\x8d\x1dL$\x1dt\xec&TSS*\xa6YZ\x97\xe9\xd17\xd7>>B;-\x1c\x88\xa1-\x1dX\x9ai\xc5\xe9\xb6Ɯ\xb23\xe6cs\x80\xde\xdb\x1d\f~\x0e^䄞]\x0e\x8d\xf3n\a\xf6/y\x1c\xdc]\xe5u\xc0\xb1|\x0e&\xac~\x1d\x91\xe1\x90L*\xe0\xc0\xceĠ\x83\x919\xe4@~\x19\xc6\xff\"\x0e\x81\xc0(\xfe\x8eeF`\xaa|\xe2\x14l\x82\x82Lf\xfemQY)\xce>\x87\x06\xd1\x06\xeai\xabw\xb6\xe3\x9d\xed\x1d\xb2?\xbf\x03\x8e\x1d\x1d\\>\xfc\x98\xa2\xec\xe4 xuv\x90\xd4tqH\\\xe9\xea\xc0Ja7\aJR\x9f8\x90h}\xea\x00d}\xe6`\x0e\xf3\xb9\x03\xa1\xa0\xbb\x03\xcf\x16:\xb8\xa6\xdf\xc3!e\xd4/)\x95\xaf\x1c|h\xb2\xa7\x83IT/G\x06\bz\xc3&\xbfv\xc8b\xc27\x0eT\x1f\xbfu\x00j\xbe\xc3\u007f\xfa8\x18g\xfb\xd2\x16\xfaQ\xcf\xfd\x1d \b\x03\x1cJZ\xbe\x87-\rt\b\xb7\x1b\x84a\xfc\xa0\x82\x1f\x9c\xb9d\b\xcd}\xa8\x03qu\x18%8\xdc\xc15\xb8\x11\x0e\x90\xf6\x1f)Ǒ\x0eT\xb5G\xfdo\x90?\xa5g\x9f\x16\xc2h\x8ea\x8cC\x16\x88\xc6:P\xb2\x1bG\x99\x8f\x87\xb0'8$\fMt\x80\\NRӜ\xac\x100\xc5\xc1ll*\x14<\r\x97Nw \u007f\x9d\x81\x81\xcft\b\xec\xcer\b\xed\xff\xd9\xc1z\xfbl\ak8s\x1cL\x8a\xe7»\xe7Qc\xf3\xb5\xe5\x05t˅\x0e2\xc9_\b\x85\x8b\x1cif\xbc\xd8\x01\xaa\xb3\xc4!\xe1\xf9WX\xfco\x18\xeaR\a7\xc8,s`\xdb\xf8r\xb9x\x85CB\xd4\xef\x0e\xc1ޕ\x0eI\x9eW94\x81Z\xed\xe0\x03\x12\x0eTz\xd6:\x84\x86\xac\x83\x82\xfeP\xbc\\\xef\x90e\xbb\r8n\xa4\x1c79\xb0r\xb3\xd9A6\xb1E\x91f\xab\x03Lj\x9b\x03${;\x10{\x87C\x8a\xa3;\x1dL\x8ew9\x10\xd7v\xa3\xb1=\x0e\t\xb9{\xb5\x91?\x1d(I\xffE\x1b\xd9G\xa5\xeewpa\xee@\xc6!\x0e:\xc0\xc7\x0e\xc1\x14\x0e;Pl8\xe2P\x12uT\xe0 '\xeb\x98C\xd3I\ak\xcelj\xb5'0\xb7\u007f\xd4\tN\xea\xf9\x14\x10ᴃ\x19\xea\x19J\xf8,\x9a?\x87\xe3y\xf5\x85\v\x0eng\xb8\xe8к\xc5%\a*_\x97\t\x90WhB\xff:\xb8\xe9\xec\xaa\x03\xa9\xf35\x9a\xdfu\xfe\xf3\x86\x03eқ\xfct\x8b.w[\xf5u\x87\xa0\xff\x9f\x03\xa4\xf4.\xed\xe7\x9eB\xe3}\b,\x97\x93Ox\xe6vB\x8ay\x9c\xf4\xb9\xbcNY;\xcd\xe7\x04\xa9\xcd\xef\x14\x06R\xc0\x99VPNVA'%P\xc8\xc9*\xe6\x03N֭\n;9\xa7\"Nn\x1fz\xd0)D\xe2!\xa7\xd2\xfc\x87\x9d\xac\xbe\x17u2.?\xe2\xc4s\x12N\xac\xb9>\xea\x14+/\xce!\x94p\n\t(\xe9\xc4.\x92ǜ\xac\xed\x97r\x12~\x1ew\x16h\n\xa5\x95vR\xfbe\x9c\xc0\x9a\xb2N\xbc\xc6͉\xc7\xd5\xcb9!\xa1'\x9dx2\xb9\xbc\x93\xaa\xcbrR(O9\xa1\x8f\xa7\x9d\xa8\x90<\xe3\x94\xe0\xf1\xac3\xe3\xbd\x15\x9ciۮ\xe8\x84\xdd<\xe7\xc4k\x1e*\xf1\xca\xe7\x9d\xdcgP\x19\x83}\xc1\t\x81\xbf\x88\x0fU\x9c\x82\xee/\xf1\xab\xaa\x18\xca\xcbN\xb1\xd1W\xf0\xf7\xab\x10\xe6kN\xbe\x89[\xe5T\xcd)\x96\xfa\x86S\xea\x82\xd5eh\xe9\x9ej8\xc5\xe7\xde\xd4+\xder\x92~\xbf\xed$\x89\xae\xe9\xd4$\xe6\x1d\xa7\xb0\xbbw\x9d\xc2\x0ek\xc9xߓCm*\xab\x8e\x0e\xf3}'\xeb\xf3\x1f8\xb1߫.\xba\xab\xe7\x94\x12e}'j\x16\rT\xa6\r\x9d(\x864r2Yi\xac\x9a\xfa\xd0\t\xb7h\x8215u\xa2\xa0\xdd\fZk.\xdd}\xe4\x94\xcd\x17-\x9c\xe0\x96-\x9d@\xeeV\xd4`k'\x9c5\xdbIBas\nHٝ4;\x87S\xab\xabNT\x06\\\xfa\xd1\xedd@\xf18\x19\xfb\xbc\xaa_\x9fS(\x9e\x1f\x124h\x13\x01\xa7`R\xd0\t\xdb\x0e9\xb9\xb2\x16VC\x89`\x84Qm5\xe6DiǤf\xe2NP\xec\x84\x13L1\xc9\x06,\x18w\n\xe2ɁͶ\xd1!\xb4U=\xb4K\x8f\xb4\x93\x91\xd5މ\x85\xe6\x0eN\xa6\xd9\x1d\x9d\\:\xfaXͪ\x93\x93\xb5\xfb\xceN\xd2\xfc.N\xa0MW\x18H7Z\xe9'Nli\xff\xd4\tN\xf3\x99\x13H\xfc\xb9S \xb4;,\xe5\v\n\xb0\x87S\xd6\xfb\xbeL_\x9d\xfe\xffWN\xa0rO'\xe2]/'\x99\u007fo'*\xe6_S/ߠ\x97oU\x86\xdf9\xb9٭\x8f\x13<\xb2/DҏJ\xe9\xefdAa\x00L\xf6{\xa7\x06\xbc\x81\xecd\x90S\xb3\xa8\x1fԊ\x06;\xa5\xe03D\xe7<\xd4ɠ1\x8cm\r\xe7hG\xf0\xde\x1f\x9d\f0#\x9d\xcc\xe1G9Q\x82\xfe\ts\x19\xedD(\x1e\xe3D\xb4\x1b\xeb$\xcf\x18\xc7\x01\x8ew\x02\xfa'\xc0e&:\xb905\x89\x8dO\x86\xe6\xa78A,\xa6\xc2\x18\xa69\x85\xeeL\xa7;\xcdp櫓\x16\xd2L\bq\x16%\xfa\xb3\x13@7\xdb\t\n7\x87\x8a\x98\xeb\x94\\n\x1e\xa6=_\x87\xba@\xe7\xb5\xd0\xc97\b\xfc\xe2\x14\x1a\xb2\xc8\t\xb8\\\xecD%a\tg\xf7\xab\x13\xb4\xeb7\xf4\xbd\xd4)\fd\x99\x131`\xb9\x13\x84q\x05\x15\xf2;u\xbb҉\xea\xdd*\x95\xc5j\xedp\x8d\x13\xf8\xbc\xd6ɤq\x9d\x93\xc8\xfe\x87\x8ec\xbdS\xa2\xc3\x06\xa7\xf0\xfe\x8dN\t\x1f9Y\x9b\xd4\n7;\xc1+\xb78\xb9'f\xab\x93\x95\x8dmNd\x15\u06dd(c\xed\x00&\xec\xc4Tw\x11\xc4v;%\x18\xedqr\xb3\xc7^\x98ٟN\xa6\x8b\xaa\xce}N\xc4\xd8\xfd\xb8\xf2\x80S\v\x12\a\x9d\\:<\xa4\x83=\f7>\x02\x179\n\xd4S5|\xae\x03\xea\xaev\xf1\x05\x05\xdc\xc3E\xb0\xfe҅}8tמ.\xbev\xac\x97K\x1fy\xec\r\v\xfd\xdaŲ\xcf7.\tcߺ\xa4\x96\xfd\x9d\x8b\x8c\xb7\x8f\v\xb4\xa7\xaf\vQ\xb6\x9f\vQ\xa2\xbf\x8b\xfcw\x00\xfc\xe4{\x17i\xc4@\x17Wf\x06A\xfb?p\x1c\x83]\f\xf4C\xf4\x96\xa1.\xae9\fs\xf1}2\xc3]\xcc\xcaF\xb8H\xb3~d\u007f#\xd1\xf2(\xea\xe8'\xba\xf6h\x9eƸt\xc1i\xac\xda\xfc8\x97P\xe1\xf1.\xc2\xf4\x04^5\xd1\x05\xc6?I\x1d}2ڛ\xa2\xde:\x95\xd7LS\x8b\x9e\xeeb\x05}\x86Ki\xf8L\x17\xeaV\xb3\xf4\xfb\x9f՜f\xbb\xb0\x9d`\x8e\v\x85\x8d\xb9\x1c\xdc<\xda\xc5|\x9a\xf7\x02\xbdt\xa1\v\x01\xee\x17\x1d\xe2\"\x17+I\x8bU+K\\\xca ~\x85\xac~s\xe1\x11\xb9\xa5.\xa9\a\xa7\x13H\x17\u07be\xb5\xdc%\x11n\x85\v4\xf4w\x176֬\x84\xb9\xaeRW^\x8dOk\\\xa0hk\xd1\xd4:6\xf5\x87\x8b\xb5\xaf\xf5.Ԓ7\xb8\x18a7\xba\x98{m\x82\xd9mvq\xe3\xd6\x16\x17_\xb2\xb3U\x85\xb5\x8d\x10\xbc݅X\xbdÅ\x90\xb4\x13\xa6\xb2\x8b\x92ۭw\xee\xe1%{\xf5\xe3\x9f\f\x03\u007f\xe1\xd2}\x94\xcf~\x9d\xd4\x01\xbd\xe6 o9\xe4\x92\xe8r\u0605H\u007f\xc4%\xbc\xf2\xa8\vk\xf9\xc7x\xc1\xdf.\x89p\xc7]\x12\xb8N\xb8\x18\x84\xfea\xef'iZ\xa7ԚO\xab\x90\xcf0,\x9cu\x81D\x9d\xd3~\xcf3\xf4\\\xd0&.\xba\x90;^ҩ^\x86]\\\xc1\xf1_\x0e\xf8*\xfb\xbf\x961\xb3\xeb\xfc\xfa\x86\x8b\xb5\x87\x9b\x04\x9f[.,\xd7\xdc\x06\xa4\xdcq\xa12\xf5\x9f\v\xd5\xe7\xbb.I<\xee\xf1\x82\xfb\xea[\xb9ܒS\xe4v\xb3\x917\x8aW\xf9\xddb\xc8\x05ܚq\x17\xcc\xfcQ(s\xf5\x03n̰\xb0\x1b\xd5\xda\"n\xf4\xfa\xa0\x1b\x18\xf3\x90\x1b\xfd=\xec\xc6\x18\x8a\xbai\x87\x8f\xb8\xc5B\x8a\xb9\x99m>\xea\x96G\x16\x8a\xe3X\x02ǒn\xd9Y\xfa\x98\x9bfQ\x8aM=\ue9b5\x96vkz_&\xf3GY\xb7h\xed\t\xdcTέ\xcc\xe5I7E[\xdeMw\xca\xd2\xf3Sn\xfe\xa4\x93\x9b\x85\xaag\xf4\xfc\xac\x1b\x9eYA直\xe7\xe7܀\x96Jnf\xbe\xcf\xebՕ\xf5\xfc\x82\x9e_D\xdfUx\xf1KnT\u0aba\xc1-_v+M\u007f\xc5\r\x1e\xfc\xaa\x1b[F^s\v\xb6\xbf\xce\x0f\xd5\xdcHV\xdf\xe0\xa7\xea<\xd5pì\xdetÏ\xder\x83ؾ\xed\xc6\x0f\x97\xd4t\vL\xbf\xe3FX\u007f\x97\xf2\xaf\xe5f`~\xcf-f[\xdb-<\xb2NZfx\x1f\xb8[\xb8\xcd\ana!u\xf1\xffznD\xb7\xfan\xe6y\rܒ\xcb6t\v\xdfo\xc4\u007f5v\x8b\x91\u007f\xe8f\x99\xb3\tGӔ\xa7fn\x16\x0e\x9aC\x91\x1f\xb9a\xdb-TA-\xd1Y+\f\xb1\xb5\x9bl.\x1b\xdf\xd9({\xbb\x1b\x9c\xd5\xe1N\xa7\xa2N72_\x976\xe8\xc6\b\x00#9\xa8\xcd\x1c\xe2Շ)\xbf#n>\xe3qԍծc\xb8\xe1o\xda\xdeq7i\xf8\t\xb7\u058b\xffq\x93\xe8\x9d\xd4\u007f\x9c\x929\x9d\x96\xc3\x19\x18\xf7Y\xb7,z\x9ds\xcb\xee\x9e\xf3n\xae\xd3^p\x83\xc8\\\u0530sIϗ\xddH\x87\xaf\xa0\xbf\u007f9\x96\xabjx\xd7\xdc$j\xd7is7ԁn\xba\x95\x1b\xdd\x028\xdcvs'\xc9\x1d7\xc2\xe9\u007fn\xac^\xdc\xe5<\xee\x11H\xefcX\xb9_\xf6\xf0w\f=\xb2*\xf9\xaaG\xf9\xe4k\x1e\x91\xf9\xeb췚\x87\xd8\xf0\x86\x87j\xaf\xeeA\xad\xa9\x86\a\x9b\b\xde\xf4H\x00x\xcb#v\xfd\xb6\av[\xd3\x03\xc3~\xc7\x03\x9e\xfb.\x87]\xcb#\xb5S\x0f(Wm*\xb1\x8e\a\x0f\xdcs&\x1fx\xc0\x16\xebz\x10K\xeby\xc4\xdc\xeb\xe3\xd8\xc0C\x92\xd5\xd0â_#\x8f.g7\xe6-\x1fz\x88\x8aM<\x82\xacM1\xf4f\x1e\xe6\a\xcd=@\xbe\x8f(\x89\x16\xec\xaa%O\xad8\xbd\xd6zi\xb6\apj\xf3\x00\xd5\xed\x1eRl\x87\xa7\xb0\xec\xc4m\x1f3SF\x96\xd3\x03N\xe7B\x17n\xcf\x03\x8dÝ\xe4?\xe9\xf8\xe7AP\xf4zĨ}\x1eP(\xbf\a\xbf\x06\xe5\xe1Jb\xc0\xc3W/\x06=LdB\x1e\xfaG\x98\x8a\x8bx\xa4:\x10\xf5 Ŏa\"\xa6\xaa6\xee\xa1\x13&<\x92\xdd%9hK\x15\x9d\xf2\xb0|\x9a\xe3\xc1KSڨ(\xdazX%h\xe7A\x92מ\xff\xed\x00qv\xa4\xc6?\xf6\xa0\xc4\xd5I{\xe9\xacR\xe8\xe2Q\xb6\xd8\xd5\xc3\xe8\xdb\xcd\xc3\xca\xd4'\x1e&\x9f\x9fz\x80x\x9fy\x10\x91>\xf70\xdfꎙ\u007fA1\xf4\xf0hU\xebK\xb5\xb8\xaf\xf4\xdc\xd3#Ѩ\x97\a\xcfI\xf5\xf6\b\xbc\u007f\xedњ\xca7\x1e<\x05\xf2-O\xdfy\x00\x1b}x\xea\vQ\xf6\x83\xd8\xfb{$\xa3\x1d\xe0a\xe0\xfeޣ\x8b\xbc\x03=$\x15\x83\xf0\xef\x1f\xa8\xa8\xc1\x1eb\xdc\x10*|(Ac\x98\x8ef8a`\x84N\xf4G=\x8f\U0010090d\xf2\xb0&\xf5\x13]v\xb4\ady\x8c\xb68փLx\x1cm{\xbc\xaah\x02?N\xa4\xb5M\xd2~&\xc37\xa6x\x10c\xa6z\x80\x99\xd3<\x82\xb2\xd3q\x9c\x81\xff\xcf\x14\xff\x98\xa5@\xf6345\xdb\x03R4\xc7#!h.d0\xcf#\xb5\xc0\xf9\x90\xe3\x02\x8aj!\xf5\xf9\x8bG8\xd0\"5\xdb\xc5\x14\xdc\x12\x8f\xc6F\x8f<.\xf1\x1b\x04\xb8ԃ躌\xfe\xbf\x9cw\xaf\xa0\x19\xfe\xee\x11(_I\x17X\xa52^\xad\xe75jkk=,\x19\xacÈ\xfe\x00|\xaeW\xebؠ\xff\xdb\xe8A\xb8\xddD\xc1o\xa6\xd1n\xe1ܷz\x18\x13\xb7y\xf80\xd8v\x0f_\x8f\xb7\xc3\xc3ȴS\xfb٥\xe7\xdd\x1c\xe2\x1e\xb6\xb5\x97\xa7?y\xfa\x8bM\xee\xe3\xa7\xfd\x1e\xdd\xfew\x80\xea9\x98\xf9|\xc8\xc3\xf2\xc0\xe1\f\xc0\x1d\xf1\xb0\xd8pԃ0~L\x87\U000b778f{\xb0\xfaw\xc2\xc3\xcc\xfd\x1f\x0fH\xd2IU\xf3)L\xf9\xb4\xfe\xf3Lz\xaa\xe1D\xd6Y8\xed9O\xbe\xe6\x9dҁ\x93\xa7\v\x1e>\xe9r\x91\x88y\x89\xa7\xcbP\xee\x15h\xfd_\x8f$~W=\xc2Ȯ\x11=\xaf{\xb8\xa0|#c\xda7q\xe5-\x9a\xe5m\x0e\xf8\x8e\x87\xebl\xffy\xf27\x8f\x19\xed\xb3\xee\xf2\xeb{\xbc\xe8\xbeG(J.\xaf(=\xb7Wr\x88<^@r^\xaf\x84\xf5|^:m~\xaf\x16\xdc\nxQ\x1e-\xe8\x05Z\x14\xe2\xb5\x0fxAD\v{e\x01\xbf\x88\x17c{\xd0+*\u007f\xc8+$\xe5a/\xd6H\x8az\xa1\xdbG\xbc\xea\xf3żܽ\xf8\xa8\x17\xa4\xae\xb8W\xea\x8a%\xbc\xe0{%\xd1\xd6c^\xbcN\xa4\x94W\x06\xf9\xb8\x97\xa5\xd4\xd2젌\x97\x8a*\xeb\x157~\x82_\x96\xf3\x8a\xd1?镤\xb1\xbc\x175U\x1c\x9f\xf22\ayڋ\xc7'\x9e\xf1R&\xcfz\xa5\xdaU!3\xb9\x8a\x1c\xc8s^\x8d\xa6\x95\xbc\\\xff{\xdeKmV\xf6\xb2\xa8\xf1\x02\xa7\xfd\xa2\x17\\\xa7\nf\xfa\x92\x97\x9b,\xab\xb2\x8d\x97\xbd0\xabW\xbc\xacҾ\xaa\xfd\xbf\x96\x99\xfb\xeb^<\xbf\\͋\xe2\xd3\x1b\xbc\xa9:\x05Tëy\ue6fc\xe8-\xaf0\x8d\xb7\xbd\x12wkzA\x03\xde\U0004257e\xeb\x95rk-/6辗\x19vm\xaf\x14|\xebx\x85\x12\xbe\xcf&?\xf0JE\xb7.\xe4X\x0f\x12\xa9\xaf\xe3m\xa0#k\xe8-\xd8\xca\xe8\xda1\x1d\xba\x1ayi\xad\x8d\xbdXZ\xf9Ы\x8e\xd0\xc4\v\xa0h\x8av\x9byA֛{\xf9b\U000cff28y\xb4\xf0jB\xdc\xd2\xcb\x04\xab\x95\x17\xe9`k\xaf\xb0\xd8l/W2m\x9c\x83\x1d\x13r\xe0_N\x1d\x8d+#\x1f\xb7W\xb7\x95{\xbc\x84\v/\xc6\ue8da\xfd0+\x83\xb6\x18\xf0f\x1e\xcc\f\u0080C鱤\xa7\x1c\xf6\xf2\xe7\x131ܨj0\xa6\xad\x99\xb4ظ\x97uڄv\x9fTuY^\x16W\xbd\xc8\xder\xbc@\xbc6^\"n[/\x88B;/\xe8G{\x95_\a/\xb7\x15t\xf42\xae~\xece\x89\xab\x93\x9e;{Y'\xef\xc2ۺz\x81\xffݼ$,\x9fxA\x89?\xe5\xe93/^\xf6\xed\x05Ru\xf7\n\x89\xfb\xc2KF\xd3\x03B\xfbҫ\x1b\x13\xbe\xf2f\x16\xc8{\xc2\xe6{yY\x85\xeb\rI|\xedEl\xfb\xc6\v\xfa\xf5\xed\xff\xe4\xf4\x1d\x8d\xb3\x8fW\xd8h_/\xde\xcbя\x93\xec\x0f\xdb\x19\xe0\x15\xba\xf5\xbdWpj \xe58\xc8+\x9b\xdc\u007f\xf0\x12\xb4\a\xc3φx\xb1\xa9k\xa8\x97\xe8;\f\xed\r\xf7\xeav\x1c/\t\xfb\x8f^Y\x99\x18\t\xf5\x8d\xf22)\xf9\xc9\xcbղ\xd1^\x14\x03\xc6x\x15\xbf\xc6\xc24\xc7Q\xc9\xe3\xbd\xcc\xda&\xf0\xe3D/\xf2\xb1I0\xf9\xc9^\xc0\xec\x14/\x8bNS\xbd\xc2)\xa6qZ\xd31\xd2\x19\xda\xc5L\x15\xdc,\x8a\xf6g\xc0\xdal\x85\xb59\xde\xcc/Iy\xc1\xe9\xe7y\x91\xb1·\xfc\x17x\xf1\xac\x87\x17\xb5\x84_\xbc\xe46\x8b\xbc\xa4K\x8b\xbd\xc8N\x97xɉ~\xe5U\xbf\xa9\xf8\x97z%|.\xc3q\xb9\xcac\x85\x17ώ\xff\xee\x95U\xb7\x95\x99\x19\xaf\xa2\x04V{Q@Z\xe3\x95Dr-\x9di\x9d\x17\x14\xef\x0f\x82\xc0zE\xbf\r^f7\x1b\xd9\xdc&/\vi\x9b\xbd\xd8N\xb0E\a\xb0\x95\xedm\xe3i;\xed`\x87W\xb8\xc0N/v\xce\xec\xf2\x82\x80\xed\xf6\"\xb6\xef\xf1\x92\xd1\xec%\x10\xfd\t\xfd\xff\x05m\xec\xa3\x13\xecW\xcf9\x00Q\x1f\xf4J0:\xe4\xc5j\xc7a\x9d\xe1\x91\fn\x1d\x85\xe1\x1c\xe3\xd4\xfe\xce\xd8\xea\xf1t\xc79\xc1\xac\x13^\xeeA\xfe\a&zҫ\xa4\xee\x94\x17\f\xe6\xb4\x17L\xeb\fOguX\xe70\x9e\xf3\xb4\xc4\vj\x83\x17\xd5\x1f/\xa9\x86/\xabj\xaex\x91d\xea\xb7W9\xc1k^D\xbd\xeb\xf4\xa9\x1b\xfaϛ0\xe3[^\xa9\x18\xdcVIޡ\xf4\xff\xf3b\xbd\xec.?\xddSL\xbc\xaf^\x9eˇ\x1d\x87\xb9}\xdc}\x9a\xc7'\x92\xca\xeb\xc3O\x0e\xfb\xf8Xu~\x1f \xa6\x80O\x18@A\x1f\xfa-\x84\xeb\x1e\xf0q\x0fba\x9fH\xa0\b\xbe{\x10LJ|R\x10x؇\x97\x04\x14\xf5!\xca<\x82\xef\x8a\xf1ã<\x15\xf7q8%|\xac\xe0\x95\xf4a\x92\x8f\xf9\x04\x16K\xf9\x10-}\xcc\x1aJ\xfbD\x17e|\xa8B\x96\xf5\xa1\xf0\xf1\x84O\x99{9\x9f\xb0\x89'}̸\xcb\xfbD\x1aY>\x85\xe0\xa7|\xe0\xa6O\xfb\xc0\xfe\x9fA\xab\xcf\xe2\x92\n>\xc1Ԋ>\xca\xff9\xf4Z\xc9G>\xf4\xbcO\x96\xb4*\xfbH\x9a^\xf01b\xbe\x88\xe9U\xc1}/\xf9H\xea\xaa\xfa\x10\xfb^\xf6\xb1T\xfc\x8a\x0f\x9b0^\xf5qU\xe55m\xe1u\x1f\xc0\xabZfTod\xc6^ݧ\x96S\xc3\xc7g\a\xde\xf4\xf17\x863\u07ff\r\xf1\xd6\xc4\xf1\x1d\x1f\xea\xdd\xef\xf2\x92Z>}\xe4ÇrU\xed\xf4?ӆZ\xc7'\xbb\xe5\xde\xc7\xf5\x1f\xf8\xb0\xa8Q7\xadK#jf\xd5\xf3\xe1\xf5\xe4\xf5}\x84\x9b\x06l\xa6\xa1\x0f\x9e\xd4(\xd3ac\x15\xf9\x87\x98f\x13\xfe\xb7)gٌ\xc2l\xeeCQ\x15\xc7\x16>\xc0UK\x1fӼV>\xb1\xf1\xd68f\xfb\xf8ت\xcd\a\xeb\xb3\xfb\x80\x80\x0e~r\xf2\xe4\x82H\xdd8zp\xf4\xe2\xe8\xf3a稟'\xc3\xc7@\x1c\xf01\xfc\x04}\xd8t\x19\xf2\x11\x88ô\xcb\bOQ\x9f\x00V\x8cFb\xfa\xb0\f\x14\xf71h'\xd4Ԓ>,\x15Y*\xf4\x94\x8fN\x97\xe3\xe3F\x866\x19=\xb5\xf5\xd1K۱\xb5\xf6\x87Uv\xd7+\xbf\xf0)\x03\xea\xe1\x93\xc7F\xbe\u052f\xbfRS\xea\xe9\x03\xb8\xf5\xf2\t_\xeb\xed\x03 |\xed\xc3k\xc0\xbe\xf1\xe9\x1b\xdf|\\]\xfd\x0ej\xe8\xe3\x03\xb1\xea듽.\xfd|\x1a+\xfaS\x1b\x03|\xf8\xbdEm{\xa0O`q\x90\x8f\xab\xb1?\xf8\xf8\xb3\xf9>D\x95!\xfa\xedP\x9f\xbcyc\x98\x0f\xaf#\x1b\x8eQ\x8c\xe0\x85?\x029F\xfa\x14?G\xb1\x87\x9f\xf4\xbe\xd1>2\xdd1ln,\xb44\xce\a\xbc\x1c\xefC؞\xa0\x16=\x91\xe2\x99\xe4\x03;\x9b\xac\xf04ŧ\x14n*\xc45\x8dS\x9f\xee\x035\x9c\xa1ҟ\xe9\x03#\x99\xc5o\u007f\xc6\xf0fg\x04:G\xd5;\x97\xed\xcf\xc3L\xe6g\xfe\xbb \xf3\xc7B\xfa\xc9/\xf8\xf7\"\x9f\x96\xd2\x16S\x81K|L\x88\u007fe\x0f\xbf\xe9ǥ4\xe7e>Th\x96\xfb\x98A\xae\xf0i\x80\xfc݇Ű\x95>)\x01\xac\xf2!\xe0\xac\xf6!ڮ\x81E\xac\x85\xb1\xac\xf3\xc9k\xcb\xfe\xf0\xa1 \xbf\xde\a\xa6\xba\xc1\xc7(\xbfч\x02\xeb&\x18\xdbf^\xb2\x85\xa7\xad>F\xb5m>\xec\x97۞\xd6b8k\a\x8e;} j\xbb\xa0\x9a\xdd\xc4\xdd=>,\xc5\xed\xa5~\xfeT\xfb\xfa\xcb\xc7\x15\xa4}\x90\xd9~\x1fX\xe9\x01\xb5\xff\x83>\xae\xc2\x1c\xf2\xa1Px\x98\xa7#\x19S?\x9a\x11\xd21\xe0\xf4\xdf\x18\xe3q\xfc}\x02\xcd\xfd\xe3\x93\xc4\xff\xa4\x0f\xec\xe5\x14\xc1\xe4\xb4\x1aƙL+g}\x8c\xa9\xe7`\x1a\xe7U\xed\x178̋\x98\xc1%\x1fꐗ}\\ȹ\xe2Þ\x84\u007f}X\x15\xb9\xea#i\xbd\xe6cx\xbb\xee\xc3&\xc0\x1b>}T\xe2\xa6\x0f{\xa7o\xe9\x84o+\xf2ߡ:\xfe\xf3\x91\x1b\xddE \xb8\xc7\xd0x\x9f\xe1/\x97\x9f\x0e\x95ۏ\xfe\xf2\xf8ɗ\xf2\xfae\x86\xf9\xfc\xf2DW~\xbf\x9a}\x01\u007f\x86\xa0\x16\xf4K\xd0,\xe4G\xb4\xf4\xc3\x00\n\xfb\x19_\x8a\xf8!\xc0\a\xfdH\x13\x1f\xf2\x83\a>\x9c>ɏa\xf8\xe9ŏ\xf8\x81\xde\xc5\xfcXZy\xd4/\x11\xa9\xb8\x1f\xe9\u007f\t\xbf\x9ajI?\x12L\xbf\xd0\xc1R~\xa4\x99\x8f\xfb\xa5\xdaY\xda/\xb3(\x83\x11\x94\xf5\xcbN\xed'\xfc\xfa|\xa4\x1f\xbf\xca\xefg\x8ePޏh\xe9\a\xa6<\x85\xa1>\xed\x17\x10x\xc6\xcf\xdf\xe3\xf7\x8b\xafU\xf0\x8bB+\xfa\x89\x96\xcf\xf9\x89\u0095\xfc\\\xb2y\xde/\x95\x98\xca~>\xcc\xf1\x02\xeex\xd1/j\xaf\xe2\x17\xdb~\x89MU\xf5c\u007f\xf7\xcb~\x86\xc6W\xfcT\xff\xab~\xa6\x16\xaf\xf9ս_\xf7\v$U\U000c3c3dᗼ\xa1:Z\xab\x81\xe3\x9b~\x18\xf9[\xfeB\x8ds\xda\x19\xe1v\x1d\xb3\xde\xf6\xb3\x94Wӏ:\xe4;~\xa0ѻ\xfe\xbc\x8dͬZ\x98\xd2{~8|m?ܥ\x8e\x1f\xc8\xf1\xbe\x1f\xde\xf0\x01Z\xad\xebG\xa9\xac\x9e\x9f{\xa6\xeb\xfbui\xa6\x81_\x12\xbb\x86~\xd8`#?\x1f\xedPI~\xe8'\xb5o\x92\x19yS?J\x85\xcd\xfc\xa8\xea7\xf7\xb3*\xff\x91\x1f\x11\xb2\x856\xdd\x12\xfd\xb5\xf23\b\xb7\xf6\x03\x04\xb2\xfdyZf\xd9\xfcؘm\xf7\xa3j\xe2P3p\xfa\x19(yrs&\x1e?\xa0ы\xd9\xf9\xfcj\xe0~U\x81\xe1\a\xef\f\xf0\x96\xa0_\xea\xa8!H5\xcc\xdb#~ť(\xac*\xe6G\xf80\xfd\xf2\x00L\xdc/շ\x84\x9f\xa15\xe9\xa7\xe3[~r\xb5\x94\x9f\xb4'\a\xb3h\xe3G!\xa2\xad\x1f\x15\xb6vj\x1f\xed\xfdxʭ\x83_\xf0\xb3#\a\xf1\xb1?OݬNi\x89t\xe9\xd81\xab\xb36\xdeŏ\x80\xdd\xd5\x0f_\xeb旜\xe2\x13Z\xf8\xa7~l_\xfa\xccOP\xfa\xdc\xcf\x00\xdd]\xcf_\xa8\xe9\xf5\x80y|\xe9ǂ\xc5W~\xa6\xc7=9\x9c^~\x81\x91\xde8~\xed\xe7\v\xe20\xeao\xfd\xd8\x11\xf8\x1d\xa5\xd4\xc7/\xf5\xfc\xbe~,A\xf4\xa3\xea\xfa\xd3T\a\xe0_\xdfû\x06Bԃ\xfc\x84\x98\x1f8\xab\xc1ho\x88\x1f\xf9\xd6P?\xaa\x04\xc3p\xe1p\xd5\xf6\b\x85\x8a\x1fUn#\xfd\x1a\u007fG\xb1\x85\x9f\x00!\xa3q\x1cC?\x19\xeb\x17\xe6?ί\x8fK\x8e\xf73\xb9\x9e\xa0\xfe2\x11\xedO\xe2\x1c'\xe3\xda)~\xbc\xc9e*E7MD=ݏ\x95\xa1\x19\xeal3uܳ\xd0\xd1\xcfD\x9f\xd9\xda\xe2\x1c?R\x9c\xb9\x9c\xc6~\xd5ϝ\xfe\u05c8N\xd73hu\xc3ύ\xdc7\xfd\xba\xab\xed\x96_^\x89x[\xb5x\a\xee\xf8\x9f\x9fQ\xf8.'~Ogr\x1f\xa2\xcae\xd0\xe1r\x1bTU\x1e\x03c\xcdk\xd0\xe8\xf2\x19\x10H~C\x1e\xbe.`\xd0\x02\v\xf2\xcbB\x86\xe8\xe4\x01\x1c\v\x1b\xc8 \xf5\xae\a\r\xda\xfbC\x06\x8c\xf4a\xfc\xb3\xa8!F\xff\x88\xc1\xbdz\xc5\f\xca\xefQ\x03\xc0Q\xdc`\xeeQ\xc2@\xfeX\xd2HK\xfe1\x83\f\xa1\x94\x81\x97\xd6>n\b\xa8\x95Ʊ\f:-k\xc8\x02\xd4\x13\x06\xc4Z\xce\x00\x10=i\xe0\t\x8f\xf2\x068S\x96\x019>ep\xcaO\x1bx\xee\xfc\x19\x83\v\x9c\xcf\x1a`\x06\x15\f\x04\x9b\x8a\x06\xca\xff\xcf\xf1Tɀ\xf3=o\x103+\xb3\xa1\x17\fٗ\xf6\"\x8eU\f\xbc*\xd5\x00Y\xadj\xe8o\x12\x1b\xaa\x99W\f\xb1\xdeW\r\t\xe4\xaf\x19b\x1b\xaf\x1b\x19RQ\xcd\x10'y\xc3@$\xaaN\x01\xd40\x94\x0e\xbc\xa9\x82y\xcb\xc0\x8a\xd3\xdb\x066[\xd64\x98\x19\xbfcH\x8d\xf9]\xdeSˠüǖj\x1b\xd0o\x1dm\xe0}\x83\xc1\xe7\x03Cܽ\xae\x81\xfd\xe6\xf5\f\xe4\xd0\xf5)\xe6\x06\x86T\xc4\x1a\x1a\x12V\x1a\xa9r\x1b\x1b\xe0G\x1ff&҄3o\xaa\x03hfpGzs\n\xed#\x03\xe9l\v\x830\xd4\xd2 ;oeH\r\xb0\xb5\x81b\xab\x01\xaf\xb7\x19\b[v\x03\xd6\xef\xe0\xc9ɓ\xcb\xe0[Si.\x1eCX\xaf\xd7\xd0\xfc\xcdg\xe8\x0f\xf5\x1bR42\x8c\xcc\xd6ۀ\x01\xac\x0e\x1at\xa0\x10\x15\x166𪸈\x81zS\xd4\xe0\xab\xe4(/\xd3\xd0\xe7\x1e\ra{\tUY\xd2\x00\xdcX\x14Iʐ|+\xc7\xd0]_mh\xeam\r\xa6\xc1\xed\xd8g{\x95U\aξ\xa3J\xfcc\x83\xb0\xd7\xc9 \r\xedl\b1\xebb\x80xt5P\xe6\xeaf\xb0\xe0\xff\t\xac\xe7S\x1c?\x835\u007fn\xb0~\xdb\xdd`\xa9\xe9\v\x95i\x0f\x03!\xe5KC\xf9\xf9Wl\xaf\xa7\x8a\xa5\x97\xa1X\xd3\x1bm}mHz\xf2\x8d\xc10\xfe-\xbd\xf9;\x03\xd9P\x1f\x83h\xd1\xd7`\xc2\xd3\xcf\xe0\xe3\xfa\xfd\xa9\x9a\x01*\x9e\xefu \x03\xe9\t\x83(\xc3\x1f\x14(\x06g\xfa\x1bB\x81\r\xe5i\x98!p:\x1c\xc7\x11\x06\xa0\xedG\x03\xc0<\xd2\xe0\xcbu\f0\xbb\x9fx\x1a\r\x17\x1ac\xa0\x161\xd6\x10\x98\x1ag\x90N\x8d7\x90\xb6L\xa0sN4@\xea&\xf149#\x84)\x06b\xfdT\xccy\x9a\xa1\x9bYi?3\ff\xc23U\x90\xb3\f\x04L\x9a\xdalv9ǐ\xbc|\xae\xde8\x8f#\x9do\xe8\"\xfd\x02C(\xc9B\x00\xd6/\x06H\xec\"\xbdt\xb1\x01\x80^\xc2)\xfe\xca\x1b\u007f\xd3\x1e\x97\xaaI-\xe3薫\x9cW\x18xz\xfbwEŕ\x06\xf76\xac2P\f]\xcd\xd3\x1a(n-\xbd~\x9d\x01\xfa\xf5\a\x1d{\xbd\xc1\fn\x03<`\xa3\x81\x15\x97M\x18\xddf\x03\xe1q\x8b!o`\xddj`G\xca6\x83\x99\xcev\x03\xe1~\x87\xc17\xcd\x01,w\xf1\xfa\xdd\x04\xcb=\x06\xb6\x9d\xee5\xb0w\xe5O\x9a\xc1_\xb0\xc6}T\xeb~\x03Y\xc5\x01\x83\xcb\x13\a\xd1\xc8!\xfdt\x98\xba<\x02%\x1c\x85\xcb\x1fcg\u007f\xb3\xeb\xe3\x1aTN\xd0d\xff!6\x9f\xe4\xe9\x14\xc7pZa\xea\f\x90\xed,\xaf\x10\x10\xfe\x11\f\xa0\n\x11\x82م\xd9t$\xc0\x10\x16\r\xf0Us\x01\xa4\xd5f\x00\xa5\xe2x\x00\xee\x9b\b\x803$\x03\xf4P+\x80\xdaK*\x80bFN\x00\xb5\xb46\x01<\xd7\xd4\x16Jk\xa7\x8d\xb6\xe7%\x1dhV\x1d1؏1\xd3N\x01\x81\xb0θ\xbaK@P\xb6+\a\xd0- \x19\xee'\xa2\xceO\x03\xc8\x16>\vpO\xc1\xe7\x19'\xe8\x0eS\xfc\x82\xa2\xef\x11P`\xf8R\xb5\xf9U\x80e\x99\x9e\x01q\xe0^\x01T\x97{Ci_\xd3\xed\xbe\xa1\x8b~\v5|\x17\x00\xea\xf6\tpY\xa0o@\xe9W\xbf\x00\xe8N\xff\x00R\x92\x01\x01ɭ\xbf\x87,\a\xd2C\a\xc9\x1di\xd0\xfc!\x80u\xae\xc1\x01\xc8\xd3!\b\xe60Du\x04\xb7\x1d\xa5\xeb\x1c\v\xe8\xafh(\xdc\x1d\xa7\xf6N\x044]\f \x16\x9d\f\xf0\x89\x90S\x01\tz\xa7a\x06gt\xb0g\x03\xa8\xe4\x9c\v 6\x9f'\xb6] \x94^̘\xe9\xa5\x00\xca\x05\x97\x03LO\xae\xe8\xf9\xdf\x00s\xe2\xab\x01l$I\xc7\xc0\x00\xea\xc4\xd7\x03x\x84\xe6F\x00\x1b\xfboR\x9f\xb7\x02`\x17\xb7\x03¾\xee\x04\xb8\xd8\x18\xc0\x13{w\x03x\xec\xc2̺\xc7\xee\xefC\xac\xb9\x822\xda\xdcAܝ'\x88\xf1\xe5\r\xc2\x02\xf3\x051\xfb\xfcAp\xbd\x02<\x15\xe4\xff\n\x05\x91\xa0=\x10\x94U\xec\xc2A.J\x16\t\xd2\x12\x1f\f\xe2w\x12\x83dJ\x0f\a\x05ъ\x06\x19\xb1\x1e\tʦ\x98bA\x96\xe8\x1e\rb\u007fS\xf1 L\xb7DP\xe2G\xc9 \xc2\xd8cAY\x17)\x15\x84\u007f?\x1e,Ԥc\xfb\x98\x99F\xd3\xd2A\xd1L\x19\x0e\xa3l\x90[\xb5\x9e\b\x8a\x99\x96\vҍ\x9f\f\xca\xee\xda\xf2A\x88\"+\br\xf7T\x90\xc9\xe8\xd3:\xaag\x82*\xf5g\x83\x82@\x15\x82\x10U\xc5 J\x90\xcfaȕ\x82B\x8c\x9e\x0f\u009a*\aAp^\bb\a㋐Z\x95 7!\xbc\x14\x94\xac\xbb\xaa\xce\xfe\xe5\xa0b\xdb+A\x84\xa6Wyz-\xc8\u05cd\xbc\x1e\xc4RD\xb5 m\xea\rL\xa7z\x90\xce^#H\v{3(\x9e\xfaV\x90\v\xc9o\a\x19\xaejr\f\xef\x04\x81c\xefr~\xb5\x82\x88\r\xef\x05\xb9)\xb6\xb6ίNP\x02\xc3\xfbA\xb0\xc7\x0f\x82Ȝ\xea\x06\x99^\xd4\v\xa2\xaeS?\br\xd1 (u\xe5\x86AzH\xa3 \xe0\xadqPb܇Aq\xab&A\x04\xa3\xa6A.\xa56\v\xa2\x10\xd3<Ȥ磠\x18z\x8b Yrˠ,(\xb4\xa2\xd6Z\a%Df\aɻl\xf8d\x0fb\xff\xa2\x03\x13t\x06\xf9ȓ\v\x8aw\a\xb1\xe9\xc0C\x81{\x83\xc8\x0e|A\xe4\xca\xfe \xf7\xd0\x18*\xa0\x806\x1a\f\xa2\xa6\x15\n\xc2#ÔL$\x888\x10U\xa1Ƃ |&m-\x1e\x04z%\x82\b\x87ɠ\xc0\x8f\x15\x04\x00\xa4\xa0\x8b\x1c6\xd9&(\xf4\xac-l\xa0\x9dε}\x10A\xa7C\x90\xa5\x87\x8eA}\x8f\\\x90\xaf\xda\xec\x14\x84Cw\x86@\xbb\x04\xf1\x0e\xa0\xaeA\xf1\xb2nAb\xde'\xd4\xe0\xa7A\xd9\x16\xfd\x19z\xf8<(q\xb3{\x90\xa9\xc8\x17\x19\xe3\xe9\x11$\x91\xf92\x88x\xfdU\x10\x01\xa4g\x90\xd9h\xaf )ho:\xe5\xd7A}\xe21HJ\xf1-\x95\xf8]P\x00\xadOP\tG_\xf1\xeeTV?\x18|\xff \x8a\x06\x03\x82\xa8\x14\u007f\x1f\x14\x1e90\b\xdc\x1d\x14DP\xfc!H\xec\x1a\x1c$\f\x0f\x81ʆ\xc2ӆQ\xc1\xc33N4\"\x98y\x89\x1c\x11d$\xae\x1dE\x03\xfbI\xcdwt\xe6\xea1A\xbc/yl\x10\xe4j\\\x10\x01n|\x10\xdccB\x90Qp\"e9\t\xae59\xc8b\xe5\x94 6\x1aL\r\xf2\xf9\x0e\xfa\xe2\xf4 \x9e\xf8\x9f\x01\xe5\xcd\f\xb2\x9c9K\a\xffs\x10I\xd7l*x\x8e\xcai.\x1b\x9f\a\xb3\x9b\x1fD-cAڢ\x8c\x80\x91\xb5\x90\xa6\xf4\v\x01fQ\x10\x11lq\x90\xf5\xee%\xaa\xa6_\xa9\x95߂\xacS,UK[\x16d\xf1f9ռB\x8d\xf5wE\x86\x95t\xc3U\xfa\xf5\xea\xa0p\xa85\x9c\xcc\xda \xd8\xf8\xba \xf2\x90?\x82\\\xec_\x1f\xc4s\xaa\x1b\x82\x12\xa57\x06Q\xb7\xd8\x14D\xc1k3\xa7\xbd%\xc8\xccgk\x90\xdbd\xb6A`\xdb\xe9\xa3;\x88\r;\x83\xfc5E5\xdb\xdd:\x9c=P\xd2\xde \u007f\xf6\xee\xcf +\xe3\u007f\x05ɽ\xf6\x05\xc9#\xf6\xab\xa7\x1d\xe08\x0f\xa6o\xc6NV \xff\xe1\xa0\xe49G`\x13Ga\xceǂR\xcb\xfb;\x88\r\xaff\xd6q\x18\xdb\t\f\ua7e0\x04\xfc\x938\x9e\xca\xd8\xf9\xe9 \xca8g(\x9a\xb3<\x9d\x83\a\x9d\xa7\x96.\x10\x9a/*\xd8^\nj\xb9\xe0r\x90\xaf\x91\xbaB\xf7\xfe\x97pxUUpM\r\xe0:\x00\xe9\x06\x05q\x93q\xe6V\x10\x15\x94\xdbA\xf0\xa7;T\xf8\u007f<\xdd\r\"\x98\xdf\v\x82k\xde'\x92\xe4\n1\x9d\xcc\x1d\x92\xc0\x96'\x84\xaaO\xde\x10ř/ā\xe5\x0f\x11y\v\x84\xb0\xef\xa3`\b\xb7\x16\n\x91$<\x10B)\xabp\x88L\xaaH\b\x01\xf7\xc1\x10\xf9\xd2C!\xa0\xdc\xc3<\x15\rIty$\x04~U,\xc4\xec\xf1\xd1\x10w\xda\x17\x0f\xc1\xeaK\x84`\x81%C\"\xee\xc7B\x98I\xa9\x10\x90\xeb\xf1\x10L\xb7tHxn\x99\x10\xc4R6D\x9b{\"\x04\x8c-\x17B&\xf3d\bor+\x1f\xd2'\x1dC\x94\xe8S!>\xc7\xf3t\bU\xb4gBHɟ\r\xa5y|\x85\x10\xa1\xaeb\b\x16\xfe\\\x88\xae])$\x11\xf7\xf9\x10\x14V9\xc4\xf4\xf9\x85\x10\xc8\u058b!\x90\xba*!ɑ^\nI\xf2V5\x04\xf0y9$\xf4\xf7\x15\x0e\xf7\xd5\x10ޗ\x13B\xd9\xe2\xf5\x10\xb5W-\x045\xbc\x11R\xde\\=D\xf7\xae\x11\xa2\t\xbf)cz+$\b\xfa6GT3D\xb6\xf4N\b\x1a\u007f7\x04\x8dׂ\xe2\xde\vIL\xac\x1d\x92\xe5\xb4:!X\xcd\xfb!\x92\xfb\x0f\xf8\xb1n\b\xd0W/\x04\xb8\xa8O\xb16\baSJC\x8a\xaeQ\bp\xd58$?=\xfc\xa1\x1aF\x93\x10b|\xd3\x10\xabS\xcdBj\xa3\xcdC\x99,\xfa\xa3\x10P\xa6E\x88\xf0\xd62\xc4p\xdd*\xa4\xbb\x83[\x87\x04\xab\xb3C\x82\xc36\xf6d\x0f1::B\xacQ8U\xae.ڎ;D\xf0\xf1\x84\x04ż!<\x19\xe6\xa3m\xfa\xd56\x8d\x10\x92\xfb\x00\x04\x1d\xa4,B\xff\x1bSX\x1b\x8c\x84\xf0\x00R4\x84\x8am,\x84\xbdifH\xf2\x80xH7D%BX-M\x86X\xb6\xb2\xa8\xb4TH8v\x0e?\xb4\t\x01tچPOm\xa7\xa6\xd1>\x84\f\xa8\x03%ۑ\x82\xfa8\xc4\xf4\xa8\x93\xfaLgt\xd6\x05Ǯ!\xe4Y\xdd\xd4(?\t\x917}\x1aҟ\xdeό\xe8\xf3\x10\xaaY\xdd\xe9n_\xa8\xc5\xf4\b!\xb6|\x19\x12\xdc\xf9JG\xdb3\x84p\xd5+\x84w\x88\xf4\xe6\xe9\xeb\x10\b\xc67!\xee_\xd5\xee\xbe\v\xf1U;}B\xc0\xe3\xbe!\x90\xec~!\x81\xca\xfe!\xb0\xc3\x01!Ů\xef3\u007f\f\x841\f\n\x81i\xfe\x10\"\x90\x0e\x0eɂ\xfe\x10\x1d\xd7А\xd6އ\xc1\x0f\x86\x87@\x83F\x84\xc8\v~\f\xa1\x8472\xa4\x11rT\x88\xab\x90\xa1\xcc\x06\xdc\xd1*\xa81\x98\xd7\xd8\x10*\x8a\xe3B\bN\xe3y\x9a\x10B\x00\x9d\b\xf0\x98\xc4\x0f\x939\xf1)!\xddɪ\xf69-\x04n2=$\xe4gFH\u007f\xa3\n7\xce\"\xbc\xfc\x1c\"\x1d\x9c\x1d\xd2g\xb5\xe7\x84\xc0\xca\xe6\x86$\r\x9dGl\x9bO\xd1-\xd0I,\f1r\x12q\x16\xc1,\x17븗\x84\xf8lů\x00\x8a\xdfB`\x94K\xb5\xe7e!\xf2\xf6\xe5\nR+BX\xe8\xf9]\xa1se\b/\xaeY\x15B:\xb2\x1a\xed\xaeQ\xebZ\xab\xe3\\\x17\x12\x16\xfa\aF\xb7>\xc42\xd3\x06\xc8jcH\xdf\xc0J\xcb\xdbL\xd1m\t\xe9V\xd6\x10\xab\xbc\xdbB\x8cr\xdb\ta;8\xc1\x9d!\xee|\xd9E\t\xef\x06\xd0\xec\x01\x96\xec\rIH\xfe\x132\xfb\v^\xb0/$\x04d\u007fH\xe2\xcd\x01\x8a\xe2`\x88\xb4\xe1\x10\x1d\xfapH\xaa\x8bG0\xac\xa3!\xe4\xf0\xc7t\xfc\u007f\x13\xba\x8f\x87\xb8\xc8w\"\x84(\xf4OH~\xb5\xe4$\x1a>\x85\x86O\x87$}:\x83\xbf\xcf\xe2x.$\xf9\xeayx\xf8\x054}\x91xu)\xc4|\xf42\xc6{\x85>\xfa/\xe7w\x95\xb2\xbc\x06\x87\xbb\xaeb\xbfA\xc5\xdd\f\x81'\xdf\"\xce\xdd&\x14\xde\xe1\f\xfe\x83\xf0\xef\xd2\xc7\xee\x85P&\xbaϖs\x85\x81\xf6\xb9ä\ry\xc2PZްxF\xbe0\x9c?\u007f\x18\xceT L{)\x18\xa6\xcb\x15\n#Iy \f\xb6X8,\x11\xa2HXX\u0083a\xd8\xc9Ca\xba\xf1\xc3a\xe9\xbdh\x98\x99\xd3#azV1=?\xca\u058b\xeb\xc7\x12a\x88\xb0d\x18\xdb]\x1f\xd3&J\x85\x91}=\x1ef\x9d\xb8t\x98\xf8]&\f}\x95\r\xd3J\x9f\b\x8b\xa2˅\x11\x13\x9e\f\x03Y\xcbs\x94Ya\xd1\xe1S\x18\xe4\xd3\xec\xf1\x990\x93\xd0gÐX\x850\x19RE\\\xf3\\\x98<\xbeRX\xc2\xdb\xf3a\x1ac\xe50\xdd\xe2\x850\x9f\x8c\xe4X\xab\xe0\x8e\x97\xc2\xfcݘ\xaaa\xc8\xf5\xe50\x9f\xf5\xe0\xe9հ\x04\x88\xd7\xc2X\xd9~=,\xe6^-\x8c\xa7\xa4\xde\b\x93\xdbV\x0f\xa3\x1eP#\x8c\xda\xfa\x9ba\x04\x80\xb7\xc2x,2̊B\xcd0\xfc\xeb\x9d0\x02\xf3\xbbaVRk\x85\x15|\xde\v\x8bQ\xd7ց\xd7\t\x03\xbf\xdf\x0f#m\xfa ,!\xb4nXJ\x90\xf5\xc2RZ\xaa\x1f\x96RC\x830\x11\xa6!\xc4\xd3(\f\xea\xd28,\x96\xf7aX\"[\x93\xb00Ŧ:\xeffl\xady\x98\t\xd4Gaо\x16aF\xf5\x96ad5\xad\xc2\u008f[\x87\x11\xed\xb2\xc3\xe2c\xb60\u007f\x8e\x18\x8d9\xb41'/w\x85\x19&\xdda\x84!OX\x16\xa8\xbda\xdd'\xe1\xd3\xe9\xf8y\xb1\x01\x81\x04(\x88 m$\x14\x16.\x15\x0es\xd3j\x18\xd8\x16\x85\xbccaT\x02M\x9dd\x9cm$\xb4\xffd\x98\x18b\xa9\xe9\xa7\xc2\xe009\x9cc\x1b\xda~\xdb0\x12\xc90\x11\xaf=>u\xc8H\xbc#D\xf4\xb1N\xbfSX`\xb93\xef\xeb\x12&dw\rK\xe9\xad[X\xb7\x14}\x02\v\xfdTG\xf0Y\xfaZy\bR?v\x0f\x13T\xbe\xc0${\xa8\\\xbe\x84@\xbe\x82\x8d\xf5ԙ\xf4\xd2s\xef0x\xd6\xd7a<\x1b\xf8\r&\xfd-\x8e߅IB\xfa\x84\x01*}i\xb0\xfd\xf4\xdb\xfe\xf4\x9b\x01aTп\xa7A\r\xe4i\x10\x8d\xfa\ahq0?\f\t#\x85\x19Jy\x0e\v\xeb\xda\xdcp\x9d\xe4\x880j\x89?\x86\xf1[Va\xc0\xd1(~\xf7\x13\x9a\x19\xad\"\x1a\xa33\x1d\x1b\x96\x9cc\\\x18\xf5\xda\xf1\xb4\xba\ta\xb0։\xb4\x9bIa\xb0\x84ɐ锰\xf2ȩa\xf2\xeei\x90\xeat\x95\xd7\f\xfdvf\x98\xaf˛\xa5\xdf\xff\x1c\x96H>\x9bN7G\xbf\x9c\xab\xe7ya\xc6\xc20\"\xf8\x02\xfdv!\xc7\U0008bdb4(\x8cz\xe8bu\xb5%\x9cگa\xbeP\xf97\xccmi\x18Yڲ0\xf6\x1e.\xa7\xff\xaeH\x1bQ\x97p\xd6\xefan\xa3]\t\x9d\xac\xd2q\xae\x0ecYd\r`q-\xef[\x17\x96\xb8\xf4G\x18\x8bi\xeb1\xeb\r\xda\xeb\xc60S\xc5Mj\xaf\x9b\xf5\xbc%,\x11dkXj\x12\xdb¬\x8cn\x87\xe9\xec`3;ì\xfc\xec\n3P\xec\x0e\xe7\xad\xdb>k\x0f.ً\x11\xfdI\xac\xfa+\x8ce\xde}aR\xb5\xfd\xfcx@\x87{0\xcc\n\xee!\x02\xd6a\xcc\xfa\b\x00\xe5hX\x02\xd71\x1c\xff\xc6\xf18\xa3\xc1\x89\xb0\xfc~\xd4?a\xc4ߓ\x84\x89S\xec\xect\x18\xbb\x02\xceP\x96gì(\x9e\v\x83\xa3\x9d\aB\\\xc0\xf1\"\x8e\x97\xe8\xeb\x97\x19R\xae\x84\xb9C\x15\x8ew\x15\x17\\\xd3Xp\x9dz\xb8\x11\xd6ň\x9b\xeaַ\xf8\xfd\xed07 ݡ{\xff\xc7\xd3\xdd0\xb6\xba\xde\vs5\xfe>f\x95+\x82u\x87\xdc\x11\xa4\x9by\"x\xfbFވ0\x95|\x11\xf8H\xfe\b\xc2q\x81\b\nr\x05#\xea\x0f\x85\"\xe2\x00\x0fD\xa8\xb7\xc2\x11l~+\x12A\x04x0\xa2\x88\xf6P\x84\xea|8\xc2\xdd\x1bE#\xd8*\xf2H\x04k\xec\xc5\"0\xcbG\xd1R\U00048a2aDD0\xa3d\x04f\xfcX\x040W\n\xa3y\\{*\x1dA\x04+\x13a\xf1\xbflD\x88\xc7\x13\x11ο\\\x04\xd1\xee\xc9\b3\x98\xf2\x11R\x95\xac\b#\xebS:\x9c\xa7#\xb0\xc3g\"\xf4\xd4g#\xac\x1eU\x88P2\x159\x99\xe7\"\x88Õ\"\xfc\xf1\xe2\x88\xf0\x90\xca\x11V\x1e^\x88\x88:^\xe4t\xaaDh\x90/E\x98\xd1T\x8d@\v/\xf3\xf4J\x04\xafZ\x8d\x00~^\x8b\xa0p\xfcz\x04^Q-\x82\r9\x19iU\x8f\x00\xe1jDX\x86~3\"\x00\xfc\x96\xce\xe5m\xaa\xa6f\x84[\xe1߉\x90a\xbc\x1b!A\xa9\x15QSx/B#\xab\x1d\xe1\xbaT\x1d\x8e\xe2\xfdH\xe6\a<2\u007f\xd4Uaԋ \x8b\xa8\x8f\x195\x88\x10\xb4\x1aF\x00P\x8d\"0\xe3\xc6\xfc\xf4aD\xd7)\x9bDX\xa4m\x1aa\t\xa8\x19\x15\xd5<\x82@\xfeQDw\x8f\xb5\x10\x1d\xc9k\xc9#D\xf0V\x11!\x83\xadiq\xd9\x11\xa4\x0f\xb6\bl\xddΓ#\x02\x02㌠F\xeaҹ\xb9iz\x1e\x9d\xba\x176\xe2\x8bhb\xe3\xcfX\xa4\x11\x91\xe2m \x82\xd4,\xc8S(\x82\xb5G\xb6\x1ea\x97Q\xaa7\x16a`7\xd9Y<´=\x11!: \xdc\xd2NS\x11\xe119\x11\xc2Q\x1b\f\xa1mD_\xa2\x03\xd3m\x8f\xef:DH\xda;F\x04s>\xd6\xeb;\xd1/:\xab\xc1u\xc1\r])\xdcn\x11\xa9R}\xc2Q|\x1a\x01D\u007f\x16\xd1Z\xe5\xe7\x19\xdb\xe8\x1e\xd1'\x8ab\x85\xbc\x05\xa7\xd62J\xfa\xda*\x8a\x12V\xeb(*\xadQ\x85$[\x945\x1a{\x14\xf9\x82#\x8a\x85ɨ$\xb8\xae(\xf3ewTPۃ\xffx\xa18_\x14\xb6\xed\x8fr\x19\xceP[\t\xa4\xdb\xcaIt\xcc\n\xa6{̱\x8c\xacP\xb4@\xab\x9c`\xba\xd5p\x14\x0f\xd7E\xd2\xdfw\x8c\xa6\xa3\xa4\xf6\x19\x8b\x12\xceͨ\xbc\x9c\"\x1e\xe5\x12N\"*\xe9F2\xaa\xbft\x15e\x92\x90\xa2\xa5\xe6DA&\xdbDA\x1c\xdbFIg\xdaE\x81\xed\xed\xa3\xc0\x8d\x0eQ\xe2f\xc7(\x9c\xf7\xe3(\xde$\xd1)*\xcf$u\xe6ȻDQ\xf2\xed\x1a\x05\x19\xec\x16\xe5\xaa\xc4'4\x89O\xf5\xe3gQ.\xea~N\xcf\xe9\xae\x1f\xbf\x80\xf2{\xd0پ\x8c\"\xe6|\x15E\x15\xb6'\xfe\xd5+\x8aH\xd6\x1bN\xf95\xac\xe3\x1b\xb5\xeco\xa3`Z\xdfEI8\xfb\xd0}\xfbB\xb4\xfd\xe0\x99\xfd\xa3\x88\u007f\x03\xa2xUyT\xf0d`T֗\x06E\x914\xfe@S\x18\xac\xee8\x84S\x1e\x1aE0\x18\x16\xc5\xc6\xfe\xe1\xd1O\x89*U\x9a\x1a-\xd0Đ\xdfL\x9d\x16\xd5$sz\x945\xfe\x19\x9c\xd1\xcc(\xc3\xcb,\xd5\xce\xcfQ\xd9d0;ʍ\xb9s \x82\xb9\x98\xf5<\x8eq~\x94\xf9\xd2\x02\xbdqa\x94/a\xe5i\x11%\xbe\x18B[\x02\xa7\xff\x15m\xfc\x16\x15$^\x8a\xe3\xb2(\b\xea\xf2(J\"+\xa0\x8a\xdf\xe9\xd6+q\xf1*\xc5\xc1\xd5Q2\xe15Q\x89\xd7k\xa3R}[\x17\x15\x18\xff#\x8a\xba\xdez\xbaކ\xa8>\x14\xb81\x8a=|\x9b\xe0\xe6\x9bՎ\xb7`0[\xa3R?\xda\x16\xc5\x0e\xff\xed\xf4\xea\x1dp\x9b\x9dQ\xbc\xf3}W\x14\xab\x9a\xbbi&{TA{ռ\xfe\x8c\x82]\xfe\x15\x05\xc3\xdaG0\xdf\x1feJr *)\xc9Az\xf2\xa1(\xb2\x87Ô\xef\x91(\xeb\x9dG\xa3,\x1b\x1f\x83\x9f\xffMY\x1e'\x10\x9e \xac\xfc\x13e>\t/?\x15\x95({\x9aXv&*e\xa6\xb3\x98\xc79U\xf1y\xcc\xe7\x02\xc5v1*E\xa2KQ\xac\x91\\\xa6\xbf\\\x81\\\xff\x8d\"Y\xbe\x1a\xe5f\xa7k\xec\xf1:\x9c\xf9\x06/\xbc\x19Ent\x8bZ\xb9\xad\xfa\xbd\xc3A\xfdGK\xbe\x1bE\x85\xe5\x1e\xc7s\x9f\x97\xe6\x8aa\x16\xb9c\xe8\"O\f\x96\x9d7\x96\xafAN\x97\xac|1\x06\xf8\xfc1tX \x06k-\x18\xe3\x93ՅbL\xbe\x1f\x88\x010\n\xc7\x18:\x8a\xc4\b\x1c\x0fƄ)<\x14+\xd0\xd2\xe8\"\x15֘\xd8x\xd1\x18\x8a5\x8f\xc4(\xc8b1xã18^\xf1\x98nC*\x11\x13\x95\x96\x8ciXħR\xb8\xff\xf1\x98\x98V\xe9\x98r\xa42zIY\xfc\xf3\x89\x98\xec\x12/\x17\xc3>\x81'cؐZ>F\xebˊ\x01\xb0\x9f\x8a\xd1\xe0\x9f\x8e\x89\xe0\x9f\xe1\x97\xcf\xea5\x15b\x02\xfb\x15c\xfa\x82rtU\x89\x93{>&<\xa1r\f\xb2~!F\xed\xbd\x18\x03\x95\xa8\x12\x93\x17\x1d\xbc\x84c\xd5\x18l\xea\xe5\x98<\x92\xffJ\x8c \xffj\fu\xd3\xd7bX\x15z]\xc5V\rc~#\x06\xceQ=F3\xaf\x11\x13\xc7x3=\x85\xf4\xb8ޢjގ!|ԌI\xc9\xf3\x9d\x18\xdf8\x17#\xb7\xaa\x15\x13sz\x8f\x83\xac\x1d#\x9e\u05c9\x81P\xbf\x1f\xc3R\xe8\a1}\x8fE\xdd\x18\xa2x\xbd\x98Ҽ\xfa1\xa1\x89\rb\xc2\xfe\x1b\xe2\xd8(F\xc2\xd1\x18S\xff0Ɣ\xaaILФ)\a\xd3,\xa6\x8f\x0e5\x8f\x91H|\x14\xe3\x8an\v=\xb7\x8cq\xb9\xa3\x15\xc7\xd4:\x06cˎ\xa1\xfcg\x8b\xc1\xd2\xed1>\x9f\xe4\x88Itv\xc6\xc0\xf8]\xe9q\x19\xed\xe5\xcd\xe41R\x17O,\x1d\xcaҨ\xe7\xa5\xd9\xf9Tn\xfe\x98@\xb6\x11ÊX@\r \x18\xd3w\xce\xc1V\xc21\xd6B#1\xae>Ƹ\xd6\x12\x8be~\xd1*\x96Y\xfc\x8a\xd3\xf2\x121d9\xc9\x188\x85\xa5\x8d\xa6b\b\x8891\xf2\x8e64\xac\xb612\xefv0\xa1\xf61\xb0\xa1\x0e\xd0C\xc7\x18b\xc4\xc7*\x9aN1\xf8[\xe7\x18\xb6\xaf\xc6H\xb8\xba\xd2Ѻň\xe0\x9f`\xc0\x9f\xc6PB\xf8,\x86<\xfa\xf3\x18\x80\xad{L\x1e:\xf8\"\xa69e\x8f\x18\xf8ї:\x9a\xafhi=鰽b\xdc\xc4\xd4[\x9d\xf0\xeb\x18\x99\xe97\xff\x9b\xe9\xb71\xc1\xac\xefbL\x88\xfa\xc4d\x1bD\xdf\x18\xa2P\xbf\x98 S\xff\x98@ր\x98\x00\xce\xf7\xb8x`\fI\xd4 \xb8\xc5\x0f\xd4\xff`\xba\xcc\x10\x8afh\x8c\x14}\x98z\xc4pU\xfe\x88\x18\xd2\xe2\x1fcX8\x1f\x19CX\x19\x15#\x95\xf9)&\x91|\xb4z\xe2\x18\xc0\xc4X\xbdq\\\x8c\x84j|\f\xefޛ\x10\xe3S\x1d1\xe2\xf7\xa4\x18Y\xea䘰\xb4)p\xa0\xa98N\x8b!\xbaN\xe7m3ԂfR\xad\xb3b\x82\xec?DŽ\xfeϦYΉ\xa161WM|\x1eqh~\x8cu\xba\x051D\xa4\x85t\x98_T\xe1\x8b\xd0\xd3b\x05\x8b%\xb1\x82\xf5:Z9\x1dұ1V(\r\xa4\t\xd3J\aH\xba\xdcR\xcajY\f\xd4ly\x8cU\xf2\x15*\xa4ߵӕ1\x06\xc8Uhw5\fa\x8d\xb6\xbe6\xc67į\x8b\x91L\xfc\x11#\x9f]\x1f\xe3\xf3p\x1bp\xf5F\x1c7\xc5\xc0L7ǰ\ak\x8b\xceakL\x1e\x8b\xda\x16\x03\xb5\xdb\x1e\xc3\xf6\xab\x1dj%;c\xd8ĵ+\x86:\xd8\xee\x18S\x84=1\xe5\x1b{i\x16\u007fBO\u007fat\xfbԞ\xf6\xc3c\x0f\xe0x\x10\x06s\x88\x8d\x1cV\xd4?\x12c\x92w4F\xfez,Fv\xf67,\xea8\\\xe1\x04\xc5\xfbO\xa6\xbf\x93\xea٧0\x9d\xd31\xb2\xd331\xa4\x89g\xd1\u05f9\x18y\xfdy Ӆ\x18R⋴\xc5K1n\x1c\xb9\x1c\xe3szW\xd0̿*\xe5\xab\xf0\xcck1\x89\xadש\x90\x1b1\xeco\xba\xc9\xd3-\xbd\xf0v\x8c\x9b\x1e\xee\xd0\xe6\xfe\xe3\xe9n\x8c\xc9\xf1\xbd\f\xeeݏ\x81\xf0\xe42a\xe1\xb9MP\xbf<\xa6\x18q^\x13y|>\x13&\x96ߔ\xa1\x160\x19M\n\x9ax3\x00\x8e\x0f\x98:\xf1\xc2&XF\x11S]\xfcAS\xf9\xddC&\f\xe8a\x938Y\xd4\x14\xc8{\x047\x173\xe1y\x8f\x9a,\a\x1479\xfa\x12\xa68iI\x13K)\x8f\x99\xd4V)S\u007f\xe5\xca\x04[/mj]\xa6\x8cY0m\xfd\x92.\x945\v6ɱ\xccx:x\x9a\xb4\xcer&\x82Ǔ\xa6h\xaa\xbc)\xe9I\x96I\xe3{\xea\u007f\xb7=m\xa6\x1d2\x91\x0e\xa0f:b\xcb/\x0e?k\"\xe5\xaf\xc0qW4\xb15\xee9\xb3@\x13\xfc2q%3m\x14\x91t>i\x02\xc9+\xeb\xf0^0\xa9\xf7\x17\xf9u\x15\x13\xd4\xeb%\x13ʭj\"T\xbcl\n\xd9|\xc5\xccWO\xdeFg\xc2!_\xe3\xe9u\x93+ \xd5L\xc0\xcb\x1b&\u0378\xbaN\xa4\x06\xe4\xff\xa6Iv\xf7\x16\xe6\xf3\xb6\t\x9b\xaa\xc9\xd3;\xa6V\x85\xdeՁ\xd42Y\xfbz\xcf\x14\x9b\xabmJ,\xaec\x82\xfb\xbco\xcar\xd0\a&\u007fL\xa8\xae)(Y\xcf\x04\xad\xaaor\xb3\xab)\x14\xa1\xa1\x89\xb7\x0152\x19\xcf\x1b\x9bBw?d\u007fMLĊ\xa6&<\xa6\x99\x89*^sZ\xcbG\xfc\xd4\xc2\x14N\xd7\xd2\xd4-<&\x8a`\xad)\x98l\nצ\U000f36d2\xa2;L0]'5\xec2%\xa9q\xe3\xe81\t;^\x93n\xe13\x198\xfc&8\xad\x819\x06LD\x91\xa0\x89(\x122\x89\xb3a\x93Q\"\xa2\xe7\xa8I<\x8d\x99\f\x8c\xa6\x8a!\x0e\xe5$L\xc1\x89$\xe7a\xe1\xab\x14\x87\x93cr\x03`\x1b\xf4\xd56\xfde\xba\xafv\xd4^{v\xd9\xc1\x14\\\xe8\x88&>f\x13\x9dL\x14\x15;\x9b\x88w]\xb4\xef\xae&\x98}7\x93[`>1\xb1\x1b\xe9SS6\x13\u007ff\x16HgN\xf2\xdbWf\xa1ƒ)\xb53\xb2\xba\x9bؚ\xfe\x85\x99\xbfI\xc7v9Y=L\x14\xb9\xbf4Q\x97\xfb\xca\x04\r\xedi\"E\xeb\x85\xe1\xf56\xe9\xe9_×\xbf\x81\xb3}k\x16li$\x8cD:p\xd2F\xfb\x98\x92x\xf6\xa5^\xfa\xd1\xf0\xfa\xc3\xd0\x06\xa8\r}o\n\xde\f4\xc1\xe2\a\x99\xf8\x81\x0f\x93\xa1\u007f\xb0I:=\xc4\x14\xe0\x1c\xaaz\x1c\x86\x9e\x86\x9b\xb2{e\x04-\xeaG\x95\xf3H\x93x=\xca\x04/\xf9\xc9$2\x8e\x86\xaf\x8f1Y\x15\x1ak\n\xeb\x1dDZ\x8cg\x03\x13(ɉ\xa6\x16\x8c&\x99`\x14\x93MD\x83)4\xe9\xa9\xea\xd6\xd3L)\x11L7\xb1Ap\x86\xf61\x93S\x9c\xa5C\xfe\xd9D\xb20\x9b&8\xc7\xc4v\xae\xb9\x14\xdf<5\xac\xf9&\x98\xcd\x02\xbde\xa1\xc9H\xf0\x8b\x89퉋L\xae\xeb.\x86\x85/1\xb5\xfa\xff+\xe6\xfd\x9b)\xf0\xbc\x14>\xba\f\xd2Yn\n\x88\xaf0\xc1\x9c\u007f7Q\x83X\xc9!\xae2\x916\xae6\x11kטB\x8bך\xe0q\xebL.\xc5\xff\x91\x16\u007f\xda\x1c\xd6ì6\x98,\xb3m4\x91\xd6n2\x19.6g\xc0v\x8b\x89$i\xab\x8ac\x9b\xa9\xcfC\xd2@w\xc0\xadw\x9a\fg\xbb8\x92݊\xba{\xe8\x99{\xc5\xfe\xda˛u\xd4\xed\xff\xd2q\xec\xa3V\xf6\xab\xaa\x0f\x98H\x18\x0e\x9a\xc2tӗ\x1f2\xf35kgf\x1d&j\x1f1\x91]\x1c\xa5\xa5\x1d\x830\xfe\x86\x18\x8e\xab+\x9f0Q\xa7\xfc\xc7d\xf6tRG|\x8aA\xe84M\xfc\fOgM\xee\x83;g\x82\x03\x9f7\x85L^ \xb6^\xa4\xfe.\x99\xdc\xf7y\x99 p\x05\xb0\xf1\xaf\xa9$\xf9*>^3I̮\x13\x9fn\xc0\xd6o\x9a\x88\x81\xb7(\x8c\xdb&7:\xdea\xe4\xf8\x8f\xa7\xbb&\xaa\xb2\xf7L\xd4b\uf6e8\xe5䊋\xb7\xe7\x8egHi\x9e\xb8\xb8o\xde8\xfd#_\x9c\x1e\x98?N\xd2S .ԣ`\x1cտBq\xaee<\x10\xcf<\xd1]8\x0e\x1aQ$N\xb6\xfd`\x9c\xf1\xfb\xa1\xb8(\xfd\xe18\xa8_\xd18\xf6\n=\x12\x17\x9f.\x16\xd78\xfbh\\ܲx\x1c\x10R\"\xce\x15\xb7\x92q\xf1\xa3\xc7\xe2b\x89\xa5\xe2\xfcy\x8f8M\xb8t\x9c\x19o\x194S6\x8e\x94\xe6\t^S.\x0egz\x92\x9f\xcaǵ\xf6\x97\x15\xc7j\xc6Sq\xa9\x9e<\x1d\xe7\xcf`<\x13\xa7y<\x1b'\x13\xae\x10g \xac\x18\x87柋\xc3\xcd+\xc5E\xf3\xcf\xc7\xc9x*\xc7\tx/\xc45\xe9T\xe1T\x89\xc3L^\x8a\x17l\x90\x93\xe8\xd8>'\xabj\\\xed\xf9e\x19u\x1a\x01_\x89\x139_\x8dKf\xfaZ\x9c\x1b{\xe2\xf0\xe0jqfHo\xc4a\x91յ\xd1\x1aq)X\xbcɹ\xbc\x15\x87\xe5\xbc\x1d\x87\xe6kƉI\xefı\xbd\xf0\xdd8jt\xb5\xe2D\xbd\xf70\xe6\xdaqxa\x9d\xb8>)\x19\x97,\xf8\x838\xb0\xa7.$Q/.̽\xbe\xf6\xde \x8e$\xaea\x1c\x15\xb6Fq\xe0Gc\xfd\xe7\x87q\x16\xb3\x9a\xc4\xd3\x115\x1d5\xa9\xedf\xdaa\xf38<\xef\xa38r\xea\x16q Q\xcb8\xe3M\xab86\xf3\xb7\x8e+\xcf\xcaV=\xda\xe2\xcc\x1f\xecq\x81\\G\xe6\xdfNh\xde\x15G\xb6\xe6\xe6\xc9\x13G\xa0\xf0\xc6\xe1q>ؔ?\x8etƈk\xf5!\xc01\x04\xe3\xac\x0e\x85\xe2\xc8\xfe\xc2Tf$\x9e\xd9\v\x1b\x8d\xf3\xb9\xf9X\x1c\x8cҌ+\x93\x8c\xc7Q\xb2J\xa8\x82\x93q\xe4.V\\\xe0/EY\xe4pzm\xe2p\xb4\xb6qD\xd5v\xe9\xf6:\xb67\xb2ڧ\xfb\xed\x98\xe6^\x1dⲕ\xafc\x1c;\x8d>\xc6H;ő\x0eu\x8es\xe3V\x17\xd8mWZL7\x9e>\x89\x13\xe8?\x8d\v\x00\u007fF\x95\u007f\x1eW\xe7\xef\xce\xe9\u007fA\xcd\xf4\x88\xf3)\xac/\xe3(V|\x05e\xf7\x8cc\xafE\xaf8\xeb\xe8\xbdiI_\xc7I\x19\xbe\xc9\b\xf7[\xaa\xff;\x88\xbc\x0f/\xea\x1bGQ6\x8eU\xb0\xfe\xb0\xb9\x01qP\xa4\xef\xe9\xaf\x03\xe3$@\x83(\xfe\x1f\xe2\xcc\xee\acrC\xd8\xf1и\xe4\xdf\xc3\xe2\xc2Ć\xc7ItGPB?ƹ\xebsd\x9c\x89\xff(\xdc\xf7S\x1cAqt\x1c\x98R-\xc1\x1fF{#A\x02Y\x1d7\xd6H\xc8J\xfb\x9bh\xf1\xad\x04\xdep\x9e\x10\xa6T\x93=\xbe\x93\x00\xaa\xbd\xab\xf7\xd6J\xa0\f\xfd\x9e~\xac͏u\x12\x9ay\xbe\x9f@\xc8\xff \x81\xd2b\xdd\x04\xb4_\x8f3\xae\x9f\x00\x05o\x80\xb15\xd4)7JЀ\x1a\xa3\xff\x0f\x13B~\x9b$\xf0\xab \t@v\xb3\x04\x98Vs\x88\xe6#\x8c\xacEB*_-U\x9e\xad0\xf1։|iꑕ\x8d)ٴQ;\xfe\xe5\xc0w\xce\x04\xa8\xa2+\xa1[_)V\x0f\xba\xf5r\x16>\x8c̟\xe0\x9exC\xdb\x0f$\x80\t\xc1\x84\xee@\rA\x9b\xe1\x84\xec\xf2\x89`\xa4QH-\x86oL\x1c\xe3\t\xbc\xf2$\x01\vN\xeaT-\n4\x95\x90\x97\x95\xe4\xf0C\x1b|h\x9bХ\xa2v\t\x84\x82\xf6\xf4H\xe0ͬ\t\x12\xb8\xaf\x12\xdcu\xd43\xa1iL/\xb6\xd9;\xa1[\xad\xbe\x86$\xbfI\x80\x0f}\x9b@p\xfd.\x81-\a}h\x85}\x13\xdc\xc9\xd8/\x81\xc7$\xfb'\x90\xed\x0eH\b\xca|\x9f \x80\x0fL\x80\xd6\fR\x1d\xfc\x00\xe1\x0fN\xa0\x162\x84b\x1e\x9a\x90|{\x18\x9b\x1e\x9e@eaD\x82/\xd4I\b\xa8\x8f\xc4\x05\xa3\x12do?\xb1\xc5\xd1\tԛ\xc7$X\x9c\x1a\x9b@\xf0\x19\a;\x19O\x03\x9a\x90\x99\xcaD\x1a\xe5\xa4\x04\x1f\x00\x9d\fALI\x00\xab\xa7&\x88\xe3\xd30\xb2\xe9\xecwFB`zfB\xa9\xc4,\x1d\xfd\xcf\xecd6\xfe;'QH|\xbec\xfb\x8eYsU\x03\xf3(\xa5\xf90\xdc\x05\t\xd6v\x16\x12K~\xe1\x18\x16\xa9\\\x16\xa3\xbb%\xf4\x9d_\x13\xc8/\u007fK \x85\xa4Ζ%PH_\x9e \x11]\xc1\xd1\xfe\xce\xd3ʄ0\xacU\xbcm5\x84\xb4\x06\r\xaeE\xd7\xebx\xd5\x1f:\x82\xf5\xf8\xd7\x06\xf5\x90\x8d0\xe0M\t\xa6\x1a\x9b\x13R\x82ْ@\xa2\xb8\x95\xa7m\x80\x87\xed\tT\xf6v`\xb2;a\x8a\xbb\x12\xc2Tv\xe3\xb8\aǽ\t<\xe8\x81\xe3_\xf8f\x9f\"\xfa\xfe\x04\xaa:\a\x88\xca\ay:\x94\x10\xa2t8\xf1\xbf\xe7Տ$\xc0d\x8e&H\x89\x8f%\xf0\xf4\xe6\xdf\x18\xd4\xf1\x04\xb8\xe9\tZ\xe0?\t\xe1\x05'\x13\xba_'\xc1\xc8t\x1a\xeev\x06ןM\xa0vy\x8efx>\x01\xfex\xe1\xff\xfb\xbaHt\xb9\x94\xc02\xe3e\xdcy%\x81\x12ݿ\td\x93W1\x83k\t\xd0\xd0\xeb\x1c\xf2\r\xce\xe3&\xfd\xf3\x16\xe4p\x1b\xc7;\x1c\xdf\u007f\t\xa9\xb1\xddU\x13\xb8\x97\x10.z\x9fM\xe4JJxΝ\x94\xd1\xe5I\x8a\x1b\xe7M2\xd3˗\xd4e\xc9d\xe6\x05\xacI\x91L\xc1$\xc2V\xa1\xa4.K&\xf1\x18ca\xfdX$IN\xf6 \xafz()\xe1\xef\xe1$v:\x15M\xf2\x8d\xe5I\xc9N\x8b%\xb1\xc9\xee\xd1$ܴx\x92\xfb)J$\xb1$\x99\xc4\xfe\xb0ǒ\xa8\xee\x94\xc2w\x8f'A\x14K')\xd42I\x85\xf6\xb2I\xd0\xfd'\x92\xb2\u0378\\\xfa\x0eysN\x12b)\x9f\x94\x1aQV\x92\xa5ɧ\x92,\x9d?\x9d\xa4u?\x83f\x9fM\xc2\xe4+$\x05\x8c+&\xf1ө\xcf%\t?\x95\x92\xb2Z\xf7|R\xaa\u0095\x93b\xf7/\xe8\xbd/\xe2\xbb*\xda\xe2KI8dUH\xf2e\xbd\xe4\x15m\xe4\xd5$\xa0\xe05\x9e^O\xf2'C\xaa%!\xfc7\x92\x8a\xdeՓ\\\x90\xa8\x91d\xcd\xe1\xcd$\xe3\xff[\xc9\xc2i\x91u0,\xb3kǬ\xb7\x93\x92\xc6\xd7L\xe2\a \x93ؓ\xf4n\x12\xe9Z\xad$\x90\xf7\xbd$KD\xb5\x93\x00\xad:IX\xd9\xfbI \xc2\aI\xd9(\\7IfY/IH\xa9\x9f\x84\x1b6H\x12v\x1a&\xc5\r\x1b%\xc1\xaf\x1b'\xc9\xf6>\xccȺI\x12\xd5\xf8\xa6\xec\xb4Y\x12`\xdc\x1c\xa2\xfb(\tCk\xa1zlɮ[Aƭ\x93\xcc]\xb2\x93X\x1e\xb1%\xb9\xa95\xc9\xf8\xe3H\x8a\xaf;qt%\xe1G\xee\xa4\xc4\fOR\x16N\xbdI\xae\xee\xfa\x92\nt\xfe$B\x94\x81\x1b\x02ɂi\x80\x93\r:A\xea<\x94d\x0e\x1a\xa6\b\"\xbc8\xaa}Œ\xc2\xceͤ\xb8F<\xc9%\x93\x84*,\x99ԇ@\x92\xc8/SI`[N\x92\x9bx\xdb$\x91U\xb4M\x92ֵK\n\x9e\xb5Or\xbfs\a=wL\"\t\xfb8\t\xd8\xef\x94\xd4\xf0\xd99ɽ2]\x92\xfa\xecGW\x1a}\xb7$\x17\x92?I\xa6S\x0e\xa9\xb2BZ\x9fѠ?OJh\xeb\x8e\xe3\x17I\x90\x9d\x1ePΗI)\x91\u007fE{\xea\x99$K\xef\xa5M\xf5N\x82f\u007f\x9d$\xb3\xfeF\xcf\xdf\xd2B\xbfK\x82\xef\xf6I\xe2ɘ\xbeIa-\xfd\x92H\x85\xfa'\xf9bV\xe0\xc0\xf7I\x14\x81\a&\x01\xb5\x83\x92\x02\x17?\xa8\xe1\f\x86܇$\xf5\xf9ءI\x86\xe8aI$\x88IĊ\x11\x14\xfe\x8fI\xa0\xd8\xc8$\n\x89\xa3\x92\\e\xf9));\xc8F'Q%\x1c\x93D\x02>\x96=\x8d\x83\x89\x8eO2+\x9d\x90\x9481\x11\x984)\x89\xb7'LN\x92GO\xd1K\xa6&A\xba\xa7a&ӓ\xc2 f\xb0\xa9\x99I\x84\xb9YI\xacI&A\xaeg\xd3F\xe7\xf04\x97\xa7yI\x81\xc6\xf9\xe8e\x01\xccc!\xc4\xfcKR\xaa*\x8b\x92\xc8{\x16SpKt\xb2\xbfr~\xbf%\x99\xe5-MJ\xa4[\xa6\b\xb8\x9c*X\x01\x1b\xfe=\xa9\xbb\x00V&\xf5uV\xab0\xa2\xd5I\x90\xce5t\x93\xb5\xe8q]\x12q揌٬W[ې\x94,d#\x1du\x13\x86\xb89\x89%\x8e-\xea\xa0[\x93`\x8dۀ\x0f\xdb9\xd6\x1d\x18\xd4N5\xdf]\xb4\xccݘԞ$\xc2\xc5^\x8c\xf0O\xc8\xee\xaf$71\xedK\n\x8b\xdcO\a?@\xe79\x98\x14\xb2t(ɼ\xf8pR+\x0eG\x92\xcc+\x8e&\xf1\xe6\x9fc\x18\xe5\xdf0\xe1\xe3h\xf9\x04\x80\xea\x1f\xcc\xf7d\x12u\xacSI\xf0\x8c\xd3I\xe5sg\x92H^\xce&Y\xcd8\x97\xc4\xf6\x85\xf3\xc0\xed\v4\x9b\x8b\x8c\x13\x97\xe8\u007f\x97\x15U\xaf\xc0\xff\xfeU\xb4\xbc\x9a$Q\xb8\x96d\xa5\xf5:۹\x91d\xc2x\x13\xc0|\x8b\x00q\x1b\xe3\xbcC\xf9\xff\x97\x94\x1c\xfc.\xcc\xee\x9e\xfa\xff}F\x84\\\x16\xb7\xb6綤\xa7<\x16~\xc1\xc3\xe2\x06V\x9e\xf2[\xa8\xb2\x14\xb0T \x05-\xdcX\xc8b\"h\xe1\xc7\x01\n[\x8c\xb9E,\x0e\xfcA\v\xcff>d\x89\x84\x1eF\xdbE-a\r\x8fX\xdc\x00Y̒\xc9?jI._\xdcBu\xb5\x84\x05s+\xc9\xf6\x1f\xb3\xc4\x01KY\x82\xba\x8f[(ܗ\xb6 \xd62\x96BdY\v\xc1\xf7\t\v3.gI\x18{\xd2b\xb0*\x8f\x99dY\xd8\xdb\xf5\x94\x05\xf9?\x8d\uf7b1Ĵ\x9e\xb5hu\x15,\xf0ӊ\x968\xd5s\x9cS%\x8b\xf4\xecy\vҫlѸ^\xb0\xf0\xb8\x87\xc5\xf4\xad\x8a\xa5&\xff\x92\x85zLU\x8bo'\xb7\xc4\x0e^\xc1\\_Uپf\t¿n\xd1\xf6\xaaY\x00\xff7,E\xc9\xea\x9cv\rK\xab\x1eoZ\xcc|\u07b2\xb8\"\xf3\xb6\x05\xe4\xaai\xc9s\x99\xefX\xe0\xf7\xefZ\b1\xb5 \xa3\xf7,!\x1f\xb5-@L\x1d\xcc\xf1}\v>\xf6\x81E]\u05f5\x18\x17\xeae$W\xdf\xe2zo\x83\x8cR\x1bZ\xe0,\x8d,zZcK\x9e\x95\xfcPzIf5\xb1\x98\xc86\x85\x1a\x9b\xb1\x9f\xe6\x16\xb9\xe5G\x16\x92\x84\x16\x96\xb8WK\x8b\x05\x85V\x9cbk\xca6\x9b\xb6`\xb3\x00\x02v\xca\xd8a!CrZ\b?.\v\xb1\xd2mq\x85\xcac1\xbczu8>\v\xbe\xee\x871\x18\x96Xv\xc0\x02\xa7\fZ\b\xd5!UQ\x18\xb3\x8fXB\u0896.3Z\xa8#\x98\x16(i\xdcb6\x9e`\x8fIK\x00Ѳ\xb8\xf1$\x05\xa3́T\xdbXL4\xdaZ,j\xb5\xb3\x88\xc5\xed\xd1E\aKbkG\x8b\x14\xf2c\v\x85\xd5N\x16xUgN\xbb\vu\xd0\xd5\xd2\x10\xd2\xcd\xe2\xf3\f\x9fX@\xeeO-\xb0\xd8\xcf2\x1a\xf8\xdcB\x14\xe9n\xe9\xfbu,ҹ\x1e\x96l\xad\xf9\xd2\xe2\v\xca-\xacB\xf6\xb4P.\xea\xc5)\xf4V%\u007f\xadV\xfb\x8d\x85Bͷ\x16\x1f^\xfe\x0e\r\xf4\xb1\b!}\xf5\xa2~\xdaM\u007f\x8bTj\x80\x95\xa7n\xd6\xf7\x96 \xe0@\v\x94k\x90\xc5\xdd[?X($\x0f\xb6$\x9b\x1b\x02q\r\xb5\xc8\xee\x86\xc1\xbb\x87ӹF\xe8\x97?\xd2\x1dFZ\x92\xab\x8c\xa2`~\xb2P\xca\x1a\xad\"\x1dC\x13\x18k\xe1\x99H\v\x11~\xbcZ\xfd\x04KX\xf3D\xba\xf4$\v\xc5\xfa\xc9\n.S,]\x0e\x99jI\xde>\rښn\x11\x14g(\xb0̴X\xa5\x9ee\xe9\xf6\xbf\x9f-!\xb1\xb3-\xd6\x15\xe6dژkI&;\xcf\xe2\v{\xe6c,\v(х\x16B\xe6/\n%\x8b,\t\x9d\x8bq\xc5\x12\xb8\xf7\xaf\x16\xc2\xcco\x96\xae\x00-\xa5\x13,\xb3\x84A,W\xa3]a1]\xfc\x9d\xc0\xb0Ғ\xb7q\xafR\xa9\xae\xb6d\xd1u\r\fz\xad\x85,s\x9d%1\xe5\x0fK\xe2\xd9z\vkp\x1b8\x9e\x8d\x16\nÛ,r\xbe\xcd\n+[,\xae\xf7l\xa5eo\xb34\u007f\xd9n\x81\x13\xec@{;-\x92\xb2]\x16\x82\xdcnKb\xc4\x1e\v+%{1\x99?\xa9\xb0\xbf,V\xf4\xf6Q\x9d\xfb\x89J\a\xb4\x8f\x83\x16\b\xc2!\x8b\x15\xeb\xc3\x16\x19\xc2\x11K\xb2ͣ\x16h\xd71\xf8\xc4ߖ\x84\xc3\xe3\xf8\xfb\x04z\xfb\x87\xd2:\t\xdc=\xa5\xd6z\xdabX=c\x81\xf1\x9c%蟳\x90\xfc\x9d\a\xa2]\xb0X\x1d\xbd\x88\xb6.\xa9=_VǸb\xb1\xe2\xf1\xaf\xfa\xe7U\xe0\xe35\x8bD\xf1:-\xee\x06\x15s\xd3\"\xf7\xbde\x81\xb3\xdcV8\xbc\xa3\xb3\xf8\xcf\xe2~\xf6\xbb\x9c\xf3=\x8e\xe5>ƛ+\x05\n\x92;\xc5v\xf3\xa4\xc0y\xf3\xa6\xe4M\xe7\xf9R\x10J\xfe\x14[/\xa0\xd7\x14LI\x0eU(%h\xf9@\n\xceXX\xffU$U0\r\xb3\x01y:2\x85\xfd\xac)1\x83\x87S\xe2+ES\xb0\xf9GR4\xf6b)&\x8e)\x91p\xf1\x94\xa8\xde\xcc*\x91\x12Q\x94\xd4\xd6\x1eKQ\x14\xa5\xf4\xfcx\n|\xb6t\x8a\xaeT&\x85pYV\x1b|\"\xc5\a\xb4ʡ\x8d'S@\xe3\xf2)\xfa\u007fVJ$\xfe\x14\x06\xf2t\x8aH\xf7L\nk\x91Ϧ\x04o+\xa4\xc4\xfc+\xe2\xf8\\J|\xb4R\n^\xfc<%R9%1\xee\x85\x14\"\xe6\x8b)\t\x1fUx\xc1K)\xa9*VMq\xc9\xfb\xe5\x14T\xf0J\x8a\x80\xfdjJ\u007f\xe7*%\xc2~\x1d\x92\xab\x96\x02o{#E\xfc\xae\xce;j\xa4\xf8\x9e\x00\xbd\xf1\xad\x14u\xf6v\x8an_3\x05T}'\xc5\r\xad)\xe8\xbdV\n\x99\xf5{)\xacD\xd4N!\xc6\xd5I\xa5\xa1\xee\xfd\x14\x02\xe8\a\xbc\xabn\x8a\xc0T/%.S\x1f\xc7\x06\xfcW\xc3\x14m\xa4Q\n\xdbM\x1asN\x1f\xa6P!k\x92\xe2\xaax\xd3\x14\x93\x86f)0\xa6\xe6)!\x13\x1f\xa5\x84.\xb4\x80\x19\xb4L\xa1>\xdaJU\xd1Z\xcf\xd9)\x89\x9a6\x95\xb7=\xa5uyG\n\x8fv\xa4`\x86\xae\x14\xf9\xb6\x9b\xa3\xf7\xa4\xb0\x88\xe0Mi\xd8\xf0\xa5tS\x86?\x85\x92\x8a\x01\xed\x06R\x92\xa6\x04iB!\xde\x19NI \x88\xa4\x94\x93FS\x8c\b1h\xdeL)\x1b\x8f\xa7m\xa9cz\x86\x89\x14\x96\xa5\x93)\x12\x05Kl\\\x9e\x80\xe4\xa0rR\x84\xa26)R϶)p\x94vj\x98\xedS\xd8\x14\xd4!\x85\xc71:Rs\x1f\xa7ȸ:\xa5\xb8c\xa2sJѳK\x8aT\xa2+\x15\xdd-E\x87\xfe$\x85(\xf7)\\\xe4\xb3\x14\xe2\xfc\xe7\x9cJ\xf7\x14\xb6\x01|\xa1\x16\xd2#U\xa0\x05\x9eh\xf8\x92\x8a\xfe\x8a\x9e\xd4S\xa5\xdc\v\x8a\xe8\r\x87\xfb:\x85\n\xc27)\xecj\xf8\x96\x17~\xc7S\x9f\x94\xb0\xe4\xbe)D\xef~\xbc\xb0\xbfNt\x80\xce\xec\xfb\x14\xa8\xea@\xfd8H\r\xe7\x87\x14 |p\x8aU\xa1!)\xee\xb7\x1c\x9a\x11\xf60\x18\xf6\xf0\x14\xc8\xfd\x88\x94\xbcX\xe7ǔ\xe0\xd5\xc8\x14\xd8\u0528\x14\xd2ğR(2\x8dN\x91\xf9\x8d\xa1\x03\x8e\xe5\xa4\xc7\xc1*Ƨ\x80\x97\x13R\xb2\xcbfbJ\x88\xce$\xda\xe4\xe4\x14~\xca#\x85\xed\x9bSS\xc2a\xa6\xa5$\xbeL\xa7\x87\xceH\xe9Z\xe4̔\xe4\x01\xb3\xd8\xea\xcf)\x89\xf9\xb3\xd1\xf6\x9c\x14˺sSX\xf6\x9a\x97Bd\x9e\x9f\u008e\x89\x05\xd4\xfc\xc2\x14\xabe\xbf\xd0\xc3\x16\xe1\xf6\xc58.I\t\xf2\xff\x9a\xc2\x16\x1c\xb6\xbe\x14\xa8\xb0\x8c\x03\\\x9eB\xa6\xb3\"\xc5ױ\xf2\xb42\xc5\x17\x06\xacJ\x91\x1d\xadN1\xf5]\x93\xc2*\xdeڔ\xc4\xdeu)݈\x93B\xa4[\x9f\xb1\xf9\r\x98\xdfFX\xc8&\x80\xd2\xe6\x14\x97\x10\xd52\xb6\xa6\x84\"l\xa3\xcflOa\a\xc2\x0e\xe0\xd1Nܴ+\x85ط;\xc5\xdfoݓ\x02'\xdb\v\xef\xf9SM\xff/:\xf5\xbe\x146\xc4\xee\xa7\x18\x0e\xa4\xb8\x86\xa8\xf6\u007f\x88\xdd\x1e\xa6\x05\x1f!\xe8\x1f\xa5\x95\x1eӱ\xfc\xadv}\x1c\x86x\"\xc5\x17礸\x10v\x92&x*\x85\x1a\xd6i\xfa\xf2\x19\xf8\xf2Yj\xe3\x1c\xb0\xe2<\x86v!\xc5\x05\xe4\x8b\xec\xf6RJi\xfd\xe5\x14^\x81rE\xe3\xc1\xbf)-\xba_\x85l\xae\x01c\xaf\xa7d{\xf6\r\f\xe2&ڼ\x85\xe3mz\xe9\x1du\xc6\xffRȍ\xef*J\xdc\xe3\xec\xefsJ\xb9r\x18\xf1r\xe7\xc8\x00\xf3\xe40\x12\xe7\xcd\x11\xa8˗#t+\u007f\x8e\xbec.G\xb0\xb4`\x8e\xe8\xa9\x10\xfe\xff@\x8e\xf4\\\x18\xc7\"9\x14߃9\xf0\xb9\x87r\xc0z\x1e\xce!\x13)\x9a\x83\x1d5\x8f\xe4`\x92\xc5rಏ\xe6\xa8\x15\x17\xcf\x11s/\x91\x03\x89\x97\xcc\xc1\xf6\xa0Ǵ\xd7R\xda\xc2\xe39x\xa0\xact\x0ea\xbaL\x8eTZ\xca\xe6P\xd9O\xe4\b\x01,\x87\xa1\xfd\x1fOW\x1d(E\xf5\x85\x95\x0e\xc1n\x85G\x18\b\x88\xa2\x12\xa2t\x83t\x83\xe0\xa3{cf\xb6{6\xe8\xee\xee\xc6\x00\x11\x14\x03E,J\x10TB%\x14Q\x10D\xba\u007f\xef|\xdf\xd9\xdf?o\xde\xee\xceܹ\xf7\xc4w\xbes\xee\x9d;\xa5\x1c\"\x9a\xd2\x0e:{\x8eC\xf0\xbb\x8cC\xa5W\xd6\x01\x16V\xceA_/\xef\x80\xe6\x9er\x88\xff>\x8d^<\xe3 \xa1x\xd6A$\xaf\xe0`T{\xce!nU\xd1\x01\xa1Ur\x88\xc5Uv0\xb5y\xde\xc1eNU\x1c\xa0[/8ȳ^t\x80\xbbUu(K})\xfb\xcf\xcb\x0eM#^q\b\x9aUs0\xc6Ww`\u007f\xa4\x1a\x0eݎ\x95\xe2xՑ]-R\xcb\xc1'\x94_s\x80X\xbd\xee\x10\x16_\xdb\xc1$\xbd\x8eC\xed\xa6\xaeʫ\x9e\x83\xa6Z\xdf\xc1 \xdb\xc0\x81<\xae!;\xd5\xc8A\xa6\xddX\xcfj\xe2\xd0\xf7@:`\xbb\xcdxh\x8e\xfe\xb5Pa\xb5\xa4\xf2\xdep\x00\x01Z9\x84̴v\xf0%\x90\xaa\xac\xb6\x0e\x81\xddv\x0eV\x82\xdb;\xe0m\x1d\x1c|\xde\xc3!0\xd6\xc9!\x0f\x04v\x86\xf9tq\x00D\xba:\x00\xcfݴ\v\xddU\x01=\xf4\xf8&\xb4\xda\x13F\xd6\v\xff\xbf\xa5*\xc9u\xa0(\xd8ۡ\x10\xd2\xc7\xc1\x18\xe9@\xa6\xd1\xcf!@\xd6_\x856\xc0A<\x1c\xe8\xd0\xe08\b\xfa\x1c\xec\x10o\x1a\xe2@D\x1a\xea\x00\xf7\x1d\xe6\x80\xc7\x0ewp\xda\xd8A\xc19\x1d\x88G\xae<\xad\xe4\r\xc6\xed\xe0\xd3\b\x86C\x02\xb1\xe9\x00;\xb3\x1c\\h\xe3\xc0ۚ\xbd\x0eqo\x9f\x83\x85d\xbfC\x03\xa3\x1e\x83\xd4C\xc8\xc1\xac3\xec\x10\xf4\x8f8\x90\x1cD)\xe1\x98C2\xa38\xfe&\x1c\xca\x11l\x87\x16\xe5\x92\xd9oR\x0e@aZU\x90q M\x1b\xe1\xc0^l#\x1d\xe0\xeb\xa3\x1cx6u\xb4\x83\v\x8a\xc68$\xd9\x1b\xcb.\x8cSs\x1dOט\xe0@\xa4\x98\xe8@0\x9b\xa4\xd63\xd9!\xe0;\xc5\x01̞\xea\x10 \x9f\xe6`\xda9]\xedu\x86\x8et&t4\xcbQ\xa0\xf5\x90\xbc\f\x92\x864\x87~6\x97\x9f\xe6\x01j\xe6s\xb0\v\xa8\xb4\x85\x0e\xe7\x04Ө\xe8\x14\x16R\x89?Uvr9*\x0fU\xf4V/8\xc5\xea^t\xe2\xe5VNZ\xe7K:\xf2\x97\xf5\x9cW\x9c\xf0\x87jN\x00Eu\xa7\xf8[\r=\xa7\xa6\x13\xd5\xf9WU\x82\xb5\x9c\x98\xd8{\xcd\xc9-\xf6^׳j;aQuح\xba\xce\xec\x02\xa8zNr\xfe\xfaN\xdaU\x03'\x83}C'wdu\"\x907\xe6\xd5M\x9c\x8c\xa8M\x9d\x92]5SI6w\xeak\xae\x9c2?\xd1\xd2\xc9x\xfa\x86\x13k\aZ9\x11\xbb[Sdm\x9c\x85\x9a\xe2i\x97\xb6N)\x91\xb7s\xc2\xca\xda;I\x17;\xf0\u070e\xd0L'\x88\xa5\xb3\x93P\xdaʼnH\xd4\xd5IP\xec\xe6$\xc4w\xd7A\xf7\xa0H\xdf\xe4]z:e!U/\xaa\xe7-v=\x97\x87\xdeN\xae\xae\xea\xe3d\x85U\xef\xdcω\xc8\xd6_\xedg\x00;2Љ\x901\x88\x9f\x06;\x05t\x87\xd0҆\xc2\xee\x879A\xe7\x87;\xb5\xc8\xedpr=\xa0\x93&\xefR\xa3r\xebр1\x98N\x06\x12\xcbI\xa8\xf68\x81\xf7^\xa7n\xf5\xe9s\"G\xf5;\x91&\x05hzA'\n]!\xd5R؉\x82@\x84\x87\xa8\x13x\x1eSό;\x05\x99\x12N\r\xef6m'\xe9īFRN\x8d\x9ai'_\xe7\xe1\x14\x9e2\x02\x165\x12n3\xca\xc9Lv\xb4S\xa0m\x8c\x13\x8b\xc3\xc6\xd2m\xc7Q\x14\xe3\xf9\xe5\x04'\xb3\x9c\x89N\x99w\x9c\xe4$K\x98\xec$Ϙ\xe2\x04\x99\x99\xea$%\x9c\xe6D\x01vzVV3\x9cX\xc05\xd3\t*5+\xfb\xf5\xec\xec?s\xe8zs\x9dʌ\xe7Q\xc5\xf3\x9d\x92f.pbI\xdaB\xa7\xce\xc0/\xa2\xae\x17;%!]\xe2\xe4\xcc\xdeR\xa7D\xeae0\x86\xe5N,\xc3X\xc1\xc3J\x15\xfd*\x15\xe7j'i\xd4\x1a'61\xa7\xad\xbd\xed\xc4\xd4\xd8;Y\x81\xbd\xcb\xcf\xef9\x91\xee\xae\xe3a\xbd\x93S\xff\xef\xab\xec78\xc9b> \xe8ld\xbf6Q\x97\x1f:\x19h?\xe2\xd06;\x11|>V\x9f\xff\x84*\xfe\u0529\x1c\xee3\x0ex\v\x8c\xe6s'\xe7g\xbe\xa0\x19oU\xd8\xfaR\xfd`\x9bS\xe8\xe9WN\xe2\xfe\xd7N\xd6$\xbeqb\x8a\xe2['c\xf9w\xda\xc7\xedj\x8e;\x9cH\x81w\xaa\xd1\xefr\",\xedv\n9\xfd\xde\xc9j\xec\x1e'J\x00{\xd9\xd5\x1f\xd8\xf1}:\xc8\xfdNp\x8e\x1fi\x85?\xd1(~V\xf3>\xe0D 9HM\x1d\xa2 \x0e\xab\xa0\u007f\xc9*\xeeW\x98\xdfo4\xab#t\x9b\xa3Y\x138\xe6\xc4l\xcaq~\xfd\xbb\x13\xd3e\u007fP,'\bd\u007f:\xc9>O:\xb1=+\xcf\xfc\x9b\xa7\x9cr2\xf19\xedD\xc0\xfe\xc7)\xd5\xcd3\xfc\xed\xacS\xa8ٿ\xb0\x90sY\r\xff\xe7\x04S<\x8fpsAE|Qm䒓5\xc5\xcbD\x8e+N̊\\u\x922^sr\x02\xe6\xba\xe2\xd5\rh\xed\xa6\x82\xe9-\xaa\xf6\xb6\x93U\x86;\\\xf2\xe3\x9d.\xe9B>\x17\xa8G~\x97\x10\xc9\x02.\xc0PA\x97\xe6\x02\x88<\xeeB\x00z\u0085\x89\x9b']\xa8\x96\x94r\xc1\xb3K\xa3\x839.\xa4depײ.\xdaB94Yޅ\x97&\xbbPru\xd1p\x9fq1\xa2<\xeb\xd2\x1c\xd3\xc5\xe9\xc4\xe7\\\xfa\x00@E\x17\x9e\x15\xac\x84\xc6+g\xbf}\xde\x05\xf0\xa8\xe2\xa2n^\xe0@^䡪K\xc0\xec%\x8a\xefe\x97\xa0\xf6+.\xd6i\xab\xb9\xf08Au\x97@[\r\x970\x88\x9a\x14ɫ.-j\xd5r\xe9\x84\xc3k.\x9a\xd6\xeb<\xa16\x0fux\xa8\xcbC=\x17\x97hԇ\xfa\x1a\xb8\x90\x185t)\xf26rqy\\c\x17|\xa0\x89\x8b\xabut\xa8\xcd\\\xf4\xfb\xe6.\xfaD\v\x17\xbd\xb7\xa5+\xfb\x9aH\x95Q+\x17Cxk\x97\xa4Qm\\\xa4\x04m]\xf0\xa8v.\xb8d{\x17\x8b\x01\x1d\\,\xecv\x84\xbc:\xb9X\x1c\xef\xac\xc7..\x86ˮ\x14T7\x97\x1a~\xf7\xec?= \xad7](\x12\xf7ta=H/\xde\xe1-\x97xX.\x05\xdf;\xab\x88>.\x14\xe7\xfb\xf2\x8a~jI\xfd]\x02G\x03\\\xc4\xe1\x81l`\x90\v\x1e;\u0605\x12\xfd\x10\x17\b\xd6P\x97\xbe\b\xcb\x05\xa8\x1a\xceA9\\\xe0\x93N\x17\x1f\xe9pa\xe1\xafۅM\xbd\f8\x8f\xe9BnfQ\xb2\x1ej\xc3˃\xcf\xc5\x05=~\x17ʏ\x01\x17\x1et\t\xba\x88\x06!\x17\xc3T\xd8EO\x8d\xb8\xf2\xb5ʉ\xbad6 \x96\x95|\x9c\x0e\x94\x80\x10m\x98r\x12\xff\xa7x\xdb4ԝ\xc1\xdf\x11\xf8a$\u007f\x18\xe5\xd2\xe9\xef\xd1.\xd4\xe8\xc7\xe8M\xc6f\xe55\xce\x05<\x1dOG\x9f\xe0\x12\x8e3Q\ra\x92jv\xb2\v\x91y\x8a\x8bh1\xd5U\xa4\xb5#`I%x\x1a\a8ݥ1q\x86\vLv~\xab\xe4\x96bce\xb7Ү\xe7\xdd\xe0\xb2UܚL\xbf\xe0f\x16\xf8\xa2[*\rU\xdd\xdcB\x807z\x99\x1d~\x85\x87jn\t\xe2\xd51\xde\x1an\xa1\xd65\xddX\x1f\xfc*\xbe\xaa冺^s\xcbnƯ\xbb\xb3Yfm\xb7\xac\x1c\xaa\xe3Vܪ\xeb\xceVr\xeb\xb9eڢ~^\xaf\xe5S\x036\xd50{^#73\xcc\xc6\xd9/\x9a\xb8\xf9P}S7\xe6\xe0\x9a\xb9\x91\x954w\xd3\xcdZ\xb8\t\x15-ݘ\x06}\xc3-e\x88V\xff\xbfWk7\xf6\xa9n\xe3\x06\x19o\xebf\x94h\xc7{\xb6ws\x91N\a\xb7D\x82\x8e\xff\xbf\xa8\x93\x1bU\x8fΔE\x174\xd9\xd5-\x93\x01ݲ\xc2\xeb\xeeFf\xd5\xc3]\xa4\xa31p\x90 śn\xach\xe9\xe9F&\xd7ˍ\xe5Zo\xb9\xb1\xfe\"\xd7-\xc9Ro7j\x93}\xdc\u061d\xa3\xaf\x9b\xe5\xf3~n.k\xe8\xef\xc6\\\xf1\x00\x9c:\xd0M\xee2\xc8-qh0\xadp\b\xe46\xd4\rr6\xcc-H4\\G\xefp\v\xadq\xb2\xdf.\x9c\xe7v+\xb91Т\xe9\xc6~\x02nB\xa2ǭ3\x98z\xf4\xb9\xa5f\xe8w\xcb\xd6(\x01\x18{P\xbb\x17r\xeb\xbb@\xf4\xca\bz\x14\xc5\xfdb83\x0e\xf7I\xe0\xaf\xed\xc6\x06*I\xb7\xb0Д\x0e\"\xedF\xb0ȸ\xb1\xfe`\x84\xder\xa4\x1bu\xeaQ\x90\xeeh7\x9e\x82tc\x9d\xd1X\x1d\xd487c\xd4x5\x80\tn\xc9\xf4&\xe2\xd4In\xe0\xc8d7J\x82SБ\xa9\x94\xcc47\x92\x90\xe9n\xf0\x89\x19n\x99^\x9c\xe9Fmz\x16\x8d|6\xfa:\xc7\r\xa4\x9f\xabN9\x8fڞ\xef֙\x84\x05\xee\xc2͆\xf4\x1b\x9e\xd7\xc4B\x9c\xbe\b\x1d]\xec\x06gY\xe2\x162\xb9\xd4\xcd\xe9\xa2eğ\xe5\xe8\xc5\n7Al%\xef\xb5\xca\r~\xb8Z\xbf]\xa3\xa3_\xebFXx\x1b\xde\xf4\x0e?\xbc\xeb\x06Kz\x0f\xc2[\xe7\xc6\xec\xe7z7\x17\xfb\xbc\xef\x96%\x81\x1b8\xa6\x0f\xdc\xd9\x14`\xa3[ӦM\x18\xe6\x874\x80\x8f\xdcL\xbf7î?vc]\xe3'0\xe0O\xddH\xf8>s\x93\xb4m\xf9\u007fK\x9f\xbb\x11\xe4\xbf\xc8b\xe4V\x1a\xf8\x970\x9bmnΒ}\xe5V\x96\xfb5l\xea\x1b\n\xfc[\b\xe3;\xe8e\xbb[fNwdmo'1g\x97\x1b\x94m7\xbd\xe1{\xb7\x10\x89=\x8ae{ݨP\xfe\x80F\xf6\xe1\xf2\xfd@\xed\x1f9\x98\x9f\xdc`t?\x13X\x0f\xe0.\aݨA\x1frK\"y\x18\xb6\xf8\x8b\x9b\x01\xe6W\xb7\xaez\xd5\x11\x1eq\xe35\x90G\u074c\xe3\xc7\x10S\x8e\xbb\x19\xba~\x87\xa8\xff`x8\xe1&o\xfb\xd3-\xf5\xe5\x93\x1ag\xfer\x93=\xfd\xadfr\x8aN|\x1a\xd6\xf0\x0f\xc7uƍL\xf9\xac\x1bS\x11\xfff\x01\xf7\x1c\xd0\xf9?76g8\x8f\x0f\x17\xdcx\x16D}\xeb\x12\f沛\v\xa9\xae\xc0̮\xb2\xc9k\xd4\xd3\xf5\xbc\xbb\xcbo7\xdcL5oR\xe2\xb7\xe8Q\xb7\x89\vw\x18\xe0\xecw\x1ar}>\x03\xec+\xbfAq\x140\xc8&\n\x1a\x80\xc7B\x06\x84]\xd8\x00b\x171\xc4\xfa\x8a\x1aR:*f\x88\xe4\x8b\x1b\x8c\xb2w\x19\xb8}\t\x035̒\x86\xf4\xf3n\x83ny\x8f\xa1\xc0|\xaf\x81\x8c\xf0>\x03\xbd\xb8\xdf@1\xff\x01\x83\xa4\xf1AC\xa2\xd9C\x86&V\x0f\x1b\xc2\x1c\x1e1\xf8\x9a,C%\xf4\x98!6\xf9\xb8\xc1\"\xfb\x13\x06L\xfeIC\x1e\xa4*e\xa0\x16Y\xda\xc83\xe5\xbcX\x96c`\xed^\x19\x03\xbe]\xd6\x10\v*\xa7\xb7*o\xe0u\x92\x06\xfc\xedi\x83\xa0\xf1\x8c!)\xe7\xb3\x06c\\\x05\x83y\xd6s\x067\xaa3\x80\xb5\x95xIe=\xe9y\x95Y\x15\x83y\xd5\v\xe8\u074b\x06V\x98U5\x10\xfc_2\x00Q/\x1b\xf0\xa9W\fƓj\x06L\xb5:\x0f5\fк\x9a\x06bΫ\x94u-\x03f\xf0\x9a!.\xf9\xba\xc1e\x11\xb5\rXL\x1d\xed@]\x03\xf3\xe3\xf5\f\xf1\xe5\xfa\xfae\x03\x03\xb5݆\x86\xd8O#\x03\x96\xd6\xd8@ͳ\x89\x01\xc8j\n\xd9638k\xd3\xdcȆ\xb1\x16<\xab\xa5\x01\xce\xfd\x86ZB+C\x01\xae\xb5!>\xdc\xc6\xd0iٶ\x06\xb9s;C\x9c\xaf=\xfev`\v\x1d\r\xe4\xf7\x9d\f0\xda\xce\x06HA\x17CL\xb9+\xfev3\x94\x80w7\xa4\x8c\xd2\xc3\x00#~\x13]\xeei\xd0qzQ\x0eo\x19dV\xb9\x069Xo\x83T\xbeO\xdeȼyI\xa5\x91\x17\xaf\x87\xe7\xf4\x83\xc5\xf57$\x90\r0\xe8\x1f\x03\rq\xb9A\x06\xd8\xe6`\x83\xd3ZCTgC\xa9\x9ea\x86\xf8\xeep\xfd\xd2ap\xee\xd2 $\xb8\fDh\xb7\x81j\xaea`+\x14S\x8d\xcf2\x00\xec\x1ej\xdbk(\xae\xfa\f\xdd)\xc0\xc0N\x01h>\xa8͇`\xe2a\x83\xcc/b\x10p\xa2l!FK\x8d\xeb\xb9\t8\x99M\xd1%\r\xdd\xdf\xdc\xe0ʯ\xb4!\xd17\x83[\x8c\xc0ߑ\x10\xdd(C\xe6pG\x1b\x9cS\x19c <\x8c\xcd\x13Jn\xce8\x83\xd3^\xe3\ry\x82`\x02\x1cy\"\xfc`\x92\xa1s\x96\x86 \xf7\x14\x83\xf1f\xaa\x81\xb2\xf64\x03\xecd:\x9a\x9f\x81\xf3g\xe2\xffY\x06s\xf2ٰ\xbd9\x06\x1f\xe1\x99kH\xb0\x9fg\b\xfd\x9bo\xf0\xd1H\x03!h!|c\x11-b\xb1\xba\xc1\x12\x83\xab\xf9\x97\x1a\xc0\xeae\x1c\xedr\x03\x91e\x05?\xad4PJ[\xa5`\xb2\x9a\xbe\xb2\xc6\x00\xa0\xaf5$\b\xbcM\xb7|G\x05\xfa\xae\x8a\xf0\xbd,\xee\xac3\x189\xd6\xd33އ\xf9o0$@~`\xb0\x94\xb4\xd1`\xd5u\x13\xba\xfe\xa1\xca\xfb#X\xd5f\xb8\xe0džL\xc1}b \xb8|J\xaf\xfe\xcc \xa7\xdcbH\\\xf9\x1cg|a\b\xe9\xd8j0\x8544\xaem3\x98\x1e~\x85{\u007fm\b\xf3\xfd\x86\x8d|k`F\xf7;\x83\xd1d\xbb\x81t}\a\xfcd\xa7\xfa\xe8.=\xee\xa6L\xbe7d\x12e\x8f\xc1\xbcb\xaf\x81\xa4\xe8\a\x83\x11k\x9fJj?\xe0\xfdǬa\xfe\xa4R\xf9\xd9`\xd1\xf6\x80\xaa\xec \xd1\xf8\x90\x81:\xefaU\xeb/\x86\x14g~\xa5M\xfe\x06\xb3:B(\xae\xbf%`}6:\x96\xd4!\xa48\xe64=6\xa3\x8a\x1ea\n;\x19\xa9:\x18e\x82\xe0\x8c6\x95Ɍ1A^\xc7Ҫ\xc6iK\xe3Mp\xcf\t\xb0扐\xda$\x935\xbf\xc9b1\xb2Ϲ\xc9\xf2\xe3T\x13(8͔\x19\xef\xe9&Ak\x06M{\xa6\xa9\xef\xcd\xca\x1a\xeblS\xd0tNV\x8fs)\xc9y\xa6\x10\xa1\xf9&9\xd7\x02\x13\t\xdeB\x0e~\x115\xb1ؔ\U0003b13d\\\xaag.\x83L\x97\x9b\x12-V\x98(ޭD7V\x99(\xe8\xad\xd6ެ1\x19\x1d֚X\xcd\xf8\xb6\x89\xe9\xcbwL\x90\xa3w՚߃1\xad3Q\xfc[or\x96\xe0}\xdep\x03\xcc\xef\x03\xf6h#\x84\xb2\x89\x9a\xfc\xd0$\xe5\xf9\x88\x06\xb6\xd9Ģ\x96\x8fMԣ>\x01\x06~\x8a\xae\u007f\xa6\xdaآN\xf4\xb9\tb\xf5\x85\x89\xe5\x8d[M\xac\"\xf8\x12\xbe\xbc\rJ\xfd\x8a*\xf8\x9a\x1e\xf9\r\xbe\xfb\xd6\xc4r\x80\xef\xb2\xe2\xdcnb\xfeo\aŸ\x93}\xdfeJ1o\xb7\xc9\x00\xf9=z\xbb\a\x97\xef\xe5\xe5?\xb0w\xfbT\xd7\xfbMaf?\x9a\x1a\xb8~B\xa7\u007fV\xe4:`\xe2\xb9\xf4\x83\xbc\xf2\x90\xca갉\t\x87_L!\a\xbf\x9a\xa8\x0f\xfdf\"\f\x1e\x81\xdf\x1ee珙\xcc\xf9\x8f\x9b\bp\xbf\x9bd\u007f\u007f\xa07'LYI\xf9\xa7Y\xbca\xbf!\xb9\x03,w\xee0+礩|\xfb/\x93\x15\x94\xbfi\f\xa7L,\xa4?m\xb2\xfc\xf3\x8f\t\x06t\xc6\xe4\xe2᳦T\xcf\xff5\xefj\xd8\xcf\x188H\x9b:g\x16\u007fc\x90;\xfb\xe9\xbf<\x85\xe6Eܜ\xf3\xe8\xde\x05\rK\x17\xe1Y\x97L\xf2\xa0˦p\x98+f\xf1\xa6\xfd\x86X\xa6C\xae̹j\x92O_\xcb\xfa\xeau\x13U\xf4\x1bf\xe1\xf6\xb9\xee\xdc!\xfdrn\xaa\x91\xdd2ɍo\x9b\xa8\xea\xdca\xf1y\xe0;-6\x9e\xcf\"\xed\xcbo\x91\x82\x14\xb0\x88\x1e\x05\xad\xe2\xed\xfb\r\xef\xc3n\xe7\x14\xb2\xa4\v\x85-j\xa6\x88%>^\xd4b\x98.fa2\xa2\xb8%T\xf5.K\x86\\\xc2\xe2=KZ\x8a\x1cw[\x9cm\xbdǂ\xff\xddk\xd1G\xef\xb3ă\xef\xb7$\xc2<`Av\x0fZ\x94\xddCz\xaf\x87-\x84\xa8G,P\xdfG-\x84\x83\xc7,}іEwxB\x8fOZ`\n\xa5,\x15JiKCl\x8e\xc5\xdaG\x99\xec\x17e-&J\xe5\xf4X\xde\x02r?\x95\xfd\xfdiK\x00\xe1\x19\v\xdb\xc4\xcbO\x8d\xb2BjlI\n\xd9\xc4\x02\xc1oj\xc1\xae\x9b\xa1\x1f\xcd->\x87\xd8B\x87\xd0\xd2B`}\x83\x87Vz\xdf\xd6\x16\xa2p\x1b\\\xd2VOm\x87F\xdb[y\x88\xe6\xcc\xe9`\xa1\xda\xdb\xd1R'\xead\x89\x87u\xb6dAH\x17\x8e\xb5+;\xd5\xcdBy\xb1\xbb\x1aa\x0f\x8b\xfb\U000a0c5e\xf8\xdb˒gy\u07b2PIȵ\xf8\x9af\x8c\xb5\x0f\xda\xebk\xc1\xc3\xfbYx\xd5j\u007f\x8c\u007f\x00?\fd7\x06Y\x05[\xf43rs\x06s\xa8C(͡\x96@\xe90\xfc\x1d\x8e;9,pT\xa7%\xbe\xe8b\xff\xdc\xf8ݰ\x80,\xa6\xc5r\xa0\xc5\x16<\x16\x1d\xcek\x91\xb6\xfa,\xc1W\xbf\x05\xfe\x15Ȏ=\x98\xb5\xb0PV\xfea\x8b\x95\x8a\x88\x05\xac\x8dⲘ\x85\xbd \xe2\xbcm\xc2*\xdc!\xd7\x14\xbc\xb0\xf5\xe4$\x1d)\x95m6\x9d\xfd'\xa3\x9d\x1aa\t\x06\x8edOG\xf10\x1a\x8e6\xc6\u0083,c\xe9o\xe3,,c\x18\xcf\xc3\x04Jo\"\xc6<\xc9\xca\x16!&[\x98\x14\x9db1_\x9d\nyO\xa3\x19L\xb7\x18KgX\xcc]fZ\x92\xefϲ\x90\xa3\xceVT\x99c\x81Y͵\x98Oͳ$\xbd\x98\x9f\xd7j\x9eZ\x16X\x82\xba\v-r\xb2E\x16\xb9\xf2b\xba\xcb\x12K\x92⥼\xd52\x8b\xb9(;\xb9\x82m\xae\xb4\xc0?V\xa1O\xab\xd1\xf15hq\xad\xc5\xca\xd2\xdb\xff\x1f\xc6;\xea\x9a\xefZȚ\u07b3P\xd7\\\a\xa9\xac'\xc0\xbcoI\xa6\xb8\x01p\xf7\x81\x85r\xc4F\xd8\xd0&\x8a\xebC\xb5̏,Ἓٓ\x8f-.\xe1\xff\xc4\xc2\xdaY(\xf03\vE\xba-\x96\xc4\xfd\xcfՓ\xbf\xa0\xf3oU\xe4\xfc\x92J\xdef\xe9\xb6\xe8\x96Tﾶ\xb4\xae\xf6\x8d\x02˷\x16Y\xc5w\xeao\xdb-M\xd2vX,\xca\xecĠwYXų\x9b\xde\xf8\xbd\x05\x12\xb1\xc7²\xa9\xbd*\xdc\x1f,\x04\x89}\xec\xf6~\vU\xd5\x1f-\xa9\x02\xfcd\x81\x8d\xffl\xe19\xe6\x03zσ\x16\v;\x87\xf4V\x87-!\x88\xbfX\xfazfH\xee7=\xe7\x88\xc52\xe7QKX\xd31\xe8\xe08\xef\xf4\xbb\x05\x06\xfa\a{s\x02\xa8\xff\xa7\x85\x82\xe7I\v\xa5ؿ,\xad\xd0Z\x8c\xe4\xa7TD\xa71\xb6\u007f4|\x9c\xb1\x94\x1d\x9e\xb5H\x03\xfe\xb5@\x99\xceQ\xd8\xffYB\x95\xcf\xd35.p\xac\x17\xa1\x8dK\xaa\x80˖\x14\x18\xae\xf0\xa7\xab0\x99k\x16\x92\x9e\xeb\x16_KiI\x1d\xfa\xa6\x85\xa5\xa0\xb7\xac\xbc\xf4\xea6\x05z\x87G<\xffN\x0f\x8c-\x9fGD\x96\xdf\x033*\xe0\x91RgA\x0f죐\x87\xb8^\xd8#\x91Ob\xa5\aO\x99\xe0\xeab\x1e\x14\x1c\x8b{h\x86wy\x84\x10\x95\xf0P7%\xf5ʻ=\"\xe2{p\xc1\xbd\x1e\xf0\x99\xfb< q\xf7{(\x9b\a<\xb2\xca\xe8A\x0fl\xe9!\x0fx\xf2\xc3\x1e\x94f=X>\xeb\xc1c[\x8fy\xe0-\x8f{0\xd8'\x0f\xb7\xb0\xf3H\xc9.\xe0\x11h\rz\x98օ\xf0)\xec\xc1\xfb\xab#\xc6)\x9fxX\"\xfb\xd4#y\xe4g\x1e@\xed\x16\x0fvnUS\xfa\x02>\xb1\xd5\x030\xfe\xd2\xc3\x1a\xc56\x8fNU~\xe5A\x9e\xf55z\xff\x8d^\xf2->}\a\xff\xd9\x0es\xdaA\xe1\xef\xc4\x0f\xbb\xea\x058>\x96\xed\xf9\xe3\xec\xc5\x13^\xf1\xff'\xbd\b쥴\x89\xd2z\xcc\xd1\xf1\x94\xf1J\xa6[\xd6\xcb\xea`9/\xb8uy\xaf\x98\xe1S^\xbcd\v\u007f\x9f\xf1r\xbd\xe2\xb3^xB\x05\xaf>\x84\xe9%۫\xe8\x95\xf2F%/#Oe/j$\xcf{\xb9\xc7G\x15\xfc\xf8\x02\x9b~\x11MW\xf5b\xa3s\x15\xf9\xcb\xda\xda+\x1cG\xb5\xec(\xab{Y\x17\xa8\xe1\xc5ҕ\x9a\xda\xf5W\xbdܓ\xbd\x96\x8a\xf05/\xdf\x11\x82\xe1\xd6\xf6\xaa\x97\xd5\x11\x1d\fʩ\xeb\xa5\xf7\xd5\xcbʹ>\x85\xd3\xc0\v\x0fo\xe8\xe5\x04K#/`\xaf\xb1\x97\xac\xa4\t\xa4\xd2ԛ\xdd\xc1\xc7\v\xca\xd7\\\xfb\xd3\u009b\x87\x97-\xbdp\xcf7T\xb9\xad\xbcba\xad\xbd(2\xb6\xf1\"\xe4\xb4\xf5\xd2C\xday\x99)\xb4\xf7\xd2H;xQ@\xee\xc8\x16:y\x89ڝi\x18]\xbcZw\xea\xea\xc5\xfc_7\x19ݠ\x9c\xee^\x92\xd8\x1e\xd9q\xbc\xe9\x15\xc7\xe9\xc9;\xf5\xa2\xc4\xdf\xd2\x0e\xe6z\xb9_Lo~\xdd\xc7+H\xd5\xd7+\x90\xde\x0f\u007f\xfb{\xc5\xdf\x06\xb0\x1f\x03\xbdB\xd5\ay\xc5c\aC=C\xbc\x882C\xbd\x98\xfe\x1e\xe6\xd574{\x05_\x1c\xbc\xc8\xe9\x15z\xea\xf2\"mq{\x89\xd3\x06\x84`zQ\x01\xb4x\xb5\xc7˒\xb8W\x85\xe1\xa3\xfc\xfd\xe8S\xc0\v\x12\x19T\x03\by\xa5\\\x1e\xf6\x02\xc1\"^\x84\xa8\xa8\x17Ō\x18m \xee\x15HHx%\x8e\xda^0\xbe\xa4\xba`\xca\xcb(\x95\xe6\xe5\x19X\xdd\b/+0#\xbdxz{\x94\x97\b4\xda\xcb\xc4l\x8cW2\xa4\xb1^бq\x1c\xcc\xf8\xac\x02&Ћ'\xaa\x95N\xf2\xa2\xa8;Ye;\xc5+\x81m\xaaW\xa9\xdd4\bn\xba\x97\x1cn\x06\\}&,r\x96\x97[\xdd\xcf\xf6\xb2\xa8<\xc7\v~7\x97\xc6>\x8f\xad\xce\xf72\xa4-Ț\xdcB\xaf\x84\xedE^\xc2\xefb/\xa8\xc5\x12/V(-\xf5\x82\x19-\x83\xb4\x97{I\xf3Vx%SYIo_\xe5%\xe1X\xad\b\xb1F\xfb\xb0\xd6K\x8e\xf8\xb6\x17\v\xfc\xdeQ\xe3}\x97@\xf5\x9eW\xe2\xf1:\x88x\xbd\x97I\xd2\xfb\x94\xfb\x06/\xa8\xd9\a\x94\xedF\xbdn\x13.\xf8\xd0+\xb1\xfa#/\x92\xb4\xcd^\x06\x8e\x8fUݟx\xb1\xb1\x9dz\xe1g^!W[\xbc \x8b\x9f\xab¾\xf0\x82\xe2o\xf5\xb2\xc6\xf4\xa5\x17\x95\x9dm\xc4ï\x88\x83_\xab \xbeQ\xd8\xfa\u058b\xca\xf0w\xfaq;\x9caG\x168vz\x91-\xecR\xb3ڭg}϶\xf6\xc0\xd2\xf7j\x8b?(h\xed\xf32~\xed\xa7B~\x84p\u007f\xf2\xa2f\xf3\xb3\x97S\x14\a(\xa7\x83\x14\xf2!\xda\xc7a/\x9fĤ\x84~\x85\x93\xfc\xe6\xe5Z\x82#^)\xf0\x1cew\x8e\xd1\xc1\x8f\xc3R~W\xcd\xfc\xe1E4;AG\xf8S\xbf=\xe9%+\xf8\v8\xff\xb7:\xe0)/\x99\xcei\xc2\xd1?^N휁\xfc\xcf\xea\x8f\xffzY\x8e<\xc7\xc1\xfe\xe7\x05\xcb<\xcf{_\xf0\xb2\xe8qы\xe0\t\x1b\xbb\f\x80\xbf\xe2EȽ\xea\x95t\xf6\x9a\x17ˢ\xae{%7\xbb\xe1թ\x97\x9b\x10\xc9-/\x88\xc5\xed\xac\xac\xef\xf0ѥ\xee\xf4\t \xe4\xf3!\x11\xce\xefC8,\xe0\xc3\xc0\v\xfaD;\x85|\xc2:\n\xfb\x10m\x8b\xf8\xf0\x82\x86\xa2>t\xb2\x98\x8f\xcbÊ\xfb \x8c\xbb|һ\x12>\b\xbb\xa4\x0fXt\xb7\x0f\x13\xfb\xf7\xf8\xf2\xa0\xf7^\x9fd\xac\xf7\xf9\xb0{\x8f\x0f\xd5\xf9\a||\x88\xc4\a\xc0{ȧ\xa5ڇ}\xb0\xf3G|\x88\xf4\x8f\xfa\x10\xbb\x1f㹏\xfb\xe0SO\xf8\xc8\x06\x9e\xf4\t\xa6\x94\xf2\x89˖\xf6!\xca\xe5\xf8\xb0q\x8fO4Z\xd6\a\xe6_\xce\aɔ\xe7\xe1)\x9f\x84\x89\xa7}\xcc\xea\x9e\xf11>=\xeb\x13}T\xf0!\xc1z\xce'H[\xd1\a\x8b\xa9\x04AT\xf6\xb1J\xfd\xbcO^1]\xc5ǂ\xe8\v>ݥ\xc0\xc7pP\xd5\a\x06\xfb\x92O\x96S\xbc\xec\xc3+\x99}\xc2\v\xab\xe1\xff\xea>ZJ\r\x9fl\x85Y\x93\xe2|\x15\xed\xd7\xf2Ѣ_\xf3х_\xe7@k\xe3\xc7:\xbe\"\xf5ܹ\x03r\x87\xf7˩\xeb\x83q\xd7\xf3q=e}\x1fK2\r\xd8׆>Up#ꨱH\xbe\x89\x0f\xf3\x86M}Hכ\xf9đ\x9a\xfb\xe0\xcd-0\xea\x96\x14\xd3\x1b>L\u07b7\xf21.\xb4\xa6\xc4\xdbh\x87\xda\xeaP\xdb\xf9Ġڳ{\x1d|\\%\xd2\xd1G\xd7\xe9\xe4\x03\x1aw\xf6\x11\u07ba\U0002cbbcY7\xfd\xb6;\xbf\xed\xa1Cx\xd3\xc7Ģ\xa7\x0f̾\x97\x8f\xf5\xf0\xb7|\x9cS\xcc\xd5[\xf4\x86F\xfb\xe8\xc9}y\xa3~>\xd2\xcb\xfe*\xbd\x01\xbe\x82Ͱ\x87\x0fMh\x10\x0f\x83E\nC|Ȩ\x87\xfa\xe8\xa4\xc3\xf4\xcaἫ\x83\x83u\xd2\x13\\>0\x027ni\xb0\xbb\xa6\x98\xfb\x90A9\x16\xe4\xe7\xf11\x16y}\x1a }(F\xf8}|\x9c<\xe0\xe3\xfctP\xc7\x18R\xe1\x85y\x9b\x88\x8fS Q\x1f7[\x8b\xf9\xf8\n\xf58|(\xe1c%\xc2\xf6q\xca \xe9c\xa5\xd5\a\xf2\x93\x86=e|Ą\x11\xf4̑>\x86\xb0Qڝ\xd1>\xc9-Ơ\xabc\xa1\xe3qt\xb2\xf1\x1c\xee\x04\xb5\u05c9>d;\x93|Ȣ'\xfbPt\x9a\xe2\x138\x99\x8a\xbeL\xf3aw\x9d\xe9>\xb0\x9e\x19>f\xd43}\\\x92;ˇ\x95\x01\xb3q\xea\x1c\x15\xc9\\\x1f\xd9\xfd<\x8eu\xbe\x0f\x14r\x81vx\xa1O(\xc4\"\xba\xe2b\xc2\xc4\x12\xd5\xc9R\xf5\xb1e>\t\xf0\xcb}\x98\xbd\xa4\xed\xacT\x03[\xa5\xee\xba\xdaG\x18]C;X\xabx\xf6\xb6O\xb8\xc8;4\xf8wU\xe8\xef\xa9P\xd6\xc1\xf1\xd7\xfbP\x1cx߇\xca熼v\xfb\xe5i\xf5\x03\fa#U\xbdI\xd1\xe5C\x9f.\xf8\xa1\xd06\xf3\xf010\xf3\x13\x1f\x8b͟\xfa\xb8\v\xdbg>\x99\xae\xd9\"\x96\xf6\xb9\x0f+~ho[}\xb2\xc0\xfaK\x1fc\xd16\x1f\x97\x8a\u007f\xe5C\xc1\xfek\xa0\xe17\x1c\xe2\xb7>\xbe\xe1\xf5;\x1fJ/\xdb}\x88\x17;t\xc0;9\xd0]\xe8\xe7n\x1f\xa7\xac\xbf'6\xeea\x03{}Hz~\xa0\x16\xf7\x11c\xf7C\x96?\xfa\xa4\xd0\xf7\x13\x87\xf7\xb3\xda\xd5\x01\x1f(\xdf\xc1,\xee\x1eR\xcf;\x8c{\xfc\xe2\x93\xc9\xf1_U\x86\xbf\xc1\x94\x8e\xe0\xefQb\xfc1\x9f\x86\x98\xe3\xaa\xf8\xdfiE\u007f\xb0\xff'|,\xb9\xfd\x89\xd6N\x02\xa2\xff\xc2\xff\u007f\xfbPW8\xa5f~Z\xbb\U000cf3f3\x16g\xd8˳>\x89s\xff\xfa\xc8\xc2\xcf\xf9P\b\xfb\x0f\xe0~\xde\xc7hy\xc1G\xc2tQ\x15|\t\xd0t\x99\xeerE\r\xee\xaa\xda\xec5\x9f\x96#\xaeSh7\x80\xc17\x15\x93n\xc16n\x03m\xef\xf0so\xb9;\xfd\f\xce\xf9\xfc\xe8P~\xbf\xb2\xc6\x02~^SЏ\x00U\xc8O^U\xd8/hQ\xc4O\xd7.\xea\x17\x0f,\xe6\a\f\x17\xf73\xd8\xdc\xe5\x87hJ\xf8E'%\xfd@\xf2\xbb\xfdx\xd4\xd2\x0fۺ\xd7O;\xbe\xcf/t\xe3~\xbfN\xa9<\xe0\x17;y\x10\u007f\x1f\xc2m\x1e\xf6c\xe5\xcf#~\x11\xe8\xa3~\xf1\xf0\xc7\xfc(\xbf?\xee\xd7\xdd\xedpޓ~:c)?\x89Si?\x02T\x8e_L\xb4\f\aV\x96\x87r~<\x91^\xde/\xaf;zJ\a\xf5\xb4_\x03\xca3\xec\xfa\xb3\xaa\xf9\xc9\xe9\xaa\xfb1\x19_Ï\t\xf6\x9a~n\xe4\xe3\a%\xaa\xc5\xc3kh\xf6\xf5\xbc1\xca\xd8j\xfb\xb1ַ\x8e\x1f\xcb\x06\xeb\xfa\xc5\xf1\xeaA@\xf5\xfd\xb2\u0c81_\x1c\xb7\xa1\x1fs*\x8dt\x80\x8d\xf5\u0604#j\x8a\xf3\x9b\xf1Cs?'T[\xf8\xe1Q-\xfd\x9a\xa5\xbeA\x81\xb5\x82\x92Z\xb3+m\xfc\x98-j\xcb+\xdb\xf9\x99\xed\xb6\xf7\v}ꀿ\x1d\xfd\x92\xdbt\xf2\xcb\"\xbf\xce<\xad\x8b\x9f\x13\x16]\xfdH\xaf\xba\xf9\xf1V\x83\xee~1\xf2\x1e~\xbceҏ\xb8\xde\xd3O\xe2\xd0\xcbϔ\x11\xea\xcb\xf5\xb3 \xde\x1b\r\xf7\xf1\x8bo\xf6\x85\xd6\xfb\xf9\xb5\xa0\xd2ߏe=ڛ\x81~\xe6+\x83\xd8\xe8`?ʐC\xfc@\x96\xa1\xec\xd20\x98\xe3p?\xd28\x87\x9f\xe0\xe3\xe4G\x97\x9fY\x94\xdb\x0f\xf2l\xf8\xe9\xf7\xa6\x1f\xe5*ˏ\xa0\xe9\xf1\x8b'y\xfd\xa8K\xf9h\xff~?\xd6\x0e\x05 ܠ_\x92\x8b\x90j9\xecǺ\x90\x88\x9f\x01)\x8aQ\xc4\xfc\xacP\xc4y\xa3\x04\x1b\xb3\xd9\xc3$NI\xf9\t\fi?\"X\xc6\x0f\xb4\x1b\xe1G>3\x92\xca\x18\xe5\x17<\x18\xed\a,\x8d\xf1\vc\x1e\xcb\x0e\x8dӁ\x8d\x87f&\xf8u/;Hk\x92Z\xc4d?+\x15S\xfc\x12S\xa6B\xd9Ө\xa8鰭\x19\x18\xe9L\x1a\xc3,?#\xfelmy\x8e\x9f\xb5蹐\xe7<\np\xbe\x9fa`\x01\xae_\b{\\\x04\xdb\\\xccV\x96\xf8\x19q\x96BRˠ\xcc\xe5\x18\xc5\n\xb4\xb3\x12\x17\xae\xf2\x13\xa8W\xfb\x11\xca\xd6\xf8\xb9\x88y-\x8d\xe3m8\xc5;~V\xfa\xdf\xf5K\x9d\xe0=Jp\x1d~Z\xef\xe7b\x93\xf7\xe9(\x1b0\xbe\x0f\xe8f\x1b\xe9ߛ\xfcX[\xf3!:\xf0\x11\xfen\xf6#\xf5\xfd\x98\xee\xf3\x89\x1f\v\xef>\x05\xca}\xe6\x97\t\xa3-~\xacx\xfc\x1c]\xfc\u008f\xa7\x93\xb6\xe2\x97/!\xfam~Dܯ\xfc\xc8Y\xbe\x86<\xbfQY\u007f\xab\n\xff\xce\xcfh\xbaݏ2\xe7\x0e\x1ev\xfau\xbeq\x97\x1f\xf9\xc4n?\xf7w\xf5#\xde\xed\x01\x9a\xee\xf5\xb3\xa0\xf0\x03\x8dd\x9f\x9f\v\a\xf6\xfb\xf1>\x10~\xf9\x13\x06\xf23\xdc\xe5\x80_Ҥ\x83~L\x97\x1c\x02\xb2\x1e\x86\xa8~\x81\x8c~\xa5\x05\xfd\x06o=\x82\x9f\x8f\xfae\"\xf8\x98\x1a\xeaq`\xd7\xef~\xcd\xfc\xffЎ\x9f\xa0\\\xfeT\xdb9I\x8f\xfe\x8b\xf7\xff\x9b\x87S~\x14XO\xfb%M\xfc\a\xb29C\xb3<\v%\xff\x9bm\xf4\x9c\x9f\xd4\xfb?^w\x9e']\x80\xcc/Ҫ/\xe1\xf2\xcb<\xe1\x8a\x1ft\xea*e\u007f\xcd/L\xeb:\xe4|\x83\x1e\u007f\x93\xeeqKm\xe36\xac\xff\x8e\x80\xd8ם\x01<\t\x95/@֝? ?\x15\bH\xb9\xa4`\x80n_( \x8eW8\x007/\x12\x80\x1a\x8b\x06(\xe7b\x011\xa2\xe2\x01\xed\xf9]\x01\xd1{\x89\x00\xebt%\xb5\x81\xbb\x03x\xcfr\x00\x94\xf2^\xb4v_@\xc0\xe0\xfe\x00\xc4\xf4@\x00\x1d\u007f0\xc0\xcd\"\x1f\n\x90,=\x1c@6\xfcH@\x84\xf3h\x00C}\x8c\x87\xc7ٙ'\x02|\a\xef\x93\x01\xb2\x95R\x011\x89\xd2\x01\x1aUN\x80%\x8b2\x01Qfـ\x18A\xb9\x80е\xf2\x01,\xcbx*\x00\xe7{: \xa2z\x06\xe2x6@*Z\x017}\x0eҨ\x18\x10[\xaa\x14@\xd6V9\x00Y?\x1fИP%@6\xf3B\x00\xef\xbd\xca\n\xa2j\x00\x8e\xf7R\x00U\xaf\x97\x03\xe4m\xaf\x04Dk\xd5Г\xea\xb8C\r\\V3\xa0\xc5R\x8e\xae\x16/~-\x80\xc4\xedu\x9cX;\x00$\xa9\xc3C]\x88\xaf^\x80+;\xeb\a\x00\x00\r\x02\xb0݆8\xbfQ\x80Yz\xe3\x00\xd6\xd8\x04\x88\x9aM\x03x*\xb8\x19\xef\xd3\x1cg\xb6\x80BZB0o\xe0\x9bV\x01F\xef\xd6\xec}\x9b\x00\xbc\xb1m@\x96\x03\xb6\xa3\xcc\xdaCf\x1d\x02ʭ:\x060/\xd6\t\x97wfw\xba\x04\x98\xb2u\rH\xad\xab[@\xb7\xdf\t\x10/{\x04h\xe3o\x06\xf0v\x9d\x9e\xe8D/^\xf9V\x80v\x9a\x8b;\xf6\x0e\xc0x\xfb\x04\x88^}\xa9\x87~\x10b\xff\x00*K\x03p߁\x01<\xb5?\x88\xbd\x1e\x9cUŐ\x00\xb7\xdf\t\x90\xb8\x0fÝ\x86\a\xc8R\x1d\x1c\x8eS\x1bwi\xef\xdc\x01\x01\x03#\x00l4\x03xB\xda\n\xc8\xda!O\x00\xcbK\xbc\x01\xad;\xfa`6\xfe\xec\xc7@\x80\x99]\x10\xdd\v\x05\xb0\x8a+\x1c`98\x12@\x95,\x1a\xd0\xe5\xc115\xf88\xbc&\x11\x00յ)\xcad\x80\xd41\xc5k\xd2j\x97\x99\x00\xd6\x14\x8e\xe0\xb7#\xd5\xd2G\xa1k\xa3\x03p\xf61*\xe9\xb1\x01\xd2\xd5q\x01\xe6\x88\xe3\x03\x12\xe5&\x04\x10\xfc'\xb2\x81I4\x84Ɂ\xec\f\xfc\x14~?5@\xe60Mۚ\xfe\xff\x13f\x04t\nq\xa6\xaawVVγ\x03\xa8\xda\xce\t\xf0\xe1\xe2\xb9\x01y\x82j^\x00\xb5\xa5\xf9\x01A\xdd\x05pυ\x012\xe5E0\xfdŰ\xbb%\x01\xb2\x82\xa5\x01\x94,\x97\x05\xb0\x16d9\x95\xb3\"\x00\xc8[\x89\x06Wa\xa8\xab\x81(k \xe4\xb5\x01\xc1ӷ\xb3\x1ax\x87#x\x97\x87\xf7t \xeb\x02\x9c\x12Y\x8fK\xde\x0f\xb0\xb6\xbfAE\xf3\x01\x9a\xd8\x18`\xbdu\x13T\xfa!\xc4\xf5\x11;\xb4\xf9\xff\xe3\xff8\xa0\xef\x00a\xdf>\r\xf0\x05t\x9f\x05Hm\xb7d\xa5\xf1y\x00\xc9\xce\x17\x01R\xaf\xad\x01L\x12\u007f\xa9\xc2٦\xba\xf9*\xdb\xeb\xaf9\xe2oxڷ\xda\xdaw\xb4\x85\xed\xb0\xc6\x1d\x01\xe4\r;\x03\xe0\x9d\xbb\x02x]\xd9\ue03e\x19\x92?\xee\t\xb0h\xb27\x80-\xcf\xf5\xc7}j\xfa\xfby\xe9\x8f\x01n]\x17`\xe4\xfc\x19\x83?\x10`)\xf8 \x8d\xe8P\x80\xe1\xee\xb0\xf6\xe4\x17\xb5\xb4_Ք\u007f\xd3㑀&GG\x01\b\xc7\x02B\x02\x8e\aP\xb1\xf8];\xf3\x87\xba\xfa\x89\x00\x8b$\u007f\xea\xb5'U\xfa\u007f\xe1ҿ٫S\xfa\xe3逐\xe1\u007f\x88\xb6g\x02,\xbb\x9d\r0\xfb\xffW\x03̹\x80\xa6\xb0\xff\x05XH9\x1f`fx\x81ҿ\x18\xe0\xeek\x97\xb4\xd1\xcb\x01d\xb0W\xf4\xe3U\x8e\xf5\x1a\x0f\xd7\x03R\xbc\xbb\xa1\xa1\xe4&\f\xe5V\x80\xbb\xf00\xe8\xdd\x11d\xed\xe8\xce .\xc8\x17,\xdc\xd14\xacގ\x9c\xfcA\t\xb9\x05\x82\x82B\x05\x83\xf4\x8bBA\xa1\r\x85\x83d\xfaE\xf0[\xd1 q\xbeX\x90FT<\x88\xa7\xfa\xee\n\x8a5\x97\b\xd2/J\x06\xc9J\xef\x0eJ\"pO\x90%\x97{\xb5\xd9\xfb\x82X\u007fx\u007f\x10+W\x83\x12\x99\x1e\f2\xf3{((r|8ȉ\xbcG\x82\x84\xfcG\x83:\xd1\xf8X\x10|\xff\xf1\xa0\xb0\xd7'8\x84'\x83\xf9[\xe5\xe6\x94\nb\x94\xa5\x83\x12Tr\x82ble\x82\xb0\xbc\xb2A\x94\x99\xca\x05\x81:\xe5\x83\xfa~\xe5\xa0h\xf9\xe9\xa0\x04\xc7g\x82R4\u007f6\x88Փ\x15\x82\xa8\v=\x17\x94yЊA\tv\x95p\xbb\xcaA\x9a\xd3\xf3A!\x16U\x82RK}\x01\u05ff\x18\xc4#TU\x83\xc8\"_\n\xf2\xf9Ƞ\xac\xe4{\x85\xdfU\v\xc2j\xab\aQ\xc0\xaf\x11\x94\x82jͼ\xef\xfa\xf9s^Ց\xd7\n\xaa\x1b\xbd\x16\xa4\xb9\xbe\x9e7h\x875\xa4_N\xed q\xb3N\x10\xa5κA\xa0_\xbd\xa0\x18W}\x0e\xbbA\x10\xf0\xd20\b\xc0h\x14\xd4\xfc\x10\xa2m\x92m\xb8i\x10롚\x05i_̓\xc4\xc5\x16A$*-\x83\xacƾA}\xb6\nʞ\x15\xad\x83R\xa3n\x13\xd4D\xba-%\xde.Hgh\x0f\x83\xe8\x00Iu\f\xb2\xf2\xda\t\xb2\xec\x1cTj\xd1%\b@\xed\x1aĬa7t\xa8;\xb4:(\xa7G\x90\x05\x837\x83:\xc3\xd8\x13\xd7\xf6\x82L\xdf\n\x82 \xe7\x06%\xac\xf4\x0e\xcaR\x94>\xd0j\xdf Y^\xbf\xa0\xb8|\xff Aw\x80Jq`\x10Ӫ\x83\xb4\x87\x83i/C\x82\b\x11C\x83\nl\xc3Ԣ\x87S-\x0e\x0e\xcb\x19\x04\x93s\xa9\x95\xba\x83\xba\xc3k\x90+\x85M\xf4\xce\n\"\x97\xf7\x04\xc1a\xbcA\xa6/\xbe \x9c\xcb\x1f$[\v\xe4}\x9d;\xc0\x91\x13T\xc3\x0fq0\xe1`\xbe\xd69\x91 \x01-\xaa\xb7\x89i\xcf\xe3A\xa1\x18\t\n\xca\xce\xeb\x8al\"\x00y\xa5\xf07\x8d\xbf\x19X\xd5\bj}d\x90+\xa3F\x05\xc5\xcfGkCc\xd41\xc7\xc2\x15\xc6\xf1\xd4\xf1Y\x19O\b\x127&\x06Q-\x9e\x14\xe4L\xcf\xe4\xa00\x8a)A)gL\x85Z\xa7\x05Q\x8a\x9a\xae\xa2\x9a\x11\x04\x1e΄rf\x051]1\x1bw\x98\x13$]\x98\xab\x03\x9b\xa7\x864\x9fW,\br_\xbd\x85\xaa\xa9E\n\r\x8b!\xce%\xd0\xe2R\xdcw\x19\x1ck9\xbdvE\x10U֕\xb4\xf9UA\x84\xe0\xd5*\xb35Als\xb2VG\xfcv\x90\x99\xe7;\xea(\xef҄\xdf\vj%a\x9d\xfa\xc3\xfa !\xf8}\x85\xb0\rYX\xf9\x000\xb5\x91ְ\x89\xd6\xf0a\x10\x19\xe6GA\xce&o\x86\x80>\x0eJ@\xfdD\xe1\xe9S\xed\xceg\x10ؖ p\xfe\xf3\xa0\xf2\xc9/\xd4#\xb6\x06\x91w\u007fI$ئ\xe2\xf8*\xa8\xb0\xffu\x90[;|\x13d\xe1\xf6[\xde\xfe\xbb \x03\xcfv\x8acG\x10\xd3u;\x83\xa0\xb1\xbb\x82\f{\xbbU\xe4\xdf\a\x11\xc8\xf7\x04\x11\xe8\xf7\xe6\x8dcА\x9c\x1f\x82\x98\xf6\xddG\xdb\xdb\x1f\x94\xcc\xeb\xc7 \x93\xf8\x9f8\xb8\x9f\xd5^\x0fК\x0f\x061\x83t\x88\xd2=\x9c5\x99_\bo\xbf\x06\xb1\xf2\xf97\xbd\xe7\x11\x1d\xfc\xd1 \xe9\xc0\xb1 \x03\xf4\xf1 wG\xfc\x1d\xf1\xe4\x0f\xf8\xec\t\xd8\xee\x9fA\x12ӓA\xc4\xf9\xbf\x14\x06\xfe\xa6\x85\x9e\xe2\xb8O\a\xb52\xfb\x8f\xc2\xe0\x99 JigU\xd7\xff\x06奰\xe7\xd0\xec\u007fA\xb0\xea\xf3h\xfd\x02@\xfab\x90sޗ覗\x83\x8c\x84W\x82 \xb1W\xb3B\xbf\x16\xc4^\x00׃d67\x82`.7\xe1G\xb7\x82\xa8%\xdeΞ{GH\xcc\xf2\xce\x10\xb6\xad\v\xe1\t\xff\xfc!\x89R\x05Bb5\x05C,h\x14\n\x01\xe9\n\x87duf\x91\x10-\xadh\x88\x02.\x16\x12\v)\x1e\x02r\xdf\x15\x12\xbaX\"\x04\xf5\x94\f\xc1\x95\xee\x0e\x89y\xdd\x13b&~o\b\xeb4\xef\vQ\xb4\xf7\x87\n\xb7\xcf5\xe4\xbd\xfd\x0f\xf0\x87\aC\x12\xe6\x1f\n\x91I<\x1c\x92\x84=7\xe7\x91\x105\xf2hH\xbc鱐\x94\n\x1e\x0fI\x98{\"D\xa4}2DvX*\x04w*\x1dby9'$N]&D\t\x97\r1^\x86`L\xe5Cxf\xe4\xa9\x10\xc9\xde\xd3!\x06\x8fgBj\xe5φ\xe0k\x15B \xfeυ\x90mTԞT\n\x89\rT\x0e\xc1\xaf\x9e\xe7oUB\xb0\xd5\x17B\xd0\xc0\x8b\xa1\x82Ms\xcdܜ\xaa\xfc\xf8R\b8\xfarHP\xe1\x15\\]\r\x92\xa9\x1e\xe2{C0\xb4\x9a:\x9cWCȻj\x85\x84\x92\xbf\x16Ұ\x19\xa2}\xd6\x0e1_\xad\x83Kꆈs\xf5B\xc0\xd7\xfa\xecD\x83\x10l\xab!\x87\xda($\xeao\x1c\x82k4\t\xa1N\xd34D\xa8h\x16\u009eR\xcdCR*h\x01ѶTݾ\x01ݶb\x8b\xadu\x04\x18\xe8\x10\xc2\n\x90\x8e\xfam\xa7P^\x1c\x19\x9c\x97v\x86\xe8\"]\xf4\xf2\xae\x18|7\xfc\xed\xae\xfa\xe9\x11\x022\xbe\x19b\x82\xdb\x13\xbd\xee\xc5q\xbd\xa5B\xc8\r\x15\xc9\x13\xf9pCV\xb0\xaa\x1c\xfap\xac}U<\xfd8\xcc\xfe!\r\xd4\x03BB'\x06\xeaɃBD\xd2\xc1jbC\xf2\xfa%ǡ!\xbca\vF5<\x04hvh?\x9clХ#p\x87$32 )3\x84\x8dw8rO\x88\xe5`o\bUO\x9f~\xf4\x87\x84O\x05B\xdc\xf65\x84J^(D\xdc\x0e\x87\xf0\u0590\x90\x94\xb8\xa2!,\xa5\x8cQ\xdcq\x1dMB\xe47\xac_\x8e\x1d\x12(H\x86P\x19K\x85\x04\xac\xd3!\x04\xbaL\x88\xb5\x84\x11!T\aG\x86P\x8d\x1b\x85\xf3G\x87\xc0\xb4ǰͱ\x18\xe3\xb8\x10\xe3f\xa8h+kH\xee\xb0A\x86#gB(\u007f;G\xceĐp\xe2I8i2\xcdu\n\xccujHXݴ\x90\xd4֦\x03\x05f\xa8;\xcfT-\xcf\xc2E\xb3\xe1\xfesB\xe4\xa1s\xf1ݼ\x90\xe4:\xf3\xf1˂\x10\x91\u007fa\x88\x1cf\x11F\xbf8\x84pI!/\xd5\x06\x97\x85\x10\xa3\x97\x87\xb2[ج\b\xa1ܴ\x92#Y\xc5A\xae\x86\x81\xae\xe1wk\xf3\xb0\xc4\x1ab\rs\xe4\xbc\x1d\xd2W\xb6\xbc\xa3b~\x170\xf0^\xf6\xebu!<{\xb9>\xc4*\xd9\xfb\xe8\xe8\x06v\xe0\x03X\xe4F\x8c{\x13\xfa\xfe!e\xf8\x11;\xb09\xa4)\xd5\xc7\xec\xe1'!V\x98>\r\x91}|F\x1c\xdd\x12*\x94\x87\x99yv\xffy\b\x9b\x13}\xc1\xc3\xd6\x10\xa3ԗj\x85ۨ\xb3\xafB\\U\xf3u\b\xb1\xf0\x1bXط\xda\xf2w\x00\xe3\xed\xea#;\x885;C2װ\v=\xdfM\xd3\xfa\x1e\x83\xdc\x03[\xda\x1bB\xfd\xfd\x87\x90И}!\x94\x80\xf7\x87\x10\n\u007f\xd4.\xfc\x14B\xc0\xfd\xf9\xffR;\x10\xc2\xcb)\x0e\xfe_\xe4\x87\xf4\xcc\xc30\xf5_8\x82_)\xf9\xdfBH\x85\x8f\xa8\xed\x1d\r\xe9\x9c\xd81\x18\xc9q\x9e\xfb;\x0f\u007f\x84P\x13:\x818\xf3gV\t'\xb3\x97\xfc\x15\"\xd3\xfc\x1bpv*\xc4e\x83\xa7\xa9\xd4\u007fT\bgT\x93g\xd9ֿ!>\xeet.\x84\xc8\xfd\x1f\xe4p>\x04\x96{\x01>y\x91\xbf\\Rc\xbcL\x8c\xb8\x82\xa1\\\r1?\xb8\x16B\xb5\xe8::v#\xc4(\u007f3\xa4\xe4\xe0\x16\u007f\xbd\x1dB\xdd\ue3b0\x98ڝaT\xcb\xf3\x85i\xa5\xf9\xc3X_U \f\xd3)\x18\xa6y\x17\n\vn\x15\x0e\v-)\x12\xc6\x14}\xd10j\xa8\xc5\xc2(~\x15\xe7\xe1\xae04P\",Y^ɰ\xf8\xc2\xdda\xechvO\x18\xfb3\xdd\x1bF\x15\xe1\xbe0\xe8\xd7\xfda\xa4\xe0\x0f\x84I\xdb\x1e\fc\xde1\xcc\xc7<\u0080\x82G\xb4\a\x8f\x86Y\x8eE\x9f\x1f\x0f\xf3\x95\xcca\xb0\xa5'ٓRa\xc6\xc902\xa4\x9c\xb0\xb8g\x990\x17\xe2\x96\r#\x14\x97\v\xc3\xeeˇ!\x86\xa7\u0088\xe6O\x87\v\xb6\x184\xf8\x18\x86\xe5\xbe\x12\x06g\xaa\x16\x16\xec\xae\x1ef~Z\x83_\xd6\f3}y5\f\x8c\xaa\x15ֵ\xabh\xee\xf50bH\xed0\xa3[\x9d0\x82|\xdd0\xb1\xbb^\x98\xef\xd6\nklh\x10\xa6Y5\fK\x11\xbaQX\xabg\x8dÀ\xd9&aA\x81\xa6a1\xe9f\x94~\xf30&\xc6Z\x84\vv\x96`\xd82L\xaf\u007f\x83Rm\x15\xe6\xb6\x19\xad9\xa66T\\[v\xbb\x9d\x8a\xa4}\x18\xc9j\x870\xf0\xa4c\x18\xeb\xba:\x855\x11\xed\x1c\x16o\xef\x02Qv\r\x13\xa0\xba\xe9\xb1{\x18\x13v=\xd8\xfa\x9ba\xa9\xda\xf5\fӖ{\x85\x99\x9b\xbc\x15ƴ_n\x18!\xacw\x98\xf9C\x9f0\vD}u\xbc\xfd \xab\xfey\xe7\xe6\xc9z@\x98p<0̂\xf5\xa00}f0mk\bu6\x94w\x1d\xa6\xf7\x19\x1e\x16\x8cr\x841k\xe0\fc5\x89K\x1br\x87%\x8a\x1aaup3\xacي\x15\x06\xab\xf5p\xc8^Z\x8d/L`\xf3\x87\xb9\xe06\x10Fx\n\x86\t\x89!Ud8,\xb8\x1c\tg_CI߉Q+\xf10\xe7$\x12\xda\x01;L\x96\x96\xa4\xf7\xa5\u0098\xfeI\xab\x183a\xe0ሰ0\x9e\x91\xfc0\x8a\xa3\x1b\xad\xe6:\x06\x06:\x16R\x1a\x17f\x96<>\x8c\xf2\xf7\x840\xa6\x9d'\x861\xc71\t\xa7LV3\x98\x02\xe5M\xe5\xc0\xa6\x85A\xec\xa6g\x8djF\x98i\xd0Lx嬼\xd6\x1cCrf\xe7\xf9S\xae\xd1/gNXww\r#\xaa\xcc\v㉸\xf9a\xc1\xb5\x05\x18\xfa°\x02\xe7\"\xb5\xa3Ū\x89%\xea\x0eKØ\x9d\xc4\xdf\xe5a֮W\xe0\xd3J\x8aaU\x98\x94b\xb5\x1a\xc1\x9a0\x1f\xd9Z\x1b\xe6\x16\xaf8\xf7\x1d\xdaػ\xbc\xe4\xbd0\xd3\xfcuanS\xb4>̹\xf7\xf7ì\x86m\bca\xf2\aa\x04\xbd\x8dD\x8cM4\x8a\x0f\xc3Xj\xf3\x11\x9a\xdd\x1cֵ\xact\xefO\xc2\\U\xf2\xa9z\xf6g\xaa\xed-8\xf9\xf30_E\x19\xc6D\xeaV\x15͗a,\x8c\xd9\x16F\x01\xe1\xab06\xe7\x01\xd8|\x13f>\xfamVD\xdf\x11\x9d\xb6\x87\x91\xf5\xed\bc\xd9\xf3\xce0\xd8\xff.\xa0\xf3nm\xf4\xfb0\xa8\xdb\x1e\x88x/l\xfa\x87p!\xa1}Cs\xf6\x855\xd4\xef\x0f\x17\xceS\x92\xec\xba\xf9#\xce\xf8)k\xd0?\xab\xed\x1e\b\vO?\xa8r=\x14\xe6\xea\x8e\xc3:\xa8_0\xa8_\xc3$\x9c\xbfe\xb1\xe7HX\xe2\xd4Q\xf6\xeaX\x98y\xef\xf10k\b\xbf\xd3\x1e\xff\b\xa3\xb4w\x02\x0e\xf5'm\xfed\x98\xdc\xe1\xaf0#\xe5\xdfj֧\xc2L\x10O\xebm\xff\xa1Z\xcf\xc0B\xcf\xf2ÿ\x18\xfc\xb90\xd2\xde\xff\xf4\x9e\xe7y\xaf\va2\xe4\x8b*\x9aKz\x9f\xcb\f\x1cW\x88\x06W\xe15\u05c8a\xd7i\xe97x\xc6ͬs\xde\n3q\xbcM\xf0\xbd#\x82R՝\x11}7e\x84\xed珈,\vD\n\xb6\xca\xf5\xe6\xe6\x14\x8c\x14n\xdd\xd7!\xb4\xbeP\x84\xe3)\x1cAf[$B\x16^4\x02\x9d\x16\x8b\x88ދGh\u007fwE\x84픈\xd0\xfdKF\x84\xee\xdc\x1d\xc1J\xa2{\"\x8c\xd1\xf7F\xa8\xa3\xfb\"X\xb9u\u007f\x84^\xf3@$\xbb\xb2\xe5\xc1\bz\xff\x10{\xf9pD\x9f\xe5\u007f$\"\x10\xf0h\x84\x98\xf8X\x04n\xf1xD\x84\xf9\x04\xafx2Bh*\x15\x01\xb1*\x1d\x91\xbabND \xa0L\x04;藍0\xd9)\x17\xa1e\x94\x8fH\x9c}J\xaf{Z\x05\xf1\f\xdb~6\x92\x87=nGN\x85\b|깈\x10\xf8\x8a\x11\x82F\xa5\x88\xd0\xee\xca\x11\xc1\x83\xe7#\x88\xcfU\"P\xc8\v\xe8\xe7\x8b\xdaV\xd5\b\xc0\xfa\xa5\x88&g/G\xe8\xf3\xafD\xb0\x14\xbbZ\x04\n\xab\x1e\x11s\xaf\x11\x91\xc0V3\xc2J\xc1\xab\x11\xaa\xbfVD(\xd2k\x11\x06\x8e\u05f5\xdd\xda\x11\x01\xad:\x11V\xad\xebF\x00\x85\xf5\"p\x9e\xfaY\x915\x88\x10\x1d\x1aBG\x8d\"X\x8b\xde8\x82U\xefMT\x1dM#Z\x05i\x16\xc1\xc3\x0f\xcdE\xcb\xc3rZ`\x14-\xf3t%\x0fǾ\x11\x01(\xb7\x8a`c\xae\xd6ڗ6\x11\x84\x8f\xb6\x11&\xec\xed\"\\o\xd6>\x02\xdaׁC\xeb\xa8]\xec\x14\x01\xf7\xec\x1c\x01\x9ev\x89\x88\xddwe\u007f\xbbEX+\xe8\x1e!\b\xf5\x88`\x93\xe87\xd5Pz\xca]\xf3\x02jDW\xbcF\x80\x1e\xb9\xecRo\xf6\xa1O\x04+\x05\xfbF\x98<\xf6C\xef\xfbg\x876 \x92\xbf\xe3\xf0\x9c\x81\x11\xa9\x1e\x0f\x8ah%n0\xaf\x1c\x82S\x87Fd\xeet\x98\xdeqxD#\xa5#B\x97vF\xc0\xae]\x11z\xb4;\x02\x1eaD\x18\xea͈\x10eK\xfb灰\xbd\x11,\xae\xf4Q1~|\x17\x88\xb0\f\x15\x84\xa3\x85\xa0\xc1p\x04S\xb2\x115\x8bh\x04\xb48\x16\x91\nm<\x026\x9b\xd0A\xd9\x11\x81\xadd\x84u\xa6\x14L/\r\x93\xc9\xd0\xc8FD\x80\x1b#\xf5\xfcQ\x11\xa50\xa3#`\xcccp۱\x8a\x90\x98o\x8e\x80H~L\xc7\xff$\x82$\xe1\xd3\b(\xd0g\xda\xff-\x11\x90\xe2ϩ\x9b/\x80W[U\f_F\x84\xe5n\x8b\xe8\xf6v\x90\xdb\u05fc\xd37\x11\x8dJߪ<\xbe\x8b\x80\x02oG\x03;\"\xa4\xcf;#\xa4\x1a\xbb`_\xbb#d=\xdfG\x00\xf3{\x14\x85\xf7*d\xfe@\xab\xdd\x17\x11\x9a\xba\x9fN\xf5c\x04D\xf1\xa7\by\xf2\xcf\xf4\x89\x03\x11\xf0Ѓ\xea燲\xeep\x98\n\xfe%\x02\xbe\xf8\xab\x9a\xffo\x11\x92\xbc#\x1a'\x8eFH\xf6\x8eEH \x8f\xd3S\u007f\xc7\xf0\xfe\xa0C\x9c \xc4\xfe\t͝\x8cH\b\xfb\v\xff\xff\r#=\x15!\r9\x1da҉/\xcf\xc0\xfe\xcfF\xc0!\xfeU\xac8\x17QN\xf0_\x04l\xe4|ֽ/\xd0\x0e.F\x18|/Eȭ.+$^\x89\x90\xb4]eG\xaeE\xc0\x8d\xaek0\xba\xa1Fp3B\x96t\x8b\x16w\x1b\xdeqGTw\xe6\x89\n\xd7\xc9\x17\x15\xaa\x91?\xaa\xaeQ J\b)\x18\xe5}\vEa\xff\x85\xa32\xc4\"Q\x06\xf8\xa2Ql\x02\x1b\x85\x89\x16\x8fB\xe6wE\xc5%JD\xc13KF\xc9M\xee\x8e2\xe4\xdf\x13\xa51\xdd\x1b\x05Q\xb8O{p\u007fT7\x1a\x88\nsy0*\xbd{H/y8\n\x1e\xf3H\x94A\xfe\xd1(\xa2\xf5cQ1\x9fǣ\x12\x19\x9f\x882\xec=\x19eH+\x15հQ:\x8a\xf8\x99\x13%\n\x94\x89\nҔ\x8d\x8a\x89\x95\xd3ᕏ\x02\xb6\x9e\x8a2V=\x1dE4{&\xcaկQ\xc2F\x85(\xe2\xe2sQ\x04\x9c\x8aQ\x84\x9fJQ8B\xe5(1\xff\xf9(\xc3C\x95(\x83\xc7\vQ\xb5\xb5\x17\xa3DĪQ@\xefK:ԗ\xa34\xbaW\xa2ĜjQ\xa4\xe4\xd5\xd9j\x8d(=\xba&\xbf}5\x8aU\xb6\xb5\xf8\xe9\xb5h\x91\x16\xb9\xb9C\xfa\xb9\xf3\x92Ҩ v\xed(K\xe7u\xa2\xa8\xf2ԍ\xf2\x8d#\xdaF}\x1dE\x03=6\x8cr\x01v\xa3(xI\xe3('\x99\x9aD\x11\xac\x9aF\xc1\x8d\x9bEu\xb3\x98\xe6Pq\x8b(\x1f\xd1k\xa9m\xbcA\x01\xb5\xe2ɭ\xa1\xb06\xdaP\xdb()};=\xb6\xd7~t\xd0\xcf\x1d\xa3\x98o\xec\xc4^v\x8e\xc2\x15\xbb@\x9f]\xa3B\x11\xbaEe\x06\xb5{T8W\x8f(\x90\xe9ͨ$\xcc=\xa3\x98\v\xee\x85_ޢ]\xe4j뽣Rc\xec\x13\x05}\xec\v+\xed\x17\xa5\xdf\xf6G\xdb\x03\xa2\b\xd8\x03\xa3H\x9e\x06E9\xe378\n\xe4\x1f\xc2\xeb\x86F\tGâؕ'\n\x04sD\xe5Ih':\xe5\x8ab\xf3 w\x14\xd0h\xc0\xd4ͨ@\xb1\x15\x95՝\x9e(\xdcϋ\xce\xf8p\x89\x1fV\x17\x88r!J0\no\x0eE\x85\x83\x85\xa3\x82\x14\x11\xb5\x98h\x94\xf0\x13c\x1bq\xfc\x98\xd01ؐLR{\x9d\xa2\xd0Ҹs\x06'\x8e\xc0ߑQnv0*\xca\xd2\xc5\xe8(&f\xc6D\x95@\x8c\x8d\xca\xea\xd3qQL\xaf\x8dד&D\x11V'\xf20)\x8a@1\x19C\x98B\x0f\x9a\xaagN\x83\xe4\xa7g[\x9b\x11\xe5f\xfc3y֬(\xc1n6\n\x02\xf7\xbe:\xf1\x06\xca\xe0\x03\xfd\xb81\xca0\xb7\x89V\xff\xa1\xb6\xf8Q\x14{\x01o\xce\xde\xf7cřOp\xdfO\xa3,\xfb}\x86\x8en\x89\xea\x9a\xd6\xcfՓ\xbe\xe0-\xb6F\x19\u05ff\x8c\xa28\xb1\x8d\x87\xaf\xa2\xc8w\xbf\x86\xe1~C?\xfd6\x8a\x1d\t\xbeCsۣ\xf2\x80\xc7\x0e\xfc\xbf\x13V\xb0K\x85\xbf\x9b\xd6\xf3=mwOT\xca\\{1\xc6\x1f\b-\xfb\xb2\b\xbf\x1f\xdf\xfe\x88\xbf?\xc1\xcb\u007f\x8e\x92\x00\x1f \x92\x1f\xe4\xe1P\x94a\xf0pT\xa8\xe5/\xda\xe1_\xb3\xf8\xf6\x1b\x14|\x84=>\x1aEP;\x16E0:\x1e\x05=\xf9\x9d\x83\xfa\x83\x06qB\x91\xf7\xcf(\x83\xf2\xc9(*g\u007fE9\xa7\xfbw\x94\x11\xebT\x14\x91\xea4\xfb\xf0\x0f\x91\xedLT8\xd4Y\xfc\xfd\x970r.*ϭ\xfc\xa7\xf8}\x1e\x12\xb9\xa0\xfa\xba\x88\xd1_\"\xd0\\\xa6\xff_\xa1\x18\xaf\xeaP\xaf\xe1\xf2\xebT\xff\r\\}\x93\xb7\xbc\xa5\xfd\xbb\x1d\x05\xff\xbb#\x86u\"w\xc60i\x97/\xc6gDbXE[ \x06\\*\x18\xc3\xf4L\xa1\x18^\xf9\x1cC\x84+\xc2CQ\x1e\x8a\xc5\xc0R\x8a\xf3pWL\x1e\xb0/\x11\x93ղ\xb99%cL\xee\xefƷ\xf7İ\x01ֽ1M\xb7\xee\x8b\xc1\xf4\ue3f1d\xf4@LB\xf6\x831\x1a\xe2C1\x82\xcb\xc31L\xc0=\x12C<~4&+@\x1e\x8b\x89u<\x1e\xe3\x9e<1\x01\xac'c\x98L.\x15â\x9b\xd21\x81֜\x98ȴ\f\u007f)\xcbA\x96\x8b\x819\x96\x8fa\xa3\xf4\x18\xfd\xe6\xe9\x98<5\xfdL\f3\xb1\xcf\xc6\xe0\x01\x158\xba\xe7b\x9cƮ\x18\x93\xd9\xdfJ<\xa52\xae~\x9e-V\x89aM\xe6\v1 ͋1\xe1\xfcUc\\\xac\xf5\x12\xc6\xfd2e\xf8\x8a\x8e\xb3ZL\x1e^\xae\x1e\x93\x84\xa7F\x8c\xeb\xc8jƸ\t,GY\x8b#{-\x86\xb2\xf3\xeb<Ԏ\xd1H먀\xea\xc6\xe0\r\xf5\xa8\xb5\xfa1T\xf0\x1b\xf0܆1\xb2\x87F1<<\xd88F?j\x12\xd3j}Sv\xb6YL\x16 6\x8f1ڷ\x88qҰ%\x1b~#\xc6Ǣ[\xc5X\xe0l\x8d\xb1\xb4\x89\xc9\xfa\xae\xb6Tv\xbb\x18\"L{v\xa1C\x8c\x16ڑ\x1a\xeb\x14S\xb2\xd79\x86\xfd\x04\xba\xc4\xf0\xb8O\xd7\x18yp7\xa8\xa8{LbF\x8f\x98\xb8ۛ1\xd4\xc5z\xc6@\xe3{ńV\xbe\x15#\vȍ1\xb9\xeb\x1d\x93\t\xcd!\xb9\xa6#\xa7\x0f\xef\xdaW\xa5\xda/\x86E\xb4zހ\x18\xa6r\aƊu0,w\xeep\xe1\x15\x83\xf8\xdd`=e\x88vwh\x8c\xe05\x8c?\x0f\u05ef\x1dzt\xea鮘8\x95;;(C\x15g\xea\xed-^\xed\xa1\x1a\xbc\x14\xa1\x8f\xda\xf0\xab$\x031Tꂰ\x9e\x90^\x18\xd6cD\xa5\x1f\xc58b\xf8\x1b\x8f14&`\xe2vL\xea!ɘ\xf8s\n\xff\xa7\xf1}F\xcf\x1a\xa1Ǒ1L\x93\x8d\u0089\xa3c\xb2D`\fn96\x86\x92ظ\x18\x9e\x91\x1d\x1f\xc3\fք\x98\xac$\x9a\b\rL\x8a1,M\x8e\xe9\xac\xfe\x14\xb415\x86\xe4kZ\x8c\x989=&\x04uF\x8c\xa9\xcf\xcc\x18cά\x98\xcc\xd2ώ\x91\xb9̉1\xfc͍!\xc1\x9a\x17\xc3L\xd0\xfc\x98,{]\x10S\x1a\xb60&\x91w\x11e\xb58\x06\xe8[\x12\x93\xf0\xb04\x06\xc8]\x16C\x9c\xb0\x1f\xa2\xfdQ\xa5\xf8\x93B\xc4\xcf1\x12\x8b\x031\x14\x86\x0eRև\x88\xa3\x87\xb3\xe6\xfe\v\x9b\xfd5\x86\n\xebo1Y\x88\u007f\x04=;\x1a\x93\x12ޱ\x98$Z\xc7a.\xbf\xc7\xf8\f%\x1c\xf8D\x8c,\xebO5\xef\x931\xae\x99\xfa+\xef\x82ܜ\xbfcB\xb2O\xa9(O\xc7d\xee\xff\x9f\x18\xc8\xec\x19\xed\xe7Yq\xacܜ\u007f\xd1\xf4\xb9\x98\xee\xf9\xfe_\f\x137\xe7a\xbc\x17\xb4͋\xec\xe4%\xb5\xd3\xcb1}\x1bݕ\xec?W\x01a\xd7b\xf9\x1a\xe5\\\x8f\xb1\n~#\xc6\x10}3\xcfGQ\x8d\x85\xa8nǰB玸\xd6h\xef\x8c\x13\x03\xf3\xc5q\x87\xfcq\x10\x83\x02qP\u0382q(\xb8\x10\xbf,\xccOE\xe2\x12\a\x8aƱ\x17L\xb18\x96\xfdċ\xb7\xee=ȟ\x97\xe5\xe4\x1aV\xce]q\xc0W\x898\xe7sK\xc6\xe5\x8d\xc0w\xc7I>\xef\x89K\xb8\xbd7\x8e2\xd5}q\xa1\xc9\xf7\xc7\xf9 \xc1\x03q\xb2\xe1\a\xe3\xe0\x12\x0f\xc5\xc5H\x1e\x8eÒ\x1f\x893[y4\x0eG\u007f,\xcet\xec\xf18\xe5\xfbD\x1c\xc0\xf0d\x9c\xf5\x84Rq\xd4xK\xc7\x01\xcf9q\xf2\xc22q\xe2QY\x0e\xae\\\x9c\xb5\x99\xf2q\x9a\xefS\x1c\xde\xd3q\xd9\x1a\xec\x998\xe8\xeb\xb3q)\xb7V\x88\x83\x0e?\x17\xc7\xc6G\x15\xe3\x98Y\xac\x14\xc73\x94\x95\xb3\x82|>oHy\xadV\x89\x8b)\xbe\x10\xc7r\xab\x17yjո\xac\x92\xc8K&\xf3Nq\xf8s^\x8e\x8b\x1f\xbe\x12\x17\x88\xa8\x16\x87\xb9W\x8fK\xd6Q#N`\xae\x19W\a{\x95\x82\xaf\x15\a\x17~-\xae\xd3\x1a\xaf\xc7\xe9a\xb5\xd1P\x9d8\x1f\x92\xa8\x1bG\xfc\xaf\x17\xa7\xda\xeb\xc7\x11s\x1a\xc4\xf9\xea\xca8\x17\xe55\x8a\xc3\x1b\x1b\xc7\xe9tM\xd8\xe9\xa6*\xc6f\xbcQ\xf3\xb8\xd0\xd5\x16q\xb1˖qI\xa7ވs^SE\xd5:\xce*H\x1b\f\xb6-\xfe\xb6\x8bK\xd4k\x1f\x87\x9bw\x88+\xc9\xeeH]v\x8aӎ;\xa3\xc7]ص\xaeqr\xc7nq>\v\xdc=.\xabYzP;o\xc6ɯzƕR\xf5\xa2\x81\xbe\x95'\x92\xbc\xa1\xe7Rn\xbd\xe3Bo\xfa\xc4\x05\xe2\xfb\xa2\xa7\xfd\xe2\xb4\xfe\xfe\xb4\xb0\x01q\x81Áq}\x96cP\x1c\t\xe1\xe08\xc8Ȑ\xb8\"\xdaP\x9aϰx\x9e\xfb\f\x8fcɕ#.\xcbr\x9dq\x00\xa8+N\\vǁp\x86Z\x9f\x89ƭ8\x00\xc5\x13g\xed\xc4\x1b\x97\xb8\xef\x8bk$\xf0C8\x818\xa1(\x18\x17\xf0\n\xc5Y\xa4\tDž\xa4D\xe2\x9c\x1c\x88\xc6\xf1`L,\xce\xf2Y<\xae\v\u007f\xe2\x02$6NMƱ\xa6*\x15'\xb9K\xc7%Tf\xe2\xacʌ\x88\vb\x8c\x84\xd6F\xc1wF\xc7I\u007f\xc6\xc0I\xc7B\xf6\xe3h\xe5\xe3\xe3\xc8\x01'\xa0\xf1\x89qTU&A\x98\x93\xb3=\x9f\x82ߦRW\xd3\xe2Ĭ\xe9\x94䠜\x19qR\xf8\x99qM,fa\xa0\xb3\xb5ks\x00\x12s\xe3\x12]\xe6eU8\x1f-.P\xe9-\x8c\xb38\xb1\b\xdf.\xa6z\x97\xc8\xf5\xeeܜ\xa5\xea\x9c\xcb\xd4%\x96Ǚm\xaf\x88\xb3\f\xbd\x12\x82\\\x15\xc7j\x82\xd5:\xce5t\x97\xb5q@\xdc\xdbq\x82\xe5;*\xdfw\xe3\xc8\x1a\xde\xe3\x8d\xd6i/\xd6+8\xbc\x0f\xe3\xdb\xc0\x16>\x88cS\xa0\x8dqͽ6\xc5Q=\xfc0\x8e\xa0\xfd\x91v|s\x1c唏\xe3|3\xdf't\xadO\x15\xf6>ST\xdb\x12\xc7Kt?ׁ|\x01\xf3\xd8\x1a\xe7\xf3\xa7_\xc6Q\xd2\xdc\x16\a\x91\xff\n\xba\xfb:\xce\x1a\xc27\xf0\xc2o\xf5\xba\xef\xe2(cmgk;\x00\x1e;\x81\xa5\xbb\xd8\xe7\xddT\xe2\xf7q\x14\xef\xf7ą\xc9썃\xc0\xff\xa0ػO\xadp\xbf\"Ə\xea+?\xc5\xf9x\xccϸ\xe3\x818\xa2\xd4A\xa8\xe5\x10[8\xac-\xfc\x12G%\xe3\u05f8\xc4\xc7\xdf\xf4\xcb#\x8a\xdbG\xa1\x93c\xfa\xed\xf1\xb8\xee;\xa0v\xfcG\\\x18҉\xb8\x86\xb9?\xf5\xb4\x93q\xe4y\u007fe\xbf\xff;.Q\xea\x94j\xe7t\x1c\xa4\xf3\x9f8\xab\xa6g`\xc8gi\xbb\xff\xea\x97\xe7ԛ\xfe\xe3\xb9\xe7\xa9\xdf\v<\\\x84S\\R\xff\xbd\x1c\a%\xb9\xc2߮\x12֯\xc5A5\xae\xc7\xc9\x1an\xc41;pSeu\v>~;\x0e\x96wG\x82YeB\xbe˗\xd0\x1aA\xfe\x84Xy\x01\xfc-\x98\xc0ՅpFa\xfc-\x92\xa0\x94\x8b&\x04 \x8b\xf1\x84\xe2\tĒ\xbb\x12x(\xbe\x04\x0f%\x13\x85\xbb\xe6\xf6u\xe4\x11\xfa\xbby\xd6=\t$\xdb\xf7&`h\xf7%Pƺ\x9f_>\x90 \x84?\x98\x80\xd9=\x94\x90\xa9\x9b\x87\xf1\xf7\x91\x84\x06\xcb\x04f\xa7\x1e\xe3\xe5\x8f'\x14\x04\x9fHp\xe7\xaa'\x13\xa8T\x94J\x88\xe5\x97N0\xa6\xe4$\x90?\x97I\x90\xed\x96M\xd0=\xca%\xc44\xcb'\x10ٟJH\xaa\xfat\x02r{&\x01\xb7z6\x81y\x82\nٛ<\x97 K\xad\x98 \x95\xad\xc4\xdf+'\xb8\x01A\xa2p\xd3~\x86l\xd8R%\xa1\x18\xfcB\x82:z1Q\xb0\x81\\P5\xc1\xcc\xee\xa5\x04\xea\x10/'$K}%\x81:u\xb5\x84\xc0[\xf5\x04UT#!:\xae\x99\xbd\xf3\xab\t\xe0q\xad\x046{M0\xb5|=A\xfc\xaa\r-\xd5\xe18\xea&\x04\xb2\xea%P魟`9\xbaABBqÄnb\a\x156N\xf0\x89\x8c&\t2\x88\xa6\xbc\xbeY\x02\xe1\xa09z\xd3\"\xc1=\x1cZ&\xb8$\xf2\r\xa8\xbbUB\xf3\x8d\xd6\tN\x04\xb4I0\xe8\xb5M\xe8[*\x13(F\xb4O\xc02;\xb0\xe1\x8e\tƀN\t\x98]g\b\xbfK\x02\b\xd0U\xe5\xd3-\x81$\xa7{\x02y{\x8f\x04\xe6^\xde̻\x8b\xc3=(\xa7'\r\xb5W\x82\xa8\xf9V\x9ea9\xfa[\xc3\xfb\xe5\xe4&\xb8\xb0\xb87m\xa2\x0f\x84\xd4\x17\xed\xf7K \xf8\xf7W=\fH\xc0\xf3\a\xea\xb0\x06%\x04k\x06\xe3\xfc!\xf8;4\xc1\xfaٰDv\x06}x\xa2@^\xfe\x9e\xe3H(OqjS.=\xba\x13R\x922\x12\xc0\x17\x13·\x12\xe4\xf1\x1e~\xe9\xe5\xc1DZ\xf9y\b\xa0{\xc1\x84\xa4{!\xd5@8\x01\x1e\x18I\xc8\xde\x1a\xd1\x04\xaa/\xb1\x04\xa9lb\x8b\xce\x1e\xb5uE\x8f\r;{\xdc\x06v=aӳ\x9e\xb4\x89\x0f\xa5l\xb2\x98Ҷ`@\x8e\r\xc6P\x06\xbd,k#\xbb,g\x8b'\x94G/\x9f\xb2\x91l=m\xcbJ\xf6gl\xe5\a\xcfڲ\x88\xb3\x82ͪ\xab\xadD\xa7\xa2M\xac\xa8\xc4aV\xb6\tZ\xcf\xeb\xb1\n\x84\xf9\x02n\xfb\xa2\rK\xa8\x8a۾d+\xe1~\xd9\x06\xbc\xbc\xc2\xfeW\xb3\x11*\xaa\xdb2\x89UC\xc7V\xd3\x16\x16\xf8j\xb6#\xb5\xf4\x96\xafٺ\x8b\x9d\xad\xb1\xb76\xc5W\x87\xf7\xa9k\x83BֳY2\xabo\xa3L\xd1\xc0\xe6\x1cuC\x1b\xf5\x89F\xb6\x14y\x1b\xabZ\x9a\xd8\xe48M\xf5\xa4f6\x90\xbb\xb9\xfe\xdc\u0096\xeaDK\x1b\xa9\xa4\xcd@؊\xe3nm\x03\xc2\xda\xd8\xfa\x0e.[\xa6\x02\xdb\xd9\x1a5\xdb۴\xc1\x0ePYG\x1bu\xacN6\xaaӝmС.vv\x9dzWt\xa9\x9b\x8d\xf0\xdf\xdd\xc6B\x83\x1e\xb6\x18蛶\x90\x87\x9e6'\x11zQpoق\x83\xb9\xb6\x06D\x8a\xa0\x8fJ\xae\xaf\x8dUI\xfdԒ\xfa\xdb\xe0\xbd\x03\xf4\xe3@Jh\x10\xfb3\xd8\xc6\x03BC\xa8\x88\xa16\n#\xc3lz\xdfp\x9b\xbc\xcaa\xc3G\x9d\xb6\xd4\x12]6\x1c\xc6m\x03\x15\r\x1b\xc5\x02\x13\x1a\xb7(\x0f\x0f\x1b\xf3\xdaR\xe7\xf7a\x10~[\x9e\v\v\xd8@\xd7 \\$dK\b\n\xdb\b0\x11\x1e\xa2\xb6\x16$bj\xbaq\x18h\xc2\xceK\x0f\xf2\x82\xa1-\xfc'i\xb3О\x82XӸq\x86\xca\x1f\x01?\x1c\x89\x1fF\xfd_\xb4\xa3a\xdecl\xb0\xaf\xb16\x8b\xad6\xa6\x8b\xc6ۘm\x9f\xa0w\x9bh\x93FM\xb2\x05^&\xdb\xc0\x8e)6aw\xaa\x9a\xc94\xb5\x8b\xe96\x8a\xf83lě\x996\x1e\xa7\x9ce\x83\x03̶\x19\xe9\xe7\xd8|\xfe|\xae\x8d\x9a\xce<\x1bQ|\xbe\x8d\x9a\xea\x02\x1b\xd1a!\u007f[D\xd5/\xb69s\xbd\x84?.\xb5\xb1>f\x99MF\xb7\xdc&J\xae\xb0\xc9\xe9Vb\xf4\xab켰\xb1\x1ac_c#Ʈ\xb5\x11F߶Q1x\xc7\x16L\u007f\xd7榮6\x1eEZg35[o\x83\x90\xbfoK\x82\xb3\xc1.\xd4\xd1\xc8\x1d\x90\x97C\xea\xaf\x1bm\xf0\xa8M\xeċjA\x1f\xe9qs^\xf3V\x9f\x9c\x8fm\xa6\xbb\x9f\xa8\x87~\xaa\xc7\xcf\x00\x1d[8\xe6\xcfUj_@\xf7[m\xc9\xc1\xbe\xb4\x89\xe6\xdb\xd4\u007f\xbe\xb2\xb1*\xf6k[\xd0\xf9\x1b\x1b\x19\xa4-D\xe0;\xe8c;\ro\a%\xbd\xd3\x06\xeaﲱ\x84y7l\xed{[2\x88=\x80\x9a\xbd6\x12\xad\x1fl\x94\x00\xf6AP\xfbmT\x99~\xb45\xb2\xfed3\v\xfb\xd9\xe6\xac\xc1\x01\x9b\x85\xa6\x836\x97\xb0\x1c\xb2\xb1\x97\xc9a\x1bK\xb9~\x01\xe2\xff\n\xeb\xfa\r\xc6{Ė\xc0v\x94\xea\xad\xc7g\x92,\xd3<\x9b\x942q\x85$\xb0幤\x10\xa9\x8aI\xe5ʕ\xd8\xcb\xcaI\x89\x86\xcf\xe3o\x95$\xe2c\x92N\xf6b\x92\xb3\xbfU\x93\xe4r/%\xe1\xb5/'\x914&\xc51\xab\xa9\x94\xab\xeb\xfdj\xa0\x99\x9aIVK_M\x82\x91\xd4J\x8a\x05\xbc\x96\xcc\x03\x83\xd79\xc4\xda\xda\xcd:I\xb8q\xdd$\xea\x8e\xf5\x92\x1a\x84\xeb'\x99?4Hb\x8e\xa1!\x0f\x8d\x92b#\x8d\x93\xb0\xe6&I\x14\x17\x9b&Ŋ\x9b%Q~k\x8e\xfb\xb4H\x8a\v\xb7LҔ\xde\xc0\x88Z%\xc5[['\xe9\xeam\x92\x98\xfen\x9b$\xa8\xb6K2\xa8\xb4\xd7c\x87$\xe6\xd9;R\xbf\x9d\x92\xe2P\x9d\x93\xc0\xf1.I\xf1\xe0\xaeY\tvK\xb2r\xdb=)L\xa8G\x12\xee\xf3\xa6ޥgR\xca\xf0\xbd\x92\x1at\xdf\xd2ss\x93\xe2]\xbd\x93\x88\xf7}\x92\x04\x9a\xbeIzC\xbf$\x89R\u007f\x1aހ\xa4\xb8\xf1@~\x18\x94\x94\xfa\xc0\xe0\xa4Č!0\xfe\xa1IV{\x86%\x81\xd0Ó\xac\x95:\x92\f\x8aI\xc0\x91+\xa9\xcb\\\x93$\x11\x06[3\x93\x04l+\xc9y\xc8$\xe3\x827\x89\b\xed\x83X\xfdI@p\x006\x1dLb\xed[(\xc9L;̛D\xd44\xa2I\x84\xa4X\x12q4\x9e\x84\xc7&\x92\x82*vR\v\x95\xc9$\v(\xa9d\xf6\xa1\xb8t\x12\xcc2\x93d\xce;\"\x89\xdd\x1cG\xb2K\xa3hᣳF1&\x89\x9c|,\xfb?.\x89\a\u007f\xc7\xf3\xa4\tI\x94p'&\x11\xdf'\xb1ߓ\xd56\xa7\xf0\xe3T\xf6mZ\x92\x15\xa9\xe9IF\xaa\x19I\x99D\x9a\xa9^6\vH2;\x89zʜ$\xf70\x98\xab\x83\x9c\x97\x14\x84\x9d\x0f3\\\x00\t-L\xb2\x00\xb2(\tα8)y\xe1\x12X\xcc\xd2$֠,\x83\x9b,כ\xaeP\xfd\xaeL\xcaZ\xd1UIy\xf2su\x12av\x8d\xded-\x9bz\x1b\x8e\xf4N\x92e\xcfw\x93Xu\xff\x1elg\x1d\xfe\xaeOb\x9dk\x92\xf9\xf3\x06t\xe7\x83$\xd2\u038d\x1c馤\xce\xde\u007f\xa8\xbe\xf0\x11lgs\x12\xe9\xd0\xc7I&o\x9f$\xf37\x1a\x9e\xf3)\x8c\xf5\xb3$f\xe2\xb7$A\xbd>\xd7N\u007f\x91$\xc3\xdfJ!\u007f\x89An\xe3\xf0\xbe\xc2}\xbfN\"0\xaaD\xbfM\x92\xed}\x97\xe4D\xf9v\xda\xfa\x0e\x8es'\xb5\xb1+ɒ\xf6n\x02\xc2\xf7I\xe1\xd4{\x92`={\xd56\u007f t\uf8e9\xedO\xa2\x00\xfdcRh\xdbOj\x86?'\xb1P\xf4@R66=\x98D\"q\b\xb0{Xƒ\x17\x1bi\xb6\xbf\xd2N~\x83\x04\x8e@\x8fG\x93xN\xf5\x98\xf6\xfa8\x04\xfe;\xcf\xfbC\xf1\xe9DR\xb8˟I\x92\xa5\x93\n\xf2\u007f\x11\xd6\xfeN\x92\xf0\x9f\"6\x9cN\xb2\"\xf2\x0fP\xe8\x8cb\xe8Yu\xbf\u007f!\xa8s\x1aX\xfe# \x9fO2B\xaa\xa1^$\x80\\\xa2\x85_Nb\xe6\xe2J\x12\xa4\xff*\xbaw\r\xc1\xe6:Fq#\xc9\xfa\xfcM\b\xe4\x16\x10\xeevR2\xf0;R\xc2i\xefL\xe9|W\xbe\x14D\x9c?\xa5\x8eT \x85\xf5\x9d\x05S\xc0\xb7B)\x06\xed\xc2)i\xb4H\x8a\x13\x10ES\x90k\xb1\x14\x18D\xf1\x14R\xc7\x14\xf6\x1fHɍJ\xa6P[\xbd;%\xef*\x92\xcc\x11gܛB\xbd\xe7\xbe\x14\x88\xfc\xfd\xbc\xcf\x03)\x01\xb1\aq\xc2C)\xd8\xc0\xc3),py$\x85gP\x1eM1\xcc<\x96¸\x1fO\t\xb6=\x91\x92\nǓ)1\xcbR)x~\xe9\x94L\x1b\xe6\xa44\xbd*\x93\x02\xf9)\x9b\x12'*\x97\x1d\\y\\\xf1T\x8aR\u007f:\xc5L\xf6\x99\x14\x92\x93gS\x80\xc4\n)\xc0\xc4s)\xbaEE\n\xa2R\n\xa0U\x99?>\x9f\x02\bUI\x91\x80\xbf\x80N\xbd\x98\x02\x03\xa8\x9aBI\xe8\xa5\x14\x9d\xf9唬z|%E0\xae\x96*\x9cG\xd9\x1cC\x1c9\xd5S:]W#\x85T\xa4f\x8a&\xf1j\n\xec\xa6\x16[y-%Ŷ\xd7S\xa2\xc4\xda)\xec|N9ԅB\xeaQ\x96\xf5SZ!h\x90B\xe6\xdf0E\xbcj\x94\x92٥\xc6)\x02h\x93\x147fhʋ\x9a\xa5\x98\xf56O\xa1\x00Ղ\x87\x96)\xac\xa2z#%\x06\xd5*\xc5\xec\xadu\n\xa8\xd3&\x05:\xd7V%\xd3.\x85\xac\xab}\nx\xd2!\x85\xc8\xdb1\x05\xce\xdd)%a\xb63\xac\xa1K\niaWJ\xb9[*/\xd0wOq~\xa8G\n4\xeb\xcd\x14jZ=S\x98\x00\ue552|\xfa\xad\x94\xf8|n\n\x98՛\xf2\xee\x93b\x15\xbd/\xfb\xda/%5\xad\xfe)A\x9c\x01)\x89\xe4\x03\xd9Р\x14\xd9\xe9\xe0\x94\xa4aCR\xf4ġ)Y\xdf2,E.2<%.\xe7H\xb1\xb6\xe1\xe4 \\)8\xb8;%1\xcd\xd0q\x9a\xfc\xcdJ\x01\xf7<\xea\x11^HȗB)ҟb1*\x00\xad\x04S\xa4\n!\xdc0\x9c\xe2\xa4T\x84\x92\x8d\xaa=\xc7\xd8j\x1c\xcd$\xd0\x19;\x05\x80M\xc2%R\xfc\x90\x86\x01d\xa8\xf4\x11\x14\xe1H~\x1a\x85\x9b\x8dNI\xba2&\xa5\xa4cl\x8a\x13C\xe3\xe8l\xe3S\x02\t\x13R\xdc\rrb\xd6\x0f&\xa5\x80n\x93Sd\x1dS\xb2\xb68U\x8dpZJ\xb8\xe0\xf4\x14\x83Ό\x94$\xf93SR&\x98\x95\"2\xcfN\x81T́e\xceM1\xf1\x98G\x11\xcd\xd7V\x16\xd0\x1a\x17\xa68\u05fc(\x05\x00[\x9c\x92p\xb0\x84\xd7/\xa5[-SQ/Oa\xb5\xe0\n\x15\xe0ʔ\xf0\xd3U)\xa4\xaa\xabi\xb6kR\xc0\xfb\xb5y\xa2\x90T1\x85\xa8\xf3\x0e\x9by\x97\xa7\xbc\x97\xc2c\xa2\xebRX\"\xb6\x9e\xd2z?\xc5%\x19\x1bRL\x9e>\xa0\xf5n\x84\x99mR`\xfb0\x85\xfc\xe5#\xe8\u007fs\n\x93\x14\x1f\xab\x93\u007f\x92b\xc0\xfb4%\x85\x95\xcfRR\"ܒb$\xf8<\x85\xac\xed\v\x05\x96\xadjc_\xa2\x9dm\xb0\xe7\xaft\x88_\xc3\\\xbf\xa1A\u007fK\x91|\x97b\xa5u{\x8a\xa1d\a`jg\n\xc1iW\na`w\x8a\x11\xf9\xfb\x14ˡ{RZhۛB\x99\xef\x87\x14\xc3\xe2>\x9a\xf0~\xb8\xfe\x8f\xfa\xe5O\x00\xe7\x9f\xe1\x8e\a`\x12\aэC\xd4\xc2a \xcb/\xf8\xe1ה$\xb0\xbf\xd1X\x8f\xe8@\x8e\x02\x9f\x8f\xa5Pl>\x9eB\xe0\xfd]}\xf8\x0f*\xe4D\n\xc10\xc5\xf4\xe7\xa4\n\xf4/\x9a\xc0\xdfTө\x14R\xb6\xd3)Į\u007f\xb2#8\xa30s\x96\x9a\xfa7\x05\xf2p\x8e\xc6\xfe\x1f\xc7s\x9e\x12\xbe@\xaf\xb9\xc8//\xa1ߗ\xa9\xfc+\x04\xa9\xabp\x98kD\xd1\xebT\xe1\r\xf5\xb9\x9b\xaa\xca[)\xa4u\xb7S\xc8/\xeeH#ۺ3-`\x91/\rh\xc9\xcfC\x81\xb4(\xb0`\x9aK\\\n\xa5\xb1\xddkZdY$\x8d1\x14M\xb3hP,\xcd\a<\xd20\xb9\xbb\xd2\xe2\xd4%Ұƒiqӻ\xd3\xfa(\xf2=i}\xbe#-\xf2\xba/\xafi\xa9\\\u070fF\x1fȞ\xf4`\x1a\xe3{(\x8db\xc1\xc3i\x01\x84G\xd2܉\xf3Ѵ\xa8\xe91m\xe6q\xdcꉴ\xb0\xce'\xd3\xf4\xbbRz,\x9dF\xb0\xcaI\xabw\x97I\xd3Z˦\tz\xe5\xd2\x04\xc6\xf2i\xc8\xfd\xa94\x1e\xbcz:M\x80{&-\x10\xfel\x1aڭ\x90\x86\x1e\x9fK\x8baVL\xc30+\xa5aÕ\xf9\xe9y\f\xb3J\x9a\xc8\xfbB\xbaH\x8b\\S\x16K漘\x86)U\xe5\xe1\xa54b\xc8\xcbifW\xaf\xa4aR\xd5\u0603\xeal\xb1F\x9apR3\xcdu\xaf\xaf\xa6\xf1>\x10\xdc\xe05\xf4\xe0u6V[O\xa8\x93\xe6\x1ev8\xa3\x1e\x1b\xa9\x0fe5H\xd3\xeb\x1a\xa6\xf1Hb#ʵ1/o\x92f\xd2\xd34M+o\x06\xc96O\x13A[\xa4QEi\x99F\x11\uf374\x84\xf8V\xf8\xdb\x1aM\xb7I\xe3\x05\x17m\xf1\xa1]Z\xa0\xbe\xbd6\xd4!\xcd\xd8\xdf1\r\x93섫:\xa7\xc5㺤\xc1q\xba\xa6%\\u\xc3W\xdd\xf1\xb7\a\xday\x13\xa7\xf6\x84R{\xa5\x11\x01\xdeJ3N\xe7Bǽ\xd3(\f\xf5I#\xda\xf6M\x83\x9c\xf4S\x81\xf5\xd7\xe3\x00\x8a``\x1a\xf3\xbf\x83\xd2\x12\\\x06\xa7\xe1%C\xd2Z\x98\x1e\x9a\x06\xc9\x1c\x96&\xe4\f\x87\xec\x1c\xfcҙ\xd6z\xa6+\r:\xee\xa6،\xb4\xa0\x80\x99\x06=\xb3\xd2\xe0x\x1et՛\xc6$\x86/-\t\xb0?M\xf4\x0e\xa4\xe1\xc0\xc14\xc9H(-ip8\xcd\xc2i\x1aq3\x9af\xc9?\xc6\xfbġ\x80DZ\x18\x93\x9d\u0588\x96Ls\xfa+\x95\xce#\x0e鴤\xb9\x994\xea\xd8#T\xcc#Ө\x1e\x8e\xe2a4]wL\x9a\xf3\xb9c\xd3\x12\xa1\xc6Ѷ\xc7\xf30!\r\xa67\x11\xde=)\x8d9\xa8\xc9t\x96)\xf8nj\x9aդiiF\xc0\xe9i\xf0\x8a\x19\x1c\xd1\xcc4\xcab\xb3p\xea\xec\xb42\xce9ia#s\xd3\x12\x8e祥t9?ͪւ4H\xccB\x1e\x16\xa59\xe9\xb68\xcdգK\xd2\xc0\xa8\xa5\xb0\x88e\xec\xcc\xf24\xe2\xc2\n|\xb7\x92\xa3]\x95\x06O\\\x9dַF*\x00\xacMK z;\x9d\xbfC\xbf\x9cw\xa8\xbew\xd3\xe0`\xef\xa51\xf9\xb4.ͬb=\x9by\x9f?nHK*\xfbA\x1a\f~#Lk\x13\xdc\xecC\xdc\xf3#\xf6c3\x9b\xf88\x8dy\x94O\xd22a\xf6)\xd0\xe83\xbd\xfd\x964қ\xcfՌ\xbe\xa0\xb7lMs\xd2\xec˴\xc4\xfaml\xec+\x00\xca״\x9bo\xd2(j}\xab`\xf3\x1dNܞF)m\a>\xecT\xb4څn\xedΚ\xe4\xf7heO\x1a\x0f\x9a\xed\x85M\xfd\x00\x99\xef\xa3r\xf6\xf3\xf0\xa3\x02\xf3O\x18\xce\xcfi\xae\x1b=\x90\x96%]\aӘE:Į\x1f\x86\xd1\xfd\xa2\xe3\xf9U\\Ǒ\xf3\x9b:\xdd\x11\xdc\xfc(N9\xa6\x82<\x0eW\xf9=O\x80\xb99\u007fp4'p\u009f\xaa\uf4c0\xf6\xbf\xd2\x1a\xde\xfeN#@\x9fJ#C=\xadj\xff\x87\xc8w&\x8d4\xe8l\xba@\xa3\xdey\xa1\x8f_\x9eK\xa3d\xf3_\x1a\xc4\xf9<\xb0\xe5\x02\xac\xedb\x9a\xd5\xfcK\x1c\xc2e*\xfcJ\x9au\xf6\xabi\xd2\xd0k\xbc\xfez\x9a\xbb\x8c\xdfH\xa3\xe4\u007f3\x8d]On\x89\x1fݦ\xe2\xef\xc8\x00\x14\xee\xcc0>\xe6\xcb\x10\x95\xf3g\xc8\v\vdHy\nfD\x88\x852\xfaZ\x8f\f\x00\xa0HF\xe2eQ\xfcT,#b*\x9ea\xb2|WF\\\xaeD\x06\xe0W2\xa3\x9b\xb6f`w\xf7d`\xd9\xf7f\xa0\xe9\xfb2\xac\x92f\xf4\x99\x8d\f3\x94\a3\xec\xf8C\x19\xe8\xf2\xe1\f\n\x80\x8fd \x9cG3\xacz?\x96A\xee\xf0xFl\xf7\x89\x8c\x84\x85'3\"\xa3R\xf8[:\x83\xd9\xc3\f<\xbdL\x06v\\6C(*\x97шX>#\xa2}*#\x00\xf9t\x06U\xf6g0\x94g3\x98\xa3\xad\x90aN\xff\\\x06U\xe3\x8a\x19T\xed+e\x80v\x953\x90\xe1\xf3\xb8Q\x95\f\xe1\xe6\x05\xf6\xeaŌ\xb8J\xd5\f\xc2\xdaK\x19\xbc\x16\xe5\xe5\x8c\x18\xc9+*\x8fj\x19\x89\xf8\xd53\fA52\x84\xb2\x9a\x19\x80\u05eb\x19q\xeaZ\x19>\x86\xf8\x1a\x9by=\xa3k\xf7y\x9e\xe7\xbe?\xe3\x9a\xef\xeb\xfa\x8c;\anm\x01$~a\x8e\xe4\x85\x16\xe5\b\x94ZL\xe1YB\xab\xb1T\xfb\xbf,\x87!\xc0\xf2\x1c\xba\xd1\x159\xe2NVB]W\xa1+\xabs4\x1f\x9a\x03P\xb9\x96\x8c[Gʬ\xcfQo\xbf!\apac\x92q\x9brtG\xf5\xcf\x1c\xe6\xe6\x1c:\x90-Tҭ\xec\xc5/\xec\xfa6\x90g;\xca_\xa9\x85;r\x10\xf4\xfcF9\xde\t\xee\xee\xcaa8\xb9\x1bµ\x87\xd4؛C\x8c\xf9{Nᶩ\xc3S\x87\xa5\x8fJOٗ\xa3ɼ?r\xe8\xf5\xf6\xe7(x:\x90#\xae\xe8`\x0e\x12+\x87 E\x87\xc9\xf1#9\x82\x18\x8e\xb2_\xc7r\x98\x9d<\xae\xd7\x13\xda\xfb\x93\xa0Ω\x1c8\xf5\xd39L)\xfe\x99\x83t\xf3_9\xf0gg\xd0ճ\x10\xa9s9\x9a\xcc?\x9f\xd4\xf9\v4\x87\x17s\xb0|\xe0R\x0e`\xd4e^\xaePV\xae\x92\x92\xd7\xd4\f]צo\xe4p\xbd\xcd\xcd\x1c8\xc1\xbfu\xd8\xff\xe4\xc0\xf1\xff\x9bT\xe9[9\b\xb2nchw()ws\x14+\xdc\xcba4r\x1f\x04|@\xc3\xf1P+~\x04\xa9\xfc/\x87\xf31\x8fs$\xc7\xf1D;\xf1\x14.$\x97A4-\xb7Ai\x99\xc7\x00_\x9f\xd7\x00\xb9\xc8g\x80@\xe47P\x9c\v\x18\x88d\v\x1a\xa4\xa9B\x06\x99\x04+l\xa0\x05,b\xa0V>c\x80\xd9)\x8a\x1f\x9f5\xa07\xc5\f\xe4Xq~|\u0380\xad\x1a\x06*j\t\x03E\xb1\xa4\x81V\xe8\x05\x03\"\x82\x17\r\xb4\x84\xa5\f\x88__2p\xf5Oi\x03\xcco\x19\x03\x16%\xbfl\x10\xad,k@\x1a\xe8\x15\x03·W\r\x88{\xca\xf1\xc6\xf2\x06\xb1i)\x06\xf1\x9c\x15\xd0\xed\x8a\x06\xa6\x9a_çJ\x06\bJe\x03\x82\xd0\xd7\r\xa2To\x18D\xf1\xab\x18Ȍ\xaa\x1cЛ\x06Ɠ\xd5\xf0Xu\xfdT\xc3@0\xf1\x96A6(\xd64pf\xf7m\x83j\xf1;\x06\x01y\xb5\f\x9co\xae\xadd|\xd7\x00\x0e\xd61\x88P\xd55\xc0o\xbdg\x10!\xacg\xa0\xa7\xac\x8f\x1e4\xe0O\r\rЉF\x06\b\xd4\xfb\x1cWc\xf6\xea\x03\x03|~\x13\x12\xb6\xa9A%\xf2C\x03\x96&43`\xa9Xs\x83\xcc\xef\xb40 \xc3\xd4Ҡ\xca\xfd\x91A\xb4\xa6\x95A\x12=\xad\r\xe2\tې\x8emѯv\x06\x82\xb0\xf6\x068\xb4\x0e\x06\xacP\xe8h\xa0-\xee\xc4!t6\x10\xd9vQ!\xe8j\x00\xd4\xeaf \x88\xean`\xec\xddC\xa9Փ}\xef\xa5?\xf76H0\xd1\xc7 6\xf5c\x03=\xa4\x013۟\x1aT\xf2\xfb\xf2\xeb~\xfc\xba\xbf\x81\xdb\xd6R\r\xccU\f\x00\xd1\x06\x1aD\xc6\a\xa1L3H\xde\xff3\x03\xb0\xcb`\x03\xf6h\x18\xb8(=݀\x85LCq\xdf0\x03\xf5\xe3s\x03-\xe5p\x83\xf8\xc5\x11\x06\xa4\xfc3\f\x88a2\rj\xedF\xb2ۣ\f2\xdd4:I\xbf,\x03\xd0]\xb6!o\x97\xf4\x941\xc9o\xc7&\xff\x19G\x96\x8c\x87\xacO\xe0\x87/\f\x88\x11\xbe4\xc0\x1e}e\xc0\x8a\x9c\xaf\xa9c\xdf\x18\x90\x01\xfb\xd6\x00,7Q\xe9<\xc9\x00\x8c\xf0\x9d*\xded\x83\x98\xfe\xef\rL\xe9\xff`\x80m\xc9a\xad\x06\x03\xf0\xb0рD\x8fI9c6`\xfd\xaeŀP\xdaj\xc0\xde\"\x9b\x01\xf9\x0e\xbb\x01\x93\xca\x0e\x83\xb8@\xa7\x81\xf0\xdae@\xfa\xcam\x10\xbf\xee\x81~y\xc9U\x9f\x01sK~\x03\xf1r\x00\x84\f\x1a$V\r\x19$\\\n\x1b\xc4=E\f\x12~DA\xd0\x18\t\x1a瀧\xf02\x95\xfd\xfd\xd1\x00\v;\r\xd5\xfcd\x80K\x98\xce\xce\xcf\x00\xa5g\x1a0;0K\xa5e\xb6\x81fk\x0e\x98>׀\xfc\xdc<60\x1f\"\xbb \xf1X\">D_\x16\x19x\xd8\xd5b\xf4c\t\x1aYj`ph\x90U\x90\xcbI\xfd\x15\x06\xf5m+I\xbeU\x06\x1c\x92\xbb\x1aʱ\x86\x8c_\v\x1dYG\x93\xb8\xde \xb9\xd4\rT\xbf\x8d\x06\xb8\x87M\x06X\xf7\x9f\r\x98\x8e\xd9l@ز\xc5P\xa4\xad\x9c~;$}xF\xcaV\xe1簄o4$W>m3\xd0lo\xa7&\xfdj\x00\xea\xdea\xc0N\xc9ߔ\xc3;I\xf9]\xec\xdbn\u07b3Ǡ\x96\u007f/L\xd1\xefj]\xf6\x19\x18\xcf\xfc\x91\xa0k\x82l\xfb\r\x125\x1e\xc0\xc0\x0fB\x11\x0e)\xe3\x0e\x1b\xe0\x85\x8f\xd0\xf2\x1d5\x00\xac\x1d3\x88o;\x8e\xdbO@\x89N\xfe\xaf\xab\xa7\f\x8cTN\x1b0\xf7\xf3'\x9f\xf8\v\xad\x9fQ\xb3\u007fV\xaf\xe7@\xdc\xf3j\xd3/\x18\xb0\x80\xf8\xa2\xb2\xee\x12$\xed2yvŀp\xe3\xaaJ\xfa5\x15\xd8\xebd\xd2\r\x83.V\xb9i`*\xfbo\x03\u0588\xfd\xa3\xda\xfc\xafA\xe3\x84[\xc9\x1bo\xd3\xd8\xdd\xe1\xe5\xae\x01>\xf9\x9e\xd6~\x9f\xcc{`\x00\x0eyH\x9b\xf6\bV\xf6?\xc8\xcec\xca\xe6\x13\x88\xfdS(m.#Nd5\xe2\x87&A%\x1f\x9bd\x8d\xe0'\x94\x8cO9о&\xc9W\xf43\xc1\xb5\xf47q. \x15$\x19@\xc6\x0fD\x93\x83L\x1a\v\xa7\x81h\x9f\x99`R\x06S؆\xa8\x9c\xa6\xf3ۡ\xa6|\x89x2e\x18\u007f\xfc\x9c\x14\x1cn\x82\u058ePBe\x98\x00\xb32)\x99#M\xd0\xfaQ&\xac\xeb\x1bmRg\x9fe\x82Q\xccV~\x8d1\x11\xbb\x8e51\x0e\x1eg\x12\xeb6^\xd91\xc1D\xd3\xfc\x85H藬\xfe+\xea\xd8\xd7I\x9a|c\x02\xec\xfc\xd6$\x11\xc8D\x13\xd3\v\x93Lt$\xdfQF&\x9b\x90\xf0\xf8\x9e\xf4\xf9\xc1\xa4\xa7\x88昰\xbd\xc6`\x92\f\xa8\xd1$\xa6\xd1db:\xd2\f=\xb1P|\xadT/\x1b\xc4\xcenbN\xd6!}r&\xabr\xc9'7i\xe511E\xee5\xc1(\xfaL\x82\n\xfc&\xe2\x92\x00\x15#hb|\x1e2q\xcdC\xd8\x04\xcf\x141\U00048ae8I\x96\a\xc6Х\xb8*\xd8\x14\x93\x065SI\xe0\x1fU[\xa6\xa1\xfb?\xa1\x9cn\xc2\xf2\x88\x19\xaa\xb83M\x02ff\x91p\xb3MLq\xcd1q5\xe8\\U\x8fy\xfay\xbeI\\\xe4\x02S\xa1ީ\xa3夸\x94\x85&\x8d\x1b\x16\x99\x18\xdd,f\xc3KL\x92\nY\nY\\fbnr\xb9vr\x85\thl\xa5\x89S\x0e\xabL\xccz\xac6!\xd6XCv\xac5\xc9\xd9z\xeb \x84\xebM\x12\xc8n\xa0e٨\x86o\x93I\xf2\xb0?\x9bx\xd4\xc5f%\xdd\x16\xb5-[M\xccq\xfc\x02\x1em\x83y\xdbn\x02\xca\xf9\xd5\xc4\x03\x19vP\xca~\x83\xd2\xed4q\xfed\x97\x89~uw\xd2\x10\xec1I\x06n\xaf\t\xfb6~7\x11v\xef31\x8d\xf6\x87Iç\xfd\xfa\xd8\x01J\xcfA\x13\x92o\x87L\x98&:\xacr|\xc4D\\u\xd4D\xd0~\xccDPt\x1c,\xcd,\x06\xf3'3|\xf9t\xfc4\x83\xaa4\xd3L\x9c=\x8b\xaa<[\xfb6G\xf92\xd7,fl\x9e\x19hm\xbe\x19\bj\x01:\xb1\x90\x1f\x16\xa1\xb2ŬyIR\u007f\x96\x92\xe0ˠ\x91\xcb\xcd\xe2\x89V\x98\x05]\xaf4\vR^\x05\xcdY-$[c\x86/YkVH\xb3\xceL\xf7\xbd\xdeLӻ\x81\xaa\xb4\xd1L\xf0\xbc\x89z\xf2sR\xa56\x9b\x05\xb4n1\v\x88\xdbj&p\xfc\xc5,\xb8p\x1bua{\xb2\xe2_\xa9\";`\xf5~3\xd3\xff\xef4\x8bW\xd9E\x13\xbcی\x97Z\x99ŷ\xef5\x13\x8c\xfen\x16\x10\xba\x0f#\xfe\x03\xe5~\xb3\u009e\x03\x94\x98\x83l\xe7\x90\x19P\xec0?\x1d!q\x8f\x92\f\xc7̊^\x8e\x9b\xb9\xdcF\x85\xec$\xf5\xe1\x94\x19X鴙{\xf5\xcd\x1a*\x9a9\xb7H2\x9fE\xdb\xe7\x92\xc3>o\x06\xb2\xbc`Vdy\xd1\flz\xc9\xcc`\x11佢zr\x95}\xb9f\x16\x90t\x1dzqC\r\xc4M|\xf7\xb7\x19\xc0\xe9\x1f3\xd0ٿ\xec\xf3\xad\xe40o\x9b\t\x91\xee(c\xeeB\xbf\xef\xa9\x1d\xbf\xcf\x11= \x05\x1f\x9a\xe1\xfb\x1eA\x10\xffS\xd3\xfb\xd8\f\xfc\xf3\xc4,\xc8\xe9)5#\x97E\xba\x91\xdbBl\x95\xc7Bz\xe4\xb5\x10\x02\xe5\xb3PQ\xf2[\x14\x86\x14\xb0\x10\xf5\x14\xb4\xc0*\x15\xb2\xc0V\x15\xd6NJX\xf0N\x0e\v\\mQ\v\xd5\xe8Y\v`G1\x8b\xba\xce\xe2\x16\x9a\x82\xe7,p`\xcf[\xe0\tKX\xc4x\x94\xb4\xa0S/X\x12\xf2\xf8\"zV\xcaB\xe3\xf0\x92\xf6\xa4\xb4E\x80D\x19\x8b`\x85\x97-P\xb0\xb2\x16\xbc*قE7\x16\u009ar\x16!|y\x8b\xf8\xb3\x14\v\x95\xb4\x82E\x04\xae\"\x9b}\xcd\x02KP\xc9B\xa7[\xd9\x02iy\xddBk\xf7\x06*\xabb\x81{\xaaj\x81\vz\xd3\x02;PM\xbb_\xddB\xafH\n\xbce\x81e\xafi!;߶\xc0\x92\xbcc\x11C_\xcb\x02M\xa9\xcd\u07be\xabMԱ\xd0d\xd4U2\xbdg\x11\xfd\xa9\xa7\xbfַ\xd0\x184\xb0`\rICV\xd1H\xbf}\xdf\x02/\xd8X?~`\x11W\xd7\x04eS\v\x8cև\x16N\x8f7\xe3\x9d\xcd-\"\a-,L\x02\xb6\xb4`\xf1\xdeG\x16\xb5\x11\xad,bZZ\x93\x04m,b`\xdbZ\x98Zjg\xc1\x8a\x81\xf6\x16Q\xbe\x0e\x16\xe4\x1e;Z\b\xd1:Yh\x18:[\x10\x9ft\xe1\xa5+\x87ٍ\x97\ueb34\x87\x05Ɍ\x9e\x16Ht/\vB\xeaސ\x96>\xfc\xf01>|\xa2\xc4\xfd\xd4\"\xc1e_\vv7\xf6\x13i\xe8o\x91\x1cP\xaaE\xd5l\x80\x85\xd6x\xa0>0Ȃ|\u007f\x9a\x05\xda\xf8\x99E,\xc7`\vva\x80,\xe9\x16\xccC\x0f\xb5\xc0S\r\x83h}n\x81\xc6\f\xb7pK\xa2\x05`)\x03\xb7gZ\xc4я\xb4`\xf5\xc4(mk4\xebȂ\xb8e[\xb8\\g\x8c\x05\x19\x8b\xb1\xe8\xfe8\x92`\xbc\x05I\xeb\t\x16N\x06~A\x1e|i\x11\a\xfc\x95E\"\x8d\xaf\xf1\xff7\x16ؙo\xf1\xd5D\v\x94~\x92j\xdew\x10\xdd\xc9\x16,\xb5\xb1`\xde\xe1\a\xedG\x8e\x05\x93\x13\x06\v\x12\xa6(M\xb8\xdb̆,\x16\xa4@\xad`\xa4\xcd\"\x99);\xf8\xe7\xc0\xb0\x9d\x1c\xaf\xcb\xc2\xd9\t7\xef\xf6\xa0G^\x8c\xde'\x04\xf7[\xc4W\x04Pq\x90\xec\vQ\xd6\xc3ڏ\b\x852j\xc1\x84F\xccBC\x1e\xb7\x10\x9fN\x01\xf5\xa7Z0\xd5\xf6\xa3\x85)\xaei\x16Y\xe7\xf1\x13\x885\xdd¥\xa73(b3-X\xad>\x8b\xf2;ۂT\xd4\x1c\xb68\xd7B$9\xcf\"\xd0s>\xa9\xbc\xc0\"\xb1\xf6B2q\x11\xe5l1ƹ\x046b)~_f\x81\xf1^\xaeva\x85\x85\x90a\xa5\x05\v\xc7VY\x90\xf2^mQ(\xb6Ƣ\xb6v\xad\x05\xa6r\x9d\x05\vCף\xc3\x1b,\x00\xe6\x1bI\xb0M \xfc\xcfhp\xb3E\x12s[,p\xbd[)\xe4\xbfP\x14\xb7i\xc3\xdbѧ_I\xfb\x1d\xb0N\xbf\x89\xcdHO\xd9i!\x96\xdb\xc5\av[\xb89k\x8fJ\xf6^\v\xf1\xd4\xef\x16\x9e\xeb\xa6d\xfe\xc3\x02o\xbc\x9f2y\x80\x97\x83\x16d\xf7\x0e\xf1\xb7\xc3\x16\x8d\xb6\x8eh\x95G-\xf4C\xc7,\x98\x138n\x01\x929\x01\x19;\xa9f\xe8\x94%\x99/\xb50Y\xfb\xa7\x05\xf3t\u007fY\xb8\x8b\xfe\x8c*\xffY\x12\xf0\x9c\xf6\xf2<\xfd\xc1\x050\xfd\"\xb9v\xc9\xc2H\xe3\xb2^\xaf\x90oW-\x82S\xaeYt\x95\xd0u\x98\xa6\x1b4\xb57-\x8a\x11\xfe\xb6ps\xd5?\x16̄\xfdK\x8d\xbae\xc1۔n\xb3\xffw\xd4\xfeܵp\xb9\xd6=T|?\xc9\xcb\a\x16콰(J\u007f\x84\xae\xfdG\x95{l\xc1\x19\x8fO OO\xd5V\xe6\xb2\xc2\xf9\xe4\xb6b6%\x8f\x95\x04\xc9k\xd5\n\xf2Y\xd1\xfd\xfcV\x02\xe1\x02V\xc6S\x05\xad\xe8a!+\x83\x8f\xc2V\x8c\xbd\x88\x15\xb4}\xc6\n+X\xd4\xca\x03Q\xad\x84rŬ\x90\xf8\xe2Vr\xf69+\xc6\xfe\xbc\x15\x89\xba\x12V\x12\xb8\xa4\x95L{\xc1*\x12\xf6\xa2U\xa8T\xca\n\x03\xfc\x12k-\xcdZ\xcbXuO\xa2\x95ֽ,\xebyE\x9f\u007f\xd5\n\xf5,g\xa5ܔ\xb7\n\x19R\xacT\xd2\nV\xeaeE+\xd4\xf45\xabУ\x92\xf6\xa02\t\xf1\xbaU9\xf5\x86\x15\xaaY\x85t\xa8j\xe5&\f\x8e\xb7\x9a\x15\xda[\xddJ\xf5\xaaa\x05\x99߲B9kZ\xa9\xbeo[E#߱Rdja`\xb5\xadP\xdcw\xadP\xb4:Vhk]\xab\xaa\xe1{V\xe8g=+T\xae\xbe\x15J\xd9\xc0*\x9a\xd7Њh\xd1\n\x1dz\x9f}jl\x85z}`\x85\x066\xb1\x8a\xca5\xb5B+?\xb4b\a\x86\x12\xa59~ja\x85Ƶ$\xfd?\xb2ByZ)\xa1Z[!dm\xacХ\xb6 [;p\xa1\xbd\x15\vQɋ\x8eV\u0557NVQ\xa3\xce\x18T\x17\xab\xbe\t\xd9J\xa5\xe9f\x85\x0eu'\xadz\xb0\xe6\x9eV\x8ao/\x15\xa8\xdeh\xa2OR\xdc>\xb6BD?\x01K>%\xc7\xfbR\xaa\xfaQ\xe4\xfa\xabȥ\xaaX\rPy\x1aH\x01\x18d\x85\xb9J\xb3\xe2\x95T\x1c\xc6`+\xb2*C\xac\xaaf\xe9\xf8q\xa8UQ\xf10P\xf6\xf3\xe4\xc7\xe1V \x9e\x11V`\x90\f+\x17-fZ\x810G\xf22\xca*^f\xb4\x15\xf35Y\x18B\xb6\x95\x88}\f\xfb1\xd6*\xe8b\x9cvr\xbcU\x17\xa2O\xb0\"\xd7\xf8\x85\nۗV\x81\xfc_Y\xe1R\xbe\xe6o\xdfp\x04\xdf⧉\xaa\x8f\x93\xf4\xfa\x9d\x15\xb0r\xb2U\xdc\xd4\xf7V\xa6\a~\xb0\x8aoαJ\x02\xc0`%\xc02R\bMV\xec\xb60[\x05\x1aX\xac@\xe2V6`\xb3½٭\b\x1c\x1cVdT\x9ch\xd5ee\n\xd7mŤ\xafNJ%#^\x8e\xccg\xc5\xf4\xbaߊ7!\x83\x94A\x1d{\xc8*X3lE\\\x19A\x1f\xa3*\xf71+v\xecǕ\x9cS\xac\xcc/N\xb5\xe2H\x90\x1f!\xa7\xd3\xd0˟\xac\x04\xae\xd3)\x993 \xb43\xad\x922\x9a\x85\x1bf\xb3\xffs\xac\n\xad\xe7Z\t?\xe7\xe9u\xbe\x15 w\x81\x15\x89\x85\x85xr\x11\xad\xc6b\x8a\xd2\x12^\x96Z%P[f\x955B˭\xb0\xb5+\xac\x92\xf0Zi\x95Xa\x95\x15k\xc6W\x93;k\xc0\xe5\xb5ʇu:\xac\xf5Vƅ\x1b\xa8\x8a\x1b\xad\xb2[r\x13\x89\xfe3*\xde\fA\xd8¯\xb6Z5#\xf6\x8b\x15\x11\xed6+6;n\x87V\xffj\xe5\x11\x8a;\xac\xba!Ê\xd5U;\xad\x82\nw\x91\xf1\xbbѿ=|z/\x15\xffw\xf0l\x9f\x15\x8b\xa7\xfe\x10\xaa\xa5\xa6\xec'\xfb\x0f\x80\a\a\xf9\xec!\xf6\xf10\x06rĊ\xf9\x92\xa3\xb8ᘊ\xe9q\xab\x00\xc0\x13V\x01O'\xf1\xcb)\b\xfai+N\t\xfb\x13\xdd\xfc\v\x86\xe0\fm\xd4Y\x15\xe4sV\xba\xf3\xf3\x94\x98\vl\xfebR\xad/Y\x91\xed\xbf\xcc\xcf\xe9)Wh\xf1\xae&\xd5\xe2\x9a\x15\xbb\xa5\xae[\x15\xe8\xde \x8boB,\xfe\xb6rb\xe1\x1f\xf6\xff_\x8e\xfa\x96\xca\xe8m\x1a\xf1;ʐ\xbbV\xc9\xd4\xdcSQ\xb8\x0f\xc3\xf4@;\xf9\x90\x9d{\x84\x01\xfc\x87\xf1=\xc6\xffOh՞Z\xe5\\\x88\\6\xe8En\x1b\x93LylX{\x99\xd7\xc6\xfcf>\x9b\x90(\xbf\r\xfd+`\xc3Z\xa3\x826\x84~\x85l\xa8\xa5\xb0\x8d\x93\x14El\x9c\xfdy\xc6F\xd2\x14\xb51\x1b\xf3\xac\x8d}+f\x83H\x16\xb7I\x87\x9f\xb3\xb1\xfb\xcf\xdbDZJ\xd8\xe4L\x8a\x926\x86\x856Ʊ/ڠ\xbd\xa5l\xd2\xe3\x97ث\xd26\x19D\x19\x94/ې\xc9(k\xc3\xda\x1a\x1b\xb7\x1b\xbfjcN\xbc\x1cn)\xcfn\xa7\xd8\xe0\x89+\xd8\x18\xe9W\xb4\x89\x86\xbc\x86\x81U\xb2\x89JT\xb6a\xbb\xcc\xebh\xea\r\x9b(z\x15\x1b\x91\u007fU\x1b_Ϩ\x1f\xabٸZ\xb9\xba\r\xbc\xa9a\xd3\x04\xc1[6n#\xa9\xc9\xef߶\xe1@7\x1b\xe8_\xcb\x06\xbd\xaam\xe3J\xd7w\x95Nul\x9aj\xafk\x13s\xf6\x9e\rf\xb8\x9e\x8d\nWߦ'07PJ5\xb4\xc1n5\xb2Ѡ\xbc\x8f\x016\xb6\x89l\u007f\x80A4\xb1A\xea\x9b\xda\xf4`p\x1b\xf6:4\xb3!E\xd0\x1ccnaCڢ\xa5\r\x1bI?Қ[ٰ\x9c\xb3\xb5\r\xdb\x04\xdb\xd8\xc4µ\x05\x97\xda\xd9T}\xdb\xdbhe;\xe80;\xa2\xbaN\xa0Wg\xb2\xa6\x8b\r\xf1sW\x1b\x96\xb3u\xd3\a\xba\xdbD {\xd8t\x1dVO0\xab\x97\x8dP\xac7(\xddGG\xf4\xb1\r\x1a\xf6\x89\r\xe6\xf6St\xa3\xaf\rz\xd2\x0f\r\xf5'mS\x93\x9d\x1a\x00\xba\rd\xbb\x83\x94Ai6\xe6H?\xb3Q\x89\x06\xdb`\x15\x87\xd8hk\xd2mX\xf83\x94\x14\x18\x06\"~nc\x14<\x99ԏ\x91Iv\x8d\";GC~\xb20\x84l0`\x8c\x8d/:\xe6e\x9c\rہǃ\x90\x13T\a\xbe\xd0\xeb\x976I\x19|\xa5t\xf8\x9a5~\x93h\x1f\xdb\xf4m\x8a\x8b&\xb2\xef\x93P\xc5w\xa0\xe4d\x94\xdf\xdb8\xb9\x88\xee\xe7\xb0\u007f\x06\xad\xda\xc8\xcaL\xaa}f\x90\xceb\x93ē\xd5\x06\xa3lSZ\xd8\xd9C\x87\r\xde\xceI\xea\xbalb\x00\xdd\xfc\xe0\xb11\x1d\xe3e\x13>\x1b\x17\xca\xf9\xa9\xa8\x01\x1b\xa1h\x90\xf5\x84\x94la\xfe\x1a\xb1\xf1\x15jQ\x1b\x92$1\x1b\x122q\x1b\xf3\x9dS\xf8q*e\xe7G\x8cp\x9a\r\xee\x90j?]\x891C\xab\x99\ty\x98Ey\x98M\x12\xcfa\xc3sm\xccKͳ\x11\xe6η!\xbf\xb7\xc0V\xb0k\xda\xe0\xd4Qi)\vQ\xf1\"\xc8\xecb\xea\xe4\x12^\x96\xea#\xcbԆ-\xb7\x15\xe8\x906*5;e\x85\x8d\x8bll\x12]\xac\x02\rW\x83\xdakTZ\xd7\xda\nv\xcf\x1a\x9d=,-e\x1d\xed\xdaz\x1b\xc0\xdb\x06[\xe1\x04\xd2\xe5/\x1bm|]\xfe&\xb4\xff\xb3\r\x93'\x9bmؗ\xb0\xc5\x06\x97\xb6\x95\x84\xfe\xc5V\xb0w\xea\xe0\u052c\xb4\x94m\xe8\xe5v\xaa\xe4\xaf\xff\xfbz\a\f\xcao6,t\xdci\x93\xd4\xee.\x1b|\xcan\x1bV*\xed!\xd5\xf7\x92ſ۰\xe6a\x1f4\xe4\x0f\x1bC\x87\xfd\x94\xe7\x036@\xe5\x836\xfa\xc0CIu:Ls~ĆL\xcdQ\xb5CǨ\x95\xc7myZ\xa4\x9c\xb0I\n\xe3$L\xf6)\x1b\xc0\xfai\x1b\xf7\x05\xfc\xc9J\xffb\x13gl\xea\a\xcfژ\xbb:g\x93\x99\x84\xf3\xa0\xc3\x05\x9b☋\xe8\xdd%\x1b\xbd\xffe6t\xc5&SFWm\x84\xe7\xd7X\xdf\xf5\xa4Fܰ\xe5k*\xabP\xd5\n\xffmC\xd4\xf3\x8fM\x92j\xff\xda\x04*ܲ\x01\x16ܦ\x86ܱq\x01\xe5]\xe9\xfe=\x9b\x00\x8b\xfb6\xa2\xf6\a\xa4\xfcC\x1b\xc0\xd3#\x9b \xa0\xfflxՔ\x8d\xb9\xd6'6\x04-OmLs\xe7\xb2K\\\x93ۮ.<\x8f]\xc4!\xaf\x9d\xce.\x9f]\xcf\xfb\xcco\x17\vW\xc0\x8e\x83\xa3\n\xda\xe9q\n\xd9\xd9fa;\"\xdb\"v4\xfd\x8c\x1dh\xbd\xa8]\xb3\xae\xcfڅ\xc7\xc5\xec\\\xf9]\xdc\xce͋v\xa6a\x9e\xb7#\x1a(a\x87\x97(i\x87G{\xc1\x8eu\xa8v\xf6\xb7\x94\xb6\xf2\x92]\xf0Li;\xe9Z\x86O\xbcl\xa7A.\x9bl\xed\x15\xbb\xe0\xccW\xed\b\xa2\xca\xd99\x87^\xdeN\x98\x9ab\xc7\xca\xdc\nvl3\xa8h\xc7\xcb\x19\xed$z%;\x93\x97\x95\xedX8\xfc\xba\x9d\xd6\xe4\r;\xfdN\x15;\xc3\xc0\xaav\xf0\xe6M;\xbct5;NǪ\x9el\xbd\x86\x9dr\xf3\x96\x1d^\xaa\xa6]4\xecm;\xe7{߱ӒԲkj\xa3\xb6\x1do\x83x\xd7\x0e\xf8Q\xc7.ӱuI\x9f\xf7씰zvHo}P\xa4\x01\xc6\xd6\x10\xff7\xb2#\xbd\xf7\xbe\x1d\xa7\xe56V2|\x00Z7\xe1oM혋\xf9\xd0.b\xd4\xccN\xd1knG<\xd4\xc2\xce\x18\xba%\xf8\xfa\x91\x1d\x11P+;\x03\x91\xd6v\x95\xf36vh_[;\xe6\x03\xda\xd9y\xa0\xd7\xc7v\xccw~\x02\xc1\xfc\x14#ꫤ\xeb\xa7d\xe9oǤI\xaa\x1d\xa1\xe9\x00\xbb\x18\xf7\x81(\aa@il\xf03\xf6t\xb0]\f\xcb\x10;\fK\xba\x9dfc\xa8]\xd4t\x98\x1d\n\xfeyr\xc4\xc3\xed\xf2\x12\r27C\x99\x99\xa9\x8d\x8e\xb4\x8b&\x8e\xb2\x8bJ\x8dF3Y*\x9aٔ\xfc1\x18\xc4X;\xa6\x17\x95\xde\xe3ѫ\tv\xa8\xe3\x17*\xd2_ڡ\x82_Qo\xbe\xe6\xd3\xdf(=\xbf\xd5J'\xaa\x96MBS\xdf鯓)\xf7\xdfC\b~H\xca]\x8eJ\xab\x81\xd2i\xa4\xf8\x9b(\xcaf\xd5\x02K\xf2n\xab\xaa\x83\r\xf2d\xa7\x14:P\xa3\x13\x1cpQ\x80\xdc\x14>\x0f\xa9\xecU\x91\xf1Q\x82\xfc\xca\xf6\x00\xba\x17$\xa5C\xa4{\xd8\x0e;\x1d\x81\xe4E\xed\xd8Ǐ2n\x97D\xed\x14;\xd68N\xb53\xdf\xf2\xa3]vOMC\xf9\x13n\x9bnG\x14;Î\xa5\xdf3\xf5\xbeYz\x9d\xad\xd79vx\xa8\xb9\xfaq\x1e\uf78f\x1a\x16\xe8\x97\v\xf5\xba\xc8N\xbb\xbf\xd8.\xab\x92\x97ع\xd2y\xa9^\x97)\xb3\x96+aV\xe8u\xa5\xbd`\xd7\xec\x01r\x8e\xe4*;\xcf\xf9^\xad\xf5\xad\xd1\xeb\xda\x04\x89\xd23S\xd6\xd9\xf3\xb6\xceLYo'\xf0\xd9`\x97ue\x1b\xedD\x19\x9b\xec|\x97\xb1ڗ\xcd\x10\xe8-(\xb7\xdaq\xaa\x8d\x1d\xc9\xd1m\x90\x9e\xed4Q\xbfڑ\xa1܁\x1b~\xb3\xcb\xca\xef\x9d\xca\xc6]v\xeeӰs2k\x8f\x9d\x89\x93\xbdv\xf1\xb0\xbfӞ\xee\xb3#+\xf4\x87\x9dY\xea\xfdP\x80\x03Tƃv\x01M\x87\xd0\xc7\xc3\"\xeeGT\a\x8fR\xb4\x8e\xd9\vv\xcb\xc8J\x1b\x9e\x91r\x9c\xb5\x9cPƟ\xa458e'\x14=mG\x14\xf2'9\xff\x17\xac\xf3\x19;\xa3\xb9\xb3\x14\xe9s\x18\xd2y\xbb\xae\xe8\xbf\xc0\x9e_T^\\\xb2\xc35^\x86\x9e_\x81:^\xb5\xcb!c\xd7t\xa4\xd7\xed\x80\xfe7\xec\x92E\xbaIk\xf67e\xf2\x1f;pƿ\t+\x92\x96\x99r\xcb\xce \xef6\xe5\xfe\x8e\x9d+\xe1\xeeҖ\u07b3\xcb|\xd8};\x91\xf3\x03H\xf8C;6\x1b\xf9\u0601\xd8\xf3\x13\x8aϧ\x0e\t*\xfaB\x1a\xfa\xb1\xcb\xfd\x95\x10\xa9\xe0\xe6\x00\xdc0СKn\x1c0\x92i\xac\xf13\aQ\xcc`\x87\xa6Ň8\x04\x97\xa6s\x9cC\x1dr\xa0\xe30V\xfa9*\x1bN\xd1\x18A\xa9\xca \x013\xd1\xf8H\a\x80\xff(\xde>\x9a\xbc\xcfr\xc0\x01d;\xb0\xf4h\x8c\x03\x1bQ\xc6j_Ʃ\"\x8c\aq'`\xc4_@.\xbft\xd0r~\xe5\x10\xf4\xf95\xbb\xf3\r\x18\xfa-{>\xd1\x01\x838Ɂ\x00\xeb;\xb2p\xb2\x8a\xd6\xf7\x0e\xfa\xa2\x1f\x1c\\\f\x97\xe3\x10\x93bp\xf0|/\xa3\xf2ȤW\xb3C<\x8d\x05\x82lU\xd2\xd9؊\x9d\xa2\xe4\xc0oNt\xd0\xe5\xe0\xc2@\xb7\x83\xe1\xb4ǁcm\x1c\xccv\xf8\x1c\f7\xfc\x0e\xcc^\x060\xb2\xa0\x83;\x91C\x0eq6a\x87B\xeb\bY\x11u(\xea\x8f9\xc4\xe3\xc6\x1d\x8c\xa6\xa680\v6\xd5\xc1L\xe4\x8f\x0e.\xb7\x9f\xe6\x90\xe0\xe4'\a\x1c\xeat\aC\xc2\x19\x0eN\xfc\xcf\xd4\xde\xcfr`?\xe1l\a\xe68\xe6\x90Fs\xf5\xa6y\xa0\xf0|Pv\x01%x!{\xbbȁ\xb4\xe5b\xca\xe7\x12\x90{\xa9\x03\xce~\x99\x83\xc7\xce,w\x10\xb6\xafp\x00X\xact\xc8ΝU\xe0\xffj\ar\xe8k\x1c\xb2\xf6a-\xf9\xbe.9\xb6\xf5\x0e\x80\xad\r4d\x1b\xc9\xd0M\x0e\x01P?\x83F\x9b\x1d\x98\xbe\xd8\xe2\x10H\xb8\xd5!Q\xf0/\x0e8\x8dm\x0e1\xd0\xdb)\xed\xbfҰ\xeePj\xfc\xe6 \nډ\av\xb1\x91\xddT\xf9=\x0e\x06\xbb{\x1dL\xa7:x\xa4\xeb>\x87\xe6\xb2\xfep\x14\xe8\x98%\xe7E\xee\xa7\xfe\x1e\xa0\xfe\x1fL\xda\xc2C4\xa3\x87)\xcfG`\xa6\x8e\x82E\xc7@\xc1\xe3\xf8\xff\x84\x03\xab\\N:0\x17\u007fJ\xdb<\xcd6\xfft\xe8\xcb\xfc\x1d\b^\xcf8\xe8\x9a\xcf:$\xa7r\x0e}>OB^\x80\x84]dO.\xc1#\\VWp\x05\x02v\xd5!H隃\x80\xf1:\xcd\xcb\r5\x977\x1d\x98\x8b\xf9\x9b\x1c\xf8ǡ\x87\x9d\xd2\x18߂\x13\xba\xed\xa0\x93\xbdC\x8e\xdfE\x13\xf7\x1c\x9a\x98\xbd\xef@.\xe1\x01\x84\xe2\xa1\xca\xf2#\aS-\xffA\xee\x1f;d\xba\xe8\t\x89\xf4ԁ\x1cv.'\x8e\xb4\xcd\xed\xc4\x18\xf28\x13\xc6.\xafS\xb8\x99\xcf\xc9\xed\xa1\xf9\xf1\xa9\x80\x13\xc3*\xe8\x04\xef\n9a\xc6\v;\xb5\xed\"\xc9\u007f\x9eq\xe2h\x8d\xa2N\xa6\x1e\x9eur\xa5z1\xa7Щ\xb8St\xe79',\xe0\xf3N\x01\xaa%\x9c\x18nI\xa7t\xfa\x05\xa7\xf0\xe4\xc5d]\xa5\xd8\xe4KN\xbe\x94\xd8\xc9\x11\x95q\x8aH\xbf\xec\x94e\x00e\x9d\fn^q\n\x1b_u\xd2\xe0\x94sb\x92\xa3\xbcS\xf1\u007f\x8aS\xc0{\x05')Qщѿ\xe6TkY\xc9\t\x04UY\u007f~\xdd)3\xe1o8i\x18\xaa\xa0\xb1\xaaNh\xea\x9b\xf8P\xcd\xc9\xd4[u'\xac}\rg2\xad\xeaD\x96\xa1\xa6\x93\xc6\xe3m'\x94\xe7\x1d\xa7\x80\x9fZN\xb0\xa6\xb6\x93\a\x15\xbc\xeb\x14\xf5\xaa\xe3\xc4F\xbd\xbaN\xca\xf4{N\xba\xe8zzS}R\xa6\x81S\xb5\xaf\xa1\x93\xae\xbb\x91\x13\x13$\xef;\x89D\x1b;!\v\x1f8E\xc0\x9aplM\xf5\xb7\x0fyk3'\xc3\xeb\xe6NZ\xd6\x16`FKm\xef#\xde\xd4ʉ\x1d\x1b\xac\xad\x8d\x93k\x03\xdb:aE\xda9\x99\xe6n\xef\x84\x1d\xe9\xe0\xa4\xc4vt\x8aLur\x12\x8fv\x86\x98tq\"\xea\xecʎts\"(\xe8N\xd2\xf4 \x15z\x82½\x9c@E\xbd\x9dt\xc3}\x9c\x88-?v>\x93\xc0 i#2\x86gde\xa4|\xe2\x84q\xfd\x94r\xd0\xd7\t\xcb\xd6\xcf\xc9e\x00\xfd\x9d\x98MIu\x024\x0epbG\xfa@'\x8c\xe0 \xa7\x04)iN\xf1v\x9f\x81\x03\x83\x9d\xcc1\x0eq\"\b\xbd\xc0I\x17\xb3\x10\xb4]\xc4\xe1,FǗ85l\xc4s\xcbP\xe3rX\xa3\x15\xfa\xd0J\xfc\xb2*ɐ\xd50bk\x9cpekul\xebȑ\xf5\xaai\x1b@\x80\x8d(7%\x1f\xfc\x99Vd\xb3V\xbb\x05}ي{~\xe1\xe3ۜ\x043\u06dd\x98\xc8\xf9\xd5\t\x0f\xbb\x83\xc2\xf8\x1b?\xed\xe4e\x17:\xba۩\x89\xfe=\xb0({\x9d\x9a\f\xf8\x1d\xbf\xees2`\xe4e?u\xf9\x00Fs\xd0\xc9E]\x87\x9c\xc0\xaf\x87\x9d\x9c$>\xa2z\u007f\x14\xa49\xc6'\x8e;e\x0e\xfe\x04L\xecIU\xd7SԈ\xd3NIS\xfe\xe9Է-\xe2\x963NDag\xb5\x85sʱ\xf3j_/8q6\xc3E\xa7\"\xf4Kp\x03\x97i\x84\xaf\x80\xadW\x9dX\xfbz\x8d\xba|\xddɼ\xf7\rX\xb8\x9bN°\xbf\x9drx\xc6?N\x01-\xff:e\xa1\xc3-\xd0\xf36\x86w\xc7ɅnwI\xac{\xd0\xcb\xfb\xb8\xe1\x81S\x8e4y\xe8$z}\xe4,\xdcz\xf4\x90\xf4\xf1\xd9\xc3\x13\x11\xa3\x93sL\x8f\x9d⥟\x80\xa2O\xa9ع\\2\xce\xdc.¸<.]\x88\xe3\xa2z\xe4s\xc1\x94\xe5w!\x9f]\xc0\x05^\x16taW\xbfK\xea*\xec\x12\xbcW\xc4\x05\xfe?\xe3Jxآ.\x84SϺ\x80\xbd\x8b\xb9\x10!\x14w\xa1\xb1\xe7\\\xec\xdb\xf3.\xe4>J\xb8\x04:\x95t!\xa7\xf5\x82\x8b\x0e\xefE\x17\x8ei)\xe5\x82\xd5|\xc9\x05\x95*\x8d;˸\xb0T\xe1e\xb4\\\xd6\x05\x8c\xf1\x8a\x8bٮW\xd9B9\x17\xa0Ly\x17\xa8\x93\xe2\x12\x92Up\xa9(Uta\x9e\xe35\x17\xb0\\%\x97й\xb2\v \xf4u\x17߯\xe8\"\xba\xad\xe2*\xd8*u\x80\xbc2\xb1\xaa\xab@\xebQ\x92F|\xd3U\xa0\xc3\xe0\xd4\xd4a)\xd5\\0\xdd\xd5]\x98\xbb\xa8\xe1\x12&\xbf\xe5\x12\x10S\xd3%\xccx\x9bm\xbf\xe3\xc2\xdb\xc7j\xb9\xc4^\xd7\x16ʼ\xeb\xa2\n\xd5q\x11\xac\xd6E\xef\xde\xc3\r\xf5\xc0\x86\xfa\x18Y\x03\x97\x88JC\x97\xb0\xbe\x91\v\xc6\xff}\x97\xe0\xa1\xc6.:D\x17\xa7\xff\x9a\xb8\x80⚺(\xb8\x1f\xb2\xddf\xbc4wa\x91O\v\x17^\x8e\xe1\xa2\x01\xfd\x88\xbf\xb5r!\xe5\xdd\xda\xc5\xf8\xa6\x8d\x8b*\xd2օ\xc5\b\xed\\\xa2\x14\xed]X\x85\xea\xd2\x05^\x1d]<\b\x9c\x15tv\tB\xec\xe2\x02Z\xee\xea\x02\x02\xed撬Ow\x97\xa8W\x0f\x17\xbdKO\xe5w/HLo\xb4\x93\x9e\xd2Dž\x00\xf1c\xfd\xf1\x13\xfc\xf8\xa9K\xf4\xba/\x05\xad\x1f\xe8\xd0\xdf\xc5Dt*\xa5e\x00\x1a\x1d\xe8B\xf2c\x10\xe5*ͅ\xf4\xcag.E*\x83]\xb2=d\b\xb8\x91Nn\x0fu!qJZ}\x8e߇\xbb\xe0\xadG\xb8\x18\x9ed\x80\x0f\x99\xa0\xf7H\x97b\x92Q.y\xb1\xf8h\x17\xa0c\x96\x8b\xfa\x93\xad\xe3\x1a\xa3\xea1V\x85o\x9c\x8b\x86o\xb709\xbf[:V\xc0\xadӷ\x05\xdd8h\xa8\x90\x9b\x01fa7\x9c@\x117z\xf3\x8c\x9bswE\xdd\"\xd7ϺE\v\x8a\xb9I\x99\xe2n\xc9y?\xe7fN\xf7y7T\xbc\x84;OӔ\x92\xee\xfcm\xf1\xc6~\xb7$\xca^t\x03ߖr\v\xa2}\xc9\r\x04]\xda\xcd׀\x95q\x8b/z٭\xa4/\xebF\x9a\xf3\x157\xec\xe0\xabn\xae\f.\xe7Fڴ\xbc\x1bH1\xc5MXT\xc1-\x10\xa4\xa2\x9b\x1c~\xcdM\x01\xa8\x84o+\xbbE _w\x03k\xbd\xe1fJ\xae\x8a\x1b\x81OU\xb7\x92\xeaM7c\x97jn\x81\"\xd5\u074c\xe8j\xb8Aз\xdc\xe2\xe3j\xba\xa1;o\xbba\xb3\xdfq\xd3m\xd5\x02\x19k\xbb5~ħ:n\xc0\xa4\xban.\xfb}/\xf1xjJ=7\xf2\x05\xf5\xdd\xd8}\xd0\xc0]\xb0m\xea\x84Ԅcn\xe8\x16\xdf\xd8\xc8\rl\xf6\xbe\x1b\"\xdf؍\xc8\xef\x037_=\x9c VZJS\xa5\xf4\x87\xfc\xb2\x99\x1b\x8e\xbf\xb9[\x81e\v~\xddҍÿ?rc긕\x9b)\x91\xd6nq\"mtTm݀\x1e\xed\xb4\xc2\xf6\xe0E\a\xb7\x88_Gr\xa4\x93\x12\xbb\xb3\x1bo\xebwcz\xb5\xab[\x8c_7w\x02\nt\xe77=܄[=\xddb[z\xb9\x11(\xf4vS\xab\xfb\xb8\xe9\xfe>vs\xbd\xc7'n\xe4i?\x057\xfa\xbai\xba\xfa\xb9\xa9\x9b\xfdݚ\xbdMe\a\x06\xa0\xe1\x81nz\xf6An\x18\xe147\x16X}\xe6\xe6\xfaTmg\x88\x1b\t\x8fte\xe0P7<\xd407A\xed\xe7z\x1d\xee\x86\v\x18\xe1\x06 \xcc\xd0\xf1e\xba\x19w\x8ft\v\xa4\x1cEi\x1f\xed\xd6\xd7ghdz\xf5\xf3\x187\xe7$Ʋ\xc1qn\t\xc7ƻi\x8f&\xb8\x01\xa7\xbepý\u007f\xa9\xc2\xf1\x95\x9ba\xc3\xd7n5\xb0\xdf@Ŀu\xc34OD\xab\x93\xdc<\x0e\u038d\xb9\xed\xc9n1\xfb߳\x9a\x1f\xc8\xd3\x1c\xdeap3P4B\x91Ln\xe6\x1b\xcd$\xabEykuc\xfa\xc0\x061\xb6\xbbaL\x1cnYX\xe4Dk.7\xb6j\xba\xdd\xac\xe7e\x03/\x1b\xdd\x12:l\x82\xc2\xff\xcc\xfb6\xbbe\xe7\xe4\x16\x90{\xab\x9b{f~!\xaf\xb7\xa9\xddٮ\xf2\xf2\xab\xf2k\x87\x9bo8\xfd\xcd-3\x03;\xddX\x86\xb6\xcb-8i7\x87\xb5\a\x94\xddK\xbd\xf8\x9d\xb4\xda\a}\xfeCe{\xbfJ\xf3\x01\x10\xe0 zt\b\xf5\x1dV5;\x92\xe4\xe7Q7V\x0e\x1f\x83a<\x9e4~'\x94V'\xd9\xfc)7\x13\x00\xa7\xdd\xf4\xc3\u007f\xba\xe9\x97\xffrs\x1e\xec\x8cڵ\xb3\xb4\x84\xe7ܘ\x998ρ^\xd0\xce\\ts]\xd7%\x9a\xb2˪DW\xdcH\xad]\x85۹Fٽ\x0e\xde\xdcp3v\xb9I\xf2\xfe\xed\xd6\xf5\xab\xfc\xf8//\xb7\x92\xce\xe16Fy\x87\x86\xf6.,\xd3=\xb7x\xe3\xfbnL\x9c=H\x8e\xf8\xa1[\x10\xfd#7_\xbdH>=fW\x9f\xb8\xf1n\x85\xa7n\xf5չ\xe7ar\xf4y\x0f\x94\xbe\x84\aP\xb3\xa4\a\xcb2^\xf0\xc0Ͻ\xe8\x01\x15Ky\xb0\x8c\xd5CZ\x96\xf6\xa8U)\xe3aN\xf4e\x8f8\xe1\xb2\x1e*\xda+\xac\xe1U6Z\xce\x03\xc5/\xef\x11S\x9d\xe2\x11RU\xf0\x00\xcdT\xf4p\xeb?/\x95<\xf4\xa8\x95=\x84ۯ{\xa0\x96oh\x9bU<\xd8WQ\x95\x04x\xd3#\\\xa8\xe6\xa1\nU\xf7\x80\xf45\xf0\x88\x1a4\xf1\x88!m\xea\xe1\x82\xce\x0f=H\n5\xf3\x10(5\xf7\x00y\xb5P\xae\xb6\xf4\x10\xb6|\x04\xf2\xb6\xf2\xc0b\xb4\xf6\x88\x99mせm\xeb\xe1\xcc@;\x0f\xa6\x8d\xda+\x89;Pb:z\xf2w\xc0\x11\xe3\x1e\tc:+\xa9\xba赫\x88C\xc2\xd1w\xf3\xc0\x8bu\xf7\x00\xce\xf6\xf0ऱ\x9e\x1eQ\x84^$Bo\xb4\xdf\xc7\xc3Ŋ\x1f{4\x96\xfbģqԧ\x1e\x02\xb0\xbe\x1e\x99R\xeb\xe7\x11\xbf\xdd\xdfCۜ\xea\xa1w\x18\x00\x96\f\xf4PE\ay\x10\x13\xa7\xe1\xcb\xcf\xc8\xe1\xc1\xbc\f\xf1PA\xd3=\t\x87>\x147\f\xf3\x00\xdb\u007f\xae\x1d\x1f\xeeANs\x84\a\x87\xc4闙\x1eDM#=\xb4\r\xa3\x92\xb2=Z\u007f\xcf\xf2\x882g{h\xee\xc6x\xb8\xdfj,i:\x8e\xe3\x1c\xef!\xe0\x9f\xe0\x91\xa5|_xxH\x9c\a\xe6\xee+\x1d\xfd\xd7\x1e\x86D\xdfx\x90C\xfc\x96\x15L\xa40OR\xcd\xfa\xce\x03\v4\x99\x1d\xfd\xde\x03\x88\xf7\x83\a\xe1P\x0e\xc4\xc0ࡏ0\xaaX\x9b<\x84\x14f\x8f\x98\x05\x8bʃ\xd5#\xe0Ǧ\xa2i\xf7h\x06̡:\xe0\x04_\\\xd4v\xb7>\xe3\xf1\x00iy=\x92\xb5\xf2a\xd4~\x0f\x93[\x01\x0fQMЃLM\xc8#\b/\xecA\x8a&\x02\xb9\x8dz\x90^\x8ay\x984\x8a'5y\x8aG\x9c\xcaT\n\xf2\x8f\x1ez\xd1i\x1e$\x10~\xd2\xeeM'\afx\x90M\x9a\xe9A\x9c:\xcb#>v\xb6\ai\x859\x1e\x9aҹ\x1e\xa6\xc5\xe6Q\x88\xe7{\x00~\x16x\x90\xa1Z葔\xcd\"(\xebb\xadz\x89G\xcd\xebR\xfdb\x99G\x90\xefrH\xc0\n\x11\x94\x95\xa0\xdb*\x8ch5jX\xe3A\xcec\xad\xf2m\x9dGR\x14\xeb=HQl\xf0\xc0\xdfn\xf40\xe3\xb3Ƀ\x10\xf8gj\xf9fԺ\xc5èd\xab\xca\xf1/\xda\xf26\xda\xdf\xed\x14\xe0_=L\xb8z\xe8=\u007f\xf3\x00\x02\xee\x84\xd1\xd8\xe5\x91t\xc9n\x8f\x84#{h+\xf6*\x03~\xf7 \xcc\xdeG\x93\xfa\x87G\xf2\x1a\xfb=\f\xde\x0e\xc0X\x1ed\x97\x0ey\xd4\a\x1cf\x8f\x8f\xc0\xf2\x1c\xa5\xf1?F\x8d=\xae\x96焇ٌ\x93ЙS*\x0e\xa7=\b\xfe\xff\xa4\xb9\xfc\xcb\x03,|\x86v\xe6\xacG\xf7{x\x18\f\x9fO\xf4R\\\xa5~}\xd1\x03/vI\xdd\xc7e\x0f\xa0\xcf\x15\xf6\xe4*\xb9}\xcd#\x90庇\x19\x8c\x1bI>\xdd\xf4H6\xe1ou(\xff@\xe4\xffUռ\xe5\xd1<\xccmՖ;\x1e\x89\xdb\ueca3\xf7<\x92\xbe\xb8\xcf\x0e> \x81\x1e\xc2-<\x82(\xfd\xe7A\xb8\xf2\xd8#!\xeb\x135\xe6O=\xc4\x13\xb9\xbcL5\xe4\xf6\u009f\xe6\xf1\x8a\x11\xcb\xeb\xd5N\xe5\xf3\"\x86\xce\xef\x85\xc1.\xe0E\x04\\\xd0\v\xa6\x17\xf2\xc2\xf5\x16\xf6\"\x96*\xe2E\xec\xfd\x8c\x97\x00\xa3\xa8\x17\xf6\xe7Y/X_\xcc\vR\x16\xf7\xea\x19\x00^D\xd6\xcf{Ł\x95\xf02)Q\xd2Kiy\xc1+Z\xf5\xa27\x11o\x96\xf2\xaa\xe7\u007f\xc9\vY(\xede`P\x86M\xbe\xecE\xe0W\xd6\xcb\xe0\xd2+@\xe8U\xaf\x04X\xe5\xbc\b\x93\xcb{\x11\xa1\xa6x\x15\x1cU\xf0\x8ajW\xf4\x8a\"\xbc慍\xaa\xe4%\x0e\xae\xec\xa5\xdfx\xdd\xcb\xd8\xd2\v9\xa9\xe2%[\xabz\xe9\x16\xdf\xf4B\xfb\xaay\x11ZW\xf7¡\xd7\xf0\xd2\x1e\xbd\xa5\xa3\xab\x89\x01\xbc\xede\x18\xf9\x8eWps-/\xe2\x9d\xda^=b\x9c\xf4\xa8\x93\x1c_]/\xe3\x91\xf7\xbc\t\xbd\xac\xe7\x85s\xa9綾m\xe0U\x83\xd2\xd0\xcb \xa6\x91\x17@\xfa}\xaf\x82\xef\xc6^\xba\xd8\x0f\xbc\xe2&\x9bxŕ4\xf5\"\xce\xf8\xd0\v<\xd7\f}h\ue17fo\xc1\x9fZz\x05\x98~\xe4\xa5Mm\xe5\x15\x05n\xed\x15\xc9l\xe3\x85}n륨\xb5ӱ\xb7\xe7\xd7\x1d\xbcb\xd6:\x92\xaf\x9d\xbc@\xf1\x9d\xbd\f`\xbaxq\x9a\x9c\x17\xd2\xde\xcd\v\xff\xda\xdd˰\xa4\x87\x97n\xac\xa7V\xdb\xcb\v\x80ڛl\xe8\xe3%D\xfc\xd8K\xbc\xfa\x89\x97\xf8\xf4S\xaf\xa0\xe3\xbe^\x81\xe1\xfd\xbc\xb4\x18\xfd\xd9v*\xa9?\xc0\v72\xd0K\xe45\xc8+r\x9f慓\xf4\x025\r\xf6¥\f\xc1/\xe9^\xfa\xab\xa1I\xd2\x0f\xf3\x12p}N\xd6\x0e\xf7\u00ad\x8dP\x9afx\tm2\xbdԚ\x91\x18\xe1(rh\xb4\x0e)\xcb+><\xdbK]\x1d\xe3U7:6)v\xe3\x92\xff\x8c\xf7bno\x82W\x00\xfd\x17^\xac\xd1\xfb\xd2+\x8e\xf3+\xed\xfe\xd7^\xc9A~\x93|\xe0[/\x1c\xd3D\xaf\x847\x93\xbc8\xf0|D\xcaw^\xfa\xb2\xc9\xec\xf2\xf7\xbc\xe9\a/\xa6Dr\xbcbH\r^$Č\xf8`\xf2\x02\x1c\x9b)t\x16/=\x8aUIn\xf32\xf8\xb6\x8bR&\x1c%ov\xaa\xe4\xbb\xf4\xeaV\xe1\xf6x\x11X{\xbd\x80\xfb\xbe\x04\xbb\xb2Ge\xa7\xf8\xbdH6\x06\xbc0\x95A/lmH\x1f\t{\tu\"|&\ua957\x88y\x19P\xc7\xd1\xc7)l}\xaaW2\xfe?z\t9\xa6A\x1e\u007fB9\xdd+o0\x9cA{4S\xfb<ˋu,\xb3٩9^\xb1\xa0s\xa9\xf4\xf3\u052ċ(,\xf0\xd2\\/\xf4\xc2 /\x82\x8a.\xf6\xc2\xdd-\xe1e\xa9\xf2o\x19\x18\xb2܋(cE\x92\x13+A\xf3\xf4\x94U\xac}5\x89\xbd\x86\r\xaf\xe5\xa7u\xa2\xbd\xeb\xbdX\xf2\xbd\xc1+\xcex\xa3\x17ˁ7%E\xe2g/\\\xe0\xe6\xe4\xe7-hk\xab\x17~\xe1\x17\u07bc\xcd\v\x88\xb0\xdd+\x16\xfeW/b\xc5\x1d^\x18\xfa\u07fcx1\xd4N/\xb6\x92\xee\xa2\\\xef\x86\xc2\xef\xf1\x02\t\xee\xf5\x16\xec4dl\xb6\xf8K\xb5\x95\xfb\xa8\xb6\u007fx\x05\x02\xef\xa7\b\x1c\x00\x95\x0f\xb2\x9aCނ\xcdx\x90\xf8a%\xfb\x11r\xf3(\f\xea1/p\xf1qU\xdb\x13z\xcfI/\xe7\x8aOy\xb1\x1a\xfd4,\xeb\x9f^D\r\u007f)%\xcfxŏ\x9f\xf5\xd2מS\x95:\x8f\x9e\\\xe0`/\xb2ۗ(\u0097\x93\x12~E%\xfc*\t{\x8d\xd2|\x1d\x92r\x83O\xde\xfc_\xb7\xff\xa6\xe8\xfcCR\xfd\xab\x02{KE\xe4\xb6J\xe1\x1d\xb2\xea\xaeJ\xff=\xb6x\x9f\x12\xfb\x80\x12\xfb\x90\xe2\xf4\x88-\xfc\x87\x8e>\xe6sO FOI\xbf\\>\x91\xc5\xdc>\x91\xcb<>\xbc\xd9\xdf\a\xb1\xc8烂\xe7\xf7q\x92\xd2G\x11,\xe8\x13\x0e\x15\xf2\x89D\x14\xf6aDE|*W\xcf\xf8\x84pE}h\xf1Y\x1fd\xa7\x18\xef)\xeeK\x88\xd3s>\xd2\xf2y\x1f\x98]\xc2'\x02S\xd2\a:\xbf\xe0\x838\xbc\xe8\x03\x1fK\xa1;/\xf9\xc8\xf6\xd2>\xe9|\x19\xfe\xf4\xb2\x0fL*\xeb#\a^\xf1a!\x0f\xcar\xbe\xbc\xed\xd2R\xca\xfb`)S|p\xda\x15|\xf4\xc4\x15}\x82\x1e^\xf3\x89ɫ\xe4\xc3\n\x90\xca>\b\xe2\xeb>\x86\xc5o\xf8 )U\xa4\xa7U}:A\xf7\xa6\x0f\x02\\͇\x15\x13\xd5}\xc4\x195|\x98ex\xcbǭ\x015}\xdc\x17\xe9\x13\x11y\xc7Gk_\xcbG\x90[[\xab\u007f\x97\xad\xd5\xf1\xd1I\xd5\xf5!\xaa~ϧ\x00\xaf\x9e4[\x1f\x14i\xe0\x13?\xd1\xd0'~\xa2\x91\x8f\x13\x95>\"\xd5\xc6>ڛ\x0f|\tDф\xc3h\xcaˇ>A\xc0\xcd|\x9c\x17k\x0e\x82\xb4\xf0I\x80\xd0҇\xdd\x1d>\xc6U\xad|L\x8e\xb6\xf6\x11\x8b\xb6\xf1\x01\x8e\xb4\xf5\xc1\xbb\xb6\xf3\x89'm\xef\xd3\xc5\x10\x1d|&\xd1\x06*\x11\a\xf9`AӴ_\x9f\xf9\x10H\f\xf6\xc1J\f!\x93\xd2\xf5ǡd\xe10^>\xf7a\xad\xd4p\xc8\xc3\bJL\x86\x0f\xd3\x12\x99d\xd4H\x9f\x98\xd5Q>B\xaa\xd1J\xb5,\xf08[\xd90Ƈ<\xfcXmb\x1c\b=>9\x82\t\xfa\xf5\x17\xac\xf0K\x1f0\xedW*\x0f_\xfb\xb8\x97\xe0\x1b\x1d\xf8\xb7>\x85\xc5\x13\xa91\x93\xf8\xd4w \xefd\x9f\xa0\xcb\xef\xf1\xff\x0f\xca\xc8\x1c\x1f\xdfa̋\x91\x836q(f\x1f\xf2 \x16\x9f\xd8]\xabO\xc1\x95\x8d2g\xe7\x8f\x0e6\xe0$\xe7\\l\xd5Mm\xf4@\xff\xbc\xa4\xa0\x0f\xaa\xe3g;\x01\x9f\x00\xb3 4=\xe4\xd3w\x17C\xcc\">]\x1f\x17\xf5a\x89H\xcc'\xc8 \x8e;\xa7\xb0\xad\xa9>X\xc8\x1f}X\x10<\xcd\a\xb7\xf4\x93\x0fK\xeb\xa7\xfb\x88]f\x80\xc23\xd9\xc7Y\xbc\xcc\xc6\xc0\xe7(=\xe7\xfa\x90\\\x99\xe7\x93\xf8j>dq\x01z\xb0\x90\r/B\x93\x8b\xd9\xe4\x12ѫ\xa5\x1c\xd52\xa5\xdcrܰ\xc2'\xd1\xc1J\x94\xabP\xae\xf6\x117\xaf\x81\x19\\K\x01\\\xe7\xe3\x0e\x8b\xf5>\x04\xb4\x1b|8~b#\x04g\x13M\xd2Ϥ\xddf55[|\x12\xc1m\xf5\xe9\x01\x15\xbf\xe0\xe36\xf4p\xbb\x0f\xaf\xeeW۵\x83-\xfc\xe6Ct\xbc\x93\r\xec\xf2\xc9Ε\xdd>b\xc7=\x90½\x94\xf3\xdf}\x92\xda\xdf\xe7\x93\x15\x01\u007f\xf8\x805\xf7\x832\a|\\TtЧ\x8btH\xb6\xc3>\xb8\x9a#>@\xab\xa3\xbe\x82]\xe9d\x8e\xf9\xe8\xf7\x8e\xb3\xda\x13\xa8\xf0\xa4\xb6x\n\x1d=\r\x12\xfd\xa9\xf5\xfe\xe5\x03J=\x03*\x9d%\x05\xce\xf9\xb0;\xe7<\x1e\xbe\x80\x87.\xa2\xbc\x84.]Fy\x857]\xf5\tξ\xe6\xc3\x1b:\xae\xfb\x04\xd9\xdc\xf0I<~\x93\xbe\xe2or\xf4\x1f\x1f\xf7Q\xfcK\xb9\xbb\x85\xe6n\xa3\xbc\xe3â\xaf\xbb\xaax\xf7|@\xb6\xf7!\xdf\x0f|\x00\"\x0f}\fR\x1e\xa9\xad\xfc\xcfG_\xfdX\x8d\xcf\x13\x88\xf1S\x1f\x13-\xb9\xfc\x92\x13\xcb\xed\x97\x1e\xe7\xf1K_\xf2\xfa\xa9\xe2\xf9\xfc\f\"\xf3\xfb\xe1N\v\xf8\x89\xb6\n\xfais\n\xf9a@\n\xfb\x11y\x14\xf1\xb3C\xcf\xf8\x05_\x14\xf5\xeb\xa9\x00~P\xbc\x98\x1f\x00\xad\xb8\x1f\xb1\xcas~\xcem<\xef窑\x12~\bhI\xbf\x88\xf1\v\xfa\xe4\x8b~lP-\xe5\x87j\xbc䇾\x94\xf6\xf3\x8d\x84e\xfc\x8c\xb8^\xf6\xcbH\xcajӯ\xf8\x93|}U\xbf)\xe7\x87I-\xef'jHaC\x15\xfcb\xda+\xfa\xb1\x82\xfe5?H\\\xc9\x0f\xc6V\xf6\x93t\xaf\xfb\x11漁\xfa\xab\xf8\xa1\xf0U9\x967YI5?\xe6!\xfd\"\xfd5\xfcb\n\xde\xf2#\xa5R\xd3O\xf5}\xdbO%}\xc7/\xfc\xaf\xe5\xc7,\xa4\x9fz\xf7\xae\x1f{?\xea\x80\xe8u\xfdd\xf6{~\xda\xc3z~,\xd5\xf1c\xa9\x0e\x9bn\xc8\xe17B\x9b\xef\xe3\xa9\xc6\xec\xfe\a\xda\xe1&zm\xea\x87<|\xe8\x17Yi\xc6\x1e7G\xf7Z\x90\xf8-\xd9\xf4GړVJ\xa9ָ\xa7\x8d\x9fq~[<\xde\xce\x0fqj\xcf\xc6;\xf8\xf1\xb2F\x94\x9d\xfct\xae\x9d\xfd̺v\xd1kW?]~7?\xf1Jw\x15\x95\x1e\xfa}O\xbf:\xf9^\xfa@o\xfd\xa1\x8f^?\xf6Sd?\xd1ϟjE}\xd9\xf9~\xbc\xf4\xf7#k\x94ꗰj\x80\x9fk0\a\xeau\x90\x1f[\x83\xd3\xfc\x92 \xfaL\x9f\x1f\xec\x87\xdd\x1b\x82/\xd3\xfdbӇ\xfa\x19\xe0\x0f\xf3\xf3\x00r\xbf\xe6T\xfdX\xe32\xc2/\xd0#\xc3/\x18/\x13R0\x92?\x8c\xf2#\xab7ڏ\x8cB\x96\x1fj\x9d\xedG\xc6n\f87\x96\x022\xce/\xd3n\xe3\xfd\xa2\xf0\x13 q_\xf8\x05\xc8|\xe9\x97T\xf8W~\xc0\xa9\xaf!?\xdf\xf8\x11*|\xeb\x87\x13\x9d\xe8\a\x8c\x99\xe4G\xc0\xfd\x9d\xca\xeed\x0e\xeb{\x15\x92\x1f\x12\x03\xcb\x18\x9e\x91\x92\xc3\xc6\f\xbc\xd9\xc8\x1aL\x90\x10\xb3\x1f\v&,~\xb8>\x946?\xce\\\xb7\xfb\xb9\x0e\xc3\xe1/\xd86cHꄴ\x14':\xe5\xf2\x13\xa5\xb8U\xd3=~\xcc\xeayU\xdb|~\x18S\xbf\x9fӂ\x01\xbd;\xe8g\x04\x1f\xf2s\x1dA\xd8\xcf\x104\xe2\x17\xb0\x1a\xf5\xab3\x8c\xa9\xcc\xc4\xfd\xc0\xb7S\xfcbϧ\xfa%\xc8\xfe\x91=\x9d\xe6Ǥ\xf5O~\xe6\x1d\xa6\x8363\xfcH\x16\xcf\xe4e\x16\xc4o\xb6\x1a\xa690WsQ\xd3<\xe5\xdf|?\x03\xd0\x05`\xe0B\xfdv\x91?o\xc7\x11)\x8bI\x9e%~\xb8\x99\xa5\xe8\xdf2?R\xb9\xcbم\x15~\xa4\xbaWBBV\xf9\x05\x96\xadf\u007f\xd7\xf8\xf5D\x00?\xdf\xda\xe8\a\xe6[\xaf4\xd8@9\xd8\b\xc2o\xd2F\u007f\xf6+x\xdc\xec\xd7\xe3\xc6A\xe5\xad\xd4\xca_\xd4>l\xf3\xd3Yn\x87\xac\xfd\xea\x97\x1d%;\xb4\x86\xdf\xfc\x88\x0fv\xd2\n\xec\xa2\x04\xee\xf6\vf\xdcC\xb3\xbb\xd7\xcf<\xce\xef\xe8\xf1>\xde\xf8\x87\xf6j\xbf\x1fn\xef\x80_Ò\x83\xd4\xe4C\xa4\xf3a?\xa0\xe9\x11?R\xb5G\xf9\xe81\xd4s\x9cD9Az\x9d$\xbdN\xd1R\x9ef%\u007f\x828\u007f\xf1\xa93T\xaf\xb3\x18\xc29\f\xe1<\xfe\xbf\xc0\xdf/\xb2\xe7\x97\xd0\xf3\xcb\xec\xd5\x15\xfet\x95\xb5^cS\xd7\xfd\b\xb5n\xf0rSI\xf47\x99\xf3\x8f~\xfc\x17T\xbeEɿ\xed\x17\xb7{\x87\xb5\xdc\xf5s{\xce=\xbf\xc4?\xf7\xfdLQ<\xf0s\x16\xe9\xa1\xca\xf1#\xde\xfc\x9f\xfe\xfc\x98\x15=\xe1\xe5\xa9_\xa3\xf8\\\x01\xc1\x18\xb9\x038c<\xa0\xaf\xdf\b\xd0l\xe5\v@L\xf2\a\xf4\xde\x02\x01\x9epW0\x80\xa1\x15\n\x88K-\x1c\x10\xf9-\x82\xff\x9f\t\b\xdc)\x1a`B\xf0\xd9\x00\xa2\xefb\x01q\x95\xc5\x03\xdc\x04\xf0\\@\xfc\xc4\xf3\x01\xa8\\\x89\x00\xccC\xc9\x00f!^\b\x88,\xbf\x18\x80\u007f)Ŷ_\nH\x94S:\xa0\xdb\xff\x03\xb2U\xed\xe5\x00\xadf\xd9\x00\x9c\xc0+\x01Q\x96W\x03\x14\x86r\x81\x04\xfe+/EJ\x00\x94\xaf\x10\x00\b\xae\x18\xc0R\xb3\xd7\x02\\tU\t\xbd\xae\xac\x9f^\x0f`Q\xf9\x1b\x01\x80\xe9*\x01n\xfe\xaf\x1a\xe0\x0e\x9b7\xd9N\xb5\x80\xb0\xb5z\x00&\xa8F\x00\xa1\xc7[\x01HDM\x8e\xf4m\xfe\xf6N@\xd8R+@\x9b\\;\xa0\xce\xe0\xdd\x00\xf9R'\x00\xdcW\x17\x84\u007f\x8f\xa4\xac\xa7C\xaa\x1f\x006n\xc0K\xc3\x00N\xa8k\x14@\n\xfc}~\xd98\x80\xb7o\xa0l\x12`\xb4\xd2T\x19\xf7!\xefl\x16\xe0\x1eG\xd6\xdd\"@-k\x19\x90\x05\xf8\x1f\x050\xf3\xde*\xa0\xdbT[\a`\xe8ۀ\x1em\x038\xc0\xad]@\xa2\x8f\xf6B\xc4\x0eRtd}\x9d\x02\x88\xf0;\a\x10\x90w\t\x10?v\r\xe8&\x9an\xbc\xab{\x80\xe2\xdb#\x80x\xbc'*\xee\x15` \xd7;\xc0\x85\x19}\x02t\x80\x1f\xeb\xf5\x93\x80ڐO\x03\xb2\x17\xa2/)\xde/\xc0\xc4b\xff\x00\xf35\xa9\xa8k@\x00\xc9ׁ\x10\xabA\x01\x84\x16i\x01\xe4r?S!\x18\f9\x1c\x12\x80\xe6\xa7\ahy\x86\x92W\xc3\x02z\xb8x@&\x1e\x86\a\xe8wF\x04\x80\x842\xb4\xf3\x99\xa4\xfcȀ\xc0\x99Q\x01\x98\xa7\xd1\x01D\\Y\x01N\x8fdCe\xc6(\xe5Ǫʌ#\xcd\xc7'Uf\x82\xaa\xcc\x17Џ/Q~E\xe1\xff\x1a\x9d\xfc\x86\xb2\xff-F3\x91\xfa0I\x15\xe8;ՙ\xc9Й\xefљ\x1fT\x15r\xa0\x18\x06\x95\x1b#\x85\xdcD\x014\xab\xe8Y\xd8\x19\xab\n\x9e-\xc9s;\xc5\xdd\x01r:9T\x17\xa9㦐y\xf8\xa4W\x9f\xf4\xe9\xd5\x0f\x11\n@<\x82\xca\xff\x90HH8)\x04\x11\nAT\xbe\x8c\x91`q\xf2k\x8a\xb2z\xaa\x8a\xc0\x8fd\xd94\xb2\xfa'\xe5\xcatpe\x06\xfb4SI=+@\xbc6;\xc0\x9c\xf5\x9c@\xc1\x8e\xa32\xe4M\x1bs\xa1\x93\xf3\x02\xc0\xbf\xf3\xb5\x8e\x05z\xdb\u0080@\x93E\x01A+\x8b\x03\x98\xf5\\\x12\xc0&\xef\xa54\x06\xcb\x02t\xe9\xcb\x03\xba\xdd1 .ve@L\xfe\xaa\x80\xac\xbeXM\x1b\xb2&@8\xb26\x00\x04\xb3.\x80I\x8c\xf5\x01$\xd46\x88\xd2d\xa4l\f`ZvS\x00\b\xfb\xe7\x80`\xd8\xcd*\xc0[T\x80\xb7\xea\xf5\x17\u07b4M;\xba]\xaf\xbf\xeau\x87>\xf6[\x00>hg@\x02\xa8]J\x84\xddz\xd3\x1e\xfd\xbcW\xfb\xf6\xbb\x8e~\x9f\xfe\xfe\aF\xbf\x1fC:\x80\xc1\x1cd\xb7\x0fq\x10\x87ه#ڥ\xa3\xfa\xd81\xbd\x1e\x0f\x00\x83\x9e\xe0\xa8N\xf2\xd3)^N\a\xf8\x02\x0e^\xfe\n\xe0\x05\ng\x02\xe2\xaeΪ>\x9cC\x8b\xe7\x03\xc0x\x17\xb4k\x17\x03XSu)\xa9\x1c\x97\x03\b~\xae\x04\xe06\xafBʯ\x05\xe8\xe9\xaf\a\xf8\xae\xc6\x00\xdc\xd5Mv\xe3o^\xfea=\xff\xf2\xb7[\x01._\x854\xdf\tpq\xfc]0\xf1\x1e\xd5\xe2~\x00^\xf7\x01G\xfc0 \x01\xf7\xa3\x00\xe6\x01\xffC?\x1f\a\x10\x02<သ\x06\x90\xfd\xca\x15\x84\x96\xe4\x0e\xa2wy\x82\u0529\xbcA=#'\bU\xcb\x1f$\xdc+\x10\x04Q\v\x069'[((m\x14\x0e&7?\x06u%\x8e^\x8b\x06%\x89\xf1l\x10\xbaR,(\xee\xa2xP\xba\xff\\\x10\xb4|>(3Z%\x82\xf9:$\xa8]2\x98Х\x17\x822\xd3\xfdb\x10\xae\xa3T\x10ٱ\x97\x82\xb2ιtP\xc8V&\x88\xae\xbf\xccn\x94\r\xc2R\xbf\x12\xc4\xcc\xe7\xab\xfc\xad\\\x90~\xa0|\x90Y\x8f\x14\xedz\x85 m^E4\xf1ZP\xccZ\xa5 \xe6\xa7*\a\xc1\xef׃\xc9\xe3T\x83P\x87*A=\x15Gz\xf6f0\u007f\a\xf9P\x8dmV\x0f\x8a[\xab\x11\xd4\x14\xd4[A\x90\xb9f\x10\xd6\xe5m\xed\xc2;A\xac\x82\xac\x15\x14\xcf];\xc8x\xfd\xdd \x92\x02u\xd8FݠX\xc7\xf7\x82\x88Z\xea\x05i\x10\xeb\a\x89N\x1b\x80>\r\x83\x98\xd1m\x14D\xb8\x18\x84\vn\x1c\x04\x8f?\bBԛ\x04\xc1\xf8\xa6\x18ӇA\xe0\xa1fA\tR\x9akM-\x820N-\x83\".\x1f\x81\x94\xad\x82\x98\x1an\x1dD\xe8\xd3&\x88)\xa5\xb6\xac\xbe]P\xed\\\xfb \xb3x\x1d\x82\x10ӎA\x80\x96N`b\xe7\xa0hB\x97 \x14\xbe\x8f\x83\x8cw?\xa1\xa8|\x8a\xbe\xf7\r\x12g\xf7K>\xdb?\x88\xdcPj\x90K\x1f\x06$8\"_\x0f$\xdf\a\x05\xa9\x92i\xe8\xd6gA\xa8\xe4`%\xfa\x90 T0\x1d4\x1cJQ\x1f\x062|Α\r\x0fB\xe5F\x04\xa1k\x19\xca\xc0LV=2\b\xbd\x19\x15\x14%\x1a\x1d\x84\xdad\x81\x06ِ\xf01\xa4\xc1\xd8dG\xc7Qi\xc6C\xe2'\xa8&}\x81\a\xbeTi\xfc\n\xac\xfd\x9a\x12\xfe\x8d\bط\xe8\xceD*\xc3$j\xc0w\x94\xecɔ\xb9\xefU\x82\u007fP\xb9̡\xd4\x18\xc83#$\xc9D\x890+\xed,\x10\t+\xe8iC\x93vJ\x8e\x83\xdcw\x92\xfb.\x8a\x87\x9bB\xe0Ir߫\x14\xf6\x05\xb9j\xd2ϖ\x02\xecU09\xdc\x10y\x19\x0e\x8a\a\x8a\x04%\xef\x13\x85\xa0\xc5\xd0b<(\xab}\xa6\x04\xe1j\xa7R\xd5~T\x02O\vJ \xfbSP\xd2\x15Ӄ\xe2\xe4f\xe8 g\x06\x91B\x9b\x15\x04\xbc\x9a\xcd&\xe6\x04\x01_\xe6*W\xe7\x05e\xceu>\b\xb7 H?\xb1\x90\xed,\n\n\xc8^L)X\xc2\xcbR\xb2zY\x10xiy\x10\xf6tE\x10\xc9ʕA\xa4\xbfV\xb1\xb9\xd5A\xd9\xec\xb5&(\xaee-Eb\x1d\xfb\xb3\x9e\xb7o\xa0\"l\f\nV\xd9\x14\xe4:\x1b\x8cv3eeK\x90\x9b\x99\xb7\xb2\xe9_\xc0\xfcmA\x99\a\xd9\x1e\xe4\xeb\x8a\xf1aGP\xc1\xcaoxzg\x90i\xbc]A\x02\xc9\xddAF5{\x82\xdc\xec\xb37(~\xeewv}_P\xd6B\xfd\x81\xaf\xf6\a%\xc1t \xc8\xdd'\a)\x80\x87\x82\x04Q\x87\x83L\xdc\x1c\t\x02\x1d\x1c\x05\xa1\x8f\xa9\x91>N\x19?\x01\x8e\x9ddwO\xf1r\x1a\x02\xff'%\xe6/\x10\xfbL\x90A\xc3Y\xaa\xf79\x92\xe3|\x90\v\b.\x04yD\xc5\xc5 3{\x97H\xea\xcbA\x02\x9c+A\xc6!W\x93\x83\xbe\x06\xf5\xb9N#p\x03\x14\xb8ɱ\xfdM\xaa\xffC\x95\xffW\x1e\xcc\xceN\xb9E\xb2\xdf\x0e\"\x82\xbcÎ\xdd\x05\x01\xee\xa9\xed\xbc\x1f\x04\xd0\u007f\x10䲣\x87A]\xb0\xff\x88r\xf1\x1f\x84\xf1q\x90\x88\xe8I\x100\xf0)\xb5-W(\xa1\x86\xb9Cj\xc8\xf2\x84 \nyC\"\x9b\xf9Bؽ\x11\xd2\x03\xc6C\xe4F\xc1\x10\x82\xedB!Ҥp\b\x13\x8cEB \xcd3!\x04)EC\\\x12\xf9lH0e\xb1\x10\x82D\x94υ`\xec\x9e\x0fA#J\x84\x00\xafJ\xf2\xcb\x17B\xf0\xe8/\x86\xe0\xe7J\x85$e\xf5\x926S:\xc4%\xbfe\xf4\xf3\xcb!\x02\xff\xb2\xac蕐\xfa\xa4WCԱr!d(ʇDMRB\x02j+\x84\xf4T\xd5\x10\x10\xe5k\xda\xc7J!\xe8w\xe5\x102\n\xaf\x87\x84\xfbo\x84\x80!\xab\x84 \x11UyǛ!X\x99j\xdar\xf5$\xcdj\x84 \x0eo\x85\xc0\x98\x9a!\xa6B\xdf\x0eQ*\xde\t\x89\xf5\xad\x15\u0092\xe4\xda!\xc9(\xbc\xcb\xe1\xd6\tQ\xdc\xeb\x860}\xf5\x1eiQ/D\xe7S?$\xf9\xcb\x06\xac\xbba(\x99\x16n\x04\x9e\xbc\x8fJ\x1b\x87 '\x1f\x84ԃ7\t\x89\xc5k\x1a\x92\xa9\x9a\x0fC\x00\x1b\xcdBD\x80͕|-B\xa2\u007f-C\xf0\x88\xac\xbb\x15H\xd4:$\xd1K\x9b\x10V\x89\xb5\r\x89P\xb6\v\t\x04i\x1fb\xa2\xaaC\bY\xec\x8e!\xda\xd8N!\x846\x9d9\xe8.$T\xd7\x10O\x00\xef\x16\x02\xc2\xe8\x1e\xa2\x13\xe8\x11\x02N\xe8\xc9a\xf7b\xaf{\x87\xe8\x13\xfb\x844m\x1a\xc2\v7Bb\xba?eu}C0|\xfdH\x9f\xfe|<5D\xe30\x00\x84\x18\xa8T\x1e\x14R\xb3\x9c\x16\x82#\xfc\x1f\xbd\x06\x87DO\x86\x80^\xe9!N\xd5\f\x05i\x87\x85\b\x86?\x0f\x89\x8a\x0f\a\x15F\xb0\xe1\x8c\x10483\x04\xd39\x124\x1b\x15\x12\xeb8\x1a\x94\xc9B\xdb\xd9!ڝ1!ؒ\xb1\x90\x9cq!13\xe3\xd1\xea\x04v\xfc\x8b\x10\x94\xfbK\xd6\xfdUH\xec\xd7\xd7!تo0\xe8oC\xb0P\x13\x95ғС\xefB\xb0\x05\x93\x95\x86ߓ3?\x90x9!\x18\x0f\x83*\x83Q\x87b\xc2\xc0\xccI\xc1\xb4\x90bV\xea\xb4-\x04\x1ba\x0fA\xed\x1d\xd0F'J\x17\xb4\u052dz\xeeQ\xbd\xf0\x82\xfd>ʑ_[\nPf\x82Ԉ\x10E6\fM\x8d@\xee\xa2\x14\x88\x98*I\\\xa5y\x8a\xca\xe1T\xf6\xffG\x15\xc7i*M?\x91R\xd3\xc1\xbc\x19\xffc\xde\xcc$Wg\x85\xc4\xcd\xcf\x0e\x01=\xce\xe1e./\xf3\xc0\xb8\xf9!\x9cȶ\x00\xf4\\\x18\xc2\xfcҢ\x10\xd28\x8bC\xb0\x9bKBpQK!\xfa\xcb\xc8\xd9\xe5\xb0\v+B\xe25W\x86$9\xb1\x8a\x84]\x1db\xaeaM\biõ!\xac\xda[\x17\x92\xc4\xe2\xfa\x10\xcc\xe7\x86\x10\x0f\x86٨\x94ل\x8a\u007f\x06)7\x87dc\xec\x16\xf4lk\b\x19\xe7_Bȹn\x83\xfclWN\xff\xaa\xb6b\a\xbe\xfd-$q\xc5ΐ\xf8\xd0\x11)\xbb(\xfc\xbb\xa1\xd3{B\f\x1a\xf7\xb2\x96\xdfCX\x15\xb2\x0f\xd6\xe4\x0f\x15\xc3\xfdl\xe8\x00\xc6t\x90O\x1f\xd2\xca\x0eC`\x8f\x84\x80\xa9\x8f\xf2rL\xc7x<\x84\x99\x88\x13\xfa\xf1d\b\xcb4O\x85\xb0$\xfa\xb4J֟\xb4\xf2\u007f\xf1r\x06m\x9c\rqQĹ\x10P\xd5\xf9\x10^\xbd}!\x84\xb5\x8f\x17CpZ\x97\xf8\xc0ev\xe7JH\x96\xa7\\\r1\xf9~M5\xf9zH\xd2]7\xf0\xdbMV\xf27\x1a\xf8'\x84\xf9\x82\u007fC\xe2\xe5o\xb1\xde\xdbЯ;!q\xa1wCt\xc0\xf7\xa0\xa0\xf7C\x9c\x11x\xc0\xee<\xa4\t\u007f\x04\x91\xfaO\x9bz\f\x19OMy\x12bR\xe0i\b\x93z\xb9\xc2\xd2\\\xee\xb0hO\x9e0\xba\x9a7L-ȇ\x9f\xf2\x87\xf9|\x810\xfdm\xc1\xb0.C-\x14\xa6O)\xac\xb7\x17\t3%\xf4L\x98n\xa8h\x18\xb8\xf9ٰ\x04N\xc5\xc22SP<\x8c\xc4\xf0saQ\xbd\xe7\xc3\\\xbeW\"L\xb0R\x92\xad\xbf\xa0\xed\xbd\x18\x16\xee\x97\n\x03\xa1\xbe\x14\x06^-\xcdK\x99DK؏\x11\x16\xc3]6\x8c\xdc\xc7+a\xaaݫz-\x17\xe6\xf1\x16\xe5ô|)a\x02\xb4\nan&\xa8\xc8\xe6^\xe3ӕ\xc2<\xf2\xb8r\x18\x00\xfdu^\xde\bCت\x84\x99L\xab\x1a\x16S\xfa&\u007f\xab\x16\x06\xbe\xa8\xceO5xy\x8b\x03\xac\x19֔\xfd\xdba\x1c1\x8e\xb2\x16h\\;\xcc<\xc0\xbbaaf\x1d\xedl\xdd0\xe6#\xdeSR\xd6\vÒ\xd4\xe7\xb7\rº?\xa1!\xeai\xc4o\xdf\x0fc\x06\xa1qX\x98\xfc\x01(\xda$\f\x10\xd14\f\v\xf5a\x18AD\xb3\xb0\xa0\xf4\xe6aI\xab\xb5\xe03-A\xb7\x8f\xc20\x91\xad\xc2T\xc8\xd6a\x05Nm\xd0J\xdb0T\xbd\x1d*n\x1f\xe6\x11\x86\x1d\x92\xf7t\fs\x1f\xa3\xb2\xbas\x186\xa5K\x98\x96\xaekX\xecA70\xb0;\xfa\xd7\x03-\xf6\fsr\xb8\x17[\xee\x1dV7\x88\x06?\x0ec\xd1\xc3'a\xc4j\x9fⱾ\xe1|-F\xa5\xa7\xf4\vS\xbc\xfb\x87\xe1FR\xc3\\\x1d0\x00\xf7\fDՃ\xc2\t(\x97&\xc5ga\xc8\xf5\xe00s\x8cC\xc2\f\x04љ\xa1$а0a\xe9\xe7aĀ\xc3\xc3\x04##\xd0팰؋\xcc0\xd0\xffH\b\xef(|5:,S\x15Yaj~v\x18\x01ʘ\xb0L\x10\x8e\r# \x18\x17.\xd8!uxꄄ\x13\f\xe7\xef\x961(#eBX2\x01_\x84\x81\xba\xbe\fcU)\xe5\xe6\xeb0^;\x15&`\xff\x96#\x9b\x18\x16c8)\x8cɲ\xef\xc2L\xd3O\x86\xa4|\x8f\xce\xfd\x80!\xe7\x90\xfa\x86\xb0xZ\xa3RÄg\xcd\xec\x89%\x8c\xb3R\xadh\xc4\x16֣\xc4Ì\xa2\x1ca\xf8\\g\x18^\xc1\x85\xea\xdda,\x12\xf0\xa0JoX\\\x8e/\\\xb0m\xea\xd0\xf4a\xa9)\xfe0\xb3?\x810\x02\x99`Xf\xdeB\xa4e8\x8c\x95U\x9102\x1fѰz\xadXX\xacT<,\xd1\xde\x14vwj\x98\xb6\xef\xc700\xc1\xb40\x9c\xfcOԿ\xe9a8\xc7\x19\xda\xd2̰8\xb3Y\x10\xbe\xd9aF\xd0sX\xcd\xdc0Q\xc1\xbc\xb0\xa4u\xe6S\x19\x16\x84\x19D.\f\x8b\x9bZ\x14F\x0ebq\xe2\xc1\x8cQ\xa9)K\u0089\xd0 +-ei\x18\xd6~\x99HSB\xaa\x96\xd3>\xad\b\x03\x14\xac\x84\xb1[E\x03\xb3Zub\rX\xbe\x96\x12\xb5.\f\x10\xb1\x1eҺ!\x8c\xb0}c\x18g\x01l\"\xb9\u007f\x0e\xd3/n\x0e\v|\xd8\x12\x16h\xb0\x95\xcc\xfc%\xcc9\xd9m\xa0\xf6\xf602忒Y;`\x18~c+;y\xd9\x15\x86\xa3\xda\x1df\x9edO8\u007f\xf7\xc1\x89!\xed\r\x17h:Z6;\xfd\x1e.\xd25{\x80\xbc\x959\xf1a_\xb8pۄԍ\x90\xe3\xe0\xfe\b3\x1d\xb3?,a\xf9\x81\xb0\xf8\x97\x83\xa0\xe3\xa10S\xf9\x87\x93<:\xc21\x1c\rs1\xdb1\xc8\xd6q\x15\xa7\x13a,\x8e?\tQ8\x15f\xfcs:\xcc0\xef\xcf0B\x9d\xbf\xc2\b@Π\xa9\xb3`ٹ0\x9c\xdeyh\xcc\x05ZËIkx)L\xbc{9\x8c\x05jWT\xf8\xaf\x86\x81\x80\xae\x81\f\xd7u\xc47\xd4\x14\xde\f\xf3\xe5\xfd*\xc3\xff\x84\x13\x00)u\xa0\xbcq#\\\xa0y\xc6\xd0\xc4s\xb7\u0085\xbaf\x0fK\x1b\x9d\xf8\xf7v\x18p\xf4\x8e\xea\xf7]Z\xc0{\xfc\xf6>E\xf4\x81j\xc1C\x8a\xe1#8\xa6\xff\xb4\xb5Ǡ\xc1\x930'\xa1\x9f\xea5W\x84.$w\x84\x1e/OD\x8ep\xcd\x1b\x81<\xe6\xe3%\u007f\x04g\xc5E\xf8\xee\x8d\b\x02\xaaB\x11\xac&/\x1c\xd1\x00\xadH\x84\x1e\xef\x99\b_E\x15\x81h<\xcbK\xb1\bmi\xf1\x88(\xfas\x91\x84){>\u0088\xbdDD\x84\xa6d\x04\x93X/\xe8}/F`TJE`9^\x8a\x88\xa1*\x1d)\xd4>{TFBkS\xcaDp\xb8\xddˑ\x82\xadRG\xa5&\x94\xb8l\x04\x16\xed\x15}\xfc\xd5\b\xa6)\xcaEDH\xcbGh\xd4R\"\x00\xb5\x15\"p?\x15#\x02\xc6_\x8b\x80z\x95x\xa9\x1c\xe1Z\xd3H\x9e>)oD\x18\x80T\x89\x88=\xa8\x1aA\xe8\xfafD4\xb0Z\x84\xf0\xa4z\x84\xfe\xadFD$\xf0-v\xa1&\xbb\xf6v\xa4p\xab\u052c\xd4!\x89\xbf\x94w\x942\xb5\"\x02\xa4kG$\x8f\xf6n\x04Z\\'\x82\xb5\xbeu#\u0099\xf7\"\xb4!\xf5\"bJ\xeb\xebX\x1a\xb0\xdb\r#P\xdeF\x11\xe4MI\xd5\xc6\x11\x82\xb8\x0f\xf0x\x13\x94M#\xe0\xfc\x87\x11\x9d\x9bk\xc6[\x9bG4\v\xd6\"B\x15j\x19\xd1\xe0\xf2\xa3\b\xd7'\xb7\x8a`\x99@\xeb\b^O\xd1&\x82M\x0emѕv\x11U\xaa\xf6\x111\xc3\x1d\"z\x9ax\x04\xd1T\xa7\x88\x18\x84\xceI9\xe8\x12\xc1\xc6\u052e\x11\x06\b\xdd\xf4\xda=\x02wԃ\xf5\xf6\x8c \xe8\xec\xc5\x1azGx\xfag\x1f\f\xee\xe3H\xbe\x16\xa3\x13\xbe2ѯ\xf1\t9\xfb4\x02_\xd47\xc24a\xbf\b\x04\xbd\u007f\x84\x80'5\x82\xf7r\r \x91\x06F\xe8t\aE\x105\xa4E`??\x8b\xe8Z\xcf\xc1\x11Q\xc2!\x11\xd5\xd8\xf4\xffǣ\xa1\x91\x84ꥧ'\f\xea\xb0H\x81\xf6\xd9Y\xa3\xb3S>\x8f`\xae\x11T\x1d\x11\x11?\x9c\x11A\xee!\xf3\u007f\xf7\x8eD\x85\xa3\"\xb0\xf2\xa3\xf1!+\x82\xad\x99\xd9\x11\xe2\xbe1Iҍ\x15\x99\x1f\x17\xc1\xdaS\x1d\xca\x04<\xf0ED_L\x05\x1d\xfb*\x02\xa0\xf05Z\xfd&\x02\x13\xfam\x04^~\"\x1e\x9e\xa4\xd2\xfc]D\x90\xcf䈸\xe0\xef\xc1\x96\x1f\"t\xa99\x11=`\x1c\xf7\x1bY\x87)\x02\x17h\x86\xb2Yp\xbf5\x02\x17i#A\xed\x11\xf1\xa6\x8e\b\xbd'\t\xe7\x8a\xc0\v\xba#p-\x1e\xda\x02oD\x9c\x9f/B_懵\b\xb0\x8e\xa02%\x84އUL\":\xc0hD\xfcM,I\x908y?%B\xb72\x15\xc4\xf8QUe\x9a\n\xffO\xf8v:\xd5s\x86\xea\xc7\xcc\b\x1cҬ\b\x9c\xc9\xec\b\xdc͜\b<\xdd\\4=O\x85|~\x84^aA\x84\xc6x!4uQ\x04&yq\x04\x06~I\x04F}iR*\x96E\xb0k1\"f\u007f\x85\x92re\x84~cU\x846~u\x846x\r;\xb66\"\x8eh\x1d\x05u=\xed\xe2\x06X\xba\x8d\xc9Z7\xf1Οi$6\x93\x94[h\xf4\xb6\x8ah\xfcB=\xdd\x06\x06mO*ӯj\x94w$\xd5\xf9\xb7\b\xad\xf6N\n\xfc.\x98\x94\xdd\x18\xd6\x1eX\xaa\xbd\xb4a\xbf\xd3`\xedSi\xf9C\xe9\xb9\x1f\xc6\xe7\x80ڍ\x83T\xf9CT\xf9ô0Gh\x92\x8e*\t\x8f\xb1\xabǡ\x9a'\xa8\xbd'U\xa7OQ\x8bOS\xe3\xff\xa4v\xfcE\xdd;\x03ΝU\x85<\xa7\"\u007f\x1e\x04\xcdH\xb9\x10\x11\u007fz\x11\x83\xbd\x84;/G\xe0N\xafD\x04\xf8\\\xa5\x0f\xb9\x86߯+\xf1o\x80\xb57#̌\xff\x1d\xc9\xd7!=#\xe5\x1f\xb6\xf6/\xc9{K\u007f\xbc\x1d\xe1V\xc7;\x14\xf1\xbb\x11b\xe0{\x11\xb8\xdb\xfbp'\x0f\"@<\x0f\xd1\xc6#\xf2\xee?\xb2\xe7\xb1R\xeb\tk}\n\xcd\xcc\x15\xc5\xc2\xd8\xdc\xd1\xfc\xbd\xa57y\xa2 E^^\xf2EE{\xf2G\xe9J\vD\xa9\xfc\x05\xa3h\xbeP\x14\xa3)\x1c\x95%\xc6E\xa2\x1aa>\x13%k\x8aF\xd9\xe7g\xa3h\xbbXT\x8e\x81(\x1e\x95\x9d\x93\xcfE\x91Lz>*\x99\xa5\x12Q\xcap\xc9(\f\xcc\vQ\xbcx#\n\aY\x8aϾ\x14\x15J\x96\x8eRD\xcaD1ڗ\xa3\xe2\xb3\xcaFI\x82W\xa2x\xe7FT\xccz\xb9(\x81`yޘ\x12Ed_!*(\xb9b\x14f㵨(C\xa5\xa8n\b\xac\x1c\xc5i8Q\u074b\x11\xa5\x1f\xac\x82\x81U\x8d\"\x19\xf8&n\xa9\x16M\x98\xdc\xf4\xc1\xe9)գ\\\x84P#\xca$\xd4[Qq\xc95\xa3bCގ\"\x92\u007f'*9\xe9Z\xecDm\xd2\xea\xdd(\x97EՉ҆ԍ\xc2AFah\xebE\xe1\xe2\xeaG\x11L5\x88\x8a(5\x8c2\x8am\x14\x05\xd4~?*\xb6\xbbq\x14ǹ|\x00\n4\xe1\xedM\xb5\xc6\x0f\xa3\xc8&4\x8b\x12\xfc5g\xf3-\xf8x\xcbh\xa1D\xc87H\x80\xf4Gф\xa1\x1b\x96\x9e\xd2*1<ِ\x11\xe5\xce\xf26dM[\xf4\xab\x1d\xc6\xdc^\xb9߁<\xe9\x18\x15I\xee\x84\xf1v\x8e2.\xee\x82\x1b\xbbF\xc5\xfcv\x8b\xc2\xfeu\xe7\xa5GT\xccEϨhY\xaf(LYo0\xa2OTR\xfc\x1fGix>\x89\n\x90\xff4\x9a0\x18}\xa5\xe8\x17\xd5m\xfe\xfd\xa3\"өhm@\x94\xd6i`\x14@vP\xb4P\xeba\xa9\xa3\xb2\a\xa7\xa6\xa4E\x13QO\x02Mf\xa7|\x16\x15\xe708J\x971$\x8a8'\x1d254*qͰ(\xe7n>\x8f2c1<\nu\x19\x11%\xe6Ɉb\x15^f\x94\xba9\x12Ս\x8ab\xa5\xfd\xe8\xa8\xee\xe6\xc7\x00\xb21\x801\x90\x91\xb1*\x85\xe3\xa2b\xb0\xc6C\\'D\xf16\u007f\x95\x8f/\xa3\\\xa8\xf9\x95~\xfe:\n\xeb\xfcMT]\xf8\xb7xr\xa2\x92c\x12x\xff\x1d\xca\xc9\xfa\xdd\xf7\x90\xf0\x1f8\xf6\x9c(1\xbd\x01\x8f\x19\xa3\f\x06LQ\xfa\x1c3:h\x812X\xa3\x05Z\x8f\xceN@I[\xb4h\xdb\xf4a\xd9\xe9Y\xa9\x83\xe4\x14\x17;8\xec \x81\x9cQĈ\xae(2\x02\xee(a\x8b'\n@\xec\x05\xdd|Q\xd8q?\x18\x15\x00W\x82\xf8?$\xfc\nG\xe1Q#Q伢\xa0wL{\x15\a\xa1\xa6P\x01\xa6F\xb1-Q\xe95-\xca\\\xe4OQ̆O\x8f\"\xd31\x03\xb5\xcfT\r\x9b\x15E\xe2~vT֝\xce\xc1\xc8\xe6F\vu\x1b\x9d=XN\xc1\x9c\x17\xe5Y\n\xf3\xd5\xea,\x80b/\xd4g\x17i;\x8b\xa3\x9cIZ\x12\xe5*\xf8\xa5Q\x18\xc0e\xe8\xcc\xf2(6\"\xac\x88r\x12~e\x14\x10}U\x14xwu\x14\xa8z\r\xa8\xb5\x16\x95\xafS1X\x1f\xe5ތ\rQ\xe4\x066\x82?\x9bP\xfe\x1c\x15/\xbb9\n_\xb5\x85#ߊ*~\x81ll\x8br\xfd\xc6\xf6(N\x17\xfd\x15\x84܁\xf27<\xba\x134\xdb\x15\x15,\xbf[5{O\x14\xd1\xe5^}\xf6\xf7(w\f\xecC\x8d\u007fD\x15\a\xef\x8f\"\xb8=\x10\x15\az\x90=8\x04A:\f\v|\x84<>J\xbbp,\xca<\xedq5y'\xa2\xc8מ\x84֞\x8a&\xf3ڧ\xa3ܼ\xfb'\xf4\xfc/h\xe3\x19z\x88\xb3Q\xf8\xe5sQ:\xf4\xf3Q\x99T\xb8\xa0]\xbe\x88\x86/E1\x15p\x19\x95^Q\xd6\\\x8d\n\xba\xbe\x16U@p=\n\x18}C\x1f\xbc\xa9\xfd\xfa\x9b\xb4\xfb'\n\xa4\xf6o\x14\xbe\xf4V\x94\xc0\xeb\xb6^\xef\x80Xw\xa3X\x9c\u007f/\n\xa7}\x1f=}\xa0\x8d=\x84\x1a?\x8a\xf2\xf4\xa1\xff\xf4\xb9\xc7Q\xc0\x84'\xe8\xe4Sx\xba\\1\xe8C\xee\x18\xcce\x9e\x98hWޘ\xfc\x9e/&\xec\xcb\x1f\x03u\vĤ\xf6\x821\x82\x80B1\xd1\xf4\xc21z\x8f\"1\xa9\xe8\x99\x18\x13\x96Ec\x00\x0f\xcf\xc6d\xd9|\xb1\x18\xbbS<\xc6p\xf9\xb9\x98$\xf2\x9f\x8fa\x8fc\t\xd4Y2\x86\x15h/\xc4\xe0a_\x8cI\xbfK\xc5DL_\x8aq\xf7@\xe9X\x92+e\xf8\xe0\xcbZk\xd9\x18\xb1\xc8+1\xd1\xfbWc\"\x16\xe5b4\xeb\xe5c\xc4')1P\xb0\x02\x06S1F\xedx-FTQ)\xc6h1&r\xf2zL\f\xdb\x1b1\xaaW\x15\xf6\xa7j\x8c\x00\xe0͘(B\xb5\x18\x8dPu\xf4\xb2\x06\x1ex+F\xdf[S\xa9\xf1v\x8c\xde\xfd\x9d\x18\xe4\xad\x16\xfaV[\x1b~7\x06\x06ԉ\xc1\xb1ԍ\x89\xe8\xbc\xc7\x1b\xeb\xc5ē֏\xc1\x936\x88\xc1\xa75\x8c\xd1y6\x8aѷ\xbd\x1f\x13\xff\xd7X\x87\xf8A\x8c\x9e\xb2IL\xa4\xb3iL|ч B\xb3\x18\xbdT\xf3\x98ؕ\x16\xb1\x84\xbdj\tb\u007f\x14\xa3 \xb4\x8a\x89\xe6\xb5ƃmb\xb0\xf5mc\xb4\x81\xedbb\xfc\xda\xc7`\xad;\xc4\xe0\x1c:\xc6\xe8::\xc5\xe83:\xc7h\xe8\xba\xc4h~\xbb\xea\xf0\xba\xc5DĻ\xa3\xd5\x1e\xe0aOi\xbb\x17\x88\xd7;\x06{\xda'&\xf6\xe2\xe3\x18\f\xdf'1\xb1q\x9f\xc6\xc4\x02\xf4\x8dAu\xfb\xc5h\xb1\xfaǸU\x1f\x8c\x1b\x80;\x06\xc6\xf4\xd5\xfd\xa8:\rR\xfa\x99\xca\xc2`\xca\xe9\x90\x18\xd5(]\xafCcT\xafa\x14\x83\xcfA\x85\xe1`߈\x18Md\x86\nu\xa6\xd64\x92\x02轸Hh\xbd8U\xb5>oh\x10\a&h\b\xda6\x8a\xc3/\xbc\x1fg\xa64\x0e\xec\xf9\x01\x1ak\x82\xb2i\x1c9\xab\x0fQS\xb3\xb8\x98\x8f\xe6q$\xc9Z\xc4\xe1F[\xc6\xe9R>ⷭ\xe2\x9crm\x1d\xe72\xc26 a\xdb8\x97.\xb7\x8b\x8b\xa1j\x0f\xe6t\xc0\xff\x1dQv\xc2]\x9d\xf1\u007f\x978\x14\xb0k\x9c\x96\xb5\x9b^\xbb\xc7\xc5/\xf5\x88\v,\xe8\x19\xc7\x01\xaf\xbd\xe2X\xda\xd0;\x0eS\xd5'\x0e\xb3\xff1\t\xf7\t\xda\xf8\x94u\xf5U\xba\xf5\x03\xa1\xfaǙ K\x8d\xd3^\x0e\xd0\xeb\xc08\xd4tP\x9c\xd83\x8d\xb5\u007fƶ\x06ǹ\x11?\x0e;\x9eN\xb2\r\x8d\xf3@\xb8aq8\xf4\xcf\xe3p\x80\xacfD\\\xd4*#.\x9e \x93]\x1b\x19\xe7;\xfa\xc1\xf7\xd1q\x98\xb6,eNv\\`Ҙx£\x8f\x8d\xcbK\xb6\xc7\xe1\xf9\xf1\xda\xc2\x04>\xfaE\x9c\xb6\xe3K\xb6\xf1U\x1c\xe6\xefk\x10\xe5\x1b\x8e\xf5[\xa5\xd7D\xd0k\x12{\xff\x1d\x06>Y\a\xfa=\t\xf6\x83\xd2!\a\xa42\xf0N#\xc6`\xd2f\xcd\xe8\xaa\x05\x1d\xb2Ɖ\x18mq\xaeڰ\xc7u\v\xa2~vR\xbc\\z\x9b[\xaf\x1e\xbd\xcd\x1b\xc7\xd6\x1a_\\\xd2o~\xedI\x00\x9f\x82zkHo\r\xf3\xd6H\x1c\xe9\xd5(e3F\xcb\x10\xe7\x97S\xe2\x00\xabS\xe3\xdc$\xf4#\x06;-\x8e\x18\xe2'2n:F2#\x9e7\xe1\x8af\xa2\x9c\x85r6\xca9(碜\x87r>\xca\x05(\x17\xa2\\\x84r1\xca%(\x97\xa2\\\x86r9\xca\x15(W\xa2\\\x85r5\xca5(ע\\\x87r=\xca\r(7\xa2܄\xf2g\x94\x9bQnA\xb9\x15\xe5/(\xb7\xa1\u070e\xf2W\x94;P\xfe\x86r'\xca](w\xa3܃r/\xca\xdfQ\xeeC\xf9\a\xca\xfd(\x0f\xa0<\x88\xf2\x10\xca\xc3(\x8f\xa0<\x8a\xf2\x18\xca\xe3(O\xa0<\x89\xf2\x14\xca\xd3(\xffD\xf9\x17\xca3(Ϣ<\x87\xf2<\xca\v(/\xa2\xbc\x84\xf22\xca+(\xaf\xa2\xbc\x86\xf2:\xca\x1b(o\xa2\xfc\x1b\xe5?(\xffEy\v\xe5m\x94wP\xdeEy\x0f\xe5}\x94\x0fP>D\xf9\b\xe5\u007f(\x1f\xa3|\x822ה<\xe9Y\xb9\x13Ÿ%OF\xd6s\x89b\xdc\xf3Srg\x94H\xfc\x93YrJ\x9e\xb4q/Lɝ\xf6\xe2\x94\xab\xb3\x94\xe3\xba$\xee\x19\xdfU\xfe\xcd언'\xd1\xe9\xee\xf2aT\x8f\xc4\b\x12,\xe8\x89˸^\x89\x81\fH\xef\x8d\x0f\x99}\xa6\xe4\x1f l\xf8?\x9a\xce:\xc0\x8d\x9b\x89\xe2\xfd\x0e\x9223333\xb7i\x03\xc5\x14\x92\xa2\xe5\xddH^/(\x1e9\xb7N\x99\x99\x99sP\x0esRfffffn?\xcd\x1b\xdd?\xf3{\xef͊\xbc\xb6\xef\xec&\xcd\x11\xc2\xf2H\xc4\xf1Qb\xed\xd1l+\xee\x18\xa0<\x96GV*0V\xf1%\xfe U\xb6\xcd\"\x12kc\xb6\x85\x1b\x05\x94\x9aG\x14\x06\xc6\xd6\x18q\x99p\x16\xd7al\x8a\xd1.\x03ʜ[\xcd\x02\xc6Z\xcc\xd8(G\xc36\x1a\x8c\x96#\xa0t|e\xab\tcnj\xeb\xc8\xfd\xf9\xba\x80\xb2\x1c\xd7\xeeт\xb1c\xc7u\xe6|\xae\xe3`\xe3\xe3\xc5\xda\x13\xd8V܉@y\x12\x8f\xa8\x9c\fcOa\x14\xeeT\xa0<\x8d[\xc5\xe90\xf6\fFӝ\t\x94gq\xaby6\x8c=\x87'\xf6\x9b=\x17\xb6q\x1e\xa3\xe5\xce\a\xca\v\xf8\xcaօ0\xf6\"\xbe\xd2ߚ\x8ba\x1b\x97\x8c\xeb0Y\xcd]\n\x94\x97\x8dk\xf7\xb8\x1c\xc6^1\xae\xd3#.\xaf\x84\x8d\xaf\x12k\xaff[q\xd7\x00\xe5\xb5<\xa2r\x1d\x8c\xbd\x9e/\xf1\xf7\xe4\x06\xb6\xcd\xe2F\xb1\xf6&\xb6\x85\x1b\a\x94\xdd<\xa2聱\xbd\xb8\xd2\xf5\x01\xe5\xcd\xdcj\xde\x02co\xc5\xe8Fy\x1bl\xe3vF\xab\xbc\x83/i\xdd\tc\xc7\xf3%\xfe,\x13`\x1b\x13ǵ\xfb\xa3L\xe2ZN\x1eזզ\xb0\xb4S\xc7u\xf01\xa6\xb1\x89\xa7\xc3\xd8\x19\xdeT\xdcL\xae\xe5,\u007fie6K;\xc7w\x9b\x85\x9b\v\x94w\xf9\xacY\xdc\rc\xef\xf1\xa6p\xf7r-\xef\xf3#\x8a\xfbY\xda\a|\x8d\xcb\a}\x10?ė\xbb\x87\xb9\x96\x8f\xf8\xa0\xf9(K\xfb\x18\x8fo\x94\x8f\xb3i<\xe1k\xcb=ɵ|\xca_\xd3z\x9a\xa5}f\\\xfb\xa8\x9a{\x96k\xf9ܸ\xb6Q\xb5\xe7Y\xda\x17|\xad\xb8\x17\xb9\x96/\xf9\xb8\xf22K\xfb\x8a\xafE\xf9\xaa\x0f\x8a\xd7X\xda\xd7}m\xba7\xb8\x96o\xfa\xb8\xf9\x16K\xfb\xf6\xb8\x8eQ~\xe5w\xd84\xde\xf5\xb5\xe5\xde\xe3Z\xbe\xef\xafi}\xc0\xd2~8\xae}L\xcd}ĵ\xfcx\\ۘ\xda',\xed\xa7\xe3:\xc6\xf8\x97\xe5g@\xf99g\xf1\x170\xf6Ko*\xee+\xae\xe5\xd7~D\xe5\x1b\x96\xf6[_\v\xf7\x1d\xd7\xf2{\x1f\x17?\xb0\xb4?\xfa\x1a\x97?q\xb5?\xfb\xdat\xbfp-\u007f\xf5\x974\u007fci\u007f\xf7\xf3\xfam\xfe\xc1\xa6\xf1\xa7\xaf-\xf7\x17\xd7\xf2o\u007fM\xeb\x1f\x96\xf6_\u007f\x8d\xbf\xd1\xff\xb1i\xcc\xd3\xdd\x1e\xf9\x9f \\˶\ueda8\xd6\xce\xd2vtwD~\xb3\x9dl\xe2\x010v\xa07\x157/\xd7r>\u007fie~\x96v\x01\xdf\xf57xAo\x9a\xc5B\xbe\x16na\xae\xe5\"\xfe\x9abQ\x96v1_\xe3rq\x1f\xc4K\xb0\xb4K\xf2\xd5n)\xae\xe5\xd2>n.\xc3\xd2.\xcbs5\xca\xe5\xd84\x96\xefnw5\xb7\x02\xd7r\xc5\xee6W[\x89\xa5]\xb9\xbb\xc3\xf9\xad\xad\xc2\xc6\xff\xe2\xc4Ʈ\xe6Mŭε\\\xc3_ZY\x93\xa5]\xcbw\xfdSpm\xa0\\\xc7g\xcdb]\x18\xbb\x9e7\x85[\x9fk\xb9\x81\x1fQl\xc8\xd2n\xe4k\\n\xec\x83x\x13\x96vS\x1e\xe46\xe3Zn\xee\xe3\xe6\x16,\xed\x96\xf7+\x9f\xedM\xb38\aƞ\xebM\xe1\xce\xe3Z\x9e\xef/-.`i/\xf45./\xf2A|1K{\t\x0fr\x97r-/\xf3q\xf3r\x96\xf6\n\x9e\xa5Q^ɦq\x95\xdfbZsW\x03\xe55~\xf7i\xedZ\x18{\x9d?u\xea7x=l|\x83X{#ۊ\xbb\t(\xc7\xf1\x88J7\x8c\xed\xe1K\xfcn{\xd96\x8b>\xb1\xf6f\xb6Ey\v_Z\xdc\ncoc\xc4\xe5\xed\x9c\xc5w\xc0\xd8;1̍\a\xca\t\xdcjN\x84\xb1\x930U\xa3\x9c\fۘ\xc2h\xb9\xa9@9\x8d\xaflM\x87\xb13\xf8J\xffn5\x13\xb61\xab\xbb\xdd\x1fo6\xd7rNw[Z\x9b\xcb\xd2\xde\xd5\xdd\xe1\xcf\xe2\xee\x06\xca{8\x8b\uf171\xf7ySq\xf7s-\x1f\xf0#*\x0f\xb2\xb4\x0f\xf9\xae\u007fkx\x18(\x1f\xf1Y\xb3x\x14\xc6>\xe6M\xe1\x1e\xe7Z>\xe1G\x14O\xb2\xb4O\xf9\x1a\x97O\xfb ~\x86\xa5}\x96\a\xb9縖\xcf\xfb\xb8\xf9\x02K\xfb\"\xcf\xd2(_b\xd3x\xd9ז{\x85k\xf9\xaa\xbf\xa6\xf5\x1aK\xfb\xba\xbf\xc6\x1f\xea\r6\x8d7\xbb\xdbuͽŵ|\xbb\xbbM\xd7\xdeai\xdf\xed\xee\xd0\xfeL\xef\x01\xe5\xfb\x9c\xc5\x1f\xc0\xd8\x0f\xbd\xa9\xb8\x8f\xb8\x96\x1f\xfb\x11\x95OX\xdaO}ן\xe93\xa0\xfc\xdcg\xcd\xe2\v\x18\xfb\xa57\x85\xfb\x8ak\xf9\xb5\x1fQ|\xc3\xd2~\xebk\xec\xbe\xe3Z~\xef\xe3\xf8\a\x96\xf6G\x1e\xea~\xe2Z\xfe\xec\xe3\xe6/,\xed\xaf\x96v~_c\xb7\x00\xd7rA\x1f\xc7\v\xb1\xb4\v\xf3P\xb7\b\xd7rQ\x1f7\x17ci\x17\xe7\xb9\x1a\xe5\x12l\x1aK\xf6th\xff\xf0.\x05\x94K\xf7\xb4{,\xd3ө\xf9A]\x16a\xbc\x9cX\xbb<ۊ[\x01(W\xe4K++\xc1ؕ\xf9\x12\xffخ\",W\xe5\xb8Y\xac&֮ζpk\x00\xe5\x9a<\xb2X\vƮ͈\xdd:@\xb9.\xb7\xe2\xf5`\xec\xfa\x98\xc4m\x00\x94\x1br\xab\xb9\x11\x8c\xdd\x18\x137\xcaM`\x1b\x9b\xf6tf\xbc\xe1\xcdz:\x98\x9b3*n\v\xa0ܲ\xa7\xddc+\x18\xbb5_\xe97\xb8\r\xdbf\xb1\xadX\xbb\x1d\xdb\xc2m\x0f\x94;\xf0\x88bG\x18\xbb\x13#.w\xe6,\xde\x05\xc6\xee\x8a\xd1n7\xa0ܝ[\xcd=`잘\xb1Q\xee\x05\xdbػ\xa7Ô57\b(\xf7\xe9i\xf7\xd8\x17\xc6\x0e\xee\xe9\xf4\x88\xdd\x10a9\x14q\x88\xbbY\xda\x1e\x1e\xe4z\xb9\x96}>n\xde\xcc\xd2\xde³4\xca[\xd94n\xf3\xb5\xe5n\xe7Z\xde\xe1\xafi\xdd\xc9Ҏ\xf7\xd7\xf0g\x186\x8d\x89=\xedU\xff\x11\x86k9\xb9\xa7\xadZ\x9b\xc2\xd2N\xed\xe9\xa8\xfag\xe54\xa0\x9c\xceY<\x03\xc6\xce\xf4\xa6\xe2fq-g\xfb\x11\x959,\xed\\\xdf\xe5\x8f0\xde\xf8\x8f00\xf6\x1eo\xfcG\x18\xae\xe5}\xfe\xd2\xe2~\x96\xf6\x01_\xfdG\x18\x1f\xc4\x0f\xb1\xb4\x0f\xf3 \xf7\b\xd7\xf2Q\x1f7\x1fci\x1f\xe7Y\x1a\xe5\x13l\x1aO\xfa\xdarOq-\x9f\xf6״\x9eai\x9f\xf5\xd7\xf8\xc3<Ǧ\xf1\xbc?\x99\xbf'/\x00\xe5\x8b\xfe\x80ck/\xc1ؗ{:=b\xf7\x8a\xb0|\x15q\xfc\x9aX\xfb:ۊ{\x03(\xdf䑕\xb7`\xecی\xa2|\x87\xb3\xe2]\x18\xfb\x1e\xc3\xff\xbc\xe1,\xfe\x00\xc6~\xc8h\x96\x1fq\xd6\xfc\x18\xc6~\xc2\xd3\xfb#|\n\xdb\xf8\x8c\xd1r\x9f\x03\xe5\x17|e\xebK\x18\xfb\x15_\xe9\x0f\xf25l\xe3\x1b\xff\xea\xf0'\xf9\x16(\xbf\U000ef631\xb5\xefa\xec\x0f\xfe\xf5\xc6'\xf8\x116\xfeI\xac\xfd\x99m\xc5\xfd\x02\x94\xbf\xf2\x88\xcao0\xf6w\xbe\xc4ߛ?\xd86\x8b?\x19E\xf9\x17`\xfff\xf8\x9fE< \xfe\x17W\x94\xff\xb1i\xce\xd3\xcb\xc6\xfe\xaf\x97G7\xca6\xd8F;\xa3\xe5:\x80\xb2\xb3\xd7_\xd9\x1a\x00c\a\xf2\x95\xfe\f\xf3\xc26\xe6\xebm\xa7\x9a\x9b\x9fk\xb9@o\x1b\xd5\x16di\x17\xea\xed \xbf\xfd\x85\xd9ċ\xc0\xd8E\xbd\xa9\xb8Ÿ\x96\x8b\xfbK+K\xb0\xb4K\xfa\xae\xdf\xf7R\xde4\x8b\xa5a\xec2\xde\x14nY\xae\xe5r\xfe\xd2by\x96v\x05_\xe3rE\x1f\xc4+\xb1\xb4+\xf3 \xb7\n\xd7rU\x1f7WciW\xe7Y\x1a\xe5\x1al\x1ak\xfa\xdarkq-\xd7\xf6״\xd6ai\xd7\xf5\xd7\xf8c\xacǦ\xb1\xbe7\xfe\x18\x1b\x00\xe5\x86>\xa3\xdaF0v\xe3\xdeN\xe2\xa3l\x02\x1bo*\xd6nƶ\xe26\a\xca-xDeK\x18\xbb\x15\xa3p[\x03\xe56\xdc*\xb6\x85\xb1\xdb1\xe2r{\xce\xe2\x1d`쎌\xa6\xdb\t(w\xe6Vs\x17\x18\xbb+\xa3\xe5v\x03\xcaݹ\xd5\xda\x03\xc6\xee\xc9\xfb\xf0\xfb\xdf\v\xb6\xb1wo\xc7X\xff\x1e:\b(\xf7\xe9m\xf7\xd8\x17\xc6\x0e\xee\xed\x1c\xcb\xef\xa2C\xd86\x8b\xa1b\xed0\xb6\x85\xdb\x0f(\xf7\xe7\x11\xc5\x010\xf6@F\xec\x0e\x02ʃ\xb9\x15\x0f\x87\xb1\x87`\x12w(P\x1eƭ\xe6\xe10v\x04&n\x94#a\x1bG0Z\xeeH\xa0<\x8a\xafl\x1d\rc\x8f\xe1+\xfdޏ\x85mTz;\xaa~\xef\n(\xab\xbd\xed\x1e\x11\x8c\x8d{;\xab\xfc\xf3`\x94\xb0\xd4\x1c7\v#\xd6\xd6\xd8\x16.\x01\xca:\x8f,R\x18\x9b1b\x97\x03e\xc1\xad\xd8\xc2\xd8ј\xa4lp\xd6$\x18\xeb0c\xa3l\xc26\xc60Z\xae\v(K\xbe\xb2Ղ\xb1c\xf9J\xbf\xf9\xe3`\x1b\xc7\xf7v4\x1a\x95\xf2\x84\xdev\x8f\x13{;\x1b\r\xbf͓8l\x16'3\nw\nP\x9eʗ\x14\xa7\xc1\xd8\xd3\x19\xb1;\x03(\xcf\xe4V|\x16\x8c=\x1b\x83\xdd9@y.\xb7\x9a\xe7\xc1\xd8\xf31\u007f\xa3\xbc\x00\xb6q!\xa3\xe5.\x02ʋ\xf9\xca\xd6%0\xf6R\xbe\xd2\xef\xf22\xd8\xc6\xe5\xfe\xc5\xda\xf0?\x9c\x80\xf2J\xffznT\xae\x82\xb1W3\xfc\xcf'Ίka\xecu\x8c\xd8]\x0f\x947p+\xbe\x11\xc6\xde\xc4h\xbaq@\xd9ͭf\x0f\x8c\xed\xf5\xef\f\xbc\xbb>\xd8\xc6͌\x96\xbb\x05(o\xe5+[\xb7\xc1\xd8\xdb\xf9J\xbf\xbb;`\x1bw\xfa\xe7\xb0\u007f\x02\x8c\a\xca\t\xfein*\x13a\xec$\xff4\xe7\x1b?\x99m\xb3\x98\"\xd6Ne[\xb8i@9\x9dG\x143`\xecLF\xecf\x01\xe5ln\xc5s`\xec\\L\xe2\xee\x02ʻ\xb9ռ\a\xc6ދ\x89\x1b\xe5}\xb0\x8d\xfb\x19-\xf7\x00P>\xc8W\xb6\x1e\x82\xb1\x0f\xf3\x95~\xef\x8f\xc06\x1e\xf5\x8fz\xc5=Ƶ|\xbc\xb7\xadQy\x82\xa5}\xd2?\xee~\xdbOy\xd3,\x9e\x86\xb1\xcfxS\xb8g\xb9\x96\xcf\xf9K\x8b\xe7Y\xda\x17|\x8d\xcb\x17}\x10\xbf\xc4Ҿ̃\xdc+\\\xcbW}\xdc|\x8d\xa5}\x9dg\xf1\x9f\x94\xd84\xde\xf4\xb5\xe5\xde\xe2Z\xbe\xed\xafi\xbd\xc3Ҿ\xeb\xaf\xf1{{\x8fM\xe3\xfd\xde\xf6\xa4\xe6>\xe0Z~\xd8ۖ\xd4>bi?\xee\xedH\xfc\xcf\xc8O\x80\xf2S\xce\xe2\xcf`\xec\xe7\x1e\xfe\xd5\xf6\x05P~\xe9[\xcd\xe2+\x18\xfb\xb57\x85\xfb\x86k\xf9\xad\x9f\xac\xf8\x8e\xa5\xfd\x9e\xafq?p-\u007f\xf4q\xf3'\x96\xf6g\x1e\xd4(\u007fa\xd3\xf8\xd5ז\xfb\x8dk\xf9\xbb\xbf\xa6\xf5\aK\xfb\xa7\xbf\xc6\xef\xf5/6\x8d\xbf{\xdbG\xd7\xdc?\\\xcb\u007f{\xdbF\xd7\xfeci\xe7\xe9\xeb\x18\xed\xf7\xfa?\xa0l\xeb\xf3Y\xdc\x0ec;<\xfc^;\x81r\x80o5\x8b\x810v^o\n7\x1f\xd7r\xfe\xbe\xb6\xd1\xc5\x02,\xed\x82|\x8d[\x88k\xb9\xb0\x8f\x9b\x8b\xb0\xb4\x8b\xf2\xa0F\xb9\x18\x9b\xc6⾶\xdc\x12\\\xcb%\xfd5\xad\xa5Xڥ\xfd5~\xaf˰i,\xdbב\xf8\av9\xa0\\\xbe\xaf\xddc\x05\x18\xbbb_g\xc2\x0f\xeeJ\xc2re\xc4\xf1*b\xed\xaaL\xbf\xdb\xd58n\x16\xab\x8b\xb5k\xb0-ܚ@\xb9\x16OX\xac\rc\xd7\xc1\x95n]\xa0\\\x8f[\xcd\xf5a\xec\x06\x18\xdd(7\x84ml\xc4h\xb9\x8d\x81r\x13\xbe\xb2\xb5)\x8cݬ\xaf#\xf7\x1b\xde\x1c(\xb7\xe8k\xf7\xd8\x12\xc6n\xd5י\xf3\x86\xb7\x16\x96\xdb \x8e\xb7\x15k\xb7c\xfa\ro\xcfq\xb3\u0601Q\xb8\x1d\x81r'\x9e\xa8\xd8\x19\xc6\xee\x82+\xca]9k\xee\x06cw\xc7\xe8F\xb9\alcOF\xcb\xed\x05\x94{\xf3\x95\xadA0v\x1f\xbe\xd2?\xc0\xfb\xc26\x06{\xb4jn\bP\x0e\xf5W\xb6j\xc3`\xec~\xfeʖ\xdf\xf0\xfe\xc2\xf2\x00\xc4\xf1\x81b\xedAL\xbf\xe1\x839n\x16\xc3\xc5\xdaC\xd8\x16\xeeP\xa0<\x8c',\x0e\x87\xb1#p\xa5\x1b\t\x94Gp\xaby$\x8c=\xaa\xaf\xdd\u007f\xa0;\x9akyL_[Y;\x96\xa5\xad\xf4u\xf0\x879\x05\x94U\xce\xe2\b\xc6\xc6\x1e\xfc)\xc9g\xfeC\x92\xaf\xfe3\x12ײ\xe6\x87\x17\tK[\xf7\xb5\xe5R\xaee\xe6\xe3V\xce\xd2\x16~\xa8\u007f\x04,\x9b\xc6\xe8\xbev\u007f\xfe\x06ג\xfaڼfi\x9b}\x1d|\xf61@\xd9\xc5Y\\\xc2ؖ\x87\u007f9\x8c\x05\xca\xe3|\xabY\x1c\x0fcO\xf0\xa6p'r-O\xf2\x93\x15'\xb3\xb4\xa7\xf05\xeeT\xae\xe5i>n\x9e\xceҞ\xc1\x83\x1a\xe5\x99l\x1ag\xf9\xdargs-\xcf\xf1״\xceei\xcf\xf3\xd7\xf8\xbd\x9eϦqA\x1f\xff\xe7\xd7\vQ/B\xbd\xb8\xaf\xfd\xc0\xc2]\xd2\xd76\xb4vi_\xfb\x90\x9a\xbb\xac\xafc?\xbf\xfd\xcb\xfb\xda\xf7h\xd9+\xfa\xda\x0f\xa6ڕ}\x1d\x83\xfc\xa7ū\xfa\xda\a\xc5\xf6꾶a\xb5k\xfa:\xf6\xf1\x0f\xf7\xb5}\xedC[\x8d\xeb\xfa:vWMw}_\xfb\xb0\xc2\xde\xd0\xd76\xa2\xb8\xb1\xaf\xfd\x80\xa6\xbb\x89/j\x16\xe3\xfaڇW\\w_۠J\x0f\x96\xecE\xed\xeb\xeb\xd83\xf2?y\xfa\xdawo6n\xe1\x15\x9aŭ\xbcvao\xebk\x1b\u07bc\xbd\xafm\u007f{G_\xc7`\xff\x92\xba\xb3\xaf}d\xe1\xc6\xfbY[nB_\xfb>Y1\xb1\xaf}\x84\xff\x94\xd4\xd7~h\xb31\xd9oҴ\xa6x\x1d۩}m#+\xd3\xfa\xda\x06\x17ӱʌ\xbe\xf6\xc1Ik\xa6\xdfy\xe1f\xf1d\xb5xv_\xdbaŜ\xbe\xb6=\x9bs\xfb\xf8\x8f\x0e5\xee\xf2\xa7\xa8\xc5w\xf7\xb5\xedѺ\xa7\x8f\xff\xa4\x88\xbd\xd7\x1f\xbef\xef\xe3\xfd\x17\xf6~\xbe\xaa\xe2\x1e\xc0|\x0f\xb2)\xecC\xfe\x02\x13?\xdc\xd79\x92?\xc2<\x82֣}mC\xe2\xc7 \x1fG}\x02\xf5IԧP\x9fF}\x06\xf5Y\xd4\xe7P\x9fG}\x01\xf5EԗP_F}\x05\xf5U\xd4\xd7P_G}\x03\xf5MԷP\xdfF}\a\xf5]\xd4\xf7P\xdfG\xfd\x00\xf5CԏP?F\xfd\x04\xf5S\xd4\xcfP?G\xfd\x02\xf5K\u052fP\xbfF\xfd\x06\xf5[\xd4\xefP\xbfG\xfd\x01\xf5GԟP\u007fF\xfd\x05\xf5W\xd4\xdfP\u007fG\xfd\x03\xf5OԿP\xffF\xfd\a\xf5_\xd4yƷ\xe9\xca\xffƷ\xeb\x8an\x1b\xdf\xe1\xabn\a\xa8\x83\xb3\xbc\x93M\x9e\f\x00\xcc@\u03a2y\xb9\xa6\xf3q\x94\xea\xf9\x81l\x01@-\b\xd0B\x80[\x18\xb0\x8b\x00fQ\x1e\x96-\xc6U-Α\xa2%\xd8Вl\x88\x96\xc2\x1aziΒe\xb8V\x97\xe5Z_\x8e\xab[\x9e\xab]\x81\xabY\x91k\xbc\x12\x0f\x88\xf5\xca\xe3;\x19z\x15!\xad\x8a8_\r6OV\x17\x9a5\x10Gk\x02\xe9ZHS\xbd\xb60[G\xa8\xd6\x15\xd2zB\xb7\xbe\xd0n 4\x1bbx\xb6\x11\xa06F\xaah\x13X\xda\x14\x96h3YRo\x8e8\xd9\x02\xa8n\tԷ\x02\xdcր\xdd\x060\xdb\xfa\x03\xb5*\xdbyӪ\xe8\xed\xfdp\x0f\xbd\x83\x90vD\x9c\xef\x04\x9b';\v\xcd.\x88\xa3]\x81t7\xa4\xa9\xde]\x98\xed!T{\ni/\xa1\xdb[h\a\t\xcd>\x18\x9e\xed\v\xa8\xc1H\x15\r\x81\xa5\xa1\xb0D\xc3dI\xbd\x1f\xe2d\u007f\xa0z\x00P?\x10p\a\x01\xf6`\xc0\f\a\xe2C00և\x8e\x1f\x00\xeaÂ\xa0å\x93\x8f\x90 OF\x06a\x8e\x90Nt\xa40=J\x1a\xa9>:\x88\xec\x98 ԱAP%\b\xa7\x82\xb0\xd5 L$\xd3d\xb1P\x8d\x92\x86\"-\x01\x19\t\xfc\aٰ\x03\x9dH'\xa9\v\xab\xa9\xb0\x9e\t].\xb4\x85\xd0X\u007f\xf7\xe2b\xb4?r\\\xe8\x86\x0f=4\t\xc9!Λ\xb0y2Fh\xba\x10G%\x90\xb6\x90\xa6z\xac0;N\xa8\x8e\x17\xd2\tBw\xa2О$4'cxv\n\xa0NE\xaa\xe84X:\x1d\x96\xe8\fYR\x9f\x8989\v\xa8\x9e\r\xd4\xcf\x01ܹ\x80=\x0f0\xe7\xfb7\x85\xf8\x02>\x95\xbe\x90\x13\xad/\x02\xe8b\xce\xf2K\xd8\xe4ɥ\x80\xb9\x8c\xb3\xe8r\xae\xe9\x15\x1c\xa5\xfaJ \xbb\nPW\x03t\r\xe0\xae\x05\xecu\x80\xb9\x9e\x87e7pU7r\xa4\xe8&64\x8e\rQ7\xd6\xd0=\x9c%\xbd\\\xab}\\\xeb7su\xb7p\xb5\xb7r5\xb7\xf1S..n\xe7\x9b\xe2\x1f\xf8;\xf8n\xf2\x8d\xb83\b\x1a/\x9d|\x82\x04y21\b3I:\xd1da:E\x1a\xa9\x9e\x1aD6-\b5=\b\x9a\x11\x84\x9b\x19\x84\x9d\x15\x84\x99-\xd3ds\x84j\xae4\x14\xdd%\x01\xdd-\x01\xd1=a\a\xfa^\xe9$\xf7\t\xab\xf7\v\xeb\x0f\b݃B\xfb\x90\xd0<\xcco\x18\xf1#8\xb2~\x14\xa1֏\t\xe9q\xc4\xf9\x13\xb0y\xf2\xa4\xd0<\x858z\x1aH\x9fA\x9a\xeag\x85\xd9sB\xf5\xbc\x90^\x10\xba\x17\x85\xf6%\xa1y\x19óW\x00\xf5*RE\xaf\xc1\xd2\xeb\xb0DoȒ\xfaM\xc4\xc9[@\xf5m\xa0\xfe\x0e\xe0\xde\x05\xec{\x80y\xdf?\xe5\x8a\x0f\xfc\xa9\n\xfd\xa1O\xfc}\xfb\b\xa0\x8f9\xcb?a\x93'\x9f\x02\xe63\u03a2Ϲ\xa6_p\x94\xea/\x81\xec+@}\r\xd07\x80\xfb\x16\xb0\xdf\x01\xe6{\x1e\x96\xfd\xc0U\xfdȑ\xa2\x9f\xd8\xd0\xcfl\x88~\xc1\x1a\xfaWΒ߸V\u007f\xe7Z\xff\x83\xab\xfb\x93\xab\xfd\x8b\xab\xf9\xdb\u05ee\xca?~@WE\xff\xeb\xcf\xec\xa1\xff\x13\xd2<\x138\xce\xff7\x81m\x9e\xb4\tM;\xe2\xa8\x03H;\x91\xa6z\x800\x1b(T\xf3\ni>\xa1\x9b_h\x17\x10\x9a\x051<[\bP\v#U\xb4\b,-\nK\xb4\x98,\xa9\x17G\x9c,\x01T\x97\x04\xeaK\x01ni\xc0.\x03\x98e\x81x9\f\x8c\xf5\xf2\x13\x06\x80z\x85 hE\xe9\xe4+I\x90'+\aaV\x91N\xb4\xaa0]M\x1a\xa9^=\x88l\x8d ԚA\xd0ZA\xb8\xb5\x83\xb0\xeb\x04a֕i\xb2\xf5\x84j}i(\xda@\x02\xdaP\x02\xa2\x8d\xc2\x0e\xf4\xc6\xd2I6\x11V7\x15\xd67\x13\xbaͅv\v\xa1\xd9r\x82\xbf\x87\xf1V\xfe\xc8E\xac\xb7\xf6\xa1\x87\xdeFH\xdb\"η\x83͓\xed\x85f\a\xc4ю@\xba\x13\xd2T\xef,\xccv\x11\xaa]\x85\xb4\x9b\xd0\xed.\xb4{\b͞\x18\x9e\xed\x05\xa8\xbd\x91*\x1a\x04K\xfb\xc0\x12\xed+K\xea\xc1\x88\x93!@u(P\x1f\x06\xb8\xfd\x00\xbb?`\x0e\xf0\aj\x15\az\xd3*\xf4A~\xb8\x87>XH\xc3\x11\xe7\x87\xc0\xe6ɡBs\x18\xe2\xe8p \x1d\x814\xd5#\x85\xd9\x11Bu\xa4\x90\x8e\x12\xba\xa3\x85\xf6\x18\xa19\x16ó\n\xa0\x14REUX\x8a`\x89bYR\x8fB\x9ch\xa0j\x80z\rp\t`\xeb\x80I'\xb4\xe9f\xe6O\xd5ԹO\x9aZ\x17\x00Y\xce\xf2\xd1l\xf2\xa4\x01\x18\xe2,r\\\xd3&G\xa9\x1e\x03d]\x80*\x01j\x01n,`\x8f\x03\xcc\xf1<,;\x81\xab:\x91#E'\xb1\xa1\x93\xd9\x10\x9d\x825\xf4\xa9\x9c%\xa7q\xad\x9eε~\x06Ww&W{\x16Ws6\xbf\x86\xe2\xe2\x1c~\x96\xf9\x1f;\xe7\xf2ӓ\u007f\x0e\x9d\x17\x04\x9d/\x9d\xfc\x02\t\xf2\xe4\xc2 \xccE҉.\x16\xa6\x97H#\u0557\x06\x91]\x16\x84\xba<\b\xba\"\bwe\x10\xf6\xaa \xcc\xd52Mv\x8dP]+\rE\xd7I@\xd7K@tC\u0601\xbeQ:\xc9M\xc2\xea8a\xbd[\xe8z\x84\xb6Wh\xfa\xfc\x91\xbb\xe2\x9bqd}\vB\xado\x15\xd2m\x88\xf3\xdba\xf3\xe4\x0e\xa1\xb9\x13q4\x1eH' M\xf5Da6I\xa8&\vi\x8a\xd0M\x15\xdaiB3\x1dó\x19\x80\x9a\x89T\xd1,X\x9a\rK4G\x96\xd4s\x11'w\x01ջ\x81\xfa=\x80\xbb\x17\xb0\xf7\x01\xe6~>P\xed\x0165\xfd \x0f\xafi\xfd\x90\x90\x1eF\x9c?\x02\x9b'\x8f\n\xcdc\x88\xa3ǁ\xf4\t\xa4\xa9~R\x98=%TO\v\xe9\x19\xa1{Vh\x9f\x13\x9a\xe71<{\x01P/\"U\xf4\x12,\xbd\fK\xf4\x8a,\xa9_E\x9c\xbc\x06T_\a\xeao\x00\xeeM\xc0\xbe\x05\x98\xb7\xf9M\xa1\xf9\x0e\xbf\xa0\x9a\xfa]~\t\xfa\x97\xd1{Bz\x1fq\xfe\x01l\x9e|(4\x1f!\x8e>\x06\xd2O\x90\xa6\xfaSa\xf6\x99P}.\xa4/\x84\xeeK\xa1\xfdJh\xbe\xc6\xf0\xec\x1b@}\x8bT\xd1w\xb0\xf4=,\xd1\x0f\xb2\xa4\xfe\x11q\xf2\x13P\xfd\x19\xa8\xff\x02\xb8_\x01\xfb\x1b`~\xf7\a\x8a\x9b\u007fx\x137\xf5\x9f~\xb8\x87\xfeKH\u007f#\xce\xff\x81͓\u007f\x85\xe6?\xc4\xd1<\x13\x19\xe9\xff&r\x9a\xea6a\xd6.T\x1dB\xea\x14\xba\x01B;Ph\xe6\xc5\xf0l>@͏T\xd1\x02\xb0\xb4 ,\xd1B`\xae\x17F\x9c,\x02T\x17\x05\xea\x8b\x01nq\xc0.\x01\x98%'\xfa;T[ʛVM/\xed\x87{\xe8e\x84\xb4,\xe2|9\xd8\xe2d\x03\xa0\xba!P\xdf\bp\x1b\x03v\x13\xc0l:\xb1M\xd76\xf3\xa7\xaa\xe9\xcd}\xe2O\xb3\x05@[r\x96o\xc5&O\xb6\x06\xcc6\x9cE\xdbrM\xb7\xe3(\xd5\xdb\x03\xd9\x0e\x80\xda\x11\xa0\x9d\x00\xb73`w\x01̮<,ۍ\xabڝ#E{\xb0\xa1=\xd9\x10\xed\x855\xf4ޜ%\x83\xb8V\xf7\xe1Zߗ\xab\x1b\xcc\xd5\x0e\xe1j\x86N\xe4?\xd73l\"\xff\xb9\x1e\xbd\x9f?3\u007f\x17\xb2\xbf\x90\x0e@\x9c\x1f\b\x9b'\a\t\xcd\xc1\x88\xa3\xe1@z\b\xd2T\x1f*\xcc\x0e\x13\xaaÅ4B\xe8F\n\xed\x11Bs$\x86gG\x01\xeah\xa4\x8a\x8e\x81\xa5ca\x89*\xb2\xa4V\x88\x93*P\x8d\x80z\f\xb8Q\x80Հ1@\\\xc3\xc0X'\x13\a\x80\xba\x1e\x04\xa5\xd2\xc93\t\xf2$\x0f\xc2\x14҉\xac0\x1d-\x8dT7\x82\xc8(\b傠f\x10nL\x10\xb6+\bS\xca4YK\xa8\xc6JC\xd1q\x12\xd0\xf1\x12\x10\x9d\x10v\xa0O\x94Nr\x92\xb0z\xb2\xb0~\x8aН*\xb4\xa7\t\xcd\xe9|\xd8V\xe5\f\xb6\xad\x8a>\x93\xe7\xe1\xefP\xce\n\x82ΖN~\x8e\x04yrn\x10\xe6<\xe9D\xe7\v\xd3\v\xa4\x91\xea\v\x83\xc8.\nB]\x1c\x04]\x12\x84\xbb4\b{Y\x10\xe6r\x99&\xbbB\xa8\xae\x94\x86\xa2\xab$\xa0\xab% \xba&\xec@_+\x9d\xe4:a\xf5za\xfd\x06\xa1\xbbQho\x12\x9aq¸[&\x88u\xcfā\"to\xbf\xa2\xbe\xd0\xcco\x0eQ\x9e\xdcү̭\xa1\x19\xdd\x16Dz{\xe8\xa5\xfa\x8e~\x95\xddٯ\xd4\xf8~E\x13\xfa\x95\x9bد\xec\xa4~e&\x87\xe9\xb2)A\xa8\xa9\xa1\xa7hZ\x88hz\x88\x88f\xf4oH\xcf\f\xcddV\x10\xd5\xd9A\xd4\xe7\x04\xe1\xe6\x06a\xef\n\xc2\xdc\xcdw=.\xee\xe1\xc7\xc3\xfffu/\xe7\xfc\xab\xd6}A\xd0\xfd\xd2\xc9\x1f\x90 O\x1e\f\xc2<$\x9d\xe8aa\xfa\x884R\xfdh\x10\xd9cA\xa8ǃ\xa0'\x82pO\x06a\x9f\n\xc2<-\xd3d\xcf\bճ\xd2P\xf4\x9c\x04\xf4\xbc\x04D/\x84\x1d\xe8\x17\xa5\x93\xbc$\xac\xbe,\xac\xbf\"t\xaf\n\xedkB\xf3:\xbfA\xc5o\xe0\xc8\xfaM\x84Z\xbf%\xa4\xb7\x11\xe7\xef\xc0\xe6ɻB\xf3\x1e\xe2\xe8} \xfd\x00i\xaa?\x14f\x1f\t\xd5\xc7B\xfaD\xe8>\x15\xdaτ\xe6s\fϾ\x00ԗH\x15}\x05K_\xc3\x12}#K\xeao\x11'\xdf\x01\xd5\xef\x81\xfa\x0f\x80\xfb\x11\xb0?\x01\xe6g<\x8d\xe3\xe2\x17\xdcN\u007f\xbb~\xc5Ӂo\xe0o\xfd\x8a~\x0f\xcd\xfc\x8f\x10\xe5ɟ\xfd\xca\xfc\x15\x9a\xd1\xdfA\xa4\xff\x84^\xaa\xff\xedW\xd9\u007f\xfdJ\xcd3)(\xfa_\xbfrm\xfdʶ\xf7+\xd31I\xa6\xcb:\x83P\x03BO\xd1\xc0\x10Ѽ!\"\x9a/\xa8\\\xcf\x1f\x9a\xc9\x02AT\x17\f\xa2\xbeP\x10n\xe1 \xec\"A\x98E'\xf1\x9bW\xbc\xd8$<\x1ezqɵ^\"\bZR:\xf9R\x12\xe4\xc9\xd2A\x98e\xa4\x13-+L\x97\x93F\xaa\x97\x0f\"[!\b\xb5b\x10\xb4R\x10n\xe5 \xec*A\x98Ue\x9al5\xa1Z]\x1a\x8a\u0590\x80֔\x80h\xad\xb0\x03\xbd\xb6t\x92u\x84\xd5u\x85\xf5\xf5\x84n}\xa1\xdd@h6\x9c\xc4\u007f\nv#>r\xa17\xe6\xd0\xdf\xefM\x84\xb4)\xe2|3\xd8<\xd9\\h\xb6@\x1cm\t\xa4[!M\xf5\xd6\xc2l\x1b\xa1\xdaVH\xdb\t\xdd\xf6B\xbb\x83\xd0\xec\x88\xe1\xd9N\x80\xda\x19\xa9\xa2]`iWX\xa2\xdddI\xbd;\xe2d\x0f\xa0\xba'P\xdf\vp{\x03v\x10`\xf6atU\xf6\xe5\x81]\x15=\x98\x1f\x18\xfe\x1ehH\x104T:\xf90\t\xf2d\xbf \xcc\xfe҉\x0e\x10\xa6\aJ#\xd5\a\x05\x91\x1d\x1c\x84\x1a\x1e\x04\x1d\x12\x84;4\b{X\x10\xe6p\x99&\x1b!T#\xa5\xa1\xe8\b\t\xe8H\t\x88\x8e\n;\xd0GK'9FX=VX\xaf\b\x9d\x12ڪ\xd0D\xc28\x96\tb=\x8a\x9f\xfb\xf8\x8eH\xf7+2\xa1\x99\xd7B\x94'I\xbf2\xf5Ќ\xd2 \xfcG>\xe9\xa5:\xefWYѯ\x94\xedW4\xba_\xb9F\xbf\xb2\u052f\x8c\v\xd3e\xcd Ԙ\xd0S\xd4\x15\"*CD\xd4\xeaߐ\x1e\x1b\x9a\xc9qAT\x8f\x0f\xa2~B\x10\xee\xc4 \xecIA\x98\x93q\xf3\xe3S\xf0t\x89\xf5\xa9\x9c\xf3\xf7G\xa7\x05A\xa7K'?C\x82<93\bs\x96t\xa2\xb3\x85\xe99\xd2H\xf5\xb9Ad\xe7\x05\xa1\xce\x0f\x82.\b\xc2]\x18\x84\xbd(\bs\xb1L\x93]\"T\x97JC\xd1e\x12\xd0\xe5\x12\x10]\x11v\xa0\xaf\x94Nr\x95\xb0z\xb5\xb0~\x8d\xd0]+\xb4\xd7\t\xcd\xf5x\x83*n\xc0K\xb8\xd07\xe2\xb5\xef_\xb67\x05A㤓wK\x90'=A\x98^\xe9D}\xc2\xf4fi\xa4\xfa\x96 \xb2[\x83P\xb7\x05A\xb7\a\xe1\xee\b\xc2\xde\x19\x84\x19/\xd3d\x13\x84j\xa24\x14M\x92\x80&K@4%\xec@O\x95N2MX\x9d.\xac\xcf\x10\xba\x99B;Khf\xf3\x1bTs\x0e\x1f\xb9\xa9\xe7r\xe8?_\xde%\xa4\xbb\x11\xe7\xf7\xc0\xe6ɽBs\x1f\xe2\xe8~ }\x00i\xaa\x1f\x14f\x0f\t\xd5\xc3BzD\xe8\x1e\x15\xdaDŽ\xe6q\fϞ\x00ԓH\x15=\x05KO\xc3\x12=#K\xeag\x11'\xcf\x01\xd5\xe7\x81\xfa\v\x80{\x11\xb0/\x01\xe6e\xbcf\xe3\xe2\x15\b\xbbB\x10fE\x99&[I\xa8V\x96\x86\xa2U$\xa0U% Z-\xec@\xaf.\x9dd\rauMa}-\xa1[[h\xd7\x11\x9au\xf9\xb0\xad\xe6zl[M\xbd>\xcf\xc3\xdfsm\x10\x04m(\x9d|#\t\xf2d\xe3 \xcc&҉6\x15\xa6\x9bI#՛\a\x91m\x11\x84\xda2\b\xda*\b\xb7u\x10v\x9b ̶2M\xb6\x9dPm/\rE;H@;J@\xb4S\u0601\xdeY:\xc9.\xc2\xea\xae\xc2\xfanB\xb7\xbb\xd0\xee!4{\xf2a\xe3\xe6^l\xe3\xa6ޛ\xe7\xe1\xef\xc0\x06\x05A\xfbH'\xdfW\x82<\x19\x1c\x84\x19\"\x9dh\xa80\x1d&\x8dT\xef\x17D\xb6\u007f\x10\xea\x80 \xe8\xc0 \xdcAA\u0603\x830\xc3e\x9a\xec\x10\xa1:T\x1a\x8a\x0e\x93\x80\x0e\x97\x80hD\u0601\x1e)\x9d\xe4\ba\xf5Ha\xfd(\xa1;Zh\x8f\x11\x9acqgk\x15\x9c\xbd\xa6\x15\x1e4\xff4\xae\x06A\x91t\xf2X\x82<\x19\x15\x84\xd1҉\x8c0\xadI#\xd5I\x10Y=\b\x95\x06AY\x10.\x0f\xc2\x16A\x18+\xd3d\xa3\x85\xaa!\rE$\x019\t\x88\x9aa\az\x8ct\x92.a\xb5\x14\xd6[B7Vh\x8f\x13\x9a\xe3'\xf3_C;\x81\x8f\\\xd3'r\xe8Oz\x92\x90NF\x9c\x9f\x02\x9b'\xa7\n\xcdi\x88\xa3Ӂ\xf4\f\xa4\xa9>S\x98\x9d%Tg\v\xe9\x1c\xa1;Wh\xcf\x13\x9a\xf31<\xbb\x00P\x17\"Ut\x11,]\fKt\x89,\xa9/E\x9c\\\x06T/\a\xeaW\x00\xeeJ\xc0^\x05\x98\xab'\xb7\xe5\x95k&\xb7\xe7\x15}\xed\xe4\x0e_\xf5u\x00]\xcfY~\x03\x9b<\xb9\x1107q\x16\x8d\xe3\x9avs\x94\xea\x1e \xeb\x05T\x1f@7\x03\xee\x16\xc0\xde\n\x98\xdbxXv;Wu\aG\x8a\xeedC\xe3\xd9\x10M\xc0\x1az\"g\xc9$\xae\xd5\xc9\\\xebS\xb8\xba\xa9\\\xed4\xaef:\xd7x\x06\x0f\x88\xf5\xccɝ\f=KH\xb3\x11\xe7s`\xf3d\xae\xd0܅8\xba\x1bH\xefA\x9a\xea{\x85\xd9}Bu\xbf\x90\x1e\x10\xba\a\x85\xf6!\xa1y\x18óG\x00\xf5(RE\x8f\xc1\xd2\xe3\xb0DOȒ\xfaI\xc4\xc9S@\xf5i\xa0\xfe\f\xe0\x9e\x05\xecs\x80y\xde\x1f\xa8Uy\xc1\x9bVE\xbf\xe8\x87\xf37c/\t\xe9e\xc4\xf9+\xb0y\xf2\xaaм\x868z\x1dH\xdf@\x9a\xea7\x85\xd9[B\xf5\xb6\x90\xde\x11\xbaw\x85\xf6=\xa1y\x1fó\x0f\x00\xf5!RE\x1f\xc1\xd2ǰD\x9fȒ\xfaS\xc4\xc9g@\xf5s\xa0\xfe\x05\xe0\xbe\x04\xecW\x80\xf9\x1a\x88\xbf\xc1\xc0X\u007f;y\x00\xa8\xbf\v\x82\xbe\x97N\xfe\x83\x04y\xf2c\x10\xe6'\xe9D?\v\xd3_\xa4\x91\xea_\x83\xc8~\vB\xfd\x1e\x04\xfd\x11\x84\xfb3\b\xfbW\x10\xe6o\x99&\xfbG\xa8\xfe\x95\x86\xa2\xff$\xa0y\xa6 \xfa\x9f\x88\\\xb7MA'i\x17V;\x84\xf5N\xa1\x1b \xb4\x03\x85f\xde)\xedy\\\xcc7\xa5\xc3W=\xbf\x0f\xf9\x17\xb7\x05\x84\xb4 \xe2|!\xd8\x01p\x13\x01;\t0\x93\x81x\n\x06\xc6z\xaa\u007fz⛣iA\xd0t\xe9\xe43$ȓ\x99A\x98Y҉f\v\xd39\xd2H\xf5\xdc \xb2\xbb\x82Pw\aA\xf7\x04\xe1\xee\r\xc2\xde\x17\x84\xb9_\xa6\xc9\x1e\x10\xaa\a\xa5\xa1\xe8!\t\xe8a\t\x88\x1e\t;ЏJ'yLX}\\X\u007fB\xe8\x9e\x14ڧ\x84\xe6i\xbe\x87\xf13|\xbbc\xfd\xac\x0f\xf9ۡ\xe7\x84\xf4<\xe2\xfc\x05\xd8\x1ap\r\xc0\x12`\xdcT\xfe+bM~A5\xf5\x98\xa9\xfc\x17̴\xee\x12R\x898o\xc1\xe6\xc9X\xa19\x0eqt<\x90\x9e\x804\xd5'\n\xb3\x93\x84\xead!\x9d\"t\xa7\n\xediBs:\x86gg\x00\xeaL\xa4\x8a\u0382\xa5\xb3a\x89Α%\xf5\xb9\x88\x93\xf3\x80\xea\xf9@\xfd\x02\xc0]\b؋\x00s\xb1?Pܼě\xb8\xa9/\xf5\xc3\xf9\x9b\x95˄t9\xe2\xfc\n\xd8<\xb9Rh\xaeB\x1c]\r\xa4\xd7 M\xf5\xb5\xc2\xec:\xa1\xba^H7\bݍB{\x93Ќ\xc3\xf0\xac\x1bP=H\x15\xf5\xc2R\x1f,\xd1Ͳ\xa4\xbe\x05qr+P\xbd\r\xa8\xdf\x0e\xb8;\x00{'`\xc6\xf3\x1d\xaaM\xe0\xd3\xd5\xf4D~<\xfcSn\x92\x90&#Χ\xc0\xe6\xc9T\xa1\x99\x868\x9a\x0e\xa43\x90\xa6z\xa60\x9b%T\xb3\x854G\xe8\xe6\n\xed]Bs7\x86g\xf7\x00\xea^\xa4\x8a\ue0e5\xfba\x89\x1e\x90%\xf5\x83\x88\x93\x87\x80\xea\xc3@\xfd\x11\xc0=\n\xd8\xc7\x00\xf3\xb8\u007fۮ=\xe1OU\xd3O\xfağ\xe6)\x80\x9e\xe6,\u007f\x86M\x9e<\v\x98\xe78\x8b\x9e皾\xc0Q\xaa_\x04\xb2\x97\x00\xf52@\xaf\x00\xeeU\xc0\xbe\x06\x98\xd7yX\xf6\x06W\xf5&G\x8a\xdebCo\xb3!z\ak\xe8w9K\xde\xe3Z}\x9fk\xfd\x03\xae\xeeC\xae\xf6#\xae\xe6\xe3\xa9mQ哩\xedQE\u007f:\xb5\xc3W\xfd\x19@\x9fs\x96\u007f\xc1&O\xbe\x04\xccW\x9cE_sM\xbf\xe1(\xd5\xdf\x02\xd9w\x80\xfa\x1e\xa0\x1f\x00\xf7#`\u007f\x02\xcc\xcf<,\xfb\x85\xab\xfa\x95#E\xbf\xb1\xa1\xdf\xd9\x10\xfd\x815\xf4\x9f\x9c%\u007fq\xad\xfe͵\xfe\x0fW\xf7/W\xfb\x1fW3\xcf4_\xe3\xffM\xf3\x03b\xdd6\xad\x93\xa1ۅԁ8\xef\x84͓\x01B3\x10q4/\x90·4\xd5\xf3\v\xb3\x05\x84jA!-$t\v\v\xed\"B\xb3(\x86g\x8b\x01jq\xa4\x8a\x96\x80\xa5%a\x89\x96\x92%\xf5҈\x93e\x80\xea\xb2@}9\xc0-\x0f\xd8\x15\x00\xb3\xa2?P\xab\xb2\x927\xad\x8a^\xd9\x0f\xe7/BV\x11Ҫ\x88\xf3\xd5`\xf3du\xa1Y\x03q\xb4&\x90\xae\x854\xd5k\v\xb3u\x84j]!\xad't\xeb\v\xed\x06B\xb3!\x86g\x1b\x01jc\xa4\x8a6\x81\xa5Ma\x896\x93%\xf5戓-\x80\xea\x96@}+\xc0m\r\xd8m\x00\xb3-\x10o\x87\x81\xb1\xde~\xda\x00P\xef\x10\x04\xed(\x9d|'\t\xf2d\xe7 \xcc.҉v\x15\xa6\xbbI#ջ\a\x91\xed\x11\x84\xda3\b\xda+\b\xb7w\x10vP\x10f\x1f\x99&\xdbW\xa8\x06KC\xd1\x10\th\xa8\x04D\xc3\xc2\x0e\xf4~\xd2I\xf6\x17V\x0f\x10\xd6\x0f\x14\xba\x83\x84\xf6`\xa1\x19\xee\xef^\\\x1c\xe2\x8f\xec\u007f\xcf9ԇ\xfc{\xcfaB:\x1cq>\x026OF\n\xcd\x11\x88\xa3#\x81\xf4(\xa4\xa9>Z\x98\x1d#T\xc7\n\xa9\"tJh\xabB\x13ax\x16\x03j\x14RE\x1a\x96\f,QM\x96\xd4\t\xe2\xa4\x0eTS\xa0\x9e\x01.\al\x01\x18;\xad-\x8aG\xf3\xa9t\x83\x13\xad\t \xc7Y\xded\x93'c\x00\xd3\xc5YTrM[\x1c\xa5z,\x90\x1d\a\xa8\xe3\x01:\x01p'\x02\xf6$\xc0\x9c\xccòS\xb8\xaaS9Rt\x1a\x1b:\x9d\r\xd1\x19XC\x9f\xc9Yr\x16\xd7\xea\xd9\\\xeb\xe7pu\xe7r\xb5\xe7q5\xe7\xf3S...\xe0\x9b\xe2\x1f\xf8\v\xf9n\xf2\x8d\xb8(\b\xbaX:\xf9%\x12\xe4ɥA\x98ˤ\x13].L\xaf\x90F\xaa\xaf\f\"\xbb*\buu\x10tM\x10\xee\xda \xecuA\x98\xebe\x9a\xec\x06\xa1\xbaQ\x1a\x8an\x92\x80\xc6I@\xd4\x1dv\xa0{\xa4\x93\xf4\n\xab}\xc2\xfa\xcdBw\x8b\xd0\xde*4\xb7\xf1\x1bF|;\x8e\xac\xef@\xa8\xf5\x9dB\x1a\x8f8\x9f\x00\x9b'\x13\x85f\x12\xe2h2\x90NA\x9a\xea\xa9\xc2l\x9aPM\x17\xd2\f\xa1\x9b)\xb4\xb3\x84f6\x86gs\x005\x17\xa9\xa2\xbb`\xe9nX\xa2{dI}/\xe2\xe4>\xa0z?P\u007f\x00p\x0f\x02\xf6!\xc0<\xec\x9fr\xc5#\xfeT\x85~\xd4'\xfe\xbe=\x06\xd0\xe3\x9c\xe5O\xb0ɓ'\x01\xf3\x14g\xd1\xd3\\\xd3g8J\xf5\xb3@\xf6\x1c\xa0\x9e\a\xe8\x05\xc0\xbd\bؗ\x00\xf32\x0f\xcb^\xe1\xaa^\xe5H\xd1kl\xe8u6Do`\r\xfd&g\xc9[\\\xabos\xad\xbf\xc3ս\xcbվ\xc7ռ\xefkW\xe5\x03?\xa0\xab\xa2?\xf4g\xe6/B>\x12\xd2Lj\xf3O`\xf3\xe4S\xa1\xf9\fq\xf49\x90~\x814\xd5_\n\xb3\xaf\x84\xeak!}#t\xdf\n\xedwB\xf3=\x86g?\x00\xeaG\xa4\x8a~\x82\xa5\x9fa\x89~\x91%\xf5\xaf\x88\x93߀\xea\xef@\xfd\x0f\xc0\xfd\tؿ\x00\xf37\x10\xff\x83\x81\xb1\xfe\xd7?=\xf1E\xc8\u007fA\xd0<\xd3\xd1\xc9\xff7\x1dA\x9e\xb4\x05aڥ\x13u\b\xd3Ni\xa4z@\x10\xd9\xc0 ԼA\xd0|A\xb8\xf9\x83\xb0\v\x04a\x16\x94i\xb2\x85\x84jai(ZD\x02ZT\x02\xa2\xc5\xc2\x0e\xf4\xe2\xd2I\x96\x10V\x97\x14֗\x12\xba\xa5\x85v\x19\xa1Yv\xba\xbf\x87\xf1r\xd3\xfd\xed\x8e\xf5\xf2>\xe4/BV\x10Ҋ\x88\xf3\x95`\xf3de\xa1Y\x05q\xb4*\x90\xae\x864ի\v\xb35\x84jM!\xad%tk\v\xed:B\xb3.\x86g\xeb\x01j}\xa4\x8a6\x80\xa5\ra\x896\x92%\xf5ƈ\x93M\x80\xea\xa6@}3\xc0m\x0e\xd8-\x00\xb3\xa5?P\xab\xd8ʛV\xa1\xb7\xf6\xc3\xf9\x8b\x90m\x84\xb4-\xe2|;\xd8<\xd9^hv@\x1c\xed\b\xa4;!M\xf5\xce\xc2l\x17\xa1\xdaUH\xbb\t\xdd\xeeB\xbb\x87\xd0\xec\x89\xe1\xd9^\x80\xda\x1b\xa9\xa2A\xb0\xb4\x0f,Ѿ\xb2\xa4\x1e\x8c8\x19\x02T\x87\x02\xf5a\x80\xdb\x0f\xb0\xfb\x03\xe6\x80\xe9mQ\xf3@\u007f\xaa\xa6>\xc8'\xfe\x03\xcf\xc1\x00\r\xe7,?\x84M\x9e\x1c\n\x98\xc38\x8b\x0e皎\xe0(\xd5#\x81\xec\b@\x1d\t\xd0Q\x80;\x1a\xb0\xc7\x00\xe6X\x1e\x96U\xb8*ő\xa2*\x1b\x8a\xd8\x10\xc5XC\x8f\xe2,\xd1\\\xab\x86k\xbd\xc6\xd5%\\m\x9d\xabI\xfd\xa5\xfc\xf5\x03?\xcb\xfc\x8f\x9d\x9c\x9f\x9e\xfcs\xa8\b\x82\xact\xf2\xd1\x12\xe4I#\bC҉\x9c0mJ#\xd5c\x82Ⱥ\x82Pe\x10\xd4\n\u008d\r\xc2\x1e\x17\x849^\xa6\xc9N\x10\xaa\x13\xa5\xa1\xe8$\t\xe8d\t\x88N\t;ЧJ'9MX=]X?C\xe8\xce\x14ڳ\x84\xe6l\u007f\xe4\xae\xf8\x1c\x1cY\x9f\x8bP\xeb\xf3\x84t>\xe2\xfc\x02\xd8<\xb9Ph.B\x1c]\f\xa4\x97 M\xf5\xa5\xc2\xec2\xa1\xba\\HW\bݕB{\x95\xd0\\\x8d\xe1\xd95\x80\xba\x16\xa9\xa2\xeb`\xe9zX\xa2\x1bdI}#\xe2\xe4&\xa0:\x0e\xa8w\x03\xae\a\xb0\xbd\x80\xe9\xe3\x03\xd5nfSӷ\xf0p\xff9\xeeV!݆8\xbf\x1d6O\xee\x10\x9a;\x11G\xe3\x81t\x02\xd2TO\x14f\x93\x84j\xb2\x90\xa6\b\xddT\xa1\x9d&4\xd31<\x9b\x01\xa8\x99H\x15͂\xa5ٰDsdI=\x17qr\x17P\xbd\x1b\xa8\xdf\x03\xb8{\x01{\x1f`\xee\xe77\x85\xe6\x03\xfc\x82j\xea\a\xf9%\xe8_F\x0f\t\xe9a\xc4\xf9#\xb0y\xf2\xa8\xd0<\x868z\x1cH\x9f@\x9a\xea'\x85\xd9SB\xf5\xb4\x90\x9e\x11\xbag\x85\xf69\xa1y\x1eó\x17\x00\xf5\"RE/\xc1\xd2˰D\xafȒ\xfaU\xc4\xc9k@\xf5u\xa0\xfe\x06\xe0\xde\x04\xec[\x80y\xdb\x1f(n\xbe\xe3M\xdc\xd4\xef\xfa\xe1\xfcE\xc8{Bz\x1fq\xfe\x01l\x9e|(4\x1f!\x8e>\x06\xd2O\x90\xa6\xfaSa\xf6\x99P}.\xa4/\x84\xeeK\xa1\xfdJh\xbe\xc6\xf0\xec\x1b@}\x8bT\xd1w\xb0\xf4=,\xd1\x0f\xb2\xa4\xfe\x11q\xf2\x13P\xfd\x19\xa8\xff\x02\xb8_\x01\xfb\x1b`~\xe7;T\xfb\x83OW\xd3\u007f\xf2\xe3\xe1\x9fr\u007f\t\xe9o\xc4\xf9?\xb0y\xf2\xaf\xd0\xfc\x878\x9ag\x06#\xfd\xdf\fNS\xdd&\xccڅ\xaaCH\x9dB7@h\a\nͼ\x18\x9e\xcd\a\xa8\xf9\x91*Z\x00\x96\x16\x84%Z\b\xcc\xf5\u0088\x93E\x80\xea\xa2@}1\xc0-\x0e\xd8%\x00\xb3䌶\xa8\xb6Ԍ\xf6\xa8\xa6\x97\xf6\t\xff\xa51\x80\x96\xe5,_\x8eM\x9e,\x0f\x98\x158\x8bV䚮\xc4Q\xaaW\x06\xb2U\x00\xb5*@\xab\x01nu\xc0\xae\x01\x985yX\xb6\x16W\xb56G\x8a\xd6aC\xeb\xb2!Z\x0fk\xe8\xf59K6\xe0Zݐk}#\xaenc\xaev\x13\xaef\xd3\x19\xfc?\xb5\xdfl\x06\xffO\xed\xf5\xe6\xfe\xcc\xfc]\xc8\x16B\xda\x12q\xbe\x15l\x9el-4\xdb \x8e\xb6\x05\xd2퐦z{a\xb6\x83P\xed(\xa4\x9d\x84ng\xa1\xddEhv\xc5\xf0l7@\xed\x8eT\xd1\x1e\xb0\xb4',\xd1^\xb2\xa4\xde\x1bq2\b\xa8\xee\x03\xd4\xf7\x05\xdc`\xc0\x0e\x01\xccP \x1e\x86\x81\xb1\xdeo\xc6\x00P\xef\x1f\x04\x1d \x9d\xfc@\t\xf2\xe4\xa0 \xcc\xc1҉\x86\v\xd3C\xa4\x91\xeaC\x83\xc8\x0e\vB\x1d\x1e\x04\x8d\b\u008d\f\xc2\x1e\x11\x849R\xa6Ɏ\x12\xaa\xa3\xa5\xa1\xe8\x18\t\xe8X\t\x88*a\aZI'\xa9\n\xab\x91\xb0\x1e\v\xdd(\xa1\xd5Bc\xf8\xb0\xadJ\x8dm\xab\xa2\x13\x9e\x87\xbfC\xa9\aA\xa9t\xf2L\x82<Ƀ0\x85t\"+LGK#Ս 2\nB\xb9 \xa8\x19\x84\x1b\x13\x84\xed\n\u00942M\xd6\x12\xaa\xb1\xd2Pt\x9c\x04t\xbc\x04D'\x84\x1d\xe8\x13\xa5\x93\x9c$\xac\x9e,\xac\x9f\"t\xa7\n\xediBs\xba0>C&\x88\xf5\x993\x06\x8a\xd0g\xf5+:;4\xf3sB\x94'\xe7\xf6+s^hF\xe7\a\x91^\x10z\xa9\xbe\xb0_e\x17\xf5+uq\xbf\xa2K\xfa\x95\xbb\xb4_\xd9\xcb\xfa\x95\xb9\x11\xb9\x9e_:\xc9\x02\xc2\xea\x82\xc2\xfaBB\xb7\xb0\xd0.\"4\x8b\xce\xe4\u007f\nf\xb1\x99\xfcO\xc1\xe8\xc59\xf4\xf7{\t!-\x898_\n6O\x96\x16\x9ae\x10G\xcb\x02\xe9rHS\xbd\xbc0[A\xa8V\x14\xd2JB\xb7\xb2Ю\"4\xabbx\xb6\x1a\xa0VG\xaah\rXZ\x13\x96h-YR\xaf\x8d8Y\a\xa8\xae\v\xd4\xd7\x03\xdc\xfa\x80\xdd\x000\x1b2\xba*\x1b\xf1\xc0\xae\x8aޘ\x1f\x18\xfe\x1eh\x93 hS\xe9\xe4\x9bI\x90'\x9b\aa\xb6\x90N\xb4\xa50\xddJ\x1a\xa9\xde:\x88l\x9b ԶA\xd0vA\xb8탰;\x04av\x94i\xb2\x9d\x84jgi(\xdaE\x02\xdaU\x02\xa2\xdd\xc2\x0e\xf4\xee\xd2I\xf6\x10V\xf7\x14\xd6\xf7\x12\xba\xbd\x85v\x90\xd0\xec#\x8c\xf7\x95\tb=x\xe6@\x11zH\xbf\xa2\xa1\xa1\x99\x0f\vQ\x9e\xec\u05ef\xcc\xfe\xa1\x19\x1d\x10Dz`\xe8\xa5\xfa\xa0~\x95\x1dܯ\xd4\xf0~E\x87\xf4+wh\xbf\xb2\x87\xf5+sx\x98.\x1b\x11\x84\x1a\x19z\x8a\x8e\b\x11\x1d\x19\"\xa2\xa3\xfa7\xa4\x8f\x0e\xcd\xe4\x98 \xaa\xc7\x06Q\xaf\x04\xe1T\x10\xb6\x1a\x84\x89p\xf3\xe3\x18O\x97X\x8f✿?\xd2A\x90\x91N^\x93 O\x92 L]:Q*L3i\xa4:\x0f\"+\x82P6\b\x1a\x1d\x84k\x04a)\b\xe3d\x9a\xac)Tc\xa4\xa1\xa8K\x02*% j\x85\x1d\xe8\xb1\xd2I\x8e\x13V\x8f\x17\xd6O\x10\xba\x13\x85\xf6$\xa19\x99\x0f\xdb*N\xc1K\xb8Ч\xe2\xb5\xef_\xb6\xa7\x05A\xa7K'?C\x82<93\bs\x96t\xa2\xb3\x85\xe99\xd2H\xf5\xb9Ad\xe7\x05\xa1\xce\x0f\x82.\b\xc2]\x18\x84\xbd(\bs\xb1L\x93]\"T\x97JC\xd1e\x12\xd0\xe5\x12\x10]\x11v\xa0\xaf\x94Nr\x95\xb0z\xb5\xb0~\x8d\xd0]+\xb4\xd7\t\xcd\xf5\xfc\x06ռ\x81\x8f\xdc\xd47r\xe8?_\xde$\xa4q\x88\xf3n\xd8<\xe9\x11\x9a^\xc4Q\x1f\x90ތ4շ\b\xb3[\x85\xea6!\xdd.tw\b\xed\x9dB3\x1eó\t\x80\x9a\x88T\xd1$X\x9a\fK4E\x96\xd4S\x11'Ӏ\xeat\xa0>\x03p3\x01;\v0\xb3\U0005a34b9x\xee\xfa\x1f\xaas\xf1\xdc石w\xf5+\xba;4\xf3{B\x94'\xf7\xf6+s_hF\xf7\a\x91>\x10z\xa9~\xb0_e\x0f\xf5+\xf5p\xbf\xa2G\xfa\x95{\xb4_\xd9\xc7\xfa\x95y\x95\x86\xa2\xcf$\xa0\xcf% \xfa\"\xec@\u007f)\x9d\xe4+a\xf5ka\xfd\x1b\xa1\xfbVh\xbf\x13\x9a\xefq\xd8\xda\x0f\xb05\xfd#\xe6\xf1\x1f\xc5\u007f\n\x82~\x96N\xfe\x8b\x04y\xf2k\x10\xe67\xe9D\xbf\v\xd3?\xa4\x91\xea?\x83\xc8\xfe\nB\xfd\x1d\x04\xfd\x13\x84\xfb7\b\xfb_\x10f\x9eY\x98&\xfb\x9fP\xb5\xcdBCQ\xbb\x04\xd4!\x01Q\xa7\x88\\\x0f\x90N2PX\x9dWX\x9fO\xe8\xe6\x17\xda\x05\x84f\xc1Y\xfc\x06\xd5\\\x88m\xab\xa9\x17\xe6y\xf8{\xaeE\x82\xa0E\xa5\x93/&A\x9e,\x1e\x84YB:ђ\xc2t)i\xa4z\xe9 \xb2e\x82P\xcb\x06A\xcb\x05\xe1\x96\x0f®\x10\x84YQ\xa6\xc9V\x12\xaa\x95\xa5\xa1h\x15\thU\t\x88V\v;ЫK'YCX]SX_K\xe8\xd6\x16\xdau\x84f]>l\xdc\\\x8fm\xdc\xd4\xeb\xf3<\xfc\x1d\xd8\x06AІ\xd2\xc97\x92 O6\x0e\xc2l\"\x9dhSa\xba\x994R\xbdy\x10\xd9\x16A\xa8-\x83\xa0\xad\x82p[\aa\xb7\t\xc2l+\xd3d\xdb\t\xd5\xf6\xd2P\xb4\x83\x04\xb4\xa3\x04D;\x85\x1d蝥\x93\xec\"\xac\xee*\xac\xef&t\xbb\v\xed\x1eB\xb3'\xeelm/\x9c\xbd\xa6\xf7ƃ\xe6\x9fƃ\x82\xa0}\xa4\x93\xef+A\x9e\f\x0e\xc2\f\x91N4T\x98\x0e\x93F\xaa\xf7\v\"\xdb?\bu@\x10t`\x10\xee\xa0 \xec\xc1A\x98\xe12Mv\x88P\x1d*\rE\x87I@\x87K@4\"\xec@\x8f\x94Nr\x84\xb0z\xa4\xb0~\x94\xd0\x1d-\xb4\xc7\bͱ\xb3\xf8\x9fb\xac\xf0\x91kZq\xc8\u007f\xa1LH\x11\xe2<\x86͓QB\xa3\x11G\x06HkHS\x9d\b\xb3\xbaP\xa5Bʄ.\x17\xdaBh,\x86g\xa3\x01\xd5@\xaa\x88`\xc9\xc1\x125eI=\x06q\xd2\x05TK\xa0\xde\x02\xdcX\xc0\x1e\a\x98\xe3g\xb55*'\xccjoT\xf4\x89\xb3:|\xd5'\x01t2g\xf9)l\xf2\xe4T\xc0\x9c\xc6Yt:\xd7\xf4\f\x8eR}&\x90\x9d\x05\xa8\xb3\x01:\ap\xe7\x02\xf6<\xc0\x9c\xcfò\v\xb8\xaa\v9Rt\x11\x1b\xba\x98\r\xd1%XC_\xcaYr\x19\xd7\xea\xe5\\\xebWpuWr\xb5Wq5Ws\x8d\xaf\xe1\x01\xb1\xbevV'C_'\xa4\xeb\x11\xe77\xc0\xe6ɍBs\x13\xe2h\x1c\x90v#Mu\x8f0\xeb\x15\xaa>!\xdd,t\xb7\b\xed\xadBs\x1b\x86g\xb7\x03\xea\x0e\xa4\x8a\ue125\xf1\xb0D\x13dI=\x11q2\t\xa8N\x06\xeaS\x007\x15\xb0\xd3\x003\xdd\x1f\xa8U\x99\xe1M\xab\xa2g\xfa\xe1\xfc\xcd\xd8,!\xcdF\x9cρ͓\xb9Bs\x17\xe2\xe8n \xbd\ai\xaa\xef\x15f\xf7\t\xd5\xfdBz@\xe8\x1e\x14ڇ\x84\xe6a\f\xcf\x1e\x01ԣH\x15=\x06K\x8f\xc3\x12=!K\xea'\x11'O\x01է\x81\xfa3\x80{\x16\xb0\xcf\x01\xe6y ~\x01\x03c\xfd\xe2\xac\x01\xa0~)\bzY:\xf9+\x12\xe4ɫA\x98פ\x13\xbd.LߐF\xaa\xdf\f\"{+\b\xf5v\x10\xf4N\x10\xee\xdd \xec{A\x98\xf7e\x9a\xec\x03\xa1\xfaP\x1a\x8a>\x92\x80>\x96\x80蓰\x03\xfd\xa9t\x92τ\xd5υ\xf5/\x84\xeeK\xa1\xfdJh\xbe\xf6w/.\xbe\xf1G\xf6\xbf\xa7}\xebC\xfe\xc5\xed;!}\x8f8\xff\x016O~\x14\x9a\x9f\x10G?\x03\xe9/HS\xfd\xab0\xfbM\xa8~\x17\xd2\x1fB\xf7\xa7\xd0\xfe%4\u007fcx\xf6\x0f\xa0\xfeE\xaa\xe8?X\x9ag6[\xa2\xff\x81\xb9n\x9b\xcdq\xd2\x0eT;\x80z'\xe0\x06\x00v `\xe6\x9d\xdd\u0588\xe7\x9b\xedO\xa5\xe7\xe7D\xeb\x05\x00Z\x90\xb3|!6y\xb20`\x16\xe1,Z\x94k\xba\x18G\xa9^\x1cȖ\x00Ԓ\x00-\x05\xb8\xa5\x01\xbb\f`\x96\xe5a\xd9r\\\xd5\xf2\x1c)Z\x81\r\xadȆh%\xac\xa1W\xe6,Y\x85kuU\xae\xf5ո\xbaչ\xda5\xb8\x9a5\xfd\xa5\xad\xb8X˟\x96\xbf\x97Z{\xf6\x00P\xaf\x13\x04\xad+\x9d|=\t\xf2d\xfd \xcc\x06҉6\x14\xa6\x1bI#\xd5\x1b\a\x91m\x12\x84\xda4\b\xda,\b\xb7y\x10v\x8b ̖2M\xb6\x95Pm-\rE\xdbH@\xdbJ@\xb4]\u0601\xde^:\xc9\x0e\xc2\xea\x8e\xc2\xfaNB\xb7\xb3\xd0\xee\"4\xbb\xfa#\xb7\xe2\xddpd\xbd;B\xad\xf7\x10Ҟ\x88\xf3\xbd`\xf3do\xa1\x19\x848\xda\aH\xf7E\x9a\xea\xc1\xc2l\x88P\r\x15\xd20\xa1\xdbOh\xf7\x17\x9a\x030<;\x10P\a!Ut0,\r\x87%:D\x96ԇ\"N\x0e\x03\xaa\x87\x03\xf5\x11\x80\x1b\t\xd8#\x00s\xa4\u007f\xca\x15G\xf9S\x15\xfah\x9f\xf8\xfbv\f@\xc7r\x96W\xd8\xe4\x89\x02L\x95\xb3(\xe2\x9a\xc6\x1c\xa5z\x14\x90i@\x19\x80j\x80K\x00[\aL\xcaò\x8c\xab\xca9RT\xb0!ˆh4\xd6\xd0\r\xce\x12\xe2Zu\\\xebM\xaen\fW\xdb\xc5Ք\xbevUZ~@WE\x8f\xf5g\xe6o\x95\x8e\x13\xd2\xf1\x88\xf3\x13`\xf3\xe4D\xa19\tqt2\x90\x9e\x824է\n\xb3ӄ\xeat!\x9d!tg\n\xedYBs6\x86g\xe7\x00\xea\\\xa4\x8a\u0383\xa5\xf3a\x89.\x90%\xf5\x85\x88\x93\x8b\x80\xea\xc5@\xfd\x12\xc0]\n\xd8\xcb\x00s9\x10_\x81\x81\xb1\xbe\xd2?=\xf1\xcd\xd1UA\xd0\xd5\xd2ɯ\x91 O\xae\r\xc2\\'\x9d\xe8zaz\x834R}c\x10\xd9MA\xa8qAPw\x10\xae'\b\xdb\x1b\x84\xe9\x93i\xb2\x9b\x85\xea\x16i(\xbaU\x02\xbaM\x02\xa2\xdb\xc3\x0e\xf4\x1d\xd2I\xee\x14V\xc7\v\xeb\x13\x84n\xa2\xd0N\x12\x9a\xc9|\x0f\xe3)|\xbbc=Շ\xfc\xed\xd04!MG\x9cπ͓\x99B3\vq4\x1bH\xe7 M\xf5\\av\x97P\xdd-\xa4{\x84\xee^\xa1\xbdOh\xee\xc7\xf0\xec\x01@=\x88T\xd1C\xb0\xf40,\xd1#\xb2\xa4~\x14q\xf2\x18P}\x1c\xa8?\x01\xb8'\x01\xfb\x14`\x9e\xe67\x85\xe2\x19~A\x15\xfaY~\t\xfa\x97\xd1sBz\x1eq\xfe\x02l\x9e\xbc(4/!\x8e^\x06\xd2W\x90\xa6\xfaUa\xf6\x9aP\xbd.\xa47\x84\xeeM\xa1}Kh\xde\xc6\xf0\xec\x1d@\xbd\x8bT\xd1{\xb0\xf4>,\xd1\a\xb2\xa4\xfe\x10q\xf2\x11P\xfd\x18\xa8\u007f\x02\xb8O\x01\xfb\x19`>\xf7o\n\xcd/\xfc\xa9\x9a\xfaK\x9f\xf8OP_\x01\xf45g\xf97l\xf2\xe4[\xc0|\xc7Y\xf4=\xd7\xf4\a\x8eR\xfd#\x90\xfd\x04\xa8\x9f\x01\xfa\x05p\xbf\x02\xf67\xc0\xfc\xceò?\xb8\xaa?9R\xf4\x17\x1b\xfa\x9b\r\xd1?XC\xff\xcbY\xf2\x1f\xd7\xea\t\xf2d\xfe \xcc\x02҉\x16\x14\xa6\vI#\xd5\v\a\x91-\x12\x84Z4\bZ,\b\xb7x\x10v\x89 ̒2M\xb6\x94P--\rE\xcbH@\xcbJ@\xb4\\\u0601^^:\xc9\n\xc2\xea\x8a\xc2\xfaJB\xb7\xb2Ю\"4\xab\xfa#wū\xe1\xc8zu\x84Z\xaf!\xa45\x11\xe7k\xc1\xe6\xc9\xdaB\xb3\x0e\xe2h] ]\x0fi\xaa\xd7\x17f\x1b\bՆB\xdaH\xe86\x16\xdaM\x84fS\f\xcf6\x03\xd4\xe6H\x15m\x01K[\xc2\x12m%K\xea\xad\x11'\xdb\x00\xd5m\x81\xfav\x80\xdb\x1e\xb0;\x00fG>Pm'65\xbd3\x0f\xf7\x1f\xf0v\x11Ү\x88\xf3\xdd`\xf3dw\xa1\xd9\x03q\xb4'\x90\xee\x854\xd5{\v\xb3AB\xb5\x8f\x90\xf6\x15\xba\xc1B;Dh\x86bx6\fP\xfb!U\xb4?,\x1d\x00Kt\xa0,\xa9\x0fB\x9c\x1c\fT\x87\x03\xf5C\x00w(`\x0f\x03\xcc\xe1\xfe@\xad\xe6\boZM=\xd2\x0f\xe7o]\x8e\x10ґ\x88\xf3\xa3`\xf3\xe4h\xa19\x06qt,\x90V\x90\xa6Z\t\xb3\xaaPEB\x8a\x85n\x94\xd0j\xa11\x18\x9e\xd5\x00\x95 UT\x87\xa5\x14\x96(\x93%u\x8e8)\x80\xaa\x05\xea\xa3\x01\xd7\x00,\x01\xc6\xf9\x03\xc5ͦ7qS\x8f\xf1\xc3\xf9\x9b\x95.!\x95\x88\xf3\x16l\x9e\x8c\x15\x9a\xe3\x10G\xc7\x03\xe9\tHS}\xa20;I\xa8N\x16\xd2)Bw\xaaО&4\xa7cxv\x06\xa0\xceD\xaa\xe8,X:\x1b\x96\xe8\x1cYR\x9f\x8b89\x0f\xa8\x9e\x0f\xd4/\x00܅\x80\xbd\b0\x17\xf3\x1d\xaa]§\xab\xe9K\xf9\xf1\xf0O\xb9˄t9\xe2\xfc\n\xd8<\xb9Rh\xaeB\x1c]\r\xa4\xd7 M\xf5\xb5\xc2\xec:\xa1\xba^H7\bݍB{\x93Ќ\xc3\xf0\xac\x1bP=H\x15\xf5\xc2R\x1f,\xd1Ͳ\xa4\xbe\x05qr+P\xbd\r\xa8\xdf\x0e\xb8;\x00{'`\xc6\xcfik\xd4&\xf8S\xd5\xf4D\x9f\xf0_\x1a\x03h2g\xf9\x146y2\x150\xd38\x8b\xa6sMgp\x94\xea\x99@6\vP\xb3\x01\x9a\x03\xb8\xb9\x80\xbd\v0w\xf3\xb0\xec\x1e\xae\xea^\x8e\x14\xdddž\xeegC\xf4\x00\xd6\xd0\x0fr\x96<ĵ\xfa0\xd7\xfa#\\ݣ\\\xedc\\\xcd\xe3sڲ\xca\x13sڳ\x8a~rN\x87\xaf\xfa)\x80\x9e\xe6,\u007f\x86M\x9e<\v\x98\xe78\x8b\x9e皾\xc0Q\xaa_\x04\xb2\x97\x00\xf52@\xaf\x00\xeeU\xc0\xbe\x06\x98\xd7yX\xf6\x06W\xf5&G\x8a\xdebCo\xb3!z\ak\xe8w9K\xde\xe3Z}\x9fk\xfd\x03\xae\xeeC\xae\xf6#\xae\xe6c\xae\xf1'< ֟\xce\xe9d\xe8τ\xf49\xe2\xfc\v\xd8<\xf9Rh\xbeB\x1c}\r\xa4\xdf M\xf5\xb7\xc2\xec;\xa1\xfa^H?\bݏB\xfb\x93\xd0\xfc\x8c\xe1\xd9/\x80\xfa\x15\xa9\xa2\xdf`\xe9wX\xa2?dI\xfd'\xe2\xe4/\xa0\xfa7P\xff\ap\xff\x02\xf6?\xc0\xcc3\xb7=kU\xfe7\xb7\xc3W\xdd6\xb7\x93\xa1ۅԁ8\xef\x84͓\x01B3\x10q4/\x90·4\xd5\xf3\v\xb3\x05\x84jA!-$t\v\v\xed\"B\xb3(\x86g\x8b\x01jq\xa4\x8a\x96\x80\xa5%a\x89\x96\x92%\xf5҈\x93e\x80\xea\xb2@}9\xc0-\x0f\xd8\x15\x00\xb3\"\x10\xaf\x84\x81\xb1^y\xee\x00P\xaf\x12\x04\xad*\x9d|5\t\xf2d\xf5 \xcc\x1a҉\xd6\x14\xa6kI#\xd5k\a\x91\xad\x13\x84Z7\bZ/\b\xb7~\x10v\x83 ̆2M\xb6\x91Pm,\rE\x9bH@\x9bJ@\xb4Y\u0601\xde\\:\xc9\x16\xc2\xea\x96\xc2\xfaVB\xb7\xb5\xd0n#4\xdb\xfa\xbb\x17\x17\xdb\xf9#\xfb\xdfs\xb6\xf7!\xff\u07b3\x83\x90vD\x9c\xef\x04\x9b';\v\xcd.\x88\xa3]\x81t7\xa4\xa9\xde]\x98\xed!T{\ni/\xa1\xdb[h\a\t\xcd>\x18\x9e\xed\v\xa8\xc1H\x15\r\x81\xa5\xa1\xb0D\xc3dI\xbd\x1f\xe2d\u007f\xa0z\x00P?\x10p\a\x01\xf6`\xc0\f\x9fۖŇ\xf0\xa9\xf4\xa1\x9ch}\x18@\x87s\x96\x8f`\x93'#\x01s\x04gё\\ӣ8J\xf5\xd1@v\f\xa0\x8e\x05\xa8\x028\x05\xd8*`\"\x1e\x96\xc5\\\xd5(\x8e\x14i6d\xd8\x10հ\x86N8K\xea\\\xab)\xd7z\xc6\xd5\xe5\\m\xc1\xd5X~\xca\xc5\xc5h\xbe)\xfc\xaf\x8a\xf1\xdd\xc4?+\x16\x049\xe9\xe4M\t\xf2dL\x10\xa6K:Q)L[\xd2H\xf5\xd8 \xb2\xe3\x82P\xc7\aA'\x04\xe1N\f\u009e\x14\x849Y\xa6\xc9N\x11\xaaS\xa5\xa1\xe84\t\xe8t\t\x88\xce\b;\xd0gJ'9KX=[X?G\xe8\xce\x15\xda\xf3\x84\xe6|~È/\xc0\x91\xf5\x85\b\xb5\xbeHH\x17#\xce/\x81͓K\x85\xe62\xc4\xd1\xe5@z\x05\xd2T_)̮\x12\xaa\xab\x85t\x8d\xd0]+\xb4\xd7\t\xcd\xf5\x18\x9e\xdd\x00\xa8\x1b\x91*\xba\t\x96\xc6\xc1\x12u˒\xba\aq\xd2\vT\xfb\x80\xfà\xbb\x05\xb0\xb7\x02\xe66\xff\x94+n\xf7\xa7*\xf4\x1d>\xe1\u007f\x85\f\xa0\xf1\x9c\xe5\x13\xd8\xe4\xc9D\xc0L\xe2,\x9a\xcc5\x9d\xc2Q\xaa\xa7\x02\xd94@M\ah\x06\xe0f\x02v\x16`f\xf3\xb0l\x0eW5\x97#Ew\xb1\xa1\xbb\xd9\x10݃5\xf4\xbd\x9c%\xf7q\xad\xdeϵ\xfe\x00W\xf7 W\xfb\x10W\xf3\xb0\xaf]\x95G\xfc\x80\xae\x8a~ԟ\x99\xbf\byLH\x8f#Ο\x80͓'\x85\xe6)\xc4\xd1\xd3@\xfa\f\xd2T?+̞\x13\xaa\xe7\x85\xf4\x82н(\xb4/\t\xcd\xcb\x18\x9e\xbd\x02\xa8W\x91*z\r\x96^\x87%zC\x96\xd4o\"N\xde\x02\xaao\x03\xf5w\x00\xf7.`\xdf\x03\xcc\xfb@\xfc\x01\x06\xc6\xfaC\xff\xf4\xc4\x17!\x1f\x05A\x1fK'\xffD\x82<\xf94\b\xf3\x99t\xa2υ\xe9\x17\xd2H\xf5\x97Ad_\x05\xa1\xbe\x0e\x82\xbe\t\xc2}\x1b\x84\xfd.\b\xf3\xbdL\x93\xfd T?JC\xd1O\x12\xd0\xcf\x12\x10\xfd\x12v\xa0\u007f\x95N\xf2\x9b\xb0\xfa\xbb\xb0\xfe\x87\xd0\xfd)\xb4\u007f\t\xcd\xdf|\x0f\xffO\xd3YGWn3Q\xbc\x9b\xa52333333Sd\xbfJ\x91m\xc5\xed(MSfffffZ\xe82\xef\xb6\xfd\xca\xcc\xcc\xcc\xed\xe7\xb9W\xef\x9f\xf9\xdd\xf9\xcdʲ\x1f%\xcf\xe7\xecI\xeb\x1f}\xba[\xf6\xdfFꍐ\xffH\x99n\x88\xea\xd0o\x88\xb6\xc1w\x90\xae?t>\x00(\a\u0096v\x10Y\r&\xcd\xf4\xa4\xcc@\xc6\x19\xc9z&\xd2͌\xe5\xd5,\x80\x99\x15\xd6\xc8lhev\xb4\"spK;'\xb4\x9f\v\xc8\xe6\x06\x8ay\x808/P\xcf\a\xb8\xf9\x874\x1f\n\xdd\v4M_\xb7]\xb0Y\xae7B\x16\"ea\xe8\xb0\b\xda\xe0\x17%\xddb\xd0\xf9\xe2@\xb9\x04li\x97$\xab\xa5H\xb34)ːqY\xb2^\x8et\xcbcy\xb5\x02`V\x845\xb2\x12ZY\x19\xad\xc8*\xdcҮ\n\xedW\x03\xb2Ձb\r \xae\t\xd4k\x01n\xed!\x1dU\xcf:\xcdU\xf5\xd8u\x1b\xd3|\xe1Y\x0f\x90\xf5Յ\r\xb4\t~C\xc0m\xa4.\xdfXk\xb9\x89\xaa\xd2n\nT\x9b\x01fs@\xb6\x00\xe2\x96@\xbd\x15\xe0\xb6\xd6e\xd56ZͶ\xaa\x8cl\xa7\x8dl\xaf\x8d\xc8\x0e\xd8\xc3\xee\xa8\xce\xef\xa45\xdbYk\xb1\x8bָ\xab\xd6z7\xadn\xf7\xe6\x9f\xf6\xb6\xba\xf7h\xaeV\xef{\xec9d\x10h\xf7JA\xf6\xe6$\xecC\x11\xfc\xbe)\xb8\xfd8\xc9\xf7'\xcb\x038(\xed\x81)T\a\xa5`\x0eNA\x0eI!\x1e\x9aB}X\n\xeep\x1e\xa6\xea$\x8d\xe1\xc0HF!9\x85H+\x9d\x81=\x82\x13o\xc9̑E\x17\x19=Y\x17\xa4+\x9bK\xeemU\xb8d\x1b \xad\xed&\xa5\x86\x0eG\xa2\r\xfe(\xd2\tt\x1e\x81\xb2\a\xb6\xb4G\x93U/i\x8e!\xa5\x8f\x8cǒ\xf5q\xa4;\x1e˫\x13\x00s\"\xac\x91\x93\xd0\xca\xc9hEN\xe1\x96\xf6Th\u007f\x1a\x90\x9d\x0e\x14g\x00\xf1L\xa0>\vpg\xeb\x05u\x9d\xa3M\x97=W\x977\xdf\xe3\xce#\xe5|\xe8p\x01\xda\xe0/$\xddE\xd0\xf9\xc5@y\tli/%\xab\xcbHs9)W\x90\xf1J\xb2\xbe\x8atWcyu\r`\xae\x855r\x1dZ\xb9\x1e\xad\xc8\r\xdc\xd2\xde\b\xedo\x02\xb2\x9b\x81\xe2\x16 \xde\nԷ\x01\xeev\xfdP\xe8\xb9C\xdfP=\xf6N}\v6o\xa3\xbbH\xb9\x1b:܃6\xf8{Iw\x1ft~?P>\x00[\xda\a\xc9\xea!\xd2\x82\xce?\x06\xcaO`K\xfb)Y}F\x9a\xcfI\xf9\x82\x8c_\x92\xf5W\xa4\xfb\x1a˫o\x00\xf3-\xac\x91\xef\xd0\xca\xf7hE~\xe0\x96\xf6Gh\xff\x13\x90\xfd\f\x14\xbf\x00\xf1W\xa0\xfe\rp\xbf7\x1f\xdb]\u007f4W\xd5e\xffl\x8c\xfe\xa71@\xfeV\x17\xfe\xd1&\xf8\u007f\x01\xf7\x9f\xba|\xba\xa1M-\xfb\rmTi;\x80\xaa?`\x06\x002\x10\x88\x83\x80z0\xe0\xa6\xd7e\xd5\fZ͌\xaa\x8c̤\x8d̬\x8d\xc8,\x8a`gU\xe7gӚͮ\xb5\x98Ck\x9cSk=\x97V7\xf7\xd0\x0e\xd39\xcf\xd0\xfe\xa6\xd3\xce;t@S\xed|\x80̯.,\xa0M\xf0\v\x02n!u\xf9\xc2Z\xcbET\x95vQ\xa0Z\f0\x8b\x03\xb2\x04\x10\x97\x04\xea\xa5\x00\xb7\xb4.\xab\x96\xd1j\x96Ued9mdymDV\xc0\x1evEu~%\xad\xd9\xcaZ\x8bU\xb4\xc6U\xb5֫iu\xabkm\xad\xa1\vZv͡\x03\x15v-Rֆ\x0e\xeb\xa0\r~]ҭ\a\x9d\xaf\x0f\x94\x1b\xc0\x96vC\xb2ڈ4\x1b\x93\xb2\t\x197%\xeb\xcdH\xb79\x96W[\x00fKX#[\xa1\x95\xadъl\xc3-\xed\xb6\xd0~; \xdb\x1e(v\x00\xe2\x8e@\xbd\x13\xe0vn.\xa8\xafs\x97\xa6\xe9봻6\xcb\xf5F\xc8n\xa4\xec\x0e\x1d\xf6@\x1b\xfc\x9e\xa4\xdb\v:\xdf\x1b(\xf7\x81-\xed\xbed\xb5\x1fi\xf6'\xe5\x002\x1eH\xd6\a\x91\xee`,\xaf\x0e\x01̡\xb0F\x0eC+\x87\xa3\x15\xe9\xe4\x96\xd6@\xfb\f\xc8r\xa0h\x01\xf1\b\xa0\xb6\x80s@\xab\v\v[\xd6\x0f\x1d\x04\xda\"\x05)9\t\x15E\xf0!\x05\xd7\xcdI^\x93\xe5\x91\x1c\x94\xf6\xa8\x14*I\xc1\xc4\x14\xa4'\x85xt\nuo\n\xee\x18\x1e\xa6\xea#ͱ\x1c\x189\x8eB\x8e\xa7\x109!\x9d\x81=\x91\x13\u007f\x12\x99\x9dL\x16\xa7\x90\xf1T\xb2>\x8dt\xa77\xcf^\xab\xfb\x8c撛\xdfs\xcel\xa4\xfe\xdes\x16)gC\x87s\xd0\x06\u007f.\xe9\u0383\xce\xcf\a\xca\v`K{!Y]D\x9a\x8bI\xb9\x84\x8c\x97\x92\xf5e\xa4\xbb\x1c˫+\x00s%\xac\x91\xab\xd0\xca\xd5hE\xae\xe1\x96\xf6Zh\u007f\x1d\x90]\x0f\x147\x00\xf1F\xa0\xbe\tp77\x1f\n\xad[\xf4\xaa\xec\xadj\xac\xbd\r\x90\xdbՅ;\xb4\t\xfeN\xc0ݥ.\xbf[ky\x8f\xaa\xd2\xde\vT\xf7\x01\xe6~@\x1e\x00\xe2\x83@\xfd\x10\xe0\x1e\xd6e\xd5#Zͣ\xaa\x8c<\xa6\x8d<\xae\x8d\xc8\x13\xd8\xc3>\xa9\xce?\xa55{Zk\xf1\x8c\xd6\xf8\xac\xd6z\x88V7T_r\xad\xeea\xfa\xa4\xe8\xdf\xf8\xd2g\x13\u007f\xe3+\x05\x19\xc1I\x18I\x11\xfc\xa8\x14\xdchN\xf21d9\x96\x83ҎK\xa1\x1a\x9f\x82\x99\x90\x82LL!NJ\xa1\x9e\x9c\x82\x9b\xc2\xc3TSI3\x8d\x03#\xcfS\xc8\v\x14\"/\xa63\xb0\xff\xe3ĿDf/\x93\xc5+d|\x95\xac_#\xdd\xeb\xfa\x81\xd1z\x03\x97l߄\xb4\xf6-Rކ\x0e\xef\xa0\r\xfe]ҽ\a\x9d\xbf\x0f\x94\x1f\xc0\x96\xf6C\xb2\xfa\x884\x1f\x93\xf2\t\x19?%\xeb\xcfH\xf79\x96W_\x00\xe6KX#_\xa1\x95\xafъ|\xc3-\xed\xb7\xd0\xfe; \xfb\x1e(~\x00\xe2\x8f@\xfd\x13\xe0~n^rݿ4W\xd5m\u007fm\x8c\xfei/@~W\x17\xfe\xd0&\xf8?\x01\xf7\x97\xba\xfco\xad\xe5?\xaaJ\xfb/P\xfd\a\x98\xe9\x86)\xa4\x1f\x10;\x80\xba?\xe0\x06\fk\x96U\x03\xb5\x9aA\xaa\x8c\f\xd6F\xa6\xd7Fd\x06E\xb03\xaa\xf33i\xcdf\xd6Z̢5Ϊ\xb5\x9eM\xab\x9b\xbd\xa9\xbd\x9ds4\vz;\xed\x9c\xc3\x06*\xec\\\xa4\xcc\r\x1d\xe6A\x1b\xfc\xbc\xa4\x9b\x0f:\x9f\x1f(\x17\x80-\xed\x82d\xb5\x10i\x16&e\x112.J\u058b\x91nq,\xaf\x96\x00̒\xb0F\x96B+K\xa3\x15Y\x86[\xdae\xa1\xfdr@\xb6\x02(G\u0096v\x14Y\x8d&\xcd\x18Rƒq\x1cY\x8f'\xdd\x04,\xaf&\x02f\x12\xac\x91\xc9he\nZ\x91\xa9\xdc\xd2N\x83\xf6\xcf\x03\xd9\v@\xf1\"\x10\xff\a\xd4/\x01\xeee\xbd\xa0\xaeW\xb4鲯\xea\xf2\xe6{\xdck\xa4\xbc\x0e\x1d\xde@\x1b\xfc\x9b\xa4{\v:\u007f\x1b(߁-\xed\xbbd\xf5\x1ei\xde'\xe5\x032~H\xd6\x1f\x91\xeec,\xaf>\x01̧\xb0F>C+\x9f\xa3\x15\xf9\x82[\xda/\xa1\xfdW@\xf65P|\x03\xc4o\x81\xfa;\xc0}\xaf\x1f\n=?\xe8\x1b\xaa\xc7\xfe\xa8o\xc1\xe6m\xf4\x13)?C\x87_\xd0\x06\xff+\xe9~\x83\xce\u007f\a\xca?`K\xfb'Y\xfdE\x9a\xbfI\xf9\x87\x8c\xff\x92\xf5\u007f\xa4\x9bn\xb8.\xaf\xfa\x01\xa6c\xb8Z#\xfd\xd1\xca\x00\xb4\"\x03\xc1`\aA\xfb\xc1@6=P\xcc\x00\xc4\x19\x81z&\xc0\xcd<\xbc\xf9m\xafg\x96\xa6i\xf5\xd8Y\x9b\xe5z#d6Rf\x87\x0es\xa0\r~N\xd2\xcd\x05\x9d\xcf\r\x94\xf3\xc0\x96v^\xb2\x9a\x8f4\xf3\x93\xb2\x00\x19\x17$\xeb\x85H\xb70\x96W\x8b\x00fQX#\x8b\xa1\x95\xc5ъ,\xc1-\xed\x92\xd0~) [\x1a(\x96\x01\xe2\xb2@\xbd\x1c\xe0\x96o.\xa8\xafk\x05\xbd\xba.\xbb\xa2>\x1e\xcdKn%RV\x86\x0e\xab\xa0\r~Uҭ\x06\x9d\xaf\x0e\x94k\xc0\x96vM\xb2Z\x8b4k\x93\xb2\x0e\x19\xd7%\xeb\xf5H\xb7>\x96W\x1b\x00fCX#\x1b\xa1\x95\x8dъl\xc2-\xed\xa6\xd0~3 \xdb\x1c(\xb6\x00\xe2\x96@\xbd\x15\xe0\xb6\x1e\xdea\xba\xb6i\xae\xaa\xcbn\xdb\x18\xfd\xdfA\x80l\xaf.\xec\xa0M\xf0;\x02n'u\xf9\xceZ\xcb]T\x95vW\xa0\xda\r0\xbb\x03\xb2\a\x10\xf7\x04\xea\xbd\x00\xb7\xb7.\xab\xf6\xd1j\xf6Ued?md\u007fmD\x0e\xc0\x1e\xf6@u\xfe \xad\xd9\xc1Z\x8bC\xb4\xc6C\xb5ևiu\x877\xd5tv6\vL\xa75\xcd5뽐\x8c\x94\x1c:\xb4\xd0\x06\u007f\x04\xe9,t\ue032\v\xb6\xb4\x9e\xac\nҔ\xa4Td\fd\xddM\xba\x1a˫#\x01s\x14\xac\x11A+\x11\xadH\x0f\xb7\xb4GC\xfb^ ;\x06(\xfa\x80x,P\x1f\a\xb8\xe3\x81\xd6\tXز'\x0e\x1f\x04ړR\x90\x939\t\xa7P\x04\u007fj\n\xee4N\xf2\xd3\xc9\xf2\f\x0eJ{f\n\xd5Y)\x98\xb3S\x90sR\x88\xe7\xa6P\x9f\x97\x82;\x9f\x87\xa9. ͅ\x1c\x18\xb9\x88B.\xa6\x10\xb9$\x9d\x81\xbd\x94\x13\u007f\x19\x99]N\x16W\x90\xf1J\xb2\xbe\x8atW\xeb\xc5\xf6u^\xa3m_\xa7\xbdV\x8f\xa3\xf7P\xaeKA\xae\xe7$\xdc@\x11\xfc\x8d)\xb8\x9b8\xc9o&\xcb[8(\xed\xad)T\xb7\xa5`nOA\xeeH!ޙB}W\n\xeen\x1e\xa6\xba\x874\xf7r`\xe4>\n\xb9\x9fB\xe4\x81t\x06\xf6AN\xfcCd\xf60Y\x05\xf7\x82>\xeb\xad\xee\x17\xf5\xf1h~\xb3\xfa\x9fz\xfdU\xeb\xa5\x14\xe4eN\xc2+\x14\xc1\xbf\x9a\x82{\x8d\x93\xfcu\xb2|\x83\x83Ҿ\x99B\xf5V\n\xe6\xed\x14\xe4\x9d\x14\xe2\xbb)\xd4\xef\xa5\xe0\xde\xe7a\xaa\x0fH\xf3!\aF>\xa2\x90\x8f)D>Ig`?\xe5\xc4\u007fFf\x9f\x93\xc5\x17d\xfc\x92\xac\xbf\"\xdd\xd7\xfa\x01\xd5\xfa\x06\x97l\xbf\x85\xb4\xf6;R\xbe\x87\x0e?\xa0\r\xfeG\xd2\xfd\x04\x9d\xff\f\x94\xbf\xc0\x96\xf6W\xb2\xfa\x8d4\xbf\x93\xf2\a\x19\xff$\xeb\xbfH\xf77\x96W\xff\x00\xe6_X#\xff\xa1\x95\xe9\x9e\xd3V\xa4\x1f\x18l\xc7s\xaa}\u007f \x1b\x00\x14\x03\x818\b\xa8\a\x03nz]\xd1\xd7\xea\x9e\xe1\xb9A\xa0\x9d\xf1\xb9\xc1\fv\xa6v\x92\x99\xd30̒T\U00033d93\x9b-\r\xf3\xd9S(\xe7H\xb3\xd2\xce\xd9N\xd5\\\xedd\xe6n'\x99\xa7\x9d\xe2\xbc\xedT\xcf\xd7Nn\xfet\xb8j\x81\x14̂ifd\xa1\xa4d\xe1\xa4D\x16i\x9f\x90]4\r\xfdb)d\x8b\xa7P,\x91B\\2\x85z\xa9\x14\xdc\xd2\xfax\xf4\xb5\x96\xe1\xe3a\x97\xa5\xb7v\xb9\x14dyN\xc2\n\x14\xc1\xaf\x98\x82[\x89\x93|e\xb2\\\x85\x83Ү\x9aB\xb5Z\nf\xf5\x14d\x8d\x14\xe2\x9a)\xd4k\xa5\xe0\xd6\xe6a\xaauH\xb3.\aF֣\x90\xf5)D6Hg`7\xe4\xc4oDf\x1b\x93\xc5&dܔ\xac7#\xdd\xe6\xcf5/\xe3\xee-\xf4\x92\xbb\xed\x96*\xf5\x8fc\x91\xb25t\xd8\x06m\xf0ےn;\xe8|{\xa0\xdc\x01\xb6\xb4;\x92\xd5N\xa4ٙ\x94]ȸ+Y\xefF\xbaݱ\xbc\xda\x030{\xc2\x1a\xd9\v\xad\xec\x8dVd\x1fni\xf7\x85\xf6\xfb\x01\xd9\xfe@q\x00\x10\x0f\x04\xea\x83\x00w\xb0\xa2\xb7\xf3\x10]\xd8\xdbi\x0f\xd5\aF\xef\x03\x1d\x96\x82\x1c\xceI\xe8\xa4\bޤ\xe02N\xf2\x9c,[\x1c\x94\xf6\x88\x14*\x9b\x82q)HW\nѧP\x17)\xb8\x92\x87\xa9*\xd2\x04\x0e\x8ctSHM!rd:\x03{\x14'^\xc8,\x92E\x0f\x19\x8f&\xeb^\xd2\x1dC\xb6\xfax\x80\x96=V_\xfb\xb8Gt\\;\xc9\xf1i\x18NH*\xf8\x13\xdbɝ\x94\x86\xf9\xc9)\x94\xa7\xa4YiOm\xa7\xea\xb4v2\xa7\xb7\x93\x9c\xd1N\xf1\xccv\xaa\xcfj'wv:\\uN\n\xe6\xdc43r^Rr~R\"\x17\xb4O\xc8^\x98\x86\xfe\xa2\x14\xb2\x8bS(.I!^\x9aB}Y\n\xeer<\xf9\xad+\xf0ri\xd9+\xd5\xeb\xfd\xa3\xabR\x90\xab9\t\xd7P\x04\u007fm\n\xee:N\xf2\xeb\xc9\xf2\x06\x0eJ{c\n\xd5M)\x98\x9bS\x90[R\x88\xb7\xa6Pߖ\x82\xbb\x9d\x87\xa9\xee ͝\x1c\x18\xb9\x8bB\xee\xa6\x10\xb9'\x9d\x81\xbd\x97\x13\u007f\x1f\x99\xddO\x16\x0f\x90\xf1A\xb2~\x88t\x0f\xe3\x03\xaa\xfb\x11\xbc\x85\xbb\xed\xa3x\xef7o\xdb\xc7R\x90\xc79\tOP\x04\xffd\n\xee)N\xf2\xa7\xc9\xf2\x19\x0eJ\xfbl\nՐ\x14\xcc\xd0\x14dX\nqx\n\xf5s)\xb8\x11\x01\xe2\xa7@\xfd\x19\xe0>\xc7{\xb6\xd5\xfd\x05^\xbb\xcd\x0f\xd5/\xf1\xdaן\xb3_\xb5\x93|\x9d\x86ᛤ\x82\xff\xb6\x9d\xdcwi\x98\u007f\x9fB\xf9C\x9a\x95\xf6\xc7v\xaa~j'\xf3s;\xc9/\xed\x14\u007fm\xa7\xfa\xb7vr\xbf\xa7\xc3U\u007f\xa4`\xfeL3#\u007f%%\u007f'%\xf2O\xfb\x84\xec\xbfi\xe8\xffK!\x9bn\x04C\xd1/\x85ؑB\xdd?\x057`\x84~R\xb7\x06\x8e\xc0\xe3a\a\xd1[;8\x05\x99\x9e\x930\x03E\xf03\xa6\xe0f\xe2$\x9f\x99,gᠴ\xb3\xa6P͖\x82\x99=\x05\x99#\x858g\n\xf5\\)\xb8\xb9y\x98j\x1e\xd2\xccˁ\x91\xf9(d~\n\x91\x05\xd2\x19\xd8\x059\xf1\v\x91\xd9\xc2d\xb1\b\x19\x17%\xeb\xc5H\xb78.\xb6k\t\xb4]vI\x1c\xa7\xf9*\xbeT\n\xb24'a\x19\x8a\xe0\x97M\xc1-\xc7I\xbe\xd7f)\xc8朄-(\x82\xdf2\x05\xb7\x15'\xf9\xd6d\xb9\r\a\xa5\xdd6\x85j\xbb\x14\xcc\xf6)\xc8\x0e)\xc4\x1dS\xa8wJ\xc1\xed\xcc\xc3T\xbb\x90fW\x0e\x8c\xecF!\xbbS\x88\xec\x91\xce\xc0\xeeɉߋ\xcc\xf6&\x8b}ȸ/Y\xefG\xba\xfd\xf5b[=\ah\xdb\xea\xb1\a\xeaq\xf4\x1e\xd8A)\xc8\xc1\x9c\x84C(\x82?4\x05w\x18'\xf9\xe1d\xd9\xc9AiM\nU\x96\x82\xc9S\x90V\n\xf1\x88\x14j\x9b\x82s\xfa\xa4\xe8_\x15\xd3g\x13\u007fV,\x05ٟ\x93p\x00E\xf0\a\xa6\xe0\x0e\xe2$?\x98,\x0fᠴ\x87\xa6P\x1d\x96\x829<\x05\xe9L!\x9a\x14\xea,\x05\x97\xf30U\x8b4Gp`\xc4R\x88\xa3\x10\xe9Jg`='\xbe \xb3\x92,*2\x06\xb2\xee&]\xdd\\r_\xebH\\\xb2=\n\xd2Z!%B\x87\x1e\xb4\xc1\x1fM\xba^\xe8\xfc\x18\xa0\xec\x83-\xed\xb1du\x1ci\x8e'\xe5\x042\x9eH\xd6'\x91\xeed,\xafN\x01̩\xb0FNC+\xa7\xa3\x159\x83[\xda3\xa1\xfdY@v6P\x9c\x03\xc4s\x81\xfa<\xc0\x9d\u07fc\xe4\xba/h\xae\xaa\xdb^\xd8\x18\xfd+d\x80\\\xac.\\\xa2M\xf0\x97\x02\xee2u\xf9\xe5Z\xcb+T\x95\xf6J\xa0\xba\n0W\x03r\r\x10\xaf\x05\xea\xeb\x00w\xbd.\xabn\xd0jnTe\xe4&m\xe4fmDn\xc1\x1e\xf6Vu\xfe6\xad\xd9\xedZ\x8b;\xb4\xc6;\xb5\xd6wiuw7\xb5\xb7\xf3\x9efAo\xa7\xbd\xb7\xb9f\xbd\xabt\x1f)\xf7C\x87\a\xd0\x06\xff \xe9\x1e\x82\xce\x1f\x06\xcaG`K\xfb(Y=F\x9a\xc7Iy\x82\x8cO\x92\xf5S\xa4{\x1a˫g\x00\xf3,\xac\x91!he(Z\x91a\xdc\xd2\x0e\x87\xf6\xcf\x01\xd9\b\xa0\x18\t\xc4Q@=\x1apc\x80\xd6X,l\xd9q\xcd\xcb\x13w\x8eƧ \x138\t\x13)\x82\x9f\x94\x82\x9b\xccI>\x85,\xa7rP\xdai)Tϧ`^HA^L!\xfe/\x85\xfa\xa5\x14\xdc\xcb'a\x03\x8a\xe07L\xc1m\xc4I\xbe1Yn\xc2Ai7M\xa1\xda,\x05\xb3y\n\xb2E\nq\xcb\x14\xea\xadRp[\xf30\xd56\xa4ٖ\x03#\xdbQ\xc8\xf6\x14\";\xa43\xb0;r\xe2w\"\xb3\x9d\xc9b\x172\xeeJֻ\x91n\xf7\xe6\x92{[{\xe0\x92힐\xd6\xeeE\xca\xde\xd0a\x1f\xb4\xc1\xefK\xba\xfd\xa0\xf3\xfd\x81\xf2\x00\xd8\xd2\x1eHV\a\x91\xe6`R\x0e!\xe3\xa1d}\x18\xe9\x0e\xc7\xf2\xaa\x130\x06\xd6H\x86Vr\xb4\"-ni\x8f\x80\xf6\x16\xc8\x1cPt\x01\xd1\x03u\x01\xb8R/\xa8\xabҦ\xcb\x06]\xde|\xc1\xeb&\xa5\x86\x0eG\xa2\r\xfe(\xd2\tt\x1e\x81\xb2\a\xb6\xb4G\x93U/i\x8e!\xa5\x8f\x8cǒ\xf5q\xa4;\x1e˫\x13\x00s\"\xac\x91\x93\xd0\xca\xc9hEN\xe1\x96\xf6Th\u007f\x1a\x90\x9d\x0e\x14g\x00\xf1L\xa0>\vpg7\x17\xd4\xd7s\x8e\xbe\xa1z\xec\xb9\xfa\x16l\xdeF\xe7\x91r>t\xb8\x00m\xf0\x17\x92\xee\"\xe8\xfcb\xa0\xbc\x04\xb6\xb4\x97\x92\xd5e\xa4\xb9\x9c\x94+\xc8x%Y_E\xba\xab\xb1\xbc\xba\x060\xd7\xc2\x1a\xb9\x0e\xad\\\x8fV\xe4\x06nio\x84\xf67\x01\xd9\xcd@q\v\x10o\x05\xea\xdb\x00w{sA\xad\x9e;\x9a\xa6\xd5c\xefl\x96띕\xbbH\xb9\x1b:܃6\xf8{Iw\x1ft~?P>\x00[\xda\a\xc9\xea!\xd2\xb6\xbb\xdei\xae\xaa˾\xdb\x18\xfdOc\x80\xbc\xaf.|\xa0M\xf0\x1f\x02\xee#u\xf9\xc7Z\xcbOT\x95\xf6S\xa0\xfa\f0\x9f\x03\xf2\x05\x10\xbf\x04\xea\xaf\x00\xf7\xb5.\xab\xbe\xd1j\xbeUe\xe4;m\xe4{mD~\xc0\x1e\xf6Gu\xfe'\xad\xd9\xcfZ\x8b_\xb4\xc6_\xb5ֿiu\xbf7U:\xffh\x16H\xa7\xfd\xb3\xb9f\xbd\x17\xf2\x17)\u007fC\x87\u007f\xd0\x06\xff/\xe9\xfe\x83Χ\x1b\xad(\xfb\x8dV[\xda\x0e\xb2\xeaO\x9a\x01\xa4\f$\xe3 \xb2\x1eL\xba鱼\x9a\x0103\xc2\x1a\x99\t\xaďVd\x160\xd8Y\xa1\xfdl@6;P\xcc\x01\xc49\x81z.\xc0\xcd\r\xb4\xe6\xc1\u0096\x9dw\xf4 \xd0Η\x82\xcc\xcfIX\x80\"\xf8\x05Sp\vq\x92/L\x96\x8bpP\xdaES\xa8\x16K\xc1,\x9e\x82,\x91B\\2\x85z\xa9\x14\xdc\xd2Yn\xc0Ai7L\xa1\xda(\x05\xb3q\n\xb2I\nq\xd3\x14\xea\xcdRp\x9b\xf30\xd5\x16\xa4ْ\x03#[Q\xc8\xd6\x14\"ۤ3\xb0\xdbr\xe2\xb7#\xb3\xed\xc9b\a2\xeeH\xd6;\x91ng\xb2\xb5\v\x0fв\xbb\x8e\x1e\xcc`wk'\xd9=\r\xc3\x1eI\x05\xbfg;\xb9\xbd\xd20\xdf;\x85r\x9f4+\xed\xbe\xedT\xed\xd7Nf\xffv\x92\x03\xda)\x1e\xd8N\xf5A\xed\xe4\x0eN\x87\xab\x0eI\xc1\x1c\x9afF\x0eKJ\x0eO\xaay\xe2\xda'dM\x1a\xfa,\x85,O\xa1h\xa5\x10\x8fH\xa1\xb6)8\xa7\xcfz\xab\xbbK\x1f\x8f\xe67+\xaf^\u007f\xd5*R\x90\x92\x93PQ\x04\x1fRpݜ\xe45Y\x1e\xc9Ai\x8fJ\xa1\x92\x14LLAzR\x88G\xa7P\xf7\xa6\xe0\x8e\xe1a\xaa>\xd2\x1cˁ\x91\xe3(\xe4x\n\x91\x13\xd2\x19\xd8\x139\xf1'\x91\xd9\xc9dq\n\x19O%\xeb\xd3Hw\xfa\xe8\xe6\x03\xaau\x06.ٞ\ti\xedY\xa4\x9c\r\x1d\xceA\x1b\xfc\xb9\xa4;\x0f:?\x1f(/\x80-\xed\x85du\x11i.&\xe5\x122^J֗\x91\xeer,\xaf\xae\x00̕\xb0F\xaeB+W\xa3\x15\xb9\x86[\xdak\xa1\xfdu@v=P\xdc\x00\xc4\x1b\x81\xfa&\xc0\u074c\x97q\xab\xfb\x16<\x9d\xfa\xd7\xc8\xf0r\xc0\x9f#k'\xb9=\r\xc3\x1dI\x05\u007fg;\xb9\xbb\xd20\xbf;\x85\xf2\x9e4+\xed\xbd\xedT\xdd\xd7N\xe6\xfev\x92\a\xda)>\xd8N\xf5C\xed\xe4\x1eN\x87\xab\x1eI\xc1<\x9afF\x1eKJ\x1eOJ\xe4\x89\xf6\t\xd9'\xd3\xd0?\x95B\xf6t\n\xc53)\xc4gS\xa8\x87\xa4\xe0\x86\xe2ë5\x8c\x8f\x87\x1dNo\xeds)\xc8\bN\xc2H\x8a\xe0G\xa5\xe0Fs\x92\x8f!˱\x1c\x94v\\\n\xd5\xf8\x14̄\x14db\nqR\n\xf5\xe4\x14\xdc\x14\x1e\xa6\x9aJ\x9ai\x1c\x18y\x9eB^\xa0\x10y1\x9d\x81\xfd\x1f'\xfe%2{\x99,^!\xe3\xabd\xfd\x1a\xe9^חq\xf7\x1bz\xc9\xdd\xf6M\x95\xfa\xd7\xcbHy\x1b:\xbc\x836\xf8wI\xf7\x1et\xfe>P~\x00[\xda\x0f\xc9\xea#\xd2|L\xca'd\xfc\x94\xac?#\xdd\xe7X^}\x01\x98/a\x8d|\x85V\xbeF+\xf2\r\xb7\xb4\xdfB\xfb\xef\x80\xec{\xa0\xf8\x01\x88?\x02\xf5O\x80\xfbY\xd1\xdb\xf9\x8b.\xec\xed\xb4\xbf\xea\x03\xa3\xf7\x81~KA~\xe7$\xfcA\x11\xfc\x9f)\xb8\xbf8\xc9\xff&\xcb\u007f8(\xed\xbf)T\xff\xa5`\xa6\x1b\xc3 \xfdR\x88\x1d)\xd4\xfdSp\x03\xc6\xe00\xd5@\xd2\f\xe2\xc0\xc8`\n\x99\x9eBd\x06\x86`g\xe4\xc4\xcfDf3\x93\xc5,d\x9c\x95\xacg#\xdd\xecdk\x0e\x1e\xa0e\xe7\x1c3\x98\xc1\xce\xd5N2w\x1a\x86y\x92\n~\xdevr\xf3\xa5a>\u007f\n\xe5\x02iV\xda\x05۩Z\xa8\x9d\xcc\xc2\xed$\x8b\xb4S\\\xb4\x9d\xea\xc5\xda\xc9-\x9e\x0eW-\x91\x82Y2͌,\x95\x94,\x9d\x94\xc82\xed\x13\xb2˦\xa1_.\x85l\xf9\x14\x8a\x15R\x88+\xa6P\xaf\x94\x82[y\x8c>\xf9\xadU\xf4\xf1\xe8n\xd9U\xd5\xeb\xfd\xa3\xd5R\x90\xd59\tkP\x04\xbff\nn-N\xf2\xb5\xc9r\x1d\x0eJ\xbbn\n\xd5z)\x98\xf5S\x90\rR\x88\x1b\xa6Po\x94\x82ۘ\x87\xa96!ͦ\x1c\x18ٌB6\xa7\x10\xd9\"\x9d\x81ݒ\x13\xbf\x15\x99mM\x16ېq[\xb2ގt\xdb\xeb\xc5\xf6u\xef\xa0m_\xb7\xddQ\x8f\xa3\xf7\x96vJAv\xe6$\xecB\x11\xfc\xae)\xb8\xdd8\xc9w'\xcb=8(\xed\x9e)T{\xa5`\xf6NA\xf6I!\xee\x9bB\xbd_\nn\u007f\x1e\xa6:\x804\ar`\xe4 \n9\x98B\xe4\x90t\x06\xf6PN\xfcadv8Yt\x92ѐuF\xba|L\xf3\x01\xd5\xd3\xd2K\xee\xb1G\xa8l\xbe_ZR\x1ct\xe8B\x1b\xbc']\x01\x9d\x97@Y\xc1\x966\x90U7ijR\x8e$\xe3Qd-\xa4\x8bX^\xf5\x00\xe6hX#\xbdh\xe5\x18\xb4\xcd\x19rK{,\xb4?\x0eȎ\a\x8a\x13\x80x\"P\x9f\x04\xb8\x93\xf1\x9emu\x9f\x82\xd7n\xf3C\xf5T\xbc\xf6\xf5\xe7\xeci\xed$\xa7\xa7a8#\xa9\xe0\xcfl'wV\x1a\xe6g\xa7P\x9e\x93f\xa5=\xb7\x9d\xaa\xf3\xdaɜ\xdfNrA;\xc5\v۩\xbe\xa8\x9d\xdc\xc5\xe9p\xd5%)\x98K\xd3\xcc\xc8eI\xc9\xe5I\x89\\\xd1>!{e\x1a\xfa\xabRȮN\xa1\xb8&\x85xm\n\xf5u)\xb8\xeb\xf5\xf1\xe8m\xdd\xc0\xc7\xc3\xdeHo\xedM)\xc8͜\x84[(\x82\xbf5\x05w\x1b'\xf9\xeddy\a\a\xa5\xbd3\x85\xea\xae\x14\xcc\xdd)\xc8=)\xc4{S\xa8\xefK\xc1\xdd\xcf\xc3T\x0f\x90\xe6A\x0e\x8cʉ\u007f\x8c\xcc\x1e'\x8b'\xc8\xf8$Y?E\xba\xa7q\xb1]Ϡ\xed\xb2\xcf\xe28\xcdW\xf1!)\xc8PN\xc20\x8a\xe0\x87\xa7\xe0\x9e\xe3$\x1fA\x96#9(\xed\xa8\x14\xaa\xd1)\x981)\xc8\xd8\x14\xe2\xb8\x14\xea\xf1)\xb8\t\xe6a\xaaOH\xf3)\aF>\xa3\x90\xcf)D\xbeHg`\xbf\xe4\xc4\u007fEf_\x93\xc57d\xfc\x96\xac\xbf#\xdd\xf7z\xb1\xad\x9e\x1f\xb4m\xf5\xd8\x1f\xf58z\x0f\xec\xa7\x14\xe4gN\xc2/\x14\xc1\xff\x9a\x82\xfb\x8d\x93\xfcw\xb2\xfc\x83\x83\xd2\xfe\x99B\xf5W\n\xe6\xef\x14\xe4\x9f\x14\xe2\xbf)\xd4\xff\xa5\xe0\xa6\x1b\x8b\xc3T\xfdH\xd31\x16\x03#\xfd)d\x00\x85\xc8@\x86`\aq\xe2\a\x93\xd9\xf4d1\x03\x19g$\xeb\x99H7\xf3X}f\xbbfѶ\xaf\xcbΪ\xc7\xd1\xfbc\xb3\xa5 \xb3s\x12\xe6\xa0\b~\xce\x14\xdc\\\x9c\xe4s\x93\xe5<\x1c\x94v\xde\x14\xaa\xf9R0\xf3\xa7 \v\xa4\x10\x17L\xa1^(\x05\xb70\x0fS-B\x9aE90\xb2\x18\x85,N!\xb2D:\x03\xbb$'~)2[\x9a,\x96!\xe3\xb2d\xbd\x1c\xe9\x96\x1f\xdb\xfc\xe8\xe9ZA/\xb9ˮ\xa8R\xff\x9f!)+C\x87U\xd0\x06\xbf*\xe9V\x83\xceW\a\xca5`K\xbb&Y\xadE\x9a\xb5IY\x87\x8c\xeb\x92\xf5z\xa4[\x1f˫\r\x00\xb3!\xac\x91\x8d\xd0\xca\xc6hE6\xe1\x96vSh\xbf\x19\x90m\x0e\x14[\x00qK\xa0\xde\np[\x8f\xed\u05f9\xcd؎N\xbb\xed\xd8\xfeͯ\xc4\xdbi\x95\xed\x1b\x11vhb\xf0;ju;5\"߹)\xe5.M_\xda]\xb5V\xbbi5\xbbk\x95=\xb4\xc6=\xb5\xd6{iu{7\xff\xbcڧ)fߦ7\xb2_\x13e\xff&\x8a\x1c\xa0\a\xb5\a6\xc2\x1fԔ\xec\xe0\xa6\x14\x874%\x1eڔ\xfa\xb0\xa6\xb8Û\xd2\xeal\xfea˚\xb1\x03\xf4\xd7\xd7\f\x90\\]hi\x13\xfc\x11\x80\xb3\xear\xa7\xb5\xecRUZ\x0fT\x05`J@* \x06\xa0\xee\x06\\\xad˪#\xb5\x9a\xa3T\x19\x11m$j\xd3\xfc|\xc6\x1e\xf6hu\xbeWkv\x8c֢Ok\xad\xd9\xfdZ\x8b\a\xb4\xc6\a\xb5\xd6\x0fiu\x0f\x8f\xeb\xd7\xf3ȸ\x8e\x1e\xfb\xe8\xb8\xfeͯ\xf4\x8fi\x95\xc7\x1b\x11\x9ehb\xf0OjuO5\"\u007f\xba)\xe53M_\xdag\xb5VC\xb4\x9a\xa1Ze\x98\xd68\\k\xfd\x9cV7\xa2\xf9\xe7\xd5Ȧ\x98QModt\x13eL\x13\x9b_G\xf4\xa0v\\#\xfc\xf8\xa6d\x13\x9aRLlJ\x9cԔzrSܔ\xe65\xdd\xea\x9eڼ\x1e\x9a\x0f\xe6i\xcd+H?\xa7\x9f'\xe5\x05\xe8\xf0\"\xda\xe0\xffG\xba\x97\xa0\xf3\x97\x81\xf2\x15\xd8ҾJV\xaf\x91\xe6uR\xde \xe3\x9bd\xfd\x16\xe9\xde\xc6\xf2\xea\x1d\xc0\xbc\vk\xe4=\xb4\xf2>Z\x91\x0f\xb8\xa5\xfd\x10\xda\u007f\x04d\x1f\x03\xc5'@\xfc\x14\xa8?\x03\xdc\xe7\xcd'K\xeb\v\xbd*\xfb\xa5\x1ak\xbf\x02\xe4ku\xe1\x1bm\x82\xff\x16pߩ˿\xd7Z\xfe\xa0\xaa\xb4?\x02\xd5O\x80\xf9\x19\x90_\x80\xf8+P\xff\x06\xb8\xdfuY\xf5\x87V\xf3\xa7*#\u007fi#\u007fk#\xf2\x0f\xf6\xb0\xff\xaa\xf3\xffiͦ\x1b\xdfԢ\x9f\xd6ء\xb5\xee\xaf\xd5\r\x18\xdf\xd1\xdb5\xb0\x89]v\xd0\xf8\x01\xfau~0 ӫ\v3h\x13\xfc\x8c\x80\x9bI]>\xb3\xd6r\x16U\xa5\x9d\x15\xa8f\x03\xcc\xec\x80\xcc\x01\xc49\x81z.\xc0ͭ˪y\xb4\x9ayU\x19\x99O\x1b\x99_\x1b\x91\x05\xb0\x87]P\x9d_Hk\xb6\xb0\xd6b\x11\xadqQ\xad\xf5bZ\xdd\xe2\xe3;\xfaz\x96\x18\u07ff\xf9\x1e\xbe\xe4\xf8\x01\xfa\xb5|)@\x96V\x17\x96\xd1&\xf8e\x01\xb7\x9c\xba|y\xad\xe5\n\xaaJ\xbb\"P\xad\x04\x98\x95\x01Y\x05\x88\xab\x02\xf5j\x80[]\x97Ukh5k\xaa2\xb2\x966\xb2\xb66\"\xeb`\x0f\xbb\xae:\xbf\x9e\xd6l}\xad\xc5\x06Z\xe3\x86Z덴\xba\x8d\xc7w\xb4z6\x19\u07ff\xf9>\xbd\xe9\xf8\x01\xfa\xf5z3@6W\x17\xb6\xd0&\xf8-\x01\xb7\x95\xba|k\xad\xe56\xaaJ\xbb-Pm\a\x98\xed\x01\xd9\x01\x88;\x02\xf5N\x80\xdbY\x97U\xbbh5\xbb\xaa2\xb2\x9b6\xb2\xbb6\"{`\x0f\xbb\xa7:\xbf\x97\xd6lo\xad\xc5>Z\xe3\xbeZ\xeb\xfd\xb4\xba\xfd\x9bG\xba\xeb\x80\xe6\xfc\xbb\xec\x81ͥ6/\x8f\x83\x009X]8D\x9b\xe0\x0f\x05\xdca\xea\xf2õ\x96\x9d\xaaJk\x80*\x03L\x0eH\v\x88G\x00\xb5\x05\x9c\xd3eU\x97V\xe3U\x19)\xb4\x91R\x1b\x91\n{ؠ\xcewk\xcdj\xadőZ\xe3QZk\xd1\xea\xe2\xf8~]=\xe3;\xba\xec\xd1\xe3\xfb\xeb\u007f\x1b\xd2*\xc74\"\xf451\xf8c\xb5\xba\xe3\x1a\x91\x1fߔ\xf2\x84\xa6/\xed\x89Z\xab\x93\xb4\x9a\x93\xb5\xca)Z\xe3\xa9Z\xebӴ\xbaӛ\u007f^\x9d\xd1\x14sf\xd3\x1b9\xab\x89rv\x13E\xceу\xdas\x1b\xe1\xcfkJv~S\x8a\v\x9a\x12/lJ}QS\xdc\xc5\xe3;|\xe7%\xe3\xfb\xfbN{\xe9\xf8\x01M\xb5\x97\x01r\xb9\xbap\x856\xc1_\t\xb8\xab\xd4\xe5Wk-\xafQU\xdak\x81\xea:\xc0\\\x0f\xc8\r@\xbc\x11\xa8o\x02\xdcͺ\xac\xbaE\xab\xb9U\x95\x91۴\x91۵\x11\xb9\x03{\xd8;\xd5\xf9\xbb\xb4fwk-\xee\xd1\x1a\xef\xd5Zߧ\xd5ݯ\xb5\xf5\x80.h\xd9\a\xc7\x0fT؇Hy\x18:<\x826\xf8GI\xf7\x18t\xfe8P>\x01[\xda'\xc9\xea)\xd2\"\xe5c\xe8\xf0\t\xda\xe0?%\xddg\xd0\xf9\xe7@\xf9\x05li\xbf$\xab\xafH\xf35)ߐ\xf1[\xb2\xfe\x8et\xdfcy\xf5\x03`~\x845\xf2\x13Z\xf9\x19\xad\xc8/\xdc\xd2\xfe\n\xed\u007f\x03\xb2߁\xe2\x0f \xfe\t\xd4\u007f\x01\xee\xef\xe6C\xa1\xe7\x9f\xe6\xaaz쿍i\xbe\x9f\xfc\a\xc8t\x13\x1b\x17\xfaMl\x9a\xe0;\x00\xd7_]>@k9PUi\a\x01\xd5`\xc0L\x0f\xc8\f@\x9c\x11\xa8g\x02\xdc̺\xac\x9aE\xab\x99U\x95\x91ٴ\x91ٵ\x11\x99\x03{\xd89\xd5\xf9\xb9\xb4fsk-\xe6\xd1\x1a\xe7\xd5Zϧ\xd5\xcd\xdf\xfc\xd3\xe6\xbb\xf7\x02\x13\a*\xec\x82\x13\a\x81v\xa1\x14daN\xc2\"\x14\xc1/\x9a\x82[\x8c\x93|q\xb2\\\x82\x83\xd2.\x99B\xb5T\nf\xe9\x14d\x99\x14\xe2\xb2)\xd4˥\xe0\x96\xe7a\xaa\x15H\xb3\"\aFV\xa2\x90\x95)DVIg`W\xe5įFf\xab\x93\xc5\x1ad\\\x93\xac\xd7\"\xdd\xda\xcd%\xf7\xb6\xd6\xc1%\xdbu!\xad]\x8f\x94\xf5\xa1\xc3\x06h\x83ߐt\x1bA\xe7\x1b\x03\xe5&\xb0\xa5ݔ\xac6#\xcd\xe6\xa4lA\xc6-\xc9z+\xd2m\x8d\xe5\xd56\x80\xd9\x16\xd6\xc8vhe{\xb4\";pK\xbb#\xb4\xdf\t\xc8v\x06\x8a]\x80\xb8+P\xef\x06\xb8\xdd\xf5\x82\xba\xf6Ц\xcb\xee\xa9˛\xafk{\x91\xb27t\xd8\am\xf0\xfb\x92n?\xe8|\u007f\xa0<\x00\xb6\xb4\a\x92\xd5A\xa49\x98\x94C\xc8x(Y\x1fF\xbañ\xbc\xea\x04\x8c\x815\x92\xa1\x95\x1c\xadH\x8b[\xda#\xa0\xbd\x052\a\x14]@\xf4@]\x00\xael.\xa8\xaf\xa7j\x9a\xbe\x1e\x1b\x9a\xe5zo\xa2\x9b\x94\x1a:\x1c\x896\xf8\xa3H'\xd0y\x04\xca\x1e\xd8\xd2\x1eMV\xbd\xa49\x86\x94>2\x1eK\xd6Ǒ\xeex,\xafN\x00̉\xb0FNB+'\xa3\x159\x85[\xdaS\xa1\xfdi@v:P\x9c\x01\xc43\x81\xfa,\xc0\x9d\xdd\\P\xab眦i\xf5\xd8s\x9b\xe5z\xdf\xe2\x1e\xcdK\xee.R\xee\x86\x0e\xf7\xa0\r\xfe^\xd2\xdd\a\x9d\xdf\x0f\x94\x0f\xc0\x96\xf6A\xb2z\x884\x0f\x93\xf2\b\x19\x1f%\xeb\xc7H\xf78\x96WO\x00\xe6IX#O\xa1\x95\xa7ъ<\xc3-\xed\xb3\xd0~\b\x90\r\x05\x8aa@\x1c\x0e\xd4\xcf\x01n\xc4\xc4\x0e\xdf5\xb2\xb9\xaa.;\xaa1\xfa\x1f}\x00\x19\xa3.\x8c\xd5&\xf8q\x80\x1b\xaf.\x9f\xa0\xb5\x9c\xa8\xaa\xb4\x93\x80j2`\xa6\x002\x15\x88Ӏ\xfay\xc0\xbd\xa0˪\x17\xb5\x9a\xff\xa92\xf2\x926\xf2\xb26\"\xaf`\x0f\xfb\xaa:\xff\x9a\xd6\xecu\xad\xc5\x1bZ\xe3\x9bZ뷴\xba\xb7\x9b\xea;\xdfi\x16\xf8N\xfbns\xcdz/\xe4=Rއ\x0e\x1f\xa0\r\xfeC\xd2}\x04\x9d\u007f\f\x94\x9f\xc0\x96\xf6S\xb2\xfa\x8c4\x9f\x93\xf2\x05\x19\xbf$\xeb\xafH\xf75\x96W\xdf\x00\xe6[X#ߡ\x95\xefъ\xfc\xc0-\xed\x8f\xd0\xfe' \xfb\x19(~\x01\xe2\xaf@\xfd\x1b\xe0~\aZ\u007f`a\xcb\xfe\xd9|\xc4\xe3>\xc9_)\xc8ߜ\x84\u007f(\x82\xff7\x05\xf7\x1f'\xf9t\x93\xc0\xb2\xdf$\fJۑB\xd5?\x053 \x05\x19\x98B\x1c\x94B=8\x057=\x0fS\xcd@\x9a\x19902\x13\x85\xccL!2\vC\xb0\xb3r\xe2g#\xb3\xd9\xc9b\x0e2\xceI\xd6s\x91n\xeeI\xcd\xc5\xf6uΣm_\xa7\x9dW\x8f\xa3\xf7P\xe6KA\xe6\xe7$,@\x11\xfc\x82)\xb8\x858\xc9\x17&\xcbE8(\xed\xa2)T\x8b\xa5`\x16OA\x96H!.\x99B\xbdT\nni\x1e\xa6Z\x864\xcbr`d9\nY\x9eBd\x85t\x06vEN\xfcJd\xb62Y\xacB\xc6U\xc9z5ҭN\xb6\xd6\xe0\x01Zv\xcdI\x83\x19\xecZ\xed$k\xa7aX'\xa9\xe0\xd7m'\xb7^\x1a\xe6\xeb\xa7Pn\x90f\xa5ݰ\x9d\xaa\x8d\xda\xc9l\xdcN\xb2I;\xc5M۩ެ\x9d\xdc\xe6\xe9p\xd5\x16)\x98-\xd3\xcc\xc8VI\xc9\xd6I\x89l\xd3>!\xbbm\x1a\xfa\xedRȶO\xa1\xd8!\x85\xb8c\n\xf5N)\xb8\x9d\xf5You\uf88fG\xf3\x9bծ\xea\xf5W\xad\xddR\x90\xdd9\t{P\x04\xbfg\nn/N\xf2\xbd\xc9r\x1f\x0eJ\xbbo\n\xd5~)\x98\xfdS\x90\x03R\x88\a\xa6P\x1f\x94\x82;\x98\x87\xa9\x0e!͡\x1c\x189\x8cB\x0e\xa7\x10\xe9Lg`\r'>#\xb3\x9c,Zd<\x82\xac-\xe9ܤ\xe6\x03\xaaՅK\xb6\x1e\xd2ڂ\x94\x12:Th\x83\x0f\xa4\xeb\x86\xcek\xa0<\x12\xb6\xb4G\x91\x95\x90&\x92\xd2Cƣɺ\x97t\xc7`y\xd5\a\x98ca\x8d\x1c\x87V\x8eG+r\x02\xb7\xb4'B\xfb\x93\x80\xecd\xa08\x05\x88\xa7\x02\xf5i\x80;\x1d/\xe3V\xf7\x19x:\xf5oV\xe1倿Z\xd5Nrv\x1a\x86s\x92\n\xfe\xdcvr\xe7\xa5a~~\n\xe5\x05iV\xda\v۩\xba\xa8\x9d\xcc\xc5\xed$\x97\xb4S\xbc\xb4\x9d\xea\xcb\xda\xc9]\x9e\x0eW]\x91\x82\xb92͌\\\x95\x94\\\x9d\x94\xc85\xed\x13\xb2צ\xa1\xbf.\x85\xec\xfa\x14\x8a\x1bR\x887\xa6Pߔ\x82\xbb\x19\x1f^\xad[\xf8x\xd8[魽-\x05\xb9\x9d\x93p\aE\xf0w\xa6\xe0\xee\xe2$\xbf\x9b,\xefᠴ\xf7\xa6Pݗ\x82\xb9?\x05y \x85\xf8`\n\xf5C)\xb8\x87y\x98\xea\x11\xd2<ʁ\x91\xc7(\xe4q\n\x91'\xd2\x19\xd8'9\xf1O\x91\xd9\xd3d\xf1\f\x19\x9f%\xeb!\xa4\x1b\xaa/\xe3\xeeaz\xc9\xddv\xb8J\xfd\xe3X\xa4\x8c\x80\x0e#\xd1\x06?\x8at\xa3\xa1\xf31@9\x16\xb6\xb4\xe3\xc8jJ\xc1|\x9c\x82|\x92B\xfc4\x85\xfa\xb3\x14\xdc\xe7Y\x9f\xfc\xd6\x1c\x93\xf5\xe5Ҳs\xaa\xd7\xfbGs\xa5 ss\x12\xe6\xa1\b~\xde\x14\xdc|\x9c\xe4\xf3\x93\xe5\x02\x1c\x94v\xc1\x14\xaa\x85R0\v\xa7 \x8b\xa4\x10\x17M\xa1^,\x05\xb78\x0fS-A\x9a%90\xb2\x14\x85,M!\xb2L:\x03\xbb,'~92[\x9e,V \xe3\x8ad\xbd\x12\xe9V\u058b\xed\xeb^E۾n\xbb\xaa\x1eG\xef-\xad\x96\x82\xac\xceIX\x83\"\xf85Spkq\x92\xafM\x96\xebpP\xdauS\xa8\xd6K\xc1\xac\x9f\x82l\x90B\xdc0\x85z\xa3\x14\xdc\xc6\x1e\xf6TzkOKAN\xe7$\x9cA\x11\xfc\x99)\xb8\xb38\xc9\xcf&\xcbs8(\xed\xb9)T\xe7\xa5`\xceOA.H!^\x98B}Q\n\xeeb\x1e\xa6\xba\x844\x97r`\xe42\n\xb9\x9cB\xe4\x8at\x06\xf6JN\xfcUdv5Y\\C\xc6k\xc9\xfa:\xd2]\x8f\x8b\xed\xba\x01m\x97\xbd\x11\xc7i\xbe\x8aߔ\x82\xdc\xccI\xb8\x85\"\xf8[Sp\xb7q\x92\xdfN\x96wpP\xda;S\xa8\xeeJ\xc1ܝ\x82ܓB\xbc7\x85\xfa\xbe\x14\xdc\xfd7P\xce\x03[\xday\xc9j>\xd2\xccO\xca\x02d\\\x90\xac\x17\"\xdd\xc2X^-\x02\x98Ea\x8d,\x86V\x16G+\xb2\x04\xb7\xb4KB\xfb\xa5\x80li\xa0X\x06\x88\xcb\x02\xf5r\x80[~JGֹ\u0094\xfeY\xa7]qʀ\xa6ڕ\x00YY]XE\x9b\xe0W\x05\xdcj\xea\xf2յ\x96k\xa8*\xed\x9a@\xb5\x16`\xd6\x06d\x1d \xae\v\xd4\xeb\x01n}]Vm\xa0\xd5l\xa8\xca\xc8F\xda\xc8\xc6ڈl\x82=\xec\xa6\xea\xfcfZ\xb3͵\x16[h\x8d[j\xad\xb7\xd2\xea\xb6\xd6\xda\xdaF\x17\xb4\xec\xb6S\x06*\xecv\xa4l\x0f\x1dv@\x1b\xfc\x8e\xa4\xdb\t:\xdf\x19(w\x81-\xed\xaed\xb5\x1biv'e\x0f2\xeeI\xd6{\x91no,\xaf\xf6\x01̾\xb0F\xf6C+\xfb\xa3\x159\x80[\xda\x03\xa1\xfdA@v0P\x1c\x02\xc4C\x81\xfa0\xc0\x1d\xde\\P_gg\xd3\xf4uZ\xd3,\xd7;c\x19)9th\xa1\r\xfe\b\xd2Y\xe8\xdc\x01e\x17li=Y\x15\xa4)I\xa9\xc8\x18Ⱥ\x9bt5\x96WG\x02\xe6(X#\x82V\"Z\x91\x1eni\x8f\x86\xf6\xbd@v\fP\xf4\x01\xf1X\xa0>\x0ep\xc7\x03\xad\x13\xb0\xb0eO\x9c2\b\xb4'\xa5 's\x12N\xa1\b\xfe\xd4\x14\xdci\x9c䧓\xe5\x19\x1c\x94\xf6\xcc\x14\xaa\xb3R0g\xa7 \xe7\xa4\x10\xcfM\xa1>/\x05w>\x0fS]@\x9a\v90r\x11\x85\\L!rI:\x03{)'\xfe22\xbb\x9c,\xae \xe3\x95d}\x15\xe9\xaen\x9e\xbdV\xf75\xcd%7\xbf\xa7]\xdbH\xfd\xc5\xed:R\xae\x87\x0e7\xa0\r\xfeF\xd2\xdd\x04\x9d\xdf\f\x94\xb7\xc0\x96\xf6V\xb2\xba\x8d4\xb7\x93r\a\x19\xef$\xeb\xbbHw7\x96W\xf7\x00\xe6^X#\xf7\xa1\x95\xfbъ<\xc0-\xed\x83\xd0\xfe! {\x18(\x1e\x01\xe2\xa3@\xfd\x18\xe0\x1eo>\x14ZO\xe8U\xd9'\xd5X\xfb\x14 O\xab\v\xcfh\x13\xfc\xb3\x80\x1b\xa2.\x1f\xaa\xb5\x1c\xa6\xaa\xb4Á\xea9\xc0\x8c\x00d$\x10G\x01\xf5h\xc0\x8d\xd1e\xd5X\xadf\x9c*#㵑\tڈL\xc4\x1ev\x92:?Yk6Ek1Uk\x9c\xa6\xb5~^\xab{A_r\xad\xee\x17\xf5Iѿ\xf1\xa5\xcf&\xfe\xc6W\n\xf22'\xe1\x15\x8a\xe0_M\xc1\xbd\xc6I\xfe:Y\xbe\xc1Ai\xdfL\xa1z+\x05\xf3v\n\xf2N\n\xf1\xdd\x14\xea\xf7Rp\xef\xf30\xd5\a\xa4\xf9\x90\x03#\x1fQ\xc8\xc7\x14\"\x9f\xa43\xb0\x9fr\xe2?#\xb3\xcf\xc9\xe2\v2~I\xd6_\x91\xeek\xfd\xc0h}\x83K\xb6\xdfBZ\xfb\x1d)\xdfC\x87\x1f\xd0\x06\xff#\xe9~\x82\xce\u007f\x06\xca_`K\xfb+Y\xfdF\x9a\xdfI\xf9\x83\x8c\u007f\x92\xf5_\xa4\xfb\x1b˫\u007f\x00\xf3/\xac\x91\xff\xd0\xcatS\xb5\x15\xe9\a\x06\xdb1U\xb5\xef\x0fd\x03\x80b \x10\a\x01\xf5`\xc0M?\xb5#\xeb\x9eaj\xff\xac\xdb\xce\xd8\x18\xfd\xd3^\x80̬.̢M\xf0\xb3\x02n6u\xf9\xecZ\xcb9T\x95vN\xa0\x9a\v0s\x032\x0f\x10\xe7\x05\xea\xf9\x007\xbf.\xab\x16\xd0j\x16Ted!mdamD\x16\xc1\x1evQu~1\xad\xd9\xe2Z\x8b%\xb4\xc6%\xb5\xd6KiuK7\xb5\xb7s\x99fAo\xa7]\xb6\xb9f\xbd\xab\xb4\x1c)\xcbC\x87\x15\xd0\x06\xbf\"\xe9V\x82\xceW\x06\xcaU`K\xbb*Y\xadF\x9a\xd5IY\x83\x8ck\x92\xf5Z\xa4[\x1b˫u\x00\xb3.\xac\x91\xf5\xd0\xca\xfahE6\xe0\x96vCh\xbf\x11\x90m\f\x14\x9b\x00qS\xa0\xde\fp\x9b\x03\xad-\xb0\xb0e\xb7\x9c:\b\xb4[\xa5 [s\x12\xb6\xa1\b~\xdb\x14\xdcv\x9c\xe4ۓ\xe5\x0e\x1c\x94v\xc7\x14\xaa\x9dR0;\xa7 \xbb\xa4\x10wM\xa1\xde-\x05\xb7;\x0fS\xedA\x9a=90\xb2\x17\x85\xecM!\xb2O:\x03\xbb/'~?2۟,\x0e \xe3\x81d}\x10\xe9\x0e\xd6\xe7\xb0u\x88>\xdd-{h#\xf5\xee\xd0a\xa4\x1c\x0e\x1d:\xd1\x06oH\x97A\xe79P\xb6`K{\x04YY\xd28R\xba\xc8\xe8ɺ ]\x89\xe5U\x05\x98\x00k\xa4\x1b\xad\xd4hE\x8e\xe4\x96\xf6(h/@\x16\x81\xa2\a\x88G\x03u/\xe0\x8ei.\xa8\xaf\xbbO\xdfP\xdd\xf6X}\v6o\xa3\xe3H9\x1e:\x9c\x806\xf8\x13Iw\x12t~2P\x9e\x02[\xdaS\xc9\xea4ҜN\xca\x19d<\x93\xac\xcf\"\xdd\xd9X^\x9d\x03\x98sa\x8d\x9c\x87V\xceG+r\x01\xb7\xb4\x17B\xfb\x8b\x80\xecb\xa0\xb8\x04\x88\x97\x02\xf5e\x80\xbb\xbc\xf9P蹢\xb9\xaa\x1e{ec\x9aoPW\x01r\xb5\xbap\x8d6\xc1_\v\xb8\xeb\xd4\xe5\xd7k-oPU\xda\x1b\x81\xea&\xc0\xdc\f\xc8-@\xbc\x15\xa8o\x03\xdc\xed\xba\xac\xbaC\xab\xb9S\x95\x91\xbb\xb4\x91\xbb\xb5\x11\xb9\a{\xd8{\xd5\xf9\xfb\xb4f\xf7k-\x1e\xd0\x1a\x1f\xd4Z?\xa4\xd5=\xac\xef\xa1V\xf7#\xfa*k~\xec<\xaa/O\xfd9\xf4X\n\xf28'\xe1\t\x8a\xe0\x9fL\xc1=\xc5I\xfe4Y>\xc3Ai\x9fM\xa1\x1a\x92\x82\x19\x9a\x82\fK!\x0eO\xa1~.\x057\x82\x87\xa9F\x92f\x14\aFFS\xc8\x18\n\x91\xb1\xe9\f\xec8N\xfcx2\x9b@\x16\x13\xc98\x89\xac'\x93n\x8a~\x02\xb6\xa6\xe2\x92\xed4Hk\x9f'\xe5\x05\xe8\xf0\"\xda\xe0\xffG\xba\x97\xa0\xf3\x97\x81\xf2\x15\xd8ҾJV\xaf\x91\xe6uR\xde \xe3\x9bd\xfd\x16\xe9\xde\xc6\xf2\xea\x1d\xc0\xbc\vk\xe4=\xb4\xf2>Z\x91\x0f\xb8\xa5\xfd\x10\xda\u007f\x04d\x1f\x03\xc5'@\xfc\x14\xa8?\x03\xdc\xe7zA]_h\xd3e\xbf\xd4\xe5\xcd\x17\xbc\xafH\xf9\x1a:|\x836\xf8oI\xf7\x1dt\xfe=P\xfe\x00[\xda\x1f\xc9\xea'\xd2\xfcL\xca/d\xfc\x95\xac\u007f#\xdd\xefX^\xfd\x01\x98?a\x8d\xfc\x85V\xfeF+\xf2\x0f\xb7\xb4\xffB\xfb\xff\x80l\xbai\x8a\xa2\x1f\x10;\x80\xba?\xe0\x06Lk>\x14z\x066M_\x8f\x1d4m\xa0\xc2\x0e&ez\xe80\x03\xda\xe0g$\xddL\xd0\xf9\xcc@9\vlig%\xab\xd9H3;)s\x90qN\xb2\x9e\x8btscy5\x0f`\xe6\x8552\x1fZ\x99\x1f\xad\xc8\x02\xdc\xd2.\b\xed\x17\x02\xb2\x85\x81b\x11 .\nԋ\x01n\xf1\xe6\x82Z=K4M\xab\xc7.\xd9,\xd7;+K\x91\xb24tX\x06m\xf0˒n9\xe8|y\xa0\\\x01\xb6\xb4+\x92\xd5J\xa4Y\x99\x94Uȸ*Y\xafF\xbaձ\xbcZ\x030k\xc2\x1aY\v\xad\xac\x8dVd\x1dniׅ\xf6\xeb\x01\xd9\xfa@\xb1\x01\x107\x04\xea\x8d\x00\xb7\xb1>C]\x9b\xe8\xd5u\xd9M\xf5\xf1h^r\x9b\x91\xb29t\xd8\x02m\xf0[\x92n+\xe8|k\xa0\xdc\x06\xb6\xb4ے\xd5v\xa4ٞ\x94\x1dȸ#Y\xefD\xba\x9d\xb1\xbc\xda\x050\xbb\xc2\x1a\xd9\r\xad\xec\x8eVd\x0fni\xf7\x84\xf6{\x01\xd9\xde@\xb1\x0f\x10\xf7\x05\xea\xfd\x00\xb7\xff\xb4\x8e\xac\xeb\x80檺쁍\xd1\xff\xff\x05\xc8\xc1\xea\xc2!\xda\x04\u007f(\xe0\x0eS\x97\x1f\xae\xb5\xecTUZ\x03T\x19`r@Z@<\x02\xa8-\xe0\x9c.\xab\xba\xb4\x1a\xaf\xcaH\xa1\x8d\x94ڈT\xd8\xc3\x06u\xbe[kVk-\x8e\xd4\x1a\x8f\xd2Z\x8bV\x17\xa7u\x14\x9d=\xd3\xfa\x17\x9d\xf6\xe8i\x03\x9aj{\x019F]\xe8\xd3&\xf8c\x01w\x9c\xba\xfcx\xad\xe5\t\xaaJ{\"P\x9d\x04\x98\x93\x019\x05\x88\xa7\x02\xf5i\x80;]\x97Ugh5g\xaa2r\x966r\xb66\"\xe7`\x0f{\xae:\u007f\x9e\xd6\xec|\xad\xc5\x05Z\xe3\x85Z담\xba\x8b\xb5\xb6.\xd1\x05-{鴁\n{\x19)\x97C\x87+\xd0\x06\u007f%鮂ί\x06\xcak`K{-Y]G\x9a\xebI\xb9\x81\x8c7\x92\xf5M\xa4\xbb\x19˫[\x00s+\xac\x91\xdb\xd0\xca\xedhE\xee\xe0\x96\xf6Nh\u007f\x17\x90\xdd\r\x14\xf7\x00\xf1^\xa0\xbe\x0fp\xf77\x17\xd4\xd7\xf9@\xd3\xf4u\xda\a\x9b\xe5z#\xe4!R\x1e\x86\x0e\x8f\xa0\r\xfeQ\xd2=\x06\x9d?\x0e\x94O\xc0\x96\xf6I\xb2z\x8a4O\x93\xf2\f\x19\x9f%\xeb!\xa4\x1b\x8a\xe5\xd50\xc0\f\x875\xf2\x1cZ\x19\x81Vd$\xb7\xb4\xa3\xa0\xfdh \x1b\x03\x14c\x818\x0e\xa8\xc7\x03n\x02К\x88\x85-;i\xda \xd0NNA\xa6p\x12\xa6R\x04\xff\u007f\x96\xce:\xcem\xa3\tÕ\x0f\xca\xcc\xec6\xcc\r33'M\xdaP\xd3\xe4\xd6vv-K\xb2\x9a\x91s\xbd\xb6)\xf3Wfffff\fC\x1bfN\xcapw\xcd\xe9\xdbyG\u007f\xe4yf\xde\xf5j\xb5\x96\xec\xf3\xb9\xbf\xfen^R\x98\xf92\x92] \xf6\x16ʀ\xa7\x17%\x85\xbf8)Ԓ\xa4\xa0\xa5I\x11-K\x8apyR\x98\x9f\xe40\xfe\xcfb\xb5B\x06\x14\xad\x94\x80VI@\xb4:9\x03\xbdFFܵ\xe2\xcc:qa\xbd8\xda \x0e7\x8a\xcd&{\xf5r\xc5\xcdv\xcb\xf6s\xce\x16\x1b\xf2瞭bچ8؎6pw\x88\xcdN\xc4\xd9]\x90\xb7\x1b\xa9\xa7\xf7\x88\xfd_\xc4\xeaW1\xfd&\x8e~\x17\x87\u007f\x88͟\x98\xee\xff\x05\xa9\xbf\x91*\xfa\a-\xfd\x8b\x96\xa8V\x96\xd4u\x88\xddz(\xf3\x1fT\xd8\vE\rP\x18Cf\x9f\xf9\xa9BΙow\xa5S\xf3m\xa2u\x19D\xe5\x9c\x05\x15\xdc\x04n%d\xf6\xe5,\xbb\x1f\xd3۟#O\x1f\x00\xf9\aB\xea \x88\x0e\x86\xa2C\xa0\xf0P\xc8\x1c\xc6\xd3\xfcÙ\xea\b\x8e\x14\x1d\xc9\r\x1d\xc5\r\xd1\xd1XC\x1fÙ{,3s\x1c\xb3p<3:\x81\x19\x9e\xc84'ه\xd6\xe4\x8a'ϯ`\xe9S\xe6W\xc2\xfaԤ\xa0\xb4\x8c\x04\xa7I\x10\xb8\xa7'\x85i$#\xd9\xc6b\xaf\x89\fx\xbaiR\xf8͒B5O\nj\x91\x14Qˤ\b[%\x85i-\x87\xf1ۈU[\x19P\xd4N\x02:C\x02\xa2\xf6\xc9\x19\xe8\x0e2\xe2v\x14g:\x89\v\x9d\xc5Q\x17q\xd8Ul\xba\xd9-\xd7\xe4\xbac˺\aB\xad{\x8a\xa9\x17\xe2\xa07\xda\xc0\xed#6}\x11g\xfbA^\u007f\xa4\x9e\x1e \xf6\a\x8a\xd5 1\r\x16GC\xc4\xe1P\xb1\x19\x86\xe9\xfepH\x8d@\xaah$Z\x1a\x85\x96h\xb4,\xa9\xc7 v\xc7B\x99qPa<\x14\x9d\t\x85\x13 3\xd1\xderų쮊\xfal\x9b\xf0_\x8e\x82h2g\xc1\x14n\x02w*d\xa6q\x96=\x87\xe9M\xe7\xc8\xd3\xe7B\xfe\fḦ́\xa8\n\x8a\x14\x14f \x93\xe5i~\x8e\xa9fq\xa4HsC\x86\x1b\xa2<\xd6\xd0.gn\x81\x99\xf1\x98\x05\x9f\x19\x05̰\xc84\xa1eu\xd5yvBu\x95\x9em\xf7\xcc_\x84\x90\x98\"\xc4A\tm\xe0\xce\x11\x9bj\xc4\xd9\xf3!\xaf\x06\xa9\xa7/\x10\xfb\x17\x8a\xd5Eb\x9a+\x8e.\x16\x87\x97\x88ͥ\x98\xee_\x06\xa9ˑ*\xba\x02-]\x89\x96\xe8*YR_\x8dؽ\x06\xca\\\v\x15\xae\x83\xa2\xeb\xa1\xf0\u007f\x90\xb9\x01\xca݈\x899}\x93\xbd=\xf1E\xc8\xcdIA\xb7\xc8Hp\xab\x04\x81{[R\x98\xdbe${\x87ػS\x06<}WR\xf8w'\x85\xba')\xe8ޤ\x88\xeeK\x8a\xf0\xfe\xa40\x0f\xc8a\xfc\a\xc5\xea!\x19P\xf4\xb0\x04\xf4\x88\x04D\x8f&g\xa0\x1f\x93\x11\xf7qq\xe6\tq\xe1Iq\xf4\x948|Zl\x9e\xe1k\x98{\x96/wN?gC\xfe\"\xe4y1\xbd\x808x\x11m\xe0\xbe$6/#ξ\x02y\xaf\"\xf5\xf4kb\xffu\xb1zCLo\x8a\xa3\xb7\xc4\xe1\xdbb\xf3\x0e\xa6\xfb\xefB\xea=\xa4\x8a\xdeGK\x1f\xa0%\xfaP\x96\xd4\x1f!v?\x862\x9f@\x85O\xa1\xe83(\xfc\x1c2_\xf0\x9bB\xf1K~A\x15\xf5W\xfc\x12\xb4/\xa3\xaf\xc5\xf4\r\xe2\xe0[\xb4\x81\xfb\x9d\xd8|\x8f8\xfb\x03\xe4\xfd\x88\xd4\xd3\xf3\xc4\xfe|\xb1Z \xa6\x85\xe2h\x918\\,6K0\xdd_\n\xa9eH\x15-GK?\xa1%\xfaY\x96\xd4+\x10\xbb+\xa1\xcc*\xa8\xb0\x1a\x8a\xd6@\xe1ZȬ\xb3o\n\xa5\xf5vW%\xbd\xc1&\xf6\x17\x9e\x8d\x10m\xe2,\xd8\xccM\xe0n\x81\xccVβۘ\xdev\x8e<\xbd\x03\xf2wBj\x17D\xbb\xa1h\x0f\x14\xfe\x02\x99_y\x9a\xff\x1bS\xfdΑ\xa2?\xb8\xa1?\xb9!\xfa\vk\xe8\xbf9s\xffaf\xfee\x16j\x99Q\x1d3\xacg\x9a\xff\xf85\x94+\xee\xe5\xbb\xcc\xfe\xd8i\xe0ۓ\u007f\x0e\xc5IA\xfb,\xc0H\xe0,@\x10\xb8\xa9\xa40e2\x92-\x17{\x152\xe0\xe9ʤ\xf0\xf7M\n\xb5_R\xd0\xfeI\x11\x1d\x90\x14\xe1\x81Ia\x0e\x92\xc3\xf8\a\x8b\xd5!2\xa0\xe8P\t\xe80\t\x88\x0eO\xce@\x1f!#\xee\x91\xe2\xccQ\xe2\xc2\xd1\xe2\xe8\x18qx\xac\xd8\x1c\xb7\xc0\xbe\x03\xe6\x8e_\xc0[\xd6' \xd4\xfaD1\x9d\x8488\x19m\xe0\x9e\"6\xa7\"Φ!\xef4\xa4\x9e>]\xec7\x12\xab\xc6bj\"\x8e\x9a\x8a\xc3fb\xd3\x1c\xd3\xfd\x16\x90j\x89TQ+\xb4\xd4\x1a-Q\x1bYR\xb7E춃2g@\x85\xf6P\xd4\x01\n;B\xa6\x13o(ߙ\x9b\xbc\xee\xc2\xd3\xed\xefq]\xc5\xd4\rq\xd0\x1dm\xe0\xf6\x10\x9b\x9e\x88\xb3\xbd \xaf7RO\xf7\x11\xfb}Ū\x9f\x98\xfa\x8b\xa3\x01\xe2p\xa0\xd8\f\xc2t\u007f0\xa4\x86 U4\x14-\rCK4\\\x96\xd4#\x10\xbb#\xa1\xcc(\xa80\x1a\x8a\xc6@\xe1XȌ\xb3\x1b\xaa)\x8d\xb7MMI\x9fi\xa7\xf3\x17!\x13\xc44\x11qp\x16\xda\xc0=[l&!\xceN\x86\xbc)H==U\xecO\x13\xabs\xc44]\x1c\x9d+\x0eg\x88\xcdLL\xf7\xab \xa5\x90*ʠ\xa5,Z\xa2\x9c,\xa9g!v5\x941P!\x0fE.\x14\x16 \xe3\xd9\r\xe5J\xbemr%\x1d\xd8\xe9\xfcEHQL!\xe2\xe0<\xb4\x81;[l\bq6\x82\xbc\x12RO\xcf\x11\xfb\xd5bu\xbe\x98j\xc4\xd1\x05\xe2\xf0B\xb1\xb9\b\xd3\xfd\xb9\x90\xba\x18\xa9\xa2K\xd0ҥh\x89.\x93%\xf5\xe5\x88\xdd+\xa0̕P\xe1*(\xba\x1a\n\xaf\x81̵|\x85\xf2\xd7\xf1\xee\xf2\xfaz~>\xec-\xf7?1݀8\xb8\x11m\xe0\xde$67#\xce\xde\x02y\xb7\"\xf5\xf4mb\xffv\xb1\xbaCLw\x8a\xa3\xbb\xc4\xe1\xddbs\x0f\xa6\xfb\xf7B\xea>\xa4\x8a\xeeGK\x0f\xa0%zP\x96\xd4\x0f!v\x1f\x862\x8f@\x85G\xa1\xe81(|\x1c2O,H\x15\xf2O\xda]\xe5\xf5S6\xe1\xffi\f\xa2g8\v\x9e\xe5&p\x9f\x83\xcc\xf3\x9ce_`z/r\xe4\xe9\x97 \xffeH\xbd\x02ѫP\xf4\x1a\x14\xbe\x0e\x997x\x9a\xff&S\xbdő\xa2\xb7\xb9\xa1w\xb8!z\x17k\xe8\xf78s\xdfgf>`\x16>dF\x1f1Ï\x99\xe6\x93\x05\xa9\xa8\xea\xd3\x05eQ\x95\xfelA\xb9\xa5\xfe\x1c\xa2/8\v\xbe\xe4&p\xbf\x82\xccלe\xbfaz\xdfr\xe4\xe9\xef \xff{H\xfd\x00яP4\x0f\n\xe7Cf\x01O\xf3\x172\xd5\"\x8e\x14-憖pC\xb4\x14k\xe8e\x9c\xb9˙\x99\x9f\x98\x85\x9f\x99\xd1\nf\xb8\x92iV1s\xabyBN\xafYP\xc1\xd2kŴ\x0eq\xb0\x1em\xe0n\x10\x9b\x8d\x88\xb3\x9b o3ROo\x11\xfb[\xc5j\x9b\x98\xb6\x8b\xa3\x1d\xe2p\xa7\xd8\xec\xc2t\u007f7\xa4\xf6 U\xf4\vZ\xfa\x15-\xd1o\xb2\xa4\xfe\x1d\xb1\xfb\a\x94\xf9\x13*\xfc\x05E\u007fC\xe1?\x90\xf9\xd7n\xa8\xa6\xaa\xd665U\xba\xceN\xe7/B\xea\xc5\xf4\x1f\xe2`/\xda\xc0m\x10\x9b\x18qv\x9f\x85,\xcfYȩ\xa7Sb\xbfL\xac\xca\xc5T!\x8e*\xc5\xe1\xbeb\xb3\x1f\xa6\xfb\xfbC\xea\x00\xa4\x8a\x0eDK\a\xa1%:\x18\x0e\xf4!\x88\xddC\xa1\xccaP\xe1p(:\x02\n\x8f\x84\xccQP\xeehL\xcc\xe9c\x16V\xc2\xfaؤ\xa0\xe3d$8^\x82\xc0=!)̉2\x92=I\xec\x9d,\x03\x9e>%)\xfcS\x93B\xa5\x93\x82NK\x8a\xe8\xf4\xa4\b\x1b%\x85i,\x87\xf1\x9b\x88US\x19P\xd4L\x02j.\x01Q\x8b\xe4\ftK\x19q[\x893\xadŅ6⨭8l'6g,,\x8br\xc5\xf6v\xcb\xf6sN\a\x1b\xf2瞎b\xea\x848\xe8\x8c6p\xbb\x88MW\xc4\xd9n\x90\xd7\x1d\xa9\xa7{\x88\xfd\x9eb\xd5KL\xbd\xc5Q\x1fq\xd8Wl\xfaa\xba\xdf\x1fR\x03\x90*\x1a\x88\x96\x06\xa1%\x1a,K\xea!\x88ݡPf\x18T\x18\x0eE#\xa0p$dF-LE\xb9Ѽ+=\x86\x13\xad\xc7B4\x8e\xb3`<7\x81{&d&p\x96\x9d\xc8\xf4\xce\xe2\xc8\xd3gC\xfe$HM\x86h\n\x14M\x85\xc2i\x909\x87\xa7\xf9ә\xea\\\x8e\x14\xcd\xe0\x86frCT\x855\xb4\xe2\xcc\xcd03Yf!njf1C\xcd4\x86o\xb9\\1\xcf\x17\x85\xff.\x13_M\xfc]\xa6\xa4 OF\x02_\x82\xc0\r\x92\xc2\x14e$\x1b\x8a\xbd\xf3d\xc0ӳ\x93§\xa4PQRP))\xa29I\x11V'\x859_\x0e\xe3\u05c8\xd5\x052\xa0\xe8B\t\xe8\"\t\x88\xe6&g\xa0/\x96\x11\xf7\x12q\xe6Rq\xe12qt\xb98\xbcBl\xae\xb4[\xae\xc9]\x85-\xeb\xab\x11j}\x8d\x98\xaeE\x1c\\\x876p\xaf\x17\x9b\xff!\xce\xde\x00y7\"\xf5\xf4Mb\xfff\xb1\xbaEL\xb7\x8a\xa3\xdb\xc4\xe1\xedbs\a\xa6\xfbwB\xea.\xa4\x8a\xeeFK\xf7\xa0%\xbaW\x96\xd4\xf7!v\xef\x872\x0f@\x85\a\xa1\xe8!(|\x182\x8f\xd8[\xae\xf8\xa8\xddUQ?f\x13\xfesL\x10=\xc1Y\xf0$7\x81\xfb\x14d\x9e\xe6,\xfb\f\xd3{\x96#O?\a\xf9\xcfC\xea\x05\x88^\x84\xa2\x97\xa0\xf0eȼ\xc2\xd3\xfcW\x99\xea5\x8e\x14\xbd\xce\r\xbd\xc1\rћXC\xbfř\xfb63\xf3\x0e\xb3\xf0.3z\x8f\x19\xbe\xcf4\x1fXVW}h'TW\xe9\x8f\xec\x9e\xf9\x8b\x90\x8f\xc5\xf4\t\xe2\xe0S\xb4\x81\xfb\x99\xd8|\x8e8\xfb\x05\xe4}\x89\xd4\xd3_\x89\xfd\xaf\xc5\xea\x1b1}+\x8e\xbe\x13\x87ߋ\xcd\x0f\x98\xee\xff\b\xa9yH\x15\xcdGK\v\xd0\x12-\x94%\xf5\"\xc4\xeeb(\xb3\x04*,\x85\xa2eP\xb8\x1c2?A\xb9\x9f11\xa7W\xd8\xdb\x13_\x84\xacL\nZ%#\xc1j\t\x02wMR\x98\xb52\x92]'\xf6\xd6ˀ\xa77$\x85\xbf1)Ԧ\xa4\xa0\xcdI\x11mI\x8apkR\x98mr\x18\u007f\xbbX\xed\x90\x01E;%\xa0]\x12\x10\xedN\xce@\xef\x91\x11\xf7\x17q\xe6Wq\xe17q\xf4\xbb8\xfcCl\xfe\xe4k\x98\xfb\x8b/wN\xffmC\xfe\"\xe4\x1f1\xfd\x8b8\xa8E\x1b\xb8ubS\x8f8\xfb\x1f\xe4\xedE\xea\xe9\x06\xb1\x1f\x8b\xd5>\x8b`r\xc4QJ\x1c\x96\x89M\xf9\"\x9e\xeeW@\xaa\x12\xa9\xa2}\xd1\xd2~h\x89\xf6\x87\x03}\x00b\xf7@(s\x10T8\x18\x8a\x0e\x81\xc2C!s\xd8\"\xfb\xa6P<\xdc65E}\x84\x9d\xce_\x84\x1c)\xa6\xa3\x10\aG\xa3\r\xdcc\xc4\xe6X\xc4\xd9\xe3 \xefx\xa4\x9e>A\xec\x9f(V'\x89\xe9dqt\x8a83)\xfc\tI\xa1&&\x05\x9d\x95\x14\xd1\xd9I\x11NJ\n3Y\x0e\xe3O\x11\xab\xa92\xa0h\x9a\x04t\x8e\x04Dӓ3\xd0\xe7ʈ;C\x9c\x99).T\x89#%\x0e3b\x93\xb5[\xae\xce\xe5\xb0e=\v\xa1\xd6ZL\x06q\x90G\x1b\xb8\xae\xd8\x14\x10g=\xc8\xf3\x91z:\x10\xfbE\xb1\n\xc5t\x9e8\x9a-\x0eIl\"L\xf7K\x90\x9a\x83TQ5Z:\x1f-Q\x8d,\xa9/@\xec^\be.\x82\ns\xa1\xe8b(\xbc\x042\x97\xf2\x86\xf2\x97q\x93ח\xf3t\xfb{\xdc\x15b\xba\x12qp\x15\xda\xc0\xbdZl\xaeA\x9c\xbd\x16\xf2\xaeC\xea\xe9\xeb\xc5\xfe\xff\xc4\xea\x061\xdd(\x8en\x12\x877\x8b\xcd-\x98\xee\xdf\n\xa9ې*\xba\x1d-݁\x96\xe8NYR߅ؽ\x1b\xca\xdc\x03\x15\ue162\xfb\xa0\xf0~\xc8<\xc0o\n\xa5\a\xf9\x05U\xd2\x0f\xf1Kо\x8c\x1e\x16\xd3#\x88\x83G\xd1\x06\xeecb\xf38\xe2\xec\x13\x90\xf7$RO?%\xf6\x9f\x16\xabg\xc4\xf4\xac8zN\x1c>/6/`\xba\xff\"\xa4^B\xaa\xe8e\xb4\xf4\nZ\xa2WeI\xfd\x1ab\xf7u(\xf3\x06Tx\x13\x8aނ·!\xf3\x8e\xddP\xae\xf4\xaemr%\xfd\x9e\x9d\xce_\x84\xbc/\xa6\x0f\x10\a\x1f\xa2\r\u070f\xc4\xe6c\xc4\xd9O \xefS\xa4\x9e\xfeL\xec\u007f.V_\x88\xe9Kq\xf4\x958\xfcZl\xbe\xc1t\xff[H}\x87T\xd1\xf7h\xe9\a\xb4D?ʒz\x1ebw>\x94Y\x00\x15\x16B\xd1\"(\\\f\x99%|\x85\xf2Kywy\xbd\x8c\x9f\x0f{\xcb-\x17\xd3O\x88\x83\x9f\xd1\x06\xee\n\xb1Y\x898\xbb\n\xf2V#\xf5\xf4\x1a\xb1\xbfV\xac։i\xbd8\xda \x0e7\x8a\xcd&L\xf77Cj\vRE[\xd1\xd26\xb4D\xdbeI\xbd\x03\xb1\xbb\x13\xca\xec\x82\n\xbb\xa1h\x0f\x14\xfe\x02\x99_\xed\xdbv\xfe7\xbb\xab\xbc\xfe\xdd&\xfc\u007f\aA\xf4'g\xc1_\xdc\x04\xeeߐ\xf9\x87\xb3\xec\xbfL\xaf\x96#O\xd7A~=\xa4\xfe\x83h/\x145@a\f\x99}\x16\xdbi\xbe\xc3T\xa9\xc56RT\xc6\r\x95sCT\xc1\nt%g\xee\xbe\xcc\xcc~\xcc\xc2\xfe\xcc\xe8\x00fx \xd3\x1c\xb48\x15V\x1d\xbc\xb8,\xac҇,.\xb7ԇBt\x18g\xc1\xe1\xdc\x04\xee\x11\x909\x92\xb3\xecQL\xefh\x8e<}\f\xe4\x1f\v\xa9\xe3 :\x1e\x8aN\x80\xc2\x13!s\x12O\xf3Of\xaaS8Rt*7\x94\xe6\x86\xe84\xac\xa1O\xe7\xccm\xc4\xcc4f\x16\x9a0\xa3\xa6̰\x19\xd34g\xe6Z\xf0\x84\x9cn\xb9\xb8\x82\xa5[\x89\xa95\xe2\xa0\r\xda\xc0m+6\xed\x10gπ\xbc\xf6H=\xddA\xecw\x14\xabNb\xea,\x8e\xba\x88îb\xd3\r\xd3\xfd\xee\x90\xea\x81TQO\xb4\xd4\v-QoYR\xf7A\xec\xf6\x852\xfd\xa0B\u007f(\x1a\x00\x85\x03!3\xc8n\xa8\xa6j\xb0mj\xaa\xf4\x10;\x9d\xbf\b\x19*\xa6a\x88\x83\xe1h\x03w\x84،D\x9c\x1d\x05y\xa3\x91zz\x8c\xd8\x1f+V\xe3\xc44^\x1c\x9d)\x0e'\x88\xcdDL\xf7ς\xd4\xd9H\x15MBK\x93\xd1\x12M\x91%\xf5T\xc4\xee4(s\x0eT\x98\x0eE\xe7B\xe1\f\xc8̄rU\x98\x98\xd3jq%\xac3IAY\x19\tr\x12\x04\ueb240ZF\xb2F\xec\xe5e\xc0\xd3nR\xf8\x85\xa4P^R\x90\x9f\x14Q\x90\x14a1)L(\x87\xf1\xcf\x13\xab\xd92\xa0\x88$\xa0H\x02\xa2Rr\x06z\x8e\x8c\xb8\xd5\xe2\xcc\xf9\xe2B\x8d8\xba@\x1c^(6\x17٫\x97+ε[\xb6\x9fs.\xb6!\u007f\xee\xb9DL\x97\"\x0e.C\x1b\xb8\x97\x8b\xcd\x15\x88\xb3WB\xdeUH=}\xb5ؿF\xac\xae\x15\xd3u\xe2\xe8zq\xf8?\xb1\xb9\x01\xd3\xfd\x1b!u\x13RE7\xa3\xa5[\xd0\x12\xdd*K\xea\xdb\x10\xbb\xb7C\x99;\xa0\u009dPt\x17\x14\xde\r\x99{\xec\x9bB\xee^ޕ\xbe\x8f\x13\xad\xef\x87\xe8\x01\u0382\a\xb9\t܇ \xf30g\xd9G\x98ޣ\x1cy\xfa1\xc8\u007f\x1cRO@\xf4$\x14=\x05\x85OC\xe6\x19\x9e\xe6?\xcbT\xcfq\xa4\xe8yn\xe8\x05n\x88^\xc4\x1a\xfa%\xceܗ\x99\x99W\x98\x85W\x99\xd1k\xcc\xf0u\xa6y\x83o\xb9\\\xf1M\xbe(\xfc\xf7\x82\xf8j\xe2/\x06%\x05\xbd##\xc1\xbb\x12\x04\xee{Iaޗ\x91\xec\ab\xefC\x19\xf0\xf4GI\xe1\u007f\x9c\x14ꓤ\xa0O\x93\"\xfa,)\xc2ϓ\xc2|!\x87\xf1\xbf\x14\xab\xafd@\xd1\xd7\x12\xd07\x12\x10}\x9b\x9c\x81\xfeNF\xdc\xefř\x1fą\x1f\xc5\xd1\u2c2f\xd8\xf4\xe3k\x98\xebϗ;\xa7\aؐ\xbf\b\x19(\xa6A\x88\x83\xc1h\x03w\x88\xd8\fE\x9c\x1d\x06yÑzz\x84\xd8\x1f)V\xa3\xc44Z\x1c\x8d\x11\x87c\xc5f\x1c\xa6\xfb\xe3!u&RE\x13\xd0\xd2D\xb4Dgɒ\xfal\xc4\xee$(3\x19*L\x81\xa2\xa9P8\r2\xe7\xd8\r\xd5\x14\xa7ۦ\xa6\xa8ϵ\xd3\xf9\x8b\x90\x19b\x9a\x898\xa8B\x1b\xb8Jl2\x88\xb3Y\xc8\xcb!\xf5\xf4,\xb1\xaf\xc5ʈ)/\x8e\\qX\x10\x1b\x0f\xd3}\x1fR\x01REE\xb4\x14\xa2%:O\x96Գ\x11\xbb\x04e\"\xa8P\x82\xa29PX\r\x99\xf3\x97\xa4\xc2R\x8d\xddUI_`\x13\xfb\vυ\x10]\xc4Y0\x97\x9b\xc0\xbd\x182\x97p\x96\xbd\x94\xe9]Ƒ\xa7/\x87\xfc+ u%DWA\xd1\xd5Px\rd\xae\xe5i\xfeuLu=G\x8a\xfe\xc7\r\xdd\xc0\rэXC\xdfę{33s\v\xb3p+3\xba\x8d\x19\xde\xce4w\xf0k(W\xbc\x93\xef2\xfbc\xe7.\xbe=\xf9\xe7\xd0\xddIA\xf7\xc8Hp\xaf\x04\x81{_R\x98\xfbe$\xfb\x80\xd8{P\x06<\xfdPR\xf8\x0f'\x85z$)\xe8Ѥ\x88\x1eK\x8a\xf0\xf1\xa40O\xc8a\xfc'\xc5\xea)\x19P\xf4\xb4\x04\xf4\x8c\x04D\xcf&g\xa0\x9f\x93\x11\xf7yq\xe6\x05q\xe1Eq\xf4\x928|Yl^\xe1w\xc0ܫز~\r\xa1֯\x8b\xe9\r\xc4\xc1\x9bh\x03\xf7-\xb1y\x1bq\xf6\x1d\xc8{\x17\xa9\xa7\xdf\x13\xfb\xef\x8b\xd5\ab\xfaP\x1c}$\x0e?\x16\x9bO0\xdd\xff\x14R\x9f!U\xf49Z\xfa\x02-ї\xb2\xa4\xfe\n\xb1\xfb5\x94\xf9\x06*|\vE\xdfA\xe1\xf7\x90\xf9\x817\x94\xff\x91\x9b\xbc\x9e\xc7\xd3\xed\xefq\xf3Ŵ\x00q\xb0\x10m\xe0.\x12\x9bň\xb3K o)RO/\x13\xfb\xcb\xc5\xea'1\xfd,\x8eV\x88Õb\xb3\n\xd3\xfdՐZ\x83T\xd1Z\xb4\xb4\x0e-\xd1zYRo@\xecn\x842\x9b\xa0\xc2f(\xda\x02\x85[!\xb3\x8d\xdf\x14J\xdb\xf9\x05U\xd2;\xf8%h_F;Ŵ\vq\xb0\x1bm\xe0\xee\x11\x9b_\x10g\u007f\x85\xbcߐz\xfaw\xb1\xff\x87X\xfd)\xa6\xbf\xc4\xd1\xdf\xe2\xf0\x1f\xb1\xf9\x17\xd3\xfdZH\xd5!UT\x8f\x96\xfeCK\xb4W\x96\xd4\r\x88\xdd\x18\xca쳔Up\xa0(\x05\x85e\x90)_j?\xed\x95*l\x93+\xe9ʥ\x15,\xbd\xaf\x98\xf6C\x1c\xec\x8f6p\x0f\x10\x9b\x03\x11g\x0f\x82\xbc\x83\x91z\xfa\x10\xb1\u007f\xa8X\x1d&\xa6\xc3\xc5\xd1\x11\xe2\xf0H\xb19\n\xd3\xfd\xa3!u\fREǢ\xa5\xe3\xd0\x12\x1d/K\xea\x13\x10\xbb'B\x99\x93\xa0\xc2\xc9Pt\n\x14\x9e\n\x99\xb4\xddPM\xfe4\xde]^\x9fn\xa7\xf3\x17!\x8d\xc4\xd4\x18q\xd0\x04m\xe06\x15\x9bf\x88\xb3\xcd!\xaf\x05RO\xb7\x14\xfb\xadĪ\xb5\x98ڈ\xa3\xb6Ⱍ\u061c\x81\xe9~{Hu@\xaa\xa8#Zꄖ\xa8\xb3,\xa9\xbb v\xbbB\x99nP\xa1;\x14\xf5\x80\u009e\x90\xe9\xb54\x15\xe6{\xdb]\xe5u\x1f\x9b\xf0\xff\xe8\x03Q?\u0382\xfe\xdc\x04\xee\x00\xc8\f\xe4,;\x88\xe9\r\xe6\xc8\xd3C \u007f(\xa4\x86A4\x1c\x8aF@\xe1HȌ\xe2i\xfeh\xa6\x1aÑ\xa2\xb1\xdc\xd08n\x88\xc6c\r}&g\xee\x04ff\"\xb3p\x163:\x9b\x19Nb\x9a\xc9KS\xa6j\xca\xd22S\xa5\xa7.-\xb7\xd4\xd3 :\x87\xb3`:7\x81{.dfp\x96\x9d\xc9\xf4\xaa8\xf2\xb4\x82\xfc\f\xa4\xb2\x10\xe5\xa0h\x16\x14j\xc8\x18\x9e\xe6\xe7\x99\xca\xe5HQ\x81\x1b\xf2\xb8!\xf2\xb1\x86\x0e8s\x8b\xccL\xc8,\x9cnjf3Cb\x9a\x88\x99+\U0004471e\xb3\xb4\x82\xa5\xab\xc5t>\xe2\xa0\x06m\xe0^ 6\x17\"\xce^\x04ys\x91z\xfab\xb1\u007f\x89X]*\xa6\xcb\xc4\xd1\xe5\xe2\xf0\n\xb1\xb9\x12\xd3\xfd\xab u5REנ\xa5k\xd1\x12]'K\xea\xeb\x11\xbb\xff\x8327@\x85\x1b\xa1\xe8&(\xbc\x192\xb7\xd8\r\xd5T\xddj\x9b\x9a*}\x9b\x9d\xce_\x84\xdc.\xa6;\x10\aw\xa2\rܻ\xc4\xe6n\xc4\xd9{ \xef^\xa4\x9e\xbeO\xec\xdf/V\x0f\x88\xe9Aq\xf4\x908|Xl\x1e\xc1t\xffQH=\x86T\xd1\xe3h\xe9\t\xb4DOʒ\xfa)\xc4\xee\xd3P\xe6\x19\xa8\xf0,\x14=\a\x85\xcfC\xe6\x05(\xf7\"&\xe6\xf4KK+a\xfdrR\xd0+2\x12\xbc*Aྖ\x14\xe6u\x19ɾ!\xf6ޔ\x01O\xbf\x95\x14\xfe\xdbI\xa1\xdeI\nz7)\xa2\xf7\x92\"|?)\xcc\ar\x18\xffC\xb1\xfaH\x06\x14},\x01}\"\x01ѧ\xc9\x19\xe8\xcfd\xc4\xfd\\\x9c\xf9B\\\xf8R\x1c}%\x0e\xbf\x16\x9bo\xec\xd5\xcb\x15\xbf\xb5[\xb6\x9fs\xbe\xb3!\u007f\xee\xf9^L? \x0e~D\x1b\xb8\xf3\xc4f>\xe2\xec\x02\xc8[\x88\xd4Ӌ\xc4\xfeb\xb1Z\"\xa6\xa5\xe2h\x998\\.6?a\xba\xff3\xa4V U\xb4\x12-\xadBK\xb4Z\x96\xd4k\x10\xbbk\xa1\xcc:\xa8\xb0\x1e\x8a6@\xe1F\xc8l\xb2o\n\xb9ͼ+\xbd\x85\x13\xad\xb7B\xb4\x8d\xb3`;7\x81\xbb\x032;9\xcb\xeebz\xbb9\xf2\xf4\x1e\xc8\xff\x05R\xbfB\xf4\x1b\x14\xfd\x0e\x85\u007f@\xe6O\x9e\xe6\xff\xc5T\u007fs\xa4\xe8\x1fn\xe8_n\x88j\xb1\x86\xae\xe3̭gf\xfec\x16\xf62\xa3\x06f\x183\xcd>\xcb\xec-\x97+:\xcb*X:\xb5\xac\x12\xd6eIA\xe52\x12TH\x10\xb8\x95Ia\xf6\x95\x91\xec~bo\u007f\x19\xf0\xf4\x01I\xe1\x1f\x98\x14ꠤ\xa0\x83\x93\":$)\xc2C\x93\xc2\x1c&\x87\xf1\x0f\x17\xab#d@ё\x12\xd0Q\x12\x10\x1d\x9d\x9c\x81>FF\xdccř\xe3ą\xe3\xc5\xd1\t\xe2\xf0D\xb19i\x99}\xc3ȝ\x8c-\xebS\x10j}\xaa\x98҈\x83\xd3\xd0\x06\xee\xe9b\xd3\bq\xb61\xe45A\xea\xe9\xa6b\xbf\x99X5\x17S\vq\xd4R\x1c\xb6\x12\x9b֘\uedc1T[\xa4\x8aڡ\xa53\xd0\x12\xb5\x97%u\a\xc4nG(\xd3\t*t\x86\xa2.P\xd8\x152ݖ\xa5L\xb1\xbb\xddUQ\xf7\xb0\t\xff\xe5(\x88zq\x16\xf4\xe6&p\xfb@\xa6/g\xd9~L\xaf?G\x9e\x1e\x00\xf9\x03!5\b\xa2\xc1P4\x04\n\x87Bf\x18O\xf3\x873\xd5\b\x8e\x14\x8d\xe4\x86FqC4\x1ak\xe81\x9c\xb9c\x99\x99q\xcc\xc2xft&3\x9c\xc04\x13-\xab\xabβ\x13\xaa\xab\xf4\xd9v\xcf\xfcE\xc8$1MF\x1cLA\x1b\xb8S\xc5f\x1a\xe2\xec9\x907\x1d\xa9\xa7\xcf\x15\xfb3\xc4j\xa6\x98\xaađ\x12\x87\x19\xb1\xc9b\xba\x9f\x83\xd4,\xa4\x8a4Z2h\x89\xf2\xb2\xa4v\x11\xbb\x05(\xe3A\x05\x1f\x8a\x02(,B&\x84r\xe7abN϶\xb7'\xbe\b\xa1\xa4\xa0HF\x82\x92\x04\x81;')L\xb5\x8cd\xcf\x17{52\xe0\xe9\v\x92¿0)\xd4EIAs\x93\"\xba8)\xc2K\x92\xc2\\*\x87\xf1/\x13\xab\xcbe@\xd1\x15\x12Е\x12\x10]\x95\x9c\x81\xbeZF\xdckękŅ\xeb\xc4\xd1\xf5\xe2\xf0\u007fbs\x03_\xc3܍|\xb9s\xfa&\x1b\xf2\x17!7\x8b\xe9\x16\xc4\xc1\xadh\x03\xf76\xb1\xb9\x1dq\xf6\x0eȻ\x13\xa9\xa7\xef\x12\xfbw\x8b\xd5=b\xbaW\x1c\xdd'\x0e\xef\x17\x9b\a0\xdd\u007f\x10R\x0f!U\xf40Zz\x04-ѣ\xb2\xa4~\f\xb1\xfb8\x94y\x02*<\tEOA\xe1Ӑy\x86\xdf\x14\x8a\xcf\xf2\v\xaa\xa8\x9f㗠}\x19=/\xa6\x17\x10\a/\xa2\rܗ\xc4\xe6e\xc4\xd9W \xefU\xa4\x9e~M\xec\xbf.Vo\x88\xe9Mq\xf4\x968|[l\xde\xc1t\xff]H\xbd\x87T\xd1\xfbh\xe9\x03\xb4D\x1fʒ\xfa#\xc4\xee\xc7P\xe6\x13\xa8\xf0)\x14}\x06\x85\x9fC\xe6\v\xfb\xa6P\xfa\xd2\ueaa4\xbf\xb2\x89\xfd\x85\xe7k\x88\xbe\xe1,\xf8\x96\x9b\xc0\xfd\x0e2\xdfs\x96\xfd\x81\xe9\xfdȑ\xa7\xe7A\xfe|H-\x80h!\x14-\x82\xc2ŐY\xc2\xd3\xfc\xa5L\xb5\x8c#E˹\xa1\x9f\xb8!\xfa\x19k\xe8\x15\x9c\xb9+\x99\x99U\xcc\xc2jf\xb4\x86\x19\xaee\x9au\xfc\x1a\xca\x15\xd7\xf3]f\u007f\xecl\xe0ۓ\u007f\x0emL\n\xda$#\xc1f\t\x02wKR\x98\xad2\x92\xdd&\xf6\xb6ˀ\xa7w$\x85\xbf3)\u052e\xa4\xa0\xddI\x11\xedI\x8a\xf0\x97\xa40\xbf\xcaa\xfc\xdf\xc4\xeaw\x19P\xf4\x87\x04\xf4\xa7\x04D\u007f%g\xa0\xff\x96\x11\xf7\x1fq\xe6_q\xa1V\x1cՉ\xc3z\xb1\xf9\x8f\xdf\x01s{\xb1e݀P\xebXL\xfb,\xe78p\x96s\x1b\xb8)\xb1)C\x9c-\x87\xbc\n\xa4\x9e\xae\x14\xfb\xfb\x8a\xd5~b\xda_\x1c\x1d \x0e\x0f\x14\x9b\x830\xdd?\x18R\x87 Ut(Z:\f-\xd1\u1ca4>\x02\xb1{$\x949\n*\x1c\rE\xc7@᱐9n\xb9\xddP\xfexn\xf2\xfa\x04\x9en\u007f\x8f;QL'!\x0eNF\x1b\xb8\xa7\x88ͩ\x88\xb3i\xc8;\r\xa9\xa7O\x17\xfb\x8dĪ\xb1\x98\x9a\x88\xa3\xa6Ⱉ\xd84\xc7t\xbf\x05\xa4Z\"U\xd4\n-\xb5FK\xd4F\x96\xd4m\x11\xbb\xed\xa0\xcc\x19P\xa1=\x14u\x80\u008e\x90\xe9d7TS\xeal\x9b\x9a\x92\xeeb\xa7\xf3\x17!]\xc5\xd4\rq\xd0\x1dm\xe0\xf6\x10\x9b\x9e\x88\xb3\xbd \xaf7RO\xf7\x11\xfb}Ū\x9f\x98\xfa\x8b\xa3\x01\xe2p\xa0\xd8\f\xc2t\u007f0\xa4\x86 U4\x14-\rCK4\\\x96\xd4#\x10\xbb#\xa1\xcc(\xa80\x1a\x8a\xc6@\xe1XȌ\xb3\x1bʕ\xc6\xdb&W\xd2g\xda\xe9\xfcE\xc8\x041MD\x1c\x9c\x856p\xcf\x16\x9bI\x88\xb3\x93!o\nROO\x15\xfb\xd3\xc4\xea\x1c1M\x17G\xe7\x8a\xc3\x19b3\x13\xd3\xfd*H)\xa4\x8a2h)\x8b\x96('K\xeaY\x88]\re\fT\xc8C\x91\v\x85\x05\xc8x|\x85\xf2>\xef.\xaf\x03~>\xec-W\x14S\x8888\x0fm\xe0\xce\x16\x1bB\x9c\x8d \xaf\x84\xd4\xd3s\xc4~\xb5X\x9d/\xa6\x1aqt\x818\xbcPl.\xc2t\u007f.\xa4.F\xaa\xe8\x12\xb4t)Z\xa2\xcbdI}9b\xf7\n(s%T\xb8\n\x8a\xae\x86\xc2k s\xed\xf2\x94\xc9_gw\x95\xd7\xd7ۄ\xffG\x1f\x88n\xe0,\xb8\x91\x9b\xc0\xbd\t27s\x96\xbd\x85\xe9\xddʑ\xa7o\x83\xfc\xdb!u\aDwB\xd1]Px7d\xee\xe1i\xfe\xbdLu\x1fG\x8a\xee\xe7\x86\x1e\xe0\x86\xe8A\xac\xa1\x1f\xe2\xcc}\x98\x99y\x84Yx\x94\x19=\xc6\f\x1fg\x9a'\x96\x97M\xeb;\xfdI\xf0)\xf0i\xf0\x19\xf0Y\xf09\xf0y\xf0\x05\xf0E\xf0%\xf0e\xf0\x15\xf0U\xf05\xf0u\xf0\r\xf0M\xf0-\xf0m\xf0\x1d\xf0]\xf0=\xf0}\xf0\x03\xf0C\xf0#\xf0c\xf0\x13\xf0S\xf03\xf0s\xf0\v\xf0K\xf0+\xf0k\xf0\x1b\xf0[\xf0;\xf0{\xf0\a\xf0Gp\x1e8\x1f\\\x00.\x04\x17\x81\x8b\xc1%\xe0Rp\x19\xb8\x1c\xfc\t\xfc\x19\\\x01\xae\x04W\x81\xab\xc15\xe0Zp\x1d\xb8\x1e\xdc\x00n\x047\x81\x9b\xc1-\xe0Vp\x1b\xb8\x1d\xdc\x01\xee\x04w\x81\xbb\xc1=\xe0/\xe0\xaf\xe0o\xe0\xef\xe0\x1f\xe0\x9f\xe0_\xe0\xdf\xe0?\xe0\xbf`-X\aփ\xff\x81{\xc1\x06p\x9f\xda\xf2\x91U5i\xa7\xb6\xd2*\xd0\xe9Tm\xd9\xc8\\\xba̲\x98.\xb7cE/]\xc1ʤ+\xad\xaa\xf3\xe9}E\xfb\xd5V\x8c\xb4oq\xe9\xfdm[\xf2\xd2\a\xb0\xfc\xf4\x81\xb5ec\xaa\xd2\a\x81\a\x83\x87Ԗ\x8d\xaaJ\x1f\x8a\xfa0\xf0p\xf0\b\xf0H\xf0\xa8\xda\xf21U\x85\xf4ѢcDNJ\x8e\x13\x1d/:At\"+H\x9f$:Yt\x8a\xe8TQZt\x1a\xcbO\x9f.j$j,j\xc2\n\xd3ME\xcdD\xcdk+\xec<\x9dn\x91\xb8e\xe2V\x89['n\xc3\x0f\xafI\xb7\xad\xad\x1c\x83筝\xddI1}\x06\xd8\x1e\xec\x00v\x04;\x81\x9d\xc1.`W\xb0\x1b\xd8\x1d\xec\x01\xf6\xb4\xc7-\x16ҽD\xbdE}D}E\xfdD\xfdYAz\x80=!\xfb\x19'=0\xf1\xa0ă\x13\x0f\xe1\x87դ\x87\x8a\x86\x89\x86\x8bFXU\x97\xd2#E\xa3D\xa3EcDcE\xe3D\xe3EgZ\x95\n\xe9\t\xa2\x89,?}\x96]\xd0\xfe\x88H\x9f\x9dxR\xe2ɉ\xa7$\x9eZ[>\xd1\x1ec\x1an\x8csj\xcbG\xd9\v:]t.+HϨ\xad\x1cſh\xa7g\xda\xc7\x14\xd3U\xb5\x15\xa3\xec\x8f\u07b4\xb2]>\x9d\xa9-\x1f\x97\xabIgYA:W[1\xce>4=˶\xf6\xa0ڶ\xd5\xf6\xa1\xa6\xb6l\\>\x9d\xaf-\x9f`\x8f\xea\x8a\n,?\xed\xd5VL\xa8\xaa)\xa4\xfd\xda\xca\t\xb8r\x81\xcdsa\xbaȪI\x87v\xb8\xda^\xd8\xf3l\x9b\x0fҳY~\x9aXa:\xaa-\x9bR\x95.ՖO\xb1Ǜ#\xaa\xae\xad\x98\xc27\xc4\xf9\x89k\x12_\x90\xf8\xc2\xc4\x17%\x9e\x9b\xf8\xe2ė\xd8c\xe6җ\x82\x97\x81\x97\x83W\x80W\x82W\x81W\x83׀ׁׂ\xd7\xdb\x13\xc9\x15\xd2\xff\x13\xdd \xbaQt\x13+H\xdf,\xbaEt\xab\xe86\xd1\xed\xa2;Dw\x8a\xee\x12\xdd-\xbaGt\xaf\xe8>\xd1\xfd\xa2\aX^\xfaA\xd1C\xa2\x87E\x8f\x88\x1e\x15=\xc6\xf2ӏ\x8b\x9e\x10=)zJ\xf44+L?c\x9f\x1b\xbe\xfe\xcf&~.\xf1\xf3\x89_H\xfcb\xe2\x97\x12\xbf\x9c\xf8\x95į&~-\xf1\xeb\x89\xdfH\xfc&/W\x93~K\xf4\xb6\xe8\x1dѻ\xb5\xa9\xb1\xe9\xf7\xec\x13\\L\xbf\x0f~\x00~\b~\x04~\f~\x02~\n~\x06~\x0e~a\x17\xe1\x17\xe0\x97\xb5\xe5\x93\xec\x1b\xe5WV\xf6\xe9\xfaڎ\x95\xd2߀߂߁߃?\x80?\x82\xf3\xc0\xf9\xe0\x02p\xa1=3\xfbz[$Z,Z\xc2\n\xd2KE\xcbD\xcbE?\xb1\xbc\xf4Ϣ\x15\xa2\x95\xa2U\xf6\xf4\xf8帺65<\xbd\x86\xb1\x96\xb1\x8e\xb1\x9e\xb1\x81\xb1\x91\xb1\x89\xb1\x99\xb1\x85\xb1\x95\xb1\x8d\xb1\x9d\xb1\x83\xb1\xb3\xb6lx!\xbd\v\xdcm\x19\xa4\xf7\x80\xbf\x80\xbf\x82\xbf\x81\xbf\x83\u007f\x80\u007fZ\xfa\xe9\xbf\xc0\xbf\xc1\u007f,\xc3\xf4\xbf`-XW[1\x90_'\xf5\xb5\xe5\x03\xed\r\xfd_m\xd9\xc0|z\xafm\xec\xeb\xb1\xc1\xcaT\xa5c\xfb\x10c\xc7\xf6\xa9c\xdb\x1ffu\x15\x13\x8d}i\xa6\x12\x97\xd5UN\xe4\xff\n\x93.Ga_\xfc\x15\\\xf0ũ\xac+\x1fg\x8a\xe9}\xeb*\xac\n\xe9\xfd\xea*\x86\xf1\x03\xf7O|\x805\xbf\xbd\x1ch]m\x8ftP]٤R\xfa\xe0\xba\xf2a\xa5b\xfa\x90\xbar\xfb\x034}\xa8谺ʩ8\xe4\xe1\xd2\x1fQW1\xde~JK\x1f)\xedQ\xa2\xa3\xeb\xca&\xe7\xd3\xc7ԕO5\xa5\xf4\xb1ueS\xf2\xe9\xe3\xea\xf8m\xed\xf8\xba\x8a\tƮtB]\xe5\xe45k\x96c\x91OYxe\xf5e\xb3f\xe5˙^E}\x8a\xa2Jƾ\xf5\xfc\xd0\xfd\xc0\xfd\xc1\x03\xc0\x03\xc1\x83\xc0\x83\xc1C\xc0C\xc1\xc3\xc0\xc3\xc1#\xc0#\xebS~p\x94E\xeeh\x8b\xfc1\xf5\xa99\xc1\xb1\xf5e~\xc1\x1c\x87\xf1\xe3\xc1\x13\xc0\x13\xc1\x93\xc0\x93\xebS5\xf9S\xebS\xf6\x93i\xbd3\xf3\xf4z'ۨ\xde1\x8d\xeb\x9dB\x93z\xc7kZ\xef\xf8\xcd\xec\xbf\xe6\xf5NԢ\xdei\xd5Ҟ\xb2iU\xefPk.\xdaآm\xbdS\xd5\xce\xfek_\xef\xa8\x0e\xf5\x8e\xeeh\x8f\xd0\xc9\x1e\xa1s\xbd3\xa7K\xbdsAW\xac\xd2\xcd\xce\xef^\xef\xd4\xf4\xb0\xc7\xedi\xff\xf5\xb2\xc7\ue351>\xb6ꋪ_\xbd\x13\xf4\xb7\xff\x06\xa0\x1bX\uf103\xec\xbf\xc1\xe8\x86ԧ\"\x1a\xca\x18V\xef\xcc\x1e\u038b\x8f\xb0\x87\x1ciwY\x1ceW\x1em\x8f9\xc6>z\xac=\xdak\x98\xf1:\xf8\x06\xf8&\xf8\x16\xf86\xf8\x0e\xf8.\xf8\x1e\xf8>\xf8\x01\xf8!\xf8\x11\xf81\xf8\t\xf8)\xf8\x19\xf89\xf8\x05\xf8%\xf8\x15\xf85\xf8\r\xf8-\xf8\x1d\xf8=\xf8\x03\xf8#8\x0f\x9c\x0f.\x00\x17\x82\x8b\xe4\xd9؋\x1f[\xe0\x00p 8\b\x1c\f\x0e\x01\x87\x82\xc3\xc0\xe1\xe0\bp$8\n\x1c\r\x8e\x01ǂ\xb7\x80\xb7\x82߀߂߁߃?\x80?\x82\xf3\xc0\xf9\xe0\x02p!\xb8\b\\\f.\x01\x97\x82\xcb\xc0\xe5\xe0O\xe0\xcf\xe0\np%\xb8\n\\\r\xae\x01ׂ\xeb\xc0\xf5\xe0\x06p#\xb8\t\xdc\fn\x01\xb7\x82\xdb\xc0\xed\xe0\x0ep'\xb8\v\xdc\r\xee\x01\u007f\x01\xff\x03\xf7\x82\r\xe0>\rL\aL\x81e`9X\x01V\x82\xfb\x82\xfb\x81\xfb\x83\a\x80\a\x82\a\x81\a\x83\x87\x80\x87\x82\x87\x81\x87\x83G\x80G\x82G\x81G\x83ǀǂǁǃ'\x80'\x82'\x81'\x83\xa7\x80\xa7\x82\x8d\x1a\x9c\x8b\x1b\xa3j\x026\x05\x9b\x81\xcd\xc1\x16`K\xb0\x15\xd8\x1al\x03\xb6\x05ہg4\xa4ڶmߐjӦC\x83Ӧc\x833\xa3\x93\xfd\u05f9\xc1iޥ!\xd5\"ݵ\xc1\xb9\xb0[Cjn\xba{\x833\xadGCjz\xbagCjZ\xf3^\re-\xa6\xa7{7\xa4z\xf5\xea\xd3P֧O\xbao\x83ӫ_C\xaaO\xba\xbf}\xdc\x00~\xdc@;sP\x833w0\x96\x19\x02\x0e\x05\x87\x81\xe3\x1a\x9c\xd6\xe3\xed\xbf3\x1b\x9c\xb6\x13\x1b\x9c\x9eg58=\xcenp\xfaNjpN\x9blOe\x8a=\x85\xa9\rN\x8bi\xf68\xe7\xd8\xe3L\xb7>\xd7zF\x83\xd3hf\x83Ӵ\xaa\xc1i\xa9\x1a\x9cV\x19\xfbج]=\xd7\xe0\xf4\x99\xd5\xe0\xf46\r\xce9\xf9\x06\xa7\xb1\xdb\xe04)48\xfd<\xac\xe6\x83\x01X\x04\t,\x81{\xc1\x06p\x9f\x187G윖\x8a\x9d\xd3\xcbb\xa7Qy\xec4\xae\x88\x9d&\x95\xb1\xd3t\xdf\xd8i\xb6_\xec4\xdf?vZ\x1c\x10;-\x0f\x8c\x9dV\a\xc5N\xeb\x83c\xa7\xcd!\xb1\xd3\xf6\xd0\xd8iwX\xec\x9cqx\xec\xb4?\"v:\x1c\x19;\x1d\x8f\x8a\x9dNG\xc7N\xe7cb\xa7˱\xb1\xd3\xf5\xb8\xd8\xe9v|\xect?!vz\x9c\x18;=O\x8a\x9d^'\xc7N\xefSb\xa7ϩ\xb1\xd37\x1d;\xfdN\x8b\x9d\xfe\xa7\xc7\u0380F\xb13\xb0q\xec\fj\x12;\x83\x9b\xc6ΐf\xb13\xb4y\xec\fk\x11;\xc3[\xc6ΈV\xb13\xb2u\xec\x8cj\x13;\xa3\xdb\xc6Θv\xb13\xf6\x8c\xd8\x19\xd7>v\xc6w\x88\x9d3;\xc6΄N\xb13\xb1s\xec\x9c\xd5%v\xce\xee\x1a;\x93\xba\xc5\xce\xe4\xee\xb13\xa5G\xecL\xed\x19;\xd3z\xc5\xce9\xbdcgz\x9f\xd89\xb7o\xec\xcc\xe8\x17;3\xfb\xc7NՀ\xd8Q\x03c'3(v\xb2\x83c'7$vf\r\x8d\x1d=,v\xcc\xf0\xd8ɏ\x88\x1dwd\xec\x14FŎ7:v\xfc1\xb1\x13\x8c\x8d\x9d\xe2\xb8\xd8\t\xc7\xc7\xceyg\xc6\xce\xec\t\xb1C\x13c':+vJg\xc7ΜI\xb1S=9vΟ\x12;5Sc\xe7\x82i\xb1\xbd\xba\xb1s\xd1\xf4ؙ{n\xec\\<\x03\xcf\xfeL\xb0\xca>\x9fʞ_ƞ[\xd6>\xc79\xfb|ϊS\xd5EmO\xce\xd8\x13\xc8ۃ\xba\xf6\xc4\nvQ/N\xd5T\xf9\x16\xa5\xc0\xa2X\x8cSQ)\xb4\x17\xe7<\xfb\xd8\xd9\xf6\xb1d\x1f\x1b\xd9ǖ\xecc\xe7ĩBU\xb5E\xfe|\x8bR\x8dE\xee\x02\x8b\xe2\x85q\x8a\xaa.\xb2\xc8ϵ(]l\x91\xbbĢx\xa9=\\\xd5e\x16\xf9\xcb\xf9\xc0WX䮴(^\x15\xa7\x82\xaa\xab-\xf2\xd7X\x94\xae\xb5\xc8]gQ\xbc>N\x99\xaa\xffY\xe4o\xb0(\xddh\x91\xbbɢxs\x9c\xf2\xabn\xb1\xc8\xdfjQ\xba\xcd\"w\xbbE\xf1\x0e\xde\xc1\x9d\xbc\x83\xbbx\awǩ\xd9U\xf7X\xe4\xef\xb5(\xddg\x91\xbbߢ\xf8\x80}\n\xaa\x1e\xb4\xcf\xf5C\xf6\xfey\xd8\xde?\x8f\xdak\xf2X\x9c\xd2\xfaq\vz\u008e + ## Installation - go get -u github.com/dalu/slug + go get -u github.com/gosimple/slug ## License diff --git a/Godeps/_workspace/src/github.com/dalu/slug/default_substitution.go b/Godeps/_workspace/src/github.com/gosimple/slug/default_substitution.go similarity index 100% rename from Godeps/_workspace/src/github.com/dalu/slug/default_substitution.go rename to Godeps/_workspace/src/github.com/gosimple/slug/default_substitution.go diff --git a/Godeps/_workspace/src/github.com/dalu/slug/doc.go b/Godeps/_workspace/src/github.com/gosimple/slug/doc.go similarity index 91% rename from Godeps/_workspace/src/github.com/dalu/slug/doc.go rename to Godeps/_workspace/src/github.com/gosimple/slug/doc.go index 39f57b30eb4..ffbe2c223f5 100644 --- a/Godeps/_workspace/src/github.com/dalu/slug/doc.go +++ b/Godeps/_workspace/src/github.com/gosimple/slug/doc.go @@ -12,7 +12,7 @@ Example: package main import( - "github.com/dalu/slug" + "github.com/gosimple/slug" "fmt" ) @@ -35,5 +35,9 @@ Example: textSub := slug.Make("water is hot") fmt.Println(textSub) // Will print 'sand-is-hot' } + +Requests or bugs? + +https://github.com/gosimple/slug/issues */ package slug diff --git a/Godeps/_workspace/src/github.com/dalu/slug/languages_substitution.go b/Godeps/_workspace/src/github.com/gosimple/slug/languages_substitution.go similarity index 100% rename from Godeps/_workspace/src/github.com/dalu/slug/languages_substitution.go rename to Godeps/_workspace/src/github.com/gosimple/slug/languages_substitution.go diff --git a/Godeps/_workspace/src/github.com/dalu/slug/slug.go b/Godeps/_workspace/src/github.com/gosimple/slug/slug.go similarity index 98% rename from Godeps/_workspace/src/github.com/dalu/slug/slug.go rename to Godeps/_workspace/src/github.com/gosimple/slug/slug.go index 85d614f941e..b2c7d62514e 100644 --- a/Godeps/_workspace/src/github.com/dalu/slug/slug.go +++ b/Godeps/_workspace/src/github.com/gosimple/slug/slug.go @@ -6,9 +6,10 @@ package slug import ( - "github.com/dalu/unidecode" "regexp" "strings" + + "github.com/rainycape/unidecode" ) var ( diff --git a/Godeps/_workspace/src/github.com/dalu/slug/slug_test.go b/Godeps/_workspace/src/github.com/gosimple/slug/slug_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/dalu/slug/slug_test.go rename to Godeps/_workspace/src/github.com/gosimple/slug/slug_test.go diff --git a/Godeps/_workspace/src/github.com/dalu/unidecode/.gitignore b/Godeps/_workspace/src/github.com/rainycape/unidecode/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/dalu/unidecode/.gitignore rename to Godeps/_workspace/src/github.com/rainycape/unidecode/.gitignore diff --git a/Godeps/_workspace/src/github.com/dalu/unidecode/LICENSE b/Godeps/_workspace/src/github.com/rainycape/unidecode/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/dalu/unidecode/LICENSE rename to Godeps/_workspace/src/github.com/rainycape/unidecode/LICENSE diff --git a/Godeps/_workspace/src/github.com/rainycape/unidecode/README.md b/Godeps/_workspace/src/github.com/rainycape/unidecode/README.md new file mode 100644 index 00000000000..9a109bcfdb2 --- /dev/null +++ b/Godeps/_workspace/src/github.com/rainycape/unidecode/README.md @@ -0,0 +1,6 @@ +unidecode +========= + +Unicode transliterator in Golang - Replaces non-ASCII characters with their ASCII approximations. + +[![GoDoc](https://godoc.org/github.com/rainycape/unidecode?status.svg)](https://godoc.org/github.com/rainycape/unidecode) diff --git a/Godeps/_workspace/src/github.com/dalu/unidecode/decode.go b/Godeps/_workspace/src/github.com/rainycape/unidecode/decode.go similarity index 92% rename from Godeps/_workspace/src/github.com/dalu/unidecode/decode.go rename to Godeps/_workspace/src/github.com/rainycape/unidecode/decode.go index 028533bf425..fe74bf3d880 100644 --- a/Godeps/_workspace/src/github.com/dalu/unidecode/decode.go +++ b/Godeps/_workspace/src/github.com/rainycape/unidecode/decode.go @@ -5,12 +5,9 @@ import ( "encoding/binary" "io" "strings" - "sync" ) var ( - decoded = false - mutex sync.Mutex transliterations [65536][]rune transCount = rune(len(transliterations)) getUint16 = binary.LittleEndian.Uint16 diff --git a/Godeps/_workspace/src/github.com/dalu/unidecode/make_table.go b/Godeps/_workspace/src/github.com/rainycape/unidecode/make_table.go similarity index 100% rename from Godeps/_workspace/src/github.com/dalu/unidecode/make_table.go rename to Godeps/_workspace/src/github.com/rainycape/unidecode/make_table.go diff --git a/Godeps/_workspace/src/github.com/rainycape/unidecode/table.go b/Godeps/_workspace/src/github.com/rainycape/unidecode/table.go new file mode 100644 index 00000000000..160ecb2edfd --- /dev/null +++ b/Godeps/_workspace/src/github.com/rainycape/unidecode/table.go @@ -0,0 +1,4 @@ +package unidecode + +// AUTOGENERATED - DO NOT EDIT! + diff --git a/Godeps/_workspace/src/github.com/dalu/unidecode/table.txt b/Godeps/_workspace/src/github.com/rainycape/unidecode/table.txt similarity index 100% rename from Godeps/_workspace/src/github.com/dalu/unidecode/table.txt rename to Godeps/_workspace/src/github.com/rainycape/unidecode/table.txt diff --git a/Godeps/_workspace/src/github.com/dalu/unidecode/unidecode.go b/Godeps/_workspace/src/github.com/rainycape/unidecode/unidecode.go similarity index 86% rename from Godeps/_workspace/src/github.com/dalu/unidecode/unidecode.go rename to Godeps/_workspace/src/github.com/rainycape/unidecode/unidecode.go index fa414bb0954..f9d2d49d418 100644 --- a/Godeps/_workspace/src/github.com/dalu/unidecode/unidecode.go +++ b/Godeps/_workspace/src/github.com/rainycape/unidecode/unidecode.go @@ -4,15 +4,15 @@ package unidecode import ( + "sync" "unicode" - - "gopkgs.com/pool.v1" ) const pooledCapacity = 64 var ( - slicePool = pool.New(0) + slicePool sync.Pool + decodingOnce sync.Once ) // Unidecode implements a unicode transliterator, which @@ -23,14 +23,7 @@ var ( // with their closest ASCII counterparts. // e.g. Unicode("áéíóú") => "aeiou" func Unidecode(s string) string { - if !decoded { - mutex.Lock() - if !decoded { - decodeTransliterations() - decoded = true - } - mutex.Unlock() - } + decodingOnce.Do(decodeTransliterations) l := len(s) var r []rune if l > pooledCapacity { diff --git a/Godeps/_workspace/src/github.com/dalu/unidecode/unidecode_test.go b/Godeps/_workspace/src/github.com/rainycape/unidecode/unidecode_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/dalu/unidecode/unidecode_test.go rename to Godeps/_workspace/src/github.com/rainycape/unidecode/unidecode_test.go diff --git a/Godeps/_workspace/src/gopkgs.com/pool.v1/.gitignore b/Godeps/_workspace/src/gopkgs.com/pool.v1/.gitignore deleted file mode 100644 index 836562412fe..00000000000 --- a/Godeps/_workspace/src/gopkgs.com/pool.v1/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a -*.so - -# Folders -_obj -_test - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe -*.test diff --git a/Godeps/_workspace/src/gopkgs.com/pool.v1/LICENSE b/Godeps/_workspace/src/gopkgs.com/pool.v1/LICENSE deleted file mode 100644 index ad410e11302..00000000000 --- a/Godeps/_workspace/src/gopkgs.com/pool.v1/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/Godeps/_workspace/src/gopkgs.com/pool.v1/README.md b/Godeps/_workspace/src/gopkgs.com/pool.v1/README.md deleted file mode 100644 index f9c561dc067..00000000000 --- a/Godeps/_workspace/src/gopkgs.com/pool.v1/README.md +++ /dev/null @@ -1,13 +0,0 @@ -pool -==== - -sync.Pool compatibility layer for for Go - falls back to a channel based pool in Go < 1.3 - - -Please, use the following import path to ensure a stable API: - -```go - import "gopkgs.com/pool.v1" -``` - -View other available versions, documentation and examples at http://gopkgs.com/pool diff --git a/Godeps/_workspace/src/gopkgs.com/pool.v1/doc.go b/Godeps/_workspace/src/gopkgs.com/pool.v1/doc.go deleted file mode 100644 index 7546db7ac21..00000000000 --- a/Godeps/_workspace/src/gopkgs.com/pool.v1/doc.go +++ /dev/null @@ -1,3 +0,0 @@ -// Package pool provides a sync.Pool compatibility layer, which -// falls back to a channel based pool on Go < 1.3. -package pool diff --git a/Godeps/_workspace/src/gopkgs.com/pool.v1/example_test.go b/Godeps/_workspace/src/gopkgs.com/pool.v1/example_test.go deleted file mode 100644 index dff9d348b3f..00000000000 --- a/Godeps/_workspace/src/gopkgs.com/pool.v1/example_test.go +++ /dev/null @@ -1,23 +0,0 @@ -package pool_test - -import ( - "fmt" - - "gopkgs.com/pool.v1" -) - -func ExamplePool() { - p := pool.New(0) - p.Put("Hello") - fmt.Println(p.Get()) - // OutPut: Hello -} - -func ExamplePoolNew() { - p := pool.New(0) - p.New = func() interface{} { - return "World!" - } - fmt.Println(p.Get()) - // OutPut: World! -} diff --git a/Godeps/_workspace/src/gopkgs.com/pool.v1/gopkgs.go b/Godeps/_workspace/src/gopkgs.com/pool.v1/gopkgs.go deleted file mode 100644 index 394a97806d6..00000000000 --- a/Godeps/_workspace/src/gopkgs.com/pool.v1/gopkgs.go +++ /dev/null @@ -1,24 +0,0 @@ -package pool - -import ( - "fmt" - "reflect" -) - -// gopkgs.go: v1 - -// NOTE: This file is autogenerated by gopkgs.com. -const ( - goPkgsSrcPath = "github.com/rainycape/pool" - goPkgsName = "pool" - goPkgsErrFmt = "invalid import path %s - please use gopkgs.com/%s.v1 or see http://gopkgs.com/%s" -) - -type goPkgsCheck struct{} - -func init() { - typ := reflect.TypeOf(goPkgsCheck{}) - if typ.PkgPath() == goPkgsSrcPath { - panic(fmt.Errorf(goPkgsErrFmt, typ.PkgPath(), goPkgsName, goPkgsName)) - } -} diff --git a/Godeps/_workspace/src/gopkgs.com/pool.v1/pool.go b/Godeps/_workspace/src/gopkgs.com/pool.v1/pool.go deleted file mode 100644 index 269a2afd919..00000000000 --- a/Godeps/_workspace/src/gopkgs.com/pool.v1/pool.go +++ /dev/null @@ -1,37 +0,0 @@ -// +build go1.3,!appengine - -package pool - -import ( - "sync" -) - -// Pool is a thin compatibility type to allow Go -// libraries to use the new sync.Pool in Go 1.3, -// while remaining compatible with lower Go versions. -// For more information, see the sync.Pool type. -type Pool sync.Pool - -// New returns a new Pool. The size argument is -// ignored on Go >= 1.3. In Go < 1.3, if size is -// zero, it's set to runtime.GOMAXPROCS(0) * 2. -func New(size int) *Pool { - return &Pool{} -} - -// Get returns an arbitrary previously Put value, removing -// it from the pool, or nil if there are no such values. Note -// that callers should not assume anything about the Get return -// value, since the runtime might decide to collect the elements -// from the pool at any time. -// -// If there are no elements to return and the New() field is non-nil, -// Get returns the result of calling it. -func (p *Pool) Get() interface{} { - return (*sync.Pool)(p).Get() -} - -// Put adds x to the pool. -func (p *Pool) Put(x interface{}) { - (*sync.Pool)(p).Put(x) -} diff --git a/Godeps/_workspace/src/gopkgs.com/pool.v1/pool_go1.2.go b/Godeps/_workspace/src/gopkgs.com/pool.v1/pool_go1.2.go deleted file mode 100644 index 11c4e490a30..00000000000 --- a/Godeps/_workspace/src/gopkgs.com/pool.v1/pool_go1.2.go +++ /dev/null @@ -1,57 +0,0 @@ -// +build !go1.3 appengine - -package pool - -import ( - "runtime" -) - -// Pool is a thin compatibility type to allow Go -// libraries to use the new sync.Pool in Go 1.3, -// while remaining compatible with lower Go versions. -// For more information, see the sync.Pool type. -type Pool struct { - ch chan interface{} - // New specifies a function to generate - // a new value, when Get would otherwise - // return nil. - New func() interface{} -} - -// New returns a new Pool. The size argument is -// ignored on Go >= 1.3. In Go < 1.3, if size is -// zero, it's set to runtime.GOMAXPROCS(0) * 2. -func New(size int) *Pool { - if size == 0 { - size = runtime.GOMAXPROCS(0) * 2 - } - return &Pool{ch: make(chan interface{}, size)} -} - -// Get returns an arbitrary previously Put value, removing -// it from the pool, or nil if there are no such values. Note -// that callers should not assume anything about the Get return -// value, since the runtime might decide to collect the elements -// from the pool at any time. -// -// If there are no elements to return and the New() field is non-nil, -// Get returns the result of calling it. -func (p *Pool) Get() interface{} { - select { - case x := <-p.ch: - return x - default: - } - if p.New != nil { - return p.New() - } - return nil -} - -// Put adds x to the pool. -func (p *Pool) Put(x interface{}) { - select { - case p.ch <- x: - default: - } -} diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go index b802eba7e1e..863e2275f90 100644 --- a/pkg/models/dashboards.go +++ b/pkg/models/dashboards.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/dalu/slug" + "github.com/gosimple/slug" ) // Typed errors From bae1e2f0c10836e70d0e1b06f11d4f7973dfa0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 12 Jun 2015 09:04:10 +0200 Subject: [PATCH 296/398] Fix for validating tags in dashboard json in backend, Fixes #2152 --- pkg/models/dashboards.go | 2 +- .../{dashboard_test.go => dashboards_test.go} | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) rename pkg/models/{dashboard_test.go => dashboards_test.go} (53%) diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go index 863e2275f90..cdcc4d52364 100644 --- a/pkg/models/dashboards.go +++ b/pkg/models/dashboards.go @@ -49,7 +49,7 @@ func NewDashboard(title string) *Dashboard { // GetTags turns the tags in data json into go string array func (dash *Dashboard) GetTags() []string { jsonTags := dash.Data["tags"] - if jsonTags == nil { + if jsonTags == nil || jsonTags == "" { return []string{} } diff --git a/pkg/models/dashboard_test.go b/pkg/models/dashboards_test.go similarity index 53% rename from pkg/models/dashboard_test.go rename to pkg/models/dashboards_test.go index 0828e51480f..b0b6796c4d8 100644 --- a/pkg/models/dashboard_test.go +++ b/pkg/models/dashboards_test.go @@ -15,4 +15,17 @@ func TestDashboardModel(t *testing.T) { So(dashboard.Slug, ShouldEqual, "grafana-play-home") }) + Convey("Given a dashboard json", t, func() { + json := map[string]interface{}{ + "title": "test dash", + } + + Convey("With tags as string value", func() { + json["tags"] = "" + dash := NewDashboardFromJson(json) + + So(len(dash.GetTags()), ShouldEqual, 0) + }) + }) + } From a815511aef7768b0f0a22a9c27588f9fb9a70b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 12 Jun 2015 10:05:38 +0200 Subject: [PATCH 297/398] Fixed failing unit test --- Godeps/_workspace/src/github.com/rainycape/unidecode/table.go | 1 + 1 file changed, 1 insertion(+) diff --git a/Godeps/_workspace/src/github.com/rainycape/unidecode/table.go b/Godeps/_workspace/src/github.com/rainycape/unidecode/table.go index 160ecb2edfd..b7e41fa70ff 100644 --- a/Godeps/_workspace/src/github.com/rainycape/unidecode/table.go +++ b/Godeps/_workspace/src/github.com/rainycape/unidecode/table.go @@ -2,3 +2,4 @@ package unidecode // AUTOGENERATED - DO NOT EDIT! +var tableData = "x\xda,\x9c\x05\\\x1cW\xd7\xc6\xf7\xcc\xec.]\x96e\x17[\xa8\x84\x92ThB\x02qwwwe\x80\t;\xd8\x00\xcbB ^\xb7\xd4ݛ\xba\xb7\x91\xb6\x91\xba[jI=\xa9\xbb\xc4]\xde\xef9\x0f\xdf\xef\xfd\x9d\xff\xb9\xf7̝;w\xce}\xe6\xec얼\x1e\x8f\xe8\xff\xc4\xf0\x88az\xc4\xf4z\xc4\xeb\xf3\x88\xcf\xef\x11\u007f\x92G\x92N\xf3\xc8i\x01\x8f\x04\x92=\x92\x1c\xf4H0\xc5#)!\x8f\x84R=\x92\x1a\xf6H8\xe2\x91H\x9aG\xd2\xd2=\x92\x9eᑌL\x8fdfy$+\xea\x91h\xb6G\xb2s<\x92s\xbaGN?\xc3#g\x9c\xe9\x913\xcf\xf2\xc8Ym<\xd2&\xd7#\xb9g{\xe4\xec<\x8f\xe4\xb5\xf5H\xdbv\x1eiw\x8eG\xce9\xd7#\xe7\x9e\xe7\x91\xf3\xce\xf7\xc8\xf9\xf9\x1eɿ\xc0#\x17\xb4\xf7H\xfb\x0e\x1e\xe9P\xe0\x91\x82\x8e\x1e\xe9\xd8\xc9#\x9d\n=RX䑢\xce\x1e\xe9\xdc\xc5#]\xbaz\xa4k7\x8ft\xeb\xee\x91\xee=<ң\xa7Gz\xf6\xf2H\xaf\xde\x1e\xe9\xdd\xc7#}\xfaz\xa4o?\x8f\xf4\xeb\xef\x91\xfe\x03<2`\xa0G\x06\x0e\xf2Ƞ\xc1\x1e\x19<\xc4#C\x86zd\xe80\x8f\f\x1b\xee\x91\xe1#<2b\xa4GF\x8e\xf2Ȩ\xd1\x1e\x19=\xc6#c\xc6zd\xec8\x8f\x8c\x1b\xef\x91\xf1\x13<2a\xa2G&N\xf2Ȥ\xc9\x1e\x99<\xc5#S\xa6zd\xea4\x8fL\x9b\xee\x91\xe93<2c\xa6Gf\xce\xf2Ȭ\xd9\x1e\x99=\xc7#s\xe6zd\xee<\x8f,\x98\xef\x91\xf9\v\xe0\x17zd\xe1\"\x8f,*\xf6H\xb1\xe5\x11\xab\xc4#%\xa5\x1e)-\xf3H\x99\xed\x11{\xb1G\x16\x97{\xa4<摘\xe3\x11\xa7\xc2#\x15\x95\x1e\xa9\xac\xf2HU\xb5G\xaak\x87m\x87\xed\x80}\x01\xfb\x12\xc9\xf8\n\xfekl\xd07\xb0oa\xdf\xc1vb\x83vy\x8c\xe9\xb1\xef=F<\xfe\x03\xee\xf1G\xd8O\xb0\x9fa\xbf\xc0~\x85\xfd\xe61,\xfbw\xec\xd1\x1f؟?a\u007f\xc1\xfe\x86\xfd\x83\xfd\xf9\x17\xf6\x1fl7l\x0f\xf6p/\xf6g\x1fnu?\xec\x00\xec \xec\x10\xec04{\x04\xfe(Rs\fv\x1cv\x02v\x12{t\xcac4\xc4\xfe\x87\x06\x9e\xc7!\"b\x19\xf0&\xbc\x17\xde\a\xef\x17\x19\x96$Rz\x1a|\x00>\x19>\b\x9f\x02\x1f\x82O\x15\x19\x1e\x16)\x8b\xc0\xa7\xc1\xa7\x8b\x8c\xc8\x10\xb13\xe1\xb3\xe0\xa3\xf0\xd9\xf09\xf0\xa7ß\x01\u007f&\xfcY\"\xa3ڈ\x94\xe7\u009f\r\x9f\a\xdf\x16\xbe\x1d\xfc9\xf0犌>O$v>|>\xfc\x05\"cڋ8\x1d\xe0\v\xe0;\xc2w\x82/\x84/\x82\xef\f\xdf\x05\xbe\xab\x18c\xc6v\x13é\xe8.2\xb6\x87HEO\x91q\xbdD*{\xc3\xfa\x88\x8c\xef+R\xd5\x0f\xbe?\xfc\x00\xf8\x81\xf0\x83\xe0\a\xc3#\x05\xe3\x87\xc2\x0f\x13\x998\\\xa4f\x04\xfcH\xf8Q\xf0\xa3\xe1Lj\x91_3V\x8c\x9a\xf2qbL\x1c5^d\xd2\x04\x11w\"\xfc$\xf8\xc9\xf0S\u09ca1i\xc441\\{\xba\xc8\xd4\x19\"\xf53\xe1g\xc1φ\x9f\x03?Wd\xda<\x91\xf8|\xf8\x05\xf0\v\xe1\x17\xc1\x17\xc3[\xf0%\"\xd3KE\x1a\xca\xe0m\xf8\xc5\xf0\xe5\xf01\x91\x19\x8eH\xa2\x02\xbe\x12\xbe\n\xbe\x1a\xbe\x06ޅ\xaf\x85\xaf\x83\xaf\x87\x8f\xc37\x88\xccJ\x8845\x8a\xcci\x12i^\x02\xdf,2\xb7E\xf0l\xc2/\x83_\x0e\xbf\x02~%\xae\xbbJ\xa4d\xb5\xc8\xd0\va\x17\xa1}\xb1H\xcfK`\x97\xe2\xce.Ö_\x8e-\xbf\x02[}%\xec*\xd8\xd5\xd8\xf25\xb0kD\xba]+2\xf8:l\xef\xf5\"#o\x10Y|#\xb6\xf2&\xd8\xcdb\xc4\x1ao\xc1\xfe\xdc\n\xbb\r\xbbq;v\xe2\x0ed\xf9N\xd8]X\xe0\xdd\xc8\xee=\xc8\uef78\xc8}\xb0\xfb\x91µH\xe1\x98\a\x90B\xe7A\x91\xc9\x0f\x89\xd4>,Ɯ\xa9\x8f\x88t}\x14\xf6\x98\x18\xd3F?.F<\xf6\x04\xb2\xf2$\xb2\xf3\x14\xfc\xd3\xf0\xcf\xe0Οŝ?\x87;]'2s=\xfc\x06\xdc\xf9F\xdc\xe5\xf3\xb8\xcb\x17Ę;\xfaE\xc5&1Zb\x9b\x15[0\xe3V\x91\x1e/\xc1^\x16\xa3!\xfe\nR\xf6\xaaȲ\xd7\xc4X\xb6\xecu`\xc0\x1b\"m\xdf\x14c\xf8ܷ\x80\x96\xb7\xc5(kyG\x8c\xf1c\xdf\x05*\xde\x13\xa3\xaa\xe2}(b\xec\a@Ň\x10H\xc5Gx\x80\xb6\xe1\x01\xfa\x187\xfd\t\x84\xf9)n\xec3\xdc\xd8\xe7X\xdfv\xaco\a\xfc\x17\xf0_\xc2\u007f\x05\xff5\xfc7\xf0\xdf\xc2\u007f\a\xbf\x13\xd9܅9\xbe\xc7\x1c?\xc0\xff\b\xff\x93\xa0\"\xfd,\xa8\t\xbf \xaf\xbf\xe21\xf9\r\xfew\xf8?\x90\xd6?\x91ֿp\x95\xbfq\x95\u007f\xe0\xff\x85\xffOot\xb7\xde\xe3\x1e<\n{\xf5\x06\xf6\xe9\r\xec\xd7\x1b8\x80\x93\x0f\xe2\xe4Cb\x8c\x9ey\x18\x1bq\x04\x1bq\x14\x1bq\f\xd7;\x8e\xeb\x9d\xd0\xeb\x9d\xd4\xeb\x9d\xc2|\xff\xc3|\x1e\x03e\xc2@\x99\x807\u1f46\x8c\xf0\x19b\xfb\xe1\x93\xe0O3dL\xc0\x10'\x19>\b\x9fbȤ\x90!n*|\x18>b\xc8\xd44C\xea\xd3\xe13\xe03\r\x99\x91eH\"\n\x9f\r\x9fcȴ\xd3\r\x89\x9fa\xc8\xf43\ri8ː9m\fi\xce5d\xf4ن\xc4\xf2\f\x99\xd8\u0590\xb2v\x861i\xc69\x86\xe1&\xce5d\xeey\x86\xb4\x9c\x8f\x15\xe5cE\x17`%\xed\xb1\x92\x0e\xb8b\x01\xae\xd8\x11\xbe\x13|!|\x11|g\xf8.\xf0]1s7\xcc\xdcݐ\xaa\x1e\x86\xd4\xf4\xc4\xd5z\x19R\xd1\xdb0\xcaJ\xfa\x18F]m_\xcc\xd8ϐa\xfd\r)\x1d`\xa0P`M\x83\xb0\xb6\xc1\xb8\xda\x10Ü7h\xc1Pr\x98!C\x87c\xfd#\fY8\x12W\x1f\x85\xab\x8f6d\xec\x18\xcc6\u0590\xbaq\xb0\xf1\xb8\xdf\t\xb8߉\xb8\xea$\\u2V:\x056\x156͐\x92\xe9X\xd1\f\\g&\xeem\x16l6\xe6\x98c\xc8\u0e70yhχ-\x80-\x84-¼ņ\x94\xa3V\x97\x97\xc0Jaeȝ\x8d\xb9\x17#G\xe5\xb0\x18r\xef\xc0*\xb0\x0f\x95\xb8\xc3*X5\xac\xc60\xaa溆̪\x85\xd5\x19R]\x8f[\x8f\xc3\x1a`\t,\xa2\x11\x89\x1dф\x1c-1dd3V\xdc\x02[\n[\x06[\x0e[\x01[\t[\x85;Z\r\xbb\x10\x19\xb9\b\xbbv1Vu\t\xfc\xa5\xb0ː\xcb\xcbaW`UW\"3W\x19\xd2x5\xb2\xb3Ɛ\xa6kp\xf7\xd7b\xa5\xd7!\x8b\xd7\xc3n\xc0\xfe\xdd\b\xbbɐA7\xc3n\x81݊\xac߆;\xbf\x1d\x99\xbd\x03\x19\xbdӐQwA\x01w\xe3\x1a\xf7\x18Ry/v\xe3>d\xf5~\x8c]\v{\x00{\xd6\xf2 0\xf7!m=l\xe0\x11~\x04\x98\xf6(0\xec1\xc3X<\xf1q\xdcx\xfc\t\xa0\xe5IØ5\xeb)\xc3X\xb0\xe0i$\xea\x19س\x98\xf29\xf8u\x98~=nm\x03l#\xecy\xd8\vX\xf2\x8bX\xf2&C\xf27\x1b\xd2n\x8b!\xc5[\xd1~\t\xfee\xd8+h\xbf\x8a%\xbc\x06{ݐ\xfeo\x182\xf0M\xdc\xea[\x86\xcc|\x1b\xfe\x1d\xf8w1\xe6=C:\xbdoH\xd1\a\x86\xcc\xffА\x8e\x1f\x19\xb2h\x1b\xda\x1f#\xf6\x89!}?5\xa4\xf03\xcc\xf79\xc6n\xc7y;p\xde\x17\x86\x14|\x89\xf3\xbeB\xfbk\x1c\xff\x06)\xf9\x16\xe7~gȊ\x9dX\xcb.\xa4\xff{Cf\xff\x80\xf4\xfc\x88\xcd\xfd\t[\xf1\xb3!K~\xc1Z\xfe\xc19\xff\x1a2\xe0?\x8c\xdbM\x99\xee!\xf7\x92\xfb\xc8\xfd\xe4\x01\xf2 y\x88\xb9\x80\\H.\"KM\xb1\xcaL\xb1mS\x9cŦ\xb8\xe5\xa6$b\xa6\x94:\xa6\x94U\x98\x12\xab4\xa5\xbaʔ\xfajS\x1ajLitMYR\xcb3\xeb\xc8z2N6\x98\x92\x9f0\xa5c#{M\xe4\x12\xb2\x99\\J.#\x97\x93+L\x19\xb4\x92\xadU\xe4j\xf2B\xf2\"\xf2RS\x86\\fJ\xbf\xcbM\x19q\x05\xecJS\xc6\\\xc5#W\x9b2i\r[ט2\xe3Z\xf4\xaeñ\xeb1\xfe\x06S\x86\xdeh\xe2cҔ\xe17\xe3\x9c[L\x99{+\xfcm&\xde\foǠ;L\x19w\xa7)\xe3\xef2e\xc2\xdd&>&Mc\\\xfc^\xccp\x9f)\x93\xef7e\xeaZ\xce\xfb\x80)\xd3\x1e4e\xfaC\x98\xffaӘ\x1c{\x04\xe3b\x8f\xa2\x15\u007f\f\x83\x1f\xc7LO\xe0ГH\xe1SH\xe1Ӱg\x90\xc6g\x91\xc2\xe7\x10[gJ\xc9zS\xca7 \x95\x1bq\xecy\x13\x9f\x93\xf0/\x9ax;܄\x81\x9bM\xa9\xdcbJ\xd5V\xe4\xf8%Sj^Fn_\xc1\x1e\xbcjJ\xedk\xc8\xf9\xeb\xa6\xc4߀\xbd\x89ܿ\x85I\xdf6\x8d\xda\xd8;\xa6Q\x19{\x17\xad\xf8{\x18\xfa>\xa6\xf9\x00\x87>D\xfb#\xf8m\xf0\x1fs\xf1\x9f\xe0\xea\x9f\xea\x95>\xc3\x12?\x87m\x87\xed\xd0\x19\xbe\xc0\xf4_\x9ar\xfeW\x1c\xf75\xf9\x8diLk\xf8\xd64\xe2\rߙ2k\xa7)M\xbbL\x99\xf2\xbd)u?\xe0H\xed\x8f8R\xfb\x13Z\xb1\x9fъ\xfdb\xca\xc8_MY\xfc\x9b\xe6\xe3w]\xd0\x1f\xa6\x8c\xfe\x13r\xf9\vi\xff\x1b\xf7\xfc\x8fi\f\x1b\xfd\xafi\x94\xc6\xfeCҝ\xddX\x88\xb3\a\xb7\xbb\x17\xb7\xb5\x0f\xf2\xdaoJ\xc5\x01^\xf9 y\x88t[\xfc^\x19\x93\xe45\xe68\xa7yel\xc0\x8b7\x8ad/\xde#\x82^sz<\x96\xe25\xc6U\x840\"\xd5+3\xc2^sxK,\xe2\x95!i^\x19\x9a\ue559\x19^\x19\x95\xe9\x95\xe1Y^\x19\x11\xf5\x1asc\xd9^\x99\x9b\x83\xe1\xa7\xc3\xce\xf0ʸ3\xbd2\xfe,\xafLh㕉\xb9^\x99t\xb6W&\xe7yej[\xafLk\xe7\x95\xe9\xe7`\xdas\xbd2\xf2<\\'v\xbeט\x1e\xcf\xf7\x1a\xc3b\x17x\x91\xc3\xf6^\xef\xb4Xi\xac\x83W\xf2\v\xbc2\xa7#|'\\\xa7\x10+O\x14\x01Vg\xafX]\xbcR\xd2\xd5+\x8dݼR\xde\xdd+e=\xbcb\xf7\xf4╣\x97WZz{\xc5\xe9\x03\xeb\xeb\x95\xca~^\xa9\xea\xef\x95\xea\x01^\xa9\x19\xe8\x15w\x90Wj\a{\xa5~\x88W\xe2C\xbd\xd20\xcc+\x89\xe1^Y<\u008b}\x1a\xe9E\x11\x1f\xe5ž\x8c\xf6b#\xc7x\xbdq\xacd,V0\xce+\xcd\xe3\xe1'\xe0:\x13\xbd\x86\x93\x98\x04X\x93\x01{\n\xe0N\xf5\x1ae\x15ӼFy\xc5t\x8d\xcd@\xb7e&\x960\xcbk4;\xb3\xbdR1Nj\u05f5\xb9^\xbc\xa4\xcd\xf3\x9a\r\xf1\xd8|\\\xafb\x01F,\xc4\x02\x16yͲ\x96X1\x12\x85\xef@n\t\xee\xb6\x14\xd7)ӽ\xb2u\xbaň\x94#\x12ӈ\xa3\x91\n\x8c\xad\xc4\xd8*\xdd\xdej]A\rR\x19w1k\xbc\u058bG\xb0\u038bg\xa0\x1e)\x8e\xe3\xe6\x1a\x90\xc7\x04\xee\xa0\x11\xbe\t~\t\xae\xd9\fk\xc1,K1\xcb2\xf8\xe5\xf0+\xbcƤ\x86\x95^\xc3mX\xe5\x95)\xab\xbdRw\xa1\xd7ߡK\xe7Ν;\\\xe6UI]\xee\rh\xb7P#Wx\x83\x1d\xbah\x8b\xbd+y\xfc*\xf2j\xaf\xb4[\x03\xbb\xc6kL\u037f\xd6k\xd4\xe7_\a\xed\xe5_\x8f\xf4\xe4ߠ\xad\x1b\xb5u\x93\xb6n\xd6\xd6-^sn,\xffV\xaf\xd9\x12˿\rrʿ\x1d;\x99\u007f\an(\xffN\xdcP\xfe]ں[[\xf7h\xeb^mݧ\xad\xfb\xb5\xb5\x16\xb2\xcd\u007f\x00\x99\xcd\u007f\x10\xad\xf2\x87\xd0*\u007f\x18)\xc8\u007f\x04)\xc8\u007fT\x15\xf6\x98n\xee\xe3\x10W\xfe\x13\xd8\xd7\xfc'!\xb8\xfc\xa7\xb0\xd7\xf9OC\x87\xcf \x11\xcfz\x8d\x19\xf9\xcfy\x8dD\xfe:\xaf9.\x96\xbf\xdekV\xc6\xf27\xe0Yh\x88o\xc4~5ğ\xf7\x9a\xc3b\xf9/x\xcd\xd2X\xfe\x8blob{\xb3WFo\xf1Jl\xab\xea\xf7%\x95\xce\xcb<\xfa\n\x8f\xbe\xea\x95\xe2\xd7\xf4\x01y]\xb5\xf9\x86\xae\xf9M]\xf3[\xcc\xd3\xdb\xe4;\xba\xfewu\xfd\xef\xb1\xff>\xf9\x81\xce\xf7\xa1\xce\xf7\x11\xfb\xdbȏ\xc9O\xf0\x00|\n\xfb\f\x8f\xe4\xe7\xf0۽\xc6\x10{\x87\x17\xaf\xcc_\xa8@\xbeT\x81|\xe5\x95\xc1_þ\x81}\v\xfbNW\xb1SW\xb1\v\xcf\xea\xf7xJ~\xd0*\xf0\xa3\n\xf5'<\xb5?C\x8a\xbf\xc0\xff\n\xff\x1b\xe4\xf0;\xe4\xf0\a\xfc\x9f\xf0\u007f\xc1\xff\r\xff\x0fd\xf8/d\xf8\x1f\xb2\xb6\x1bY\xdb\x03\xbf\x17~\x1f\xfc~\xf8\x03\xba惺\xe6C\\\xe7a\xf2\bDw\x14\xa2;\xc6\xdeq\xf2\x04y\x92\xd4g\x8c\x8a\r\xf3a\xbf\x86\xfbd\xc2\b\x9f\xcc\x19铉\xa3|\xa8\xbf\xa3}2i\x8c\x0f\x1a.\x1e\xeb\x93\xc9\xe3|2v\xbcϘ\x1a\x9b\xe0\x93i\x13}2s\x92O\xa6O\xf6\xc9\xd4)>|P\x14O\xf5ɬi>cr\xf1t\\\xa7x\x06N\x9d铑\xb3\xb8\xd8\xd9\xe4\x1c\x9f\xf4\x9f\xeb\x93\xfcy>)\x9a\uf4f6\v|\xd2q\xa1O\x06-\xf2Ia1GX>\xb1J|RR\xea\xc3w\n\x9f\x94\xd9>\xb1\x17\xfb\xa4\xa5\x1c>\x06s|FCq\x85\x0fҭ\xf4\x89S\xe5÷\n\x1f\x9e\xe7\x1a\x84\xe3\xaeO*k}\x12\xab\xf3A\xc7\xf5>\xa3<\x16\xf7A\u007f\r>\xa9N\xf8P\xf0|R\xd3\xe4C)_\xe2\x13\xb7هG\xb2\xb8\xc5'\xb5K}R\xb1\xccg\xd4ǖ\xfb$\xbe\xc2'\x8d+}Ұ\xca'\xf5\xab}\xa8\xcd\xc5\x17\xfa\xa4\xe9\"\x9fQ[|1\xaeS|\tN\xbd\xd4'\x8b/\xf3\x19v\xd3\xe5\\\xf1\x15X\xfb\x95>\xe9t\x15{W\x93k\xc8k\xc8k\xc9\xebȵ\xe4\xb3>\x19\xfc\x1c\xeee\x1d\xeeu=&܀;و\xfe\xf3\xb0\x17\x10{\x11\xb6\t\xf1\xcd\x1c\xbd\xc5'\x89\xad\xc8\xd9\x1b>\xe9\xfb\x16#o\x93\xef\x90\xef\x92\xef\x91\xef\x93\x1f\x90\x1f\x92\x1f\x91\xdbȏ\xc9O\x91\xdbϐ\xdbϑ\xdb\xed\xc8\xd5\x0e\xdc\xf0\x17\xc8\uf5daůp\xe7_#S\xdf \x91\xdf¾Czw\"{\xbb`\xdf#{?\xc0~D\x96~\xf2I\xf1\xcfH\xdd/\xb0_5\xf3\xbf)~\xf7I\xdd\x1f\xc8۟\x9a\xe3\xbf0\xd5\u07fc\xe2?\xe4\xbf\xe4\u007f\xe4nr\x0f\xf4\xb3\xd7g\xb8\xcd\xfbp\xfb\xfbq\x83\a|\xd2\xee \x0f\x1d\"\x0f\x93Gȣ\xe41\xf28y\x82\x15~9\xaf\xd2/\x85Uزj\xbft\xa8\xe1\xd9.Y\x875\xd4\xc3\xe2\xb0\x04\xac\xd1o\xe475\x01\x89%@s3\xf2\xd9\xd0\xe2\xc7\xc7yl)Ҽ\f)^\x8et\xad\xf0K\xedJM\xf5*\xbfQ\x12[\x8d\x91\xb1\v\x91\xf0\x8b\xfcFM\xf3\xc5Hv\xf3%\xe8]\xeaGY\xb9\xcco\x96\x96\xc6.G\xac\xec\n\xe4\xfaJ\xd8U~cx\xc3պ%k\xfcfYY\xec\x1a\xecе\x88_\a\xbb\xdeo\xd4\xd7\xdf\xe0\x97\xa97\xc2n\x82\xdd\f\xbb\x05v+\xec6\xec\xeb\xed\xf0w`\xe3\xee\x84\xdd\x05\xbb\x1bv\x0f\xec^\xac\xea>\xbf1j\xf4\xfd~\x19\xb9\x16\xf6\x00\xecA\xbf4>\x84\xfdz؏o)\x8f\xf8eʣ\xb0\xc7T\x15\x8fc\xf7\x9e\xf0˸'aOa\xd5\xe5O\xa3\xf1\x8c_ʟ\x85\x00\x9e\xf3\xcb\xc4u\xf0\xeba\x1b`\x1b\xfd2\xfey\xd8\v\xb0\x17a\x9bp|3l\vl+\xec%\xd8\xcb\xd8\xfeW\xfc\xf8px\xd5oĚ_C\xefu\xa4\xe0\r\xc8\xf2M\xec\xf6[~õ\xdfV\xbc\x03\r\xbc\v\xd5&\xdeS\xbc\x8fc\x1f`\x91\x1fB0\x1f\xf9e\xce6\xd8Lj}\x86\xfe\xe7\xaa\xed\xedض\x1dP\x92\xbd\x133\xed\xf2\xcb9\u007f\xfae\xe1\u007fܹ\xdd\xe4\x1eh`/4\xb0\x0f\x1a\xd8\x0f\r\x1c\x80\x06\x0eB\x03\x87\xa0\x81\xc3\xd0\xc0\x11h\xe0(4p̏ϩ\xe3\xc8\xf0\t$)v\xd2/\xe7\x9f\xf2\x1b\x05՞$\xa3\xa8H\x92\xa4\xc8H\x92\x8ef\x92\xb4\xf5\xc2|I\xd2ɏ~\x12\xec\xb4$\xe9\x17H\x92A\xc9I\xb2\"\x98$KS\x92dy(I:\xa4&\xf1qO\x92\xfc\xf4$)\xc9H\x92\xf2LXV\x92\x94Ea\xd9I\x12\xcbI\x92\xa6ӓ\xa4\xe5\x8c$\x19}f\x924\x9c\x05k\x93$\u0379IFs\xec\xec$\xa9\xccK\x92\xaa\xb6IR\xdd.Ij\xceI\x92\xf8\xb9\xb0\xf3\x92\xa4\xf8\xfc$\xa9͇]\x90$\xd3\xda'I]\x87$\xa9/H\xc2\x03\xdb\x113t\xe2u\v\xc9\"\xb2s\x12\xbe\xdb\xc0\xbaº%ɐ\xee\xb0\x1e\xb0\x9eIb\xf7\x82\xf5\x86\xf5I\x92\x11}\x93\xc4\xe9\a\xeb\x9f$\x89\x01\xb0\x81\xb0AI\xe2\x0e\xc1%\x87\xe2>F$\xc9\xec\x91I2eT\x92\f\x1e\r\x1b\x93$\xcb\xc6&I\xc18^e<9\x81\x9cHN\"'\x93Sȩ\xe44r:9\x83\x9cI\xce\"g\x93sȹ\xe4\xb9\x80\\H.\"\x8bI\x8b,!K\xc92\xd2&\x17\x93\xe5d\x8ct\xc8\n\xb2\x92\xac\"\xab\xc9\x1a\xd2%k\xc9:\xb2\x9e\x8c\x93\rd\x82l$\x9b\xc8%d3\xd9B.%\x97\x91\xcb\xc9\x15\xe4Jr\x15\x94\xb0Z7\xefB\xec\xf2E\xd8ɋ!\x97K\x92d\xfc\xa5P\xc0eH\xfb\xe5I\xd2x\x05Tpe\x92,\xbe*\tE\xe1\xea$ԕ5\xd0\xc65\x10ԵI\xa8(\xd7A\x18\xd7CU7@M7B\x037AE7C \xb7$IŭI(2\xb7ᔆۓ\x8cX\xec\x8e$<\xdcw\xea\fwa\xf0\xddz\xe1{p\xf6\xbd8\xfb>\x9cy?\x82k\xb1\xdf\x0f$\xe1\xb5\xe7Ah\xeb!\x88\xf4a\b\xe7\x91$ò\x1e\x85:\x1eK2l\xfbqH\xe3\x89$\xc3u\x9f\x84v\x9eB\xa4\xf9i\b\xe5\x19D\xac\xe7xW\xeb\xc8\xf5\xe4\x06r#\xf9<\xf9\x02\xf9\"\xb9\x89\xdcLn!\xb7\x92/\x91/\x93\xaf\x90\xaf\x92\xaf\x91\xaf\x93o\x90o\x92o\x91o\x93\xef\x90\xef\x92\xef\x91\xef\x93\x1f\x90\x1f\x92\x1f\x91\xdbȏ\xc9O\xc8O\xc9\xcf\xc8\xcf\xc9\xed\xe4\x0e\xf2\v\xf2K\xf2+\xf2k\xf2\x1b\xf2[\xf2;r'\xb9\x8b\xfc\x9e\xfc\x81\xfc\x91\xfc\x89\xfc\x99\xfc\x85\xfc\x95\xfc\x8d\xfc\x9d\xfc\x83\xfc\x93\xfc\x8b\xfc\x9b\xfc\x87\xfc\x97\xfc\x8f\xdcM\xee!\xf7\x92\xfb\xc8\xfd\xe4\x01\xf2 y\x88`\xd6\xd4\xd4t\bHmA\x00\x1fs\x1d\x03R\xd2)\x80O\xe5\u0080T\x17\x05\xa4\xb9s@\xea\xbb\x04\xf0\xb1\xda5 U\xdd`\xdd\x03fUUU\x8f\x804\xf6\f\xe0\xf9\xe8\x05\xc4{\a$\xde' \xb1\xbe\xbc\xf1~d\xff\x80\xe4\x0f\x80\r\xd4\x14\fB\n\x06k\n\x86 \x05C5\x05Ð\x82\xe1\x01c\xea\xd4\x11\x9a\x83\x91\xb8\xffQ\xb0њ\x831\x9a\x83\xb1\xb8\xffq\xb0\U0005a0c9\x9cq\x1299`\x0e\x991a\nf\x9e\n\x9b\x16\x90\xe2\xe9\xf03xl&9\x8b\x9c\x1d\x90\xba9\x01\xb32\x16\x9b\x1b0\xcbc\xb1y\x01i\x99\x1f\xf0\x96!\x1d\vp?\xb1\x85\x01Y\xbc(`47\x17\xeb*\xac\x801~|\t\xb6\xa4T\x1be\x013\xaf(\xcf\x0ex\xf3\x8a\x8a\xf2\x16\a\xa4sy@\xba\xc4\x02\xd2\xd5\tH\xb7\x8a\x80t\xaf\fH\x8f\xaa\x80\xf4\xac\x0eH\xaf\x9a\x80\xf4v\x03ҧ6 \x85u\xbct=\x19'\x1b\xc8\x04\xd9H6\x91K\xc8f\xb2\x85\\J.#\x97\x93+ȕ\xe4*r5\x14v!\xec\"\xa8\xecbF.\x81\xca.\xd5\x14_\x86\x14_\xae)\xbe\x02)\xbeRS|\x15R|\xb5\xde\xdc\x1a\x8e\xbc\x86\xbc\x16Y\xbeN\xb3|=\xbb7\x907\"\xd17i\xa2o\x86\xd8nQ\xb1\xdd\n\xb1ݦb\xbb]\xc5v\a\xc4v\xa7\x8a\xed.\x88\xedn\x15\xdb=*\xb6{Ul\xf7Ql\xf7\xab\xd8\xd6Rl\x0f\xa8\xd8\x1e\x84\xd8\x1eR\xb1=\f\xb1=\xa2b{\x14b{\x8cW{\x1cb{B\xc5\xf6$\xc4\xf6\x94\x8a\xedi\x88\xed\x19\x88\xedY\x88\xed9\x8eY\a\xa5\xadgk\x03\xb9\x91|^\x15\xf7\x82*\xeeE(n\x13\x14\xb7\x99\xf1-\xe4V\xe8\xe0%\xb6^ք\xbc\x82\x84\xbc\xaa\ty\r\ty]\x13\xf2\x06\x12\xf2\xa6&\xe4-\x8ez\x9b|\a\tyW\x13\xf2\x1e\xbb\xef\x93\x1f !\x1fjB\xb6\xb1\xfb1\xf9\t\xf9)\xf9\x19\xf99\xb9\x9d\xdcA~A~\x19\x90\x82\xaf\xd8\xfa\x9a\xfc\x86\xfc\x96\xfcN\x1f\xa6\x9d\xaa\xc0]\xec\u007f\xaf\x1a\xfcAW\xf5\xa3J\xef'h\xf0gm\xfc£\xbf\x92\xbfA\x82\xbfC\x82\u007f@\x82\u007fB\x82\u007fA\x82\u007fC\x82\xff@\x82\xffB\x82\xffA\x82\xbb!\xc1=\x986\u007f/P\xbc\x0f\x13\xc6\xf7+\x0e\x04\x8c.E\a\x03FעC\x01\xa3[\xd1\xe1\x80ѽ\xe8H )\xafK^\xa7\xbc.EG\x03fQ\x97\x9e\xc7y\x95\x13\xe4I\xf2\x14\xe9Ifi#\x8dd\x147\xb6\xbc\xa4/\x19\xe5-Y\xcb[2\xca[\xb2\x96\xb7d\x94\xb7d-o\x1c\x90B\x86\xc8T2\x9c\x8cO\xc7H\xb2\x969\xf6\xd3Ɍd|Tf&k\xa9KF\xa9K\xd6R\x97\x8cR\x97\xac\xa5.YK]2J]\xb2\x96\xbad\x94\xbad-u\xc9Z꒵\xd4%\xb3\xd4%k\xa9Kf\xa9K\xd6R\x97\x8cR\x97\xac\xa5.\x19\xa5.YK]2J\x1d/\xd7!\x19\xa5.YK]2J]\xb2QRR\x98\x8cR\x97\x8cR\x97\x8cR\xc71]\x93Q뒍\xaa\xaa\xee\xec\xf6HF\xb1K\xd6b\xc7n\xefdT\xbbdT;\xf6\xfa\x91\xfd\x93Q\xed\xd8\x1a\xa89\x19\x84\x9c\f֜\fAN\x86jN\x86\xf1\xe0pr\x049\x92\x1c\xa59\x19\xad9\x19\xc3\xfeXr\x9c\xe6d\xbc\xe6d\"\xfb\x93\xc8\xc9\xe4\x14r*9\x8d\x9cN\xce g\x92\xb3\xc8\xd9\xe4\x9cd\x16\xc1d\x16\xc1d\x14\xc1d\bp\x01\x0f-LF\rd\xab\x98\xb4\xc8\x12\xb2\x94,#mrq2\na2\na2\na2\na2\na2\na2\na2\na2\na2\n!\x94R\x97,\xa3\x1b\x92\xfd\xa3\nG\x14N*L\xf0\xf4F\xb2\x89\\B6\x93-\xe4Rr\x19\xb9\x9c\\A\xae$W\x91\xab1\U00045c0b0\xf9Ō\\\x02\x11^\xaa\t\xbf\f\t\xbf\\\x13~\x05\x12~\xa5&\xfc\xaadT?\x0eZ\x83\x14O\xbc\x86\xcdk\x93Q\xfd4\xd9\xd7#\xc1\x13o`\xec\xc6d\x14?M\xf5͐\xdf-*\xbf[!\xbf\xdbT~\xb7\xab\xfc\xee\x80\xfc\xeeT\xf9\xdd\x05\xf9ݭ\xf2\xbbG\xe5w\xaf\xca\xef>\xca\xef~\x95\xdfZ\xca\xef\x01\x95߃\x90\xdfC*\xbf\x87!\xbfGT~\x8fB~\x8f\xf1j\x8fC~O\xa8\xfc\x9e\x84\xfc\x9eJ\xd6\xe2\a\xf9=\x93l4[\xcfB\u007f\xcfq\xd0:\xe8o\xbd\xeao\x03\xbb\x1b\xa1\xbf\xe7U\u007f/$k\xe9\x83\xfc6A~\x9byl\v\xb9\x15\xf2{\t\xf6\xb2\xe6\xe2\x15\xe4\xe2U\xcd\xc5k\xc8\xc5뚋7\x90\x8b7\x93\xb5\xf0i*\xde\xe6)\xef \x15\xefj*\xde\xd3T\xbc\xcf\xd8\aHŇ\x9a\x8am\xec~L~\x92\xac\x1f\xb8\x9f\xb2\xfd\x19\xf99\xb9\x9d\xdcA~A~I~E~M~C~K~G\xee$w\x91ߓ?\xe8\xc2~d\xf3'\xf2g\xf2\x17\xf2W\xf27(\xefw(\xef\x0f(\xefO(\xef/(\xefo(\xef\x1f(\xef_(\xef?(o7\x94\xb7\x87\xa3\xf7\x92\xfb\xc8\xfd\xe4\x01\xf2 y\x88\b\x05>\xc4\xee\xc3\xe4#\xe4\xa3P\xe1cA\xfd\xc2\xf18T\xf8\x04cO\x92O\x91OC\x89\xcf@\x89\xcfB\x89\xcf鞭\x83\x10\u05eb\x107\x04\xf5[\xc7\xc6 \n!G\xbe\xa0j|\x11j\xdc\x045nfh\v\xb9\x95|\x89|Y\xf3\xf3\n\xf2\xf3\xaa\xe6\xe75\xe4\xe7u\xcd\xcf\x1b<\xf8&\xf9\x16\xf96\xf2\xf3\x8e\xe6\xe7]\xcd\xcf{\x8c\xbd\x8f\xfc|\xa0\xf9\xf9P\U000f3371\x8f\xc9O\xc8O\xc9\xcf\xc8\xcf\xc9\xed\xe4\x0e\xf2\v\xf2Kh\xf2+\xb6\xbe&\xbf!\xbf%\xbf#w\x92\xbb\xc8\xef\xc9\x1f\xc8\x1fɟȟ\xc9_\xc8_\xc9\xdf \xcc\xdf!\xcc? \xcc?!̿ ̿!\xcc\u007f \xcc\u007f!\xcc\xff \xcc\xdd\x10枠\xb7\xa0K炽A\x1f\\\xe7\x82}A\xbf\xfa\xce\x05\xfb9\xcb\x01\xf2 y\x88j\xf0~\xd5\xe0Zj\xf0\x01\xd5\xe0\x83\xd0\xe0C\xaa\xc1\x87\xa1\xc1GT\x83\x8fB\x83\x8f\xf1\x92\x8fC\x83O\xa8\x06\x9f\x84\x06\x9fR\r>\r\r>\x03\r>\v\r>\xa7\x1a\\\a\r\xaeW\rn\xe0\x19\x1b\xa1\xc1\xe7U\x83/\xa8\x06_\x84\x067A\x83\x9byl\v\xb9\x95|\x89|Ys\xf1\nr\xf1\xaa\xe6\xe25\xe4\xe2u\xcd\xc5\x1b\xc8ś\xba\xddoq\xd4\xdbH\xc6;\x9a\x8cw5\x19\xef1\xf6>\x92\xf1\x81&\xe3CM\xc66\xc6>&?!?%?#?'\xb7\x93;\xa0\xbf/`_\xb2\xf7\x15\xf95\xf9\r\xf9-\xf9\x1d\xb9\x93ܕ\xa2U\xfe{\xb6\u007f\xd0E\xfd\xa8\x1a\xfc\x89\xfd\x9f\xc9_\xc8_\xc9ߠ\xc1ߡ\xc1?\xa0\xc1?\xa1\xc1\xbf\xa0\xc1\xbf\xa1\xc1\u007f\xa0\xc1\u007f\xa1\xc1\xff\xa0\xc1\xdd\xd0\xe0\x1e\x8e\xdeK\xee#\xf7\x93\aȃ\xe4!\xf20y\x84#Uz\xccL\x95\x9e\xb3R\xa5\xd7\xecT\xe9='U\xfa\xccM\xe5\u007f\xab\x98\x97\xea\x83+ʛϋ- \x17\x92\x8b\xc8b\xd2\"K\xc8R\xb2\x8c\xb4\xc9\xc5d9\x19#\x1d\xb2\x82\xac$\xab\xc8j\xb2\x86t\xc9Z\xb2\x8e\xac'\xe3d\x03\x99 \x1b\xc9&r\t\xd9L\xb6\x90K\xc9e\xe4rr\x05\xb9\x92\\E\xae\x86\xc0.T1]\xc4\xee\xc5ڼ\x84\xcdK\xc9\xcbTc\x97\xab\x9c\xae`\xffJ\xec\xebUl]M\xae\xc1\xf1\xe6kؼ\x96\xbc\x8e\xbc\x9e\xbc\x81\xbc\x91\xbc\tr\xbb\x19\"\xb8EEv\xab\xe26\xc6o\x87\xde\xee\x80\xde\xee\x84\xde\xeeRu\xdd\r\x99ݣ\x8d{Ѹ\x8fc\xee\x87\xe0\xd6Bp\x0f@p\x0f2\xf2\x10d\xf50[\x8f@t\x8f\xb2\xf5\x18\xf98\x16\xf8\x04\xae\xf3${OAz\xcf@v\xcfBr\xebTr\xebUr\x1b \xb9\x8d*\xb9\xe71\xe9\v\xa9Fs\xf3\x8b\x10\xdc&\x15\xdcf\x9e\xb6\x05ZڊK\xbc\xa4w\xf72C\xaf\x90\xafBm\xaf\xa5\x1a\xb6\xf3:F\xbc\x81\xb9\x9a\xdfT\xb5\xbdŃoCn\xef\xb0\xf5\x11D\xb7\x8d\xad\x8f\xc9O \xbdO!\xbd\xcf \xbd\xcf!\xbd\xed\x90\xde\x0eH\xef\vH\xefKH\xef+H\xefkH\xef\x1b\x8e\xfe\x96\xfc.Ո\xd5\xec\x04\xaaw\xb1\xff=\xf9\x03\xf9#\xf9\x13\xf93\xf9\v\xf9+\xf9\x1b\xf9;\xf9\a\xf9'\xf9\x17\xf97\xf9\x0f\xf9/\xf9\x1f\xb9\x9b\xdcC\xee%\xf7\x91\xfb\xc9\x03\xe4A\xf2\x10y\x987\xac\u007f\x95?\x0f#[\xe6\x87\xf5\xaf\xf1\x17\x84\xa5ia\xd8h\x89-\nKKqX\xf2\xad\xb04\x97\x84\xa5\xbe4,Uea|P\xdba3\x1e\x8f-\x0eK\xbc<,\xb1XX,'lV\xc6\xe3\x15\x18T\xc9UV\x91\xd5d\r钵d]\x18\x0fS}X\x9cx\x18\xcfQCX\x12\x890\x1e\x9fưLm\n\xe3SpIX\xc67\x87\xf1I\xd8\x12\x16{i\x18\x9f\xcf\xcb\xc2\xe2.\x0f\xe3\xa3yEX&\xac\f\xcb\xe8U8{\xb5\x9e}5g\\C^C^K^\x87\x8c^\xaf\x19\xbd\x01\x19\xbdQ3z\x93f\xf4fd\xf4\x16\xcd\xe8\xad\xc8\xe8m\x1cy\xbbf\xf4\x0e\xcd\xe8\x9d\xcc\xe8]\x9aѻ\x99\xd1{4\xa3\xf7\"\xa3\xf7iF\xefGF\xd7jF\x1f@F\x1fDF\x1fҌ>\x8c\x8c>\xa2\x19}\x14\x19}L3\xfa83\xfa\x84f\xf4If\xf4)d\xf4i\xcd\xe83\xc8\xe8\xb3\xc8\xe8s\xc8\xe8:$k=2\xbaA3\xba\x11\x88?\x8f\x84\xbe\x80\x84\xbe\x88\x84nbB7\xe3\xc4-\x18\xbb\x15c_\xe2b_\x0e\xcb\xecW ⾳\xfb潪b\x9eT\x94\xf7\x9az\xb7(\xefu\xf8\xf9\xee\xfc\xbc7\xe0/\x98\xd4>\xef#\x9e\xb1\x8d\xfc\x84\xfc\x94\xfc\x8c\xfc\x9c\xdcN\xee \xbf \xbf$\xbf\"\xbf&\xbf!\xbf%\xbf#w\x92\xbb\xc8\xef\xc9\x1f\xc8\x1fɟȟ\xc9_\xc8_\xc9\xdf\xc8\xdf\xc9?\xc8?ɿȿ\xc9\u007f\xc8\u007f\xc9\xff\xc8\xdd\xe4\x1er/\xb9\x8f\xdcO\x1e \x0f\x92\x87\xc8\xc3\xe4\x11\xf2(y\x8c\xb9\x80\\H.\"\x8bI\x8b,!K\xc92\xd2&\x17\x93\xe5d\x8ct\xc8\n\xb2\x92\xac\"\xab\xc9\x1a\xd2%k\xc9:\xb2\x9e\x8c\x93\rd\x82l$\x9b\xc8%d3\xd9B.%\x97\x91\xcb\xc9\x15\xe4Jr\x15\xb9\x9a\xbc\x90\xbc\x88\xbc\x98\xbc\x84\xbc\x94\xbc\x8c\xbc\x9c\xbc\x82\xbc\x92\xbc\x8a\xbc\x9a\\C^C^K^G^O\xde@\xdeH\xdeD\xdeL\xdeB\xdeJ\xdeF\xdeN\xdeA\xdeI\xdeE\xdeM\xdeC\xdeK\xde\x17\x91!\xf7Gd\xe8ڈ\x8cz \"\xc3\x1f\x8cȈ\x87\"2\xf3\xe1\x88\xcc}$bL/~4\"c\x1e\x8bȸDZ\xabODd\u0093\xd0\xdeS\x11\x99\xf4tD&?\x131\xe6ƞž?\x17\x91i\xeb\"2}}Dfl\x88\x18\x93\x8b7F\x8cq\xc5\xcfG\x8cQ\xf9/Ddʋ\x11cZlSD\xff\x99\xc6\xe6\x881\xacx\v\xce\xcb\xdf\x1a\x91a/\xa1\x17{9\x82\xfa\x18\x91\xb1\xafFd\xf4k\xb8\xfc\xeb\x11\x99\xf3FDf\xbd\x191f\xc7ފ\x18\x93F\xbcͥ\xbeC\xbeK\xbeG\xbeO~@~H~Dn#?&?\xc1#\xf9)\x1e\xe0\xcfP*>\xc7\xe3\xbd\x1d\x8fՎ\x884~\x11\x91\x96/\xf1\xcc\x17\u007f\x85'\xefk\x14\x94o\xf0@\u007f\x8b\a\xfc;<\xfa;\xf1\x84\xee\xc2\xe3\xff}\x04\x9f\x00?\xe0i\xff\x11O\xf9O\x11i\xf8\x19O\xe7/\xa8\tſ\xa2\xfc\x14\xff\x86ғ\xff{D\xea\xfe\xd0\xe7\xe2ψ\xfe\x93\x8d\xbfP\x80\x8a\xff\xc6y\xf9\xff\xa0\x1c\xfd\xab\xe5迈,ٍ\x92\xb4\aeb/.\xbf\x0f%d?Jǁ\x88\xb1$v0b\xb8\xf6\xa1\x88,>\xcc\xe5\x1e!\x8f\x92\xc7\xc8㭏\xe3\tvN\x92\xa7HO\x9a\x94K\x9aQ^n\xa4I\x8d\x99&e\xde4\xd45_\x9a\xd4\xfbӤ:)MJNK3JJ\x02i\x12ON\xc3#\x9b\x92&\x15\xa14\xa3\xa2\"5MJ\xc3iR\x19I\x93\x86\xb44\xa9MO\x93XF\x1a\nh&P\x93\x05\x94E\x81\x92l\xccW\x9e\x93f\xd4ל\x0eԟ\x01\xc4\xce\x04&\x9e\x95fT\x97\xb4\x01&\xe6\xe2\n\xe5g\x035m\x81x\xbb4\xb3$^~\x8e\xb2\xe1\\e\xc9y\xca\xf8\xf9ʊ|\f\xa9\xb8\x00(m\x0f4t\x00j\v\x80\x89\x1dq\xb8db',\xb2\xbc\x10\xa8)\x02\xca:\x03\xf5]\x80\xea\xae@I\xb743^R\xde\x1d\x8c\xc7{\xe0\x96z\"X\xd1\v(\xed\rT\xf6\x01\x1a\xfa\x02\xb5\xfd\x80\xd8\xe04\x99;\x04\xf9\x19\x8a\xb4\fC6\x86#\x1b#p\xd6H\xc4G#\x0fc\x90\x82\xb1\xb8\xfdq\xb8\xfd\xf1i2q\x02bSӌ\xd2\xcai@lf\x9aQ[2\v\x988;͈\xc5\xe6\xa4ɔ\xb9i\xace\xe4|r\x01\xb9\x90\xb4\xd2\xc4*I×\xd2\xd24\xa3\xd9*K3\x9b-\xdbN3lwq\x9a\xd8\xe5\xe8\xdan\fGl'M܊4\xa3ɪL3\x9b,\xbb*\r{_\x8d\x03nM\x9a$\\\xc4l\xb7\x16\x87\xed:\xc0\xa9ǁD\x1c\xb3$\x1a\xd0r\x12i\xe24\xa6\x99V'\xb7I\x99X\x92\xe6mF\xa79\xcd\a\xd7춤ym\xb7\x93\xbb\x94.\xb1,\xcd\ag'\x96㨆W\xb4\xfa\xc4\xca4/\xc2\xee\xaa4\x13n\xb5v\x9a\xed\v\xb5\xe3^\xa4L\\\x8cq\x88Y\x97\xa4\xf9\xe9\xedK[\x1b\xb6{\x19.\x87a\x97\xd39W\xa4\x99\x89N֕i^о*-)щ\x97\xbbZ\x03\xcd\xf6\x1a=\x9a\xb8\x06Cq\xf8ZL\xa9\x87\xafc\u05fe\x1e\x13\xea\x18\xf7\x06ƛ\xed\x1b\x19O\xdcD\xe7܌\xf5\xa3w\v֏\xc1\x89[\x11u:%nK3\x9dN\xd6\xedi^\ak\xbaC;\xee\x9d\xca\xc4]\x1a\xb2\x13wkg\xc6=i2\xe3\xde4\xef\f\\\xec\xbe4sF\xa7\xc4\xfdJgm\x9a1c\xc6\x03ܧ\aɇȇ\xc9G\xc8G!\x95\xc7\xf4Qz\x1c\x88?\x81\xe7\xe9I<\x00\x15O\x01\xb1\xa7!\xa1gҤ\xea\xd94\xa3\xaa\xfc9\xa0z\x1dP\xb2\x1e\x88o\x00\x1a6\x02\xb5\xcf\x03\xb1\x17\xa0\xb4\x17\xa1\xb4M\xfa,l\x86ܶ\xe8s\xb7U\x1f\xad\x97 \xb0\x97!\xbaW\xf0ܽ\n\xe1\xbd\x06\u1f4e\xe7\xee\r\\\xb0\xea\xcd4\xb3<^\xfe\x96\x8e{[\x9f\xbew\x80\xf8\xbb\xc0\xdc\xf7\x80\x86\xf7\xf59\xfc \xcdh\xa8\xfa0ͬ*\x8f\u007f\x84k\xd5l\x03\xca>F\xbf!\xf6\t\x9aU\x9f\xa2Y]\xfe\x992\xfe9X\x12߮\x8c\xedH3\xeb'\xd6~\x81v<\xfe%\x06\xce\xfd\n\xa8\xfc\x1a\x98\xf2\r\x9e\xe0\xf2o\x81\xaa\xef\xf4\x81\xde\t\xc4w\xa5\x99\xd5\xf1\xf8\xf7h\xce\xfd\x01(\xfd\x11\x88\xfd\xa4\x8f\xfaϸ\xa9\xaa_\xf4\x99\xfd\x15OF\xec7}<~\xd7G\xf6\x0f}Z\xff\x04\xaa\xfe\xd2\a\xf5o\x05\x12\x9f\x01\xce\xe7\xe9f\xb1em\am{\a\x02\xf6\x17\x80\xfb%\x87~\x95n\xb4X_\x03\x89o\x00\xe7\xdbt\x13\xc5\xe2;жw\"`\xef\x02\xdc\xef\xd1o\xb2~\x00c֏\xca\xc4OJ\xe7\xe7t/\"\xd6/\xeal\xfbW\x8dٿ)\xdd\xdf5\xd4d\xfd\x91\x8e\xb7\x94?\x81\xc4_\x80\xf3w:\xdeW\xac\u007f@\xdb\xfe\x17\x01\xfb?\xc0\xddͅ\xecI7ʬ\xbd@b\x1f\xe0\xecO7\xcb,\xeb\x00h\xdb\a\x11\xb0\x0f\x01\xeea\xf4\x9b\xac#`\x99uT\x998\xa6t\x8e\xa7{\x11\xb1N\xa8\xb3\xed\x93\x1a\xb3O)\xdd\xffi\xa8\xc9\xf2d\x18\x15\x96\x00\t\x03p\xcc\f\xb3\x02\xb5\x1cD-G\xc0\xf6\x03n\x12\xfaM\xd6i\x19F\xb9\x15\x00\x12ɀ\x13\xcc0\xcbQ\xcbA\xd4r\x04\xecT\xc0\rg\xf0\xdf\xc6!\xdad\xa5\xb1\x9d\xaem'#Ë\x88\x95\xa9\x0e\xb5\\cv\x94dz\xc9\x1cDʭӕ\x893\x94Ι\x18\x8a\v\x9c\xa5\x0e\xf5\\cv\xae\xd2=\x9bg\xe4e\x98\r1\xab\xad2\xd1N霓\xe1E\xc4:W\x1d*\xba\xc6\xec\xf3\x95n\xbe\x86P\xd13\xf0\xfd\xc0j\xafLtP:\x05\x19^D\xac\x8e\xeaP\xd65f\x17*\xdd\"\r\xa1\xb2g\x98\xb51\xab\x8b2\xd1U\xe9t\xcb\xf0\"buW\x87\xf2\xae1\xbb\xa7\xd2\xed\xa5!Tx\\2n\xf5Q&\xfa*\x9d~\xb8<>\x10\xfa\xabC\x85ט=P\xe9\x0e\xd2\x10*<:-\xd6\x10eb\xa8\xd2\x19\x86\x03\x10\xdcpu(\xf3\x1a\xb3G*\xddQ\xbc\xfb\xd1\x19\xc6bk\f\x90\x18\v8\xe32\xcc\xc5(\xf2 j<\x02\xf6D\xc0\x9d\x84~\x9359è\xb5\xa6\x00\x89\xa9\x803\rkEu\aQ\xdc\x11\xb0g\x02\xee,\xf4\x9b\xac\xd9\x19f}\xb35'ìn\xb6\xe6\xe2\xe4fk\x1e\xaf6\x9f\\@.$\x17\x91Ť\x95!y%\x19RX\x9a!\x1d\xcb2\xa4\x9f\x9d!}\x17g\x98}\xfb\xe6\x95gȠX\x86QT\xe4dH\x97\x8a\f\xe9Z\x99!ݪ2\xa4{u\x86\xf4\xa8ɐ\x9en\x86\xf4\xaa͐\xdeu\x19ҧ>\xc3\xecҹ \x9eav\xed\\Аav\xeb\\\x90\xc80\xbbw.h\xcc0{t.h\xca0{v.X\x92a\xf6\xea\\Мa\xf6\xee\\Вa\xf6\xe9\\\xb04ë\u007f\x1d\xb6,#\xa9K\xe7\x8e\xfa\xe7a˹\xa6\x15\xe4Jr\x15\xb9\x9a\xbc\x90\xbc\x88\xbc\x98\xbc\x84\xbc\x94\xbc\x8c\xbc\x9c\xbc\x82\xbc\x92\xbc\x8a\xbc\x9a\\C^C^K^G^O\xde@\xdeH\xdeD\xdeL\xdeB\xdeJ\xdeF\xdeN\xdeA\xdeI\xdeE\xdeM\xdeC\xdeKޗ!\xd6\xfd\x19b\xaf\xcd\x10\xe7\x81\fq\x1f̐\xc4C\x19\xd2\xf8\xb0>\x90\x8fd\xa0\x86?\xaa\xcf\xdfc\xfaT>\xae\x0f\xe1\x13\xfa\x90>\t4>\x95\x81W\xb5\xa7\x01\xfb\x19\xc0y\x16p\x9f\x03\x12\xeb\x80\xc6\xf5\x19x;\xdb\x00\xd8\x1b\x01\xe7y\xc0}\x01H\xbc\b4n\xca\xc0\xdb\xd5f\xc0\xde\x028[\x01\xf7% \xf1r\x06>\xc0^\xc90c5֫\x19\xf8\xf0\x8a\xbd\x86\x80\xfd:\xe0\xbc\x01\xb8o\x02\x89\xb7\x80Ʒ3̺\x84\xf5\x8e\xd2~W鼧t\xdfW&>P6~\x98\x81w\xa7\x8f2$\xbe\r\r\xfbc\xc0\xf9\x04p?\x05\x12\x9f\x01\x8d\x9fg\xa0\x02n\xcf\xc0\a\xfd\x0e\xb4\xec/в\xbfD\xcb\xf9\n-\xe7k\xb4\xdco\x80ķ@\xe3w\x19fY\x95\xb5\x13\x8fJ\x95\xb5Ki\u007f\xaft~P\xba?*\x13?)\x1b\u007f\xe6s\xfa\v\x9f\xc6_\xf9\x9c\xfe\xc6g\xf2w>\xb9\u007f(\x1b\xff\xcc\xc0g\xcb_\x80\xfd7\xe0\xfc\x03\xb8\xff\x02\x89\xff\x80\xc6\xdd\x19\xa8\xe2{\x00{/\xe0\xec\x03\xdc\xfd@\xe2\x00\xd0x\x90\x9bw\x88\x9d3\xbd(GN\x17\xb4\x9d\xae\x99f\xad\xe3tC\xd3펦\xeb\xf6 {f\xeaW\x8b^\x99\x10po\x1c\xb3\xfadj\x05\xeb\v6\xd9\xfd\xc8\xfeJg\x009\x10\x13\xe2F\a\xb5\xba\xc1\x1as\x87\x90C5\xe4\xba\xc3Z\xddp\x8dY#ȑ\x1a\xb2\xacQ\xadnt\xab\x1b\x93)\xb5ca\xe32%6>\x13\x9a\x9b\x90\xe9\xc5˥3\x11mgR\xa6\xd9\xe08\x93\xd1t\xa7\xa0\xe9\xbaS\xc9i\x99\xfa\xb9<=\x13✁c\xd6\xccL}\x1f\x9d\x056ٳ\xc99Jg.9\x0f\x13b\x8d\xf3[\xdd\x02\x8d\xb9\v\xc9E\x1ar\xdd\xe2Vgi\xcc*!K5\x84\x17\xe7Vg\xb7\xba\xc5ؐr\x1cn\xb0cJ\xc7Q\xba\x15J\xab2\x13orU\x99^\xbc\xda9\xd5h;5\x99f\xa5\xe3\xb8h\xba\xb5h\xban\x1dY\x8f\x80\x15\xcf\xd4W\xc0\x86L}\x99K\x90\x8dJ\xa7\x89\\\x82Y\xb0\xd0\xe6Vע1w)\xb9LC\xae\xbb\xbcխИ\xb5\x92\\\x95\xc9\xd7\xc4խ\xee\xc2Vw\x11\xc4s1\xae\xd7t\t\xc6رKuE\xb1\xcbt\x19\xb1\xcbu\x05\xb1+2\xf1B~e\xa6\x17o\xe8\xceUh;Wg\x9a\xa5\x8e\xb3\x06M\xf7\x1a4]\xf7Z\xf2:\x04\xac\xeb3\xf5M\xfe\x06\xb0ɾ\x91\xbcI\xe9\xdcLނY\xb0\xda[[\xddm\x1aso'\xefА\xeb\xde\xd9\xea\xeeҘu7y\x8f\x86,\xeb\xdeVw_\xab\xbb\x1fr^\x8bM\x8d=\x90\x89\x9a\xf8`\xa6\x17_6\x9d\x87\xd0v\x1e\xce4\xab\x1d\xe7\x114\xddG\xd1t\xdd\xc7\xc8\xc7\x11\xb0\x9e\xc8\xd4/\xa5O\x82M\xf6S\xe4\xd3J\xe7\x19\xf2ŶU=\xd7\xea\xd6i\xcc]OnА\xebnlu\xcfk\xccz\x81|QC\x96\xb5\xa9\xd5mnu[2\xa5z+\xec%\\3\xf62\x1a\xaf\xc0^\xcdD]~-Ӌ\xef\x17\xce\xeb\x99Z\x9e3\xcd\x1a\xc7y\x13M\xf7-4]\xf7m\xf2\x1d\x04\xacw3\xf5{\xc8{`\x93\xfd>\xf9\x81\xd2\xfa\x90\xfc\b\xb3\xe02\xdbZ\xddǭ\xee\x13<\xee\x9f\xe2\xdc\xf2π\xd8\xe7\x99\xf8 ٞ\xe9\xc57|g\a\xda\xce\x17\x99f\x95\xe3|\x89\xa6\xfb\x15\x9a\xae\xfb5\xf9\r\x02ַ\x99\xfaK\xc0w`\x93\xbd\x93ܥt\xbe'\u007f\xc0,\xc8Ǐ\xad\xee'\x8d\xb9?\x93\xbfh\xc8u\u007fmu\xbfi\xcc\xfa\x9d\xfcCC\x96\xf5g\xab\xfb\v5\xe7o\xd8?\xb0\u007fQ\xa6\xec\xff2\xbdx\x05sv\xa3\xed\xec\xc94㎳\x17Mw\x1f\x9a\xae\xbb\x9f<\x80\x80u0S\xbf\xbb\x1f\x02\x9b\xec\xc3\xe4\x11\xa5s\x94<\x86Y\xb0\xa2\xe3\xad\xee\x84\xc6ܓ\xe4)\r\xb9\xee\xffZ\x9d'K\xbf\xeb\vid!dYf\xab\xf3\xb6:_\x96\xc4\xfd\xb0\xa4,#\xdet\x1a\x1a\x014*\x93qBeS\x10\xcdY)\x18\x87*\x14\x82\xc3\x13\x9e\n\x87\a'\f\a)F\xb2\xf47\x824\xa5\x93\x8eP\xccq2\xb4\xe3fj\aE];V4\x8b\xbf+d\xabk\xb2sZ\xdd\xe9t\xce\x19\xad\xee\xcc,\x9f:\xe7\xac\xff\xf7m\x18vs[\xddٌ\xban\xde\xff\xfb\xb6\f[\xedZ\xdd9\x8c\xe2u\xfb\xff\xfdyXu\xec\xfc,|\x18\xe6gy\xf1mƹ\x00m\xa7}\x96\xd9\xec8\x1d\xd0t\v\xd0tݎd'\x04\xac\xc2,\xfd\xd6S\x046ٝ\xc9.J\xa7+\xd9\r\xb3`I\xdd[]\x0f\x8d\xb9=\xc9^\x1ar\xddޭ\xae\x8fƬ\xbed?\r\xe1E\xbb\xd5\rhu\x03\xb3\xa4y\x10l0l\x88\xaeih\x96Qo\x0fS\fςdGdy\xeb\xb1ܑ\b8\xa3\xb2\xccz\xc7\x19\x8d\xa6;\x06M\xd7\x1d\x8b\x11\xee8\xf4\xad\xf1Y\xfa\xfb\xcf\x04\xf4\xad\x898\x03\x13Oju\x93\xb3\xa4~\nl*lZ\x16\u07bd\xa7gy\xf12\xee\xcc@ۙ\x99e.v\x9cYh\xba\xb3\xd1t\xdd9hZs\xb3\xf4u}\x1e\xc6\xe9o&\xadnA\x96,^\x98\xa5\xdfY\x16\x91\xc5J\xc7\"K\xb2\xf0\xfd\xc5qJ[]\x99\xc6\\[;\xae\xbbX;Vy\x16\xbf\xfaIJ|\xfa=\xc7r\xfe\xdfWd\xa1\\U\xe2\x18櫢s\xaa\xe9\xdc\x1a:\xcb\xcd\xd2\xff\x1c[\v6\xdbuJ\xa7^\xe9ƕVC\x16^\x1c\x13\x80Әe\xe2\xc2Mh\xbaK\xd0t\xddf4\xad\x96,\xfd\xe5oi\x96Ė\xc1\x96#T\xb9\"\xcb[\x87\xeb\xaf\xcc2\xea\x9cUYf\x9d\xe3\xacFӽ\x10M\u05fd\bM\xeb\xe2,\xfd\xf9\xea\x92,\xa9\xbb\x14k\xa8\x8aٗ\xd19\x97ӹW\xd0YW\xea\xf6\\\xa5[r\xb5n\xc6\x1a݁k\xb2|5\xf8F\xe8\\\x9be֔;\xd7eyA\xe7z\xed\xb87h\xc7uoԎu\x93v,\xeb\xe6,T\xa6[\xb2\xf4\x8f9o\xe5\x03s\x1b\x1f\x98\xdb\xf9\xa4\xdc\xc1G\xe4Nf\xfa.\xe6\xf8nf\xf5\x1e\xa6\xf3^\xcd\xdb}Y&\x96u\u007f\x96\x17t\xd6j\xc7}@;\xae\xfb\xa0v\xac\x87\xb4cY\x0fC\x11\xb1G8ѣ\x9c\xe8\xb1\xd6]z\x9c\xf3=ѺKOrڧZw\xe9i\x9d\xfd\x99,)y6K\xec\xe7\xb2\xc4Y\x97%\xee\xfa,\xb16d\xe1\xbdm#\xe0<\x0f\xb8/\x00\u058b\xb8\v{\x13\xe0l\x06\xdc-\x80\xb55\v\x1f\xe9/\x01\xceˀ\xfb\n`\xbd\xaa{\xf5\x9a\xee\xd5\xeb\xbaKo\xe8\xfe\xbc\x99e\x96\xc7\x12o)ݷ\x95\xf6;Y^\xd0~W;\xce{J\xeb}\xa46\xf1\x81&\xf9C\xcd\xf9GY\xfa\x03\xe76\xcd\xfcǚ\xf4O\xb0\x88ħ\xba\x9c\xcftu\x9fg\xe9\xef*\xdbu\x8d;ty_@\x02M\x89/\x95\xeeWJ\xfb\xeb,\xaf\xfe\x02\xf8\x8dv\x9co\x95\xd6wz\xf7\x89\x9dL\xc8.f\xea\xfb,~G\xff\x81\t\xfb\x91\xc9\xf9I\xa5\x98\xf8Y\xe9\xfe\xa2\xb4\u007fU\x8d\xda\xf6o\xdaq~WZ\u007fd\xe1k쟀\xfb\x17`\xff\x9d\xa5\xdfb\xffA\xd3\xf9\x17\xb0\xfe˒\xda\xddY\xf8\xf2\xb3\ap\xf7\x02\xf6\xbe,\xfd\x81b?\x9a\xce\x01\xc0:\x98eV\xc6\x12\x87\x94\xeea\xa5}$\xcb\v\xdaG\xb5\xe3\x1cSZ\xc7\xc1\xca\xc4\t\xa5{Ri\x9f\u00a0J\xdb\xfe\x9fv\x1cO\x14\xb4$jTV\x1aQ|\xd71\x01\xd7\vؾ\xa8\xfe\x8c\xe7G\xd3I\x02\xacӢ\xf8\xbe\x14\x00\xdcd\xc0\x0eF\xf5\xb7\xe9\x144\x9d\x10`\xa5F\xf1e!\f\xb8\x11\xc0N\x8b\xea\x0f@\xe9h:\x19\x80\x95\x195*\x12Y\x8a(\xe0f\x03vNT\u007f\x9b9\x1dM\xe7\fř\x80u\x16\x82\x15\x896J7Wi\x9f\x1d\xf5\x82v\x9ev\x9c\xb6J\xab]\x14\xdf\xec\xce\x01\xdcs\x01\xfb\xbc\xa8\xfe\n\u007f>\x9aN>`]\x10\xc5\x17\xa7D{\xa5\xdbAi\x17D\xbd\xa0\xddQ;N'\xa5U\x88\x93b\x89\"\xa5\xdbYiw\x89\xe2)\xb0\xed\xae\xdaq\xba)\xad\xeeQ}\x84\x13=\xe8ܞtv\xaf\xa8O\x9dݛ]\xa7\x0f\x9d\xd57\xaa\xdf\xc7\xfa)\xdd\xfeJ{\x80\x1e\xb0\xed\x81\xdaq\x06)\xad\xc1Q\xa3%1\x04p\x87\x02\xf6\xb0\xa8\xfe\b7\x1cMg\x04`\x8d\x8cJ\xcb(\xd8h\xac\xb0%1F\xe9\x8eU\xda\xe3p\x03\x18:^;\xce\x04\xa551\x8ao\x95\x93\x00w2`O\x89\xeao\xf4S\xd1t\xa6\x01\xd6\xf4\xa8\xfe.?C\xe9\xceTڳ\xa2\xfcY~\xb6v\x9c9Jk.F\xc6\xe6E\xf5[\xe2|\xa5\xbb@i/\x8c\xf2\xe7\x9dE\xdaq\x8a\x95\x96\x15՟\x9aJ\x94n\xa9\xd2.\x8b\xf2\x97&[;\xceb\xa5U\x8e\xf30U\x8c\xceu\xe8\xec\n\xa4Kg\xabdש\xa2\xb3\xaa\xa32\xbb&*\x85n\x145\u0529\x8dj\x9ds\xea\xe0P\t\xeb\xa3>uN\x9c]\xb7\x81]\xd7M\xb0k5\xb2kYMQ\xfe\x8d\x05\xd9L\xb6\x90K\xc9e\xe4rr\x05\xb9\x92\\\x15\x95\xbc\xd5Q)\xb90*U\x17Ee\xf1\xc5Q\x89_\x12\x95\x9aK\xa3\x12\xbb,*e\x97G\xa5ከ\x94^\x19\x95\xba\xab\xa2R}uT\xca\xd7@\xff\xe5\xd7`_\xae\x8dJ\xfduQ\xb1\xae\x8f\x8a{CT\x127Fž)*\xce\xcdQ\xa34vKT\xff85j\xd4\xc6n\x8bJ\xed\xedQYr\a\xfc\x9dQ\xe9\u007fWT\x06\xdeͫ\xdfC\xdeKއ\xab\xdf\x1f\x95Ƶ\x98\xe8\x01<#\xf5\x0fF\xa5\xf9\xa1\xa84=\xac\x13=\xa2x\x14\xd7z\f\xd7z\xb9\x80\\H.\"\x8bI\x8b,!K\xc92\xd2&\x17\x93\xe5d\x8ct\xc8\n\xb2\x92\xac\"\xab\xc9\x1a\xd2%k\xc9:\xb2\x9e\x8c\x93\rd\x82l$\x9b\xc8%d3\xd9B.%\x97\x91\xcb\xc9\x15\xe4JrU\xb6T\xae\xce6*c\x17fK\xf9E\xd9Fy\xec\xe2l<×dK\xe9\xa5\xd9\xfa\u007f\x12\x99-\x15\x97g\x1b\x15\xb1+\x10n\xbe2[\x1a\xae\xca\xd6w\U000abce5lM6\xff?\"q\xa0\xe6Z\x1c\xb8.\x1b\xd5\xedz\xc4o\xc86\xcab7fK\xcdM\xd9R{s6\x8a\xe7-\xd9Rrk\xb6Q\x12\xbb-[\xaaoϖ\xe6;\xb2\xa5\xfe\xcel\xa9\xba+[\x1a\xef\xce\xd6\xff+8 ~o\xb6\xc4\xef˖\xd8\xfd8\xb26[\xea\x1e\xc8\x16\xeb\xc1lò\x1e\xca\x16\xe7\xe1l\xc3q\x1eɖģ\xd9F\xa2\xf21 \xf1x\xb6\x99H4>\x91m\xd47?\x99m\xd677?\x95mT5?\x9dmV57?\x93-\xf6\xb38\xd7y.\xdbp\xddu\x8a\xf5\xe8&6`\u038d:\xe7\xf3\x8a\x170\xf1\x8b:\xf1&,js\xb6\xd1ܼ\x05Wت\x93\xbf\x04X/\xe3<\xfb\x15ĭW1\xca~\r\x93\xbe\x8e\xf3\xec7t\xe67uҷtҷ\xb3e\xc2;\xd92\xfa]t\x8a?Ľm˖\xb6۳\xa5pG6\xff6\xeb\x8bl\xe9\xfbe\xb6\x14|\x95m\x14\x14|\x9d\xad\u007f\xea\xfeMv\xeb\xbf&\xf96\xdb\x187\xf5\xbbl\xc9\xdf\xc9\xfd\xd8E~O\xfe\x90-\x9d\u007f̖.?eKן\xb3\xa5\xdb/\xd9\xd2\xfd\xd7l\xe9\xf1[\xb6\xf4\xfc=[z\xfd\x91-\xbd\xff̖>\u007fq\xf4\xdf\xe4?\xe4\xbf\xe4\u007f\xe4nr\x0f\xb9\x97\xdcG\xee'\x0f\x90\a\xc9C\xe4a\xf2\by\x94\x1b#\xe7\xe0\x92ss\x8c\x8a\xe6y\x98\xa7y~\x8eQֲ\x00WZ\x88+-\xca1\x9c\xe6b\\\xc2\xc2\xe5J\xf42\xa58\xa9\f'\xd98i1.W\xae7\x1a\xc3u\x1c\\\xa7\x02\x97\xa8\xc4}Ua@5\x06\xd4\xe8\xe5\\\xdcU-n\xbaN\x17Q\xaf7\x14\xc7\xcc\r\x98'\x81h#\x867ip\t\xb3\xdfL\xb6\x90K\xc9e\xe4rr\x05\xb9\x92\\E\xaeΑ\xd1\x17\xe6\xc8\xec\x8brd\xd6\xc592\xe1\x12(\xa8[ޥPP\xb7n\xdd\xf2.\xc3^^\x8e\x8b]\x81\x8b]\xa9\xab\xbf*GJ\xafƢ\x1a\xd6\xe4h\xe5\xb9\x06\xf7Zv-\x0e\xd4\\\x87;\xb8\x1ewp\x03n\xe9\xc6\x1c\x94\x99\x9bp_\xf1\x9bua\xb7`\xfd\xb7b\xa2\xdb0\xe4v\rܑ\x83\xd2v\xa7Nw\x17\xa6\xbb;G\xffA\xb9Ngݛ\xa3E\xec>\x8c\xbb\x1f\x13\xc7\xd6\xea\x14\x0f\u0b9b\x1f\xd4\xd3\x1e\xc2<\x0f#\x8d\x8f \xfd\x8f栀=\x96#\xf9\x8f\xf3.\x9e \x9f$\x9f\"\x9f&\x9f!\x9f%\x9f#ב\xeb\xc9\r\xe4F\xf2y\xf2\x05\xf2Er\x13\xb9\x99\xdcBn%_\"_&_!_%_#_'\xdf \xdf$\xdf\"\xdf&\xdf!\xdf%\xdf#\xdf'? ?$?\"\xb7\x91\x1f\x93\x9f\x90\x9f\x92\x9f\x91\x9f\x93\xdb\xc9\x1d\xe4\x17\xe4\x97\xe4W\xe4\xd7\xe47\xe4\xb7\xe4w\xe4Nr\x17\xf9=\xf9\x03\xf9#\xf9\x13\xf93\xf9\v\xf9+\xf9\x1b\xf9;\xf9\a\xf9'\xf9\x17\xf97\xf9\x0f\xf9/\xf9\x1f\xb9\x9b\xdcC\xee%\xf7\x91\xfb\xc9\x03\xe4A\xf2\x10y\x98\x04\x9f\n\x1f\x86\x8f\xc0\xa7\xc1\xa7\xc3g\xc0g\xe6ʈ\xac\\\xb1\xa3\xf0\xd9\xf09\xf0\xa7ß\x01\u007f&\xfcY\xf0m\xe0sse\xe4ٹ\xb28/WF\xb5͕\xf2v\xb92\xfa\x9c\\\x89\x9d\v\u007f\x1e\xfc\xf9\xf0\xf9\xf0\x17\xc0\xb7\x87\xef\x00_\x00\xdf1W\xc6t\xca\x15\xa7\x10\xbe\b\xbes\xae\x8c\xeb\x92+\x95]\xe1\xbb\xc1w\x87\xef\x01\xdf3W\xc6\xf7ʕ\xaa\xde\xf0}\xe0\xfb\xc2\xf7\x83\xef\x0f?\x00~`\xaeL\x18\x94+Ճ\xe1\x87\xc0\x0f\x85\x1f\x06?t\x01t!t\x11t1t\tt)t\x19t9t\x05t%t\x15t5t\rt-\xdcm\x1d\xdcm=t\x03t#\xaa{\x13\xaa{3t\vt+t\x1bt;t\at't\x17t7t\x0ft/t\x1ft?\xf4\x00\xf4 \xf4\x10\xf40\xf4\b\xf4(\xf4\x18\xf48\xf4\x04\xf4$\xaa\xeb\x14\xaa\xeb4\xf4\f\xf4,\xf4\x1c\xf4<\xf4\x02\xf4\"\xf4\x12\xf42\xf4\n\xf4*\xf4\x1a\xf4:\xaa\xe5\x06\x8a\xfb&\xf4\x16\xf46\xf4\x0e\xf4.\xf4\x1e\xf4>K\xfb\x01\xf9\x90|D>&\x9f(\xa5\x855\x98\tf\x86%\xc0\x12aE`Ea\xc5Ji\xf5\x8b\xc3J\xc0\x9e\x84=\x05{\x1a\xf6\f\xecY\xd8s\xa5\xb4\xc8\xf3\xb0\x17`/\xc2^\x82\xbd\f{\xa5\x14\x97\x9f\xe4k\xa5\xd0!\xc0ހ\xbd\t{\v\xf66\xac$\xaf\x96\"u<\x93\x04+\r+\x03K\x86\x95\x85\xbd\x03+\a\xb3\xe0\xfe\x14XyX\x05XEX%XeX\x15\x98\xb5\x94\x16\xb5\xc1RavXUX5XuX\r\x98\xa3\x94ּ&\xec]X-XmX\x1dX]X=\xd8{\xa5\xb4X}X\x03XCX#XcX\x13\xa6\xae)٬\x14fY\xb0\x16\xb0\x96\xb0V\xb04\x98\x93W]\xa4\xbb\x94\x16\xf7\xc0\xbc0\x1f\xcc\x0f\v\xc0\x82\xb0ְ6\xbc\xabm)-Ў\xa1\xf6\bu`(\x84PG\x86:!\xd4\x19\xef\x0eú\xc0\xd2a\x19\xb0\b\xac+,\x13\x96\x85\xf7Fa\xdd`\xddaٰ\x1cX.,\x06끺{\x1f\x96\x87\xb2ˇ\x15\xc0Ⱎ(\x8b^\xb0ވ\xa3\x0f\xac/\xd2\xd4\x0f\xd6\x1f\xe1\x01\xb0\x81L\xc1 \xf2\x03<\xff!l0l\bl(l\x18l8l\x04l$\xea\u007f\x14l4\xec#\xd8ǰO`\x9f\xc2>\x83}\x8e\xf7}\x01\xfb\x12\xf6\x15\xeck\xd87\xb0oa\xdf\xc1\xbeG\xbd\xfd\x00\xfb\x11\xf6\x13\xecg\xd8/\xb0_a\xbf\xc1~Gz\xfe\x80\xfd\t\x1b\x03\x1b\v\xfb\v6\x0e6\x1e6\x01\xf9\xfc\x1b6\x11\xf6\x0fl\x12l2l\nl*l\x1a\xd28\x1d6\x036\x136\v6\x9b9\x9b\x83п\xb0\xb9H\xe5<\xd8|\xd8\x02\xd8BآRZ\xb9\xc5(\xa1%Х\xa5\xb4\x81\xcbJ\x99J\x0f\\\x8e䮀\xad\x84\xadb\x14\xab\x11Z\x03[\x8b\x84\xae\x83\xad\x87m\x80m\x84m*e*\xd7y3Pn\v0p+b\xdb\x06\xdb\x0e\xdb\x01\xdb\xc9\bv\x91\xbbq\xbc\a\xb6\x17>\xb8\x0f\xb6\x1fv\x00v\x90W\x0f\x952u.wX\xe1\b0\xf0(*\xea\x18\xec8\xec\x04\xecd)\xcd{\nv\x1a\xe13\xb0\xb3p\x9cs\xb0\xf3\xb0\v\xb0\x8b\xb8v\t\xc9\xef|\x19(w\xa5\x94\xd6\xf9*\xa3\xbdF^G\x11ހ݄\xdd\xe2\x99\xdb\b݁\xddE\xe1݃݇=\x80=\x84=Bq\xb9\x80\\H.\"\x17\x93Kȥ\xe42r9\xb9\x82\\I\xae\"W\x93kȵ\xe4:r=\xb9\x81\xdcHn\"7\x93[ȓ\xe4)\xf24y\x86IkY!I\xab\x9f\x9a\xa45\xa9\x95\xc4}^\xb2\x0eY\x97\xacG\xbeG\xd6'\x1b\x90\r\xc9Fdc\xb2\tٔlF6'[\x90-\xc9Vd\x1a\xe9\xc4[]\f\xb9I\x0f\xe9%}I\x89\xba\xad\x8a]\xf7CS\xa1\x01\x1eWӃ<\xae\xa6\xb7\x86ڡm\xa0U\xa1my\xbd\xba\xde\x0eZ\rڞ\xc7\x0e\xbd\x03\xefs\xe8!\x9ew\xe8\x1d\xa15\xa0\x9d\x92̸\xde9Ik\x1eN25o\xde%\xc9ܼy\xf3t\x04\x83\x19IZ0\x92d\n6\xef\x9ad\x0e6o\x9e\x99\x94\x006\xcf¥6\xd1$\xadM\xb7$S\x9b\xe6ݓ\xccm\x9a7\xcfN\xd2Z\xe5$i\rs\x93\xb4F\xb1$-\xadG\x92\x16}?\xc9\x14\x8d\xe6%\x99\xa3\xd1h>\x82=\v\x92\xb4\x9e\xf1$S\xcfh\xcf$s\xcfh\xb4WR\x02\x18\xed\x8dK\xbd\xfb$i\xbd\xfb&\x99zG\xfb%\x99{G\xa3\xfd\x93\xb4\xec\x01IZ\xfa\xc0$-cP\x92\x96\xf3A\x92\xc9\xd2\xe8\xc3$S\xa3\x94\xc1I\x89\x16K\xff\x94\x94!IZ\xcaP\x96\xce0r89\x82\x1cI\x8e\"G\x93\x1f\x91\x1f\x93\x9f\x90\x9f\x92\x9f\x91\x9f'i\x95\xbeH\xd2\xfa\u007f\t\xfd\n\xfa5\xf4\x1b\xe8\xb7IZ\x87\uf4b4*\xdfC\u007f\x80\xfe\x88\xf3?\xc1~N\xd2\x06\xfe\x02\xfb\x15\xe1\xdfp\xdf\xef\xd0?\xa0\u007fB\xc7\xc0\xc6\xc2\xfe\xc2\xf18\xe8x\xe8\x04\xd8\xdf\bO\x84\xfd\x03\x9b\x04\x9b\f\x9b\x02\x9b\x8ak\xd3`\xd3a3`3a\xb3`\xb3as\x92\xb4\x8e\xff\xa2\x06\xe6\xe2\xfd\xf3\x92\xb4:\xf3\x11^\x80s\v\xf1\xdc\"\xd8bܳ\x04\xb6\x14\xe1e\xb0\xe5\b\xaf\x80\xadĽ\xab\xa0\xab\xa1k`k\x11^\a]\x0f\xdd\x00\xdd\b\xdb\x04\xdb\f\xdb\x02\xdb\nۆkۡ;\xa0;\xa1\xbb\xa0\xbb\xf1\xde=\xc8\xf7^\xe8>\xe8~\x9c?\x00;\x88\xbc\x1f\x82\x1d\xc6=G`G\xf1\xeec\xd0\xe3\xd0\x13Г\xd0S\xb0Ӱ38>\v=\a=\x0f\xbb\x00\xbb\b\xbb\x04\xbb\f\xbb\x02\xbb\x8a\xeb\xd7\xf0\x8e\xeb\xb0\x1b8\xbe\xc9Z\xb9E\xde&\xef\x90w\xc9{\xe4}\xf2\x01\xf9\x90|D>&\x9f(\xcd/a\xa4\x894\x93\td\"Y\x84,J\x16#\x8b\x93%\xc8'ɧȧ\xc9g\xc8g\xc9\xe7\xc8\xe7\xc9\x17\xc8\x17ɗȗ\xc9W\xc8W\xc9\xd7\xc8\xd7\xc97\xc87ɷȷɒd)R'\x93\xc8\xd2d\x192\x99,K\xbeC\x96#-d\nY\x9e\xac@V$+\x91\x95\xc9*\xa4\x95\xb4\x91\xa9\xa4\x9d\xacJV#\xab\x935H\aY\x93|\x97\xacE\xd6&\xeb\x90u\xc9z\xe4{d}\xb2\x01ِlD6&\x9b\x90M\xc9fds\xb2\x05ْlE\xa6\x91N\xd2E\xbaI\x0f\xe9%}\xa4\x9f\f\x90A\xb25نlK\xb6#ۓ\x1d\xc8\x10ّ\xecDv&\xc3d\x172\x9d\xcc #dW2\x93\xcc\"\xa3d7\xb2;\x99M搹d\x8c\xecA\xbeO\xe6\x91\xf9d\x01\x19'{\x92\xbd\xc8\xded\x1f\xb2/ُ\xecO\x0e \a\x92\x83\xc8\x0f\xc8\x0f\xc9\xc1\xe4\x10r(9\x8c\x1cN\x8e G\x92\xa3\xc8\xd1\xe4G\xe4\xc7\xe4'\xe4\xa7\xe4g\xe4\xe7\xe4\x17\xe4\x97\xe4W\xe4\xd7\xe47\xe4\xb7\xe4w\xe4\xf7\xe4\x0f\xe4\x8f\xe4O\xe4\xcf\xe4/\xe4\xaf\xe4o\xe4\xef\xe4\x1f\xe4\x9f\xe4\x18r,\xf9\x179\x8e\x1cON \xff&'\x92\xff\x90\x93\xc8\xc9\xe4\x14r*9\x8d\x9cN\xce g\x92\xb3\xc8\xd9\xe4\x1c\xf2_r.9\x8f\x9cO. \x17\x92\x8b\xc8\xc5\xe4\x12r)\xb9\x8c\\N\xae W\x92\xab\xc8\xd5\xe4\x1ar-\xb9\x8e\\On 7\x92\x9b\xc8\xcd\xe4\x16r+\xb9\x8d\xdcN\xee w\x92\xbb\xc8\xdd\xe4\x1er/\xb9\x8f\xdcO\x1e \x0f\x92\x87\xc8\xc3\xe4\x11\xf2(y\x8c \x1f\x92\x8f\xc8\xc7\xe4\x13e\xd8\xf3\x93&\xd2L&\x90\x89d\x11\xb2(Y\x8c,N\x96 \x9f$\x9f\"\x9f&\x9f!\x9f%\x9f#\x9f'_ _$_\"_&_!_%_#_'\xdf \xdf$\xdf\"\xdf&K\x92\xa5H\x9dL\"K\x93e\xc8d\xb2,\xf9\x0eY\x8e\xb4\x90)dy\xb2\x02Y\x91\xacDV&\xab\x90V\xd2F\xa6\x92v\xb2*Y\x8d\xacN\xd6 \x1ddM\xf2]\xb2\x16Y\x9b\xacC\xd6%\xeb\x91\xef\x91\xf5\xc9\x06dC\xb2\x11٘lB6%\x9b\x91\xcd\xc9\x16dK\xb2\x15\x99F:I\x17\xe9&=\xa4\x97\xf4\x91~2@\x06\xc9\xd6d\x1b\xb2-َlOv CdG\xb2\x13ٙ\f\x93]\xc8t2\x83\x8c\x90]\xc9L2\x8b\x8c\x92\xdd\xc8\xeed6\x99C\xe6\x921\xb2\a\xf9>\x99G\xe6\x93\x05d\x9c\xecI\xf6\"{\x93}Ⱦd?\xb2?9\x80\x1cH\x0e\"? ?$\a\x93Cȡ\xe40r89\x82\x1cI\x8e\"G\x93\x1f\x91\x1f\x93\x9f\x90\x9f\x92\x9f\x91\x9f\x93_\x90_\x92_\x91_\x93ߐߒߑߓ?\x90?\x92?\x91?\x93\xbf\x90\xbf\x92\xbf\x91\xbf\x93\u007f\x90\u007f\x92cȱ\xe4_\xe48r<9\x81\xfc\x9b\x9cH\xfeCN\"'\x93Sȩ\xe44r:9\x83\x9cI\xce\"g\x93s\xc8\u007fɹ\xe4\xb9\x80\\H.\"\x17\x93Kȥ\xe42r9\xb9\x82\\I\xae\"W\x93kȵ\xe4:r=\xb9\x81\xdcHn\"7\x93[ȭ\xe46r;\xb9\x83\xdcI\xee\"w\x93{Ƚ\xe4>r?y\x80\xf9\x80|H>\"\x1fK\u007f\x98\xcc\xfe\x90L!˓\x15Ȋd%\xb22Y\x85\xb4\x9262\x95\xb4\x93U\xc9jdu\xb2\x06\xe9 k\x92\uf4b5\xc8\xdad\x1d\xb2.Y\x8flI\xb6\"\xd3H'\xe9\"ݤ\x87\xf4\x92>\xd2O\x06\xc8 ٚlC\xb6%ۑ\xed\xc9\x0ed\x88\xecHv\"\xb7&k\xe1m\xc9Z\x97\xed\xc9Z\xfa\x8ed-cg\xb2\x16ٕ\xacuݝ\xace\xeeIֲ\xf6&k\xd1}\xc9Z\xb7\xfd\xc9Z\xf7\x03\xc9Z\xf6\xc1d-\xe7P\xb2\x96{8Y\x8b\x1dI\xd6z\x1cM\xd6\xde?\x96\xac\xe5\x1dO\xd6\xf2O$k\x05'\x93\xb5\xf8\xa9d\xad\xe7\xe9d\xadיd\xad\xf7\xd9d\xadϹd\xad\xef\xf9d\xcdz\x81o\xbcH^\"/\x93Wȫ\xe45\xf2:y\x83\xbcI\xde\"o\x93wȻ\xe4=\xf2>\xf9\x80|H>\"\x1f\x93O\x94\xd5*i0SY\xad\xbf\x19\x96\x80p\"\xac\b\xc2Ea\xc5\x10.\x0e+\x81\U00013c27\xcaj\x15\x9e\x86=\x03{\x16\xf6\x1c\xecy\xd8\v\xb0\x17a/\xc1^\x86\xbd\x02{\x15\xf6\x1a\xecu\xd8\x1b\xb07ao\xc1ކ\x95\x84\x95\x82\xe9\xb0$XiX\x19X2\xac,\xec\x1dX9\x98\x05\x96\x02+\x0f\xab\x00\xab\b\xab\x04\xab\f\xab\x02\xb3\xc2l\xb0T\x98\x1dV\x15V\rV\x1dV\x03\xe6\x80Մ\xbd\v\xab\x05\xab\r\xab\x03\xab\v\xab\a{\x0fV\x1f\xd6\x00\xd6\x10\xd6\b\xd6\x18\xd6\x04\xd6\x14\xd6\f\xd6\x1c\xd6\x02\xd6\x12\xd6\ne\x91\x06s\xa2,\\07\xc2\x1e\xa8\x17\xd7|0?,\x00\v\xc2Z\xc3\xda\xc0\xda\xc2\xda\xc1\xda\xc3:\xc0B\xb0\x8e\xb0N\xb0ΰ0\xac\v,\x1d\x96\x01\x8b\xc0\xba\xc22aY\xb0(\xac\x1b\xac;,\x1b\x96\x03˅\xc5`=`\xef\x97ժ\xe4\x95\xd5:\xe4\x97\xd5\xda\x14 =q\xa4\xa7'\xb4\x17\xb47\xb4\x0f\xb4/\xb4\x1f\xb4?t\x00t t\x10\xf4\x83\xb2Z\x99\x0fa\x83aC`Ca\xc3`\xc3a#`#a\xa3`\xa3a\x1f\xc1>\x86}\x02\xfb\x14\xf6\x19\xecs\xd8\x17\xb0/a_\xc1\xbeF\xbc\xdf \xdeo\xcbr\x14#\xbf'\u007f \u007f$\u007f\"\u007f&\u007f!\u007f%\u007f#\u007fG<\u007f\xc0\xfe\x84\x8d\x81\x8d\x85\xfd\x05\x1b\a\x1b\x0f\x9b\x00\xfb\x1b6\x11\xf6\x0fl\x12l2l\nl*l\x1al:lFY\xad\xe3L\xd8,\xd8l\u061c\xb2Z\xdd\u007fasa\xf3`\xf3a\v`\v\xcbj\xc1E\xb0Ű%\xb0\xa5e\xb5\xda\xcb`\xcba+`+a\xab`\xab\xcbj\xe5\xd7\xc0\xd6\xc2\xd6\xc1\xd6\xc36\xc06\xc26\xc16ö\xc0\xb6¶\xc1\xb6\xc3v\xc0v\xc2v\xc1v\xc3\xf6\xc0\xf6\xc2\xf6\xc1\xf6\xc3\x0e\xc0\x0e\xc2\x0e\xc1\x0eÎ\xc0\x8e\u008e\xc1\x8e\xc3N\xc0N\xc2N\xc1N\xc3\xce _ga\xe7`\xe7a\x17`\x17\x91\xb7K\xb0˰+e5\xd7U\x9c\xbb\x06\xbb\x0e\xbb\x01\xbb\t\xbb\x05\xbb\r\xbb\x03\xbb\xcbR\xbeG\xde'\x1f\x90\x0f\xc9G\xe4c\xf2\xa5w8/'_!_%_#\xf3\xc8|\xb2\x80\x8c\x93=\xc9^do\xb2\x0fٗ\xecG\xf6'\a\x90\x03\xc9A\xe4\a\xe4\x87\xe4`r\b9\x94\x1cF\x0e'G\x90#\xc9Q\xe4h\xf2#\xf2c\xf2\x13\xf2S\xf23\xf2s\xf2\v\xf2K\xf2+\xf2k\xf2\x1b\xf2[\xf2;\xf2{\xf2\a\xf2G\xf2'\xf2g\xf2\x17\xf2W\xf27\xf2w\xf2\x0f\xf2Or\f9\x96\xfc\x8b\x1cG\x8e''\x90\u007f\x93\x13\xc9\u007f\xc8I\xe4dr\n9\x95\x9cFN'g\x903\xc9Y\xe4lr\x0e\xf9/9\x97\x9cG\xce'\x17\x90\v\xc9E\xe4br\t\xb9\x94\\F.'W\x90+\xc9U\xe4jr\r\xb9\x96\\G\xae'7\x90\x1b\xc9M\xe4fr\v\xb9\x95\xdcFn'w\x90;\xc9]\xe4nr\x0f\xb9\x97\xdcG\xee'\x0f\x90\a\xc9C\xe4a\xf2\by\x94 \x1f\x92\x8f\xc8\xc7\xe4\x13\x16M\xd7,Z\xd8d\xd1lf\x8b\xd6%\xc1\xa2\x95K\xb4h\u074bX\xb4Ԣ\x16-\xbb\x98E{\xaf\xb8EK/aѢOZ\xb4\xaeOY\xb4*O[\xb4\x9cg,Z\xfe\xb3\x16\xad\xc7s\x16\xad\xf4\xf3\x16-\xf2\x82E\xb3\xbfhѲ^\xb2h5_\xb6h\xb1W,Z\xf5W-Z\xdek\x16\xad\xe3\xeb\x16-\xe3\r\x8b\xd6\xedM\x8b\x96\xf9\x96E\xab\xfb\xb6E\xcb-i\xd1\nJY\xb4\xf7u\x8bV1ɢ\x95/mѪ\x95\xb1h\xb5\x93-Z\xa5\xb2\x16-\xfe\x8eEs\x94\xb3h=-\x16\xadr\x8aE+[ޢ\xb5\xaf`ђ+Z0C\xb2h\xbd+[\xb4\xa4*\x16\xed\x1d\xabE\xabe\xb3h\xef\xa6Z\xb4\xaav\x8b֡\xaaE\xb3V\xb3h}\xab[\xb4\x1a5,\x9a\xc5a\xd1:մh\xf5\u07b5h\xbdjY\xb4Pm\x8bV\xa6\x8eE\xebSע\xa5Գhu\u07b3$\xb4Ϩ\x11\xaaoIl\x9fa\xab\x11j\xa04\xb5F\xa8\xa1\xa5\b\x8e\x11h\xa4N\xd8k\x84\x1a\xf3\x04\x02MT \x15\x81\xa6\x96\xa2\xea\x16\x84\x9a\xa9{\xaa\xd6\b5\xe7=\b\xb4\xe0=\b\xb4\x94{\x10j\xa5N\xd9\x11H\xe3)\x15r\xaaP\xaa\n\xb9,\xc5\x18\x15\x82n\x15W\xb5\x1a!\x0f\xe3B\xc0˸\x10\xf0I\\\b\xf9\x19\x17\x02\x01\x89\v\xa1\xa0ąPk#.\x04ۨ\xfb\xaa\"Ж\xf7\xa9P;ާB\xed\xe5>\x15\xec\xa0N\xdaU(ē\fvT\xc1T\x06;Y\x8aK\xf2\x10\xee\xac\xd2W\xbdF(\xcc\xf4!Ѕ\xe9C ]҇P\x06Ӈ@D҇PWI\x1fB\x99F\xfa\x10\xccb\xfa\x10\x88J\xfa\x10\xea&\xe9C\xa8\xbb\x91>\x04\xb3%}\b\xe5\x18\xe9C0\xd7H\x1f\x82\xb1\xc2\xf4!\xdcC\xc5Y\r\x81\xf7\x19\xa7\n\xe51N\x15ʗ8U\xb0\x80q\xaaP\\\xe2T\xc1\x9e\x12\xa7\n\xf62\xe2T\xe1\xde\xeaު*ԇ\xf72ؗ\xf72\xd8O\xeee\xb8\xbf:mgp\x00OKx\xa0\n\xa7Jx\x90\xa5\x84Q\x9c8\xf8@\xf9\x9f#\xf4!\xfd\xcf\x11\x1aL\xffs\x84\x86\x88\xff9BC\xe9\u007f\x8e\xd00\xf1?Gh\xb8\xf8\x9f#4\xc2\xf0?Gh$\xfd\xcf\x11\x1a%\xfe\xe7\b\x8d\x16\xffs\x84>2\xfc\xcf\x11\xfaX\xfc\xcf\x11\xfa\xc4\xf0?G\xe8S\xc3\xff\x1c\xa1\xcf\n\xfd\xcf\x11\xfa\x9c\xfe\xe7\b}!\xfe\xe7\b})\xfe\xe7\b}e\xf8\x9f#\xf4\xb5\xf8\x9f#\xf4\x8d\xe1\u007f\x8eз\x86\xff9B\xdf\x15\xfa\x9f#\xf4\xbd\xf8\x9f#\xf4\x83\xe1\u007f\x8eЏ\x86\xff9B?\x15\xfa\x9f#\xf4\xb3\xe1\u007f\x8e\xd0/\x85\xfe\xe7\b\xfdZ\xe8\u007f\x8e\xd0o\xff\xf9\x9f#\xf4;\xfd\xcf\x11\xfaC\xfc\xcf\x11\xfaS\xfc\xcf\x11\x1ac\xf8\x9f#4V\xfc\xcf\x11\xfa\xcb\xf0?Gh\x9c\xe1\u007f\x8e\xd0\xf8B\xffs\x84&\x88\xff9B\u007f\x1b\xfe\xe7\bM4\xfc\xcf\x11\xfa\xa7\xd0\xff\x1c\xa1I\x86\xff9B\x93\v\xfd\xcf\x11\x9aR\xe8\u007f\x8e\xd0\xd4\xff\xfc\xcf\x11\x9a&\xfe\xe7\bM7\xfc\xcf\x11\x9aa\xf8\x9f#4\xb3\xd0\xff\x1c\xa1Y\x86\xff9B\xb3\v\xfd\xcf\x11\x9aS\xe8\u007f\x8eп\xff\xf9\x9f#4\xd7\xf0?Gh^\xa1\xff9B\xf3\v\xfd\xcf\x11Z\xf0\x9f\xff9B\v\v\xfd\xcf\x11Z\xf4\x9f\xff9B\x8b\xff\xf3?Gh\xc9\xff\xfb\x9f#\xb4T\x95g\rGh\x19\xcb\x13\x81\xe5,O\x04VHy\"\xb4\x92\xe5\x89\xc0*)O\x84VKy\"\xb4\xc6(O\x04ײ<\x11X'\xe5\x89\xd0z)O\x846\x18\xe5\x89\xe0F)O\x846\x19\xe5\x89\xe0f\xa3<\x11\xdcRX\x9e\boey\"\xb0M\xca\x13\xa1\xedR\x9e\b\xed0\xca\x13\xc1\x9dR\x9e\b\xed2\xca\x13\xc1\xddFy\"\xb8\xa7\xb0<\x11\xde+\xe5\x89\xd0>\xa3<\x11\xdco\x94'\x82\a\n\xcb\x13\xe1\x83Fy\"x\xa8\xb0<\x11>\\X\x9e\b\x1f\xf9\xaf\xcb\xf4\xaa\xd09I\xaf\n\x9e\x97\xf4\xaa\xe0\x05#\xbd*|Qҫ\x82\x97\x8c\xf4\xaa\xf0e#\xbd*|\xa50\xbd\xeaઊ\xbb\x9a\n]c\xdc\f^g\xdc\fސ\xb8\x19\xbeɸ\x19\xbc%q3|[\xe2f\xf8\x8e\x117\x0f\xee\xaa\xfb\xab2x\x8f\xf7K\xf8>\xef\x97\xf0\x03\xb9_\x0e\x1e\xaa\vv\t?\xe2\x05\xe3\xe0\xb1:H5\x0e\xfegy\xf2\xbf\xee\xd3\x11\xea\\Qk\x15\xae\xa8ew\x81\xa6W\xd4\xdc\x19\x155o\xa4\xa2\x16\xeeZQ+Ȭ\xa85˪\xa8eE+j-\xbbUԺw\xaf\xa8\xb5ˮ\xa8\xf5ͭ\xa8\xa5\xc5*j\xf5\x9f\xa8\xcc\xefA\xa4\x894\x93\td\"Y\x84,J\x16#\x8b\x93%\xc8'ɧȧ\xc9g\xc8g\xc9\xe7\xc8\xe7\xc9\x17\xc8\x17ɗȗ\xc9W\xc8W\xc9\xd7\xc8\xd7\xc97\xc87ɷȷɒd)R'\x93\xc8\xd2d\x192\x99,K\xbeC\x96#-d\nY\x9e\xac@V$+\x91\x95\xc9*\xa4\x95\xb4\x91\xa9\xa4\x9d\xacJV#\xab\x935H\aY\x93|\x97\xacE\xd6&\xeb\x90u\xc9z\xe4{d}\xb2\x01ِlD6&\x9b\x90M\xc9fds\xb2\x05ْlE\xa6\x91N\xd2E\xbaI\x0f\xe9%}\xa4\x9f\f\x90A\xb25نlK\xb6#ۓ\x1d\xc8\x10ّ\xecDv&\xc3d\x172\x9d\xcc #dW2\x93\xcc\"\xa3d7\xb2;\x99M搹d\x8c\xecA\xbeO\xe6\x91\xf9d\x01\x19'{\x92\xbd\xc8\xded\x1f\xb2/ُ\xecO\x0e \a\x92\x83\xc8\x0f*'(/\xfaPd\xb0\xc8\x10\x91\xa1\"\xc3D\x86\x8b\x8c\x10\x19)2Jd\xb4\xc8G\"\x1f\x8b|\"\xf2\xa9\xc8g\"\x9f\x8b|!\xf2\xa5\xc8W\"_\x8b|#\xf2\xad\xc8w\"ߋ\xfc \xf2#\xd3\xfe\x93\x1c\xfc,\xf2\x8bȯ\"\xbf\x89\xfc.\xf2\x87ȟ\"cDƊ\xfc%2Nd\xbc\xc8\x04\x91\xbfE&\x8a\xfc#2Id\xb2\xc8\x14\x91\xa9\"\xd3D\xa6\x8b\xcc\x10\x99)2Kd\xb6\xc8\x1c\x91\u007fE\xe6\x8a\xcc\x13\x99/\xb2@d\xa1\xc8\"\x91\xc5\"KD\x96\x8a,\x13Y.\xb2Bd\xa5\xc8*\x91\xd5\"kD֊\xac\x13Y/\xb2Ad\xa3\xc8&\x91\xcd\"[D\xb6\x8al\x13\xd9.\xb2Cd\xa7\xc8.\x91\xdd\"{D\xf6\x8a\xec\x13\xd9/r@\xe4\xa0\xc8!\x91\xc3\"GD\x8e\x8a\x1c\x139.rB\xe4\xa4\xc8)\x91\xd3\"gDΊ\x9c\x139/rA\xe4\xa2\xc8%\x91\xcb\"WD\xae\x8a\\\x13\xb9.rC\xe4&\x9d\xee\x16y\x9b\xbcC\xde%\xef\x91\xf7\xc9\a\xe4C\xf2\x11\xf9\x98|\xa2\n#\xd2DL\"f\x91\x04\x91D\x91\"\"EE\x8a\x89\x14\x17)!\xf2\xa4\xc8S\"O\x8b<#\xf2\xac\xc8s\"ϋ\xbc \xf2\xa2\xc8K\"/\x8b\xbc\"\xf2\xaa\xc8k\"\xaf\x8b\xbc!\xf2\xa6\xc8[\"o\x8b\x94\x14)%\xa2\x8b$\x89\x94\x16)#\x92,RV\xe4\x1d\x91r\"\x16\x91\x14\x91\xf2\"\x15D*\x8aT\x12\xa9,RE\xc4*b\x13I\x15\xb1\x8bT\x15\xa9&R]\xa4\x86\x88C\xa4\xa6Ȼ\"\xb5Dj\x8b\xd4\x11\xa9+RO\xe4=\x91\xfa\"\rD\x1a\x8a4\x12i,\xd2D\xa4\xa9H3\x91\xe6\"-DZ\x8a\xb4\x12I\x13q\x8a\xb8D\xdc\"\x1e\x11\xaf\x88O\xc4/\x12\x10\t\x8a\xb4\x16i#\xd2V\xa4\x9dH{\x91\x0e\"!\x91\x8e\"\x9dD:\x8b\x84E\xba\x88\xa4\x8bd\x88DD\xba\x8ad\x8ad\x89DE\xba\x89t\x17\xc9\x16\xc9\x11\xc9\x15\x89\x89\xf4\x10y_$O$_\xa4@$.\xd2S\xa4\x97Ho\x91>\"}E\xfa\x89\xf4\x17\x19 2Pd\x90\xc8\a\"\x1f\x8a\f\x16\x19\"2Td\x98\xc8p\x91\x11\"#EF\x89\x8c\x16\xf9H\xe4c\x91OD>\x15\xf9L\xe4s\x91/D\xbe\x14\xf9J\xe4k\x91oD\xbe\x15\xf9N\xe4{\x91\x1fD~\x14\xf9I\xe4g\x91_D~\x15\xf9M\xe4w\x91?D\xfe\x14\x19#2V\xe4/\x91q\"\xe3E&\x88\xfc-2Q\xe4\x1f\x91I\"\x93E\xa6\x88L\x15\x99&2]d\x86\xc8L\x91Y\"\xb3E\xe6\x88\xfc+2Wd\x9e\xc8|\x91\x05\"\vE\x16\x89,\x16Y\"\xb2Td\x99\xc8r\x91\x15\"+EV\x89\xac\x16Y#\xb2Vd\x9d\xc8z\x91\r\"\x1bE6\x89l\x16\xd9\"\xb2Ud\x9b\xc8v\x91\x1d\";Ev\x89\xec\xae\u008dcr/\xb9\x8f\xdcO\x1e \x0f\x92\x87\xc8\xc3\xe4\x11\xf2(y\x8c\x84b~\x84b\x01\xab)?\x1c\xb4\x9a\xfa\x86[[\xd5\xff\v\xad\r\x82Ѷ8\x19o\x87P\xbc=B\x91\x0e\bEB\b\xc5:\"\x14\xebd5\x15\x84;[M\x19\xe1\xb0U\xfd\xffκ \x18M\xb7\xaa\xffqZ\x06\x19\xc1\x89xW\xdc\x15\xc9D(\x92\x85P,\x8aP\xac\x9bՔ\x1b\xee\x0eD\xb3\x81x\x0e\x10\xc9\x05b1\xab)+\xdc\xc3j\xea\x12~\xdfj\xea\x11\xce\xc3a4\x1f\x87\xd1\x02\x1cF\xe38\x8c\xf7\xc4a\xbc\x17\x0e\xe3\xbdq\x18\xe9\x83\xc3H_\x1cF\xfa\xe10\xd6\x1f\x87\xb1\x018\x8c\r\xb4\x9ar\u0083\x80\xe8\a@\xfcC 2\x18\x88\r\xb1\x9a\xfa\x84\x87*\f\x03\xe2\xc3\x15F\x00\xb1\x91\n\xa3\xac\xa6\xbc\xf0h \xfa\x11\x10\xff\x18\x88|\x02\xc4>\xb5\x9az\x85?S\xf8\x1c\x88~\x01D\xbe\x04b_Y\xb5ܯ\xad\xa6\x9e\xf1oXEߒߑߓ\xbf\xc0Y\u007f\x85\xfdƣ\xdf\xc9?P\x89\u007f\xc2Ơ\x12\xc7\xc2\xfeB%\x8e\x83\x8dG%N\x80\xfd\x8dJ\x9c\b\xfbGU\xe4$U\x91\x93UENQ\x159UU\xe44U\x91\xd3UE\xceP\x159SU\xe4,U\x91\xb3UE\xceQ\x15\xf9/+r\xae\xaa\xc8y\xaa\"竊\\\xa0*r\xa1\xaa\xc8E\xaa\"\x17\xab\x8a\\\xa2*r\xa9\xaa\xc8e\xac\xc8\xe5\xaa\"W\xb0\nW\x92\xabTE\xaeV\x15\xb9FU\xe4ZU\x91\xebTE\xaeW\x15\xb9AU\xe4FU\x91\x9bTEnV\x15\xb9EU\xe4VU\x91\xdbTEnW\x15\xb9CU\xe4NU\x91\xbbTE\xeeV\x15\xb9GU\xe4^U\x91\xfbTE\xeeW\x15y@U\xe4AU\x91\x87TE\x1eV\x15yDU\xe4QU\x91\xc7TE\x1eW\x15yB\xd5\xe1I\x85S\xaa\x0eO+\x9cQuxVᜪ\xc8\xf3\xaa\"/\xa8\x8a\xbc\xa8*\xf2\x92\xaa\xc8˪\x0e\xaf(\\U\x15yMU\xe4uU\x917P\x917UE\xdeR\x85~[\x95\xed\x1d\x1c\x86\xef\x02\xd1{@\xe4>\x10{\x84\xaa|\f{\xc2\xc6m\x1e\xd2D\x9a\xc9\x042Ѧ5(b\xd3\xdcEmZZ1\x9b֤\xb8MkT¦\xf9\x9f\xb4iΧlZ\xab\xa7mZ\xd3glZ\xcbgmZ\xb3\xe7lZ\x8b\xe7m\x9a\xe7\x05\x9b\xd6\xe6E\x9b\xa9]\xb3\x97l\xa6\x86\xcd^\xb6\x99|\xcd^\xb1i\xdeWmZ\xbb\xd7lZ\xc3\xd7m\x9a\xef\r\x9bV\xffM\x9b\xe6z˦5~\xdbfjܬ\xa4\xcdT\xbfy)\x84\x9a\xeb\b\x05\x92l&W\xa04B\xce28\xe7L\xb6\x99\xeb;\x9b\x96\xb5\x99\x1b;\x9b\xbe\x83\x13\xder6\xad\xb9Ŧ\x05Rl\xa6\xe6\x81\xf26-X\xc1fr6\xadh35uVb\xba+\x93UH+i\xb3i\x99\xa96Sf\xa6\x1dȯj\xd3r\xab\xd9L\xb9ݪ\x03Y5lZ\x86\xc3f\xcaȨi\xd3\xf2\u07b5\x99\xb23k\x019\xb5\x81.u\x80\xfc\xba@A=\xa0\xc7{6S^V}\x9b\x96\xd3\xc0\xa6uih3u\xe9\xd2\b\xc8ol\xd3\xf2\x9b\xd8L\xf9\xf9\xcdlZ\xb7\xe66S\xb7n-lZzK\x9bֽ\x95M+H\xb3i=\x9c6-\xcbe\xd3\xc2n\x9b)\x1c\xf1\xd8P\xdd^\x9b\xfa\xfbo>\x9b)\x12\xf3۴H\xc0\xa6\xfe\xfe[\x10W\"\xadmZ\xac\x8d\rU\xdb֦\xfe\xfe[;\x9b)\x16i\x8f\v\xb1\x0e6-\x1e\xb2\xa9\xbf\xff\xd6\x11\x97#\x9d\x80hg\\\x88\x87\x11K\xbc\vB\xd1t\x9b\x16\x8d S\xb9]\x81\x8cL ?\vh\x17\xb5\xa9\xbf\t\xd6\ry\xc8\xe8nS\u007f\xf7+\x1b\xc1v9\x80'\xd7f\xca\xe9\x12\x03\xf2{\x00\xed\xde\a\x9cy\xc8Uf\x81M\xfd\x9d\xbe\xb8bAO\x9c\xe8\xd6\v(\xe8\r8\xfb\xd8\xd4\xdf\xe2\xeb\x8b,g\xf6\x03r\xfb\x03\x19\x03\x80.\x03\x81n\x83P\xd9\x1f\xc2G\x06\xa3^\xf2\x87\x00\xed\x86\xdaL=\x9c\xc3l\xa6\xac\xac\xe1\xf0\x91\x116\xf9\x03r#m\xc6\x1f\x90\x1be\xe3\x1f\x8c\x1bm3\xfe\xec\xdbG6\xf9\xb3o\x1f\xdb\xf8\xf7\xde>Ae\u007fjS\u007f\xa6\xed3\xd6\xe6\xef6S\x83\xc0\x1fp\xb2\xe6\u007f\xdaL-\x9a\x8fA\xcd\a\xc6\xc23\x1a\xff\xa5\x9c\xc49\x0e\xfe\xe3\x1ao3\xbb\x9c\xce\tp\x11\xef\xdfʁ\x9c\x13m\xe6\xe6N\xe7?\x88\xc6霄\xd3i\x93mfgӦSl\t\xf5q~*\x04\x17\xa6\xc1\xebҦ\xe3\xf9\xb4\x19\xea\xf9\xa63m\t\xb8蜅F0\x1b\x8e?\a\xce\xfe/\x9c}.\x931\x8f\x9cO. \x17\x92\x8b\xc8\xc5\xe4\x12r)\xb9\x8c\\N\xae W\x92\xab\xc8\xd5\xe4\x1ar-\xb9\x8e\\On 7\x92\x9b\xc8\xcd\xe4\x16r+\xb9\x8d\xdcN\xee w\x92\xbb\xc8\xdd\xe4\x1er/\xb9\x8f\xdcO\x1e \x0f\x92\x87\xc8\xc3\xe4\x11\xf2(y\x8c \x1f\x92\x8f\xc8\xc7\xe4\x13\xa9fKf\x8a\x06榘\xc0\x8c\x143\x98\x97\x92\x00\xe6\xa4$\x82]R\x8a\x80\xf9)ESM\x96\x94b\bvK)\x0e\xa6\xa7\x94\x00\xbb\xa7<\t\x16\xa4<\x05\xf6Hy\x1a\xccJy&5\xc1\x92\x19Ny\x16\x92\x1bNy\x0e\x92\x11Ny\x1e\xa2\xfe\x14\x1b$'\x9c\xf2\"\xa4K8\xe5%H~8\xe5e<\x16Ny\x05\a\xdd\xc2)\xafB\xd2\xc3)\xafA\xba\x87S^\x87\x14\x84Sހ\xf4\b\xa7\xbc\t\xc9\n\xa7\xbc\xa5\ue327\xbc\x9d\xcaMm\xb2\x14\xa9\xe3\x82-EO\x82\xa4\xa6\xe8\xa5!\xf6\x14\xbd\f\xa4j\x8a\x9e\f\xa9\x96\xa2\x97\x85TO\xd1߁\xd4H\xd1\xcbA\x1c)\xba\x05R3EOIM\xb4ج)z\xf9\xd4\"\x96\xb6\xf1H\x8a^\x01\x81f\xf1X\x8a^1\xb5\xa8ŗ\x15\x8f\xa6\xe8\x95pOZ\xe2\x98}\xc51\xfb\x89c\xf6g\xca\a\x90\x03\xc9A\xa9\t-\x9b\xfb\xf4\x0f\xc41?\x14\xc7\x1c,\x8e9D\x1cs\xa88\xe60q\xcc\xe1\xe2\x98#\xc41G\x8ac\x8e2\x1cst\xa1c~T\xe8\x98\x1f\xff瘟\x18\x8e\xf9i\xa1c~f8\xe6\xe7\x86c~Q\xe8b_\x16:\xe6W\x85\x8e\xf9\xf5\u007f\x8e\xf9\x8d\xe1\x98\xdf\x16:\xe6w\x85O}_\xe8\x98?\xa8\x17\xe1ʏ8\xe1T^\xf8\x13N8q\xc7ό\x0eW~)|\xc1\xaf*\xa0\xd2\xf2[a,\xbf\xa7\x16\x83C\x86ի\xfe(\xf4\xcd?\v\xbdv\f.\xb6ˊ\xa8\x8bc\x11\xf4e\xf1\xbe\xbfx6\xa6\x82\xe3xg8E\x1f\xaf\xe2S\xf9\x9fP\xf8\xaa\xbf\x91\x88\xb6x\xf7Dd\xa5\x1do\xfe\xa7\xb0\xbdL\xfa\xaf\xbdL6\xda\xcb\x14\xa3\xbdL-|\xf34\xf54t:+m\x069\x93\x9cE\xce&\xe7\x90\xff\x92s\xc9y\xe4|r\x01\xb9\x90\\D.&\x97\x90KSM\xb6\xb4e\xa9\xa6Դ\xe5\xa9&{ڊTSմ\x95\xa9\xa6ji\xabRM\xd5\xd3V\xa7\x9aj\xa4\xadI59\xd2֦\x9aj\xa6\xadK5۬i\xebA[\xda\x0605m##\xd9Dn&\xb7\x90[S\xb5\xf0\xb6T-\xba=U\x8b\xef\x80\xedL\xd5b\xbbR1\xb3\xdd\rD\xf7\x00\xf1\xbd@d\x1f\x10۟\x8aU\xc3\x01 z\x10\x88\x1f\x02\"\x87\x81ؑT\xac\r\x8e\x02\xd1c@\xfc8\x109\x01\xc4N\xa6b\xea\u007f\n\x88\x9e\x06\xe2g\x80\xc8Y v.\x15S\xff\xf3@\xf4\x02\x10\xbf\bD.\x01\xb1˩\x98\xc8_\x01\xa2W\x81\xf85 r\x1d\x88\xddHŤ\xee&\x10\xbf\x05\xc4n\xa7b\xe6~\a\x88\xde\x05\xe2\xf7\x80\xc8} \xf6 \x153\xbb\x87@\xf4\x11\x10y\fĞ\xb0\x17\x0fc\xa1X\x90\x13\xc9-\xd0\xec\x89\xe1\xec\x1eYa\x93\xbdH8\xa7G$/b\xb6\x9b\xc3y\x91\x04{\x91hn.|8ў\x10\xcdM\xcf*b7\xf7\x8a\xe5\x16\xb5\x17\x89\xe4\xa7\xc73b\xc5\xec\t\xe1\xf4\xbcHq{b,\x9e\x9b\x1e)a7Dzr\x9e\xb4\x17\xe9\x1e\x8eVʋ>eOL\x0f\xe7\x85\v\x9e\xb6\x17M\x0fg\xc7\xf2\xa2\x91g\xecE2\xc3\xd9ٱ\xdcg퉙\u171c\xf0s\xf6\x84\xcchf\xf8y\x9c\x8fGs#\xe1\x17\xf0H\x1c7\xbeh/\x8a\x13\xd9\x19\x91\xbc\x97\xec\tݣٱ\x97\xedŔd\xe6\x85s^\xb1\x17W\xc1\x9cHA$\xefU9\xdd+\\P\xf0\x1a\xa2\xc2\xd5\xd7\xedŔ\xe8\x05\xb1\xdc7\xec\xc5\xd2\xf3\xe2}#Ѽ؛\xf6\xc4\xeey\xb1\xdc\xc8[\xf6\x84\xf4p~\xe4m$1\x96\x17\xcf\r\x97\xc4\xfbb\x95b=JA\xfb\xa4gGt$\x15\xa5\x11͉$ًa\x05\x98\x9d\x8d\xbc\x97\xc6Eu\xb2\f\x1e\x86&\xdb\x133b}#\xb9e\xed\t\x19\x91\xfc\xe8;\xf6\"\x19\xb1\xec\xecp^9\xbb\x19/\xb5\xd8\x13rù\xb1\x14$;7VP\xde^4+\x12\xcd\xcc*ȯ`/\x8abU\xcfW\xb4'\xaaRϯd/\xd2%\x9c\x97\x17ɮ\x8cK\xd1p>\xb2S\x05\x97\xa2\xe9\xf1l\xab=\x01\x1a\xb3ًuQ\xa5\x804\xa4\xda\x13\xbb\xa2,3\xec\xf6\x84\xae\x91HAU<\x1b\xcfϊdW\xc3\xf9\xbcpnzu\xf5\xa2\xf4\x02TY\r<\x1bɏ9\x10i\xd7\b\xea.\xb3\xa6=1+\x92W\xd0\xf7]D\x1eA-\xd5\xc2\r\xe1\xccHm{B\x97HA\xb8\x0e\xceƢ\xb9\x05u\xed\t=cXo\xd8\xcd\xe8\x14\xdeS'\xe3\xb9\x19\xf5\xed\tY\xa8\xaf\x06\x90X^nC{bN4=/\xd6Ȟ\x90\x13͎4\x86\x84ӳ\x9a(\xc9\xeb\xde\xd4^4'\x9c\x9b\x1f\x8d\xe56\xb3\x17\xe1m\xb9\xcd\xd5\xfd(\xc1\x16\xf6bT\xe4\xb6%n\x8ed\x86[\xe1f\b\x8a+\r\xf7\xa8\x8at\xda\x13\xfa\x84\xf32\\\"nH<\x9c\xeb\xb1'fGq\xd1kOȎ\xe6\x85}\xf6ļx\x8fHį\xb4Kv$`7\xe7Er\x82\xf6by1\x14kf$\xb7\xb5=AyB\x1b\xbbɚ\xd5\xd6n\xb2e\xb5\xb3\x9bR\xb3\xda\xdbM\xf6\xac\x0evSլ\x90\xddT-\xab\xa3\xddT=\xab\x93\xddT#\xab\xb3\xdd\xe4\xc8\n\xdbM5\xb3\xba\xd8\xd13d\xa5\x83\xb6\xac\f05+\x02ڳ\xba\x82U\xb32\xc1jYY`\xf5\xac(X#\xab\x1b\xe8\xc8\xea\x0e\xd6\xccʶ\x9bS\xadY9\xa0-+\x17L͊\x81\xf6\xac\x1e`լ\xf7\xed\xe6f\xee\xfayvSF8ߎEf\x81\u074cb\x88\xdbM\xb1`O\xbb\xa9Gz/;?\x13\x93}Ⱦd?{\x91f\x91h~$\xda\xdf^\xc4\xd7'\x16\xef\x15\x1e`/\xea\x0fG\xf3\x11\x1ehOL\x8bD\xbbE\a\xd9\x13\x9a\xe7\xa6W\xfe\x00\xf1\xd4\xff\xd0nʭ?X\x154J\x1e-x\x88ݔS\u007f\xa8\xddԽ\xfe0\xa0\xc1p\xbb)\xad\xc1\b\xbb\xa9i\x83\x91v3\x1a\xe3(\xb8'd4\x1em\xf2\x11\x1em\xf2\xb1\xbd\x04\x1fm\xa2\x9c\xec\x13{q\x1e\xa8\x86\xf4)\"\xca\xfc\fqd~n75\xeb\xfb\x85\xddܽY\xdf/\xed\xe6\xb4f}\xbf\xb2\x9b\x9b6\xeb\xfb\xb5\xdd\xeco\xd6\xf7\x1b\xe3y\xd6\u05f7x&\xfb;\xe49\xfb{<\x98\xfd\x83\xdd\xd45\xe7G\xbc%\xe7'\xe3.V\xf9ϸ+\xe7\x17\xbb)=\xe7Wܕ\xf3\x1b\\#\xa7c\xea\xefhd\x90?\xecf\xf0O$\x132\x86\x97\xaa\x8e\xe5%\xfb_\xea\x92}\x1c/\xd9\xc7\xe3\xa0J\xfe\x04xQ\x95\xfc\x8e\xa9\u007f\xdbM\xee\xf0D$\xd1\x1d\xfe\aIt\x87'!\x89\xee\xf0d8J8c\n\xdc&\x9cQ%\u007f\xaa\xbd(\xb5c\xea4d?\u007f:\x12\x96?\xc3\xfe$\x13\x96\x1fI\x8f\xe5f\xccD\xca\xf2g\xe1bp6.\x06\xe7\x18š\xdaǿ\xb8\x14\x9c\x8b\xf4\x06\xe7\xa1H\x83\xf3qS\xeb\x05\xb8\xa9\xf5B\xe3&個pS\xebŸ\xa9\xf5\x12\xdc\xd4z)\x92\xea\xca\xcaYfOH\x83,G\x9fY9\xa7\xf2\n\xbb\xa9\xc1\xfb+\x91\xfb\xf4U@\xc6j{B\xc3*\xdd3\xd7\xd8\xcd\rc\x95ע\xe8\x1a\xacCm\xf5Yoǀ\xb0\x01\x05\xef\xdeh7Es7\xd9\x13ZVnYy\xb3\xdd\xd42m\v\xe2/\xd8j7e\xe7l\x03r\xb7\xdb\xcd\xe8\x1ew \xd8{'^\xdfe\x97]\xfd_\x8bv\x83\xb1\xec=He\xb3\xbdh\xf6x\xef>\xbb\xd9\xedNۏ\x82\xf2\x1e\xb0\x9b\xf2\xf3\x0e\xdaM\xbe\x9e\x87\xec\xa6\xd6]\x0e\xd3\xf1\x8e\x90G\xd1z2\x8e\xa1\xf5d\x1cG\xeb\xc98\x81֓q\x12\xad'\xe3\x14ZO\xc6i\xb4\x9e\x8c3h=\x19g\xd1z2Ω֓q^\xb5\x9e\x8c\v\xaa\xf5d\\T\xad'\xe3\x92j=\x19\x97U\xebɸ\xa2ZO\xc6U\xd5z2\xae\xa9֓q]\xb5\x9e\x8c\x1b\xaa\xf5d\xdcT\xad'\xe3\x96j=\x19\xb7U\xebɸ\xa3ZO\xc6]\xb0Z\xc6=\xb0z\xc6}\xb0F\xc6\x03Б\xf1\x10\xac\x99\xf1\xc8n\xb6[3\x1e\x83\xb6\x8c'\xd2\xe4[\xae\x88I\xc4,\x92 \x92(RD\xa4\xa8H1\x91\xe2\"%D\x9e\x14yJ\xe4i\x91gD\x9e\x15yN\xe4y\x91\x17D^\x14yI\xe4e\x91WD^\x15yM\xe4u\x917D\xde\x14yK\xe4m\x91\x92\"\xa5Dt\x91$\x91\xd2\"eD\x92Eʊ\xbc#RN\xc4\"\x92\"R^\xa4\x82HE\x91J\"\x95E\xaa\x88XEl\"\xa9\"v\x91\xaa\"\xd5D\xaa\x8b\xd4\x10q\x88\xd4\x14yW\xa4\x96Hm\x91:\"uEꉼ'R_\xa4\x81HC\x91F\"\x8dE\x9a\x884\x15i&\xd2\\\xa4\x85HK\x91V\"i\"N\x11\x97\x88[\xc4#\xe2\x15\xf1\x89\xf8E\x02\"A\x91\xd6\"mDڊ\xb4\x13i/\xd2A$$\xd2Q\xa4\x93Hg\x91\xb0H\x17\x91t\x91\f\x91\x88HW\x91L\x91,\x91\xa8H7\x91\xee\"\xd9\"9\"\xb9\"1\x91\x1e\"\xef\x8b\xe4\x89\xe4\x8b\x14\x88\xc4Ez\x8a\xf4\x12\xe9-\xd2G\xa4\xafH?\x91\xfe\"\x03D\x06\x8a\f\x12\xf9@\xe4C\x91\xc1\"CD\x86\x8a\f\x13\x19.2Bd\xa4\xc8(\x91\xd1\"\x1f\x89|,\xf2\x89ȧ\"\x9f\x89|.\xf2\x85ȗ\"_\x89|-\xf2\x8dȷ\"߉|/\xf2\x83ȏ\"?\x89\xfc,\xf2\x8bȯ\"\xbf\x89\xfc.\xf2\x87ȟ\"cDƊ\xfc%2Nd\xbc\xc8\x04\x91\xbfE&\x8a\xfc#2Id\xb2\xc8\x14\x91\xa9\"\xd3D\xa6\x8b\xcc\x10\x99)2Kd\xb6Ȝ4.\x9fȹ\xe4\xb9\x80\\H.\"\x17\x93Kȥ\xe42r9\xb9\x82\\I\xae\"W\x93kȵ\xe4:r=\xb9\x81\xdcHn\"7\x93[ȭ\xe46r;\xb9\x83\xdcI\xee\"w\x93{Ƚ\xe4>r?y\x80\xf9\x80|H>\"\x1f\x93O8e\xbcr&6\xc2\xec^79\x13Z\x86c\xba\xd9i\xf6D\xf5\x04g\x11.\xd2\xf5Dg\x02\xd6\xe5z\x11\xb9\xb7\xa8Ӝ\x16Ӌ9\x8b\xb4\xe3\xc5\xe2\xce\x04_8W/Qx\xf3\x93r\xf3SNs\x8b\xa8\xfe\xb4\xd3\xdc \xae?\xe34\xb7\x8d\xeb\xcf:\x13ӰNןs&4\rG\xf5睉\r\xb3bq\xfd\x05C_T\x11b\xb2\xad\xbf\xe4L\xf0D#\xfa\xcbN\xb3;\xaa\xbf\x82س\xa2\xfa\xab\"\xaf\xa9Kq\xfdugb\x03\x95\xda7\x10oD\u007f\x13\x11\xc4p\xf4\x16\xf2\xa0\xf4m\xa7\xd9\x17\xd5K:\x8b4T\x9b\rz)gB#<\xa3ˣI\xce\"\xad\xd4\x06\x85^ZN\x97q&\xb4\xc5˓\vO\x97\xc51\xd2\xf0\x8e\xf1\x86r\xceD\x9f:mA\x9a\xe3\xb9z\x8a3\xa1\x05\x1e*\xef47\x8d\xe8\x15\xf0\xf6\xb0^\xd1Y\xc4\xc3'+\xa9\xf4\xab\xf7WfΫ\xa8[#\xbaՙ\xd8D\xa5\xc2\xe6Ll\xaa2\x97\xaa\x92\xa5\x02v\x95mhUgB\xabh\xae^͙\x88\xdc\xc7\xf4\xea\xce\x04\xa8^\xc3in\x16\xd6\x1d΄ָ\xa5&\x92\ny\x17G\x91\xa8^K\xee\xa8\xedLl\xa1RX\xc7in\x15\xd5\xeb\xe2\x9dq\xbd\x9e3\xc1\x8dw\xbe\xe747\x89\xeb\xf5\x91\xbc\xa8ހl\xe8Lp\xa2\xc8\x1b\xa9:\u009aRo,\xf9h\"\xd2T\xc5\x18ћ\xa9\xac\xc7\xf4\xe6|\xa2\x85\xd4uKu)\xaa\xb7r\x9a[\xc7\xf54u\x10֝H[\\w\xe1%aݍ\xb7GtOaֽ\xceD\xb7J\x94\x0f\xaa\xca\xc4\xefLD\xe1\xc4\xf4\x00\x1f\t\xb2\f\xa2z\xebªiS\x18h\xcbw\xb6C\x02P\x14\xed\xe5\xd5\x1d\x9c\ti\xc8LH\xd2ؑ\x1eى\x15\xde\xd9in\x13\xd5\xc3\xce\"\xdcjһ\x88?\xa5K\x85f8\x13\x9a\x85\xb3\xf5\x88D\xd2U\xf9M\\\xcft&\xfa{ų\xf5,q\xa3(k\xa8\x9b3ѩ\x9e\xef\xae\xde\x10ֳ\xe1\xfa\x91l=Gnɕ\xe7cN\xb3+[\uf064\xe0\r\xef;\x13[\xa9\xaa\xcbs&4\xc4+\xf2\x9dfo\\/\x80\xbb\xc7#z\\\xfc\xa6'\x8b\xbe\x97\x8a#\xac\xf7v\x9a\x9da\xbd\x8fJ^\xae\xde\x17\xe7b\xd9z?\xa7\xb9q\xb6\xde\x1f\x95\xaf\xd23@\xde2Pn\x19\x84x\xf1\xea\x0f\x94\xafE\xf5\x0f\xe5\xe4`\xe3\xa5C\xc4O\x86\xb2\xa4\x86!\xc9x\xe9p\\S\xc5;\x02-2\xac\x8fd+\x1b\xa5\xeaB\x95\xe9h\xc9\xc8G\"\x1f\xe3\xbdy\xfa'\xea\rq\xfdS\xde\xf9\x19\xf99\xf9\x05\x92\x0f\xff\xfe\x92\xf5\xf4\x15\xcb\xfak\xd6\xf97\x86\x9b}\xcbF\xf5\x1d\"CҾG\xd2\"\xb9\xfa\x0f\"?\xb2\x1d\xfc\xa4\x9a}D\xff\x99\a\xbf0\x86_\x19\xfe\x8d\x85\xfd\xbb3\xc1\x8fv\xf6\x873\xb1\xb5*\xf3?\x9d\x89-\x95\x8eq\x9a\xfda}\xacz\t\xf2\U00057abb\xa8>\x8ey\x1co4\x90\t\xce\xc4f*?\u007f#\x93q}\xa2\x94\xd8?\x85\x95?\xc9H\xdfd\u0530\xd2)\x85\ryj\xe1\x1dӌ;\xa6\xd3wf\xa8n W\x9f\x89~)\xa6ϒ\xc6?[\x92>G\x9aٿ,\xd4\\}.\x0e\xd1 \xe7I\xab\x9b\xefL\xf0\"\xaf\vD\x162O\x8b\xe0\xfca}\xb1\x91\xa5%L\xf5R)\xeeer\xdfr6\x8f\x15F\xe7\xba\xd2in\x17\xd1W)w\xcb\xd5W\xa3{\x8b\xebk\x8c\xceo-\xd2\x13\xd6\xd7\x15\xf6\xa9\xeb\xe5\x9e\r҇l4:\xa3M\xceD\xaf*\x89\xcdF\x87\xb7\x05\xce\x16ӷJ\xff\xbb\r\xfe\x81\x1a\u070e\xa3>a}\anQ\x11\xed\xc4+\xa3\xfa.I\xd4n\x16\xf6\x9e\u0097쥯\xees&\xaar\xd2\xf7\x1bz\x00\x15\x85l\x1fD\xa9\xabw\x1cB\xb9*=,\x19:\xc2\x06\x9d\xab\x1f\x15\xe7<\xc6<\x1fw\x9a\x1bE\xf5\x13\xaa\xf8\xa2\xfaIU|x\xe0\x14/\x9df%\xc6\xf43\xaa\xa5\xab\x97\x9e\x85\x1f\x85\xf5sR\x8b\xe7y\xcf\x05V\xecE\xb41\xbc\xe0\x92\xbc粴\xc9+\xc6\xe3W\x9d\x89m\xd5\xd3\u05cc\xd7_/\xecpnp\x90\xb8)\xfd\xe4-z\xecm:S\xae~G\n\xef\xae\xf4j\xf7\x8c~\xf8\xbeQ0\x0f\xe4=\x0f\x8d\xca{\xe4L\xc0e\xfd1s\xf2?ܫN>\xe12ޢ\xb9\x94;\x9b\\\tnx\x82٥\x1aL\x82\vu\x8ax\x13]\xf0\x92\\\xbd\x88\v^\x92\xab\x17u\xa9\f\x15s\xc1\x9fr\xf5\xe2.\xf1\xf1\x12<\xf9\xa4K\xb9\xccS.s}\x8c\x8a.\x95\xd0gx\xe6Y\x97\xaa\x85\xe7\\\xaa7}^=\x88\x11\xd1\xc5\xda\u007fѕ\xd0\x00\xef{\xc9E\xb7|\x99\xf7\xbd\xe2J\xf4\xab8_-L\xdak.\xba\xf0뮄f\xa8\xb57\x94D\xf57\x99ķ\\\t\rq\xf0\xb6\xcb\x18qJ\xba\xe8(\xa5\\th\xbd\xf0t\x12nC\xef_ڥ\x1ak\x19\x97xA\xb2\xcb\x18\xcd˺\x8c\x8a{\xc7E\xff*\xe7\x92\xf2\xb3 \xa9j@\x94\xac\x96\x978+\xb884Ut\xc9z\x0eq\xa9\x17Tv\x99\x9dq\xbd\x8aK\xb58\xab\xcb\xdc4\xae\xdbp&\xaa\xa7\x92v\x17\x1b_Ud\x16\xf7Vs\x99\xdb\xc4\xf5\xea.\xf1\xa1\x1a.\f\x8aȝÕ\xe8C\x9f\xa6\xd7D=\xc4\xf5w]\xaa+\xaa\xe5Jl\xa0*\xb46\x8f\xea\xb8\xe8/u]\xca\x1d\xea\xb1\xc0\xdf\xe3\x85\xfa,\xf0\x06.\xa3Sl\xc8j\xcb\xd5\x1b\xa1\xa0 \x8d]\xec؛H\x117\x95\xe47s\xa99Ks\xbe\xab\x05\xc2Q\xbd\xa5z?*\xbb\x95\xcb\xdc0\xaa\xa7If\x9d.\xe5+.y\xc6\rA\xf9{\xa46\xbc.qW\x9f\xcb\xec\x8f\xea~\x95\vD\x1fp\x99\x9bE\xf4 cl\xedb+k\x83*Aٷe}\xb5c\xb2ۻT\xa3\xee \xf1\x85\\\t-\x11_GW\xa2S\x95G'\x974\xc6\xce,\xb9\xb0Q\xbe]\x98\xd2t\xbcS]ˀo\x85\xf5\x88K\x1aJW\xa9\x8aL\x97\xb9eXϒ\x83\xa8\xf8q7Wb35\x1awg\xb2\xb2Q\xbd\xc8a\x8e\xcb\xe85s]j\x8a\x1332\xd2C\xd5\x0e\x06@zi\x9e+Q}M\xd2\xf3\xa5\xcc\v\\jd\x89\xbb\xa4\x8f\xeaI\xa7\xee\x85\xe2E}\xf5\x16\xaf\xec\xe3\xe2\x80\xd6\x17iR\xe9\xed\x87\\\xa8\xa6\xd3\xdf%\xbd\xfe\x00\x96\xea@\xe6~\x90\x8b=\xd5\a\xca\r\x11ۇF\xc5\x0f\x96\xe2\x1a\x82\xe2@\x04C]\x9c\x94\fsq\xdc\x1f\xaeR\x1e\xd5G\xf0\xf9\x91.\x0e\xa1\xa3pc<\xac\x8fv\x15Q\x93\xaeL\xfd#\x97\x9a$}\xec\xe2\xfc\xe2\x13yǧ.sZT\xffL\xea\xefs\xfa\xdd\x17R}_\xc2gr\xf5\xaf\xf0L\\\xff\x1a\x1e\x82S\xdf0\x93\xdfJ\x1b\xf8Ψ\x86\xef\xd5\xcb\xc2\xfa\x0f\xf2\xce\x1f\xa5E\xfc\xe4Jl\xaa.\xfel\xf8\xee/L\u05ef.5W\xf8\xcd%]\xd3\xef.N\x91\xff\x90\x02\xfc\x13I@\x06\xc6\xf0}cQS\x18\b\x8d\xa2\x19\xa7\"A\xfeǣ\x88\"\xfa\x04\x97̦\xfeFǢjn\xa2K\xf5\x8eQ\xfd\x1f\xc3=&Aի'K\xff1\x85\xbd\xccT\xd4\x01\x921\xcdU\xa4ET]\x9c\xee2\xe6\\3\x8c\xb8g\x8a\xab\xcdr\xc9H4\xdb\xc5\x01r\x0eS\xf3\xafKM+\xe7\xba8\x89\x9a\xe7\x92!v\xbeQ)\v\xa4R\x16\xb2a/ra\x86\x99\xab/V\xed*\xa6/Qހå\xea\x16\x8c\x86\xf4\xef\xe5.5m[\x81\xac\xc4\xf5\x95.Sc}\x95\x8bS\xf2\xd5,\xfb5\xae\"-YWkQ\x02q}\x1d\x13\xbf\x1e9A\x99n`\x19nd\x0f\xb8\t}\x83\xbam\xb3\xcb\xdc.\xaeo1\x8ad++x\x9b\xd1\x06\xb6+\xbf\xcb\xd5w\xb8d\xe4\xdfitj\xbb\xa4\x03\xdc\r\xffG\xa9\xedA\xff\x10\xd7\xf72\xd2}L\xda~Fr\x80g\x0e\xbad&{Hy~L?\xcc\x1c\x1ca\x97rTj\xef\x98t}ǥ\xcf>\xc1\x1bN\xb2\xc1\x9f\x92\x1e\xf5\xb4Q\xa2g\xa4ٝuq\x86x\x0e>\x84\xa7\xcf\xf3]\x17\xc4w/\xca\x1d\x97\f\xf7\xb8,Q^aB\xae\xb2y^cE\\gFb\xfa\r\xc9\xc1M\xe3\xfe[,\xed\x98~\xdb\xc5\xd9\xdd\x1d\x17Ʋ\xa8~\xd7%#\xde=v\xec\xf7\xe9\xd3\x0fdHy\xc8\xc4>\x92\fY\x13\xba\xd9Ƿu\xabѵ\x9d\x9b}S{7;\xda\x0en\xe9\x80B\xe2C\x1d\x99\xfbN\xee\"\xcd\xd8ot\x16\xd7\f\xbbe\xb4\xed\xe2\x96֗.\t\xc9p\xb3k\x8f\x18\xb9\xef\xeaV}N\xa6\x9b\v\xda,\xb7\x1a\x80\xa2n\xd5ܺ\xb9Uk\xe8.E\x9amTw\x8e[v.r\xddjp\x8b\xd1\xc5zH\xf2\xdfw\xb3\xd7\xcfs\xab\x9e!\x1fթ\n\xb3\xc0\xad\xba\xeb\xb8[:؞n\xb3\vkB7\x17@\xbdE\xfaH\x16\xfa\xa2\xde\xc3z?\xb7\xeak\xfbKI\x0f\x90r\x1c\xe8\xe6\x84tP\xa1\u007f~\xe0\x96E!*\x19\x8f\x0f\x96\xf4\rq\xab.l\xa8\x9b\xfd\xd10\xa6\u007f8\xea[%a\x84;ѫ\x92>ҭ\xfa\x99Qn5\xfc\x8cvs\x91\xf7\x11\xa2B\x1c\x1f\xbbբ\xf1\x13ԥ\x8a\xffS\xb7L\x8c>3*\xeas7;\xf2/$Q_\xbaU\xff\xf8\x95[M\x83r\xf5\xaf\r\xbf\xffFZ\xe6\xb7F\x83\xff\xce\xcd\xee\xe7{7{\xd9\x1f$\x87?\xba\xa5\xcb\xfa\xc9-]\xf3\xcfRK\xbfH\xdb\xfeU\xb5\u0098\xfe\x9b[\xa6\x19\xbf\xbb\xd5\xfc\xe2\x0fý\xfe\x14\x0f\x1c\xe3\xe6\xbab\xac\x9b\xa3\xe4_F\xfaƉ{\x8f\xc7[ЇM\x90W\xff\x8dւ\xe8&\xaa֒\xab\xff\x83\xa6\x87\x14L\x92\xbej\xb2\x91\x80)*\x9e\x98>ը\xdaiF72\xddh\xa03\xdc\xe6\xfa1}\xa6ۘ\x1cϢ\xc3\xcf6\xda\xdb\x1cD\x85\x92\xfb\xd7mL\x8e纍\xbd\x9fyF\xe72_:\xcd\x05\xd2\x14\x17\xba9\xc9\\\xe46\x16\\\x8b\x8d\xa6\xb9D\\r)]|\x19\x8bv9]`\x85\x94\xd9J\xb6\xa1\x98\xbe\xca-+E\xb7,H\xd7\xf0\x9e\xb5\xe8#q\xb0Ψ\x83\xf5n\x19\xdb6H\x81n4\x9a\xfb&\xa3c\xd9\xec66ն\xb8\x8d\x89\xddV\xa3\x12\xb7\xb9e\xe4\xdc\xee6&\x06;\xdc\x1c\xabw\xaa&\x87\xb1ҭ\x96\xa7\xbb\x99\xb8=n\xce\r\xf7\x16\xfa\xe2>\xb71\xad\xda\xef\x96\xfd\x87\x03\xecn\x0f❪(\x0f\xb9e\xe1~X<\xf9\b\x1b\xcdQ\xf8\xb3Z0\xba\xb9@9^X\xbe'\x8c\xf6x\xd2\xcd\x19\xf8)\xb7\xcc{N\xbb\xb9\xe9s\x06iU1\x9e\x95\xc6p\xce\xc8\xeby\xf1\xbb\v\xaa\x17\xb9h\xb3\xbbG\xedhe{d5\x94\xa3\xbc%\xae\xe7zT\u007f\x12\x13\xaf\xed!\xbe\xf8\xbeqK\x9eG\xa6\x84\xf9\x1e\x99)\x16xd\xa2\x17\xf7\x18+K\x8f\xeadzyԴ\xa8\xb7GF\xab>\x1e5o\xea\xeb)\xe2\xee\xd1\v5\xd4\xcf#\xe3H\u007f\xa3\t\rP\x99C\xae\x06zT\x174\x88\xcd\xef\x03\x86?4\xbcf\xb0\xc7\xe8\xfd\x86Hq\f\xf5$\xc0\x8b\xf4a\x92\xb5\xe1FU\x8f\x90\x8b#\x912\x15\xfd(\xb9i\xb4G\x8d\xf2\x1f\x15\xc6\xf01\x0f?\x91\x86\xf9\xa9\a\xc3uX\xff\xac\xf0\xe2\xe7\x12\xc3\x17\x1e\xe93\xbe\xf4pU\xf9\x95\x87#\xf1\xd7\x1e5\x19\xf9\xc6\xf0\x83o=j]\xfa\x9dG\xc6\xef\xef=\\\xb3\xfe\xe0\xe1l\xe3G\x0f'G?I\xff\xf2\xb3ѿ\xfc\u008c\xfd\xca\xe7~\x93\xba\xff\xdd(\xc4?\x8c6\xfd\xa7ǘލa\xf9\x8d52\xf6\x97G\x96\xf2\xe3<\xdcg\x18\xafj$G\x9f\xe0Q3\x89\xbf\xe5\x95\x13\x19\xed?F%L\xf2ȸ2Y\xba\x97)F\x89L\xf5H\x9f8\u0378m\xbaG\xed#\xcf(l\x183=\xec\xb0g\xf1\xec\xec\xc2Nb\x8eGu\xb5\xffzdF<׃5M\xae>\x8f\xef\x9e\xefag\xbc\xc0x\xdbB\xa3\x1d-\x92>g\xb1\x87\x13\x9e%F-/5\x9cu\x99\xb4\xfc\xe5x\x16u\xb7\x82\xadd%\x9df\x95G\xf5\xff\xabU\xe1\xa3\xd8\xd6xd\xa8_k<\xb7\xae\xd0q\xd7{d|\xde\xe0\x91\xbd\xbd\x8d\x1eن\xdad$c\xb3\x87+\x89-\xc6{\xb7J\xd5l\xf3pR\xb0\x9d\x95\xb0\x83\rf\xa7GfD\xbb\x8c\xe2ݭJ?\x8eV\xb6\xc7ù\xc8^\xb6\xdd}\x1en0\xef\x97^\xf8\x80\x87\x03\xd6A\x91CF\xef{\x98\r\xe6\b\xfbѣ\xf4\xdcc\x1e\x0e\xa4\xc7EN\x88\x9c4\xca\xff\x14k\xf7\xb4\xf4\x8cgT\a\xd7=\xa6\x9f5.\x9eSN\xd7]?\xefQ\xb3\xdd\v,\xe7\x8bƥK\x1eY\xed^6\x8e\xaf(?\x8b\xeaW\v\x1b\xfe59\xbe.\x05p\xc3#\x03\xfdM\xe3\xa9[\x1e\xb5\x01u\xbb\xb0\u05fbc\fdwY\x03\xf7\xef\x95\xfe\xe6\x05/F\x8e\xb0\xfe\xa2\x97\x8bڗ\xbc\xb2\xfa\xf4\xaaz}ŋ\x81 \xa2\xbf\xea\xa5\x1b\xbe\xe6e\x9f\xf6\xbaW\xed\xea\xbfᕖ\xf0\xe6\u007fI{˫J\xf8myaI\xaf*\xa2R^U=\xbaWf`I^:yi\xafxY\x19\xaf\xd1D\x93\xbdl\te\xbd\x18\xd4#\xfa;^\xce\xc0ˉX\xbc\x1cXS\x98\x9c\xf2FD\x15\xe4Ί^\xe9\xd3*yů+{\xd9\aU\xf1\xf2+\x8dU\n\xd2\xf6_\xfaRQ@\xf0E\xbbWm\xb7T\xf5\xd2\x17\xaby\xd58S\xdd\xcb\x11\xba\x86\x8a\x1e\x118\xbc\xd2\xc1\xd7\xf4r\x15\xf6\xaeW\xf9O-\xaf\x1a\xc2jK\xaa\xeax\xb98\xa9\xcb+\xf5\xe4\xe0=/]\xa6\xbeD܀%\xddЫV\x8a\x8d\x8c\xf45F\xf9\xa1\xe14\x91\xf45e16\xf3J\xc7\xd4\\UWLo\xe1\xe5ǵ\x96|Y+\xaf\xfaܒfT\xa8SR\xe3\xfa/?nɮ\xc7+\xad\xd3+1\xf8XR~\xbe8\xe0\xe5\xc6H\x10\xe5\x8b\xf7\xb66\x8a\xab\x8dWu\x11m\xff\x8b\xa7\x9dW\x8d)\xed\x8d\xfa\xec n\x10\xf2\xaaydG梓d\xa9\xb3Wz\x8b\xb0\x97co\x17\xaf\xac\xfbӍ\xf7g\xf0\xde\b\x9f\xeb*\xb7d\xb2\xfa\xb3\xbc\xdc\x14\x8dz\x8d\x05o7\xe3\x81\xee\x12m\xb6W\u05909^5\xf5ȕL\xc5\xe8K=\n\x1fy\xdfx$ϫ\xb6V\xf2\xbd\\\xc5\x16H\x81\xc7\xff\xcbHO\xaflZ\xf422\xdaۛ\xe8W\xc7}\xbcj\xae֗\x05\xd3\x0fE\x82\xb2\xe8ox\xd2\x00\xaf\xac<\x06z9\x1e\f\xf2ʤ\xf3\x03IŇ^\x99\a\x0f\x9661D\x1a\xcaPy\xfd0#\xffý\xb2Z\x19\xc1̎\xf4\xaa)\xf3(i)\xa3\xc53>2b\xfdX\x0e?12\U000e985fy\x8d\x15\xa8\x94\xd3\x17,\xc7/\x8d\x8b_\xb1\x85\u007fm\x1c}#\x8e\xfa\xad\x91\xc1\xef\xa0*\x83\xdf{\xd5\x0f\x14~`\x06\u007f\xf4r\u007f\xf7'\x1e\xfc\xec\xe5\xc7Iß\u007f\xf5\xf2\x93\xc3o^\x99\u007f\xfc\xee\xe5d\xff\x0f\x96\xfb\x9f^~\x18\x18#-}\xac\x97]\xf4_\xdeĖ\xaa\xf8\xc7y92\x8e\x97\xb7O\xf0\xca\xe8\xf0\xb7\xbci\xa2W}\xed\xf8G\x1a\xc6$6\xfb\xc9^\xf9|0\x85\x89\x9f*\xf7M\xf3\xaa\xe1>\xa6Og\xcaf\x18mb\xa6\x97K\xadY\"\xb3\x8d\x1a\x9c#\xd5\xf1\xafW\xa67s\xbdj\x8b\u007f\x9eWV\xd6\xf3\xbd\x9cK,\xf0\x1a\xc3\xeaBy\xf5\"I\xfab\xaf\xda>\\\xe2\xe5\xac`)\xdb\xd12\xe3]˽\x9ct\xaf\xa0\x8b\xae\x94\xceh\x95\x97\v\xd8\xd5^\xd9d]\xe3\x95E\xf3ZC\xd7ye\x8e\xb2\x9e\x11m\xf0r\xefc\xa3\x91\xcaMF\x83\xd8L\xff\xda\"\xadl\xabW& ۼ\xdc\x1c\xdc\xeeU\x1fDw\x88\xab\xee4b\xdbe\x94\xe0n\xaf\x9a\a\xed!\xf7J\xf7\xbd\x8f\xb5\xb1\x9f\x05w@^wЛؚ\xcb\xcc\xc2\xd6pX\n\xeb\x88W}F<ʗ\x1f3\xfc\xf8\xb8\xe4\xfb\x04}褗;ۧ\xbcƢ\xfd\xb4\xe1\x87g\f\u007f8k\x14\xef9\xbe\xed\xbc8\xf9\x05/\a؋F\x1e/yeyy\x99\xde}EF\x8e\xab\xe2\x0f\xd7\xc4g\xaeK2o\x88\xdcdzn\xb1\x92o{\xb9\xd5u\xc7++\x95\xbb\xc6{\xefI\x9f~\xdf\xf0\x92\a^\xae6\x1ez\xb9\x04~$\x17\x1f{9S\xfc\x1f\x8b\xe3\t\x1f\xef\xd0|\x89ij\xd6k\xf2%8\xc3}t\xb3\x8f\x9fC\x12D\x12}|\xae\x88O>\x15\x17\xf5ɯL}\xc6\x18]\xdc'\xdb\x1e%|*\x1fO\xfa0\x9b\x8b\xe9O\xf9Tw\xf2\xb4O\xad\xfc\x9f\xf1\xa9\xb5\xe4\xb3>\fE1\xfd9\x9f\xea~\x9e\xf7ICy\xc1gn\x84\xf1\xd1\xc7\xf4\xbd\xe43\x96\x87/\xfb\xd4\xc6\xd9+>\xf6\t\xaf\xfa\xb8\x91\xf1\x9aJYL\u007f\xddG\xa7z\xc3'{\xaboʓo\xf9T1\xbf\xedS;`%}\xc6*\xbc\x94O\xbe\x99\xea\x85'\x92|\x86[\x97\xf6\xa9\xc9c\x19\x1f\xa7~\xc9>ծ\xca\xfa\xe4+\xc3;>v$\xe5|\x9c\x04X|\x89\xed\xd4\x03)\x85O\x96\xf7\xb1ۯ\xc0\b*\xfa\xb8\xffVI\x1e\xa9,R\xc5\xc7Ţ\xd5\xc7\xea\xb4\xc9\xc9T\x9ftdvC\xab\xfa\x12}\xaa\xba\xaa\xf9\xd4d\xac\xbad\xa2\x06\x13\xe2\xf0\xa9YZM\x9f\xea\xeb\xde\xe5\x99Z\xcc\\m\x95\xa2\xb0^\xc7\xc7\uefee\x91\xdcz>\xb5\x90~\x8f\xf7\xd5\xf7\xd1A\x1b\xf8\xb8\xb2k蓱\xad\x91\x0f\xb3?\xb5)\xebS\x1f˛\xf8ԗ\x8e\xa6>\xc3ݛ\xf9\x94\x0f4\x97$\xb7\xf0\xb1\x0fk)Ѵb:\xd2|\x1c\xb2\x9cR\x15.\x1f\x9d\xd3-'=R1^F\xe9\xf3I\x97\xed\x97[\x02\x92\xfd\xa0\x8fn\xdc\xda\xc7\x0f:m\xe4d[\x9fjA\xed|\xaa\xabh\xafR\xa2&x\x1d|\xeaCi\xa8\xb0\x9c;\x1a\xf9\xeb\xc4ӝ}\xb2\x0f\x1b\x962\xe8\xe2S\xed \xdd\xc7\xe5~\x06\x0f\"LmW\x1fǖL\x9f\xda\x18Β\x94D}\xecº\x89t\xf7qݟ\xedK\xa8\xafV\x92\x85\x0e\x97\xebc\xf7\x1b\xf3qe\xd5\xc3\xc7\xc9\xf8\xfbro\x9eO\xdaR>\x93]\x80$\xa8\x9f\xe8\xf8\xe4\x974=\xa5\xb0z\xf9\xa4I\xf7\x96w\xf6\xf1\xa9n\xa7\xaf\x8f=}?y\xa2?\x8bz\x00#\x19\xe835\xd6\a\xf9\xa4\x8b\xfb\x80I\xffP\x1a\xd5`\x1f\xe7\xafC\x8c\f\x0fU7\x0e\xf3\xc9V\xf5p\x9fj\xf8#|\xfc\x81\xd5H\xb9q\x14ύ\xf6\xa9\xb1\xe8#\xf2cq\x90O|\xfc\x1a\xfc\xa9d\xec3\x1f\xc7\xd5\xcf}\xf2S\xaa/\xe4e_\xfaT\u007f\xfe\x15\x1f\xfbZn\xfcƧ\x16\x9e\xdf\x1a\xf7}\xe7SS\x9d\xef\xf9\x8e\x1f$\xc2\x1f}\xfc4\U00093466\x9f\xf1\x18\\\xe7\x17\x1f'H\xbfJ\xeb\xf8\xcd'\x13\xaf\xdf\x19\xd9\x1f\xc6џ>c\xd7p\x8c\xa4p,\xa3\xfd\xcbǮq\x9c\x8f[Q\xe3}\xb2\x16\x9f\xe0\x93=Xi\x18\x13}\xecl\xff\xf1\xa9\xd9\xff$iQ\x93%\x92)>\xb5\xfa\x99ʨ\xa6\xf9\x8c\xed\x8e\xe9>n\x06\xcc\xe0ٙr\xe3,\x91\xd9Fb\xe6\xf0\xb9\u007f\x8d^h\xae\x8f\v\xa5y>~C\x9c\xcfִ\x80\\\xe83\a\xba\xeb\x8b|\xdc\xcfY\xccֺ\xc4'\vȥ>c;t\x99\x8f\x9b\xd4\xcb}\xdc)^!\xb2Rd\x95\xc8j\x9f\xda\xd7[\xe3\xe3\xee\xf3Zq\xdcu>N:\xd7\xd3#6ȹ\x8d\xbe\xa2>\x99pm\xf2q\xac\xd8\xec\x93]\x87->\xf9\xb9\xdbV\x9f\xda\t\xd9\xe6S{\xdb\xdb}\xfcd\xb2C\\p\xa7\x8f+\xd6]F;\xdc\xcd\xe4\xef1\x1e\xdfk4\xa7}t\xcc\xfd>\xceN\x0e\xf8\xb868\xe8\xe3g\x80C\xaa\xaf\x8f\xe9\x87\xc5\xe9\x8f\xc8ɣH1\xfc\xf9\x98zST?n\f\x00'|\x9cB\x9c\xf4\xa9\x95\xf0)\xf6\xfa\xa7}\xb2\xf08#-\xf0\xac\f\x02\xe7\xe4\xc6\xf3\xe2[\x17|2F^\xf4\xc9\xd6\xd6%\xe6\xe5\xb2O~\xd0tŧ\xa6\x01W}\xdc\v\xb8&\xbd\xfcu\xc9\xda\r)\x9c\x9bR=\xb7\xd05\xc6\xf4\xdb\xd2\xd2\xee\xf88\xef\xb8\xcb\xea\xbc\xe7\xe3\xbe\xf5}y\xf8\x81OM\x0f\x1e\xfad\xed\xf7\x88\xc5\xfcX\x1c\xff\u007f>\xf9A\xd2\x13~\xfe,P\xf3\xabR1\xf9\x13\xd3Tɛ\xfd|<\xc1\xaf\x06\xb0D\xbfl\xa8\x16\xf1\xf3SCQ\xbf\x9a\xcf\x17\xf3\xabvS\xdcϥ\xa1_\xe2\u007f\xd2\xcf5\xe1S~\x19ӟ\xf6\xcbj\xfd\x19?\x9b˳~\xe5\x8a\xcf\xf9\xd5\"\xf6y\xbf\xd1\x0e^\xf0\xb3Q\xbe\xe8\xe70\xf4\x92_\xed`\xbc\xecW\xbd\xd9+~S}\xfdU\xbf\xfa\xa6\xf2\x9a_}\xf0y\xddϵ\xcb\x1b~~\x90\xf4s\xc7\xe6-\xbflǾ\xed\xa7\xf3\x96\xf4'\xf8q\xb6\x94\x9f}\x97\xeegKL\U000ab074\xb4\x9f\xed\xa7\x8cH\xb2\x9f=aY\xbf\xeaY\xdf\xf1s\xce^ί\xaa\xc2\xe2\xe7\xef\x8fR\xfc\\\a\x97\xf7\xa3\xef\xa9\xe0g7S\xd1/ͽ\x92?\xb1\x99Jze\xbfZ\xce\xe5\xeaU\xfcj\xbdc\xf5Kq\xda\xfc\xac\xe7T\xbfl\x03\xda\xfd\xaaǫJV\xf3ˏ\xaf\xaa\xfb\xcdΈ^C\xb2\xe3\xf0s\xa8\xf3\xcb\xc7\xd8w\xfd\xdc5\xac\xe5\xe7r\xba\xb6\x14\\\x1df\xbf.\xe3\xa8秇\xbe\xe7W\xfdU})\x84\x06,\xaf\x86*\xa9\x8dXa\x8d\xfdܱi\xe2W\r\xae)\x93\xd7\xcco|\xael\xcehZH4-\xfdj\x1e\xd2\xca/>\x99fd\xc1)\x95\xef\xf2\x1b\x03\xa4\x9b\xe9\xf5H\xd9z\xf9\x88\x8f\x95\xe0\xf7\xb3-\a\x98\xbe \xab\xb7\xb5\x9f\xfb\x9dm\xfc\xd2Ŵ\xf5\xcb\xd6E;\xbf\xfc{\n\xbf1U\xec\xc0T\x84T\x92;\xfa\xe9ߝ\xfc2y\xeb\xecO\xc0DJ\x0fK\tt\xf1\xab\xa1=\xddoJ\xd33\xfcҺ\"~n\x16v\xf5\xb3=d\xfa\xd57\x9f,\xbfl\x03F%\xaen\xc6aw$\x19\xb5\x9c\xcd\"\xcea\x92sY\x1a1\xbfl\xb4\xf4\xa0+\xbf\xefWm8\x8f\xe1|?\x9b~\x01[C\x9c>\xde\xd3\xcfIW/q\xd1\xde~\xfeا\x0fc\xeb\xeb\x97%C?\xa3\xb6\xfb\xfbՔh\x80\xe1\xf7\x03\xfdj^7ȯ:\xa1\x0f\xfc\xaa\x87\xf8\x10\xc5\x1e\xc9\xd1\a\xfb\xd5\x1cm\x88\x9f?\xf7\x18\xea\xe72u\x98\x9f\xd3\xfb\xe1~N\x10G\xd0gG\xb2\xacG\xf9e\x1a=\x9a\xa9\xf9H\x1a\xcc\xc7<\xf8\xc4\xcf\xdfw~\xea\xe7\x10\xf1\x99_\x16\x15\x9f\xf3\xb1/\xfc\x1cr\xbf4\xca\xe2+\xbfZ\xe3|\xedW\xbf[\xfa\x86\x19\xfe\x96\xe1\xef\xfc\xfc\"\xfc=[\xc2\x0f~\xf9\x14\xf0\xa3_\x16\x10?\xf9e\xd7\xecg$\x15/\xfdůz\x98_\xfd\xd2\xf7\xff\xe6\xe7z\xf2w\x96\xe8\x1f~\xb5\xd1\xf1\xa7\xaa\xd01~cs~\xac$\xf5/\x16\xff8\x16\xd8x?\x17Q\x13X\xd6\u007fK\xcf3\xd1\xcf\rQi7\x93\xa4\x8f\x99\xcc~e\x8a\x91\xf6\xa9\xf4\xeai~c\x9a4\xdd\xcf\xef\x063\x8c\u009f\xe9W\x9d\xe6,?\xe7o\xb3\xfd\xfc\xa1\xd2\x1c\xbf\xfc\x16\xeb_?\xfb\xe0\xb9F\x92\xe7\xa9\xf4\xcd7\xba\xb3\x05~\xfe*d!j\x1cw.\xf2sl\\\xec\xe7\xdag\tS\xbb\x94\rh\x19\xaa\x04]\xc6r\xa3\x8eW\x18\xbd\xdbJ\xa3\xb5\xac\xf2\x1bK\x80\xd5\xd2lְ\xa0\xd7\xfa\xd5\xef\xcd\xd7\xf9\xb9y\xbdޯ6\xf07\xd0U7\xfa\xf9S\x93M\x85\x1d\xe0f\xbec\x8b\x9f\xbf\xef\xda\xea7\xa6~\xdbؾ\xb7Ӂv\x18\xf9\xdcI\x9f\xd8\xe5\xe7\x96\xd9niP{\xfc\x9c\x93\xeeEф\xf3QR\xfb\x8c\xf6\xb6_\x9c\xea\x80\xdcu\x90\xa5y\xc8/\xbbۇ\xfd\\\xdf\x1e\xc1+b\xfaQ?ǎcF{=n8\xc0\t\xf1Ɠ\xc6pp\x8a\x15pZ\x95\xde\x19\xc9\xe5Y\xbfL\bϱ՟\xf7\xab\x1ff_\xf0\xabI\xf0Ez\xe6%\xbf\xda\x05\xbbl$\xfd\x8aQ\xfeW\xa5t\xaf\xf9մ\xf7\xba\x9f\x93\xb8\x1b\xe2%7\xfdƦ\xf1-v÷\xc57\xee\xf8\xd5\xf8u\xd7\xcfߖܓ~\xfa>]\xf5\x81t\xca\x0f\xfd\xf2c\xe6G\xfeĦJ\x1f\xb3S\x8e\xe9\xffc\x8a\x9f\b\xb0\x93\xd0\x02\xac[S@\xb9\xbd\x99L\b\xb0\x9fJ\f0\x96\"\x01~6/\x1a\x90\x9fj\x14\vp\xdb3\xa0j\xa6D\x80\xf3\x84'\x03j\xd8z* \xf9x:\xa0\xdc+W\u007f&\xa0r\xffl@9\xf8s\x01\xd9fy>\xc0\x06\xf5B\x80\x03\xf5\x8b\x01.Q_\n\xa8\xfe\xee\xe5\x00wd_\t\xa8\xca}5\xc0\xae\xfe\xb5\x80j>\xaf\a\x94o\xbc\x11\xe0\xe0\xf4f@\rzo\x050\x0f\xcf\xd6\xdf\x0e\x88\x9b\x95\x94\xdbK\x05\x12ZF\xf2u=\xc0\x82L\n\x14\xfe\xe3\v\xc9@\x19yA\xb2\x91\xbc\xb2\x01\xd9ux'\xc0\x89e\xb9\x80r\x03\x8b\xa4/%\xa0\xd6\a\xe5\x03\xb2?]!\xc0\x11\xb3b@\xf5_\x95\x98\xa4\xca\x01\x996U\t\xb0G\xb4\x06d\xf3\xd2\x160&\x98\xa9\x01\xd5\xe2\xed,\x81\xaa\x01\xa3_\xaf\x16P\xab\xdc\xea\x01\x8e\xae5\x02\xca\xc3\x1c\x01Y{\xd5\f\xa8F\xf0n@>J\xd5\np\xfb\xa2\xb6\xa4\xac\x0eK\xb0n\x80\x1db=&\xe2=\x96~\xfd\x80\xf4\x00\r\x02\tNHC\x95{,\xe7\x022\xbfklh\x93\x80\xf1\xfb\x81\xa6,\xc6f\x01\xf1\x89\xe6\x01N\x81[\x040\x91h\x19\x10Ol\x150\xda]Z\x80Ù\x93\x15\xe3\np\xb4q\a\xf85\xc1#\x89\xf22\x1d>\x16\x86\x9f\f\x04؛\x04\x03\\µ\x16i\x13Ps\x96\xb6\x01գ\xb5\v\xa8&\xda^\xa2\xe9@o\x8a顀j\x10\x1dY\xe9\x9d\x18O\xe7\x00=?\x1c\xe0Pҥ\xb0\x12\xd3\r\xef\xca\b\xa8uoDR\xd15\xa06i3\x03j37+ \xab\xa5h\x80\x13\xccn\xb8/\xacw\x97Ȳ\x03f_D\xcf\t\x18\xf3\xf1\\\x14\x18\xaa \xa6\xee\xc4b.\xc0\xef\xb5\xefK;\xc8c)\xe5\ad\xc0-\bp\xc2\x18\x0f\xa86\xd93 \x13\xd1^\x86\xe7\xf46\x8a\xadO@\xfe٠\xe1\xe3\xfd\x02\xec\x04\xfa\a\xd4\xd2h\x00\xeb|`\x80c\xd0 )\x94\x0f\x02\xaaO\xfe0 \x03\xd2`q\xa1!\x01\xae\x80\x87\x06dot\x18\x1db\xb8$\u007f\x04\xb39R\x1cgT\x80\xf3\x9e\xd1\xd28?\np\xfe\xfd\xb1\xe1\n\x9f\x04\xe4\xcb\xfb\xa7\x01\xf6۟\x05\xccވ\xfe9\xe3\xfaB\xbc\xf8\xcb\x00LJ\xaf\x02\x1cJ\xbe\xa6\xa3\u007f\x130>\x06\xb2R\xbf\vp\xc3\xe7\xfb\x80\xf1\xab\x89\x1f\x02\x1c<~4\xda\xcdO\x86\xfeL\xb7\xfc\x85\xf5\xf7+\x1b\xcfo\x01\xee\xf1\xff\x1e0>-\xfc!9\xfbS\xeajL@\xcd\x1a\xc6\x06\x8c\x8f<\u007f\x05\xd4Ri\x9c\xd4\xc4\xf8\x80\x8c:\x13\nk\xfbo&yb@\xfe=\xd4?R\xa2\x93\x02\xb2#O\x12?\x9f\xb9Z\xc0\xd7/\x94\x02_\x14\xe0\x97\x83\xc5\x01\xd5i/Af\x10\xc9\xd2\x00\x87\xf7e\xac\xe3\xe5R\x96+X\x14+U\x83Z\x15\xe0蹺\xb0寡\xff\xad5j|]@\xfd&d\xbd\xd1wm\bp\x9d\xb2\x91\xdd\xea&\xe9\xaa6\xb3\x93\xdb\x12\xe0\xfaok\x80\xf3\x98m\xf4\x9a\xed\x01\xf5\xaf*v\x18\x05\xb3\xd3\xe80v\x05ԧ\xf2\xdd\x01.\xc9\xf6\x04\xd4\x18\xbb\x97U\xb2/ \xeb\xf4\xfdl\xc9\a\x8c6t0\xc0\x99ࡀ\x1a\x06\x0e\xb3q\x1e\x91\xbc\x1e\x95\xb6p, \xbb\x9e\xc7\x19Չ\x80\x9aٜ\x94J8\x15\xe0\x98xZ\x12zF\x06\x80\xb3\x92\xc4sr\xf2\xbc\xf4\xd4\x17\xa4n/\xb2X.\xe1\xe9h\xbe~9\xc0\x1f\xae\\\t\x98\x9d\x99\xfaU\xbe\xffZ@\r\x8fו\x1f\x87\xf5\x1b\xec\xd8nJ\x83\xba\x15\x90\xc9\xc4mv\x1cw\x02jq\u007f\x97\xbc\x17\x90]\xb2\xfbҙ<\x90f\xf20\xa0v\xe2\x1fI)<\x16\xf9\x9f4\xe0'\x82\xaaUkA\xfeˊ\xa0\xcc\xe8\xcdA\xe3\x83q\x82q\"1ȍ\xe2\"A>R4\xc8E{\xb1 \xfc*\xa6\x17\x0f2\xa3%\x82*}O\x06\xa5\xe1?\x15\x94\x8dߧ\x83\xf4\x90g\x82\xe6\xa6a\xfd٠\x1aB\x9f3ny>\xa8\x9a\xd4\vA6\xa1\x17\x83\xecp^\n\xaa%\xc1\xcbA\xa9\x8cW\x82\xaa\xf7z5h\x8c\x1c\xaf\x05U3y=\xa8\x96\xb0o \xd5\x11\xfd\xcd G<\xf2mFW2\xc8݆RAՄt\xbe5)(\x9dO\xe9\xa0\xeap\xcb\x04\xe5\x9f+$\a\xc5\xd7\xcb\x06\xe1/\xc8\xda;FN\xcb\x05լ\xd2b\xa41%\xc8yR\xf9 \xb7\xe2*\x04\xb9\x84\xa8\x18\xe4HX)([\xb7\x95\x83\x1cS\xab\x18\x8fX\x83ʻlA~\\H\r\xca\xd2\xcd\x1ed\x13\xaa\x1a\xe4\x8eO5\xe3\xd6\xeaA\xe5=5\x82t\x1bGP;k\x06\xe5\x97\\\xef\x06\xa5A\xd7\n\xaaFW;\xc8FSG\x8a\xbf\xaeH\xbd\xa0\xaa\xd3\xf7\x82\xdcޮ\x1f\xc4\x1c\xabA\x90?\x19k\x18\xe4\xf6G\xa3 \xbd\xb2\xb1\x14p\x93 ;\xb7\xa6\xc1¯R͂\xea\xf7\xdf̓\xec)Z\x04\xf9{\xd2 ǶVAc͗f\x94\x89\x93%\xe7bR\xdct\x14\x8f\xa4\xd9\x1b\x14g\xf3\xb1f\xfcA\xf9\x1c\x1d\x907\x06\x83\xecU[\a\xd56v\x9b \xb7\xaa\xda\x06\xe9\xff\xed$\xd1\xed\x83l\x06\x1d\x82j\x1d\x1abat\f\xb2\x03\xebd\xd4N砚Ɇ%\x91]\x98\xc8\xf4\xa0\xf4\xe7\x19A\xee\x10F\x822;\xed\x1a\xe4\xfc6Sޝ\xc5TFU\xa1t\vrn\xd3=\xa8:\x91\xec \x9bw\x8e\x91\xb1ܠL_c\xf4\xdd\x1eA\xe9\x84ޗ\xb4\xe6\x05eN\x9c\xcf\xd7\x16\x04\xd9'ƃ\xfcz\xdb3\xa8\xdag\xaf w\x8b{\a\xb9\xf4\xef\x13\x94\xaf\xe9}\xf1\x0e\xb5u\x19d{\xee\x1fT\x83\xf2\x00r\xa0\x94\xc8 \xf1\x82\x0f\x82\xb2H\xfa\x90\rpp\x90\x93\x8e!AՉ\r\r\xb2\x0f\x1d\x16T}\xd7p)\xeb\x11A\xae#G\x06\xd5|`T\x90\xf3\xf4\xd1\xffG\xd4U\aJQ~m\x1a\x04\x15\x11\x10\x01\x91k\x80\x88\"\x16\x82\x8a\"(-!q\xb7c\xb6gwg/)e \n\x18\x94 )HwH\v(!)ݠ4\b\xd2)\x8d\xc0\xb7\xe7y\xce\xfe\xbe\u007ff\xee\xee\x9dy\xe3\xc4s\x9es\xdewf\xa1\x92\xef\xb2Y\xcc\xe8\x03\xcb\xebK\xb9\xf4\xe3]\xfd\xb3\x05\x86\ad\\\xe8\xfbl\x16/y\x1a\x946\x81tn\x87K\x06C\tC(\xbe\xa1\xd9\x12ԇe\x83\x05\x0f\xa7\x96Fp\xf0?\xc2\xcdF\xc2\xf6Fek\xc4\xfa)\x1b(3:[\"̘l,2\x8e\xcd\xce\xdf@\x1ck\\67r\x8dW\xa3\x9f\x80['Rϓp\xc7d\xf4=%\x9b9\xc4T8\xc24\xea|z6w\xa0\xcd\xc8F25\x13r\x9c\x95\xadd\xecg\xcai6\x9a\x9c\x03ḁd\xe6eKH\x9a\xcf^\x16ds]r\xa1Z\xd5/\xd9\\\xf8Y\x94͊\xe9\xe2l!\x11K \xfa_u\x98\xbf\xa9\x89,\xcd&\x1b[\x96\xcdؾ\x9c]\xae\xc8\xce\x140)\x9d\x95z\xdb*\x88t5\xa6\xb5F\xbb]\x9bM\xe6\xb1\x0e\xdf\xfe\x01C\\\x9f\x8dh\xb2A\x85\xb3\x91\u07b9)[\xc2\xdffLdK\xfa\uf72c\xadٺ\xc7%[R\xff\xedD\x95\x1d\xb4\x95\x9d\xecz\x97\xb6\xb1\x9bJ\xdd\xc3\xd3\xdel\x84\xf6?\xa9п\xa8\xbc}\xd9H.\xf6\xc3\xd5\x0e\xc8\xed\xa9\xac\x83\xda\xc3!^y\x986}\x847\x1c\xcd\x06\xf5:\x96\xcd\x15\xeb\xbf\xf5|\x9c\x16\u007f\"\x9b\x8bD\xff\xa8\x1b\x9d\xcc\xd6]V\xa7\xb2\xb9\xf9\xfct6\xf8ҙl\xd6>\xcf\xc2vα\xa3\xf3z\xd3\x05Z\xd9E\x06\x80K\x02\x94\xa9\xac\xcbz\xc7\x15\xce\xe2\xdflɢ\xae\xf2õl\xec\xef\xbf\xce\x1bn\xa4\xa7\x94\xfet3\xed*\xe9L/\x9b\xb5\x9e\xdb\b4wx\xc5\u007f\xd9(\x8b\xde\xe5\xa7{h\xea>;\xcde\xc3w\xb9m\x98l\x1e\x1b\x9e\x05\xc8k\x13\xc0\xcag\x13\xaf\xcfoc\x9eg\xe3X\v\xda\xd0u!\x1b)\xf0\x03\xb8\xa6\xb0\x8d\xec\xba\b\x1b{Ц\xe4\xf0!\x1b\x86\xfb\xb0\xde[Toz\xc4&\x96Y\xcc&F\xfe\xa8\xfe\xaf\xb8\x9eK\xd8ҀU\xd2&#|\f\xc7R8>n\xa3\xd8KK\xf7\xe1\xac26>\\h\x13CzBo-g\xe3\xa2ʓz.\x8f;\xb3l\x82\x16O\xe1\xef\xa7m\xacC>c\xd3\xfaܳ\x98h\x05\x9b8_E[\xbe\x86\xed̬\xe7p}%\x1b\xca\x0f\xcfs\x02\x95mx\xc8\x1es}\xd1&d\xa9\x8a\x8d\x8bv6qƪ\x18\xc6\xcb6\x01\xb1Wl\\7{Uϯٸ\xf3\xfeu\x1b\x13\xaej6B\xe4\x1b6\xacEU\xb7\x15\xac\x9d\xe8ء}Ǭ\x1a\xe9Y\x18\x96\x91\xf5\xa6M\v\x19o\xd9\x14\xb1\u07b6\t\x92״\xc1\xd4߱\x89\xa3\xbfk\x13\x9c\xabe\x03\xedxφ\xfaOm\x9e\xeaذ\f\xf7\xbe\r\xf1\xe5\x03\x1b\xd6\x18\xeb\xda\x10t\xea\xd9P\x9a\xadoC\U0007304d{\b\x1a\xda\x10\xf3\x1aٸ&ژ\x17}h\xc3\x13 Ml\x88\xb4MmX\x03o\x86\xf96\xb7\xf1\tC\xbd\xbf\x85M\x18XK\x1b\xf7,\xb5\x82\x18Z۸\xb0\x9f\x8d\x81\xdal\x8c#v\xfcϡ\xffs\xda\xe8v.v\xe1\xb6\t6xlR\xc3\xf0B\xc8>\x8e\xc4\x0fљY\x86MhO\xc0\x86e\x87\xa0\x8d\x94&d\x83\xb7\x84mR*\x8c\xb0\xa5(%\x11\xb3!)6m\xd8)\x16\xb7\xb1p\x99\xb0\x11\xf1\x926d\x82\x96Mʤ)\x1b\x1c$\a\xd3kcS\x1fnkc\xf9\xb0\x9dM\x9e\x83lo\x13r\xd9\xc1\x06h\xefh\x03\x8c|l\x93\x85\xfeN6!ߝmX\x17\xefbCq\xba+\xe6\xd1\xcd\xc6lφRƧ6\xfa\xe6g6`\xd8\xe7p\x80\xee6A\x84/8\xe4\x1e6\x16\xb3\xbf\xb4\t\x1c\u007fec8\xe8\xa9\xe7^\xb0\xd3\xde\x18\xc7\xd72\xe2.Y\xdf\xd8P\xf4\xfc\xd6ƗĨ\x0e\xfa\xd8X\x84\xec\v\xe9\xf7\xc3\xf0\xfa\xe3\xe6\x016\xd9\x17\xf5=\x875\xd0\x06\xa68Ȇe\xfa\x1f\b\x01\x83m\xc8 \x87ذ\xdbw\xa8\x8d\x8b-\xc30\xd6\xe16\xadO\x8e\xb0!\xa9\xf9цH3\x92\xa7Q\xf4\x89\x9flHLF\xab\xf0ưٱ6Ys\x1aG\x19\x8dW\x8f\x9d`C~:ц$g\x92\r%\x8a\xc9\x19\xf1O\xb1\xb1\x8c2U a\x9aM\xaa\x82\xd3Uy3lL\x8ff\xc2Nf\xd9P\xb9\xfc\x99B\x98mC\xa9a\x8e:\xda\\\x1bx\xfb<[\xfe\xfaF\"\x9c5߆\x92\xf4\x02\x9bd\xde\vU^\xbf\xd8ȶ\x17\xd9\x18\xe1\x16\xdb\xf8$\xca\x12\x1b\xca\f\xbfB\x97\xbf\xc1˗r:ˈ\x8a\xcbm\xc2\xfaV\xa8\xd6~O\xcf\\\x9e\xb4\xb7\xb1\xa0\xb6\xca&\x94j\xb5\x8d\x1cy\x8d\xba\xd7Z\x1b\x8a\xcb\xebl\xba\x9d\x85~\xba\x9e\xae\xbc\x01\x0e\xb2\xd1\x06\xae\xbd\xc9\xc6J\xc2f\x1b\xf3\xdf-6%\xa5[m\x88\xe9\xdbl\xa09\xdbm`\x1e;\xa8̝6\x94\x89w٤ҷ;sǞ\xf4\x90r,3k/\xbe\xfe\xd3\x06\n\xf8\x17\xbb\xdeG\xd0ޟ\x11\xfb\x01\x9bP݃6֞\x0eaD\x87\x01}Gp\xf7Q\x00\xe41\x1b\x97\xac\xff\xb6\xa1\xc0x\x1c\x9es\"\xd3\xdf?6,\xf1\x9f\xb4I\xe9\xfe\x14C\xc6i\x9b>\xf8|\xc6\xc6'\xd9\xce\xda4\xc5:\xa7\xe6zކE\x91\v\xf4\xe2\x8bP\xd1%\x1b\x1e7\xbbl\xc3\xf2\xe4\x15\x1bS\x97\u007f\tGW\xe95\xd7h\u007fס\xa0\x1b\xfc\xee&>ܢ\x02o\xc3\x0f\xeeظ\xe9\xf6?\xe0\xe9]\x1br\xf5{\x18\xe2}\xa0@.\xbbĥ\xdcvq\x97\x0f۹\xbb\xb8\xa8\x9d\x0fJ\xd8E\x8c\xc5\xec\f\x13\x8f\xf2\xcb\xe2v\x99s\t~(iǴ\x1e\xb3\xc3bK\xa1\x91\xc7\xed*\xe1\xd2v\xd8a\x19;\x02vY\xbb@\xf0\x13v\xe6\"\xe5\xec\xd0\xe8\x93vxWy\xbb\xf2\xb4,;<\xfb);\xb6\xe3<\xcd\xd33\x18\xf4\xb3v\xd1r\x05;\xf6/T\xb4s\x9b\xa7=\u007f\v\xb9\xad\x92L\xe8y;m\xba\xb2\x1d\x82\u007f\xc1\xceG\x96^\xc4\xddU\xecJ\x82_\x92K\xabځ\r/\xdba\xa4\xaf\xb0\x9bW\xed\xa2\x81\xd7\xecX]{ݮ\x91\xad\x9a\x1d\xfbW\xec\xc0\xe9\xea\x9cQ\r;\xeb\xaaoڵP\xf4\x16\x87\U000f6741\xb4\xa6\xfe\xff\x1d\x95\xfa\xbbv%\x1b\xb5T9\xef\xd9\v4\xef\"WԶ\x17l\x95\xd3\xce\f\x85\xb3\xeaؕ-\xbf\x9f\x19\xe9\a\xaa\x8c\xbavnq\xacG\x91\u05f7\xd3\xd5\x1a`\xb8\rqldg\xf0jl'u\xfe\xd0.$\xb9IF\x11M\xedt\xe4fv\xe0Ls\xbb\xf0\u05cfpla\x87\x9f\xb5\xb4K>\xdd\n\xb7\xb5\xb6\xb3v\x92\x9d\xb9\xdd\x06\xb5\xda\xd5\xda\x1cv\x80\x8333w\x97]b\xa2[\xad\xc9c',y\xedȫ|v\xee.\xf2\xd3\x1a\r;\xcb=\x01\xbb`b0\xd3A\xc8\x0e/\x0fۅ\xc2DT\x88Q\xbb@S\xcc\xce\xfd\v&U\x15\xa7n\x13\xdaN\xd2N\x90\xb6\xec\xa8\xf0\xa6\xec\x00\xe9\x1c;\xe2_\x1b{\xbe\xdai\xb2\xd2\xd6N\x88j\x97\xd1h{\x1dj\a;\x1d\xb5\xa3\x9d\xc9\xcb\xc7vI\xb5;\xd9%\x06u\xb6K\x85\xa3\x8bZ~W\xdaD7\xbb\xf0\x9aO2\xb6\xfa\xa9=\xb3\x93\xe13;<\xffs;\xaa(\xdd\xed\x88\\_\xd8\xf1\xe4Y\x0f;\x1f\xe7\xf9\xd2NF\xf1\x95]<\xbb'\xef\xe8\x05\x9b\xeem\xd7'\u07be\xe6\xec\xbeQu}kg$\xf9N\a\xd8\xc7\x0e\xd8\xe8k\x97ģ\x1f\x1d\xa8\xbf]+t\x03\xe8\xe8ߣŁv-\x99\x0f\xb2K\xf0\xff\xc1\x8e*\xd3`\xcap\b\xb4<4-f\x99\xfd0\x8cgx\xa6\x99\x11v-`\xfeHk\x1bi'\xb1\x19eg\xa5\xe3'\xbdm\xb4]\xa2\xca\x18;\x8b\xbdc\xf5<\xce.Qh\xbc]\x18\xeb\x04\xb5ɉv\"\xe7$;\xea\x1d\x93i>S ˩vd(\xd3x\x9a\xce\xd3\fLa\xa6]\xf9\xef,B\xcc\xcf<Ͷ\x03x\xe7\xd8YĘ\vC\x9ag\a\t\x9b\x9f\xf1\x9c\x05\xbch\xa1]\xca\x12\xbf\xd8%V,\x12\x81\xe7d-\xb6\xe7o\"\fv\t@\xe1\xd7̬\u007f\x83\x17-\xd59.\xb3#\xc8/\xb7c\x95\xd0.Q\xe3w\x80\xd7JU\xc8*\xbbn\xb7[\x8d\xb6ר\xbe\xd6\xda%\x1f_\xc7\xce\xff\xb0#\xfb[o\x17\xec\xde`\xe7\x82\xe5F;\x03\xfe&;S\xdb\xcdj`[\xe8\x00[y\xcf6(x\xbb]ʎ;\xe0\x05;\x01Ļ\xec\xa8j춣f\xb0G\xb1o\xafN\xe9O;\x82\xeb_v\xe5\xe6\xfb`\xc8\xfb\xa9\xf3\x03\x1c\xd4A;r\x85C:\x9c\xc3v\x92\xb6#z>j\xe7&\x18x\xf4\xdfvl\xba8\xaeC=\x91n!-\x94\u007f8ғl\xf6\x14\xfb<\r\xb5\x9f\xa1Ŝ%\xa2\x9c\xb3\xe3ك\xf3\xfc\U00082f60\x93\xber\xf1\u007f\u007f]\xcah\xf82\x04}\xc5\x0eF\xf1/B\xdbU;\xe8\xe7\xb5\xff]|\xdd.\x14\xf4\x06\x8e7\x19\xefn\xe1\xb6\xdb\xf8\xea\x0e\xcc\xf1?\xfe㮝\xa4잝\xeb\x9b\xf7\xed(\xb8\xe5r\xf0\xeb\xdc\x0e\xb9/\x8f\x03Δׁ\xf5B\a6c\xe5w\xa8^\v8\b\xe0\x05\x1d\xd8\xffW(\xfd\xef4\x91}\xc0\xc1-F\x85\x1d\xe0\x13E\x1c\xc8i\x1ft\x901?\xe4\x10\xfa\xf9\xb0\x03yGQ\a\xca@\x8f8t\xf5\xb8\x98\x83/\x1cu N\x16\xe7\u007fK8Pn,\xe9\x10u?\xe6\xc0\x82G)\a\x11\xedq\a\xe2\\i\x87\x80t\x19\al\xbf,OO8\xc4\xe8\xca9\x98\xcf>\xe9\xc8\u05faK\xfb\xac\xf2\x0e\xb0\xd6,\x9e\x9er\x88S?\xed\xe0f\xe2g\xf4\xfc\xac\x03ѫ\x82\x03\xb5\x91\x8a\x0e\xa2\xcas\x0e\xf1\x92J\x0e)\xe2>\xef \xaeVv \xd7x\x01Sz\xd1\xc1\x8dYU\x1c\b\x9a/9H\x9a\xab:\xb8Q\xe6e\a6\x9b\xbc\xe2\x80\xda_u %{\x8d\r\xbc\xee@jW\xcd\x01ky\xc3!NT\x1d\xe2\xaf\xe1\x00\x1f~\xd3\x01N\xf9\x16g\xf6v\xfa\xcbN\x1d\xb3j:Ԅ\xdfq\xa00\xf1./\xaa\xe5\x90\x05\xb1\xf7\x1cy릲j;H#\xea8Ȇ\xdfw\bf|\xc0~\xea:\x90p\xd4s0\x95\xaf\x0fa4p\xe0\xd5\x00\rU\xb3\x8d\x1c\b\x15\x8d\x1dL$\x1dt\xec&TSS*\xa6YZ\x97\xe9\xd17\xd7>>B;-\x1c\x88\xa1-\x1dX\x9ai\xc5\xe9\xb6Ɯ\xb23\xe6cs\x80\xde\xdb\x1d\f~\x0e^䄞]\x0e\x8d\xf3n\a\xf6/y\x1c\xdc]\xe5u\xc0\xb1|\x0e&\xac~\x1d\x91\xe1\x90L*\xe0\xc0\xceĠ\x83\x919\xe4@~\x19\xc6\xff\"\x0e\x81\xc0(\xfe\x8eeF`\xaa|\xe2\x14l\x82\x82Lf\xfemQY)\xce>\x87\x06\xd1\x06\xeai\xabw\xb6\xe3\x9d\xed\x1d\xb2?\xbf\x03\x8e\x1d\x1d\\>\xfc\x98\xa2\xec\xe4 xuv\x90\xd4tqH\\\xe9\xea\xc0Ja7\aJR\x9f8\x90h}\xea\x00d}\xe6`\x0e\xf3\xb9\x03\xa1\xa0\xbb\x03\xcf\x16:\xb8\xa6\xdf\xc3!e\xd4/)\x95\xaf\x1c|h\xb2\xa7\x83IT/G\x06\bz\xc3&\xbfv\xc8b\xc27\x0eT\x1f\xbfu\x00j\xbe\xc3\u007f\xfa8\x18g\xfb\xd2\x16\xfaQ\xcf\xfd\x1d \b\x03\x1cJZ\xbe\x87-\rt\b\xb7\x1b\x84a\xfc\xa0\x82\x1f\x9c\xb9d\b\xcd}\xa8\x03qu\x18%8\xdc\xc15\xb8\x11\x0e\x90\xf6\x1f)Ǒ\x0eT\xb5G\xfdo\x90?\xa5g\x9f\x16\xc2h\x8ea\x8cC\x16\x88\xc6:P\xb2\x1bG\x99\x8f\x87\xb0'8$\fMt\x80\\NRӜ\xac\x100\xc5\xc1ll*\x14<\r\x97Nw \u007f\x9d\x81\x81\xcft\b\xec\xcer\b\xed\xff\xd9\xc1z\xfbl\ak8s\x1cL\x8a\xe7»\xe7Qc\xf3\xb5\xe5\x05t˅\x0e2\xc9_\b\x85\x8b\x1cif\xbc\xd8\x01\xaa\xb3\xc4!\xe1\xf9WX\xfco\x18\xeaR\a7\xc8,s`\xdb\xf8r\xb9x\x85CB\xd4\xef\x0e\xc1ޕ\x0eI\x9eW94\x81Z\xed\xe0\x03\x12\x0eTz\xd6:\x84\x86\xac\x83\x82\xfeP\xbc\\\xef\x90e\xbb\r8n\xa4\x1c79\xb0r\xb3\xd9A6\xb1E\x91f\xab\x03Lj\x9b\x03${;\x10{\x87C\x8a\xa3;\x1dL\x8ew9\x10\xd7v\xa3\xb1=\x0e\t\xb9{\xb5\x91?\x1d(I\xffE\x1b\xd9G\xa5\xeewpa\xee@\xc6!\x0e:\xc0\xc7\x0e\xc1\x14\x0e;Pl8\xe2P\x12uT\xe0 '\xeb\x98C\xd3I\ak\xcelj\xb5'0\xb7\u007f\xd4\tN\xea\xf9\x14\x10ᴃ\x19\xea\x19J\xf8,\x9a?\x87\xe3y\xf5\x85\v\x0eng\xb8\xe8к\xc5%\a*_\x97\t\x90WhB\xff:\xb8\xe9\xec\xaa\x03\xa9\xf35\x9a\xdfu\xfe\xf3\x86\x03eқ\xfct\x8b.w[\xf5u\x87\xa0\xff\x9f\x03\xa4\xf4.\xed\xe7\x9eB\xe3}\b,\x97\x93Ox\xe6vB\x8ay\x9c\xf4\xb9\xbcNY;\xcd\xe7\x04\xa9\xcd\xef\x14\x06R\xc0\x99VPNVA'%P\xc8\xc9*\xe6\x03N֭\n;9\xa7\"Nn\x1fz\xd0)D\xe2!\xa7\xd2\xfc\x87\x9d\xac\xbe\x17u2.?\xe2\xc4s\x12N\xac\xb9>\xea\x14+/\xce!\x94p\n\t(\xe9\xc4.\x92ǜ\xac\xed\x97r\x12~\x1ew\x16h\n\xa5\x95vR\xfbe\x9c\xc0\x9a\xb2N\xbc\xc6͉\xc7\xd5\xcb9!\xa1'\x9dx2\xb9\xbc\x93\xaa\xcbrR(O9\xa1\x8f\xa7\x9d\xa8\x90<\xe3\x94\xe0\xf1\xac3\xe3\xbd\x15\x9ciۮ\xe8\x84\xdd<\xe7\xc4k\x1e*\xf1\xca\xe7\x9d\xdcgP\x19\x83}\xc1\t\x81\xbf\x88\x0fU\x9c\x82\xee/\xf1\xab\xaa\x18\xca\xcbN\xb1\xd1W\xf0\xf7\xab\x10\xe6kN\xbe\x89[\xe5T\xcd)\x96\xfa\x86S\xea\x82\xd5eh\xe9\x9ej8\xc5\xe7\xde\xd4+\xder\x92~\xbf\xed$\x89\xae\xe9\xd4$\xe6\x1d\xa7\xb0\xbbw\x9d\xc2\x0ek\xc9xߓCm*\xab\x8e\x0e\xf3}'\xeb\xf3\x1f8\xb1߫.\xba\xab\xe7\x94\x12e}'j\x16\rT\xa6\r\x9d(\x864r2Yi\xac\x9a\xfa\xd0\t\xb7h\x8215u\xa2\xa0\xdd\fZk.\xdd}\xe4\x94\xcd\x17-\x9c\xe0\x96-\x9d@\xeeV\xd4`k'\x9c5\xdbIBas\nHٝ4;\x87S\xab\xabNT\x06\\\xfa\xd1\xedd@\xf18\x19\xfb\xbc\xaa_\x9fS(\x9e\x1f\x124h\x13\x01\xa7`R\xd0\t\xdb\x0e9\xb9\xb2\x16VC\x89`\x84Qm5\xe6DiǤf\xe2NP\xec\x84\x13L1\xc9\x06,\x18w\n\xe2ɁͶ\xd1!\xb4U=\xb4K\x8f\xb4\x93\x91\xd5މ\x85\xe6\x0eN\xa6\xd9\x1d\x9d\\:\xfaXͪ\x93\x93\xb5\xfb\xceN\xd2\xfc.N\xa0MW\x18H7Z\xe9'Nli\xff\xd4\tN\xf3\x99\x13H\xfc\xb9S \xb4;,\xe5\v\n\xb0\x87S\xd6\xfb\xbeL_\x9d\xfe\xffWN\xa0rO'\xe2]/'\x99\u007fo'*\xe6_S/ߠ\x97oU\x86\xdf9\xb9٭\x8f\x13<\xb2/DҏJ\xe9\xefdAa\x00L\xf6{\xa7\x06\xbc\x81\xecd\x90S\xb3\xa8\x1fԊ\x06;\xa5\xe03D\xe7<\xd4ɠ1\x8cm\r\xe7hG\xf0\xde\x1f\x9d\f0#\x9d\xcc\xe1G9Q\x82\xfe\ts\x19\xedD(\x1e\xe3D\xb4\x1b\xeb$\xcf\x18\xc7\x01\x8ew\x02\xfa'\xc0e&:\xb905\x89\x8dO\x86\xe6\xa78A,\xa6\xc2\x18\xa69\x85\xeeL\xa7;\xcdp櫓\x16\xd2L\bq\x16%\xfa\xb3\x13@7\xdb\t\n7\x87\x8a\x98\xeb\x94\\n\x1e\xa6=_\x87\xba@\xe7\xb5\xd0\xc97\b\xfc\xe2\x14\x1a\xb2\xc8\t\xb8\\\xecD%a\tg\xf7\xab\x13\xb4\xeb7\xf4\xbd\xd4)\fd\x99\x131`\xb9\x13\x84q\x05\x15\xf2;u\xbb҉\xea\xdd*\x95\xc5j\xedp\x8d\x13\xf8\xbc\xd6ɤq\x9d\x93\xc8\xfe\x87\x8ec\xbdS\xa2\xc3\x06\xa7\xf0\xfe\x8dN\t\x1f9Y\x9b\xd4\n7;\xc1+\xb78\xb9'f\xab\x93\x95\x8dmNd\x15\u06dd(c\xed\x00&\xec\xc4Tw\x11\xc4v;%\x18\xedqr\xb3\xc7^\x98ٟN\xa6\x8b\xaa\xce}N\xc4\xd8\xfd\xb8\xf2\x80S\v\x12\a\x9d\\:<\xa4\x83=\f7>\x02\x179\n\xd4S5|\xae\x03\xea\xaev\xf1\x05\x05\xdc\xc3E\xb0\xfe҅}8tמ.\xbev\xac\x97K\x1fy\xec\r\v\xfd\xdaŲ\xcf7.\tcߺ\xa4\x96\xfd\x9d\x8b\x8c\xb7\x8f\v\xb4\xa7\xaf\vQ\xb6\x9f\vQ\xa2\xbf\x8b\xfcw\x00\xfc\xe4{\x17i\xc4@\x17Wf\x06A\xfb?p\x1c\x83]\f\xf4C\xf4\x96\xa1.\xae9\fs\xf1}2\xc3]\xcc\xcaF\xb8H\xb3~d\u007f#\xd1\xf2(\xea\xe8'\xba\xf6h\x9eƸt\xc1i\xac\xda\xfc8\x97P\xe1\xf1.\xc2\xf4\x04^5\xd1\x05\xc6?I\x1d}2ڛ\xa2\xde:\x95\xd7LS\x8b\x9e\xeeb\x05}\x86Ki\xf8L\x17\xeaV\xb3\xf4\xfb\x9f՜f\xbb\xb0\x9d`\x8e\v\x85\x8d\xb9\x1c\xdc<\xda\xc5|\x9a\xf7\x02\xbdt\xa1\v\x01\xee\x17\x1d\xe2\"\x17+I\x8bU+K\\\xca ~\x85\xac~s\xe1\x11\xb9\xa5.\xa9\a\xa7\x13H\x17\u07be\xb5\xdc%\x11n\x85\v4\xf4w\x176֬\x84\xb9\xaeRW^\x8dOk\\\xa0hk\xd1\xd4:6\xf5\x87\x8b\xb5\xaf\xf5.Ԓ7\xb8\x18a7\xba\x98{m\x82\xd9mvq\xe3\xd6\x16\x17_\xb2\xb3U\x85\xb5\x8d\x10\xbc݅X\xbdÅ\x90\xb4\x13\xa6\xb2\x8b\x92ۭw\xee\xe1%{\xf5\xe3\x9f\f\x03\u007f\xe1\xd2}\x94\xcf~\x9d\xd4\x01\xbd\xe6 o9\xe4\x92\xe8r\u0605H\u007f\xc4%\xbc\xf2\xa8\vk\xf9\xc7x\xc1\xdf.\x89p\xc7]\x12\xb8N\xb8\x18\x84\xfea\xef'iZ\xa7ԚO\xab\x90\xcf0,\x9cu\x81D\x9d\xd3~\xcf3\xf4\\\xd0&.\xba\x90;^ҩ^\x86]\\\xc1\xf1_\x0e\xf8*\xfb\xbf\x961\xb3\xeb\xfc\xfa\x86\x8b\xb5\x87\x9b\x04\x9f[.,\xd7\xdc\x06\xa4\xdcq\xa12\xf5\x9f\v\xd5\xe7\xbb.I<\xee\xf1\x82\xfb\xea[\xb9ܒS\xe4v\xb3\x917\x8aW\xf9\xddb\xc8\x05ܚq\x17\xcc\xfcQ(s\xf5\x03n̰\xb0\x1b\xd5\xda\"n\xf4\xfa\xa0\x1b\x18\xf3\x90\x1b\xfd=\xec\xc6\x18\x8a\xbai\x87\x8f\xb8\xc5B\x8a\xb9\x99m>\xea\x96G\x16\x8a\xe3X\x02ǒn\xd9Y\xfa\x98\x9bfQ\x8aM=\ue9b5\x96vkz_&\xf3GY\xb7h\xed\t\xdcTέ\xcc\xe5I7E[\xdeMw\xca\xd2\xf3Sn\xfe\xa4\x93\x9b\x85\xaag\xf4\xfc\xac\x1b\x9eYA直\xe7\xe7܀\x96Jnf\xbe\xcf\xebՕ\xf5\xfc\x82\x9e_D\xdfUx\xf1KnT\u0aba\xc1-_v+M\u007f\xc5\r\x1e\xfc\xaa\x1b[F^s\v\xb6\xbf\xce\x0f\xd5\xdcHV\xdf\xe0\xa7\xea<\xd5pì\xdetÏ\xder\x83ؾ\xed\xc6\x0f\x97\xd4t\vL\xbf\xe3FX\u007f\x97\xf2\xaf\xe5f`~\xcf-f[\xdb-<\xb2NZfx\x1f\xb8[\xb8\xcd\ana!u\xf1\xffznD\xb7\xfan\xe6y\rܒ\xcb6t\v\xdfo\xc4\u007f5v\x8b\x91\u007f\xe8f\x99\xb3\tGӔ\xa7fn\x16\x0e\x9aC\x91\x1f\xb9a\xdb-TA-\xd1Y+\f\xb1\xb5\x9bl.\x1b\xdf\xd9({\xbb\x1b\x9c\xd5\xe1N\xa7\xa2N72_\x976\xe8\xc6\b\x00#9\xa8\xcd\x1c\xe2Շ)\xbf#n>\xe3qԍծc\xb8\xe1o\xda\xdeq7i\xf8\t\xb7\u058b\xffq\x93\xe8\x9d\xd4\u007f\x9c\x929\x9d\x96\xc3\x19\x18\xf7Y\xb7,z\x9ds\xcb\xee\x9e\xf3n\xae\xd3^p\x83\xc8\\\u0530sIϗ\xddH\x87\xaf\xa0\xbf\u007f9\x96\xabjx\xd7\xdc$j\xd7is7ԁn\xba\x95\x1b\xdd\x028\xdcvs'\xc9\x1d7\xc2\xe9\u007fn\xac^\xdc\xe5<\xee\x11H\xefcX\xb9_\xf6\xf0w\f=\xb2*\xf9\xaaG\xf9\xe4k\x1e\x91\xf9\xeb췚\x87\xd8\xf0\x86\x87j\xaf\xeeA\xad\xa9\x86\a\x9b\b\xde\xf4H\x00x\xcb#v\xfd\xb6\av[\xd3\x03\xc3~\xc7\x03\x9e\xfb.\x87]\xcb#\xb5S\x0f(Wm*\xb1\x8e\a\x0f\xdcs&\x1fx\xc0\x16\xebz\x10K\xeby\xc4\xdc\xeb\xe3\xd8\xc0C\x92\xd5\xd0â_#\x8f.g7\xe6-\x1fz\x88\x8aM<\x82\xacM1\xf4f\x1e\xe6\a\xcd=@\xbe\x8f(\x89\x16\xec\xaa%O\xad8\xbd\xd6zi\xb6\apj\xf3\x00\xd5\xed\x1eRl\x87\xa7\xb0\xec\xc4m\x1f3SF\x96\xd3\x03N\xe7B\x17n\xcf\x03\x8dÝ\xe4?\xe9\xf8\xe7AP\xf4zĨ}\x1eP(\xbf\a\xbf\x06\xe5\xe1Jb\xc0\xc3W/\x06=LdB\x1e\xfaG\x98\x8a\x8bx\xa4:\x10\xf5 Ŏa\"\xa6\xaa6\xee\xa1\x13&<\x92\xdd%9hK\x15\x9d\xf2\xb0|\x9a\xe3\xc1KSڨ(\xdazX%h\xe7A\x92מ\xff\xed\x00qv\xa4\xc6?\xf6\xa0\xc4\xd5I{\xe9\xacR\xe8\xe2Q\xb6\xd8\xd5\xc3\xe8\xdb\xcd\xc3\xca\xd4'\x1e&\x9f\x9fz\x80x\x9fy\x10\x91>\xf70\xdfꎙ\u007fA1\xf4\xf0hU\xebK\xb5\xb8\xaf\xf4\xdc\xd3#Ѩ\x97\a\xcfI\xf5\xf6\b\xbc\u007f\xedњ\xca7\x1e<\x05\xf2-O\xdfy\x00\x1b}x\xea\vQ\xf6\x83\xd8\xfb{$\xa3\x1d\xe0a\xe0\xfeޣ\x8b\xbc\x03=$\x15\x83\xf0\xef\x1f\xa8\xa8\xc1\x1eb\xdc\x10*|(Ac\x98\x8ef8a`\x84N\xf4G=\x8f\U0010090d\xf2\xb0&\xf5\x13]v\xb4\ady\x8c\xb68փLx\x1cm{\xbc\xaah\x02?N\xa4\xb5M\xd2~&\xc37\xa6x\x10c\xa6z\x80\x99\xd3<\x82\xb2\xd3q\x9c\x81\xff\xcf\x14\xff\x98\xa5@\xf6345\xdb\x03R4\xc7#!h.d0\xcf#\xb5\xc0\xf9\x90\xe3\x02\x8aj!\xf5\xf9\x8bG8\xd0\"5\xdb\xc5\x14\xdc\x12\x8f\xc6F\x8f<.\xf1\x1b\x04\xb8ԃ躌\xfe\xbf\x9cw\xaf\xa0\x19\xfe\xee\x11(_I\x17X\xa52^\xad\xe75jkk=,\x19\xacÈ\xfe\x00|\xaeW\xebؠ\xff\xdb\xe8A\xb8\xddD\xc1o\xa6\xd1n\xe1ܷz\x18\x13\xb7y\xf80\xd8v\x0f_\x8f\xb7\xc3\xc3ȴS\xfb٥\xe7\xdd\x1c\xe2\x1e\xb6\xb5\x97\xa7?y\xfa\x8bM\xee\xe3\xa7\xfd\x1e\xdd\xfew\x80\xea9\x98\xf9|\xc8\xc3\xf2\xc0\xe1\f\xc0\x1d\xf1\xb0\xd8pԃ0~L\x87\U000b778f{\xb0\xfaw\xc2\xc3\xcc\xfd\x1f\x0fH\xd2IU\xf3)L\xf9\xb4\xfe\xf3Lz\xaa\xe1D\xd6Y8\xed9O\xbe\xe6\x9dҁ\x93\xa7\v\x1e>\xe9r\x91\x88y\x89\xa7\xcbP\xee\x15h\xfd_\x8f$~W=\xc2Ȯ\x11=\xaf{\xb8\xa0|#c\xda7q\xe5-\x9a\xe5m\x0e\xf8\x8e\x87\xebl\xffy\xf27\x8f\x19\xed\xb3\xee\xf2\xeb{\xbc\xe8\xbeG(J.\xaf(=\xb7Wr\x88<^@r^\xaf\x84\xf5|^:m~\xaf\x16\xdc\nxQ\x1e-\xe8\x05Z\x14\xe2\xb5\x0fxAD\v{e\x01\xbf\x88\x17c{\xd0+*\u007f\xc8+$\xe5a/\xd6H\x8az\xa1\xdbG\xbc\xea\xf3żܽ\xf8\xa8\x17\xa4\xae\xb8W\xea\x8a%\xbc\xe0{%\xd1\xd6c^\xbcN\xa4\x94W\x06\xf9\xb8\x97\xa5\xd4\xd2젌\x97\x8a*\xeb\x157~\x82_\x96\xf3\x8a\xd1?镤\xb1\xbc\x175U\x1c\x9f\xf22\ayڋ\xc7'\x9e\xf1R&\xcfz\xa5\xdaU!3\xb9\x8a\x1c\xc8s^\x8d\xa6\x95\xbc\\\xff{\xdeKmV\xf6\xb2\xa8\xf1\x02\xa7\xfd\xa2\x17\\\xa7\nf\xfa\x92\x97\x9b,\xab\xb2\x8d\x97\xbd0\xabW\xbc\xacҾ\xaa\xfd\xbf\x96\x99\xfb\xeb^<\xbf\\͋\xe2\xd3\x1b\xbc\xa9:\x05Tëy\ue6fc\xe8-\xaf0\x8d\xb7\xbd\x12wkzA\x03\xde\U0004257e\xeb\x95rk-/6辗\x19vm\xaf\x14|\xebx\x85\x12\xbe\xcf&?\xf0JE\xb7.\xe4X\x0f\x12\xa9\xaf\xe3m\xa0#k\xe8-\xd8\xca\xe8\xda1\x1d\xba\x1ayi\xad\x8d\xbdXZ\xf9Ы\x8e\xd0\xc4\v\xa0h\x8av\x9byA֛{\xf9b\U000cff28y\xb4\xf0jB\xdc\xd2\xcb\x04\xab\x95\x17\xe9`k\xaf\xb0\xd8l/W2m\x9c\x83\x1d\x13r\xe0_N\x1d\x8d+#\x1f\xb7W\xb7\x95{\xbc\x84\v/\xc6\ue8da\xfd0+\x83\xb6\x18\xf0f\x1e\xcc\f\u0080C鱤\xa7\x1c\xf6\xf2\xe7\x131ܨj0\xa6\xad\x99\xb4ظ\x97uڄv\x9fTuY^\x16W\xbd\xc8\xder\xbc@\xbc6^\"n[/\x88B;/\xe8G{\x95_\a/\xb7\x15t\xf42\xae~\xece\x89\xab\x93\x9e;{Y'\xef\xc2ۺz\x81\xffݼ$,\x9fxA\x89?\xe5\xe93/^\xf6\xed\x05Ru\xf7\n\x89\xfb\xc2KF\xd3\x03B\xfbҫ\x1b\x13\xbe\xf2f\x16\xc8{\xc2\xe6{yY\x85\xeb\rI|\xedEl\xfb\xc6\v\xfa\xf5\xed\xff\xe4\xf4\x1d\x8d\xb3\x8fW\xd8h_/\xde\xcbя\x93\xec\x0f\xdb\x19\xe0\x15\xba\xf5\xbdWpj \xe58\xc8+\x9b\xdc\u007f\xf0\x12\xb4\a\xc3φx\xb1\xa9k\xa8\x97\xe8;\f\xed\r\xf7\xeav\x1c/\t\xfb\x8f^Y\x99\x18\t\xf5\x8d\xf22)\xf9\xc9\xcbղ\xd1^\x14\x03\xc6x\x15\xbf\xc6\xc24\xc7Q\xc9\xe3\xbd\xcc\xda&\xf0\xe3D/\xf2\xb1I0\xf9\xc9^\xc0\xec\x14/\x8bNS\xbd\xc2)\xa6qZ\xd31\xd2\x19\xda\xc5L\x15\xdc,\x8a\xf6g\xc0\xdal\x85\xb59\xde\xcc/Iy\xc1\xe9\xe7y\x91\xb1·\xfc\x17x\xf1\xac\x87\x17\xb5\x84_\xbc\xe46\x8b\xbc\xa4K\x8b\xbd\xc8N\x97xɉ~\xe5U\xbf\xa9\xf8\x97z%|.\xc3q\xb9\xcac\x85\x17ώ\xff\xee\x95U\xb7\x95\x99\x19\xaf\xa2\x04V{Q@Z\xe3\x95Dr-\x9di\x9d\x17\x14\xef\x0f\x82\xc0zE\xbf\r^f7\x1b\xd9\xdc&/\vi\x9b\xbd\xd8N\xb0E\a\xb0\x95\xedm\xe3i;\xed`\x87W\xb8\xc0N/v\xce\xec\xf2\x82\x80\xed\xf6\"\xb6\xef\xf1\x92\xd1\xec%\x10\xfd\t\xfd\xff\x05m\xec\xa3\x13\xecW\xcf9\x00Q\x1f\xf4J0:\xe4\xc5j\xc7a\x9d\xe1\x91\fn\x1d\x85\xe1\x1c\xe3\xd4\xfe\xce\xd8\xea\xf1t\xc79\xc1\xac\x13^\xeeA\xfe\a&zҫ\xa4\xee\x94\x17\f\xe6\xb4\x17L\xeb\fOguX\xe70\x9e\xf3\xb4\xc4\vj\x83\x17\xd5\x1f/\xa9\x86/\xabj\xaex\x91d\xea\xb7W9\xc1k^D\xbd\xeb\xf4\xa9\x1b\xfaϛ0\xe3[^\xa9\x18\xdcVIޡ\xf4\xff\xf3b\xbd\xec.?\xddSL\xbc\xaf^\x9eˇ\x1d\x87\xb9}\xdc}\x9a\xc7'\x92\xca\xeb\xc3O\x0e\xfb\xf8Xu~\x1f \xa6\x80O\x18@A\x1f\xfa-\x84\xeb\x1e\xf0q\x0fba\x9fH\xa0\b\xbe{\x10LJ|R\x10x؇\x97\x04\x14\xf5!\xca<\x82\xef\x8a\xf1ã<\x15\xf7q8%|\xac\xe0\x95\xf4a\x92\x8f\xf9\x04\x16K\xf9\x10-}\xcc\x1aJ\xfbD\x17e|\xa8B\x96\xf5\xa1\xf0\xf1\x84O\x99{9\x9f\xb0\x89'}̸\xcb\xfbD\x1aY>\x85\xe0\xa7|\xe0\xa6O\xfb\xc0\xfe\x9fA\xab\xcf\xe2\x92\n>\xc1Ԋ>\xca\xff9\xf4Z\xc9G>\xf4\xbcO\x96\xb4*\xfbH\x9a^\xf01b\xbe\x88\xe9U\xc1}/\xf9H\xea\xaa\xfa\x10\xfb^\xf6\xb1T\xfc\x8a\x0f\x9b0^\xf5qU\xe55m\xe1u\x1f\xc0\xabZfTod\xc6^ݧ\x96S\xc3\xc7g\a\xde\xf4\xf17\x863\u07ff\r\xf1\xd6\xc4\xf1\x1d\x1f\xea\xdd\xef\xf2\x92Z>}\xe4ÇrU\xed\xf4?ӆZ\xc7'\xbb\xe5\xde\xc7\xf5\x1f\xf8\xb0\xa8Q7\xadK#jf\xd5\xf3\xe1\xf5\xe4\xf5}\x84\x9b\x06l\xa6\xa1\x0f\x9e\xd4(\xd3ac\x15\xf9\x87\x98f\x13\xfe\xb7)gٌ\xc2l\xeeCQ\x15\xc7\x16>\xc0UK\x1fӼV>\xb1\xf1\xd68f\xfb\xf8ت\xcd\a\xeb\xb3\xfb\x80\x80\x0e~r\xf2\xe4\x82H\xdd8zp\xf4\xe2\xe8\xf3a稟'\xc3\xc7@\x1c\xf01\xfc\x04}\xd8t\x19\xf2\x11\x88ô\xcb\bOQ\x9f\x00V\x8cFb\xfa\xb0\f\x14\xf71h'\xd4Ԓ>,\x15Y*\xf4\x94\x8fN\x97\xe3\xe3F\x866\x19=\xb5\xf5\xd1K۱\xb5\xf6\x87Uv\xd7+\xbf\xf0)\x03\xea\xe1\x93\xc7F\xbe\u052f\xbfRS\xea\xe9\x03\xb8\xf5\xf2\t_\xeb\xed\x03 |\xed\xc3k\xc0\xbe\xf1\xe9\x1b\xdf|\\]\xfd\x0ej\xe8\xe3\x03\xb1\xea듽.\xfd|\x1a+\xfaS\x1b\x03|\xf8\xbdEm{\xa0O`q\x90\x8f\xab\xb1?\xf8\xf8\xb3\xf9>D\x95!\xfa\xedP\x9f\xbcyc\x98\x0f\xaf#\x1b\x8eQ\x8c\xe0\x85?\x029F\xfa\x14?G\xb1\x87\x9f\xf4\xbe\xd1>2\xdd1ln,\xb44\xce\a\xbc\x1c\xefC؞\xa0\x16=\x91\xe2\x99\xe4\x03;\x9b\xac\xf04ŧ\x14n*\xc45\x8dS\x9f\xee\x035\x9c\xa1ҟ\xe9\x03#\x99\xc5o\u007f\xc6\xf0fg\x04:G\xd5;\x97\xed\xcf\xc3L\xe6g\xfe\xbb \xf3\xc7B\xfa\xc9/\xf8\xf7\"\x9f\x96\xd2\x16S\x81K|L\x88\u007fe\x0f\xbf\xe9ǥ4\xe7e>Th\x96\xfb\x98A\xae\xf0i\x80\xfc݇Ű\x95>)\x01\xac\xf2!\xe0\xac\xf6!ڮ\x81E\xac\x85\xb1\xac\xf3\xc9k\xcb\xfe\xf0\xa1 \xbf\xde\a\xa6\xba\xc1\xc7(\xbfч\x02\xeb&\x18\xdbf^\xb2\x85\xa7\xad>F\xb5m>\xec\x97۞\xd6b8k\a\x8e;} j\xbb\xa0\x9a\xdd\xc4\xdd=>,\xc5\xed\xa5~\xfeT\xfb\xfa\xcb\xc7\x15\xa4}\x90\xd9~\x1fX\xe9\x01\xb5\xff\x83>\xae\xc2\x1c\xf2\xa1Px\x98\xa7#\x19S?\x9a\x11\xd21\xe0\xf4\xdf\x18\xe3q\xfc}\x02\xcd\xfd\xe3\x93\xc4\xff\xa4\x0f\xec\xe5\x14\xc1\xe4\xb4\x1aƙL+g}\x8c\xa9\xe7`\x1a\xe7U\xed\x178̋\x98\xc1%\x1fꐗ}\\ȹ\xe2Þ\x84\u007f}X\x15\xb9\xea#i\xbd\xe6cx\xbb\xee\xc3&\xc0\x1b>}T\xe2\xa6\x0f{\xa7o\xe9\x84o+\xf2ߡ:\xfe\xf3\x91\x1b\xddE \xb8\xc7\xd0x\x9f\xe1/\x97\x9f\x0e\x95ۏ\xfe\xf2\xf8ɗ\xf2\xfae\x86\xf9\xfc\xf2DW~\xbf\x9a}\x01\u007f\x86\xa0\x16\xf4K\xd0,\xe4G\xb4\xf4\xc3\x00\n\xfb\x19_\x8a\xf8!\xc0\a\xfdH\x13\x1f\xf2\x83\a>\x9c>ɏa\xf8\xe9ŏ\xf8\x81\xde\xc5\xfcXZy\xd4/\x11\xa9\xb8\x1f\xe9\u007f\t\xbf\x9ajI?\x12L\xbf\xd0\xc1R~\xa4\x99\x8f\xfb\xa5\xdaY\xda/\xb3(\x83\x11\x94\xf5\xcbN\xed'\xfc\xfa|\xa4\x1f\xbf\xca\xefg\x8ePޏh\xe9\a\xa6<\x85\xa1>\xed\x17\x10x\xc6\xcf\xdf\xe3\xf7\x8b\xafU\xf0\x8bB+\xfa\x89\x96\xcf\xf9\x89\u0095\xfc\\\xb2y\xde/\x95\x98\xca~>\xcc\xf1\x02\xeex\xd1/j\xaf\xe2\x17\xdb~\x89MU\xf5c\u007f\xf7\xcb~\x86\xc6W\xfcT\xff\xab~\xa6\x16\xaf\xf9ս_\xf7\v$U\U000c3c3dᗼ\xa1:Z\xab\x81\xe3\x9b~\x18\xf9[\xfeB\x8ds\xda\x19\xe1v\x1d\xb3\xde\xf6\xb3\x94Wӏ:\xe4;~\xa0ѻ\xfe\xbc\x8dͬZ\x98\xd2{~8|m?ܥ\x8e\x1f\xc8\xf1\xbe\x1f\xde\xf0\x01Z\xad\xebG\xa9\xac\x9e\x9f{\xa6\xeb\xfbui\xa6\x81_\x12\xbb\x86~\xd8`#?\x1f\xedPI~\xe8'\xb5o\x92\x19yS?J\x85\xcd\xfc\xa8\xea7\xf7\xb3*\xff\x91\x1f\x11\xb2\x856\xdd\x12\xfd\xb5\xf23\b\xb7\xf6\x03\x04\xb2\xfdyZf\xd9\xfcؘm\xf7\xa3j\xe2P3p\xfa\x19(yrs&\x1e?\xa0ы\xd9\xf9\xfcj\xe0~U\x81\xe1\a\xef\f\xf0\x96\xa0_\xea\xa8!H5\xcc\xdb#~ť(\xac*\xe6G\xf80\xfd\xf2\x00L\xdc/շ\x84\x9f\xa15\xe9\xa7\xe3[~r\xb5\x94\x9f\xb4'\a\xb3h\xe3G!\xa2\xad\x1f\x15\xb6vj\x1f\xed\xfdxʭ\x83_\xf0\xb3#\a\xf1\xb1?OݬNi\x89t\xe9\xd81\xab\xb36\xdeŏ\x80\xdd\xd5\x0f_\xeb旜\xe2\x13Z\xf8\xa7~l_\xfa\xccOP\xfa\xdc\xcf\x00\xdd]\xcf_\xa8\xe9\xf5\x80y|\xe9ǂ\xc5W~\xa6\xc7=9\x9c^~\x81\x91\xde8~\xed\xe7\v\xe20\xeao\xfd\xd8\x11\xf8\x1d\xa5\xd4\xc7/\xf5\xfc\xbe~,A\xf4\xa3\xea\xfa\xd3T\a\xe0_\xdfû\x06Bԃ\xfc\x84\x98\x1f8\xab\xc1ho\x88\x1f\xf9\xd6P?\xaa\x04\xc3p\xe1p\xd5\xf6\b\x85\x8a\x1fUn#\xfd\x1a\u007fG\xb1\x85\x9f\x00!\xa3q\x1cC?\x19\xeb\x17\xe6?ί\x8fK\x8e\xf73\xb9\x9e\xa0\xfe2\x11\xedO\xe2\x1c'\xe3\xda)~\xbc\xc9e*E7MD=ݏ\x95\xa1\x19\xeal3uܳ\xd0\xd1\xcfD\x9f\xd9\xda\xe2\x1c?R\x9c\xb9\x9c\xc6~\xd5ϝ\xfe\u05c8N\xd73hu\xc3ύ\xdc7\xfd\xba\xab\xed\x96_^\x89x[\xb5x\a\xee\xf8\x9f\x9fQ\xf8.'~Ogr\x1f\xa2\xcae\xd0\xe1r\x1bTU\x1e\x03c\xcdk\xd0\xe8\xf2\x19\x10H~C\x1e\xbe.`\xd0\x02\v\xf2\xcbB\x86\xe8\xe4\x01\x1c\v\x1b\xc8 \xf5\xae\a\r\xda\xfbC\x06\x8c\xf4a\xfc\xb3\xa8!F\xff\x88\xc1\xbdz\xc5\f\xca\xefQ\x03\xc0Q\xdc`\xeeQ\xc2@\xfeX\xd2HK\xfe1\x83\f\xa1\x94\x81\x97\xd6>n\b\xa8\x95Ʊ\f:-k\xc8\x02\xd4\x13\x06\xc4Z\xce\x00\x10=i\xe0\t\x8f\xf2\x068S\x96\x019>ep\xcaO\x1bx\xee\xfc\x19\x83\v\x9c\xcf\x1a`\x06\x15\f\x04\x9b\x8a\x06\xca\xff\xcf\xf1Tɀ\xf3=o\x103+\xb3\xa1\x17\fٗ\xf6\"\x8eU\f\xbc*\xd5\x00Y\xadj\xe8o\x12\x1b\xaa\x99W\f\xb1\xdeW\r\t\xe4\xaf\x19b\x1b\xaf\x1b\x19RQ\xcd\x10'y\xc3@$\xaaN\x01\xd40\x94\x0e\xbc\xa9\x82y\xcb\xc0\x8a\xd3\xdb\x066[\xd64\x98\x19\xbfcH\x8d\xf9]\xdeSˠüǖj\x1b\xd0o\x1dm\xe0}\x83\xc1\xe7\x03Cܽ\xae\x81\xfd\xe6\xf5\f\xe4\xd0\xf5)\xe6\x06\x86T\xc4\x1a\x1a\x12V\x1a\xa9r\x1b\x1b\xe0G\x1ff&҄3o\xaa\x03hfpGzs\n\xed#\x03\xe9l\v\x830\xd4\xd2 ;oeH\r\xb0\xb5\x81b\xab\x01\xaf\xb7\x19\b[v\x03\xd6\xef\xe0\xc9ɓ\xcb\xe0[Si.\x1eCX\xaf\xd7\xd0\xfc\xcdg\xe8\x0f\xf5\x1bR42\x8c\xcc\xd6ۀ\x01\xac\x0e\x1at\xa0\x10\x15\x166𪸈\x81zS\xd4\xe0\xab\xe4(/\xd3\xd0\xe7\x1e\ra{\tUY\xd2\x00\xdcX\x14Iʐ|+\xc7\xd0]_mh\xeam\r\xa6\xc1\xed\xd8g{\x95U\aξ\xa3J\xfcc\x83\xb0\xd7\xc9 \r\xedl\b1\xebb\x80xt5P\xe6\xeaf\xb0\xe0\xff\t\xac\xe7S\x1c?\x835\u007fn\xb0~\xdb\xdd`\xa9\xe9\v\x95i\x0f\x03!\xe5KC\xf9\xf9Wl\xaf\xa7\x8a\xa5\x97\xa1X\xd3\x1bm}mHz\xf2\x8d\xc10\xfe-\xbd\xf9;\x03\xd9P\x1f\x83h\xd1\xd7`\xc2\xd3\xcf\xe0\xe3\xfa\xfd\xa9\x9a\x01*\x9e\xefu \x03\xe9\t\x83(\xc3\x1f\x14(\x06g\xfa\x1bB\x81\r\xe5i\x98!p:\x1c\xc7\x11\x06\xa0\xedG\x03\xc0<\xd2\xe0\xcbu\f0\xbb\x9fx\x1a\r\x17\x1ac\xa0\x161\xd6\x10\x98\x1ag\x90N\x8d7\x90\xb6L\xa0sN4@\xea&\xf149#\x84)\x06b\xfdT\xccy\x9a\xa1\x9bYi?3\ff\xc23U\x90\xb3\f\x04L\x9a\xdalv9ǐ\xbc|\xae\xde8\x8f#\x9do\xe8\"\xfd\x02C(\xc9B\x00\xd6/\x06H\xec\"\xbdt\xb1\x01\x80^\xc2)\xfe\xca\x1b\u007f\xd3\x1e\x97\xaaI-\xe3薫\x9cW\x18xz\xfbwEŕ\x06\xf76\xac2P\f]\xcd\xd3\x1a(n-\xbd~\x9d\x01\xfa\xf5\a\x1d{\xbd\xc1\fn\x03<`\xa3\x81\x15\x97M\x18\xddf\x03\xe1q\x8b!o`\xddj`G\xca6\x83\x99\xcev\x03\xe1~\x87\xc17\xcd\x01,w\xf1\xfa\xdd\x04\xcb=\x06\xb6\x9d\xee5\xb0w\xe5O\x9a\xc1_\xb0\xc6}T\xeb~\x03Y\xc5\x01\x83\xcb\x13\a\xd1\xc8!\xfdt\x98\xba<\x02%\x1c\x85\xcb\x1fcg\u007f\xb3\xeb\xe3\x1aTN\xd0d\xff!6\x9f\xe4\xe9\x14\xc7pZa\xea\f\x90\xed,\xaf\x10\x10\xfe\x11\f\xa0\n\x11\x82م\xd9t$\xc0\x10\x16\r\xf0Us\x01\xa4\xd5f\x00\xa5\xe2x\x00\xee\x9b\b\x803$\x03\xf4P+\x80\xdaK*\x80bFN\x00\xb5\xb46\x01<\xd7\xd4\x16Jk\xa7\x8d\xb6\xe7%\x1dhV\x1d1؏1\xd3N\x01\x81\xb0θ\xbaK@P\xb6+\a\xd0- \x19\xee'\xa2\xceO\x03\xc8\x16>\vpO\xc1\xe7\x19'\xe8\x0eS\xfc\x82\xa2\xef\x11P`\xf8R\xb5\xf9U\x80e\x99\x9e\x01q\xe0^\x01T\x97{Ci_\xd3\xed\xbe\xa1\x8b~\v5|\x17\x00\xea\xf6\tpY\xa0o@\xe9W\xbf\x00\xe8N\xff\x00R\x92\x01\x01ɭ\xbf\x87,\a\xd2C\a\xc9\x1di\xd0\xfc!\x80u\xae\xc1\x01\xc8\xd3!\b\xe60Du\x04\xb7\x1d\xa5\xeb\x1c\v\xe8\xafh(\xdc\x1d\xa7\xf6N\x044]\f \x16\x9d\f\xf0\x89\x90S\x01\tz\xa7a\x06gt\xb0g\x03\xa8\xe4\x9c\v 6\x9f'\xb6] \x94^̘\xe9\xa5\x00\xca\x05\x97\x03LO\xae\xe8\xf9\xdf\x00s\xe2\xab\x01l$I\xc7\xc0\x00\xea\xc4\xd7\x03x\x84\xe6F\x00\x1b\xfboR\x9f\xb7\x02`\x17\xb7\x03¾\xee\x04\xb8\xd8\x18\xc0\x13{w\x03x\xec\xc2̺\xc7\xee\xefC\xac\xb9\x822\xda\xdcAܝ'\x88\xf1\xe5\r\xc2\x02\xf3\x051\xfb\xfcAp\xbd\x02<\x15\xe4\xff\n\x05\x91\xa0=\x10\x94U\xec\xc2A.J\x16\t\xd2\x12\x1f\f\xe2w\x12\x83dJ\x0f\a\x05ъ\x06\x19\xb1\x1e\tʦ\x98bA\x96\xe8\x1e\rb\u007fS\xf1 L\xb7DP\xe2G\xc9 \xc2\xd8cAY\x17)\x15\x84\u007f?\x1e,Ԥc\xfb\x98\x99F\xd3\xd2A\xd1L\x19\x0e\xa3l\x90[\xb5\x9e\b\x8a\x99\x96\vҍ\x9f\f\xca\xee\xda\xf2A\x88\"+\br\xf7T\x90\xc9\xe8\xd3:\xaag\x82*\xf5g\x83\x82@\x15\x82\x10U\xc5 J\x90\xcfaȕ\x82B\x8c\x9e\x0f\u009a*\aAp^\bb\a㋐Z\x95 7!\xbc\x14\x94\xac\xbb\xaa\xce\xfe\xe5\xa0b\xdb+A\x84\xa6Wyz-\xc8\u05cd\xbc\x1e\xc4RD\xb5 m\xea\rL\xa7z\x90\xce^#H\v{3(\x9e\xfaV\x90\v\xc9o\a\x19\xaejr\f\xef\x04\x81c\xefr~\xb5\x82\x88\r\xef\x05\xb9)\xb6\xb6ίNP\x02\xc3\xfbA\xb0\xc7\x0f\x82Ȝ\xea\x06\x99^\xd4\v\xa2\xaeS?\br\xd1 (u\xe5\x86AzH\xa3 \xe0\xadqPb܇Aq\xab&A\x04\xa3\xa6A.\xa56\v\xa2\x10\xd3<Ȥ磠\x18z\x8b Yrˠ,(\xb4\xa2\xd6Z\a%Df\aɻl\xf8d\x0fb\xff\xa2\x03\x13t\x06\xf9ȓ\v\x8aw\a\xb1\xe9\xc0C\x81{\x83\xc8\x0e|A\xe4\xca\xfe \xf7\xd0\x18*\xa0\x806\x1a\f\xa2\xa6\x15\n\xc2#ÔL$\x888\x10U\xa1Ƃ |&m-\x1e\x04z%\x82\b\x87ɠ\xc0\x8f\x15\x04\x00\xa4\xa0\x8b\x1c6\xd9&(\xf4\xac-l\xa0\x9dε}\x10A\xa7C\x90\xa5\x87\x8eA}\x8f\\\x90\xaf\xda\xec\x14\x84Cw\x86@\xbb\x04\xf1\x0e\xa0\xaeA\xf1\xb2nAb\xde'\xd4\xe0\xa7A\xd9\x16\xfd\x19z\xf8<(q\xb3{\x90\xa9\xc8\x17\x19\xe3\xe9\x11$\x91\xf92\x88x\xfdU\x10\x01\xa4g\x90\xd9h\xaf )ho:\xe5\xd7A}\xe21HJ\xf1-\x95\xf8]P\x00\xadOP\tG_\xf1\xeeTV?\x18|\xff \x8a\x06\x03\x82\xa8\x14\u007f\x1f\x14\x1e90\b\xdc\x1d\x14DP\xfc!H\xec\x1a\x1c$\f\x0f\x81ʆ\xc2ӆQ\xc1\xc33N4\"\x98y\x89\x1c\x11d$\xae\x1dE\x03\xfbI\xcdwt\xe6\xea1A\xbc/yl\x10\xe4j\\\x10\x01n|\x10\xdccB\x90Qp\"e9\t\xae59\xc8b\xe5\x94 6\x1aL\r\xf2\xf9\x0e\xfa\xe2\xf4 \x9e\xf8\x9f\x01\xe5\xcd\f\xb2\x9c9K\a\xffs\x10I\xd7l*x\x8e\xcai.\x1b\x9f\a\xb3\x9b\x1fD-cAڢ\x8c\x80\x91\xb5\x90\xa6\xf4\v\x01fQ\x10\x11lq\x90\xf5\xee%\xaa\xa6_\xa9\x95߂\xacS,UK[\x16d\xf1f9ռB\x8d\xf5wE\x86\x95t\xc3U\xfa\xf5\xea\xa0p\xa85\x9c\xcc\xda \xd8\xf8\xba \xf2\x90?\x82\\\xec_\x1f\xc4s\xaa\x1b\x82\x12\xa57\x06Q\xb7\xd8\x14D\xc1k3\xa7\xbd%\xc8\xccgk\x90\xdbd\xb6A`\xdb\xe9\xa3;\x88\r;\x83\xfc5E5\xdb\xdd:\x9c=P\xd2\xde \u007f\xf6\xee\xcf +\xe3\u007f\x05ɽ\xf6\x05\xc9#\xf6\xab\xa7\x1d\xe08\x0f\xa6o\xc6NV \xff\xe1\xa0\xe49G`\x13Ga\xceǂR\xcb\xfb;\x88\r\xaff\xd6q\x18\xdb\t\f\ua7e0\x04\xfc\x938\x9e\xca\xd8\xf9\xe9 \xca8g(\x9a\xb3<\x9d\x83\a\x9d\xa7\x96.\x10\x9a/*\xd8^\nj\xb9\xe0r\x90\xaf\x91\xbaB\xf7\xfe\x97pxUUpM\r\xe0:\x00\xe9\x06\x05q\x93q\xe6V\x10\x15\x94\xdbA\xf0\xa7;T\xf8\u007f<\xdd\r\"\x98\xdf\v\x82k\xde'\x92\xe4\n1\x9d\xcc\x1d\x92\xc0\x96'\x84\xaaO\xde\x10ř/ā\xe5\x0f\x11y\v\x84\xb0\xef\xa3`\b\xb7\x16\n\x91$<\x10B)\xabp\x88L\xaaH\b\x01\xf7\xc1\x10\xf9\xd2C!\xa0\xdc\xc3<\x15\rIty$\x04~U,\xc4\xec\xf1\xd1\x10w\xda\x17\x0f\xc1\xeaK\x84`\x81%C\"\xee\xc7B\x98I\xa9\x10\x90\xeb\xf1\x10L\xb7tHxn\x99\x10\xc4R6D\x9b{\"\x04\x8c-\x17B&\xf3d\bor+\x1f\xd2'\x1dC\x94\xe8S!>\xc7\xf3t\bU\xb4gBHɟ\r\xa5y|\x85\x10\xa1\xaeb\b\x16\xfe\\\x88\xae])$\x11\xf7\xf9\x10\x14V9\xc4\xf4\xf9\x85\x10\xc8\u058b!\x90\xba*!ɑ^\nI\xf2V5\x04\xf0y9$\xf4\xf7\x15\x0e\xf7\xd5\x10ޗ\x13B\xd9\xe2\xf5\x10\xb5W-\x045\xbc\x11R\xde\\=D\xf7\xae\x11\xa2\t\xbf)cz+$\b\xfa6GT3D\xb6\xf4N\b\x1a\u007f7\x04\x8dׂ\xe2\xde\vIL\xac\x1d\x92\xe5\xb4:!X\xcd\xfb!\x92\xfb\x0f\xf8\xb1n\b\xd0W/\x04\xb8\xa8O\xb16\baSJC\x8a\xaeQ\bp\xd58$?=\xfc\xa1\x1aF\x93\x10b|\xd3\x10\xabS\xcdBj\xa3\xcdC\x99,\xfa\xa3\x10P\xa6E\x88\xf0\xd62\xc4p\xdd*\xa4\xbb\x83[\x87\x04\xab\xb3C\x82\xc36\xf6d\x0f1::B\xacQ8U\xae.ڎ;D\xf0\xf1\x84\x04ż!<\x19\xe6\xa3m\xfa\xd56\x8d\x10\x92\xfb\x00\x04\x1d\xa4,B\xff\x1bSX\x1b\x8c\x84\xf0\x00R4\x84\x8am,\x84\xbdifH\xf2\x80xH7D%BX-M\x86X\xb6\xb2\xa8\xb4TH8v\x0e?\xb4\t\x01tچPOm\xa7\xa6\xd1>\x84\f\xa8\x03%ۑ\x82\xfa8\xc4\xf4\xa8\x93\xfaLgt\xd6\x05Ǯ!\xe4Y\xdd\xd4(?\t\x917}\x1aҟ\xdeό\xe8\xf3\x10\xaaY\xdd\xe9n_\xa8\xc5\xf4\b!\xb6|\x19\x12\xdc\xf9JG\xdb3\x84p\xd5+\x84w\x88\xf4\xe6\xe9\xeb\x10\b\xc67!\xee_\xd5\xee\xbe\v\xf1U;}B\xc0\xe3\xbe!\x90\xec~!\x81\xca\xfe!\xb0\xc3\x01!Ů\xef3\u007f\f\x841\f\n\x81i\xfe\x10\"\x90\x0e\x0eɂ\xfe\x10\x1d\xd7А\xd6އ\xc1\x0f\x86\x87@\x83F\x84\xc8\v~\f\xa1\x8472\xa4\x11rT\x88\xab\x90\xa1\xcc\x06\xdc\xd1*\xa81\x98\xd7\xd8\x10*\x8a\xe3B\bN\xe3y\x9a\x10B\x00\x9d\b\xf0\x98\xc4\x0f\x939\xf1)!\xddɪ\xf69-\x04n2=$\xe4gFH\u007f\xa3\n7\xce\"\xbc\xfc\x1c\"\x1d\x9c\x1d\xd2g\xb5\xe7\x84\xc0\xca\xe6\x86$\r\x9dGl\x9bO\xd1-\xd0I,\f1r\x12q\x16\xc1,\x17븗\x84\xf8lů\x00\x8a\xdfB`\x94K\xb5\xe7e!\xf2\xf6\xe5\nR+BX\xe8\xf9]\xa1se\b/\xaeY\x15B:\xb2\x1a\xed\xaeQ\xebZ\xab\xe3\\\x17\x12\x16\xfa\aF\xb7>\xc42\xd3\x06\xc8jcH\xdf\xc0J\xcb\xdbL\xd1m\t\xe9V\xd6\x10\xab\xbc\xdbB\x8cr\xdb\ta;8\xc1\x9d!\xee|\xd9E\t\xef\x06\xd0\xec\x01\x96\xec\rIH\xfe\x132\xfb\v^\xb0/$\x04d\u007fH\xe2\xcd\x01\x8a\xe2`\x88\xb4\xe1\x10\x1d\xfapH\xaa\x8bG0\xac\xa3!\xe4\xf0\xc7t\xfc\u007f\x13\xba\x8f\x87\xb8\xc8w\"\x84(\xf4OH~\xb5\xe4$\x1a>\x85\x86O\x87$}:\x83\xbf\xcf\xe2x.$\xf9\xeayx\xf8\x054}\x91xu)\xc4|\xf42\xc6{\x85>\xfa/\xe7w\x95\xb2\xbc\x06\x87\xbb\xaeb\xbfA\xc5\xdd\f\x81'\xdf\"\xce\xdd&\x14\xde\xe1\f\xfe\x83\xf0\xef\xd2\xc7\xee\x85P&\xbaϖs\x85\x81\xf6\xb9ä\ry\xc2PZްxF\xbe0\x9c?\u007f\x18\xceT L{)\x18\xa6\xcb\x15\n#Iy \f\xb6X8,\x11\xa2HXX\u0083a\xd8\xc9Ca\xba\xf1\xc3a\xe9\xbdh\x98\x99\xd3#azV1=?\xca\u058b\xeb\xc7\x12a\x88\xb0d\x18\xdb]\x1f\xd3&J\x85\x91}=\x1ef\x9d\xb8t\x98\xf8]&\f}\x95\r\xd3J\x9f\b\x8b\xa2˅\x11\x13\x9e\f\x03Y\xcbs\x94Ya\xd1\xe1S\x18\xe4\xd3\xec\xf1\x990\x93\xd0gÐX\x850\x19RE\\\xf3\\\x98<\xbeRX\xc2\xdb\xf3a\x1ac\xe50\xdd\xe2\x850\x9f\x8c\xe4X\xab\xe0\x8e\x97\xc2\xfcݘ\xaaa\xc8\xf5\xe50\x9f\xf5\xe0\xe9հ\x04\x88\xd7\xc2X\xd9~=,\xe6^-\x8c\xa7\xa4\xde\b\x93\xdbV\x0f\xa3\x1eP#\x8c\xda\xfa\x9ba\x04\x80\xb7\xc2x,2̊B\xcd0\xfc\xeb\x9d0\x02\xf3\xbbaVRk\x85\x15|\xde\v\x8bQ\xd7ց\xd7\t\x03\xbf\xdf\x0f#m\xfa ,!\xb4nXJ\x90\xf5\xc2RZ\xaa\x1f\x96RC\x830\x11\xa6!\xc4\xd3(\f\xea\xd28,\x96\xf7aX\"[\x93\xb00Ŧ:\xeffl\xady\x98\t\xd4Gaо\x16aF\xf5\x96ad5\xad\xc2\u008f[\x87\x11\xed\xb2\xc3\xe2c\xb60\u007f\x8e\x18\x8d9\xb41'/w\x85\x19&\xdda\x84!OX\x16\xa8\xbda\xdd'\xe1\xd3\xe9\xf8y\xb1\x01\x81\x04(\x88 m$\x14\x16.\x15\x0es\xd3j\x18\xd8\x16\x85\xbccaT\x02M\x9dd\x9cm$\xb4\xffd\x98\x18b\xa9\xe9\xa7\xc2\xe009\x9cc\x1b\xda~\xdb0\x12\xc90\x11\xaf=>u\xc8H\xbc#D\xf4\xb1N\xbfSX`\xb93\xef\xeb\x12&dw\rK\xe9\xad[X\xb7\x14}\x02\v\xfdTG\xf0Y\xfaZy\bR?v\x0f\x13T\xbe\xc0${\xa8\\\xbe\x84@\xbe\x82\x8d\xf5ԙ\xf4\xd2s\xef0x\xd6\xd7a<\x1b\xf8\r&\xfd-\x8e߅IB\xfa\x84\x01*}i\xb0\xfd\xf4\xdb\xfe\xf4\x9b\x01aTп\xa7A\r\xe4i\x10\x8d\xfa\ahq0?\f\t#\x85\x19Jy\x0e\v\xeb\xda\xdcp\x9d\xe4\x880j\x89?\x86\xf1[Va\xc0\xd1(~\xf7\x13\x9a\x19\xad\"\x1a\xa33\x1d\x1b\x96\x9cc\\\x18\xf5\xda\xf1\xb4\xba\ta\xb0։\xb4\x9bIa\xb0\x84ɐ锰\xf2ȩa\xf2\xeei\x90\xeat\x95\xd7\f\xfdvf\x98\xaf˛\xa5\xdf\xff\x1c\x96H>\x9bN7G\xbf\x9c\xab\xe7ya\xc6\xc20\"\xf8\x02\xfdv!\xc7\U0008bdb4(\x8cz\xe8bu\xb5%\x9cگa\xbeP\xf97\xccmi\x18Yڲ0\xf6\x1e.\xa7\xff\xaeH\x1bQ\x97p\xd6\xefan\xa3]\t\x9d\xac\xd2q\xae\x0ecYd\r`q-\xef[\x17\x96\xb8\xf4G\x18\x8bi\xeb1\xeb\r\xda\xeb\xc60S\xc5Mj\xaf\x9b\xf5\xbc%,\x11dkXj\x12\xdb¬\x8cn\x87\xe9\xec`3;ì\xfc\xec\n3P\xec\x0e\xe7\xad\xdb>k\x0f.ً\x11\xfdI\xac\xfa+\x8ce\xde}aR\xb5\xfd\xfcx@\x87{0\xcc\n\xee!\x02\xd6a\xcc\xfa\b\x00\xe5hX\x02\xd71\x1c\xff\xc6\xf18\xa3\xc1\x89\xb0\xfc~\xd4?a\xc4ߓ\x84\x89S\xec\xect\x18\xbb\x02\xceP\x96gì(\x9e\v\x83\xa3\x9d\aB\\\xc0\xf1\"\x8e\x97\xe8\xeb\x97\x19R\xae\x84\xb9C\x15\x8ew\x15\x17\\\xd3Xp\x9dz\xb8\x11\xd6ň\x9b\xeaַ\xf8\xfd\xed07 ݡ{\xff\xc7\xd3\xdd0\xb6\xba\xde\vs5\xfe>f\x95+\x82u\x87\xdc\x11\xa4\x9by\"x\xfbFވ0\x95|\x11\xf8H\xfe\b\xc2q\x81\b\nr\x05#\xea\x0f\x85\"\xe2\x00\x0fD\xa8\xb7\xc2\x11l~+\x12A\x04x0\xa2\x88\xf6P\x84\xea|8\xc2\xdd\x1bE#\xd8*\xf2H\x04k\xec\xc5\"0\xcbG\xd1R\U00048a2aDD0\xa3d\x04f\xfcX\x040W\n\xa3y\\{*\x1dA\x04+\x13a\xf1\xbflD\x88\xc7\x13\x11ο\\\x04\xd1\xee\xc9\b3\x98\xf2\x11R\x95\xac\b#\xebS:\x9c\xa7#\xb0\xc3g\"\xf4\xd4g#\xac\x1eU\x88P2\x159\x99\xe7\"\x88Õ\"\xfc\xf1\xe2\x88\xf0\x90\xca\x11V\x1e^\x88\x88:^\xe4t\xaaDh\x90/E\x98\xd1T\x8d@\v/\xf3\xf4J\x04\xafZ\x8d\x00~^\x8b\xa0p\xfcz\x04^Q-\x82\r9\x19iU\x8f\x00\xe1jDX\x86~3\"\x00\xfc\x96\xce\xe5m\xaa\xa6f\x84[\xe1߉\x90a\xbc\x1b!A\xa9\x15QSx/B#\xab\x1d\xe1\xbaT\x1d\x8e\xe2\xfdH\xe6\a<2\u007f\xd4Uaԋ \x8b\xa8\x8f\x195\x88\x10\xb4\x1aF\x00P\x8d\"0\xe3\xc6\xfc\xf4aD\xd7)\x9bDX\xa4m\x1aa\t\xa8\x19\x15\xd5<\x82@\xfeQDw\x8f\xb5\x10\x1d\xc9k\xc9#D\xf0V\x11!\x83\xadiq\xd9\x11\xa4\x0f\xb6\bl\xddΓ#\x02\x02㌠F\xeaҹ\xb9iz\x1e\x9d\xba\x176\xe2\x8bhb\xe3\xcfX\xa4\x11\x91\xe2m \x82\xd4,\xc8S(\x82\xb5G\xb6\x1ea\x97Q\xaa7\x16a`7\xd9Y<´=\x11!: \xdc\xd2NS\x11\xe119\x11\xc2Q\x1b\f\xa1mD_\xa2\x03\xd3m\x8f\xef:DH\xda;F\x04s>\xd6\xeb;\xd1/:\xab\xc1u\xc1\r])\xdcn\x11\xa9R}\xc2Q|\x1a\x01D\u007f\x16\xd1Z\xe5\xe7\x19\xdb\xe8\x1e\xd1'\x8ab\x85\xbc\x05\xa7\xd62J\xfa\xda*\x8a\x12V\xeb(*\xadQ\x85$[\x945\x1a{\x14\xf9\x82#\x8a\x85ɨ$\xb8\xae(\xf3ewTPۃ\xffx\xa18_\x14\xb6\xed\x8fr\x19\xceP[\t\xa4\xdb\xcaIt\xcc\n\xa6{̱\x8c\xacP\xb4@\xab\x9c`\xba\xd5p\x14\x0f\xd7E\xd2\xdfw\x8c\xa6\xa3\xa4\xf6\x19\x8b\x12\xceͨ\xbc\x9c\"\x1e\xe5\x12N\"*\xe9F2\xaa\xbft\x15e\x92\x90\xa2\xa5\xe6DA&\xdbDA\x1c\xdbFIg\xdaE\x81\xed\xed\xa3\xc0\x8d\x0eQ\xe2f\xc7(\x9c\xf7\xe3(\xde$\xd1)*\xcf$u\xe6ȻDQ\xf2\xed\x1a\x05\x19\xec\x16\xe5\xaa\xc4'4\x89O\xf5\xe3gQ.\xea~N\xcf\xe9\xae\x1f\xbf\x80\xf2{\xd0پ\x8c\"\xe6|\x15E\x15\xb6'\xfe\xd5+\x8aH\xd6\x1bN\xf95\xac\xe3\x1b\xb5\xeco\xa3`Z\xdfEI8\xfb\xd0}\xfbB\xb4\xfd\xe0\x99\xfd\xa3\x88\u007f\x03\xa2xUyT\xf0d`T֗\x06E\x914\xfe@S\x18\xac\xee8\x84S\x1e\x1aE0\x18\x16\xc5\xc6\xfe\xe1\xd1O\x89*U\x9a\x1a-\xd0Đ\xdfL\x9d\x16\xd5$sz\x945\xfe\x19\x9c\xd1\xcc(\xc3\xcb,\xd5\xce\xcfQ\xd9d0;ʍ\xb9s \x82\xb9\x98\xf5<\x8eq~\x94\xf9\xd2\x02\xbdqa\x94/a\xe5i\x11%\xbe\x18B[\x02\xa7\xff\x15m\xfc\x16\x15$^\x8a\xe3\xb2(\b\xea\xf2(J\"+\xa0\x8a\xdf\xe9\xd6+q\xf1*\xc5\xc1\xd5Q2\xe15Q\x89\xd7k\xa3R}[\x17\x15\x18\xff#\x8a\xba\xdez\xbaކ\xa8>\x14\xb81\x8a=|\x9b\xe0\xe6\x9bՎ\xb7`0[\xa3R?\xda\x16\xc5\x0e\xff\xed\xf4\xea\x1dp\x9b\x9dQ\xbc\xf3}W\x14\xab\x9a\xbbi&{TA{ռ\xfe\x8c\x82]\xfe\x15\x05\xc3\xdaG0\xdf\x1feJr *)\xc9Az\xf2\xa1(\xb2\x87Ô\xef\x91(\xeb\x9dG\xa3,\x1b\x1f\x83\x9f\xffMY\x1e'\x10\x9e \xac\xfc\x13e>\t/?\x15\x95({\x9aXv&*e\xa6\xb3\x98\xc79U\xf1y\xcc\xe7\x02\xc5v1*E\xa2KQ\xac\x91\\\xa6\xbf\\\x81\\\xff\x8d\"Y\xbe\x1a\xe5f\xa7k\xec\xf1:\x9c\xf9\x06/\xbc\x19Ent\x8bZ\xb9\xad\xfa\xbd\xc3A\xfdGK\xbe\x1bE\x85\xe5\x1e\xc7s\x9f\x97\xe6\x8aa\x16\xb9c\xe8\"O\f\x96\x9d7\x96\xafAN\x97\xac|1\x06\xf8\xfc1tX \x06k-\x18\xe3\x93ՅbL\xbe\x1f\x88\x010\n\xc7\x18:\x8a\xc4\b\x1c\x0fƄ)<\x14+\xd0\xd2\xe8\"\x15֘\xd8x\xd1\x18\x8a5\x8f\xc4(\xc8b1xã18^\xf1\x98nC*\x11\x13\x95\x96\x8ciXħR\xb8\xff\xf1\x98\x98V\xe9\x98r\xa42zIY\xfc\xf3\x89\x98\xec\x12/\x17\xc3>\x81'cؐZ>F\xebˊ\x01\xb0\x9f\x8a\xd1\xe0\x9f\x8e\x89\xe0\x9f\xe1\x97\xcf\xea5\x15b\x02\xfb\x15c\xfa\x82rtU\x89\x93{>&<\xa1r\f\xb2~!F\xed\xbd\x18\x03\x95\xa8\x12\x93\x17\x1d\xbc\x84c\xd5\x18l\xea\xe5\x98<\x92\xffJ\x8c \xffj\fu\xd3\xd7bX\x15z]\xc5V\rc~#\x06\xceQ=F3\xaf\x11\x13\xc7x3=\x85\xf4\xb8ޢjގ!|ԌI\xc9\xf3\x9d\x18\xdf8\x17#\xb7\xaa\x15\x13sz\x8f\x83\xac\x1d#\x9e\u05c9\x81P\xbf\x1f\xc3R\xe8\a1}\x8fE\xdd\x18\xa2x\xbd\x98Ҽ\xfa1\xa1\x89\rb\xc2\xfe\x1b\xe2\xd8(F\xc2\xd1\x18S\xff0Ɣ\xaaILФ)\a\xd3,\xa6\x8f\x0e5\x8f\x91H|\x14\xe3\x8an\v=\xb7\x8cq\xb9\xa3\x15\xc7\xd4:\x06cˎ\xa1\xfcg\x8b\xc1\xd2\xed1>\x9f\xe4\x88Itv\xc6\xc0\xf8]\xe9q\x19\xed\xe5\xcd\xe41R\x17O,\x1d\xcaҨ\xe7\xa5\xd9\xf9Tn\xfe\x98@\xb6\x11ÊX@\r \x18\xd3w\xce\xc1V\xc21\xd6B#1\xae>Ƹ\xd6\x12\x8be~\xd1*\x96Y\xfc\x8a\xd3\xf2\x121d9\xc9\x188\x85\xa5\x8d\xa6b\b\x8891\xf2\x8e64\xac\xb612\xefv0\xa1\xf61\xb0\xa1\x0e\xd0C\xc7\x18b\xc4\xc7*\x9aN1\xf8[\xe7\x18\xb6\xaf\xc6H\xb8\xba\xd2Ѻň\xe0\x9f`\xc0\x9f\xc6PB\xf8,\x86<\xfa\xf3\x18\x80\xad{L\x1e:\xf8\"\xa69e\x8f\x18\xf8ї:\x9a\xafhi=鰽b\xdc\xc4\xd4[\x9d\xf0\xeb\x18\x99\xe97\xff\x9b\xe9\xb71\xc1\xac\xefbL\x88\xfa\xc4d\x1bD\xdf\x18\xa2P\xbf\x98 S\xff\x98@ր\x98\x00\xce\xf7\xb8x`\fI\xd4 \xb8\xc5\x0f\xd4\xff`\xba\xcc\x10\x8afh\x8c\x14}\x98z\xc4pU\xfe\x88\x18\xd2\xe2\x1fcX8\x1f\x19CX\x19\x15#\x95\xf9)&\x91|\xb4z\xe2\x18\xc0\xc4X\xbdq\\\x8c\x84j|\f\xefޛ\x10\xe3S\x1d1\xe2\xf7\xa4\x18Y\xea䘰\xb4)p\xa0\xa98N\x8b!\xbaN\xe7m3ԂfR\xad\xb3b\x82\xec?DŽ\xfeϦYΉ\xa161WM|\x1eqh~\x8cu\xba\x051D\xa4\x85t\x98_T\xe1\x8b\xd0\xd3b\x05\x8b%\xb1\x82\xf5:Z9\x1dұ1V(\r\xa4\t\xd3J\aH\xba\xdcR\xcajY\f\xd4ly\x8cU\xf2\x15*\xa4ߵӕ1\x06\xc8Uhw5\fa\x8d\xb6\xbe6\xc67į\x8b\x91L\xfc\x11#\x9f]\x1f\xe3\xf3p\x1bp\xf5F\x1c7\xc5\xc0L7ǰ\ak\x8b\xceakL\x1e\x8b\xda\x16\x03\xb5\xdb\x1e\xc3\xf6\xab\x1dj%;c\xd8ĵ+\x86:\xd8\xee\x18S\x84=1\xe5\x1b{i\x16\u007fBO\u007fat\xfbԞ\xf6\xc3c\x0f\xe0x\x10\x06s\x88\x8d\x1cV\xd4?\x12c\x92w4F\xfez,Fv\xf67,\xea8\\\xe1\x04\xc5\xfbO\xa6\xbf\x93\xea٧0\x9d\xd31\xb2\xd331\xa4\x89g\xd1\u05f9\x18y\xfdy Ӆ\x18R⋴\xc5K1n\x1c\xb9\x1c\xe3szW\xd0̿*\xe5\xab\xf0\xcck1\x89\xadש\x90\x1b1\xeco\xba\xc9\xd3-\xbd\xf0v\x8c\x9b\x1e\xee\xd0\xe6\xfe\xe3\xe9n\x8c\xc9\xf1\xbd\f\xeeݏ\x81\xf0\xe42a\xe1\xb9MP\xbf<\xa6\x18q^\x13y|>\x13&\x96ߔ\xa1\x160\x19M\n\x9ax3\x00\x8e\x0f\x98:\xf1\xc2&XF\x11S]\xfcAS\xf9\xddC&\f\xe8a\x938Y\xd4\x14\xc8{\x047\x173\xe1y\x8f\x9a,\a\x1479\xfa\x12\xa68iI\x13K)\x8f\x99\xd4V)S\u007f\xe5\xca\x04[/mj]\xa6\x8cY0m\xfd\x92.\x945\v6ɱ\xccx:x\x9a\xb4\xcer&\x82Ǔ\xa6h\xaa\xbc)\xe9I\x96I\xe3{\xea\u007f\xb7=m\xa6\x1d2\x91\x0e\xa0f:b\xcb/\x0e?k\"\xe5\xaf\xc0qW4\xb15\xee9\xb3@\x13\xfc2q%3m\x14\x91t>i\x02\xc9+\xeb\xf0^0\xa9\xf7\x17\xf9u\x15\x13\xd4\xeb%\x13ʭj\"T\xbcl\n\xd9|\xc5\xccWO\xdeFg\xc2!_\xe3\xe9u\x93+ \xd5L\xc0\xcb\x1b&\u0378\xbaN\xa4\x06\xe4\xff\xa6Iv\xf7\x16\xe6\xf3\xb6\t\x9b\xaa\xc9\xd3;\xa6V\x85\xdeՁ\xd42Y\xfbz\xcf\x14\x9b\xabmJ,\xaec\x82\xfb\xbco\xcar\xd0\a&\u007fL\xa8\xae)(Y\xcf\x04\xad\xaaor\xb3\xab)\x14\xa1\xa1\x89\xb7\x0152\x19\xcf\x1b\x9bBw?d\u007fMLĊ\xa6&<\xa6\x99\x89*^sZ\xcbG\xfc\xd4\xc2\x14N\xd7\xd2\xd4-<&\x8a`\xad)\x98l\nצ\U000f36d2\xa2;L0]'5\xec2%\xa9q\xe3\xe81\t;^\x93n\xe13\x198\xfc&8\xad\x819\x06LD\x91\xa0\x89(\x122\x89\xb3a\x93Q\"\xa2\xe7\xa8I<\x8d\x99\f\x8c\xa6\x8a!\x0e\xe5$L\xc1\x89$\xe7a\xe1\xab\x14\x87\x93cr\x03`\x1b\xf4\xd56\xfde\xba\xafv\xd4^{v\xd9\xc1\x14\\\xe8\x88&>f\x13\x9dL\x14\x15;\x9b\x88w]\xb4\xef\xae&\x98}7\x93[`>1\xb1\x1b\xe9SS6\x13\u007ff\x16HgN\xf2\xdbWf\xa1ƒ)\xb53\xb2\xba\x9bؚ\xfe\x85\x99\xbfI\xc7v9Y=L\x14\xb9\xbf4Q\x97\xfb\xca\x04\r\xedi\"E\xeb\x85\xe1\xf56\xe9\xe9_×\xbf\x81\xb3}k\x16li$\x8cD:p\xd2F\xfb\x98\x92x\xf6\xa5^\xfa\xd1\xf0\xfa\xc3\xd0\x06\xa8\r}o\n\xde\f4\xc1\xe2\a\x99\xf8\x81\x0f\x93\xa1\u007f\xb0I:=\xc4\x14\xe0\x1c\xaaz\x1c\x86\x9e\x86\x9b\xb2{e\x04-\xeaG\x95\xf3H\x93x=\xca\x04/\xf9\xc9$2\x8e\x86\xaf\x8f1Y\x15\x1ak\n\xeb\x1dDZ\x8cg\x03\x13(ɉ\xa6\x16\x8c&\x99`\x14\x93MD\x83)4\xe9\xa9\xea\xd6\xd3L)\x11L7\xb1Ap\x86\xf61\x93S\x9c\xa5C\xfe\xd9D\xb20\x9b&8\xc7\xc4v\xae\xb9\x14\xdf<5\xac\xf9&\x98\xcd\x02\xbde\xa1\xc9H\xf0\x8b\x89퉋L\xae\xeb.\x86\x85/1\xb5\xfa\xff+\xe6\xfd\x9b)\xf0\xbc\x14>\xba\f\xd2Yn\n\x88\xaf0\xc1\x9c\u007f7Q\x83X\xc9!\xae2\x916\xae6\x11kטB\x8bך\xe0q\xebL.\xc5\xff\x91\x16\u007f\xda\x1c\xd6ì6\x98,\xb3m4\x91\xd6n2\x19.6g\xc0v\x8b\x89$i\xab\x8ac\x9b\xa9\xcfC\xd2@w\xc0\xadw\x9a\fg\xbb8\x92݊\xba{\xe8\x99{\xc5\xfe\xda˛u\xd4\xed\xff\xd2q\xec\xa3V\xf6\xab\xaa\x0f\x98H\x18\x0e\x9a\xc2tӗ\x1f2\xf35kgf\x1d&j\x1f1\x91]\x1c\xa5\xa5\x1d\x830\xfe\x86\x18\x8e\xab+\x9f0Q\xa7\xfc\xc7d\xf6tRG|\x8aA\xe84M\xfc\fOgM\xee\x83;g\x82\x03\x9f7\x85L^ \xb6^\xa4\xfe.\x99\xdc\xf7y\x99 p\x05\xb0\xf1\xaf\xa9$\xf9*>^3I̮\x13\x9fn\xc0\xd6o\x9a\x88\x81\xb7(\x8c\xdb&7:\xdea\xe4\xf8\x8f\xa7\xbb&\xaa\xb2\xf7L\xd4b\uf6e8\xe5䊋\xb7\xe7\x8egHi\x9e\xb8\xb8o\xde8\xfd#_\x9c\x1e\x98?N\xd2S .ԣ`\x1cտBq\xaee<\x10\xcf<\xd1]8\x0e\x1aQ$N\xb6\xfd`\x9c\xf1\xfb\xa1\xb8(\xfd\xe18\xa8_\xd18\xf6\n=\x12\x17\x9f.\x16\xd78\xfbh\\ܲx\x1c\x10R\"\xce\x15\xb7\x92q\xf1\xa3\xc7\xe2b\x89\xa5\xe2\xfcy\x8f8M\xb8t\x9c\x19o\x194S6\x8e\x94\xe6\t^S.\x0egz\x92\x9f\xcaǵ\xf6\x97\x15\xc7j\xc6Sq\xa9\x9e<\x1d\xe7\xcf`<\x13\xa7y<\x1b'\x13\xae\x10g \xac\x18\x87柋\xc3\xcd+\xc5E\xf3\xcf\xc7\xc9x*\xc7\tx/\xc45\xe9T\xe1T\x89\xc3L^\x8a\x17l\x90\x93\xe8\xd8>'\xabj\\\xed\xf9e\x19u\x1a\x01_\x89\x139_\x8dKf\xfaZ\x9c\x1b{\xe2\xf0\xe0jqfHo\xc4a\x91յ\xd1\x1aq)X\xbcɹ\xbc\x15\x87\xe5\xbc\x1d\x87\xe6kƉI\xefı\xbd\xf0\xdd8jt\xb5\xe2D\xbd\xf70\xe6\xdaqxa\x9d\xb8>)\x19\x97,\xf8\x838\xb0\xa7.$Q/.̽\xbe\xf6\xde \x8e$\xaea\x1c\x15\xb6Fq\xe0Gc\xfd\xe7\x87q\x16\xb3\x9a\xc4\xd3\x115\x1d5\xa9\xedf\xdaa\xf38<\xef\xa38r\xea\x16q Q\xcb8\xe3M\xab86\xf3\xb7\x8e+\xcf\xcaV=\xda\xe2\xcc\x1f\xecq\x81\\G\xe6\xdfNh\xde\x15G\xb6\xe6\xe6\xc9\x13G\xa0\xf0\xc6\xe1q>ؔ?\x8etƈk\xf5!\xc01\x04\xe3\xac\x0e\x85\xe2\xc8\xfe\xc2Tf$\x9e\xd9\v\x1b\x8d\xf3\xb9\xf9X\x1c\x8cҌ+\x93\x8c\xc7Q\xb2J\xa8\x82\x93q\xe4.V\\\xe0/EY\xe4pzm\xe2p\xb4\xb6qD\xd5v\xe9\xf6:\xb67\xb2ڧ\xfb\xed\x98\xe6^\x1dⲕ\xafc\x1c;\x8d>\xc6H;ő\x0eu\x8es\xe3V\x17\xd8mWZL7\x9e>\x89\x13\xe8?\x8d\v\x00\u007fF\x95\u007f\x1eW\xe7\xef\xce\xe9\u007fA\xcd\xf4\x88\xf3)\xac/\xe3(V|\x05e\xf7\x8cc\xafE\xaf8\xeb\xe8\xbdiI_\xc7I\x19\xbe\xc9\b\xf7[\xaa\xff;\x88\xbc\x0f/\xea\x1bGQ6\x8eU\xb0\xfe\xb0\xb9\x01qP\xa4\xef\xe9\xaf\x03\xe3$@\x83(\xfe\x1f\xe2\xcc\xee\acrC\xd8\xf1и\xe4\xdf\xc3\xe2\xc2Ć\xc7ItGPB?ƹ\xebsd\x9c\x89\xff(\xdc\xf7S\x1cAqt\x1c\x98R-\xc1\x1fF{#A\x02Y\x1d7\xd6H\xc8J\xfb\x9bh\xf1\xad\x04\xdep\x9e\x10\xa6T\x93=\xbe\x93\x00\xaa\xbd\xab\xf7\xd6J\xa0\f\xfd\x9e~\xac͏u\x12\x9ay\xbe\x9f@\xc8\xff \x81\xd2b\xdd\x04\xb4_\x8f3\xae\x9f\x00\x05o\x80\xb15\xd4)7JЀ\x1a\xa3\xff\x0f\x13B~\x9b$\xf0\xab \t@v\xb3\x04\x98Vs\x88\xe6#\x8c\xacEB*_-U\x9e\xad0\xf1։|iꑕ\x8d)ٴQ;\xfe\xe5\xc0w\xce\x04\xa8\xa2+\xa1[_)V\x0f\xba\xf5r\x16>\x8c̟\xe0\x9exC\xdb\x0f$\x80\t\xc1\x84\xee@\rA\x9b\xe1\x84\xec\xf2\x89`\xa4QH-\x86oL\x1c\xe3\t\xbc\xf2$\x01\vN\xeaT-\n4\x95\x90\x97\x95\xe4\xf0C\x1b|h\x9bХ\xa2v\t\x84\x82\xf6\xf4H\xe0ͬ\t\x12\xb8\xaf\x12\xdcu\xd43\xa1iL/\xb6\xd9;\xa1[\xad\xbe\x86$\xbfI\x80\x0f}\x9b@p\xfd.\x81-\a}h\x85}\x13\xdc\xc9\xd8/\x81\xc7$\xfb'\x90\xed\x0eH\b\xca|\x9f \x80\x0fL\x80\xd6\fR\x1d\xfc\x00\xe1\x0fN\xa0\x162\x84b\x1e\x9a\x90|{\x18\x9b\x1e\x9e@eaD\x82/\xd4I\b\xa8\x8f\xc4\x05\xa3\x12do?\xb1\xc5\xd1\tԛ\xc7$X\x9c\x1a\x9b@\xf0\x19\a;\x19O\x03\x9a\x90\x99\xcaD\x1a\xe5\xa4\x04\x1f\x00\x9d\fALI\x00\xab\xa7&\x88\xe3\xd30\xb2\xe9\xecwFB`zfB\xa9\xc4,\x1d\xfd\xcf\xecd6\xfe;'QH|\xbec\xfb\x8eYsU\x03\xf3(\xa5\xf90\xdc\x05\t\xd6v\x16\x12K~\xe1\x18\x16\xa9\\\x16\xa3\xbb%\xf4\x9d_\x13\xc8/\u007fK \x85\xa4Ζ%PH_\x9e \x11]\xc1\xd1\xfe\xce\xd3ʄ0\xacU\xbcm5\x84\xb4\x06\r\xaeE\xd7\xebx\xd5\x1f:\x82\xf5\xf8\xd7\x06\xf5\x90\x8d0\xe0M\t\xa6\x1a\x9b\x13R\x82ْ@\xa2\xb8\x95\xa7m\x80\x87\xed\tT\xf6v`\xb2;a\x8a\xbb\x12\xc2Tv\xe3\xb8\aǽ\t<\xe8\x81\xe3_\xf8f\x9f\"\xfa\xfe\x04\xaa:\a\x88\xca\ay:\x94\x10\xa2t8\xf1\xbf\xe7Տ$\xc0d\x8e&H\x89\x8f%\xf0\xf4\xe6\xdf\x18\xd4\xf1\x04\xb8\xe9\tZ\xe0?\t\xe1\x05'\x13\xba_'\xc1\xc8t\x1a\xeev\x06ןM\xa0vy\x8efx>\x01\xfex\xe1\xff\xfb\xbaHt\xb9\x94\xc02\xe3e\xdcy%\x81\x12ݿ\td\x93W1\x83k\t\xd0\xd0\xeb\x1c\xf2\r\xce\xe3&\xfd\xf3\x16\xe4p\x1b\xc7;\x1c\xdf\u007f\t\xa9\xb1\xddU\x13\xb8\x97\x10.z\x9fM\xe4JJxΝ\x94\xd1\xe5I\x8a\x1b\xe7M2\xd3˗\xd4e\xc9d\xe6\x05\xacI\x91L\xc1$\xc2V\xa1\xa4.K&\xf1\x18ca\xfdX$IN\xf6 \xafz()\xe1\xef\xe1$v:\x15M\xf2\x8d\xe5I\xc9N\x8b%\xb1\xc9\xee\xd1$ܴx\x92\xfb)J$\xb1$\x99\xc4\xfe\xb0ǒ\xa8\xee\x94\xc2w\x8f'A\x14K')\xd42I\x85\xf6\xb2I\xd0\xfd'\x92\xb2\u0378\\\xfa\x0eysN\x12b)\x9f\x94\x1aQV\x92\xa5ɧ\x92,\x9d?\x9d\xa4u?\x83f\x9fM\xc2\xe4+$\x05\x8c+&\xf1ө\xcf%\t?\x95\x92\xb2Z\xf7|R\xaa\u0095\x93b\xf7/\xe8\xbd/\xe2\xbb*\xda\xe2KI8dUH\xf2e\xbd\xe4\x15m\xe4\xd5$\xa0\xe05\x9e^O\xf2'C\xaa%!\xfc7\x92\x8a\xdeՓ\\\x90\xa8\x91d\xcd\xe1\xcd$\xe3\xff[\xc9\xc2i\x91u0,\xb3kǬ\xb7\x93\x92\xc6\xd7L\xe2\a \x93ؓ\xf4n\x12\xe9Z\xad$\x90\xf7\xbd$KD\xb5\x93\x00\xad:IX\xd9\xfbI \xc2\aI\xd9(\\7IfY/IH\xa9\x9f\x84\x1b6H\x12v\x1a&\xc5\r\x1b%\xc1\xaf\x1b'\xc9\xf6>\xccȺI\x12\xd5\xf8\xa6\xec\xb4Y\x12`\xdc\x1c\xa2\xfb(\tCk\xa1zlɮ[Aƭ\x93\xcc]\xb2\x93X\x1e\xb1%\xb9\xa95\xc9\xf8\xe3H\x8a\xaf;qt%\xe1G\xee\xa4\xc4\fOR\x16N\xbdI\xae\xee\xfa\x92\nt\xfe$B\x94\x81\x1b\x02ɂi\x80\x93\r:A\xea<\x94d\x0e\x1a\xa6\b\"\xbc8\xaa}Œ\xc2\xceͤ\xb8F<\xc9%\x93\x84*,\x99ԇ@\x92\xc8/SI`[N\x92\x9bx\xdb$\x91U\xb4M\x92ֵK\n\x9e\xb5Or\xbfs\a=wL\"\t\xfb8\t\xd8\xef\x94\xd4\xf0\xd99ɽ2]\x92\xfa\xecGW\x1a}\xb7$\x17\x92?I\xa6S\x0e\xa9\xb2BZ\x9fѠ?OJh\xeb\x8e\xe3\x17I\x90\x9d\x1ePΗI)\x91\u007fE{\xea\x99$K\xef\xa5M\xf5N\x82f\u007f\x9d$\xb3\xfeF\xcf\xdf\xd2B\xbfK\x82\xef\xf6I\xe2ɘ\xbeIa-\xfd\x92H\x85\xfa'\xf9bV\xe0\xc0\xf7I\x14\x81\a&\x01\xb5\x83\x92\x02\x17?\xa8\xe1\f\x86܇$\xf5\xf9ءI\x86\xe8aI$\x88IĊ\x11\x14\xfe\x8fI\xa0\xd8\xc8$\n\x89\xa3\x92\\e\xf9));\xc8F'Q%\x1c\x93D\x02>\x96=\x8d\x83\x89\x8eO2+\x9d\x90\x9481\x11\x984)\x89\xb7'LN\x92GO\xd1K\xa6&A\xba\xa7a&ӓ\xc2 f\xb0\xa9\x99I\x84\xb9YI\xacI&A\xaeg\xd3F\xe7\xf04\x97\xa7yI\x81\xc6\xf9\xe8e\x01\xccc!\xc4\xfcKR\xaa*\x8b\x92\xc8{\x16SpKt\xb2\xbfr~\xbf%\x99\xe5-MJ\xa4[\xa6\b\xb8\x9c*X\x01\x1b\xfe=\xa9\xbb\x00V&\xf5uV\xab0\xa2\xd5I\x90\xce5t\x93\xb5\xe8q]\x12q揌٬W[ې\x94,d#\x1du\x13\x86\xb89\x89%\x8e-\xea\xa0[\x93`\x8dۀ\x0f\xdb9\xd6\x1d\x18\xd4N5\xdf]\xb4\xccݘԞ$\xc2\xc5^\x8c\xf0O\xc8\xee\xaf$71\xedK\n\x8b\xdcO\a?@\xe79\x98\x14\xb2t(ɼ\xf8pR+\x0eG\x92\xcc+\x8e&\xf1\xe6\x9fc\x18\xe5\xdf0\xe1\xe3h\xf9\x04\x80\xea\x1f\xcc\xf7d\x12u\xacSI\xf0\x8c\xd3I\xe5sg\x92H^\xce&Y\xcd8\x97\xc4\xf6\x85\xf3\xc0\xed\v4\x9b\x8b\x8c\x13\x97\xe8\u007f\x97\x15U\xaf\xc0\xff\xfeU\xb4\xbc\x9a$Q\xb8\x96d\xa5\xf5:۹\x91d\xc2x\x13\xc0|\x8b\x00q\x1b\xe3\xbcC\xf9\xff\x97\x94\x1c\xfc.\xcc\xee\x9e\xfa\xff}F\x84\\\x16\xb7\xb6綤\xa7<\x16~\xc1\xc3\xe2\x06V\x9e\xf2[\xa8\xb2\x14\xb0T \x05-\xdcX\xc8b\"h\xe1\xc7\x01\n[\x8c\xb9E,\x0e\xfcA\v\xcff>d\x89\x84\x1eF\xdbE-a\r\x8fX\xdc\x00Y̒\xc9?jI._\xdcBu\xb5\x84\x05s+\xc9\xf6\x1f\xb3\xc4\x01KY\x82\xba\x8f[(ܗ\xb6 \xd62\x96BdY\v\xc1\xf7\t\v3.gI\x18{\xd2b\xb0*\x8f\x99dY\xd8\xdb\xf5\x94\x05\xf9?\x8d\uf7b1Ĵ\x9e\xb5hu\x15,\xf0ӊ\x968\xd5s\x9cS%\x8b\xf4\xecy\vҫlѸ^\xb0\xf0\xb8\x87\xc5\xf4\xad\x8a\xa5&\xff\x92\x85zLU\x8bo'\xb7\xc4\x0e^\xc1\\_Uپf\t¿n\xd1\xf6\xaaY\x00\xff7,E\xc9\xea\x9cv\rK\xab\x1eoZ\xcc|\u07b2\xb8\"\xf3\xb6\x05\xe4\xaai\xc9s\x99\xefX\xe0\xf7\xefZ\b1\xb5 \xa3\xf7,!\x1f\xb5-@L\x1d\xcc\xf1}\v>\xf6\x81E]\u05f5\x18\x17\xeae$W\xdf\xe2zo\x83\x8cR\x1bZ\xe0,\x8d,zZcK\x9e\x95\xfcPzIf5\xb1\x98\xc86\x85\x1a\x9b\xb1\x9f\xe6\x16\xb9\xe5G\x16\x92\x84\x16\x96\xb8WK\x8b\x05\x85V\x9cbk\xca6\x9b\xb6`\xb3\x00\x02v\xca\xd8a!CrZ\b?.\v\xb1\xd2mq\x85\xcac1\xbczu8>\v\xbe\xee\x871\x18\x96Xv\xc0\x02\xa7\fZ\b\xd5!UQ\x18\xb3\x8fXB\u0896.3Z\xa8#\x98\x16(i\xdcb6\x9e`\x8fIK\x00Ѳ\xb8\xf1$\x05\xa3́T\xdbXL4\xdaZ,j\xb5\xb3\x88\xc5\xed\xd1E\aKbkG\x8b\x14\xf2c\v\x85\xd5N\x16xUgN\xbb\vu\xd0\xd5\xd2\x10\xd2\xcd\xe2\xf3\f\x9fX@\xeeO-\xb0\xd8\xcf2\x1a\xf8\xdcB\x14\xe9n\xe9\xfbu,ҹ\x1e\x96l\xad\xf9\xd2\xe2\v\xca-\xacB\xf6\xb4P.\xea\xc5)\xf4V%\u007f\xadV\xfb\x8d\x85Bͷ\x16\x1f^\xfe\x0e\r\xf4\xb1\b!}\xf5\xa2~\xdaM\u007f\x8bTj\x80\x95\xa7n\xd6\xf7\x96 \xe0@\v\x94k\x90\xc5\xdd[?X($\x0f\xb6$\x9b\x1b\x02q\r\xb5\xc8\xee\x86\xc1\xbb\x87ӹF\xe8\x97?\xd2\x1dFZ\x92\xab\x8c\xa2`~\xb2P\xca\x1a\xad\"\x1dC\x13\x18k\xe1\x99H\v\x11~\xbcZ\xfd\x04KX\xf3D\xba\xf4$\v\xc5\xfa\xc9\n.S,]\x0e\x99jI\xde>\rښn\x11\x14g(\xb0̴X\xa5\x9ee\xe9\xf6\xbf\x9f-!\xb1\xb3-\xd6\x15\xe6dژkI&;\xcf\xe2\v{\xe6c,\v(х\x16B\xe6/\n%\x8b,\t\x9d\x8bq\xc5\x12\xb8\xf7\xaf\x16\xc2\xcco\x96\xae\x00-\xa5\x13,\xb3\x84A,W\xa3]a1]\xfc\x9d\xc0\xb0Ғ\xb7q\xafR\xa9\xae\xb6d\xd1u\r\fz\xad\x85,s\x9d%1\xe5\x0fK\xe2\xd9z\vkp\x1b8\x9e\x8d\x16\nÛ,r\xbe\xcd\n+[,\xae\xf7l\xa5eo\xb34\u007f\xd9n\x81\x13\xec@{;-\x92\xb2]\x16\x82\xdcnKb\xc4\x1e\v+%{1\x99?\xa9\xb0\xbf,V\xf4\xf6Q\x9d\xfb\x89J\a\xb4\x8f\x83\x16\b\xc2!\x8b\x15\xeb\xc3\x16\x19\xc2\x11K\xb2ͣ\x16h\xd71\xf8\xc4ߖ\x84\xc3\xe3\xf8\xfb\x04z\xfb\x87\xd2:\t\xdc=\xa5\xd6z\xdabX=c\x81\xf1\x9c%蟳\x90\xfc\x9d\a\xa2]\xb0X\x1d\xbd\x88\xb6.\xa9=_VǸb\xb1\xe2\xf1\xaf\xfa\xe7U\xe0\xe35\x8bD\xf1:-\xee\x06\x15s\xd3\"\xf7\xbde\x81\xb3\xdcV8\xbc\xa3\xb3\xf8\xcf\xe2~\xf6\xbb\x9c\xf3=\x8e\xe5>ƛ+\x05\n\x92;\xc5v\xf3\xa4\xc0y\xf3\xa6\xe4M\xe7\xf9R\x10J\xfe\x14[/\xa0\xd7\x14LI\x0eU(%h\xf9@\n\xceXX\xffU$U0\r\xb3\x01y:2\x85\xfd\xac)1\x83\x87S\xe2+ES\xb0\xf9GR4\xf6b)&\x8e)\x91p\xf1\x94\xa8\xde\xcc*\x91\x12Q\x94\xd4\xd6\x1eKQ\x14\xa5\xf4\xfcx\n|\xb6t\x8a\xaeT&\x85pYV\x1b|\"\xc5\a\xb4ʡ\x8d'S@\xe3\xf2)\xfa\u007fVJ$\xfe\x14\x06\xf2t\x8aH\xf7L\nk\x91Ϧ\x04o+\xa4\xc4\xfc+\xe2\xf8\\J|\xb4R\n^\xfc<%R9%1\xee\x85\x14\"\xe6\x8b)\t\x1fUx\xc1K)\xa9*VMq\xc9\xfb\xe5\x14T\xf0J\x8a\x80\xfdjJ\u007f\xe7*%\xc2~\x1d\x92\xab\x96\x02o{#E\xfc\xae\xce;j\xa4\xf8\x9e\x00\xbd\xf1\xad\x14u\xf6v\x8an_3\x05T}'\xc5\r\xad)\xe8\xbdV\n\x99\xf5{)\xacD\xd4N!\xc6\xd5I\xa5\xa1\xee\xfd\x14\x02\xe8\a\xbc\xabn\x8a\xc0T/%.S\x1f\xc7\x06\xfcW\xc3\x14m\xa4Q\n\xdbM\x1asN\x1f\xa6P!k\x92\xe2\xaax\xd3\x14\x93\x86f)0\xa6\xe6)!\x13\x1f\xa5\x84.\xb4\x80\x19\xb4L\xa1>\xdaJU\xd1Z\xcf\xd9)\x89\x9a6\x95\xb7=\xa5uyG\n\x8fv\xa4`\x86\xae\x14\xf9\xb6\x9b\xa3\xf7\xa4\xb0\x88\xe0Mi\xd8\xf0\xa5tS\x86?\x85\x92\x8a\x01\xed\x06R\x92\xa6\x04iB!\xde\x19NI \x88\xa4\x94\x93FS\x8c\b1h\xdeL)\x1b\x8f\xa7m\xa9cz\x86\x89\x14\x96\xa5\x93)\x12\x05Kl\\\x9e\x80\xe4\xa0rR\x84\xa26)R϶)p\x94vj\x98\xedS\xd8\x14\xd4!\x85\xc71:Rs\x1f\xa7ȸ:\xa5\xb8c\xa2sJѳK\x8aT\xa2+\x15\xdd-E\x87\xfe$\x85(\xf7)\\\xe4\xb3\x14\xe2\xfc\xe7\x9cJ\xf7\x14\xb6\x01|\xa1\x16\xd2#U\xa0\x05\x9eh\xf8\x92\x8a\xfe\x8a\x9e\xd4S\xa5\xdc\v\x8a\xe8\r\x87\xfb:\x85\n\xc27)\xecj\xf8\x96\x17~\xc7S\x9f\x94\xb0\xe4\xbe)D\xef~\xbc\xb0\xbfNt\x80\xce\xec\xfb\x14\xa8\xea@\xfd8H\r\xe7\x87\x14 |p\x8aU\xa1!)\xee\xb7\x1c\x9a\x11\xf60\x18\xf6\xf0\x14\xc8\xfd\x88\x94\xbcX\xe7ǔ\xe0\xd5\xc8\x14\xd8\u0528\x14\xd2ğR(2\x8dN\x91\xf9\x8d\xa1\x03\x8e\xe5\xa4\xc7\xc1*Ƨ\x80\x97\x13R\xb2\xcbfbJ\x88\xce$\xda\xe4\xe4\x14~\xca#\x85\xed\x9bSS\xc2a\xa6\xa5$\xbeL\xa7\x87\xceH\xe9Z\xe4̔\xe4\x01\xb3\xd8\xea\xcf)\x89\xf9\xb3\xd1\xf6\x9c\x14˺sSX\xf6\x9a\x97Bd\x9e\x9f\u008e\x89\x05\xd4\xfc\xc2\x14\xabe\xbf\xd0\xc3\x16\xe1\xf6\xc58.I\t\xf2\xff\x9a\xc2\x16\x1c\xb6\xbe\x14\xa8\xb0\x8c\x03\\\x9eB\xa6\xb3\"\xc5ױ\xf2\xb42\xc5\x17\x06\xacJ\x91\x1d\xadN1\xf5]\x93\xc2*\xdeڔ\xc4\xdeu)݈\x93B\xa4[\x9f\xb1\xf9\r\x98\xdfFX\xc8&\x80\xd2\xe6\x14\x97\x10\xd52\xb6\xa6\x84\"l\xa3\xcflOa\a\xc2\x0e\xe0\xd1Nܴ+\x85ط;\xc5\xdfoݓ\x02'\xdb\v\xef\xf9SM\xff/:\xf5\xbe\x146\xc4\xee\xa7\x18\x0e\xa4\xb8\x86\xa8\xf6\u007f\x88\xdd\x1e\xa6\x05\x1f!\xe8\x1f\xa5\x95\x1eӱ\xfc\xadv}\x1c\x86x\"\xc5\x17礸\x10v\x92&x*\x85\x1a\xd6i\xfa\xf2\x19\xf8\xf2Yj\xe3\x1c\xb0\xe2<\x86v!\xc5\x05\xe4\x8b\xec\xf6RJi\xfd\xe5\x14^\x81rE\xe3\xc1\xbf)-\xba_\x85l\xae\x01c\xaf\xa7d{\xf6\r\f\xe2&ڼ\x85\xe3mz\xe9\x1du\xc6\xffRȍ\xef*J\xdc\xe3\xec\xefsJ\xb9r\x18\xf1r\xe7\xc8\x00\xf3\xe40\x12\xe7\xcd\x11\xa8˗#t+\u007f\x8e\xbec.G\xb0\xb4`\x8e\xe8\xa9\x10\xfe\xff@\x8e\xf4\\\x18\xc7\"9\x14߃9\xf0\xb9\x87r\xc0z\x1e\xce!\x13)\x9a\x83\x1d5\x8f\xe4`\x92\xc5rಏ\xe6\xa8\x15\x17\xcf\x11s/\x91\x03\x89\x97\xcc\xc1\xf6\xa0Ǵ\xd7R\xda\xc2\xe39x\xa0\xact\x0ea\xbaL\x8eTZ\xca\xe6P\xd9O\xe4\b\x01,\x87\xa1\xfd\x1fOW\x1d(E\xf5\x85\x95\x0e\xc1n\x85G\x18\b\x88\xa2\x12\xa2t\x83t\x83\xe0\xa3{cf\xb6{6\xe8\xee\xee\xc6\x00\x11\x14\x03E,J\x10TB%\x14Q\x10D\xba\u007f\xef|\xdf\xd9\xdf?o\xde\xee\xceܹ\xf7\xc4w\xbes\xee\x9d;\xa5\x1c\"\x9a\xd2\x0e:{\x8eC\xf0\xbb\x8cC\xa5W\xd6\x01\x16V\xceA_/\xef\x80\xe6\x9er\x88\xff>\x8d^<\xe3 \xa1x\xd6A$\xaf\xe0`T{\xce!nU\xd1\x01\xa1Ur\x88\xc5Uv0\xb5y\xde\xc1eNU\x1c\xa0[/8ȳ^t\x80\xbbUu(K})\xfb\xcf\xcb\x0eM#^q\b\x9aUs0\xc6Ww`\u007f\xa4\x1a\x0eݎ\x95\xe2xՑ]-R\xcb\xc1'\x94_s\x80X\xbd\xee\x10\x16_\xdb\xc1$\xbd\x8eC\xed\xa6\xaeʫ\x9e\x83\xa6Z\xdf\xc1 \xdb\xc0\x81<\xae!;\xd5\xc8A\xa6\xddX\xcfj\xe2\xd0\xf7@:`\xbb\xcdxh\x8e\xfe\xb5Pa\xb5\xa4\xf2\xdep\x00\x01Z9\x84̴v\xf0%\x90\xaa\xac\xb6\x0e\x81\xddv\x0eV\x82\xdb;\xe0m\x1d\x1c|\xde\xc3!0\xd6\xc9!\x0f\x04v\x86\xf9tq\x00D\xba:\x00\xcfݴ\v\xddU\x01=\xf4\xf8&\xb4\xda\x13F\xd6\v\xff\xbf\xa5*\xc9u\xa0(\xd8ۡ\x10\xd2\xc7\xc1\x18\xe9@\xa6\xd1\xcf!@\xd6_\x856\xc0A<\x1c\xe8\xd0\xe08\b\xfa\x1c\xec\x10o\x1a\xe2@D\x1a\xea\x00\xf7\x1d\xe6\x80\xc7\x0ewp\xda\xd8A\xc19\x1d\x88G\xae<\xad\xe4\r\xc6\xed\xe0\xd3\b\x86C\x02\xb1\xe9\x00;\xb3\x1c\\h\xe3\xc0ۚ\xbd\x0eqo\x9f\x83\x85d\xbfC\x03\xa3\x1e\x83\xd4C\xc8\xc1\xac3\xec\x10\xf4\x8f8\x90\x1cD)\xe1\x98C2\xa38\xfe&\x1c\xca\x11l\x87\x16\xe5\x92\xd9oR\x0e@aZU\x90q M\x1b\xe1\xc0^l#\x1d\xe0\xeb\xa3\x1cx6u\xb4\x83\v\x8a\xc68$\xd9\x1b\xcb.\x8cSs\x1dOט\xe0@\xa4\x98\xe8@0\x9b\xa4\xd63\xd9!\xe0;\xc5\x01̞\xea\x10 \x9f\xe6`\xda9]\xedu\x86\x8et&t4\xcbQ\xa0\xf5\x90\xbc\f\x92\x864\x87~6\x97\x9f\xe6\x01j\xe6s\xb0\v\xa8\xb4\x85\x0e\xe7\x04Ө\xe8\x14\x16R\x89?Uvr9*\x0fU\xf4V/8\xc5\xea^t\xe2\xe5VNZ\xe7K:\xf2\x97\xf5\x9cW\x9c\xf0\x87jN\x00Eu\xa7\xf8[\r=\xa7\xa6\x13\xd5\xf9WU\x82\xb5\x9c\x98\xd8{\xcd\xc9-\xf6^׳j;aQuح\xba\xce\xec\x02\xa8zNr\xfe\xfaN\xdaU\x03'\x83}C'wdu\"\x907\xe6\xd5M\x9c\x8c\xa8M\x9d\x92]5SI6w\xeak\xae\x9c2?\xd1\xd2\xc9x\xfa\x86\x13k\aZ9\x11\xbb[Sdm\x9c\x85\x9a\xe2i\x97\xb6N)\x91\xb7s\xc2\xca\xda;I\x17;\xf0\u070e\xd0L'\x88\xa5\xb3\x93P\xdaʼnH\xd4\xd5IP\xec\xe6$\xc4w\xd7A\xf7\xa0H\xdf\xe4]z:e!U/\xaa\xe7-v=\x97\x87\xdeN\xae\xae\xea\xe3d\x85U\xef\xdcω\xc8\xd6_\xedg\x00;2Љ\x901\x88\x9f\x06;\x05t\x87\xd0҆\xc2\xee\x879A\xe7\x87;\xb5\xc8\xedpr=\xa0\x93&\xefR\xa3r\xebр1\x98N\x06\x12\xcbI\xa8\xf68\x81\xf7^\xa7n\xf5\xe9s\"G\xf5;\x91&\x05hzA'\n]!\xd5R؉\x82@\x84\x87\xa8\x13x\x1eSό;\x05\x99\x12N\r\xef6m'\xe9īFRN\x8d\x9ai'_\xe7\xe1\x14\x9e2\x02\x165\x12n3\xca\xc9Lv\xb4S\xa0m\x8c\x13\x8b\xc3\xc6\xd2m\xc7Q\x14\xe3\xf9\xe5\x04'\xb3\x9c\x89N\x99w\x9c\xe4$K\x98\xec$Ϙ\xe2\x04\x99\x99\xea$%\x9c\xe6D\x01vzVV3\x9cX\xc05\xd3\t*5+\xfb\xf5\xec\xec?s\xe8zs\x9dʌ\xe7Q\xc5\xf3\x9d\x92f.pbI\xdaB\xa7\xce\xc0/\xa2\xae\x17;%!]\xe2\xe4\xcc\xdeR\xa7D\xeae0\x86\xe5N,\xc3X\xc1\xc3J\x15\xfd*\x15\xe7j'i\xd4\x1a'61\xa7\xad\xbd\xed\xc4\xd4\xd8;Y\x81\xbd\xcb\xcf\xef9\x91\xee\xae\xe3a\xbd\x93S\xff\xef\xab\xec78\xc9b> \xe8ld\xbf6Q\x97\x1f:\x19h?\xe2\xd06;\x11|>V\x9f\xff\x84*\xfe\u0529\x1c\xee3\x0ex\v\x8c\xe6s'\xe7g\xbe\xa0\x19oU\xd8\xfaR\xfd`\x9bS\xe8\xe9WN\xe2\xfe\xd7N\xd6$\xbeqb\x8a\xe2['c\xf9w\xda\xc7\xedj\x8e;\x9cH\x81w\xaa\xd1\xefr\",\xedv\n9\xfd\xde\xc9j\xec\x1e'J\x00{\xd9\xd5\x1f\xd8\xf1}:\xc8\xfdNp\x8e\x1fi\x85?\xd1(~V\xf3>\xe0D 9HM\x1d\xa2 \x0e\xab\xa0\u007f\xc9*\xeeW\x98\xdfo4\xab#t\x9b\xa3Y\x138\xe6\xc4l\xcaq~\xfd\xbb\x13\xd3e\u007fP,'\bd\u007f:\xc9>O:\xb1=+\xcf\xfc\x9b\xa7\x9cr2\xf19\xedD\xc0\xfe\xc7)\xd5\xcd3\xfc\xed\xacS\xa8ٿ\xb0\x90sY\r\xff\xe7\x04S<\x8fpsAE|Qm䒓5\xc5\xcbD\x8e+N̊\\u\x922^sr\x02\xe6\xba\xe2\xd5\rh\xed\xa6\x82\xe9-\xaa\xf6\xb6\x93U\x86;\\\xf2\xe3\x9d.\xe9B>\x17\xa8G~\x97\x10\xc9\x02.\xc0PA\x97\xe6\x02\x88<\xeeB\x00z\u0085\x89\x9b']\xa8\x96\x94r\xc1\xb3K\xa3\x839.\xa4depײ.\xdaB94Yޅ\x97&\xbbPru\xd1p\x9fq1\xa2<\xeb\xd2\x1c\xd3\xc5\xe9\xc4\xe7\\\xfa\x00@E\x17\x9e\x15\xac\x84\xc6+g\xbf}\xde\x05\xf0\xa8\xe2\xa2n^\xe0@^䡪K\xc0\xec%\x8a\xefe\x97\xa0\xf6+.\xd6i\xab\xb9\xf08Au\x97@[\r\x970\x88\x9a\x14ɫ.-j\xd5r\xe9\x84\xc3k.\x9a\xd6\xeb<\xa16\x0fux\xa8\xcbC=\x17\x97hԇ\xfa\x1a\xb8\x90\x185t)\xf26rqy\\c\x17|\xa0\x89\x8b\xabut\xa8\xcd\\\xf4\xfb\xe6.\xfaD\v\x17\xbd\xb7\xa5+\xfb\x9aH\x95Q+\x17Cxk\x97\xa4Qm\\\xa4\x04m]\xf0\xa8v.\xb8d{\x17\x8b\x01\x1d\\,\xecv\x84\xbc:\xb9X\x1c\xef\xac\xc7..\x86ˮ\x14T7\x97\x1a~\xf7\xec?= \xad7](\x12\xf7ta=H/\xde\xe1-\x97xX.\x05\xdf;\xab\x88>.\x14\xe7\xfb\xf2\x8a~jI\xfd]\x02G\x03\\\xc4\xe1\x81l`\x90\v\x1e;\u0605\x12\xfd\x10\x17\b\xd6P\x97\xbe\b\xcb\x05\xa8\x1a\xceA9\\\xe0\x93N\x17\x1f\xe9pa\xe1\xafۅM\xbd\f8\x8f\xe9BnfQ\xb2\x1ej\xc3˃\xcf\xc5\x05=~\x17ʏ\x01\x17\x1et\t\xba\x88\x06!\x17\xc3T\xd8EO\x8d\xb8\xf2\xb5ʉ\xbad6 \x96\x95|\x9c\x0e\x94\x80\x10m\x98r\x12\xff\xa7x\xdb4ԝ\xc1\xdf\x11\xf8a$\u007f\x18\xe5\xd2\xe9\xef\xd1.\xd4\xe8\xc7\xe8M\xc6f\xe55\xce\x05<\x1dOG\x9f\xe0\x12\x8e3Q\ra\x92jv\xb2\v\x91y\x8a\x8bh1\xd5U\xa4\xb5#`I%x\x1a\a8ݥ1q\x86\vLv~\xab\xe4\x96bce\xb7Ү\xe7\xdd\xe0\xb2UܚL\xbf\xe0f\x16\xf8\xa2[*\rU\xdd\xdcB\x807z\x99\x1d~\x85\x87jn\t\xe2\xd51\xde\x1an\xa1\xd65\xddX\x1f\xfc*\xbe\xaa冺^s\xcbnƯ\xbb\xb3Yfm\xb7\xac\x1c\xaa\xe3Vܪ\xeb\xceVr\xeb\xb9eڢ~^\xaf\xe5S\x036\xd50{^#73\xcc\xc6\xd9/\x9a\xb8\xf9P}S7\xe6\xe0\x9a\xb9\x91\x954w\xd3\xcdZ\xb8\t\x15-ݘ\x06}\xc3-e\x88V\xff\xbfWk7\xf6\xa9n\xe3\x06\x19o\xebf\x94h\xc7{\xb6ws\x91N\a\xb7D\x82\x8e\xff\xbf\xa8\x93\x1bU\x8fΔE\x174\xd9\xd5-\x93\x01ݲ\xc2\xeb\xeeFf\xd5\xc3]\xa4\xa31p\x90 śn\xach\xe9\xe9F&\xd7ˍ\xe5Zo\xb9\xb1\xfe\"\xd7-\xc9Ro7j\x93}\xdc\u061d\xa3\xaf\x9b\xe5\xf3~n.k\xe8\xef\xc6\\\xf1\x00\x9c:\xd0M\xee2\xc8-qh0\xadp\b\xe46\xd4\rr6\xcc-H4\\G\xefp\v\xadq\xb2\xdf.\x9c\xe7v+\xb91Т\xe9\xc6~\x02nB\xa2ǭ3\x98z\xf4\xb9\xa5f\xe8w\xcb\xd6(\x01\x18{P\xbb\x17r\xeb\xbb@\xf4\xca\bz\x14\xc5\xfdb83\x0e\xf7I\xe0\xaf\xed\xc6\x06*I\xb7\xb0Д\x0e\"\xedF\xb0ȸ\xb1\xfe`\x84\xder\xa4\x1bu\xeaQ\x90\xeeh7\x9e\x82tc\x9d\xd1X\x1d\xd487c\xd4x5\x80\tn\xc9\xf4&\xe2\xd4In\xe0\xc8d7J\x82SБ\xa9\x94\xcc47\x92\x90\xe9n\xf0\x89\x19n\x99^\x9c\xe9Fmz\x16\x8d|6\xfa:\xc7\r\xa4\x9f\xabN9\x8fڞ\xef֙\x84\x05\xee\xc2͆\xf4\x1b\x9e\xd7\xc4B\x9c\xbe\b\x1d]\xec\x06gY\xe2\x162\xb9\xd4\xcd\xe9\xa2eğ\xe5\xe8\xc5\n7Al%\xef\xb5\xca\r~\xb8Z\xbf]\xa3\xa3_\xebFXx\x1b\xde\xf4\x0e?\xbc\xeb\x06Kz\x0f\xc2[\xe7\xc6\xec\xe7z7\x17\xfb\xbc\xef\x96%\x81\x1b8\xa6\x0f\xdc\xd9\x14`\xa3[ӦM\x18\xe6\x874\x80\x8f\xdcL\xbf7î?vc]\xe3'0\xe0O\xddH\xf8>s\x93\xb4m\xf9\u007fK\x9f\xbb\x11\xe4\xbf\xc8b\xe4V\x1a\xf8\x970\x9bmnΒ}\xe5V\x96\xfb5l\xea\x1b\n\xfc[\b\xe3;\xe8e\xbb[fNwdmo'1g\x97\x1b\x94m7\xbd\xe1{\xb7\x10\x89=\x8ae{ݨP\xfe\x80F\xf6\xe1\xf2\xfd@\xed\x1f9\x98\x9f\xdc`t?\x13X\x0f\xe0.\aݨA\x1frK\"y\x18\xb6\xf8\x8b\x9b\x01\xe6W\xb7\xaez\xd5\x11\x1eq\xe35\x90G\u074c\xe3\xc7\x10S\x8e\xbb\x19\xba~\x87\xa8\xff`x8\xe1&o\xfb\xd3-\xf5\xe5\x93\x1ag\xfer\x93=\xfd\xadfr\x8aN|\x1a\xd6\xf0\x0f\xc7uƍL\xf9\xac\x1bS\x11\xfff\x01\xf7\x1c\xd0\xf9?76g8\x8f\x0f\x17\xdcx\x16D}\xeb\x12\f沛\v\xa9\xae\xc0̮\xb2\xc9k\xd4\xd3\xf5\xbc\xbb\xcbo7\xdcL5oR\xe2\xb7\xe8Q\xb7\x89\vw\x18\xe0\xecw\x1ar}>\x03\xec+\xbfAq\x140\xc8&\n\x1a\x80\xc7B\x06\x84]\xd8\x00b\x171\xc4\xfa\x8a\x1aR:*f\x88\xe4\x8b\x1b\x8c\xb2w\x19\xb8}\t\x035̒\x86\xf4\xf3n\x83ny\x8f\xa1\xc0|\xaf\x81\x8c\xf0>\x03\xbd\xb8\xdf@1\xff\x01\x83\xa4\xf1AC\xa2\xd9C\x86&V\x0f\x1b\xc2\x1c\x1e1\xf8\x9a,C%\xf4\x98!6\xf9\xb8\xc1\"\xfb\x13\x06L\xfeIC\x1e\xa4*e\xa0\x16Y\xda\xc83\xe5\xbcX\x96c`\xed^\x19\x03\xbe]\xd6\x10\v*\xa7\xb7*o\xe0u\x92\x06\xfc\xedi\x83\xa0\xf1\x8c!)\xe7\xb3\x06c\\\x05\x83y\xd6s\x067\xaa3\x80\xb5\x95xIe=\xe9y\x95Y\x15\x83y\xd5\v\xe8\u074b\x06V\x98U5\x10\xfc_2\x00Q/\x1b\xf0\xa9W\fƓj\x06L\xb5:\x0f5\fк\x9a\x06bΫ\x94u-\x03f\xf0\x9a!.\xf9\xba\xc1e\x11\xb5\rXL\x1d\xed@]\x03\xf3\xe3\xf5\f\xf1\xe5\xfa\xfae\x03\x03\xb5݆\x86\xd8O#\x03\x96\xd6\xd8@ͳ\x89\x01\xc8j\n\xd9638k\xd3\xdcȆ\xb1\x16<\xab\xa5\x01\xce\xfd\x86ZB+C\x01\xae\xb5!>\xdc\xc6\xd0iٶ\x06\xb9s;C\x9c\xaf=\xfev`\v\x1d\r\xe4\xf7\x9d\f0\xda\xce\x06HA\x17CL\xb9+\xfev3\x94\x80w7\xa4\x8c\xd2\xc3\x00#~\x13]\xeei\xd0qzQ\x0eo\x19dV\xb9\x069Xo\x83T\xbeO\xdeȼyI\xa5\x91\x17\xaf\x87\xe7\xf4\x83\xc5\xf57$\x90\r0\xe8\x1f\x03\rq\xb9A\x06\xd8\xe6`\x83\xd3ZCTgC\xa9\x9ea\x86\xf8\xeep\xfd\xd2ap\xee\xd2 $\xb8\fDh\xb7\x81j\xaea`+\x14S\x8d\xcf2\x00\xec\x1ej\xdbk(\xae\xfa\f\xdd)\xc0\xc0N\x01h>\xa8͇`\xe2a\x83\xcc/b\x10p\xa2l!FK\x8d\xeb\xb9\t8\x99M\xd1%\r\xdd\xdf\xdc\xe0ʯ\xb4!\xd17\x83[\x8c\xc0ߑ\x10\xdd(C\xe6pG\x1b\x9cS\x19c <\x8c\xcd\x13Jn\xce8\x83\xd3^\xe3\ry\x82`\x02\x1cy\"\xfc`\x92\xa1s\x96\x86 \xf7\x14\x83\xf1f\xaa\x81\xb2\xf64\x03\xecd:\x9a\x9f\x81\xf3g\xe2\xffY\x06s\xf2ٰ\xbd9\x06\x1f\xe1\x99kH\xb0\x9fg\b\xfd\x9bo\xf0\xd1H\x03!h!|c\x11-b\xb1\xba\xc1\x12\x83\xab\xf9\x97\x1a\xc0\xeae\x1c\xedr\x03\x91e\x05?\xad4PJ[\xa5`\xb2\x9a\xbe\xb2\xc6\x00\xa0\xaf5$\b\xbcM\xb7|G\x05\xfa\xae\x8a\xf0\xbd,\xee\xac3\x189\xd6\xd33އ\xf9o0$@~`\xb0\x94\xb4\xd1`\xd5u\x13\xba\xfe\xa1\xca\xfb#X\xd5f\xb8\xe0džL\xc1}b \xb8|J\xaf\xfe\xcc \xa7\xdcbH\\\xf9\x1cg|a\b\xe9\xd8j0\x8544\xaem3\x98\x1e~\x85{\u007fm\b\xf3\xfd\x86\x8d|k`F\xf7;\x83\xd1d\xbb\x81t}\a\xfcd\xa7\xfa\xe8.=\xee\xa6L\xbe7d\x12e\x8f\xc1\xbcb\xaf\x81\xa4\xe8\a\x83\x11k\x9fJj?\xe0\xfdǬa\xfe\xa4R\xf9\xd9`\xd1\xf6\x80\xaa\xec \xd1\xf8\x90\x81:\xefaU\xeb/\x86\x14g~\xa5M\xfe\x06\xb3:B(\xae\xbf%`}6:\x96\xd4!\xa48\xe64=6\xa3\x8a\x1ea\n;\x19\xa9:\x18e\x82\xe0\x8c6\x95Ɍ1A^\xc7Ҫ\xc6iK\xe3Mp\xcf\t\xb0扐\xda$\x935\xbf\xc9b1\xb2Ϲ\xc9\xf2\xe3T\x13(8͔\x19\xef\xe9&Ak\x06M{\xa6\xa9\xef\xcd\xca\x1a\xeblS\xd0tNV\x8fs)\xc9y\xa6\x10\xa1\xf9&9\xd7\x02\x13\t\xdeB\x0e~\x115\xb1ؔ\U0003b13d\\\xaag.\x83L\x97\x9b\x12-V\x98(ޭD7V\x99(\xe8\xad\xd6ެ1\x19\x1d֚X\xcd\xf8\xb6\x89\xe9\xcbwL\x90\xa3w՚߃1\xad3Q\xfc[or\x96\xe0}\xdep\x03\xcc\xef\x03\xf6h#\x84\xb2\x89\x9a\xfc\xd0$\xe5\xf9\x88\x06\xb6\xd9Ģ\x96\x8fMԣ>\x01\x06~\x8a\xae\u007f\xa6\xdaآN\xf4\xb9\tb\xf5\x85\x89\xe5\x8d[M\xac\"\xf8\x12\xbe\xbc\rJ\xfd\x8a*\xf8\x9a\x1e\xf9\r\xbe\xfb\xd6\xc4r\x80\xef\xb2\xe2\xdcnb\xfeo\aŸ\x93}\xdfeJ1o\xb7\xc9\x00\xf9=z\xbb\a\x97\xef\xe5\xe5?\xb0w\xfbT\xd7\xfbMaf?\x9a\x1a\xb8~B\xa7\u007fV\xe4:`\xe2\xb9\xf4\x83\xbc\xf2\x90\xca갉\t\x87_L!\a\xbf\x9a\xa8\x0f\xfdf\"\f\x1e\x81\xdf\x1ee珙\xcc\xf9\x8f\x9b\bp\xbf\x9bd\u007f\u007f\xa07'LYI\xf9\xa7Y\xbca\xbf!\xb9\x03,w\xee0+礩|\xfb/\x93\x15\x94\xbfi\f\xa7L,\xa4?m\xb2\xfc\xf3\x8f\t\x06t\xc6\xe4\xe2᳦T\xcf\xff5\xefj\xd8\xcf\x188H\x9b:g\x16\u007fc\x90;\xfb\xe9\xbf<\x85\xe6Eܜ\xf3\xe8\xde\x05\rK\x17\xe1Y\x97L\xf2\xa0˦p\x98+f\xf1\xa6\xfd\x86X\xa6C\xae̹j\x92O_\xcb\xfa\xeau\x13U\xf4\x1bf\xe1\xf6\xb9\xee\xdc!\xfdrn\xaa\x91\xdd2ɍo\x9b\xa8\xea\xdca\xf1y\xe0;-6\x9e\xcf\"\xed\xcbo\x91\x82\x14\xb0\x88\x1e\x05\xad\xe2\xed\xfb\r\xef\xc3n\xe7\x14\xb2\xa4\v\x85-j\xa6\x88%>^\xd4b\x98.fa2\xa2\xb8%T\xf5.K\x86\\\xc2\xe2=KZ\x8a\x1cw[\x9cm\xbdǂ\xff\xddk\xd1G\xef\xb3ă\xef\xb7$\xc2<`Av\x0fZ\x94\xddCz\xaf\x87-\x84\xa8G,P\xdfG-\x84\x83\xc7,}іEwxB\x8fOZ`\n\xa5,\x15JiKCl\x8e\xc5\xdaG\x99\xec\x17e-&J\xe5\xf4X\xde\x02r?\x95\xfd\xfdiK\x00\xe1\x19\v\xdb\xc4\xcbO\x8d\xb2BjlI\n\xd9\xc4\x02\xc1oj\xc1\xae\x9b\xa1\x1f\xcd->\x87\xd8B\x87\xd0\xd2B`}\x83\x87Vz\xdf\xd6\x16\xa2p\x1b\\\xd2VOm\x87F\xdb[y\x88\xe6\xcc\xe9`\xa1\xda\xdb\xd1R'\xead\x89\x87u\xb6dAH\x17\x8e\xb5+;\xd5\xcdBy\xb1\xbb\x1aa\x0f\x8b\xfb\U000a0c5e\xf8\xdb˒gy\u07b2PIȵ\xf8\x9af\x8c\xb5\x0f\xda\xebk\xc1\xc3\xfbYx\xd5j\u007f\x8c\u007f\x00?\fd7\x06Y\x05[\xf43rs\x06s\xa8C(͡\x96@\xe90\xfc\x1d\x8e;9,pT\xa7%\xbe\xe8b\xff\xdc\xf8ݰ\x80,\xa6\xc5r\xa0\xc5\x16<\x16\x1d\xcek\x91\xb6\xfa,\xc1W\xbf\x05\xfe\x15Ȏ=\x98\xb5\xb0PV\xfea\x8b\x95\x8a\x88\x05\xac\x8dⲘ\x85\xbd \xe2\xbcm\xc2*\xdc!\xd7\x14\xbc\xb0\xf5\xe4$\x1d)\x95m6\x9d\xfd'\xa3\x9d\x1aa\t\x06\x8edOG\xf10\x1a\x8e6\xc6\u0083,c\xe9o\xe3,,c\x18\xcf\xc3\x04Jo\"\xc6<\xc9\xca\x16!&[\x98\x14\x9db1_\x9d\nyO\xa3\x19L\xb7\x18KgX\xcc]fZ\x92\xefϲ\x90\xa3\xceVT\x99c\x81Y͵\x98Oͳ$\xbd\x98\x9f\xd7j\x9eZ\x16X\x82\xba\v-r\xb2E\x16\xb9\xf2b\xba\xcb\x12K\x92⥼\xd52\x8b\xb9(;\xb9\x82m\xae\xb4\xc0?V\xa1O\xab\xd1\xf15hq\xad\xc5\xca\xd2\xdb\xff\x1f\xc6;\xea\x9a\xefZȚ\u07b3P\xd7\\\a\xa9\xac'\xc0\xbcoI\xa6\xb8\x01p\xf7\x81\x85r\xc4F\xd8\xd0&\x8a\xebC\xb5̏,Ἓٓ\x8f-.\xe1\xff\xc4\xc2\xdaY(\xf03\vE\xba-\x96\xc4\xfd\xcfՓ\xbf\xa0\xf3oU\xe4\xfc\x92J\xdef\xe9\xb6\xe8\x96Tﾶ\xb4\xae\xf6\x8d\x02˷\x16Y\xc5w\xeao\xdb-M\xd2vX,\xca\xecĠwYXų\x9b\xde\xf8\xbd\x05\x12\xb1\xc7²\xa9\xbd*\xdc\x1f,\x04\x89}\xec\xf6~\vU\xd5\x1f-\xa9\x02\xfcd\x81\x8d\xffl\xe19\xe6\x03zσ\x16\v;\x87\xf4V\x87-!\x88\xbfX\xfazfH\xee7=\xe7\x88\xc52\xe7QKX\xd31\xe8\xe08\xef\xf4\xbb\x05\x06\xfa\a{s\x02\xa8\xff\xa7\x85\x82\xe7I\v\xa5ؿ,\xad\xd0Z\x8c\xe4\xa7TD\xa71\xb6\u007f4|\x9c\xb1\x94\x1d\x9e\xb5H\x03\xfe\xb5@\x99\xceQ\xd8\xffYB\x95\xcf\xd35.p\xac\x17\xa1\x8dK\xaa\x80˖\x14\x18\xae\xf0\xa7\xab0\x99k\x16\x92\x9e\xeb\x16_KiI\x1d\xfa\xa6\x85\xa5\xa0\xb7\xac\xbc\xf4\xea6\x05z\x87G<\xffN\x0f\x8c-\x9fGD\x96\xdf\x033*\xe0\x91RgA\x0f죐\x87\xb8^\xd8#\x91Ob\xa5\aO\x99\xe0\xeab\x1e\x14\x1c\x8b{h\x86wy\x84\x10\x95\xf0P7%\xf5ʻ=\"\xe2{p\xc1\xbd\x1e\xf0\x99\xfb< q\xf7{(\x9b\a<\xb2\xca\xe8A\x0fl\xe9!\x0fx\xf2\xc3\x1e\x94f=X>\xeb\xc1c[\x8fy\xe0-\x8f{0\xd8'\x0f\xb7\xb0\xf3H\xc9.\xe0\x11h\rz\x98օ\xf0)\xec\xc1\xfb\xab#\xc6)\x9fxX\"\xfb\xd4#y\xe4g\x1e@\xed\x16\x0fvnUS\xfa\x02>\xb1\xd5\x030\xfe\xd2\xc3\x1a\xc56\x8fNU~\xe5A\x9e\xf55z\xff\x8d^\xf2->}\a\xff\xd9\x0es\xdaA\xe1\xef\xc4\x0f\xbb\xea\x058>\x96\xed\xf9\xe3\xec\xc5\x13^\xf1\xff'\xbd\b쥴\x89\xd2z\xcc\xd1\xf1\x94\xf1J\xa6[\xd6\xcb\xea`9/\xb8uy\xaf\x98\xe1S^\xbcd\v\u007f\x9f\xf1r\xbd\xe2\xb3^xB\x05\xaf>\x84\xe9%۫\xe8\x95\xf2F%/#Oe/j$\xcf{\xb9\xc7G\x15\xfc\xf8\x02\x9b~\x11MW\xf5b\xa3s\x15\xf9\xcb\xda\xda+\x1cG\xb5\xec(\xab{Y\x17\xa8\xe1\xc5ҕ\x9a\xda\xf5W\xbdܓ\xbd\x96\x8a\xf05/\xdf\x11\x82\xe1\xd6\xf6\xaa\x97\xd5\x11\x1d\fʩ\xeb\xa5\xf7\xd5\xcbʹ>\x85\xd3\xc0\v\x0fo\xe8\xe5\x04K#/`\xaf\xb1\x97\xac\xa4\t\xa4\xd2ԛ\xdd\xc1\xc7\v\xca\xd7\\\xfb\xd3\u009b\x87\x97-\xbdp\xcf7T\xb9\xad\xbcba\xad\xbd(2\xb6\xf1\"\xe4\xb4\xf5\xd2C\xday\x99)\xb4\xf7\xd2H;xQ@\xee\xc8\x16:y\x89ڝi\x18]\xbcZw\xea\xea\xc5\xfc_7\x19ݠ\x9c\xee^\x92\xd8\x1e\xd9q\xbc\xe9\x15\xc7\xe9\xc9;\xf5\xa2\xc4\xdf\xd2\x0e\xe6z\xb9_Lo~\xdd\xc7+H\xd5\xd7+\x90\xde\x0f\u007f\xfb{\xc5\xdf\x06\xb0\x1f\x03\xbdB\xd5\ay\xc5c\aC=C\xbc\x882C\xbd\x98\xfe\x1e\xe6\xd574{\x05_\x1c\xbc\xc8\xe9\x15z\xea\xf2\"mq{\x89\xd3\x06\x84`zQ\x01\xb4x\xb5\xc7˒\xb8W\x85\xe1\xa3\xfc\xfd\xe8S\xc0\v\x12\x19T\x03\by\xa5\\\x1e\xf6\x02\xc1\"^\x84\xa8\xa8\x17Ō\x18m \xee\x15HHx%\x8e\xda^0\xbe\xa4\xba`\xca\xcb(\x95\xe6\xe5\x19X\xdd\b/+0#\xbdxz{\x94\x97\b4\xda\xcb\xc4l\x8cW2\xa4\xb1^бq\x1c\xcc\xf8\xac\x02&Ћ'\xaa\x95N\xf2\xa2\xa8;Ye;\xc5+\x81m\xaaW\xa9\xdd4\bn\xba\x97\x1cn\x06\\}&,r\x96\x97[\xdd\xcf\xf6\xb2\xa8<\xc7\v~7\x97\xc6>\x8f\xad\xce\xf72\xa4-Ț\xdcB\xaf\x84\xedE^\xc2\xefb/\xa8\xc5\x12/V(-\xf5\x82\x19-\x83\xb4\x97{I\xf3Vx%SYIo_\xe5%\xe1X\xad\b\xb1F\xfb\xb0\xd6K\x8e\xf8\xb6\x17\v\xfc\xdeQ\xe3}\x97@\xf5\x9eW\xe2\xf1:\x88x\xbd\x97I\xd2\xfb\x94\xfb\x06/\xa8\xd9\a\x94\xedF\xbdn\x13.\xf8\xd0+\xb1\xfa#/\x92\xb4\xcd^\x06\x8e\x8fUݟx\xb1\xb1\x9dz\xe1g^!W[\xbc \x8b\x9f\xab¾\xf0\x82\xe2o\xf5\xb2\xc6\xf4\xa5\x17\x95\x9dm\xc4ï\x88\x83_\xab \xbeQ\xd8\xfa\u058b\xca\xf0w\xfaq;\x9caG\x168vz\x91-\xecR\xb3ڭg}϶\xf6\xc0\xd2\xf7j\x8b?(h\xed\xf32~\xed\xa7B~\x84p\u007f\xf2\xa2f\xf3\xb3\x97S\x14\a(\xa7\x83\x14\xf2!\xda\xc7a/\x9fĤ\x84~\x85\x93\xfc\xe6\xe5Z\x82#^)\xf0\x1cew\x8e\xd1\xc1\x8f\xc3R~W\xcd\xfc\xe1E4;AG\xf8S\xbf=\xe9%+\xf8\v8\xff\xb7:\xe0)/\x99\xcei\xc2\xd1?^N휁\xfc\xcf\xea\x8f\xffzY\x8e<\xc7\xc1\xfe\xe7\x05\xcb<\xcf{_\xf0\xb2\xe8qы\xe0\t\x1b\xbb\f\x80\xbf\xe2EȽ\xea\x95t\xf6\x9a\x17ˢ\xae{%7\xbb\xe1թ\x97\x9b\x10\xc9-/\x88\xc5\xed\xac\xac\xef\xf0ѥ\xee\xf4\t \xe4\xf3!\x11\xce\xefC8,\xe0\xc3\xc0\v\xfaD;\x85|\xc2:\n\xfb\x10m\x8b\xf8\xf0\x82\x86\xa2>t\xb2\x98\x8f\xcbÊ\xfb \x8c\xbb|һ\x12>\b\xbb\xa4\x0fXt\xb7\x0f\x13\xfb\xf7\xf8\xf2\xa0\xf7^\x9fd\xac\xf7\xf9\xb0{\x8f\x0f\xd5\xf9\a||\x88\xc4\a\xc0{ȧ\xa5ڇ}\xb0\xf3G|\x88\xf4\x8f\xfa\x10\xbb\x1f㹏\xfb\xe0SO\xf8\xc8\x06\x9e\xf4\t\xa6\x94\xf2\x89˖\xf6!\xca\xe5\xf8\xb0q\x8fO4Z\xd6\a\xe6_\xce\aɔ\xe7\xe1)\x9f\x84\x89\xa7}\xcc\xea\x9e\xf11>=\xeb\x13}T\xf0!\xc1z\xce'H[\xd1\a\x8b\xa9\x04AT\xf6\xb1J\xfd\xbcO^1]\xc5ǂ\xe8\v>ݥ\xc0\xc7pP\xd5\a\x06\xfb\x92O\x96S\xbc\xec\xc3+\x99}\xc2\v\xab\xe1\xff\xea>ZJ\r\x9fl\x85Y\x93\xe2|\x15\xed\xd7\xf2Ѣ_\xf3х_\xe7@k\xe3\xc7:\xbe\"\xf5ܹ\x03r\x87\xf7˩\xeb\x83q\xd7\xf3q=e}\x1fK2\r\xd8׆>Up#ꨱH\xbe\x89\x0f\xf3\x86M}Hכ\xf9đ\x9a\xfb\xe0\xcd-0\xea\x96\x14\xd3\x1b>L\u07b7\xf21.\xb4\xa6\xc4\xdbh\x87\xda\xeaP\xdb\xf9Ġڳ{\x1d|\\%\xd2\xd1G\xd7\xe9\xe4\x03\x1aw\xf6\x11\u07ba\U0002cbbcY7\xfd\xb6;\xbf\xed\xa1Cx\xd3\xc7Ģ\xa7\x0f̾\x97\x8f\xf5\xf0\xb7|\x9cS\xcc\xd5[\xf4\x86F\xfb\xe8\xc9}y\xa3~>\xd2\xcb\xfe*\xbd\x01\xbe\x82Ͱ\x87\x0fMh\x10\x0f\x83E\nC|Ȩ\x87\xfa\xe8\xa4\xc3\xf4\xcaἫ\x83\x83u\xd2\x13\\>0\x027ni\xb0\xbb\xa6\x98\xfb\x90A9\x16\xe4\xe7\xf11\x16y}\x1a }(F\xf8}|\x9c<\xe0\xe3\xfctP\xc7\x18R\xe1\x85y\x9b\x88\x8fS Q\x1f7[\x8b\xf9\xf8\n\xf58|(\xe1c%\xc2\xf6q\xca \xe9c\xa5\xd5\a\xf2\x93\x86=e|Ą\x11\xf4̑>\x86\xb0Qڝ\xd1>\xc9-Ơ\xabc\xa1\xe3qt\xb2\xf1\x1c\xee\x04\xb5\u05c9>d;\x93|Ȣ'\xfbPt\x9a\xe2\x138\x99\x8a\xbeL\xf3aw\x9d\xe9>\xb0\x9e\x19>f\xd43}\\\x92;ˇ\x95\x01\xb3q\xea\x1c\x15\xc9\\\x1f\xd9\xfd<\x8eu\xbe\x0f\x14r\x81vx\xa1O(\xc4\"\xba\xe2b\xc2\xc4\x12\xd5\xc9R\xf5\xb1e>\t\xf0\xcb}\x98\xbd\xa4\xed\xacT\x03[\xa5\xee\xba\xdaG\x18]C;X\xabx\xf6\xb6O\xb8\xc8;4\xf8wU\xe8\xef\xa9P\xd6\xc1\xf1\xd7\xfbP\x1cx߇\xca熼v\xfb\xe5i\xf5\x03\fa#U\xbdI\xd1\xe5C\x9f.\xf8\xa1\xd06\xf3\xf010\xf3\x13\x1f\x8b͟\xfa\xb8\v\xdbg>\x99\xae\xd9\"\x96\xf6\xb9\x0f+~ho[}\xb2\xc0\xfaK\x1fc\xd16\x1f\x97\x8a\u007f\xe5C\xc1\xfek\xa0\xe17\x1c\xe2\xb7>\xbe\xe1\xf5;\x1fJ/\xdb}\x88\x17;t\xc0;9\xd0]\xe8\xe7n\x1f\xa7\xac\xbf'6\xeea\x03{}Hz~\xa0\x16\xf7\x11c\xf7C\x96?\xfa\xa4\xd0\xf7\x13\x87\xf7\xb3\xda\xd5\x01\x1f(\xdf\xc1,\xee\x1eR\xcf;\x8c{\xfc\xe2\x93\xc9\xf1_U\x86\xbf\xc1\x94\x8e\xe0\xefQb\xfc1\x9f\x86\x98\xe3\xaa\xf8\xdfiE\u007f\xb0\xff'|,\xb9\xfd\x89\xd6N\x02\xa2\xff\xc2\xff\u007f\xfbPW8\xa5f~Z\xbb\U000cf3f3\x16g\xd8˳>\x89s\xff\xfa\xc8\xc2\xcf\xf9P\b\xfb\x0f\xe0~\xde\xc7hy\xc1G\xc2tQ\x15|\t\xd0t\x99\xeerE\r\xee\xaa\xda\xec5\x9f\x96#\xaeSh7\x80\xc17\x15\x93n\xc16n\x03m\xef\xf0so\xb9;\xfd\f\xce\xf9\xfc\xe8P~\xbf\xb2\xc6\x02~^SЏ\x00U\xc8O^U\xd8/hQ\xc4O\xd7.\xea\x17\x0f,\xe6\a\f\x17\xf73\xd8\xdc\xe5\x87hJ\xf8E'%\xfd@\xf2\xbb\xfdx\xd4\xd2\x0fۺ\xd7O;\xbe\xcf/t\xe3~\xbfN\xa9<\xe0\x17;y\x10\u007f\x1f\xc2m\x1e\xf6c\xe5\xcf#~\x11\xe8\xa3~\xf1\xf0\xc7\xfc(\xbf?\xee\xd7\xdd\xedpޓ~:c)?\x89Si?\x02T\x8e_L\xb4\f\aV\x96\x87r~<\x91^\xde/\xaf;zJ\a\xf5\xb4_\x03\xca3\xec\xfa\xb3\xaa\xf9\xc9\xe9\xaa\xfb1\x19_Ï\t\xf6\x9a~n\xe4\xe3\a%\xaa\xc5\xc3kh\xf6\xf5\xbc1\xca\xd8j\xfb\xb1ַ\x8e\x1f\xcb\x06\xeb\xfa\xc5\xf1\xeaA@\xf5\xfd\xb2\u0c81_\x1c\xb7\xa1\x1fs*\x8dt\x80\x8d\xf5\u0604#j\x8a\xf3\x9b\xf1Cs?'T[\xf8\xe1Q-\xfd\x9a\xa5\xbeA\x81\xb5\x82\x92Z\xb3+m\xfc\x98-j\xcb+\xdb\xf9\x99\xed\xb6\xf7\v}ꀿ\x1d\xfd\x92\xdbt\xf2\xcb\"\xbf\xce<\xad\x8b\x9f\x13\x16]\xfdH\xaf\xba\xf9\xf1V\x83\xee~1\xf2\x1e~\xbceҏ\xb8\xde\xd3O\xe2\xd0\xcbϔ\x11\xea\xcb\xf5\xb3 \xde\x1b\r\xf7\xf1\x8bo\xf6\x85\xd6\xfb\xf9\xb5\xa0\xd2ߏe=ڛ\x81~\xe6+\x83\xd8\xe8`?ʐC\xfc@\x96\xa1\xec\xd20\x98\xe3p?\xd28\x87\x9f\xe0\xe3\xe4G\x97\x9fY\x94\xdb\x0f\xf2l\xf8\xe9\xf7\xa6\x1f\xe5*ˏ\xa0\xe9\xf1\x8b'y\xfd\xa8K\xf9h\xff~?\xd6\x0e\x05 ܠ_\x92\x8b\x90j9\xecǺ\x90\x88\x9f\x01)\x8aQ\xc4\xfc\xacP\xc4y\xa3\x04\x1b\xb3\xd9\xc3$NI\xf9\t\fi?\"X\xc6\x0f\xb4\x1b\xe1G>3\x92\xca\x18\xe5\x17<\x18\xed\a,\x8d\xf1\vc\x1e\xcb\x0e\x8dӁ\x8d\x87f&\xf8u/;Hk\x92Z\xc4d?+\x15S\xfc\x12S\xa6B\xd9Ө\xa8鰭\x19\x18\xe9L\x1a\xc3,?#\xfelmy\x8e\x9f\xb5蹐\xe7<\np\xbe\x9fa`\x01\xae_\b{\\\x04\xdb\\\xccV\x96\xf8\x19q\x96BRˠ\xcc\xe5\x18\xc5\n\xb4\xb3\x12\x17\xae\xf2\x13\xa8W\xfb\x11\xca\xd6\xf8\xb9\x88y-\x8d\xe3m8\xc5;~V\xfa\xdf\xf5K\x9d\xe0=Jp\x1d~Z\xef\xe7b\x93\xf7\xe9(\x1b0\xbe\x0f\xe8f\x1b\xe9ߛ\xfcX[\xf3!:\xf0\x11\xfen\xf6#\xf5\xfd\x98\xee\xf3\x89\x1f\v\xef>\x05\xca}\xe6\x97\t\xa3-~\xacx\xfc\x1c]\xfc\u008f\xa7\x93\xb6\xe2\x97/!\xfam~Dܯ\xfc\xc8Y\xbe\x86<\xbfQY\u007f\xab\n\xff\xce\xcfh\xbaݏ2\xe7\x0e\x1ev\xfau\xbeq\x97\x1f\xf9\xc4n?\xf7w\xf5#\xde\xed\x01\x9a\xee\xf5\xb3\xa0\xf0\x03\x8dd\x9f\x9f\v\a\xf6\xfb\xf1>\x10~\xf9\x13\x06\xf23\xdc\xe5\x80_Ҥ\x83~L\x97\x1c\x02\xb2\x1e\x86\xa8~\x81\x8c~\xa5\x05\xfd\x06o=\x82\x9f\x8f\xfae\"\xf8\x98\x1a\xeaq`\xd7\xef~\xcd\xfc\xffЎ\x9f\xa0\\\xfeT\xdb9I\x8f\xfe\x8b\xf7\xff\x9b\x87S~\x14XO\xfb%M\xfc\a\xb29C\xb3<\v%\xff\x9bm\xf4\x9c\x9f\xd4\xfb?^w\x9e']\x80\xcc/Ҫ/\xe1\xf2\xcb<\xe1\x8a\x1ft\xea*e\u007f\xcd/L\xeb:\xe4|\x83\x1e\u007f\x93\xeeqKm\xe36\xac\xff\x8e\x80\xd8ם\x01<\t\x95/@֝? ?\x15\bH\xb9\xa4`\x80n_( \x8eW8\x007/\x12\x80\x1a\x8b\x06(\xe7b\x011\xa2\xe2\x01\xed\xf9]\x01\xd1{\x89\x00\xebt%\xb5\x81\xbb\x03x\xcfr\x00\x94\xf2^\xb4v_@\xc0\xe0\xfe\x00\xc4\xf4@\x00\x1d\u007f0\xc0\xcd\"\x1f\n\x90,=\x1c@6\xfcH@\x84\xf3h\x00C}\x8c\x87\xc7ٙ'\x02|\a\xef\x93\x01\xb2\x95R\x011\x89\xd2\x01\x1aUN\x80%\x8b2\x01Qfـ\x18A\xb9\x80е\xf2\x01,\xcbx*\x00\xe7{: \xa2z\x06\xe2x6@*Z\x017}\x0eҨ\x18\x10[\xaa\x14@\xd6V9\x00Y?\x1fИP%@6\xf3B\x00\xef\xbd\xca\n\xa2j\x00\x8e\xf7R\x00U\xaf\x97\x03\xe4m\xaf\x04Dk\xd5Г\xea\xb8C\r\\V3\xa0\xc5R\x8e\xae\x16/~-\x80\xc4\xedu\x9cX;\x00$\xa9\xc3C]\x88\xaf^\x80+;\xeb\a\x00\x00\r\x02\xb0݆8\xbfQ\x80Yz\xe3\x00\xd6\xd8\x04\x88\x9aM\x03x*\xb8\x19\xef\xd3\x1cg\xb6\x80BZB0o\xe0\x9bV\x01F\xef\xd6\xec}\x9b\x00\xbc\xb1m@\x96\x03\xb6\xa3\xcc\xdaCf\x1d\x02ʭ:\x060/\xd6\t\x97wfw\xba\x04\x98\xb2u\rH\xad\xab[@\xb7\xdf\t\x10/{\x04h\xe3o\x06\xf0v\x9d\x9e\xe8D/^\xf9V\x80v\x9a\x8b;\xf6\x0e\xc0x\xfb\x04\x88^}\xa9\x87~\x10b\xff\x00*K\x03p߁\x01<\xb5?\x88\xbd\x1e\x9cUŐ\x00\xb7\xdf\t\x90\xb8\x0fÝ\x86\a\xc8R\x1d\x1c\x8eS\x1bwi\xef\xdc\x01\x01\x03#\x00l4\x03xB\xda\n\xc8\xda!O\x00\xcbK\xbc\x01\xad;\xfa`6\xfe\xec\xc7@\x80\x99]\x10\xdd\v\x05\xb0\x8a+\x1c`98\x12@\x95,\x1a\xd0\xe5\xc115\xf88\xbc&\x11\x00յ)\xcad\x80\xd41\xc5k\xd2j\x97\x99\x00\xd6\x14\x8e\xe0\xb7#\xd5\xd2G\xa1k\xa3\x03p\xf61*\xe9\xb1\x01\xd2\xd5q\x01\xe6\x88\xe3\x03\x12\xe5&\x04\x10\xfc'\xb2\x81I4\x84Ɂ\xec\f\xfc\x14~?5@\xe60Mۚ\xfe\xff\x13f\x04t\nq\xa6\xaawVVγ\x03\xa8\xda\xce\t\xf0\xe1\xe2\xb9\x01y\x82j^\x00\xb5\xa5\xf9\x01A\xdd\x05pυ\x012\xe5E0\xfdŰ\xbb%\x01\xb2\x82\xa5\x01\x94,\x97\x05\xb0\x16d9\x95\xb3\"\x00\xc8[\x89\x06Wa\xa8\xab\x81(k \xe4\xb5\x01\xc1ӷ\xb3\x1ax\x87#x\x97\x87\xf7t \xeb\x02\x9c\x12Y\x8fK\xde\x0f\xb0\xb6\xbfAE\xf3\x01\x9a\xd8\x18`\xbdu\x13T\xfa!\xc4\xf5\x11;\xb4\xf9\xff\xe3\xff8\xa0\xef\x00a\xdf>\r\xf0\x05t\x9f\x05Hm\xb7d\xa5\xf1y\x00\xc9\xce\x17\x01R\xaf\xad\x01L\x12\u007f\xa9\xc2٦\xba\xf9*\xdb\xeb\xaf9\xe2oxڷ\xda\xdaw\xb4\x85\xed\xb0\xc6\x1d\x01\xe4\r;\x03\xe0\x9d\xbb\x02x]\xd9\ue03e\x19\x92?\xee\t\xb0h\xb27\x80-\xcf\xf5\xc7}j\xfa\xfby\xe9\x8f\x01n]\x17`\xe4\xfc\x19\x83?\x10`)\xf8 \x8d\xe8P\x80\xe1\xee\xb0\xf6\xe4\x17\xb5\xb4_Ք\u007f\xd3㑀&GG\x01\b\xc7\x02B\x02\x8e\aP\xb1\xf8];\xf3\x87\xba\xfa\x89\x00\x8b$\u007f\xea\xb5'U\xfa\u007f\xe1ҿ٫S\xfa\xe3逐\xe1\u007f\x88\xb6g\x02,\xbb\x9d\r0\xfb\xffW\x03̹\x80\xa6\xb0\xff\x05XH9\x1f`fx\x81ҿ\x18\xe0\xeek\x97\xb4\xd1\xcb\x01d\xb0W\xf4\xe3U\x8e\xf5\x1a\x0f\xd7\x03R\xbc\xbb\xa1\xa1\xe4&\f\xe5V\x80\xbb\xf00\xe8\xdd\x11d\xed\xe8\xce .\xc8\x17,\xdc\xd14\xacގ\x9c\xfcA\t\xb9\x05\x82\x82B\x05\x83\xf4\x8bBA\xa1\r\x85\x83d\xfaE\xf0[\xd1 q\xbeX\x90FT<\x88\xa7\xfa\xee\n\x8a5\x97\b\xd2/J\x06\xc9J\xef\x0eJ\"pO\x90%\x97{\xb5\xd9\xfb\x82X\u007fx\u007f\x10+W\x83\x12\x99\x1e\f2\xf3{((r|8ȉ\xbcG\x82\x84\xfcG\x83:\xd1\xf8X\x10|\xff\xf1\xa0\xb0\xd7'8\x84'\x83\xf9[\xe5\xe6\x94\nb\x94\xa5\x83\x12Tr\x82ble\x82\xb0\xbc\xb2A\x94\x99\xca\x05\x81:\xe5\x83\xfa~\xe5\xa0h\xf9\xe9\xa0\x04\xc7g\x82R4\u007f6\x88Փ\x15\x82\xa8\v=\x17\x94yЊA\tv\x95p\xbb\xcaA\x9a\xd3\xf3A!\x16U\x82RK}\x01\u05ff\x18\xc4#TU\x83\xc8\"_\n\xf2\xf9Ƞ\xac\xe4{\x85\xdfU\v\xc2j\xab\aQ\xc0\xaf\x11\x94\x82jͼ\xef\xfa\xf9s^Ց\xd7\n\xaa\x1b\xbd\x16\xa4\xb9\xbe\x9e7h\x875\xa4_N\xed q\xb3N\x10\xa5κA\xa0_\xbd\xa0\x18W}\x0e\xbbA\x10\xf0\xd20\b\xc0h\x14\xd4\xfc\x10\xa2m\x92m\xb8i\x10롚\x05i_̓\xc4\xc5\x16A$*-\x83\xacƾA}\xb6\nʞ\x15\xad\x83R\xa3n\x13\xd4D\xba-%\xde.Hgh\x0f\x83\xe8\x00Iu\f\xb2\xf2\xda\t\xb2\xec\x1cTj\xd1%\b@\xed\x1aĬa7t\xa8;\xb4:(\xa7G\x90\x05\x837\x83:\xc3\xd8\x13\xd7\xf6\x82L\xdf\n\x82 \xe7\x06%\xac\xf4\x0e\xcaR\x94>\xd0j\xdf Y^\xbf\xa0\xb8|\xff Aw\x80Jq`\x10Ӫ\x83\xb4\x87\x83i/C\x82\b\x11C\x83\nl\xc3Ԣ\x87S-\x0e\x0e\xcb\x19\x04\x93s\xa9\x95\xba\x83\xba\xc3k\x90+\x85M\xf4\xce\n\"\x97\xf7\x04\xc1a\xbcA\xa6/\xbe \x9c\xcb\x1f$[\v\xe4}\x9d;\xc0\x91\x13T\xc3\x0fq0\xe1`\xbe\xd69\x91 \x01-\xaa\xb7\x89i\xcf\xe3A\xa1\x18\t\n\xca\xce\xeb\x8al\"\x00y\xa5\xf07\x8d\xbf\x19X\xd5\bj}d\x90+\xa3F\x05\xc5\xcfGkCc\xd41\xc7\xc2\x15\xc6\xf1\xd4\xf1Y\x19O\b\x127&\x06Q-\x9e\x14\xe4L\xcf\xe4\xa00\x8a)A)gL\x85Z\xa7\x05Q\x8a\x9a\xae\xa2\x9a\x11\x04\x1e΄rf\x051]1\x1bw\x98\x13$]\x98\xab\x03\x9b\xa7\x864\x9fW,\br_\xbd\x85\xaa\xa9E\n\r\x8b!\xce%\xd0\xe2R\xdcw\x19\x1ck9\xbdvE\x10U֕\xb4\xf9UA\x84\xe0\xd5*\xb35Als\xb2VG\xfcv\x90\x99\xe7;\xea(\xef҄\xdf\vj%a\x9d\xfa\xc3\xfa !\xf8}\x85\xb0\rYX\xf9\x000\xb5\x91ְ\x89\xd6\xf0a\x10\x19\xe6GA\xce&o\x86\x80>\x0eJ@\xfdD\xe1\xe9S\xed\xceg\x10ؖ p\xfe\xf3\xa0\xf2\xc9/\xd4#\xb6\x06\x91w\u007fI$ئ\xe2\xf8*\xa8\xb0\xffu\x90[;|\x13d\xe1\xf6[\xde\xfe\xbb \x03\xcfv\x8acG\x10\xd3u;\x83\xa0\xb1\xbb\x82\f{\xbbU\xe4\xdf\a\x11\xc8\xf7\x04\x11\xe8\xf7\xe6\x8dcА\x9c\x1f\x82\x98\xf6\xddG\xdb\xdb\x1f\x94\xcc\xeb\xc7 \x93\xf8\x9f8\xb8\x9f\xd5^\x0fК\x0f\x061\x83t\x88\xd2=\x9c5\x99_\bo\xbf\x06\xb1\xf2\xf97\xbd\xe7\x11\x1d\xfc\xd1 \xe9\xc0\xb1 \x03\xf4\xf1 wG\xfc\x1d\xf1\xe4\x0f\xf8\xec\t\xd8\xee\x9fA\x12ӓA\xc4\xf9\xbf\x14\x06\xfe\xa6\x85\x9e\xe2\xb8O\a\xb52\xfb\x8f\xc2\xe0\x99 JigU\xd7\xff\x06奰\xe7\xd0\xec\u007fA\xb0\xea\xf3h\xfd\x02@\xfab\x90sޗ覗\x83\x8c\x84W\x82 \xb1W\xb3B\xbf\x16\xc4^\x00׃d67\x82`.7\xe1G\xb7\x82\xa8%\xdeΞ{GH\xcc\xf2\xce\x10\xb6\xad\v\xe1\t\xff\xfc!\x89R\x05Bb5\x05C,h\x14\n\x01\xe9\n\x87duf\x91\x10-\xadh\x88\x02.\x16\x12\v)\x1e\x02r\xdf\x15\x12\xbaX\"\x04\xf5\x94\f\xc1\x95\xee\x0e\x89y\xdd\x13b&~o\b\xeb4\xef\vQ\xb4\xf7\x87\n\xb7\xcf5\xe4\xbd\xfd\x0f\xf0\x87\aC\x12\xe6\x1f\n\x91I<\x1c\x92\x84=7\xe7\x91\x105\xf2hH\xbc鱐\x94\n\x1e\x0fI\x98{\"D\xa4}2DvX*\x04w*\x1dby9'$N]&D\t\x97\r1^\x86`L\xe5Cxf\xe4\xa9\x10\xc9\xde\xd3!\x06\x8fgBj\xe5φ\xe0k\x15B \xfeυ\x90mTԞT\n\x89\rT\x0e\xc1\xaf\x9e\xe7oUB\xb0\xd5\x17B\xd0\xc0\x8b\xa1\x82Ms\xcdܜ\xaa\xfc\xf8R\b8\xfarHP\xe1\x15\\]\r\x92\xa9\x1e\xe2{C0\xb4\x9a:\x9cWCȻj\x85\x84\x92\xbf\x16Ұ\x19\xa2}\xd6\x0e1_\xad\x83Kꆈs\xf5B\xc0\xd7\xfa\xecD\x83\x10l\xab!\x87\xda($\xeao\x1c\x82k4\t\xa1N\xd34D\xa8h\x16\u009eR\xcdCR*h\x01ѶTݾ\x01ݶb\x8b\xadu\x04\x18\xe8\x10\xc2\n\x90\x8e\xfam\xa7P^\x1c\x19\x9c\x97v\x86\xe8\"]\xf4\xf2\xae\x18|7\xfc\xed\xae\xfa\xe9\x11\x022\xbe\x19b\x82\xdb\x13\xbd\xee\xc5q\xbd\xa5B\xc8\r\x15\xc9\x13\xf9pCV\xb0\xaa\x1c\xfap\xac}U<\xfd8\xcc\xfe!\r\xd4\x03BB'\x06\xeaɃBD\xd2\xc1jbC\xf2\xfa%ǡ!\xbca\vF5<\x04hvh?\x9clХ#p\x87$32 )3\x84\x8dw8rO\x88\xe5`o\bUO\x9f~\xf4\x87\x84O\x05B\xdc\xf65\x84J^(D\xdc\x0e\x87\xf0\u0590\x90\x94\xb8\xa2!,\xa5\x8cQ\xdcq\x1dMB\xe47\xac_\x8e\x1d\x12(H\x86P\x19K\x85\x04\xac\xd3!\x04\xbaL\x88\xb5\x84\x11!T\aG\x86P\x8d\x1b\x85\xf3G\x87\xc0\xb4ǰͱ\x18\xe3\xb8\x10\xe3f\xa8h+kH\xee\xb0A\x86#gB(\u007f;G\xceĐp\xe2I8i2\xcdu\n\xccujHXݴ\x90\xd4֦\x03\x05f\xa8;\xcfT-\xcf\xc2E\xb3\xe1\xfesB\xe4\xa1s\xf1ݼ\x90\xe4:\xf3\xf1˂\x10\x91\u007fa\x88\x1cf\x11F\xbf8\x84pI!/\xd5\x06\x97\x85\x10\xa3\x97\x87\xb2[ج\b\xa1ܴ\x92#Y\xc5A\xae\x86\x81\xae\xe1wk\xf3\xb0\xc4\x1ab\rs\xe4\xbc\x1d\xd2W\xb6\xbc\xa3b~\x170\xf0^\xf6\xebu!<{\xb9>\xc4*\xd9\xfb\xe8\xe8\x06v\xe0\x03X\xe4F\x8c{\x13\xfa\xfe!e\xf8\x11;\xb09\xa4)\xd5\xc7\xec\xe1'!V\x98>\r\x91}|F\x1c\xdd\x12*\x94\x87\x99yv\xffy\b\x9b\x13}\xc1\xc3\xd6\x10\xa3ԗj\x85ۨ\xb3\xafB\\U\xf3u\b\xb1\xf0\x1bXط\xda\xf2w\x00\xe3\xed\xea#;\x885;C2װ\v=\xdfM\xd3\xfa\x1e\x83\xdc\x03[\xda\x1bB\xfd\xfd\x87\x90И}!\x94\x80\xf7\x87\x10\n\u007f\xd4.\xfc\x14B\xc0\xfd\xf9\xffR;\x10\xc2\xcb)\x0e\xfe_\xe4\x87\xf4\xcc\xc30\xf5_8\x82_)\xf9\xdfBH\x85\x8f\xa8\xed\x1d\r\xe9\x9c\xd81\x18\xc9q\x9e\xfb;\x0f\u007f\x84P\x13:\x818\xf3gV\t'\xb3\x97\xfc\x15\"\xd3\xfc\x1bpv*\xc4e\x83\xa7\xa9\xd4\u007fT\bgT\x93g\xd9ֿ!>\xeet.\x84\xc8\xfd\x1f\xe4p>\x04\x96{\x01>y\x91\xbf\\Rc\xbcL\x8c\xb8\x82\xa1\\\r1?\xb8\x16B\xb5\xe8::v#\xc4(\u007f3\xa4\xe4\xe0\x16\u007f\xbd\x1dB\xdd\ue3b0\x98ڝaT\xcb\xf3\x85i\xa5\xf9\xc3X_U \f\xd3)\x18\xa6y\x17\n\vn\x15\x0e\v-)\x12\xc6\x14}\xd10j\xa8\xc5\xc2(~\x15\xe7\xe1\xae04P\",Y^ɰ\xf8\xc2\xdda\xechvO\x18\xfb3\xdd\x1bF\x15\xe1\xbe0\xe8\xd7\xfda\xa4\xe0\x0f\x84I\xdb\x1e\fc\xde1\xcc\xc7<\u0080\x82G\xb4\a\x8f\x86Y\x8eE\x9f\x1f\x0f\xf3\x95\xcca\xb0\xa5'ٓRa\xc6\xc902\xa4\x9c\xb0\xb8g\x990\x17\xe2\x96\r#\x14\x97\v\xc3\xeeˇ!\x86\xa7\u0088\xe6O\x87\v\xb6\x184\xf8\x18\x86\xe5\xbe\x12\x06g\xaa\x16\x16\xec\xae\x1ef~Z\x83_\xd6\f3}y5\f\x8c\xaa\x15ֵ\xabh\xee\xf50bH\xed0\xa3[\x9d0\x82|\xdd0\xb1\xbb^\x98\xef\xd6\nklh\x10\xa6Y5\fK\x11\xbaQX\xabg\x8dÀ\xd9&aA\x81\xa6a1\xe9f\x94~\xf30&\xc6Z\x84\vv\x96`\xd82L\xaf\u007f\x83Rm\x15\xe6\xb6\x19\xad9\xa66T\\[v\xbb\x9d\x8a\xa4}\x18\xc9j\x870\xf0\xa4c\x18\xeb\xba:\x855\x11\xed\x1c\x16o\xef\x02Qv\r\x13\xa0\xba\xe9\xb1{\x18\x13v=\xd8\xfa\x9ba\xa9\xda\xf5\fӖ{\x85\x99\x9b\xbc\x15ƴ_n\x18!\xacw\x98\xf9C\x9f0\vD}u\xbc\xfd \xab\xfey\xe7\xe6\xc9z@\x98p<0̂\xf5\xa00}f0mk\bu6\x94w\x1d\xa6\xf7\x19\x1e\x16\x8cr\x841k\xe0\fc5\x89K\x1br\x87%\x8a\x1aaup3\xacي\x15\x06\xab\xf5p\xc8^Z\x8d/L`\xf3\x87\xb9\xe06\x10Fx\n\x86\t\x89!Ud8,\xb8\x1c\tg_CI߉Q+\xf10\xe7$\x12\xda\x01;L\x96\x96\xa4\xf7\xa5\u0098\xfeI\xab\x183a\xe0ሰ0\x9e\x91\xfc0\x8a\xa3\x1b\xad\xe6:\x06\x06:\x16R\x1a\x17f\x96<>\x8c\xf2\xf7\x840\xa6\x9d'\x861\xc71\t\xa7LV3\x98\x02\xe5M\xe5\xc0\xa6\x85A\xec\xa6g\x8djF\x98i\xd0Lx嬼\xd6\x1cCrf\xe7\xf9S\xae\xd1/gNXww\r#\xaa\xcc\v㉸\xf9a\xc1\xb5\x05\x18\xfa°\x02\xe7\"\xb5\xa3Ū\x89%\xea\x0eKØ\x9d\xc4\xdf\xe5a֮W\xe0\xd3J\x8aaU\x98\x94b\xb5\x1a\xc1\x9a0\x1f\xd9Z\x1b\xe6\x16\xaf8\xf7\x1d\xdaػ\xbc\xe4\xbd0\xd3\xfcuanS\xb4>̹\xf7\xf7ì\x86m\bca\xf2\aa\x04\xbd\x8dD\x8cM4\x8a\x0f\xc3Xj\xf3\x11\x9a\xdd\x1cֵ\xact\xefO\xc2\\U\xf2\xa9z\xf6g\xaa\xed-8\xf9\xf30_E\x19\xc6D\xeaV\x15͗a,\x8c\xd9\x16F\x01\xe1\xab06\xe7\x01\xd8|\x13f>\xfamVD\xdf\x11\x9d\xb6\x87\x91\xf5\xed\bc\xd9\xf3\xce0\xd8\xff.\xa0\xf3nm\xf4\xfb0\xa8\xdb\x1e\x88x/l\xfa\x87p!\xa1}Cs\xf6\x855\xd4\xef\x0f\x17\xceS\x92\xec\xba\xf9#\xce\xf8)k\xd0?\xab\xed\x1e\b\vO?\xa8r=\x14\xe6\xea\x8e\xc3:\xa8_0\xa8_\xc3$\x9c\xbfe\xb1\xe7HX\xe2\xd4Q\xf6\xeaX\x98y\xef\xf10k\b\xbf\xd3\x1e\xff\b\xa3\xb4w\x02\x0e\xf5'm\xfed\x98\xdc\xe1\xaf0#\xe5\xdfj֧\xc2L\x10O\xebm\xff\xa1Z\xcf\xc0B\xcf\xf2ÿ\x18\xfc\xb90\xd2\xde\xff\xf4\x9e\xe7y\xaf\va2\xe4\x8b*\x9aKz\x9f\xcb\f\x1cW\x88\x06W\xe15\u05c8a\xd7i\xe97x\xc6ͬs\xde\n3q\xbcM\xf0\xbd#\x82R՝\x11}7e\x84\xed珈,\vD\n\xb6\xca\xf5\xe6\xe6\x14\x8c\x14n\xdd\xd7!\xb4\xbeP\x84\xe3)\x1cAf[$B\x16^4\x02\x9d\x16\x8b\x88ދGh\u007fwE\x84픈\xd0\xfdKF\x84\xee\xdc\x1d\xc1J\xa2{\"\x8c\xd1\xf7F\xa8\xa3\xfb\"X\xb9u\u007f\x84^\xf3@$\xbb\xb2\xe5\xc1\bz\xff\x10{\xf9pD\x9f\xe5\u007f$\"\x10\xf0h\x84\x98\xf8X\x04n\xf1xD\x84\xf9\x04\xafx2Bh*\x15\x01\xb1*\x1d\x91\xbabND \xa0L\x04;藍0\xd9)\x17\xa1e\x94\x8fH\x9c}J\xaf{Z\x05\xf1\f\xdb~6\x92\x87=nGN\x85\b|깈\x10\xf8\x8a\x11\x82F\xa5\x88\xd0\xee\xca\x11\xc1\x83\xe7#\x88\xcfU\"P\xc8\v\xe8\xe7\x8b\xdaV\xd5\b\xc0\xfa\xa5\x88&g/G\xe8\xf3\xafD\xb0\x14\xbbZ\x04\n\xab\x1e\x11s\xaf\x11\x91\xc0V3\xc2J\xc1\xab\x11\xaa\xbfVD(\xd2k\x11\x06\x8e\u05f5\xdd\xda\x11\x01\xad:\x11V\xad\xebF\x00\x85\xf5\"p\x9e\xfaY\x915\x88\x10\x1d\x1aBG\x8d\"X\x8b\xde8\x82U\xefMT\x1dM#Z\x05i\x16\xc1\xc3\x0f\xcdE\xcb\xc3rZ`\x14-\xf3t%\x0fǾ\x11\x01(\xb7\x8a`c\xae\xd6ڗ6\x11\x84\x8f\xb6\x11&\xec\xed\"\\o\xd6>\x02\xdaׁC\xeb\xa8]\xec\x14\x01\xf7\xec\x1c\x01\x9ev\x89\x88\xddwe\u007f\xbbEX+\xe8\x1e!\b\xf5\x88`\x93\xe87\xd5Pz\xca]\xf3\x02jDW\xbcF\x80\x1e\xb9\xecRo\xf6\xa1O\x04+\x05\xfbF\x98<\xf6C\xef\xfbg\x876 \x92\xbf\xe3\xf0\x9c\x81\x11\xa9\x1e\x0f\x8ah%n0\xaf\x1c\x82S\x87Fd\xeet\x98\xdeqxD#\xa5#B\x97vF\xc0\xae]\x11z\xb4;\x02\x1eaD\x18\xea͈\x10eK\xfb灰\xbd\x11,\xae\xf4Q1~|\x17\x88\xb0\f\x15\x84\xa3\x85\xa0\xc1p\x04S\xb2\x115\x8bh\x04\xb48\x16\x91\nm<\x026\x9b\xd0A\xd9\x11\x81\xadd\x84u\xa6\x14L/\r\x93\xc9\xd0\xc8FD\x80\x1b#\xf5\xfcQ\x11\xa50\xa3#`\xcccp۱\x8a\x90\x98o\x8e\x80H~L\xc7\xff$\x82$\xe1\xd3\b(\xd0g\xda\xff-\x11\x90\xe2ϩ\x9b/\x80W[U\f_F\x84\xe5n\x8b\xe8\xf6v\x90\xdb\u05fc\xd37\x11\x8dJߪ<\xbe\x8b\x80\x02oG\x03;\"\xa4\xcf;#\xa4\x1a\xbb`_\xbb#d=\xdfG\x00\xf3{\x14\x85\xf7*d\xfe@\xab\xdd\x17\x11\x9a\xba\x9fN\xf5c\x04D\xf1\xa7\by\xf2\xcf\xf4\x89\x03\x11\xf0Ѓ\xea燲\xeep\x98\n\xfe%\x02\xbe\xf8\xab\x9a\xffo\x11\x92\xbc#\x1a'\x8eFH\xf6\x8eEH \x8f\xd3S\u007f\xc7\xf0\xfe\xa0C\x9c \xc4\xfe\t͝\x8cH\b\xfb\v\xff\xff\r#=\x15!\r9\x1da҉/\xcf\xc0\xfe\xcfF\xc0!\xfeU\xac8\x17QN\xf0_\x04l\xe4|ֽ/\xd0\x0e.F\x18|/Eȭ.+$^\x89\x90\xb4]eG\xaeE\xc0\x8d\xaek0\xba\xa1Fp3B\x96t\x8b\x16w\x1b\xdeqGTw\xe6\x89\n\xd7\xc9\x17\x15\xaa\x91?\xaa\xaeQ J\b)\x18\xe5}\vEa\xff\x85\xa32\xc4\"Q\x06\xf8\xa2Ql\x02\x1b\x85\x89\x16\x8fB\xe6wE\xc5%JD\xc13KF\xc9M\xee\x8e2\xe4\xdf\x13\xa51\xdd\x1b\x05Q\xb8O{p\u007fT7\x1a\x88\nsy0*\xbd{H/y8\n\x1e\xf3H\x94A\xfe\xd1(\xa2\xf5cQ1\x9fǣ\x12\x19\x9f\x882\xec=\x19eH+\x15հQ:\x8a\xf8\x99\x13%\n\x94\x89\nҔ\x8d\x8a\x89\x95\xd3ᕏ\x02\xb6\x9e\x8a2V=\x1dE4{&\xcaկQ\xc2F\x85(\xe2\xe2sQ\x04\x9c\x8aQ\x84\x9fJQ8B\xe5(1\xff\xf9(\xc3C\x95(\x83\xc7\vQ\xb5\xb5\x17\xa3DĪQ@\xefK:ԗ\xa34\xbaW\xa2ĜjQ\xa4\xe4\xd5\xd9j\x8d(=\xba&\xbf}5\x8aU\xb6\xb5\xf8\xe9\xb5h\x91\x16\xb9\xb9C\xfa\xb9\xf3\x92Ҩ v\xed(K\xe7u\xa2\xa8\xf2ԍ\xf2\x8d#\xdaF}\x1dE\x03=6\x8cr\x01v\xa3(xI\xe3('\x99\x9aD\x11\xac\x9aF\xc1\x8d\x9bEu\xb3\x98\xe6Pq\x8b(\x1f\xd1k\xa9m\xbcA\x01\xb5\xe2ɭ\xa1\xb06\xdaP\xdb()};=\xb6\xd7~t\xd0\xcf\x1d\xa3\x98o\xec\xc4^v\x8e\xc2\x15\xbb@\x9f]\xa3B\x11\xbaEe\x06\xb5{T8W\x8f(\x90\xe9ͨ$\xcc=\xa3\x98\v\xee\x85_ޢ]\xe4j뽣Rc\xec\x13\x05}\xec\v+\xed\x17\xa5\xdf\xf6G\xdb\x03\xa2\b\xd8\x03\xa3H\x9e\x06E9\xe378\n\xe4\x1f\xc2\xeb\x86F\tGâؕ'\n\x04sD\xe5Ih':\xe5\x8ab\xf3 w\x14\xd0h\xc0\xd4ͨ@\xb1\x15\x95՝\x9e(\xdcϋ\xce\xf8p\x89\x1fV\x17\x88r!J0\no\x0eE\x85\x83\x85\xa3\x82\x14\x11\xb5\x98h\x94\xf0\x13c\x1bq\xfc\x98\xd01ؐLR{\x9d\xa2\xd0Ҹs\x06'\x8e\xc0ߑQnv0*\xca\xd2\xc5\xe8(&f\xc6D\x95@\x8c\x8d\xca\xea\xd3qQL\xaf\x8dד&D\x11V'\xf20)\x8a@1\x19C\x98B\x0f\x9a\xaagN\x83\xe4\xa7g[\x9b\x11\xe5f\xfc3y֬(\xc1n6\n\x02\xf7\xbe:\xf1\x06\xca\xe0\x03\xfd\xb81\xca0\xb7\x89V\xff\xa1\xb6\xf8Q\x14{\x01o\xce\xde\xf7cřOp\xdfO\xa3,\xfb}\x86\x8en\x89\xea\x9a\xd6\xcfՓ\xbe\xe0-\xb6F\x19\u05ff\x8c\xa28\xb1\x8d\x87\xaf\xa2\xc8w\xbf\x86\xe1~C?\xfd6\x8a\x1d\t\xbeCsۣ\xf2\x80\xc7\x0e\xfc\xbf\x13V\xb0K\x85\xbf\x9b\xd6\xf3=mwOT\xca\\{1\xc6\x1f\b-\xfb\xb2\b\xbf\x1f\xdf\xfe\x88\xbf?\xc1\xcb\u007f\x8e\x92\x00\x1f \x92\x1f\xe4\xe1P\x94a\xf0pT\xa8\xe5/\xda\xe1_\xb3\xf8\xf6\x1b\x14|\x84=>\x1aEP;\x16E0:\x1e\x05=\xf9\x9d\x83\xfa\x83\x06qB\x91\xf7\xcf(\x83\xf2\xc9(*g\u007fE9\xa7\xfbw\x94\x11\xebT\x14\x91\xea4\xfb\xf0\x0f\x91\xedLT8\xd4Y\xfc\xfd\x970r.*ϭ\xfc\xa7\xf8}\x1e\x12\xb9\xa0\xfa\xba\x88\xd1_\"\xd0\\\xa6\xff_\xa1\x18\xaf\xeaP\xaf\xe1\xf2\xebT\xff\r\\}\x93\xb7\xbc\xa5\xfd\xbb\x1d\x05\xff\xbb#\x86u\"w\xc60i\x97/\xc6gDbXE[ \x06\\*\x18\xc3\xf4L\xa1\x18^\xf9\x1cC\x84+\xc2CQ\x1e\x8a\xc5\xc0R\x8a\xf3pWL\x1e\xb0/\x11\x93ղ\xb99%cL\xee\xefƷ\xf7İ\x01ֽ1M\xb7\xee\x8b\xc1\xf4\ue3f1d\xf4@LB\xf6\x831\x1a\xe2C1\x82\xcb\xc31L\xc0=\x12C<~4&+@\x1e\x8b\x89u<\x1e\xe3\x9e<1\x01\xac'c\x98L.\x15â\x9b\xd21\x81֜\x98ȴ\f\u007f)\xcbA\x96\x8b\x819\x96\x8fa\xa3\xf4\x18\xfd\xe6\xe9\x98<5\xfdL\f3\xb1\xcf\xc6\xe0\x01\x158\xba\xe7b\x9cƮ\x18\x93\xd9\xdfJ<\xa52\xae~\x9e-V\x89aM\xe6\v1 ͋1\xe1\xfcUc\\\xac\xf5\x12\xc6\xfd2e\xf8\x8a\x8e\xb3ZL\x1e^\xae\x1e\x93\x84\xa7F\x8c\xeb\xc8jƸ\t,GY\x8b#{-\x86\xb2\xf3\xeb<Ԏ\xd1H먀\xea\xc6\xe0\r\xf5\xa8\xb5\xfa1T\xf0\x1b\xf0܆1\xb2\x87F1<<\xd88F?j\x12\xd3j}Sv\xb6YL\x16 6\x8f1ڷ\x88qҰ%\x1b~#\xc6Ǣ[\xc5X\xe0l\x8d\xb1\xb4\x89\xc9\xfa\xae\xb6Tv\xbb\x18\"L{v\xa1C\x8c\x16ڑ\x1a\xeb\x14S\xb2\xd79\x86\xfd\x04\xba\xc4\xf0\xb8O\xd7\x18yp7\xa8\xa8{LbF\x8f\x98\xb8ۛ1\xd4\xc5z\xc6@\xe3{ńV\xbe\x15#\vȍ1\xb9\xeb\x1d\x93\t\xcd!\xb9\xa6#\xa7\x0f\xef\xdaW\xa5\xda/\x86E\xb4zހ\x18\xa6r\aƊu0,w\xeep\xe1\x15\x83\xf8\xdd`=e\x88vwh\x8c\xe05\x8c?\x0f\u05ef\x1dzt\xea鮘8\x95;;(C\x15g\xea\xed-^\xed\xa1\x1a\xbc\x14\xa1\x8f\xda\xf0\xab$\x031Tꂰ\x9e\x90^\x18\xd6cD\xa5\x1f\xc58b\xf8\x1b\x8f14&`\xe2vL\xea!ɘ\xf8s\n\xff\xa7\xf1}F\xcf\x1a\xa1Ǒ1L\x93\x8d\u0089\xa3c\xb2D`\fn96\x86\x92ظ\x18\x9e\x91\x1d\x1f\xc3\fք\x98\xac$\x9a\b\rL\x8a1,M\x8e\xe9\xac\xfe\x14\xb415\x86\xe4kZ\x8c\x989=&\x04uF\x8c\xa9\xcf\xcc\x18cά\x98\xcc\xd2ώ\x91\xb9̉1\xfc͍!\xc1\x9a\x17\xc3L\xd0\xfc\x98,{]\x10S\x1a\xb60&\x91w\x11e\xb58\x06\xe8[\x12\x93\xf0\xb04\x06\xc8]\x16C\x9c\xb0\x1f\xa2\xfdQ\xa5\xf8\x93B\xc4\xcf1\x12\x8b\x031\x14\x86\x0eRև\x88\xa3\x87\xb3\xe6\xfe\v\x9b\xfd5\x86\n\xebo1Y\x88\u007f\x04=;\x1a\x93\x12ޱ\x98$Z\xc7a.\xbf\xc7\xf8\f%\x1c\xf8D\x8c,\xebO5\xef\x931\xae\x99\xfa+\xef\x82ܜ\xbfcB\xb2O\xa9(O\xc7d\xee\xff\x9f\x18\xc8\xec\x19\xed\xe7Yq\xacܜ\u007f\xd1\xf4\xb9\x98\xee\xf9\xfe_\f\x137\xe7a\xbc\x17\xb4͋\xec\xe4%\xb5\xd3\xcb1}\x1bݕ\xec?W\x01a\xd7b\xf9\x1a\xe5\\\x8f\xb1\n~#\xc6\x10}3\xcfGQ\x8d\x85\xa8nǰB玸\xd6h\xef\x8c\x13\x03\xf3\xc5q\x87\xfcq\x10\x83\x02qP\u0382q(\xb8\x10\xbf,\xccOE\xe2\x12\a\x8aƱ\x17L\xb18\x96\xfdċ\xb7\xee=ȟ\x97\xe5\xe4\x1aV\xce]q\xc0W\x898\xe7sK\xc6\xe5\x8d\xc0w\xc7I>\xef\x89K\xb8\xbd7\x8e2\xd5}q\xa1\xc9\xf7\xc7\xf9 \xc1\x03q\xb2\xe1\a\xe3\xe0\x12\x0f\xc5\xc5H\x1e\x8eÒ\x1f\x893[y4\x0eG\u007f,\xcet\xec\xf18\xe5\xfbD\x1c\xc0\xf0d\x9c\xf5\x84Rq\xd4xK\xc7\x01\xcf9q\xf2\xc22q\xe2QY\x0e\xae\\\x9c\xb5\x99\xf2q\x9a\xefS\x1c\xde\xd3q\xd9\x1a\xec\x998\xe8\xeb\xb3q)\xb7V\x88\x83\x0e?\x17\xc7\xc6G\x15\xe3\x98Y\xac\x14\xc73\x94\x95\xb3\x82|>oHy\xadV\x89\x8b)\xbe\x10\xc7r\xab\x17yjո\xac\x92\xc8K&\xf3Nq\xf8s^\x8e\x8b\x1f\xbe\x12\x17\x88\xa8\x16\x87\xb9W\x8fK\xd6Q#N`\xae\x19W\a{\x95\x82\xaf\x15\a\x17~-\xae\xd3\x1a\xaf\xc7\xe9a\xb5\xd1P\x9d8\x1f\x92\xa8\x1bG\xfc\xaf\x17\xa7\xda\xeb\xc7\x11s\x1a\xc4\xf9\xea\xca8\x17\xe55\x8a\xc3\x1b\x1b\xc7\xe9tM\xd8\xe9\xa6*\xc6f\xbcQ\xf3\xb8\xd0\xd5\x16q\xb1˖qI\xa7ވs^SE\xd5:\xce*H\x1b\f\xb6-\xfe\xb6\x8bK\xd4k\x1f\x87\x9bw\x88+\xc9\xeeH]v\x8aӎ;\xa3\xc7]ص\xaeqr\xc7nq>\v\xdc=.\xabYzP;o\xc6ɯzƕR\xf5\xa2\x81\xbe\x95'\x92\xbc\xa1\xe7Rn\xbd\xe3Bo\xfa\xc4\x05\xe2\xfb\xa2\xa7\xfd\xe2\xb4\xfe\xfe\xb4\xb0\x01q\x81Áq}\x96cP\x1c\t\xe1\xe08\xc8Ȑ\xb8\"\xdaP\x9aϰx\x9e\xfb\f\x8fcɕ#.\xcbr\x9dq\x00\xa8+N\\vǁp\x86Z\x9f\x89ƭ8\x00\xc5\x13g\xed\xc4\x1b\x97\xb8\xef\x8bk$\xf0C8\x818\xa1(\x18\x17\xf0\n\xc5Y\xa4\tDž\xa4D\xe2\x9c\x1c\x88\xc6\xf1`L,\xce\xf2Y<\xae\v\u007f\xe2\x02$6NMƱ\xa6*\x15'\xb9K\xc7%Tf\xe2\xacʌ\x88\vb\x8c\x84\xd6F\xc1wF\xc7I\u007f\xc6\xc0I\xc7B\xf6\xe3h\xe5\xe3\xe3\xc8\x01'\xa0\xf1\x89qTU&A\x98\x93\xb3=\x9f\x82ߦRW\xd3\xe2Ĭ\xe9\x94䠜\x19qR\xf8\x99qM,fa\xa0\xb3\xb5ks\x00\x12s\xe3\x12]\xe6eU8\x1f-.P\xe9-\x8c\xb38\xb1\b\xdf.\xa6z\x97\xc8\xf5\xeeܜ\xa5\xea\x9c\xcb\xd4%\x96Ǚm\xaf\x88\xb3\f\xbd\x12\x82\\\x15\xc7j\x82\xd5:\xce5t\x97\xb5q@\xdc\xdbq\x82\xe5;*\xdfw\xe3\xc8\x1a\xde\xe3\x8d\xd6i/\xd6+8\xbc\x0f\xe3\xdb\xc0\x16>\x88cS\xa0\x8dqͽ6\xc5Q=\xfc0\x8e\xa0\xfd\x91v|s\x1c唏\xe3|3\xdf't\xadO\x15\xf6>ST\xdb\x12\xc7Kt?ׁ|\x01\xf3\xd8\x1a\xe7\xf3\xa7_\xc6Q\xd2\xdc\x16\a\x91\xff\n\xba\xfb:\xce\x1a\xc27\xf0\xc2o\xf5\xba\xef\xe2(cmgk;\x00\x1e;\x81\xa5\xbb\xd8\xe7\xddT\xe2\xf7q\x14\xef\xf7ą\xc9썃\xc0\xff\xa0ػO\xadp\xbf\"Ə\xea+?\xc5\xf9x\xccϸ\xe3\x818\xa2\xd4A\xa8\xe5\x10[8\xac-\xfc\x12G%\xe3\u05f8\xc4\xc7\xdf\xf4\xcb#\x8a\xdbG\xa1\x93c\xfa\xed\xf1\xb8\xee;\xa0v\xfcG\\\x18҉\xb8\x86\xb9?\xf5\xb4\x93q\xe4y\u007fe\xbf\xff;.Q\xea\x94j\xe7t\x1c\xa4\xf3\x9f8\xab\xa6g`\xc8gi\xbb\xff\xea\x97\xe7ԛ\xfe\xe3\xb9\xe7\xa9\xdf\v<\\\x84S\\R\xff\xbd\x1c\a%\xb9\xc2߮\x12֯\xc5A5\xae\xc7\xc9\x1an\xc41;pSeu\v>~;\x0e\x96wG\x82YeB\xbe˗\xd0\x1aA\xfe\x84Xy\x01\xfc-\x98\xc0ՅpFa\xfc-\x92\xa0\x94\x8b&\x04 \x8b\xf1\x84\xe2\tĒ\xbb\x12x(\xbe\x04\x0f%\x13\x85\xbb\xe6\xf6u\xe4\x11\xfa\xbby\xd6=\t$\xdb\xf7&`h\xf7%Pƺ\x9f_>\x90 \x84?\x98\x80\xd9=\x94\x90\xa9\x9b\x87\xf1\xf7\x91\x84\x06\xcb\x04f\xa7\x1e\xe3\xe5\x8f'\x14\x04\x9fHp\xe7\xaa'\x13\xa8T\x94J\x88\xe5\x97N0\xa6\xe4$\x90?\x97I\x90\xed\x96M\xd0=\xca%\xc44\xcb'\x10ٟJH\xaa\xfat\x02r{&\x01\xb7z6\x81y\x82\nٛ<\x97 K\xad\x98 \x95\xad\xc4\xdf+'\xb8\x01A\xa2p\xd3~\x86l\xd8R%\xa1\x18\xfcB\x82:z1Q\xb0\x81\\P5\xc1\xcc\xee\xa5\x04\xea\x10/'$K}%\x81:u\xb5\x84\xc0[\xf5\x04UT#!:\xae\x99\xbd\xf3\xab\t\xe0q\xad\x046{M0\xb5|=A\xfc\xaa\r-\xd5\xe18\xea&\x04\xb2\xea%P魟`9\xbaABBqÄnb\a\x156N\xf0\x89\x8c&\t2\x88\xa6\xbc\xbeY\x02\xe1\xa09z\xd3\"\xc1=\x1cZ&\xb8$\xf2\r\xa8\xbbUB\xf3\x8d\xd6\tN\x04\xb4I0\xe8\xb5M\xe8[*\x13(F\xb4O\xc02;\xb0\xe1\x8e\tƀN\t\x98]g\b\xbfK\x02\b\xd0U\xe5\xd3-\x81$\xa7{\x02y{\x8f\x04\xe6^\xde̻\x8b\xc3=(\xa7'\r\xb5W\x82\xa8\xf9V\x9ea9\xfa[\xc3\xfb\xe5\xe4&\xb8\xb0\xb87m\xa2\x0f\x84\xd4\x17\xed\xf7K \xf8\xf7W=\fH\xc0\xf3\a\xea\xb0\x06%\x04k\x06\xe3\xfc!\xf8;4\xc1\xfaٰDv\x06}x\xa2@^\xfe\x9e\xe3H(OqjS.=\xba\x13R\x922\x12\xc0\x17\x13·\x12\xe4\xf1\x1e~\xe9\xe5\xc1DZ\xf9y\b\xa0{\xc1\x84\xa4{!\xd5@8\x01\x1e\x18I\xc8\xde\x1a\xd1\x04\xaa/\xb1\x04\xa9lb\x8b\xce\x1e\xb5uE\x8f\r;{\xdc\x06v=aӳ\x9e\xb4\x89\x0f\xa5l\xb2\x98Ҷ`@\x8e\r\xc6P\x06\xbd,k#\xbb,g\x8b'\x94G/\x9f\xb2\x91l=m\xcbJ\xf6gl\xe5\a\xcfڲ\x88\xb3\x82ͪ\xab\xadD\xa7\xa2M\xac\xa8\xc4aV\xb6\tZ\xcf\xeb\xb1\n\x84\xf9\x02n\xfb\xa2\rK\xa8\x8a۾d+\xe1~\xd9\x06\xbc\xbc\xc2\xfeW\xb3\x11*\xaa\xdb2\x89UC\xc7V\xd3\x16\x16\xf8j\xb6#\xb5\xf4\x96\xafٺ\x8b\x9d\xad\xb1\xb76\xc5W\x87\xf7\xa9k\x83BֳY2\xabo\xa3L\xd1\xc0\xe6\x1cuC\x1b\xf5\x89F\xb6\x14y\x1b\xabZ\x9a\xd8\xe48M\xf5\xa4f6\x90\xbb\xb9\xfe\xdc\u0096\xeaDK\x1b\xa9\xa4\xcd@؊\xe3nm\x03\xc2\xda\xd8\xfa\x0e.[\xa6\x02\xdb\xd9\x1a5\xdb۴\xc1\x0ePYG\x1bu\xacN6\xaaӝmС.vv\x9dzWt\xa9\x9b\x8d\xf0\xdf\xdd\xc6B\x83\x1e\xb6\x18蛶\x90\x87\x9e6'\x11zQpoق\x83\xb9\xb6\x06D\x8a\xa0\x8fJ\xae\xaf\x8dUI\xfdԒ\xfa\xdb\xe0\xbd\x03\xf4\xe3@Jh\x10\xfb3\xd8\xc6\x03BC\xa8\x88\xa16\n#\xc3lz\xdfp\x9b\xbc\xcaa\xc3G\x9d\xb6\xd4\x12]6\x1c\xc6m\x03\x15\r\x1b\xc5\x02\x13\x1a\xb7(\x0f\x0f\x1b\xf3\xdaR\xe7\xf7a\x10~[\x9e\v\v\xd8@\xd7 \\$dK\b\n\xdb\b0\x11\x1e\xa2\xb6\x16$bj\xbaq\x18h\xc2\xceK\x0f\xf2\x82\xa1-\xfc'i\xb3О\x82XӸq\x86\xca\x1f\x01?\x1c\x89\x1fF\xfd_\xb4\xa3a\xdecl\xb0\xaf\xb16\x8b\xad6\xa6\x8b\xc6ۘm\x9f\xa0w\x9bh\x93FM\xb2\x05^&\xdb\xc0\x8e)6aw\xaa\x9a\xc94\xb5\x8b\xe96\x8a\xf83lě\x996\x1e\xa7\x9ce\x83\x03̶\x19\xe9\xe7\xd8|\xfe|\xae\x8d\x9a\xce<\x1bQ|\xbe\x8d\x9a\xea\x02\x1b\xd1a!\u007f[D\xd5/\xb69s\xbd\x84?.\xb5\xb1>f\x99MF\xb7\xdc&J\xae\xb0\xc9\xe9Vb\xf4\xab켰\xb1\x1ac_c#Ʈ\xb5\x11F߶Q1x\xc7\x16L\u007f\xd7榮6\x1eEZg35[o\x83\x90\xbfoK\x82\xb3\xc1.\xd4\xd1\xc8\x1d\x90\x97C\xea\xaf\x1bm\xf0\xa8M\xeċjA\x1f\xe9qs^\xf3V\x9f\x9c\x8fm\xa6\xbb\x9f\xa8\x87~\xaa\xc7\xcf\x00\x1d[8\xe6\xcfUj_@\xf7[m\xc9\xc1\xbe\xb4\x89\xe6\xdb\xd4\u007f\xbe\xb2\xb1*\xf6k[\xd0\xf9\x1b\x1b\x19\xa4-D\xe0;\xe8c;\ro\a%\xbd\xd3\x06\xeaﲱ\x84y7l\xed{[2\x88=\x80\x9a\xbd6\x12\xad\x1fl\x94\x00\xf6AP\xfbmT\x99~\xb45\xb2\xfed3\v\xfb\xd9\xe6\xac\xc1\x01\x9b\x85\xa6\x836\x97\xb0\x1c\xb2\xb1\x97\xc9a\x1bK\xb9~\x01\xe2\xff\n\xeb\xfa\r\xc6{Ė\xc0v\x94\xea\xad\xc7g\x92,\xd3<\x9b\x942q\x85$\xb0幤\x10\xa9\x8aI\xe5ʕ\xd8\xcb\xcaI\x89\x86\xcf\xe3o\x95$\xe2c\x92N\xf6b\x92\xb3\xbfU\x93\xe4r/%\xe1\xb5/'\x914&\xc51\xab\xa9\x94\xab\xeb\xfdj\xa0\x99\x9aIVK_M\x82\x91\xd4J\x8a\x05\xbc\x96\xcc\x03\x83\xd79\xc4\xda\xda\xcd:I\xb8q\xdd$\xea\x8e\xf5\x92\x1a\x84\xeb'\x99?4Hb\x8e\xa1!\x0f\x8d\x92b#\x8d\x93\xb0\xe6&I\x14\x17\x9b&Ŋ\x9b%Q~k\x8e\xfb\xb4H\x8a\v\xb7LҔ\xde\xc0\x88Z%\xc5[['\xe9\xeam\x92\x98\xfen\x9b$\xa8\xb6K2\xa8\xb4\xd7c\x87$\xe6\xd9;R\xbf\x9d\x92\xe2P\x9d\x93\xc0\xf1.I\xf1\xe0\xaeY\tvK\xb2r\xdb=)L\xa8G\x12\xee\xf3\xa6ޥgR\xca\xf0\xbd\x92\x1at\xdf\xd2ss\x93\xe2]\xbd\x93\x88\xf7}\x92\x04\x9a\xbeIzC\xbf$\x89R\u007f\x1aހ\xa4\xb8\xf1@~\x18\x94\x94\xfa\xc0\xe0\xa4Č!0\xfe\xa1IV{\x86%\x81\xd0Ó\xac\x95:\x92\f\x8aI\xc0\x91+\xa9\xcb\\\x93$\x11\x06[3\x93\x04l+\xc9y\xc8$\xe3\x827\x89\b\xed\x83X\xfdI@p\x006\x1dLb\xed[(\xc9L;̛D\xd44\xa2I\x84\xa4X\x12q4\x9e\x84\xc7&\x92\x82*vR\v\x95\xc9$\v(\xa9d\xf6\xa1\xb8t\x12\xcc2\x93d\xce;\"\x89\xdd\x1cG\xb2K\xa3hᣳF1&\x89\x9c|,\xfb?.\x89\a\u007f\xc7\xf3\xa4\tI\x94p'&\x11\xdf'\xb1ߓ\xd56\xa7\xf0\xe3T\xf6mZ\x92\x15\xa9\xe9IF\xaa\x19I\x99D\x9a\xa9^6\vH2;\x89zʜ$\xf70\x98\xab\x83\x9c\x97\x14\x84\x9d\x0f3\\\x00\t-L\xb2\x00\xb2(\tα8)y\xe1\x12X\xcc\xd2$֠,\x83\x9b,כ\xaeP\xfd\xaeL\xcaZ\xd1UIy\xf2su\x12av\x8d\xded-\x9bz\x1b\x8e\xf4N\x92e\xcfw\x93Xu\xff\x1elg\x1d\xfe\xaeOb\x9dk\x92\xf9\xf3\x06t\xe7\x83$\xd2\u038d\x1c馤\xce\xde\u007f\xa8\xbe\xf0\x11lgs\x12\xe9\xd0\xc7I&o\x9f$\xf37\x1a\x9e\xf3)\x8c\xf5\xb3$f\xe2\xb7$A\xbd>\xd7N\u007f\x91$\xc3\xdfJ!\u007f\x89An\xe3\xf0\xbe\xc2}\xbfN\"0\xaaD\xbfM\x92\xed}\x97\xe4D\xf9v\xda\xfa\x0e\x8es'\xb5\xb1+ɒ\xf6n\x02\xc2\xf7I\xe1\xd4{\x92`={\xd56\u007f t\uf8e9\xedO\xa2\x00\xfdcRh\xdbOj\x86?'\xb1P\xf4@R66=\x98D\"q\b\xb0{Xƒ\x17\x1bi\xb6\xbf\xd2N~\x83\x04\x8e@\x8fG\x93xN\xf5\x98\xf6\xfa8\x04\xfe;\xcf\xfbC\xf1\xe9DR\xb8˟I\x92\xa5\x93\n\xf2\u007f\x11\xd6\xfeN\x92\xf0\x9f\"6\x9cN\xb2\"\xf2\x0fP\xe8\x8cb\xe8Yu\xbf\u007f!\xa8s\x1aX\xfe# \x9fO2B\xaa\xa1^$\x80\\\xa2\x85_Nb\xe6\xe2J\x12\xa4\xff*\xbaw\r\xc1\xe6:Fq#\xc9\xfa\xfcM\b\xe4\x16\x10\xeevR2\xf0;R\xc2i\xefL\xe9|W\xbe\x14D\x9c?\xa5\x8eT \x85\xf5\x9d\x05S\xc0\xb7B)\x06\xed\xc2)i\xb4H\x8a\x13\x10ES\x90k\xb1\x14\x18D\xf1\x14R\xc7\x14\xf6\x1fHɍJ\xa6P[\xbd;%\xef*\x92\xcc\x11gܛB\xbd\xe7\xbe\x14\x88\xfc\xfd\xbc\xcf\x03)\x01\xb1\aq\xc2C)\xd8\xc0\xc3),py$\x85gP\x1eM1\xcc<\x96¸\x1fO\t\xb6=\x91\x92\nǓ)1\xcbR)x~\xe9\x94L\x1b\xe6\xa44\xbd*\x93\x02\xf9)\x9b\x12'*\x97\x1d\\y\\\xf1T\x8aR\u007f:\xc5L\xf6\x99\x14\x92\x93gS\x80\xc4\n)\xc0\xc4s)\xbaEE\n\xa2R\n\xa0U\x99?>\x9f\x02\bUI\x91\x80\xbf\x80N\xbd\x98\x02\x03\xa8\x9aBI\xe8\xa5\x14\x9d\xf9唬z|%E0\xae\x96*\x9cG\xd9\x1cC\x1c9\xd5S:]W#\x85T\xa4f\x8a&\xf1j\n\xec\xa6\x16[y-%Ŷ\xd7S\xa2\xc4\xda)\xec|N9ԅB\xeaQ\x96\xf5SZ!h\x90B\xe6\xdf0E\xbcj\x94\x92٥\xc6)\x02h\x93\x147fhʋ\x9a\xa5\x98\xf56O\xa1\x00Ղ\x87\x96)\xac\xa2z#%\x06\xd5*\xc5\xec\xadu\n\xa8\xd3&\x05:\xd7V%\xd3.\x85\xac\xab}\nx\xd2!\x85\xc8\xdb1\x05\xce\xdd)%a\xb63\xac\xa1K\niaWJ\xb9[*/\xd0wOq~\xa8G\n4\xeb\xcd\x14jZ=S\x98\x00\ue552|\xfa\xad\x94\xf8|n\n\x98՛\xf2\xee\x93b\x15\xbd/\xfb\xda/%5\xad\xfe)A\x9c\x01)\x89\xe4\x03\xd9Р\x14\xd9\xe9\xe0\x94\xa4aCR\xf4ġ)Y\xdf2,E.2<%.\xe7H\xb1\xb6\xe1\xe4 \\)8\xb8;%1\xcd\xd0q\x9a\xfc\xcdJ\x01\xf7<\xea\x11^HȗB)ҟb1*\x00\xad\x04S\xa4\n!\xdc0\x9c\xe2\xa4T\x84\x92\x8d\xaa=\xc7\xd8j\x1c\xcd$\xd0\x19;\x05\x80M\xc2%R\xfc\x90\x86\x01d\xa8\xf4\x11\x14\xe1H~\x1a\x85\x9b\x8dNI\xba2&\xa5\xa4cl\x8a\x13C\xe3\xe8l\xe3S\x02\t\x13R\xdc\rrb\xd6\x0f&\xa5\x80n\x93Sd\x1dS\xb2\xb68U\x8dpZJ\xb8\xe0\xf4\x14\x83Ό\x94$\xf93SR&\x98\x95\"2\xcfN\x81T́e\xceM1\xf1\x98G\x11\xcd\xd7V\x16\xd0\x1a\x17\xa68\u05fc(\x05\x00[\x9c\x92p\xb0\x84\xd7/\xa5[-SQ/Oa\xb5\xe0\n\x15\xe0ʔ\xf0\xd3U)\xa4\xaa\xabi\xb6kR\xc0\xfb\xb5y\xa2\x90T1\x85\xa8\xf3\x0e\x9by\x97\xa7\xbc\x97\xc2c\xa2\xebRX\"\xb6\x9e\xd2z?\xc5%\x19\x1bRL\x9e>\xa0\xf5n\x84\x99mR`\xfb0\x85\xfc\xe5#\xe8\u007fs\n\x93\x14\x1f\xab\x93\u007f\x92b\xc0\xfb4%\x85\x95\xcfRR\"ܒb$\xf8<\x85\xac\xed\v\x05\x96\xadjc_\xa2\x9dm\xb0\xe7\xaft\x88_\xc3\\\xbf\xa1A\u007fK\x91|\x97b\xa5u{\x8a\xa1d\a`jg\n\xc1iW\na`w\x8a\x11\xf9\xfb\x14ˡ{RZhۛB\x99\xef\x87\x14\xc3\xe2>\x9a\xf0~\xb8\xfe\x8f\xfa\xe5O\x00\xe7\x9f\xe1\x8e\a`\x12\aэC\xd4\xc2a \xcb/\xf8\xe1ה$\xb0\xbf\xd1X\x8f\xe8@\x8e\x02\x9f\x8f\xa5Pl>\x9eB\xe0\xfd]}\xf8\x0f*\xe4D\n\xc10\xc5\xf4\xe7\xa4\n\xf4/\x9a\xc0\xdfTө\x14R\xb6\xd3)Į\u007f\xb2#8\xa30s\x96\x9a\xfa7\x05\xf2p\x8e\xc6\xfe\x1f\xc7s\x9e\x12\xbe@\xaf\xb9\xc8//\xa1ߗ\xa9\xfc+\x04\xa9\xabp\x98kD\xd1\xebT\xe1\r\xf5\xb9\x9b\xaa\xca[)\xa4u\xb7S\xc8/\xeeH#ۺ3-`\x91/\rh\xc9\xcfC\x81\xb4(\xb0`\x9aK\\\n\xa5\xb1\xddkZdY$\x8d1\x14M\xb3hP,\xcd\a<\xd20\xb9\xbb\xd2\xe2\xd4%Ұƒiqӻ\xd3\xfa(\xf2=i}\xbe#-\xf2\xba/\xafi\xa9\\\u070fF\x1fȞ\xf4`\x1a\xe3{(\x8db\xc1\xc3i\x01\x84G\xd2܉\xf3Ѵ\xa8\xe91m\xe6q\xdcꉴ\xb0\xce'\xd3\xf4\xbbRz,\x9dF\xb0\xcaI\xabw\x97I\xd3Z˦\tz\xe5\xd2\x04\xc6\xf2i\xc8\xfd\xa94\x1e\xbcz:M\x80{&-\x10\xfel\x1aڭ\x90\x86\x1e\x9fK\x8baVL\xc30+\xa5aÕ\xf9\xe9y\f\xb3J\x9a\xc8\xfbB\xbaH\x8b\\S\x16K漘\x86)U\xe5\xe1\xa54b\xc8\xcbifW\xaf\xa4aR\xd5\u0603\xeal\xb1F\x9apR3\xcdu\xaf\xaf\xa6\xf1>\x10\xdc\xe05\xf4\xe0u6V[O\xa8\x93\xe6\x1ev8\xa3\x1e\x1b\xa9\x0fe5H\xd3\xeb\x1a\xa6\xf1Hb#ʵ1/o\x92f\xd2\xd34M+o\x06\xc96O\x13A[\xa4QEi\x99F\x11\uf374\x84\xf8V\xf8\xdb\x1aM\xb7I\xe3\x05\x17m\xf1\xa1]Z\xa0\xbe\xbd6\xd4!\xcd\xd8\xdf1\r\x93섫:\xa7\xc5㺤\xc1q\xba\xa6%\\u\xc3W\xdd\xf1\xb7\a\xday\x13\xa7\xf6\x84R{\xa5\x11\x01\xdeJ3N\xe7Bǽ\xd3(\f\xf5I#\xda\xf6M\x83\x9c\xf4S\x81\xf5\xd7\xe3\x00\x8a``\x1a\xf3\xbf\x83\xd2\x12\\\x06\xa7\xe1%C\xd2Z\x98\x1e\x9a\x06\xc9\x1c\x96&\xe4\f\x87\xec\x1c\xfcҙ\xd6z\xa6+\r:\xee\xa6،\xb4\xa0\x80\x99\x06=\xb3\xd2\xe0x\x1et՛\xc6$\x86/-\t\xb0?M\xf4\x0e\xa4\xe1\xc0\xc14\xc9H(-ip8\xcd\xc2i\x1aq3\x9af\xc9?\xc6\xfbġ\x80DZ\x18\x93\x9d\u0588\x96Ls\xfa+\x95\xce#\x0e鴤\xb9\x994\xea\xd8#T\xcc#Ө\x1e\x8e\xe2a4]wL\x9a\xf3\xb9c\xd3\x12\xa1\xc6Ѷ\xc7\xf30!\r\xa67\x11\xde=)\x8d9\xa8\xc9t\x96)\xf8nj\x9aդiiF\xc0\xe9i\xf0\x8a\x19\x1c\xd1\xcc4\xcab\xb3p\xea\xec\xb42\xce9ia#s\xd3\x12\x8e祥t9?ͪւ4H\xccB\x1e\x16\xa59\xe9\xb68\xcdգK\xd2\xc0\xa8\xa5\xb0\x88e\xec\xcc\xf24\xe2\xc2\n|\xb7\x92\xa3]\x95\x06O\\\x9dַF*\x00\xacMK z;\x9d\xbfC\xbf\x9cw\xa8\xbew\xd3\xe0`\xef\xa51\xf9\xb4.ͬb=\x9by\x9f?nHK*\xfbA\x1a\f~#Lk\x13\xdc\xecC\xdc\xf3#\xf6c3\x9b\xf88\x8dy\x94O\xd22a\xf6)\xd0\xe83\xbd\xfd\x964қ\xcfՌ\xbe\xa0\xb7lMs\xd2\xec˴\xc4\xfaml\xec+\x00\xca״\x9bo\xd2(j}\xab`\xf3\x1dNܞF)m\a>\xecT\xb4څn\xedΚ\xe4\xf7heO\x1a\x0f\x9a\xed\x85M\xfd\x00\x99\xef\xa3r\xf6\xf3\xf0\xa3\x02\xf3O\x18\xce\xcfi\xae\x1b=\x90\x96%]\aӘE:Į\x1f\x86\xd1\xfd\xa2\xe3\xf9U\\Ǒ\xf3\x9b:\xdd\x11\xdc\xfc(N9\xa6\x82<\x0eW\xf9=O\x80\xb99\u007fp4'p\u009f\xaa\uf4c0\xf6\xbf\xd2\x1a\xde\xfeN#@\x9fJ#C=\xadj\xff\x87\xc8w&\x8d4\xe8l\xba@\xa3\xdey\xa1\x8f_\x9eK\xa3d\xf3_\x1a\xc4\xf9<\xb0\xe5\x02\xac\xedb\x9a\xd5\xfcK\x1c\xc2e*\xfcJ\x9au\xf6\xabi\xd2\xd0k\xbc\xfez\x9a\xbb\x8c\xdfH\xa3\xe4\u007f3\x8d]On\x89\x1fݦ\xe2\xef\xc8\x00\x14\xee\xcc0>\xe6\xcb\x10\x95\xf3g\xc8\v\vdHy\nfD\x88\x852\xfaZ\x8f\f\x00\xa0HF\xe2eQ\xfcT,#b*\x9ea\xb2|WF\\\xaeD\x06\xe0W2\xa3\x9b\xb6f`w\xf7d`\xd9\xf7f\xa0\xe9\xfb2\xac\x92f\xf4\x99\x8d\f3\x94\a3\xec\xf8C\x19\xe8\xf2\xe1\f\n\x80\x8fd \x9cG3\xacz?\x96A\xee\xf0xFl\xf7\x89\x8c\x84\x85'3\"\xa3R\xf8[:\x83\xd9\xc3\f<\xbdL\x06v\\6C(*\x97шX>#\xa2}*#\x00\xf9t\x06U\xf6g0\x94g3\x98\xa3\xad\x90aN\xff\\\x06U\xe3\x8a\x19T\xed+e\x80v\x953\x90\xe1\xf3\xb8Q\x95\f\xe1\xe6\x05\xf6\xeaŌ\xb8J\xd5\f\xc2\xdaK\x19\xbc\x16\xe5\xe5\x8c\x18\xc9+*\x8fj\x19\x89\xf8\xd53\fA52\x84\xb2\x9a\x19\x80\u05eb\x19q\xeaZ\x19>\x86\xf8\x1a\x9by=\xa3k\xf7y\x9e\xe7\xbe?\xe3\x9a\xef\xeb\xfa\x8c;\anm\x01$~a\x8e\xe4\x85\x16\xe5\b\x94ZL\xe1YB\xab\xb1T\xfb\xbf,\x87!\xc0\xf2\x1c\xba\xd1\x159\xe2NVB]W\xa1+\xabs4\x1f\x9a\x03P\xb9\x96\x8c[Gʬ\xcfQo\xbf!\apac\x92q\x9brtG\xf5\xcf\x1c\xe6\xe6\x1c:\x90-Tҭ\xec\xc5/\xec\xfa6\x90g;\xca_\xa9\x85;r\x10\xf4\xfcF9\xde\t\xee\xee\xcaa8\xb9\x1bµ\x87\xd4؛C\x8c\xf9{Nᶩ\xc3S\x87\xa5\x8fJOٗ\xa3ɼ?r\xe8\xf5\xf6\xe7(x:\x90#\xae\xe8`\x0e\x12+\x87 E\x87\xc9\xf1#9\x82\x18\x8e\xb2_\xc7r\x98\x9d<\xae\xd7\x13\xda\xfb\x93\xa0Ω\x1c8\xf5\xd39L)\xfe\x99\x83t\xf3_9\xf0gg\xd0ճ\x10\xa9s9\x9a\xcc?\x9f\xd4\xf9\v4\x87\x17s\xb0|\xe0R\x0e`\xd4e^\xaePV\xae\x92\x92\xd7\xd4\f]צo\xe4p\xbd\xcd\xcd\x1c8\xc1\xbfu\xd8\xff\xe4\xc0\xf1\xff\x9bT\xe9[9\b\xb2nchw()ws\x14+\xdc\xcba4r\x1f\x04|@\xc3\xf1P+~\x04\xa9\xfc/\x87\xf31\x8fs$\xc7\xf1D;\xf1\x14.$\x97A4-\xb7Ai\x99\xc7\x00_\x9f\xd7\x00\xb9\xc8g\x80@\xe47P\x9c\v\x18\x88d\v\x1a\xa4\xa9B\x06\x99\x04+l\xa0\x05,b\xa0V>c\x80\xd9)\x8a\x1f\x9f5\xa07\xc5\f\xe4Xq~|\u0380\xad\x1a\x06*j\t\x03E\xb1\xa4\x81V\xe8\x05\x03\"\x82\x17\r\xb4\x84\xa5\f\x88__2p\xf5Oi\x03\xcco\x19\x03\x16%\xbfl\x10\xad,k@\x1a\xe8\x15\x03·W\r\x88{\xca\xf1\xc6\xf2\x06\xb1i)\x06\xf1\x9c\x15\xd0\xed\x8a\x06\xa6\x9a_çJ\x06\bJe\x03\x82\xd0\xd7\r\xa2To\x18D\xf1\xab\x18Ȍ\xaa\x1cЛ\x06Ɠ\xd5\xf0Xu\xfdT\xc3@0\xf1\x96A6(\xd64pf\xf7m\x83j\xf1;\x06\x01y\xb5\f\x9co\xae\xadd|\xd7\x00\x0e\xd61\x88P\xd55\xc0o\xbdg\x10!\xacg\xa0\xa7\xac\x8f\x1e4\xe0O\r\rЉF\x06\b\xd4\xfb\x1cWc\xf6\xea\x03\x03|~\x13\x12\xb6\xa9A%\xf2C\x03\x96&43`\xa9Xs\x83\xcc\xef\xb40 \xc3\xd4Ҡ\xca\xfd\x91A\xb4\xa6\x95A\x12=\xad\r\xe2\tې\x8emѯv\x06\x82\xb0\xf6\x068\xb4\x0e\x06\xacP\xe8h\xa0-\xee\xc4!t6\x10\xd9vQ!\xe8j\x00\xd4\xeaf \x88\xean`\xec\xddC\xa9Փ}\xef\xa5?\xf76H0\xd1\xc7 6\xf5c\x03=\xa4\x013۟\x1aT\xf2\xfb\xf2\xeb~\xfc\xba\xbf\x81\xdb\xd6R\r\xccU\f\x00\xd1\x06\x1aD\xc6\a\xa1L3H\xde\xff3\x03\xb0\xcb`\x03\xf6h\x18\xb8(=݀\x85LCq\xdf0\x03\xf5\xe3s\x03-\xe5p\x83\xf8\xc5\x11\x06\xa4\xfc3\f\x88a2\rj\xedF\xb2ۣ\f2\xdd4:I\xbf,\x03\xd0]\xb6!o\x97\xf4\x941\xc9o\xc7&\xff\x19G\x96\x8c\x87\xacO\xe0\x87/\f\x88\x11\xbe4\xc0\x1e}e\xc0\x8a\x9c\xaf\xa9c\xdf\x18\x90\x01\xfb\xd6\x00,7Q\xe9<\xc9\x00\x8c\xf0\x9d*\xded\x83\x98\xfe\xef\rL\xe9\xff`\x80m\xc9a\xad\x06\x03\xf0\xb0рD\x8fI9c6`\xfd\xaeŀP\xdaj\xc0\xde\"\x9b\x01\xf9\x0e\xbb\x01\x93\xca\x0e\x83\xb8@\xa7\x81\xf0\xdae@\xfa\xcam\x10\xbf\xee\x81~y\xc9U\x9f\x01sK~\x03\xf1r\x00\x84\f\x1a$V\r\x19$\\\n\x1b\xc4=E\f\x12~DA\xd0\x18\t\x1a瀧\xf02\x95\xfd\xfd\xd1\x00\v;\r\xd5\xfcd\x80K\x98\xce\xce\xcf\x00\xa5g\x1a0;0K\xa5e\xb6\x81fk\x0e\x98>׀\xfc\xdc<60\x1f\"\xbb \xf1X\">D_\x16\x19x\xd8\xd5b\xf4c\t\x1aYj`ph\x90U\x90\xcbI\xfd\x15\x06\xf5m+I\xbeU\x06\x1c\x92\xbb\x1aʱ\x86\x8c_\v\x1dYG\x93\xb8\xde \xb9\xd4\rT\xbf\x8d\x06\xb8\x87M\x06X\xf7\x9f\r\x98\x8e\xd9l@ز\xc5P\xa4\xad\x9c~;$}xF\xcaV\xe1簄o4$W>m3\xd0lo\xa7&\xfdj\x00\xea\xdea\xc0N\xc9ߔ\xc3;I\xf9]\xec\xdbn\u07b3Ǡ\x96\u007f/L\xd1\xefj]\xf6\x19\x18\xcf\xfc\x91\xa0k\x82l\xfb\r\x125\x1e\xc0\xc0\x0fB\x11\x0e)\xe3\x0e\x1b\xe0\x85\x8f\xd0\xf2\x1d5\x00\xac\x1d3\x88o;\x8e\xdbO@\x89N\xfe\xaf\xab\xa7\f\x8cTN\x1b0\xf7\xf3'\x9f\xf8\v\xad\x9fQ\xb3\u007fV\xaf\xe7@\xdc\xf3j\xd3/\x18\xb0\x80\xf8\xa2\xb2\xee\x12$\xed2yvŀp\xe3\xaaJ\xfa5\x15\xd8\xebd\xd2\r\x83.V\xb9i`*\xfbo\x03\u0588\xfd\xa3\xda\xfc\xafA\xe3\x84[\xc9\x1bo\xd3\xd8\xdd\xe1\xe5\xae\x01>\xf9\x9e\xd6~\x9f\xcc{`\x00\x0eyH\x9b\xf6\bV\xf6?\xc8\xcec\xca\xe6\x13\x88\xfdS(m.#Nd5\xe2\x87&A%\x1f\x9bd\x8d\xe0'\x94\x8cO9о&\xc9W\xf43\xc1\xb5\xf47q. \x15$\x19@\xc6\x0fD\x93\x83L\x1a\v\xa7\x81h\x9f\x99`R\x06S؆\xa8\x9c\xa6\xf3ۡ\xa6|\x89x2e\x18\u007f\xfc\x9c\x14\x1cn\x82\u058ePBe\x98\x00\xb32)\x99#M\xd0\xfaQ&\xac\xeb\x1bmRg\x9fe\x82Q\xccV~\x8d1\x11\xbb\x8e51\x0e\x1eg\x12\xeb6^\xd91\xc1D\xd3\xfc\x85H藬\xfe+\xea\xd8\xd7I\x9a|c\x02\xec\xfc\xd6$\x11\xc8D\x13\xd3\v\x93Lt$\xdfQF&\x9b\x90\xf0\xf8\x9e\xf4\xf9\xc1\xa4\xa7\x88昰\xbd\xc6`\x92\f\xa8\xd1$\xa6\xd1db:\xd2\f=\xb1P|\xadT/\x1b\xc4\xcenbN\xd6!}r&\xabr\xc9'7i\xe511E\xee5\xc1(\xfaL\x82\n\xfc&\xe2\x92\x00\x15#hb|\x1e2q\xcdC\xd8\x04\xcf\x141\U00048ae8I\x96\a\xc6Х\xb8*\xd8\x14\x93\x065SI\xe0\x1fU[\xa6\xa1\xfb?\xa1\x9cn\xc2\xf2\x88\x19\xaa\xb83M\x02ff\x91p\xb3MLq\xcd1q5\xe8\\U\x8fy\xfay\xbeI\\\xe4\x02S\xa1ީ\xa3夸\x94\x85&\x8d\x1b\x16\x99\x18\xdd,f\xc3KL\x92\nY\nY\\fbnr\xb9vr\x85\thl\xa5\x89S\x0e\xabL\xccz\xac6!\xd6XCv\xac5\xc9\xd9z\xeb \x84\xebM\x12\xc8n\xa0e٨\x86o\x93I\xf2\xb0?\x9bx\xd4\xc5f%\xdd\x16\xb5-[M\xccq\xfc\x02\x1em\x83y\xdbn\x02\xca\xf9\xd5\xc4\x03\x19vP\xca~\x83\xd2\xed4q\xfed\x97\x89~uw\xd2\x10\xec1I\x06n\xaf\t\xfb6~7\x11v\xef31\x8d\xf6\x87Iç\xfd\xfa\xd8\x01J\xcfA\x13\x92o\x87L\x98&:\xacr|\xc4D\\u\xd4D\xd0~\xccDPt\x1c,\xcd,\x06\xf3'3|\xf9t\xfc4\x83\xaa4\xd3L\x9c=\x8b\xaa<[\xfb6G\xf92\xd7,fl\x9e\x19hm\xbe\x19\bj\x01:\xb1\x90\x1f\x16\xa1\xb2ŬyIR\u007f\x96\x92\xe0ˠ\x91\xcb\xcd\xe2\x89V\x98\x05]\xaf4\vR^\x05\xcdY-$[c\x86/YkVH\xb3\xceL\xf7\xbd\xdeLӻ\x81\xaa\xb4\xd1L\xf0\xbc\x89z\xf2sR\xa56\x9b\x05\xb4n1\v\x88\xdbj&p\xfc\xc5,\xb8p\x1bua{\xb2\xe2_\xa9\";`\xf5~3\xd3\xff\xef4\x8bW\xd9E\x13\xbcی\x97Z\x99ŷ\xef5\x13\x8c\xfen\x16\x10\xba\x0f#\xfe\x03\xe5~\xb3\u009e\x03\x94\x98\x83l\xe7\x90\x19P\xec0?\x1d!q\x8f\x92\f\xc7̊^\x8e\x9b\xb9\xdcF\x85\xec$\xf5\xe1\x94\x19X鴙{\xf5\xcd\x1a*\x9a9\xb7H2\x9fE\xdb\xe7\x92\xc3>o\x06\xb2\xbc`Vdy\xd1\flz\xc9\xcc`\x11佢zr\x95}\xb9f\x16\x90t\x1dzqC\r\xc4M|\xf7\xb7\x19\xc0\xe9\x1f3\xd0ٿ\xec\xf3\xad\xe40o\x9b\t\x91\xee(c\xeeB\xbf\xef\xa9\x1d\xbf\xcf\x11= \x05\x1f\x9a\xe1\xfb\x1eA\x10\xffS\xd3\xfb\xd8\f\xfc\xf3\xc4,\xc8\xe9)5#\x97E\xba\x91\xdbBl\x95\xc7Bz\xe4\xb5\x10\x02\xe5\xb3PQ\xf2[\x14\x86\x14\xb0\x10\xf5\x14\xb4\xc0*\x15\xb2\xc0V\x15\xd6NJX\xf0N\x0e\v\\mQ\v\xd5\xe8Y\v`G1\x8b\xba\xce\xe2\x16\x9a\x82\xe7,p`\xcf[\xe0\tKX\xc4x\x94\xb4\xa0S/X\x12\xf2\xf8\"zV\xcaB\xe3\xf0\x92\xf6\xa4\xb4E\x80D\x19\x8b`\x85\x97-P\xb0\xb2\x16\xbc*قE7\x16\u009ar\x16!|y\x8b\xf8\xb3\x14\v\x95\xb4\x82E\x04\xae\"\x9b}\xcd\x02KP\xc9B\xa7[\xd9\x02iy\xddBk\xf7\x06*\xabb\x81{\xaaj\x81\vz\xd3\x02;PM\xbb_\xddB\xafH\n\xbce\x81e\xafi!;߶\xc0\x92\xbcc\x11C_\xcb\x02M\xa9\xcd\u07be\xabMԱ\xd0d\xd4U2\xbdg\x11\xfd\xa9\xa7\xbfַ\xd0\x184\xb0`\rICV\xd1H\xbf}\xdf\x02/\xd8X?~`\x11W\xd7\x04eS\v\x8cև\x16N\x8f7\xe3\x9d\xcd-\"\a-,L\x02\xb6\xb4`\xf1\xdeG\x16\xb5\x11\xad,bZZ\x93\x04m,b`\xdbZ\x98Zjg\xc1\x8a\x81\xf6\x16Q\xbe\x0e\x16\xe4\x1e;Z\b\xd1:Yh\x18:[\x10\x9ft\xe1\xa5+\x87ٍ\x97\ueb34\x87\x05Ɍ\x9e\x16Ht/\vB\xeaސ\x96>\xfc\xf01>|\xa2\xc4\xfd\xd4\"\xc1e_\vv7\xf6\x13i\xe8o\x91\x1cP\xaaE\xd5l\x80\x85\xd6x\xa0>0Ȃ|\u007f\x9a\x05\xda\xf8\x99E,\xc7`\vva\x80,\xe9\x16\xccC\x0f\xb5\xc0S\r\x83h}n\x81\xc6\f\xb7pK\xa2\x05`)\x03\xb7gZ\xc4я\xb4`\xf5\xc4(mk4\xebȂ\xb8e[\xb8\\g\x8c\x05\x19\x8b\xb1\xe8\xfe8\x92`\xbc\x05I\xeb\t\x16N\x06~A\x1e|i\x11\a\xfc\x95E\"\x8d\xaf\xf1\xff7\x16ؙo\xf1\xd5D\v\x94~\x92j\xdew\x10\xdd\xc9\x16,\xb5\xb1`\xde\xe1\a\xedG\x8e\x05\x93\x13\x06\v\x12\xa6(M\xb8\xdb̆,\x16\xa4@\xad`\xa4\xcd\"\x99);\xf8\xe7\xc0\xb0\x9d\x1c\xaf\xcb\xc2\xd9\t7\xef\xf6\xa0G^\x8c\xde'\x04\xf7[\xc4W\x04Pq\x90\xec\vQ\xd6\xc3ڏ\b\x852j\xc1\x84F\xccBC\x1e\xb7\x10\x9fN\x01\xf5\xa7Z0\xd5\xf6\xa3\x85)\xaei\x16Y\xe7\xf1\x13\x885\xdd¥\xa73(b3-X\xad>\x8b\xf2;ۂT\xd4\x1c\xb68\xd7B$9\xcf\"\xd0s>\xa9\xbc\xc0\"\xb1\xf6B2q\x11\xe5l1ƹ\x046b)~_f\x81\xf1^\xaeva\x85\x85\x90a\xa5\x05\v\xc7VY\x90\xf2^mQ(\xb6Ƣ\xb6v\xad\x05\xa6r\x9d\x05\vCף\xc3\x1b,\x00\xe6\x1bI\xb0M \xfc\xcfhp\xb3E\x12s[,p\xbd[)\xe4\xbfP\x14\xb7i\xc3\xdbѧ_I\xfb\x1d\xb0N\xbf\x89\xcdHO\xd9i!\x96\xdb\xc5\av[\xb89k\x8fJ\xf6^\v\xf1\xd4\xef\x16\x9e\xeb\xa6d\xfe\xc3\x02o\xbc\x9f2y\x80\x97\x83\x16d\xf7\x0e\xf1\xb7\xc3\x16\x8d\xb6\x8eh\x95G-\xf4C\xc7,\x98\x138n\x01\x929\x01\x19;\xa9f\xe8\x94%\x99/\xb50Y\xfb\xa7\x05\xf3t\u007fY\xb8\x8b\xfe\x8c*\xffY\x12\xf0\x9c\xf6\xf2<\xfd\xc1\x050\xfd\"\xb9v\xc9\xc2H\xe3\xb2^\xaf\x90oW-\x82S\xaeYt\x95\xd0u\x98\xa6\x1b4\xb57-\x8a\x11\xfe\xb6ps\xd5?\x16̄\xfdK\x8d\xbae\xc1۔n\xb3\xffw\xd4\xfeܵp\xb9\xd6=T|?\xc9\xcb\a\x16콰(J\u007f\x84\xae\xfdG\x95{l\xc1\x19\x8fO OO\xd5V\xe6\xb2\xc2\xf9\xe4\xb6b6%\x8f\x95\x04\xc9k\xd5\n\xf2Y\xd1\xfd\xfcV\x02\xe1\x02V\xc6S\x05\xad\xe8a!+\x83\x8f\xc2V\x8c\xbd\x88\x15\xb4}\xc6\n+X\xd4\xca\x03Q\xad\x84rŬ\x90\xf8\xe2Vr\xf69+\xc6\xfe\xbc\x15\x89\xba\x12V\x12\xb8\xa4\x95L{\xc1*\x12\xf6\xa2U\xa8T\xca\n\x03\xfc\x12k-\xcdZ\xcbXuO\xa2\x95ֽ,\xebyE\x9f\u007f\xd5\n\xf5,g\xa5ܔ\xb7\n\x19R\xacT\xd2\nV\xeaeE+\xd4\xf45\xabУ\x92\xf6\xa02\t\xf1\xbaU9\xf5\x86\x15\xaaY\x85t\xa8j\xe5&\f\x8e\xb7\x9a\x15\xda[\xddJ\xf5\xaaa\x05\x99߲B9kZ\xa9\xbeo[E#߱Rdja`\xb5\xadP\xdcw\xadP\xb4:Vhk]\xab\xaa\xe1{V\xe8g=+T\xae\xbe\x15J\xd9\xc0*\x9a\xd7Њh\xd1\n\x1dz\x9f}jl\x85z}`\x85\x066\xb1\x8a\xca5\xb5B+?\xb4b\a\x86\x12\xa59~ja\x85Ƶ$\xfd?\xb2ByZ)\xa1Z[!dm\xacХ\xb6 [;p\xa1\xbd\x15\vQɋ\x8eV\u0557NVQ\xa3\xce\x18T\x17\xab\xbe\t\xd9J\xa5\xe9f\x85\x0eu'\xadz\xb0\xe6\x9eV\x8ao/\x15\xa8\xdeh\xa2OR\xdc>\xb6BD?\x01K>%\xc7\xfbR\xaa\xfaQ\xe4\xfa\xabȥ\xaaX\rPy\x1aH\x01\x18d\x85\xb9J\xb3\xe2\x95T\x1c\xc6`+\xb2*C\xac\xaaf\xe9\xf8q\xa8UQ\xf10P\xf6\xf3\xe4\xc7\xe1V \x9e\x11V`\x90\f+\x17-fZ\x810G\xf22\xca*^f\xb4\x15\xf35Y\x18B\xb6\x95\x88}\f\xfb1\xd6*\xe8b\x9cvr\xbcU\x17\xa2O\xb0\"\xd7\xf8\x85\nۗV\x81\xfc_Y\xe1R\xbe\xe6o\xdfp\x04\xdf⧉\xaa\x8f\x93\xf4\xfa\x9d\x15\xb0r\xb2U\xdc\xd4\xf7V\xa6\a~\xb0\x8aoαJ\x02\xc0`%\xc02R\bMV\xec\xb60[\x05\x1aX\xac@\xe2V6`\xb3½٭\b\x1c\x1cVdT\x9ch\xd5ee\n\xd7mŤ\xafNJ%#^\x8e\xccg\xc5\xf4\xbaߊ7!\x83\x94A\x1d{\xc8*X3lE\\\x19A\x1f\xa3*\xf71+v\xecǕ\x9cS\xac\xcc/N\xb5\xe2H\x90\x1f!\xa7\xd3\xd0˟\xac\x04\xae\xd3)\x993 \xb43\xad\x922\x9a\x85\x1bf\xb3\xffs\xac\n\xad\xe7Z\t?\xe7\xe9u\xbe\x15 w\x81\x15\x89\x85\x85xr\x11\xad\xc6b\x8a\xd2\x12^\x96Z%P[f\x955B˭\xb0\xb5+\xac\x92\xf0Zi\x95Xa\x95\x15k\xc6W\x93;k\xc0\xe5\xb5ʇu:\xac\xf5Vƅ\x1b\xa8\x8a\x1b\xad\xb2[r\x13\x89\xfe3*\xde\fA\xd8¯\xb6Z5#\xf6\x8b\x15\x11\xed6+6;n\x87V\xffj\xe5\x11\x8a;\xac\xba!Ê\xd5U;\xad\x82\nw\x91\xf1\xbbѿ=|z/\x15\xffw\xf0l\x9f\x15\x8b\xa7\xfe\x10\xaa\xa5\xa6\xec'\xfb\x0f\x80\a\a\xf9\xec!\xf6\xf10\x06rĊ\xf9\x92\xa3\xb8ᘊ\xe9q\xab\x00\xc0\x13V\x01O'\xf1\xcb)\b\xfai+N\t\xfb\x13\xdd\xfc\v\x86\xe0\fm\xd4Y\x15\xe4sV\xba\xf3\xf3\x94\x98\vl\xfebR\xad/Y\x91\xed\xbf\xcc\xcf\xe9)Wh\xf1\xae&\xd5\xe2\x9a\x15\xbb\xa5\xae[\x15\xe8\xde \x8boB,\xfe\xb6rb\xe1\x1f\xf6\xff_\x8e\xfa\x96\xca\xe8m\x1a\xf1;ʐ\xbbV\xc9\xd4\xdcSQ\xb8\x0f\xc3\xf4@;\xf9\x90\x9d{\x84\x01\xfc\x87\xf1=\xc6\xffOh՞Z\xe5\\\x88\\6\xe8En\x1b\x93LylX{\x99\xd7\xc6\xfcf>\x9b\x90(\xbf\r\xfd+`\xc3Z\xa3\x826\x84~\x85l\xa8\xa5\xb0\x8d\x93\x14El\x9c\xfdy\xc6F\xd2\x14\xb51\x1b\xf3\xac\x8d}+f\x83H\x16\xb7I\x87\x9f\xb3\xb1\xfb\xcf\xdbDZJ\xd8\xe4L\x8a\x926\x86\x856Ʊ/ڠ\xbd\xa5l\xd2\xe3\x97ث\xd26\x19D\x19\x94/ې\xc9(k\xc3\xda\x1a\x1b\xb7\x1b\xbfjcN\xbc\x1cn)\xcfn\xa7\xd8\xe0\x89+\xd8\x18\xe9W\xb4\x89\x86\xbc\x86\x81U\xb2\x89JT\xb6a\xbb\xcc\xebh\xea\r\x9b(z\x15\x1b\x91\u007fU\x1b_Ϩ\x1f\xabٸZ\xb9\xba\r\xbc\xa9a\xd3\x04\xc1[6n#\xa9\xc9\xef߶\xe1@7\x1b\xe8_\xcb\x06\xbd\xaam\xe3J\xd7w\x95Nul\x9aj\xafk\x13s\xf6\x9e\rf\xb8\x9e\x8d\nWߦ'07PJ5\xb4\xc1n5\xb2Ѡ\xbc\x8f\x016\xb6\x89l\u007f\x80A4\xb1A\xea\x9b\xda\xf4`p\x1b\xf6:4\xb3!E\xd0\x1ccnaCڢ\xa5\r\x1bI?Қ[ٰ\x9c\xb3\xb5\r\xdb\x04\xdb\xd8\xc4µ\x05\x97\xda\xd9T}\xdb\xdbhe;\xe80;\xa2\xbaN\xa0Wg\xb2\xa6\x8b\r\xf1sW\x1b\x96\xb3u\xd3\a\xba\xdbD {\xd8t\x1dVO0\xab\x97\x8dP\xac7(\xddGG\xf4\xb1\r\x1a\xf6\x89\r\xe6\xf6St\xa3\xaf\rz\xd2\x0f\r\xf5'mS\x93\x9d\x1a\x00\xba\rd\xbb\x83\x94Ai6\xe6H?\xb3Q\x89\x06\xdb`\x15\x87\xd8hk\xd2mX\xf83\x94\x14\x18\x06\"~nc\x14<\x99ԏ\x91Iv\x8d\";GC~\xb20\x84l0`\x8c\x8d/:\xe6e\x9c\rہǃ\x90\x13T\a\xbe\xd0\xeb\x976I\x19|\xa5t\xf8\x9a5~\x93h\x1f\xdb\xf4m\x8a\x8b&\xb2\xef\x93P\xc5w\xa0\xe4d\x94\xdf\xdb8\xb9\x88\xee\xe7\xb0\u007f\x06\xad\xda\xc8\xcaL\xaa}f\x90\xceb\x93ē\xd5\x06\xa3lSZ\xd8\xd9C\x87\r\xde\xceI\xea\xbalb\x00\xdd\xfc\xe0\xb11\x1d\xe3e\x13>\x1b\x17\xca\xf9\xa9\xa8\x01\x1b\xa1h\x90\xf5\x84\x94la\xfe\x1a\xb1\xf1\x15jQ\x1b\x92$1\x1b\x122q\x1b\xf3\x9dS\xf8q*e\xe7G\x8cp\x9a\r\xee\x90j?]\x891C\xab\x99\ty\x98Ey\x98M\x12\xcfa\xc3sm\xccKͳ\x11\xe6η!\xbf\xb7\xc0V\xb0k\xda\xe0\xd4Qi)\vQ\xf1\"\xc8\xecb\xea\xe4\x12^\x96\xea#\xcbԆ-\xb7\x15\xe8\x906*5;e\x85\x8d\x8bll\x12]\xac\x02\rW\x83\xdakTZ\xd7\xda\nv\xcf\x1a\x9d=,-e\x1d\xed\xdaz\x1b\xc0\xdb\x06[\xe1\x04\xd2\xe5/\x1bm|]\xfe&\xb4\xff\xb3\r\x93'\x9bmؗ\xb0\xc5\x06\x97\xb6\x95\x84\xfe\xc5V\xb0w\xea\xe0\u052c\xb4\x94m\xe8\xe5v\xaa\xe4\xaf\xff\xfbz\a\f\xcao6,t\xdci\x93\xd4\xee.\x1b|\xcan\x1bV*\xed!\xd5\xf7\x92ſ۰\xe6a\x1f4\xe4\x0f\x1bC\x87\xfd\x94\xe7\x036@\xe5\x836\xfa\xc0CIu:Ls~ĆL\xcdQ\xb5CǨ\x95\xc7myZ\xa4\x9c\xb0I\n\xe3$L\xf6)\x1b\xc0\xfai\x1b\xf7\x05\xfc\xc9J\xffb\x13gl\xea\a\xcfژ\xbb:g\x93\x99\x84\xf3\xa0\xc3\x05\x9b☋\xe8\xdd%\x1b\xbd\xffe6t\xc5&SFWm\x84\xe7\xd7X\xdf\xf5\xa4Fܰ\xe5k*\xabP\xd5\n\xffmC\xd4\xf3\x8fM\x92j\xff\xda\x04*ܲ\x01\x16ܦ\x86ܱq\x01\xe5]\xe9\xfe=\x9b\x00\x8b\xfb6\xa2\xf6\a\xa4\xfcC\x1b\xc0\xd3#\x9b \xa0\xfflxՔ\x8d\xb9\xd6'6\x04-OmLs\xe7\xb2K\\\x93ۮ.<\x8f]\xc4!\xaf\x9d\xce.\x9f]\xcf\xfb\xcco\x17\vW\xc0\x8e\x83\xa3\n\xda\xe9q\n\xd9\xd9fa;\"\xdb\"v4\xfd\x8c\x1dh\xbd\xa8]\xb3\xae\xcfڅ\xc7\xc5\xec\\\xf9]\xdc\xce͋v\xa6a\x9e\xb7#\x1a(a\x87\x97(i\x87G{\xc1\x8eu\xa8v\xf6\xb7\x94\xb6\xf2\x92]\xf0Li;\xe9Z\x86O\xbcl\xa7A.\x9bl\xed\x15\xbb\xe0\xccW\xed\b\xa2\xca\xd99\x87^\xdeN\x98\x9ab\xc7\xca\xdc\nvl3\xa8h\xc7\xcb\x19\xed$z%;\x93\x97\x95\xedX8\xfc\xba\x9d\xd6\xe4\r;\xfdN\x15;\xc3\xc0\xaav\xf0\xe6M;\xbct5;NǪ\x9el\xbd\x86\x9dr\xf3\x96\x1d^\xaa\xa6]4\xecm;\xe7{߱ӒԲkj\xa3\xb6\x1do\x83x\xd7\x0e\xf8Q\xc7.ӱuI\x9f\xf7씰zvHo}P\xa4\x01\xc6\xd6\x10\xff7\xb2#\xbd\xf7\xbe\x1d\xa7\xe56V2|\x00Z7\xe1oM혋\xf9\xd0.b\xd4\xccN\xd1knG<\xd4\xc2\xce\x18\xba%\xf8\xfa\x91\x1d\x11P+;\x03\x91\xd6v\x95\xf36vh_[;\xe6\x03\xda\xd9y\xa0\xd7\xc7v\xccw~\x02\xc1\xfc\x14#ꫤ\xeb\xa7d\xe9oǤI\xaa\x1d\xa1\xe9\x00\xbb\x18\xf7\x81(\aa@il\xf03\xf6t\xb0]\f\xcb\x10;\fK\xba\x9dfc\xa8]\xd4t\x98\x1d\n\xfeyr\xc4\xc3\xed\xf2\x12\r27C\x99\x99\xa9\x8d\x8e\xb4\x8b&\x8e\xb2\x8bJ\x8dF3Y*\x9aٔ\xfc1\x18\xc4X;\xa6\x17\x95\xde\xe3ѫ\tv\xa8\xe3\x17*\xd2_ڡ\x82_Qo\xbe\xe6\xd3\xdf(=\xbf\xd5J'\xaa\x96MBS\xdf鯓)\xf7\xdfC\b~H\xca]\x8eJ\xab\x81\xd2i\xa4\xf8\x9b(\xcaf\xd5\x02K\xf2n\xab\xaa\x83\r\xf2d\xa7\x14:P\xa3\x13\x1cpQ\x80\xdc\x14>\x0f\xa9\xecU\x91\xf1Q\x82\xfc\xca\xf6\x00\xba\x17$\xa5C\xa4{\xd8\x0e;\x1d\x81\xe4E\xed\xd8Ǐ2n\x97D\xed\x14;\xd68N\xb53\xdf\xf2\xa3]vOMC\xf9\x13n\x9bnG\x14;Î\xa5\xdf3\xf5\xbeYz\x9d\xad\xd79vx\xa8\xb9\xfaq\x1e\uf78f\x1a\x16\xe8\x97\v\xf5\xba\xc8N\xbb\xbf\xd8.\xab\x92\x97ع\xd2y\xa9^\x97)\xb3\x96+aV\xe8u\xa5\xbd`\xd7\xec\x01r\x8e\xe4*;\xcf\xf9^\xad\xf5\xad\xd1\xeb\xda\x04\x89\xd23S\xd6\xd9\xf3\xb6\xceLYo'\xf0\xd9`\x97ue\x1b\xedD\x19\x9b\xec|\x97\xb1ڗ\xcd\x10\xe8-(\xb7\xdaq\xaa\x8d\x1d\xc9\xd1m\x90\x9e\xed4Q\xbfڑ\xa1܁\x1b~\xb3\xcb\xca\xef\x9d\xca\xc6]v\xeeӰs2k\x8f\x9d\x89\x93\xbdv\xf1\xb0\xbfӞ\xee\xb3#+\xf4\x87\x9dY\xea\xfdP\x80\x03Tƃv\x01M\x87\xd0\xc7\xc3\"\xeeGT\a\x8fR\xb4\x8e\xd9\vv\xcb\xc8J\x1b\x9e\x91r\x9c\xb5\x9cPƟ\xa458e'\x14=mG\x14\xf2'9\xff\x17\xac\xf3\x19;\xa3\xb9\xb3\x14\xe9s\x18\xd2y\xbb\xae\xe8\xbf\xc0\x9e_T^\\\xb2\xc35^\x86\x9e_\x81:^\xb5\xcb!c\xd7t\xa4\xd7\xed\x80\xfe7\xec\x92E\xbaIk\xf67e\xf2\x1f;pƿ\t+\x92\x96\x99r\xcb\xce \xef6\xe5\xfe\x8e\x9d+\xe1\xeeҖ\u07b3\xcb|\xd8};\x91\xf3\x03H\xf8C;6\x1b\xf9\u0601\xd8\xf3\x13\x8aϧ\x0e\t*\xfaB\x1a\xfa\xb1\xcb\xfd\x95\x10\xa9\xe0\xe6\x00\xdc0СKn\x1c0\x92i\xac\xf13\aQ\xcc`\x87\xa6Ň8\x04\x97\xa6s\x9cC\x1dr\xa0\xe30V\xfa9*\x1bN\xd1\x18A\xa9\xca \x013\xd1\xf8H\a\x80\xff(\xde>\x9a\xbc\xcfr\xc0\x01d;\xb0\xf4h\x8c\x03\x1bQ\xc6j_Ʃ\"\x8c\aq'`\xc4_@.\xbft\xd0r~\xe5\x10\xf4\xf95\xbb\xf3\r\x18\xfa-{>\xd1\x01\x838Ɂ\x00\xeb;\xb2p\xb2\x8a\xd6\xf7\x0e\xfa\xa2\x1f\x1c\\\f\x97\xe3\x10\x93bp\xf0|/\xa3\xf2ȤW\xb3C<\x8d\x05\x82lU\xd2\xd9؊\x9d\xa2\xe4\xc0oNt\xd0\xe5\xe0\xc2@\xb7\x83\xe1\xb4ǁcm\x1c\xccv\xf8\x1c\f7\xfc\x0e\xcc^\x060\xb2\xa0\x83;\x91C\x0eq6a\x87B\xeb\bY\x11u(\xea\x8f9\xc4\xe3\xc6\x1d\x8c\xa6\xa680\v6\xd5\xc1L\xe4\x8f\x0e.\xb7\x9f\xe6\x90\xe0\xe4'\a\x1c\xeat\aC\xc2\x19\x0eN\xfc\xcf\xd4\xde\xcfr`?\xe1l\a\xe68\xe6\x90Fs\xf5\xa6y\xa0\xf0|Pv\x01%x!{\xbbȁ\xb4\xe5b\xca\xe7\x12\x90{\xa9\x03\xce~\x99\x83\xc7\xce,w\x10\xb6\xafp\x00X\xact\xc8ΝU\xe0\xffj\ar\xe8k\x1c\xb2\xf6a-\xf9\xbe.9\xb6\xf5\x0e\x80\xad\r4d\x1b\xc9\xd0M\x0e\x01P?\x83F\x9b\x1d\x98\xbe\xd8\xe2\x10H\xb8\xd5!Q\xf0/\x0e8\x8dm\x0e1\xd0\xdb)\xed\xbfҰ\xeePj\xfc\xe6 \nډ\av\xb1\x91\xddT\xf9=\x0e\x06\xbb{\x1dL\xa7:x\xa4\xeb>\x87\xe6\xb2\xfep\x14\xe8\x98%\xe7E\xee\xa7\xfe\x1e\xa0\xfe\x1fL\xda\xc2C4\xa3\x87)\xcfG`\xa6\x8e\x82E\xc7@\xc1\xe3\xf8\xff\x84\x03\xab\\N:0\x17\u007fJ\xdb<\xcd6\xfft\xe8\xcb\xfc\x1d\b^\xcf8\xe8\x9a\xcf:$\xa7r\x0e}>OB^\x80\x84]dO.\xc1#\\VWp\x05\x02v\xd5!H隃\x80\xf1:\xcd\xcb\r5\x977\x1d\x98\x8b\xf9\x9b\x1c\xf8ǡ\x87\x9d\xd2\x18߂\x13\xba\xed\xa0\x93\xbdC\x8e\xdfE\x13\xf7\x1c\x9a\x98\xbd\xef@.\xe1\x01\x84\xe2\xa1\xca\xf2#\aS-\xffA\xee\x1f;d\xba\xe8\t\x89\xf4ԁ\x1cv.'\x8e\xb4\xcd\xed\xc4\x18\xf28\x13\xc6.\xafS\xb8\x99\xcf\xc9\xed\xa1\xf9\xf1\xa9\x80\x13\xc3*\xe8\x04\xef\n9a\xc6\v;\xb5\xed\"\xc9\u007f\x9eq\xe2h\x8d\xa2N\xa6\x1e\x9eur\xa5z1\xa7Щ\xb8St\xe79',\xe0\xf3N\x01\xaa%\x9c\x18nI\xa7t\xfa\x05\xa7\xf0\xe4\xc5d]\xa5\xd8\xe4KN\xbe\x94\xd8\xc9\x11\x95q\x8aH\xbf\xec\x94e\x00e\x9d\fn^q\n\x1b_u\xd2\xe0\x94sb\x92\xa3\xbcS\xf1\u007f\x8aS\xc0{\x05')Qщѿ\xe6TkY\xc9\t\x04UY\u007f~\xdd)3\xe1o8i\x18\xaa\xa0\xb1\xaaNh\xea\x9b\xf8P\xcd\xc9\xd4[u'\xac}\rg2\xad\xeaD\x96\xa1\xa6\x93\xc6\xe3m'\x94\xe7\x1d\xa7\x80\x9fZN\xb0\xa6\xb6\x93\a\x15\xbc\xeb\x14\xf5\xaa\xe3\xc4F\xbd\xbaN\xca\xf4{N\xba\xe8zzS}R\xa6\x81S\xb5\xaf\xa1\x93\xae\xbb\x91\x13\x13$\xef;\x89D\x1b;!\v\x1f8E\xc0\x9aplM\xf5\xb7\x0fyk3'\xc3\xeb\xe6NZ\xd6\x16`FKm\xef#\xde\xd4ʉ\x1d\x1b\xac\xad\x8d\x93k\x03\xdb:aE\xda9\x99\xe6n\xef\x84\x1d\xe9\xe0\xa4\xc4vt\x8aLur\x12\x8fv\x86\x98tq\"\xea\xecʎts\"(\xe8N\xd2\xf4 \x15z\x82½\x9c@E\xbd\x9dt\xc3}\x9c\x88-?v>\x93\xc0 i#2\x86gde\xa4|\xe2\x84q\xfd\x94r\xd0\xd7\t\xcb\xd6\xcf\xc9e\x00\xfd\x9d\x98MIu\x024\x0epbG\xfa@'\x8c\xe0 \xa7\x04)iN\xf1v\x9f\x81\x03\x83\x9d\xcc1\x0eq\"\b\xbd\xc0I\x17\xb3\x10\xb4]\xc4\xe1,FǗ85l\xc4s\xcbP\xe3rX\xa3\x15\xfa\xd0J\xfc\xb2*ɐ\xd50bk\x9cpekul\xebȑ\xf5\xaai\x1b@\x80\x8d(7%\x1f\xfc\x99Vd\xb3V\xbb\x05}ي{~\xe1\xe3ۜ\x043\u06dd\x98\xc8\xf9\xd5\t\x0f\xbb\x83\xc2\xf8\x1b?\xed\xe4e\x17:\xba۩\x89\xfe=\xb0({\x9d\x9a\f\xf8\x1d\xbf\xees2`\xe4e?u\xf9\x00Fs\xd0\xc9E]\x87\x9c\xc0\xaf\x87\x9d\x9c$>\xa2z\u007f\x14\xa49\xc6'\x8e;e\x0e\xfe\x04L\xecIU\xd7SԈ\xd3NIS\xfe\xe9Է-\xe2\x963NDag\xb5\x85sʱ\xf3j_/8q6\xc3E\xa7\"\xf4Kp\x03\x97i\x84\xaf\x80\xadW\x9dX\xfbz\x8d\xba|\xddɼ\xf7\rX\xb8\x9bN°\xbf\x9drx\xc6?N\x01-\xff:e\xa1\xc3-\xd0\xf36\x86w\xc7ɅnwI\xac{\xd0\xcb\xfb\xb8\xe1\x81S\x8e4y\xe8$z}\xe4,\xdcz\xf4\x90\xf4\xf1\xd9\xc3\x13\x11\xa3\x93sL\x8f\x9d⥟\x80\xa2O\xa9ع\\2\xce\xdc.¸<.]\x88\xe3\xa2z\xe4s\xc1\x94\xe5w!\x9f]\xc0\x05^\x16taW\xbfK\xea*\xec\x12\xbcW\xc4\x05\xfe?\xe3Jxآ.\x84SϺ\x80\xbd\x8b\xb9\x10!\x14w\xa1\xb1\xe7\\\xec\xdb\xf3.\xe4>J\xb8\x04:\x95t!\xa7\xf5\x82\x8b\x0e\xefE\x17\x8ei)\xe5\x82\xd5|\xc9\x05\x95*\x8d;˸\xb0T\xe1e\xb4\\\xd6\x05\x8c\xf1\x8a\x8bٮW\xd9B9\x17\xa0Ly\x17\xa8\x93\xe2\x12\x92Up\xa9(Uta\x9e\xe35\x17\xb0\\%\x97й\xb2\v \xf4u\x17߯\xe8\"\xba\xad\xe2*\xd8*u\x80\xbc2\xb1\xaa\xab@\xebQ\x92F|\xd3U\xa0\xc3\xe0\xd4\xd4a)\xd5\\0\xdd\xd5]\x98\xbb\xa8\xe1\x12&\xbf\xe5\x12\x10S\xd3%\xccx\x9bm\xbf\xe3\xc2\xdb\xc7j\xb9\xc4^\xd7\x16ʼ\xeb\xa2\n\xd5q\x11\xac\xd6E\xef\xde\xc3\r\xf5\xc0\x86\xfa\x18Y\x03\x97\x88JC\x97\xb0\xbe\x91\v\xc6\xff}\x97\xe0\xa1\xc6.:D\x17\xa7\xff\x9a\xb8\x80⚺(\xb8\x1f\xb2\xddf\xbc4wa\x91O\v\x17^\x8e\xe1\xa2\x01\xfd\x88\xbf\xb5r!\xe5\xdd\xda\xc5\xf8\xa6\x8d\x8b*\xd2օ\xc5\b\xed\\\xa2\x14\xed]X\x85\xea\xd2\x05^\x1d]<\b\x9c\x15tv\tB\xec\xe2\x02Z\xee\xea\x02\x02\xed撬Ow\x97\xa8W\x0f\x17\xbdKO\xe5w/HLo\xb4\x93\x9e\xd2Dž\x00\xf1c\xfd\xf1\x13\xfc\xf8\xa9K\xf4\xba/\x05\xad\x1f\xe8\xd0\xdf\xc5Dt*\xa5e\x00\x1a\x1d\xe8B\xf2c\x10\xe5*ͅ\xf4\xcag.E*\x83]\xb2=d\b\xb8\x91Nn\x0fu!qJZ}\x8e߇\xbb\xe0\xadG\xb8\x18\x9ed\x80\x0f\x99\xa0\xf7H\x97b\x92Q.y\xb1\xf8h\x17\xa0c\x96\x8b\xfa\x93\xad\xe3\x1a\xa3\xea1V\x85o\x9c\x8b\x86o\xb709\xbf[:V\xc0\xadӷ\x05\xdd8h\xa8\x90\x9b\x01fa7\x9c@\x117z\xf3\x8c\x9bswE\xdd\"\xd7ϺE\v\x8a\xb9I\x99\xe2n\xc9y?\xe7fN\xf7y7T\xbc\x84;OӔ\x92\xee\xfcm\xf1\xc6~\xb7$\xca^t\x03ߖr\v\xa2}\xc9\r\x04]\xda\xcd׀\x95q\x8b/z٭\xa4/\xebF\x9a\xf3\x157\xec\xe0\xabn\xae\f.\xe7Fڴ\xbc\x1bH1\xc5MXT\xc1-\x10\xa4\xa2\x9b\x1c~\xcdM\x01\xa8\x84o+\xbbE _w\x03k\xbd\xe1fJ\xae\x8a\x1b\x81OU\xb7\x92\xeaM7c\x97jn\x81\"\xd5\u074c\xe8j\xb8Aз\xdc\xe2\xe3j\xba\xa1;o\xbba\xb3\xdfq\xd3m\xd5\x02\x19k\xbb5~ħ:n\xc0\xa4\xban.\xfb}/\xf1xjJ=7\xf2\x05\xf5\xdd\xd8}\xd0\xc0]\xb0m\xea\x84Ԅcn\xe8\x16\xdf\xd8\xc8\rl\xf6\xbe\x1b\"\xdf؍\xc8\xef\x037_=\x9c VZJS\xa5\xf4\x87\xfc\xb2\x99\x1b\x8e\xbf\xb9[\x81e\v~\xddҍÿ?rc긕\x9b)\x91\xd6nq\"mtTm݀\x1e\xed\xb4\xc2\xf6\xe0E\a\xb7\x88_Gr\xa4\x93\x12\xbb\xb3\x1bo\xebwcz\xb5\xab[\x8c_7w\x02\nt\xe77=܄[=\xddb[z\xb9\x11(\xf4vS\xab\xfb\xb8\xe9\xfe>vs\xbd\xc7'n\xe4i?\x057\xfa\xbai\xba\xfa\xb9\xa9\x9b\xfdݚ\xbdMe\a\x06\xa0\xe1\x81nz\xf6An\x18\xe147\x16X}\xe6\xe6\xfaTmg\x88\x1b\t\x8fte\xe0P7<\xd407A\xed\xe7z\x1d\xee\x86\v\x18\xe1\x06 \xcc\xd0\xf1e\xba\x19w\x8ft\v\xa4\x1cEi\x1f\xed\xd6\xd7ghdz\xf5\xf3\x187\xe7$Ʋ\xc1qn\t\xc7ƻi\x8f&\xb8\x01\xa7\xbepý\u007f\xa9\xc2\xf1\x95\x9ba\xc3\xd7n5\xb0\xdf@Ŀu\xc34OD\xab\x93\xdc<\x0e\u038d\xb9\xed\xc9n1\xfb߳\x9a\x1f\xc8\xd3\x1c\xdeap3P4B\x91Ln\xe6\x1b\xcd$\xabEykuc\xfa\xc0\x061\xb6\xbbaL\x1cnYX\xe4Dk.7\xb6j\xba\xdd\xac\xe7e\x03/\x1b\xdd\x12:l\x82\xc2\xff\xcc\xfb6\xbbe\xe7\xe4\x16\x90{\xab\x9b{f~!\xaf\xb7\xa9\xddٮ\xf2\xf2\xab\xf2k\x87\x9bo8\xfd\xcd-3\x03;\xddX\x86\xb6\xcb-8i7\x87\xb5\a\x94\xddK\xbd\xf8\x9d\xb4\xda\a}\xfeCe{\xbfJ\xf3\x01\x10\xe0 zt\b\xf5\x1dV5;\x92\xe4\xe7Q7V\x0e\x1f\x83a<\x9e4~'\x94V'\xd9\xfc)7\x13\x00\xa7\xdd\xf4\xc3\u007f\xba\xe9\x97\xffrs\x1e\xec\x8cڵ\xb3\xb4\x84\xe7ܘ\x998ρ^\xd0\xce\\ts]\xd7%\x9a\xb2˪DW\xdcH\xad]\x85۹Fٽ\x0e\xde\xdcp3v\xb9I\xf2\xfe\xed\xd6\xf5\xab\xfc\xf8//\xb7\x92\xce\xe16Fy\x87\x86\xf6.,\xd3=\xb7x\xe3\xfbnL\x9c=H\x8e\xf8\xa1[\x10\xfd#7_\xbdH>=fW\x9f\xb8\xf1n\x85\xa7n\xf5չ\xe7ar\xf4y\x0f\x94\xbe\x84\aP\xb3\xa4\a\xcb2^\xf0\xc0Ͻ\xe8\x01\x15Ky\xb0\x8c\xd5CZ\x96\xf6\xa8U)\xe3aN\xf4e\x8f8\xe1\xb2\x1e*\xda+\xac\xe1U6Z\xce\x03\xc5/\xef\x11S\x9d\xe2\x11RU\xf0\x00\xcdT\xf4p\xeb?/\x95<\xf4\xa8\x95=\x84ۯ{\xa0\x96oh\x9bU<\xd8WQ\x95\x04x\xd3#\\\xa8\xe6\xa1\nU\xf7\x80\xf45\xf0\x88\x1a4\xf1\x88!m\xea\xe1\x82\xce\x0f=H\n5\xf3\x10(5\xf7\x00y\xb5P\xae\xb6\xf4\x10\xb6|\x04\xf2\xb6\xf2\xc0b\xb4\xf6\x88\x99mせm\xeb\xe1\xcc@;\x0f\xa6\x8d\xda+\x89;Pb:z\xf2w\xc0\x11\xe3\x1e\tc:+\xa9\xba赫\x88C\xc2\xd1w\xf3\xc0\x8bu\xf7\x00\xce\xf6\xf0ऱ\x9e\x1eQ\x84^$Bo\xb4\xdf\xc7\xc3Ŋ\x1f{4\x96\xfbģqԧ\x1e\x02\xb0\xbe\x1e\x99R\xeb\xe7\x11\xbf\xdd\xdfCۜ\xea\xa1w\x18\x00\x96\f\xf4PE\ay\x10\x13\xa7\xe1\xcb\xcf\xc8\xe1\xc1\xbc\f\xf1PA\xd3=\t\x87>\x147\f\xf3\x00\xdb\u007f\xae\x1d\x1f\xeeANs\x84\a\x87\xc4闙\x1eDM#=\xb4\r\xa3\x92\xb2=Z\u007f\xcf\xf2\x882g{h\xee\xc6x\xb8\xdfj,i:\x8e\xe3\x1c\xef!\xe0\x9f\xe0\x91\xa5|_xxH\x9c\a\xe6\xee+\x1d\xfd\xd7\x1e\x86D\xdfx\x90C\xfc\x96\x15L\xa40OR\xcd\xfa\xce\x03\v4\x99\x1d\xfd\xde\x03\x88\xf7\x83\a\xe1P\x0e\xc4\xc0ࡏ0\xaaX\x9b<\x84\x14f\x8f\x98\x05\x8bʃ\xd5#\xe0Ǧ\xa2i\xf7h\x06̡:\xe0\x04_\\\xd4v\xb7>\xe3\xf1\x00iy=\x92\xb5\xf2a\xd4~\x0f\x93[\x01\x0fQMЃLM\xc8#\b/\xecA\x8a&\x02\xb9\x8dz\x90^\x8ay\x984\x8a'5y\x8aG\x9c\xcaT\n\xf2\x8f\x1ez\xd1i\x1e$\x10~\xd2\xeeM'\afx\x90M\x9a\xe9A\x9c:\xcb#>v\xb6\ai\x859\x1e\x9aҹ\x1e\xa6\xc5\xe6Q\x88\xe7{\x00~\x16x\x90\xa1Z葔\xcd\"(\xebb\xadz\x89G\xcd\xebR\xfdb\x99G\x90\xefrH\xc0\n\x11\x94\x95\xa0\xdb*\x8ch5jX\xe3A\xcec\xad\xf2m\x9dGR\x14\xeb=HQl\xf0\xc0\xdfn\xf40\xe3\xb3Ƀ\x10\xf8gj\xf9fԺ\xc5èd\xab\xca\xf1/\xda\xf26\xda\xdf\xed\x14\xe0_=L\xb8z\xe8=\u007f\xf3\x00\x02\xee\x84\xd1\xd8\xe5\x91t\xc9n\x8f\x84#{h+\xf6*\x03~\xf7 \xcc\xdeG\x93\xfa\x87G\xf2\x1a\xfb=\f\xde\x0e\xc0X\x1ed\x97\x0ey\xd4\a\x1cf\x8f\x8f\xc0\xf2\x1c\xa5\xf1?F\x8d=\xae\x96焇ٌ\x93ЙS*\x0e\xa7=\b\xfe\xff\xa4\xb9\xfc\xcb\x03,|\x86v\xe6\xacG\xf7{x\x18\f\x9fO\xf4R\\\xa5~}\xd1\x03/vI\xdd\xc7e\x0f\xa0\xcf\x15\xf6\xe4*\xb9}\xcd#\x90庇\x19\x8c\x1bI>\xdd\xf4H6\xe1ou(\xff@\xe4\xffUռ\xe5\xd1<\xccmՖ;\x1e\x89\xdb\ueca3\xf7<\x92\xbe\xb8\xcf\x0e> \x81\x1e\xc2-<\x82(\xfd\xe7A\xb8\xf2\xd8#!\xeb\x135\xe6O=\xc4\x13\xb9\xbcL5\xe4\xf6\u009f\xe6\xf1\x8a\x11\xcb\xeb\xd5N\xe5\xf3\"\x86\xce\xef\x85\xc1.\xe0E\x04\\\xd0\v\xa6\x17\xf2\xc2\xf5\x16\xf6\"\x96*\xe2E\xec\xfd\x8c\x97\x00\xa3\xa8\x17\xf6\xe7Y/X_\xcc\vR\x16\xf7\xea\x19\x00^D\xd6\xcf{Ł\x95\xf02)Q\xd2Kiy\xc1+Z\xf5\xa27\x11o\x96\xf2\xaa\xe7\u007f\xc9\vY(\xede`P\x86M\xbe\xecE\xe0W\xd6\xcb\xe0\xd2+@\xe8U\xaf\x04X\xe5\xbc\b\x93\xcb{\x11\xa1\xa6x\x15\x1cU\xf0\x8ajW\xf4\x8a\"\xbc慍\xaa\xe4%\x0e\xae\xec\xa5\xdfx\xdd\xcb\xd8\xd2\v9\xa9\xe2%[\xabz\xe9\x16\xdf\xf4B\xfb\xaay\x11ZW\xf7¡\xd7\xf0\xd2\x1e\xbd\xa5\xa3\xab\x89\x01\xbc\xede\x18\xf9\x8eWps-/\xe2\x9d\xda^=b\x9c\xf4\xa8\x93\x1c_]/\xe3\x91\xf7\xbc\t\xbd\xac\xe7\x85s\xa9綾m\xe0U\x83\xd2\xd0\xcb \xa6\x91\x17@\xfa}\xaf\x82\xef\xc6^\xba\xd8\x0f\xbc\xe2&\x9bxŕ4\xf5\"\xce\xf8\xd0\v<\xd7\f}h\ue17fo\xc1\x9fZz\x05\x98~\xe4\xa5Mm\xe5\x15\x05n\xed\x15\xc9l\xe3\x85}n륨\xb5ӱ\xb7\xe7\xd7\x1d\xbcb\xd6:\x92\xaf\x9d\xbc@\xf1\x9d\xbd\f`\xbaxq\x9a\x9c\x17\xd2\xde\xcd\v\xff\xda\xdd˰\xa4\x87\x97n\xac\xa7V\xdb\xcb\v\x80ڛl\xe8\xe3%D\xfc\xd8K\xbc\xfa\x89\x97\xf8\xf4S\xaf\xa0\xe3\xbe^\x81\xe1\xfd\xbc\xb4\x18\xfd\xd9v*\xa9?\xc0\v72\xd0K\xe45\xc8+r\x9f慓\xf4\x025\r\xf6¥\f\xc1/\xe9^\xfa\xab\xa1I\xd2\x0f\xf3\x12p}N\xd6\x0e\xf7\u00ad\x8dP\x9afx\tm2\xbdԚ\x91\x18\xe1(rh\xb4\x0e)\xcb+><\xdbK]\x1d\xe3U7:6)v\xe3\x92\xff\x8c\xf7bno\x82W\x00\xfd\x17^\xac\xd1\xfb\xd2+\x8e\xf3+\xed\xfe\xd7^\xc9A~\x93|\xe0[/\x1c\xd3D\xaf\x847\x93\xbc8\xf0|D\xcaw^\xfa\xb2\xc9\xec\xf2\xf7\xbc\xe9\a/\xa6Dr\xbcbH\r^$Č\xf8`\xf2\x02\x1c\x9b)t\x16/=\x8aUIn\xf32\xf8\xb6\x8bR&\x1c%ov\xaa\xe4\xbb\xf4\xeaV\xe1\xf6x\x11X{\xbd\x80\xfb\xbe\x04\xbb\xb2Ge\xa7\xf8\xbdH6\x06\xbc0\x95A/lmH\x1f\t{\tu\"|&\ua957\x88y\x19P\xc7\xd1\xc7)l}\xaaW2\xfe?z\t9\xa6A\x1e\u007fB9\xdd+o0\x9cA{4S\xfb<ˋu,\xb3٩9^\xb1\xa0s\xa9\xf4\xf3\u052ċ(,\xf0\xd2\\/\xf4\xc2 /\x82\x8a.\xf6\xc2\xdd-\xe1e\xa9\xf2o\x19\x18\xb2܋(cE\x92\x13+A\xf3\xf4\x94U\xac}5\x89\xbd\x86\r\xaf\xe5\xa7u\xa2\xbd\xeb\xbdX\xf2\xbd\xc1+\xcex\xa3\x17ˁ7%E\xe2g/\\\xe0\xe6\xe4\xe7-hk\xab\x17~\xe1\x17\u07bc\xcd\v\x88\xb0\xdd+\x16\xfeW/b\xc5\x1d^\x18\xfa\u07fcx1\xd4N/\xb6\x92\xee\xa2\\\xef\x86\xc2\xef\xf1\x02\t\xee\xf5\x16\xec4dl\xb6\xf8K\xb5\x95\xfb\xa8\xb6\u007fx\x05\x02\xef\xa7\b\x1c\x00\x95\x0f\xb2\x9aCނ\xcdx\x90\xf8a%\xfb\x11r\xf3(\f\xea1/p\xf1qU\xdb\x13z\xcfI/\xe7\x8aOy\xb1\x1a\xfd4,\xeb\x9f^D\r\u007f)%\xcfxŏ\x9f\xf5\xd2מS\x95:\x8f\x9e\\\xe0`/\xb2ۗ(\u0097\x93\x12~E%\xfc*\t{\x8d\xd2|\x1d\x92r\x83O\xde\xfc_\xb7\xff\xa6\xe8\xfcCR\xfd\xab\x02{KE\xe4\xb6J\xe1\x1d\xb2\xea\xaeJ\xff=\xb6x\x9f\x12\xfb\x80\x12\xfb\x90\xe2\xf4\x88-\xfc\x87\x8e>\xe6sO FOI\xbf\\>\x91\xc5\xdc>\x91\xcb<>\xbc\xd9\xdf\a\xb1\xc8烂\xe7\xf7q\x92\xd2G\x11,\xe8\x13\x0e\x15\xf2\x89D\x14\xf6aDE|*W\xcf\xf8\x84pE}h\xf1Y\x1fd\xa7\x18\xef)\xeeK\x88\xd3s>\xd2\xf2y\x1f\x98]\xc2'\x02S\xd2\a:\xbf\xe0\x838\xbc\xe8\x03\x1fK\xa1;/\xf9\xc8\xf6\xd2>\xe9|\x19\xfe\xf4\xb2\x0fL*\xeb#\a^\xf1a!\x0f\xcar\xbe\xbc\xed\xd2R\xca\xfb`)S|p\xda\x15|\xf4\xc4\x15}\x82\x1e^\xf3\x89ɫ\xe4\xc3\n\x90\xca>\b\xe2\xeb>\x86\xc5o\xf8 )U\xa4\xa7U}:A\xf7\xa6\x0f\x02\\͇\x15\x13\xd5}\xc4\x195|\x98ex\xcbǭ\x015}\xdc\x17\xe9\x13\x11y\xc7Gk_\xcbG\x90[[\xab\u007f\x97\xad\xd5\xf1\xd1I\xd5\xf5!\xaa~ϧ\x00\xaf\x9e4[\x1f\x14i\xe0\x13?\xd1\xd0'~\xa2\x91\x8f\x13\x95>\"\xd5\xc6>ڛ\x0f|\tDф\xc3h\xcaˇ>A\xc0\xcd|\x9c\x17k\x0e\x82\xb4\xf0I\x80\xd0҇\xdd\x1d>\xc6U\xad|L\x8e\xb6\xf6\x11\x8b\xb6\xf1\x01\x8e\xb4\xf5\xc1\xbb\xb6\xf3\x89'm\xef\xd3\xc5\x10\x1d|&\xd1\x06*\x11\a\xf9`AӴ_\x9f\xf9\x10H\f\xf6\xc1J\f!\x93\xd2\xf5ǡd\xe10^>\xf7a\xad\xd4p\xc8\xc3\bJL\x86\x0f\xd3\x12\x99d\xd4H\x9f\x98\xd5Q>B\xaa\xd1J\xb5,\xf08[\xd90Ƈ<\xfcXmb\x1c\b=>9\x82\t\xfa\xf5\x17\xac\xf0K\x1f0\xedW*\x0f_\xfb\xb8\x97\xe0\x1b\x1d\xf8\xb7>\x85\xc5\x13\xa91\x93\xf8\xd4w \xefd\x9f\xa0\xcb\xef\xf1\xff\x0f\xca\xc8\x1c\x1f\xdfa̋\x91\x836q(f\x1f\xf2 \x16\x9f\xd8]\xabO\xc1\x95\x8d2g\xe7\x8f\x0e6\xe0$\xe7\\l\xd5Mm\xf4@\xff\xbc\xa4\xa0\x0f\xaa\xe3g;\x01\x9f\x00\xb3 4=\xe4\xd3w\x17C\xcc\">]\x1f\x17\xf5a\x89H\xcc'\xc8 \x8e;\xa7\xb0\xad\xa9>X\xc8\x1f}X\x10<\xcd\a\xb7\xf4\x93\x0fK\xeb\xa7\xfb\x88]f\x80\xc23\xd9\xc7Y\xbc\xcc\xc6\xc0\xe7(=\xe7\xfa\x90\\\x99\xe7\x93\xf8j>dq\x01z\xb0\x90\r/B\x93\x8b\xd9\xe4\x12ѫ\xa5\x1c\xd52\xa5\xdcrܰ\xc2'\xd1\xc1J\x94\xabP\xae\xf6\x117\xaf\x81\x19\\K\x01\\\xe7\xe3\x0e\x8b\xf5>\x04\xb4\x1b|8~b#\x04g\x13M\xd2Ϥ\xddf55[|\x12\xc1m\xf5\xe9\x01\x15\xbf\xe0\xe36\xf4p\xbb\x0f\xaf\xeeW۵\x83-\xfc\xe6Ct\xbc\x93\r\xec\xf2\xc9Ε\xdd>b\xc7=\x90½\x94\xf3\xdf}\x92\xda\xdf\xe7\x93\x15\x01\u007f\xf8\x805\xf7\x832\a|\\TtЧ\x8btH\xb6\xc3>\xb8\x9a#>@\xab\xa3\xbe\x82]\xe9d\x8e\xf9\xe8\xf7\x8e\xb3\xda\x13\xa8\xf0\xa4\xb6x\n\x1d=\r\x12\xfd\xa9\xf5\xfe\xe5\x03J=\x03*\x9d%\x05\xce\xf9\xb0;\xe7<\x1e\xbe\x80\x87.\xa2\xbc\x84.]Fy\x857]\xf5\tξ\xe6\xc3\x1b:\xae\xfb\x04\xd9\xdc\xf0I<~\x93\xbe\xe2or\xf4\x1f\x1f\xf7Q\xfcK\xb9\xbb\x85\xe6n\xa3\xbc\xe3â\xaf\xbb\xaax\xf7|@\xb6\xf7!\xdf\x0f|\x00\"\x0f}\fR\x1e\xa9\xad\xfc\xcfG_\xfdX\x8d\xcf\x13\x88\xf1S\x1f\x13-\xb9\xfc\x92\x13\xcb\xed\x97\x1e\xe7\xf1K_\xf2\xfa\xa9\xe2\xf9\xfc\f\"\xf3\xfb\xe1N\v\xf8\x89\xb6\n\xfais\n\xf9a@\n\xfb\x11y\x14\xf1\xb3C\xcf\xf8\x05_\x14\xf5\xeb\xa9\x00~P\xbc\x98\x1f\x00\xad\xb8\x1f\xb1\xcas~\xcem<\xef窑\x12~\bhI\xbf\x88\xf1\v\xfa\xe4\x8b~lP-\xe5\x87j\xbc䇾\x94\xf6\xf3\x8d\x84e\xfc\x8c\xb8^\xf6\xcbH\xcajӯ\xf8\x93|}U\xbf)\xe7\x87I-\xef'jHaC\x15\xfcb\xda+\xfa\xb1\x82\xfe5?H\\\xc9\x0f\xc6V\xf6\x93t\xaf\xfb\x11漁\xfa\xab\xf8\xa1\xf0U9\x967YI5?\xe6!\xfd\"\xfd5\xfcb\n\xde\xf2#\xa5R\xd3O\xf5}\xdbO%}\xc7/\xfc\xaf\xe5\xc7,\xa4\x9fz\xf7\xae\x1f{?\xea\x80\xe8u\xfdd\xf6{~\xda\xc3z~,\xd5\xf1c\xa9\x0e\x9bn\xc8\xe17B\x9b\xef\xe3\xa9\xc6\xec\xfe\a\xda\xe1&zm\xea\x87<|\xe8\x17Yi\xc6\x1e7G\xf7Z\x90\xf8-\xd9\xf4GړVJ\xa9ָ\xa7\x8d\x9fq~[<\xde\xce\x0fqj\xcf\xc6;\xf8\xf1\xb2F\x94\x9d\xfct\xae\x9d\xfd̺v\xd1kW?]~7?\xf1Jw\x15\x95\x1e\xfa}O\xbf:\xf9^\xfa@o\xfd\xa1\x8f^?\xf6Sd?\xd1ϟjE}\xd9\xf9~\xbc\xf4\xf7#k\x94ꗰj\x80\x9fk0\a\xeau\x90\x1f[\x83\xd3\xfc\x92 \xfaL\x9f\x1f\xec\x87\xdd\x1b\x82/\xd3\xfdbӇ\xfa\x19\xe0\x0f\xf3\xf3\x00r\xbf\xe6T\xfdX\xe32\xc2/\xd0#\xc3/\x18/\x13R0\x92?\x8c\xf2#\xab7ڏ\x8cB\x96\x1fj\x9d\xedG\xc6n\f87\x96\x022\xce/\xd3n\xe3\xfd\xa2\xf0\x13 q_\xf8\x05\xc8|\xe9\x97T\xf8W~\xc0\xa9\xaf!?\xdf\xf8\x11*|\xeb\x87\x13\x9d\xe8\a\x8c\x99\xe4G\xc0\xfd\x9d\xca\xeed\x0e\xeb{\x15\x92\x1f\x12\x03\xcb\x18\x9e\x91\x92\xc3\xc6\f\xbc\xd9\xc8\x1aL\x90\x10\xb3\x1f\v&,~\xb8>\x946?\xce\\\xb7\xfb\xb9\x0e\xc3\xe1/\xd86cHꄴ\x14':\xe5\xf2\x13\xa5\xb8U\xd3=~\xcc\xeayU\xdb|~\x18S\xbf\x9fӂ\x01\xbd;\xe8g\x04\x1f\xf2s\x1dA\xd8\xcf\x104\xe2\x17\xb0\x1a\xf5\xab3\x8c\xa9\xcc\xc4\xfd\xc0\xb7S\xfcbϧ\xfa%\xc8\xfe\x91=\x9d\xe6Ǥ\xf5O~\xe6\x1d\xa6\x8363\xfcH\x16\xcf\xe4e\x16\xc4o\xb6\x1a\xa690WsQ\xd3<\xe5\xdf|?\x03\xd0\x05`\xe0B\xfdv\x91?o\xc7\x11)\x8bI\x9e%~\xb8\x99\xa5\xe8\xdf2?R\xb9\xcbم\x15~\xa4\xbaWBBV\xf9\x05\x96\xadf\u007f\xd7\xf8\xf5D\x00?\xdf\xda\xe8\a\xe6[\xaf4\xd8@9\xd8\b\xc2o\xd2F\u007f\xf6+x\xdc\xec\xd7\xe3\xc6A\xe5\xad\xd4\xca_\xd4>l\xf3\xd3Yn\x87\xac\xfd\xea\x97\x1d%;\xb4\x86\xdf\xfc\x88\x0fv\xd2\n\xec\xa2\x04\xee\xf6\vf\xdcC\xb3\xbb\xd7\xcf<\xce\xef\xe8\xf1>\xde\xf8\x87\xf6j\xbf\x1fn\xef\x80_Ò\x83\xd4\xe4C\xa4\xf3a?\xa0\xe9\x11?R\xb5G\xf9\xe81\xd4s\x9cD9Az\x9d$\xbdN\xd1R\x9ef%\u007f\x828\u007f\xf1\xa93T\xaf\xb3\x18\xc29\f\xe1<\xfe\xbf\xc0\xdf/\xb2\xe7\x97\xd0\xf3\xcb\xec\xd5\x15\xfet\x95\xb5^cS\xd7\xfd\b\xb5n\xf0rSI\xf47\x99\xf3\x8f~\xfc\x17T\xbeEɿ\xed\x17\xb7{\x87\xb5\xdc\xf5s{\xce=\xbf\xc4?\xf7\xfdLQ<\xf0s\x16\xe9\xa1\xca\xf1#\xde\xfc\x9f\xfe\xfc\x98\x15=\xe1\xe5\xa9_\xa3\xf8\\\x01\xc1\x18\xb9\x038c<\xa0\xaf\xdf\b\xd0l\xe5\v@L\xf2\a\xf4\xde\x02\x01\x9epW0\x80\xa1\x15\n\x88K-\x1c\x10\xf9-\x82\xff\x9f\t\b\xdc)\x1a`B\xf0\xd9\x00\xa2\xefb\x01q\x95\xc5\x03\xdc\x04\xf0\\@\xfc\xc4\xf3\x01\xa8\\\x89\x00\xccC\xc9\x00f!^\b\x88,\xbf\x18\x80\u007f)Ŷ_\nH\x94S:\xa0\xdb\xff\x03\xb2U\xed\xe5\x00\xadf\xd9\x00\x9c\xc0+\x01Q\x96W\x03\x14\x86r\x81\x04\xfe+/EJ\x00\x94\xaf\x10\x00\b\xae\x18\xc0R\xb3\xd7\x02\\tU\t\xbd\xae\xac\x9f^\x0f`Q\xf9\x1b\x01\x80\xe9*\x01n\xfe\xaf\x1a\xe0\x0e\x9b7\xd9N\xb5\x80\xb0\xb5z\x00&\xa8F\x00\xa1\xc7[\x01HDM\x8e\xf4m\xfe\xf6N@\xd8R+@\x9b\\;\xa0\xce\xe0\xdd\x00\xf9R'\x00\xdcW\x17\x84\u007f\x8f\xa4\xac\xa7C\xaa\x1f\x006n\xc0K\xc3\x00N\xa8k\x14@\n\xfc}~\xd98\x80\xb7o\xa0l\x12`\xb4\xd2T\x19\xf7!\xefl\x16\xe0\x1eG\xd6\xdd\"@-k\x19\x90\x05\xf8\x1f\x050\xf3\xde*\xa0\xdbT[\a`\xe8ۀ\x1em\x038\xc0\xad]@\xa2\x8f\xf6B\xc4\x0eRtd}\x9d\x02\x88\xf0;\a\x10\x90w\t\x10?v\r\xe8&\x9an\xbc\xab{\x80\xe2\xdb#\x80x\xbc'*\xee\x15` \xd7;\xc0\x85\x19}\x02t\x80\x1f\xeb\xf5\x93\x80ڐO\x03\xb2\x17\xa2/)\xde/\xc0\xc4b\xff\x00\xf35\xa9\xa8k@\x00\xc9ׁ\x10\xabA\x01\x84\x16i\x01\xe4r?S!\x18\f9\x1c\x12\x80\xe6\xa7\ahy\x86\x92W\xc3\x02z\xb8x@&\x1e\x86\a\xe8wF\x04\x80\x842\xb4\xf3\x99\xa4\xfcȀ\xc0\x99Q\x01\x98\xa7\xd1\x01D\\Y\x01N\x8fdCe\xc6(\xe5Ǫʌ#\xcd\xc7'Uf\x82\xaa\xcc\x17Џ/Q~E\xe1\xff\x1a\x9d\xfc\x86\xb2\xff-F3\x91\xfa0I\x15\xe8;ՙ\xc9Й\xefљ\x1fT\x15r\xa0\x18\x06\x95\x1b#\x85\xdcD\x014\xab\xe8Y\xd8\x19\xab\n\x9e-\xc9s;\xc5\xdd\x01r:9T\x17\xa9㦐y\xf8\xa4W\x9f\xf4\xe9\xd5\x0f\x11\n@<\x82\xca\xff\x90HH8)\x04\x11\nAT\xbe\x8c\x91`q\xf2k\x8a\xb2z\xaa\x8a\xc0\x8fd\xd94\xb2\xfa'\xe5\xcatpe\x06\xfb4SI=+@\xbc6;\xc0\x9c\xf5\x9c@\xc1\x8e\xa32\xe4M\x1bs\xa1\x93\xf3\x02\xc0\xbf\xf3\xb5\x8e\x05z\xdb\u0080@\x93E\x01A+\x8b\x03\x98\xf5\\\x12\xc0&\xef\xa54\x06\xcb\x02t\xe9\xcb\x03\xba\xdd1 .ve@L\xfe\xaa\x80\xac\xbeXM\x1b\xb2&@8\xb26\x00\x04\xb3.\x80I\x8c\xf5\x01$\xd46\x88\xd2d\xa4l\f`ZvS\x00\b\xfb\xe7\x80`\xd8\xcd*\xc0[T\x80\xb7\xea\xf5\x17\u07b4M;\xba]\xaf\xbf\xeau\x87>\xf6[\x00>hg@\x02\xa8]J\x84\xddz\xd3\x1e\xfd\xbcW\xfb\xf6\xbb\x8e~\x9f\xfe\xfe\aF\xbf\x1fC:\x80\xc1\x1cd\xb7\x0fq\x10\x87ه#ڥ\xa3\xfa\xd81\xbd\x1e\x0f\x00\x83\x9e\xe0\xa8N\xf2\xd3)^N\a\xf8\x02\x0e^\xfe\n\xe0\x05\ng\x02\xe2\xaeΪ>\x9cC\x8b\xe7\x03\xc0x\x17\xb4k\x17\x03XSu)\xa9\x1c\x97\x03\b~\xae\x04\xe06\xafBʯ\x05\xe8\xe9\xaf\a\xf8\xae\xc6\x00\xdc\xd5Mv\xe3o^\xfea=\xff\xf2\xb7[\x01._\x854\xdf\tpq\xfc]0\xf1\x1e\xd5\xe2~\x00^\xf7\x01G\xfc0 \x01\xf7\xa3\x00\xe6\x01\xffC?\x1f\a\x10\x02<သ\x06\x90\xfd\xca\x15\x84\x96\xe4\x0e\xa2wy\x82\u0529\xbcA=#'\bU\xcb\x1f$\xdc+\x10\x04Q\v\x069'[((m\x14\x0e&7?\x06u%\x8e^\x8b\x06%\x89\xf1l\x10\xbaR,(\xee\xa2xP\xba\xff\\\x10\xb4|>(3Z%\x82\xf9:$\xa8]2\x98Х\x17\x822\xd3\xfdb\x10\xae\xa3T\x10ٱ\x97\x82\xb2ιtP\xc8V&\x88\xae\xbf\xccn\x94\r\xc2R\xbf\x12\xc4\xcc\xe7\xab\xfc\xad\\\x90~\xa0|\x90Y\x8f\x14\xedz\x85 m^E4\xf1ZP\xccZ\xa5 \xe6\xa7*\a\xc1\xef׃\xc9\xe3T\x83P\x87*A=\x15Gz\xf6f0\u007f\a\xf9P\x8dmV\x0f\x8a[\xab\x11\xd4\x14\xd4[A\x90\xb9f\x10\xd6\xe5m\xed\xc2;A\xac\x82\xac\x15\x14\xcf];\xc8x\xfd\xdd \x92\x02u\xd8FݠX\xc7\xf7\x82\x88Z\xea\x05i\x10\xeb\a\x89N\x1b\x80>\r\x83\x98\xd1m\x14D\xb8\x18\x84\vn\x1c\x04\x8f?\bBԛ\x04\xc1\xf8\xa6\x18ӇA\xe0\xa1fA\tR\x9akM-\x820N-\x83\".\x1f\x81\x94\xad\x82\x98\x1an\x1dD\xe8\xd3&\x88)\xa5\xb6\xac\xbe]P\xed\\\xfb \xb3x\x1d\x82\x10ӎA\x80\x96N`b\xe7\xa0hB\x97 \x14\xbe\x8f\x83\x8cw?\xa1\xa8|\x8a\xbe\xf7\r\x12g\xf7K>\xdb?\x88\xdcPj\x90K\x1f\x06$8\"_\x0f$\xdf\a\x05\xa9\x92i\xe8\xd6gA\xa8\xe4`%\xfa\x90 T0\x1d4\x1cJQ\x1f\x062|Α\r\x0fB\xe5F\x04\xa1k\x19\xca\xc0LV=2\b\xbd\x19\x15\x14%\x1a\x1d\x84\xdad\x81\x06ِ\xf01\xa4\xc1\xd8dG\xc7Qi\xc6C\xe2'\xa8&}\x81\a\xbeTi\xfc\n\xac\xfd\x9a\x12\xfe\x8d\bط\xe8\xceD*\xc3$j\xc0w\x94\xecɔ\xb9\xefU\x82\u007fP\xb9̡\xd4\x18\xc83#$\xc9D\x890+\xed,\x10\t+\xe8iC\x93vJ\x8e\x83\xdcw\x92\xfb.\x8a\x87\x9bB\xe0Ir߫\x14\xf6\x05\xb9j\xd2ϖ\x02\xecU09\xdc\x10y\x19\x0e\x8a\a\x8a\x04%\xef\x13\x85\xa0\xc5\xd0b<(\xab}\xa6\x04\xe1j\xa7R\xd5~T\x02O\vJ \xfbSP\xd2\x15Ӄ\xe2\xe4f\xe8 g\x06\x91B\x9b\x15\x04\xbc\x9a\xcd&\xe6\x04\x01_\xe6*W\xe7\x05e\xceu>\b\xb7 H?\xb1\x90\xed,\n\n\xc8^L)X\xc2\xcbR\xb2zY\x10xiy\x10\xf6tE\x10\xc9ʕA\xa4\xbfV\xb1\xb9\xd5A\xd9\xec\xb5&(\xaee-Eb\x1d\xfb\xb3\x9e\xb7o\xa0\"l\f\nV\xd9\x14\xe4:\x1b\x8cv3eeK\x90\x9b\x99\xb7\xb2\xe9_\xc0\xfcmA\x99\a\xd9\x1e\xe4\xeb\x8a\xf1aGP\xc1\xcaoxzg\x90i\xbc]A\x02\xc9\xddAF5{\x82\xdc\xec\xb37(~\xeewv}_P\xd6B\xfd\x81\xaf\xf6\a%\xc1t \xc8\xdd'\a)\x80\x87\x82\x04Q\x87\x83L\xdc\x1c\t\x02\x1d\x1c\x05\xa1\x8f\xa9\x91>N\x19?\x01\x8e\x9ddwO\xf1r\x1a\x02\xff'%\xe6/\x10\xfbL\x90A\xc3Y\xaa\xf79\x92\xe3|\x90\v\b.\x04yD\xc5\xc5 3{\x97H\xea\xcbA\x02\x9c+A\xc6!W\x93\x83\xbe\x06\xf5\xb9N#p\x03\x14\xb8ɱ\xfdM\xaa\xffC\x95\xffW\x1e\xcc\xceN\xb9E\xb2\xdf\x0e\"\x82\xbcÎ\xdd\x05\x01\xee\xa9\xed\xbc\x1f\x04\xd0\u007f\x10䲣\x87A]\xb0\xff\x88r\xf1\x1f\x84\xf1q\x90\x88\xe8I\x100\xf0)\xb5-W(\xa1\x86\xb9Cj\xc8\xf2\x84 \nyC\"\x9b\xf9Bؽ\x11\xd2\x03\xc6C\xe4F\xc1\x10\x82\xedB!Ҥp\b\x13\x8cEB \xcd3!\x04)EC\\\x12\xf9lH0e\xb1\x10\x82D\x94υ`\xec\x9e\x0fA#J\x84\x00\xafJ\xf2\xcb\x17B\xf0\xe8/\x86\xe0\xe7J\x85$e\xf5\x926S:\xc4%\xbfe\xf4\xf3\xcb!\x02\xff\xb2\xac蕐\xfa\xa4WCԱr!d(ʇDMRB\x02j+\x84\xf4T\xd5\x10\x10\xe5k\xda\xc7J!\xe8w\xe5\x102\n\xaf\x87\x84\xfbo\x84\x80!\xab\x84 \x11UyǛ!X\x99j\xdar\xf5$\xcdj\x84 \x0eo\x85\xc0\x98\x9a!\xa6B\xdf\x0eQ*\xde\t\x89\xf5\xad\x15\u0092\xe4\xda!\xc9(\xbc\xcb\xe1\xd6\tQ\xdc\xeb\x860}\xf5\x1eiQ/D\xe7S?$\xf9\xcb\x06\xac\xbba(\x99\x16n\x04\x9e\xbc\x8fJ\x1b\x87 '\x1f\x84ԃ7\t\x89\xc5k\x1a\x92\xa9\x9a\x0fC\x00\x1b\xcdBD\x80͕|-B\xa2\u007f-C\xf0\x88\xac\xbb\x15H\xd4:$\xd1K\x9b\x10V\x89\xb5\r\x89P\xb6\v\t\x04i\x1fb\xa2\xaaC\bY\xec\x8e!\xda\xd8N!\x846\x9d9\xe8.$T\xd7\x10O\x00\xef\x16\x02\xc2\xe8\x1e\xa2\x13\xe8\x11\x02N\xe8\xc9a\xf7b\xaf{\x87\xe8\x13\xfb\x844m\x1a\xc2\v7Bb\xba?eu}C0|\xfdH\x9f\xfe|<5D\xe30\x00\x84\x18\xa8T\x1e\x14R\xb3\x9c\x16\x82#\xfc\x1f\xbd\x06\x87DO\x86\x80^\xe9!N\xd5\f\x05i\x87\x85\b\x86?\x0f\x89\x8a\x0f\a\x15F\xb0\xe1\x8c\x10483\x04\xd39\x124\x1b\x15\x12\xeb8\x1a\x94\xc9B\xdb\xd9!ڝ1!ؒ\xb1\x90\x9cq!13\xe3\xd1\xea\x04v\xfc\x8b\x10\x94\xfbK\xd6\xfdUH\xec\xd7\xd7!تo0\xe8oC\xb0P\x13\x95ғС\xefB\xb0\x05\x93\x95\x86ߓ3?\x90x9!\x18\x0f\x83*\x83Q\x87b\xc2\xc0\xccI\xc1\xb4\x90bV\xea\xb4-\x04\x1ba\x0fA\xed\x1d\xd0F'J\x17\xb4\u052dz\xeeQ\xbd\xf0\x82\xfd>ʑ_[\nPf\x82Ԉ\x10E6\fM\x8d@\xee\xa2\x14\x88\x98*I\\\xa5y\x8a\xca\xe1T\xf6\xffG\x15\xc7i*M?\x91R\xd3\xc1\xbc\x19\xffc\xde\xcc$Wg\x85\xc4\xcd\xcf\x0e\x01=\xce\xe1e./\xf3\xc0\xb8\xf9!\x9cȶ\x00\xf4\\\x18\xc2\xfcҢ\x10\xd28\x8bC\xb0\x9bKBpQK!\xfa\xcb\xc8\xd9\xe5\xb0\v+B\xe25W\x86$9\xb1\x8a\x84]\x1db\xaeaM\biõ!\xac\xda[\x17\x92\xc4\xe2\xfa\x10\xcc\xe7\x86\x10\x0f\x86٨\x94ل\x8a\u007f\x06)7\x87dc\xec\x16\xf4lk\b\x19\xe7_Bȹn\x83\xfclWN\xff\xaa\xb6b\a\xbe\xfd-$q\xc5ΐ\xf8\xd0\x11)\xbb(\xfc\xbb\xa1\xd3{B\f\x1a\xf7\xb2\x96\xdfCX\x15\xb2\x0f\xd6\xe4\x0f\x15\xc3\xfdl\xe8\x00\xc6t\x90O\x1f\xd2\xca\x0eC`\x8f\x84\x80\xa9\x8f\xf2rL\xc7x<\x84\x99\x88\x13\xfa\xf1d\b\xcb4O\x85\xb0$\xfa\xb4J֟\xb4\xf2\u007f\xf1r\x06m\x9c\rqQĹ\x10P\xd5\xf9\x10^\xbd}!\x84\xb5\x8f\x17CpZ\x97\xf8\xc0ev\xe7JH\x96\xa7\\\r1\xf9~M5\xf9zH\xd2]7\xf0\xdbMV\xf27\x1a\xf8'\x84\xf9\x82\u007fC\xe2\xe5o\xb1\xde\xdbЯ;!q\xa1wCt\xc0\xf7\xa0\xa0\xf7C\x9c\x11x\xc0\xee<\xa4\t\u007f\x04\x91\xfaO\x9bz\f\x19OMy\x12bR\xe0i\b\x93z\xb9\xc2\xd2\\\xee\xb0hO\x9e0\xba\x9a7L-ȇ\x9f\xf2\x87\xf9|\x810\xfdm\xc1\xb0.C-\x14\xa6O)\xac\xb7\x17\t3%\xf4L\x98n\xa8h\x18\xb8\xf9ٰ\x04N\xc5\xc22SP<\x8c\xc4\xf0saQ\xbd\xe7\xc3\\\xbeW\"L\xb0R\x92\xad\xbf\xa0\xed\xbd\x18\x16\xee\x97\n\x03\xa1\xbe\x14\x06^-\xcdK\x99DK؏\x11\x16\xc3]6\x8c\xdc\xc7+a\xaaݫz-\x17\xe6\xf1\x16\xe5ô|)a\x02\xb4\nan&\xa8\xc8\xe6^\xe3ӕ\xc2<\xf2\xb8r\x18\x00\xfdu^\xde\bCت\x84\x99L\xab\x1a\x16S\xfa&\u007f\xab\x16\x06\xbe\xa8\xceO5xy\x8b\x03\xac\x19֔\xfd\xdba\x1c1\x8e\xb2\x16h\\;\xcc<\xc0\xbbaaf\x1d\xedl\xdd0\xe6#\xdeSR\xd6\vÒ\xd4\xe7\xb7\rº?\xa1!\xeai\xc4o\xdf\x0fc\x06\xa1qX\x98\xfc\x01(\xda$\f\x10\xd14\f\v\xf5a\x18AD\xb3\xb0\xa0\xf4\xe6aI\xab\xb5\xe03-A\xb7\x8f\xc20\x91\xad\xc2T\xc8\xd6a\x05Nm\xd0J\xdb0T\xbd\x1d*n\x1f\xe6\x11\x86\x1d\x92\xf7t\fs\x1f\xa3\xb2\xbas\x186\xa5K\x98\x96\xaekX\xecA70\xb0;\xfa\xd7\x03-\xf6\fsr\xb8\x17[\xee\x1dV7\x88\x06?\x0ec\xd1\xc3'a\xc4j\x9fⱾ\xe1|-F\xa5\xa7\xf4\vS\xbc\xfb\x87\xe1FR\xc3\\\x1d0\x00\xf7\fDՃ\xc2\t(\x97&\xc5ga\xc8\xf5\xe00s\x8cC\xc2\f\x04љ\xa1$а0a\xe9\xe7aĀ\xc3\xc3\x04##\xd0팰؋\xcc0\xd0\xffH\b\xef(|5:,S\x15Yaj~v\x18\x01ʘ\xb0L\x10\x8e\r# \x18\x17.\xd8!uxꄄ\x13\f\xe7\xef\x961(#eBX2\x01_\x84\x81\xba\xbe\fcU)\xe5\xe6\xeb0^;\x15&`\xff\x96#\x9b\x18\x16c8)\x8cɲ\xef\xc2L\xd3O\x86\xa4|\x8f\xce\xfd\x80!\xe7\x90\xfa\x86\xb0xZ\xa3RÄg\xcd\xec\x89%\x8c\xb3R\xadh\xc4\x16֣\xc4Ì\xa2\x1ca\xf8\\g\x18^\xc1\x85\xea\xdda,\x12\xf0\xa0JoX\\\x8e/\\\xb0m\xea\xd0\xf4a\xa9)\xfe0\xb3?\x810\x02\x99`Xf\xdeB\xa4e8\x8c\x95U\x9102\x1fѰz\xadXX\xacT<,\xd1\xde\x14vwj\x98\xb6\xef\xc700\xc1\xb40\x9c\xfcOԿ\xe9a8\xc7\x19\xda\xd2̰8\xb3Y\x10\xbe\xd9aF\xd0sX\xcd\xdc0Q\xc1\xbc\xb0\xa4u\xe6S\x19\x16\x84\x19D.\f\x8b\x9bZ\x14F\x0ebq\xe2\xc1\x8cQ\xa9)K\u0089\xd0 +-ei\x18\xd6~\x99HSB\xaa\x96\xd3>\xad\b\x03\x14\xac\x84\xb1[E\x03\xb3Zub\rX\xbe\x96\x12\xb5.\f\x10\xb1\x1eҺ!\x8c\xb0}c\x18g\x01l\"\xb9\u007f\x0e\xd3/n\x0e\v|\xd8\x12\x16h\xb0\x95\xcc\xfc%\xcc9\xd9m\xa0\xf6\xf602忒Y;`\x18~c+;y\xd9\x15\x86\xa3\xda\x1df\x9edO8\u007f\xf7\xc1\x89!\xed\r\x17h:Z6;\xfd\x1e.\xd25{\x80\xbc\x959\xf1a_\xb8pۄԍ\x90\xe3\xe0\xfe\b3\x1d\xb3?,a\xf9\x81\xb0\xf8\x97\x83\xa0\xe3\xa10S\xf9\x87\x93<:\xc21\x1c\rs1\xdb1\xc8\xd6q\x15\xa7\x13a,\x8e?\tQ8\x15f\xfcs:\xcc0\xef\xcf0B\x9d\xbf\xc2\b@Π\xa9\xb3`ٹ0\x9c\xdeyh\xcc\x05ZËIkx)L\xbc{9\x8c\x05jWT\xf8\xaf\x86\x81\x80\xae\x81\f\xd7u\xc47\xd4\x14\xde\f\xf3\xe5\xfd*\xc3\xff\x84\x13\x00)u\xa0\xbcq#\\\xa0y\xc6\xd0\xc4s\xb7\u0085\xbaf\x0fK\x1b\x9d\xf8\xf7v\x18p\xf4\x8e\xea\xf7]Z\xc0{\xfc\xf6>E\xf4\x81j\xc1C\x8a\xe1#8\xa6\xff\xb4\xb5Ǡ\xc1\x930'\xa1\x9f\xea5W\x84.$w\x84\x1e/OD\x8ep\xcd\x1b\x81<\xe6\xe3%\u007f\x04g\xc5E\xf8\xee\x8d\b\x02\xaaB\x11\xac&/\x1c\xd1\x00\xadH\x84\x1e\xef\x99\b_E\x15\x81h<\xcbK\xb1\bmi\xf1\x88(\xfas\x91\x84){>\u0088\xbdDD\x84\xa6d\x04\x93X/\xe8}/F`TJE`9^\x8a\x88\xa1*\x1d)\xd4>{TFBkS\xcaDp\xb8\xddˑ\x82\xadRG\xa5&\x94\xb8l\x04\x16\xed\x15}\xfc\xd5\b\xa6)\xcaEDH\xcbGh\xd4R\"\x00\xb5\x15\"p?\x15#\x02\xc6_\x8b\x80z\x95x\xa9\x1c\xe1Z\xd3H\x9e>)oD\x18\x80T\x89\x88=\xa8\x1aA\xe8\xfafD4\xb0Z\x84\xf0\xa4z\x84\xfe\xadFD$\xf0-v\xa1&\xbb\xf6v\xa4p\xab\u052c\xd4!\x89\xbf\x94w\x942\xb5\"\x02\xa4kG$\x8f\xf6n\x04Z\\'\x82\xb5\xbeu#\u0099\xf7\"\xb4!\xf5\"bJ\xeb\xebX\x1a\xb0\xdb\r#P\xdeF\x11\xe4MI\xd5\xc6\x11\x82\xb8\x0f\xf0x\x13\x94M#\xe0\xfc\x87\x11\x9d\x9bk\xc6[\x9bG4\v\xd6\"B\x15j\x19\xd1\xe0\xf2\xa3\b\xd7'\xb7\x8a`\x99@\xeb\b^O\xd1&\x82M\x0emѕv\x11U\xaa\xf6\x111\xc3\x1d\"z\x9ax\x04\xd1T\xa7\x88\x18\x84\xceI9\xe8\x12\xc1\xc6\u052e\x11\x06\b\xdd\xf4\xda=\x02wԃ\xf5\xf6\x8c \xe8\xec\xc5\x1azGx\xfag\x1f\f\xee\xe3H\xbe\x16\xa3\x13\xbe2ѯ\xf1\t9\xfb4\x02_\xd47\xc24a\xbf\b\x04\xbd\u007f\x84\x80'5\x82\xf7r\r \x91\x06F\xe8t\aE\x105\xa4E`??\x8b\xe8Z\xcf\xc1\x11Q\xc2!\x11\xd5\xd8\xf4\xffǣ\xa1\x91\x84ꥧ'\f\xea\xb0H\x81\xf6\xd9Y\xa3\xb3S>\x8f`\xae\x11T\x1d\x11\x11?\x9c\x11A\xee!\xf3\u007f\xf7\x8eD\x85\xa3\"\xb0\xf2\xa3\xf1!+\x82\xad\x99\xd9\x11\xe2\xbe1Iҍ\x15\x99\x1f\x17\xc1\xdaS\x1d\xca\x04<\xf0ED_L\x05\x1d\xfb*\x02\xa0\xf05Z\xfd&\x02\x13\xfam\x04^~\"\x1e\x9e\xa4\xd2\xfc]D\x90\xcf䈸\xe0\xef\xc1\x96\x1f\"t\xa99\x11=`\x1c\xf7\x1bY\x87)\x02\x17h\x86\xb2Yp\xbf5\x02\x17i#A\xed\x11\xf1\xa6\x8e\b\xbd'\t\xe7\x8a\xc0\v\xba#p-\x1e\xda\x02oD\x9c\x9f/B_懵\b\xb0\x8e\xa02%\x84އUL\":\xc0hD\xfcM,I\x908y?%B\xb72\x15\xc4\xf8QUe\x9a\n\xffO\xf8v:\xd5s\x86\xea\xc7\xcc\b\x1cҬ\b\x9c\xc9\xec\b\xdc͜\b<\xdd\\4=O\x85|~\x84^aA\x84\xc6x!4uQ\x04&yq\x04\x06~I\x04F}iR*\x96E\xb0k1\"f\u007f\x85\x92re\x84~cU\x846~u\x846x\r;\xb66\"\x8eh\x1d\x05u=\xed\xe2\x06X\xba\x8d\xc9Z7\xf1Οi$6\x93\x94[h\xf4\xb6\x8ah\xfcB=\xdd\x06\x06mO*ӯj\x94w$\xd5\xf9\xb7\b\xad\xf6N\n\xfc.\x98\x94\xdd\x18\xd6\x1eX\xaa\xbd\xb4a\xbf\xd3`\xedSi\xf9C\xe9\xb9\x1f\xc6\xe7\x80ڍ\x83T\xf9CT\xf9ô0Gh\x92\x8e*\t\x8f\xb1\xabǡ\x9a'\xa8\xbd'U\xa7OQ\x8bOS\xe3\xff\xa4v\xfcE\xdd;\x03ΝU\x85<\xa7\"\u007f\x1e\x04\xcdH\xb9\x10\x11\u007fz\x11\x83\xbd\x84;/G\xe0N\xafD\x04\xf8\\\xa5\x0f\xb9\x86߯+\xf1o\x80\xb57#̌\xff\x1d\xc9\xd7!=#\xe5\x1f\xb6\xf6/\xc9{K\u007f\xbc\x1d\xe1V\xc7;\x14\xf1\xbb\x11b\xe0{\x11\xb8\xdb\xfbp'\x0f\"@<\x0f\xd1\xc6#\xf2\xee?\xb2\xe7\xb1R\xeb\tk}\n\xcd\xcc\x15\xc5\xc2\xd8\xdc\xd1\xfc\xbd\xa57y\xa2 E^^\xf2EE{\xf2G\xe9J\vD\xa9\xfc\x05\xa3h\xbeP\x14\xa3)\x1c\x95%\xc6E\xa2\x1aa>\x13%k\x8aF\xd9\xe7g\xa3h\xbbXT\x8e\x81(\x1e\x95\x9d\x93\xcfE\x91Lz>*\x99\xa5\x12Q\xcap\xc9(\f\xcc\vQ\xbcx#\n\aY\x8aϾ\x14\x15J\x96\x8eRD\xcaD1ڗ\xa3\xe2\xb3\xcaFI\x82W\xa2x\xe7FT\xccz\xb9(\x81`yޘ\x12Ed_!*(\xb9b\x14f㵨(C\xa5\xa8n\b\xac\x1c\xc5i8Q\u074b\x11\xa5\x1f\xac\x82\x81U\x8d\"\x19\xf8&n\xa9\x16M\x98\xdc\xf4\xc1\xe9)գ\\\x84P#\xca$\xd4[Qq\xc95\xa3bCގ\"\x92\u007f'*9\xe9Z\xecDm\xd2\xea\xdd(\x97EՉ҆ԍ\xc2AFah\xebE\xe1\xe2\xeaG\x11L5\x88\x8a(5\x8c2\x8am\x14\x05\xd4~?*\xb6\xbbq\x14ǹ|\x00\n4\xe1\xedM\xb5\xc6\x0f\xa3\xc8&4\x8b\x12\xfc5g\xf3-\xf8x\xcbh\xa1D\xc87H\x80\xf4Gф\xa1\x1b\x96\x9e\xd2*1<ِ\x11\xe5\xce\xf26dM[\xf4\xab\x1d\xc6\xdc^\xb9߁<\xe9\x18\x15I\xee\x84\xf1v\x8e2.\xee\x82\x1b\xbbF\xc5\xfcv\x8b\xc2\xfeu\xe7\xa5GT\xccEϨhY\xaf(LYo0\xa2OTR\xfc\x1fGix>\x89\n\x90\xff4\x9a0\x18}\xa5\xe8\x17\xd5m\xfe\xfd\xa3\"өhm@\x94\xd6i`\x14@vP\xb4P\xeba\xa9\xa3\xb2\a\xa7\xa6\xa4E\x13QO\x02Mf\xa7|\x16\x15\xe708J\x971$\x8a8'\x1d254*qͰ(\xe7n>\x8f2c1<\nu\x19\x11%\xe6Ɉb\x15^f\x94\xba9\x12Ս\x8ab\xa5\xfd\xe8\xa8\xee\xe6\xc7\x00\xb21\x801\x90\x91\xb1*\x85\xe3\xa2b\xb0\xc6C\\'D\xf16\u007f\x95\x8f/\xa3\\\xa8\xf9\x95~\xfe:\n\xeb\xfcMT]\xf8\xb7xr\xa2\x92c\x12x\xff\x1d\xca\xc9\xfa\xdd\xf7\x90\xf0\x1f8\xf6\x9c(1\xbd\x01\x8f\x19\xa3\f\x06LQ\xfa\x1c3:h\x812X\xa3\x05Z\x8f\xceN@I[\xb4h\xdb\xf4a\xd9\xe9Y\xa9\x83\xe4\x14\x17;8\xec \x81\x9cQĈ\xae(2\x02\xee(a\x8b'\n@\xec\x05\xdd|Q\xd8q?\x18\x15\x00W\x82\xf8?$\xfc\nG\xe1Q#Q伢\xa0wL{\x15\a\xa1\xa6P\x01\xa6F\xb1-Q\xe95-\xca\\\xe4OQ̆O\x8f\"\xd31\x03\xb5\xcfT\r\x9b\x15E\xe2~vT֝\xce\xc1\xc8\xe6F\vu\x1b\x9d=XN\xc1\x9c\x17\xe5Y\n\xf3\xd5\xea,\x80b/\xd4g\x17i;\x8b\xa3\x9cIZ\x12\xe5*\xf8\xa5Q\x18\xc0e\xe8\xcc\xf2(6\"\xac\x88r\x12~e\x14\x10}U\x14xwu\x14\xa8z\r\xa8\xb5\x16\x95\xafS1X\x1f\xe5ތ\rQ\xe4\x066\x82?\x9bP\xfe\x1c\x15/\xbb9\n_\xb5\x85#ߊ*~\x81ll\x8br\xfd\xc6\xf6(N\x17\xfd\x15\x84܁\xf27<\xba\x134\xdb\x15\x15,\xbf[5{O\x14\xd1\xe5^}\xf6\xf7(w\f\xecC\x8d\u007fD\x15\a\xef\x8f\"\xb8=\x10\x15\az\x90=8\x04A:\f\v|\x84<>J\xbbp,\xca<\xedq5y'\xa2\xc8מ\x84֞\x8a&\xf3ڧ\xa3ܼ\xfb'\xf4\xfc/h\xe3\x19z\x88\xb3Q\xf8\xe5sQ:\xf4\xf3Q\x99T\xb8\xa0]\xbe\x88\x86/E1\x15p\x19\x95^Q\xd6\\\x8d\n\xba\xbe\x16U@p=\n\x18}C\x1f\xbc\xa9\xfd\xfa\x9b\xb4\xfb'\n\xa4\xf6o\x14\xbe\xf4V\x94\xc0\xeb\xb6^\xef\x80Xw\xa3X\x9c\u007f/\n\xa7}\x1f=}\xa0\x8d=\x84\x1a?\x8a\xf2\xf4\xa1\xff\xf4\xb9\xc7Q\xc0\x84'\xe8\xe4Sx\xba\\1\xe8C\xee\x18\xcce\x9e\x98hWޘ\xfc\x9e/&\xec\xcb\x1f\x03u\vĤ\xf6\x821\x82\x80B1\xd1\xf4\xc21z\x8f\"1\xa9\xe8\x99\x18\x13\x96Ec\x00\x0f\xcf\xc6d\xd9|\xb1\x18\xbbS<\xc6p\xf9\xb9\x98$\xf2\x9f\x8fa\x8fc\t\xd4Y2\x86\x15h/\xc4\xe0a_\x8cI\xbfK\xc5DL_\x8aq\xf7@\xe9X\x92+e\xf8\xe0\xcbZk\xd9\x18\xb1\xc8+1\xd1\xfbWc\"\x16\xe5b4\xeb\xe5c\xc4')1P\xb0\x02\x06S1F\xedx-FTQ)\xc6h1&r\xf2zL\f\xdb\x1b1\xaaW\x15\xf6\xa7j\x8c\x00\xe0͘(B\xb5\x18\x8dPu\xf4\xb2\x06\x1ex+F\xdf[S\xa9\xf1v\x8c\xde\xfd\x9d\x18\xe4\xad\x16\xfaV[\x1b~7\x06\x06ԉ\xc1\xb1ԍ\x89\xe8\xbc\xc7\x1b\xeb\xc5ē֏\xc1\x936\x88\xc1\xa75\x8c\xd1y6\x8aѷ\xbd\x1f\x13\xff\xd7X\x87\xf8A\x8c\x9e\xb2IL\xa4\xb3iL|ч B\xb3\x18\xbdT\xf3\x98ؕ\x16\xb1\x84\xbdj\tb\u007f\x14\xa3 \xb4\x8a\x89\xe6\xb5ƃmb\xb0\xf5mc\xb4\x81\xedbb\xfc\xda\xc7`\xad;\xc4\xe0\x1c:\xc6\xe8::\xc5\xe83:\xc7h\xe8\xba\xc4h~\xbb\xea\xf0\xba\xc5DĻ\xa3\xd5\x1e\xe0aOi\xbb\x17\x88\xd7;\x06{\xda'&\xf6\xe2\xe3\x18\f\xdf'1\xb1q\x9f\xc6\xc4\x02\xf4\x8dAu\xfb\xc5h\xb1\xfaǸU\x1f\x8c\x1b\x80;\x06\xc6\xf4\xd5\xfd\xa8:\rR\xfa\x99\xca\xc2`\xca\xe9\x90\x18\xd5(]\xafCcT\xafa\x14\x83\xcfA\x85\xe1`߈\x18Md\x86\nu\xa6\xd64\x92\x02轸Hh\xbd8U\xb5>oh\x10\a&h\b\xda6\x8a\xc3/\xbc\x1fg\xa64\x0e\xec\xf9\x01\x1ak\x82\xb2i\x1c9\xab\x0fQS\xb3\xb8\x98\x8f\xe6q$\xc9Z\xc4\xe1F[\xc6\xe9R>ⷭ\xe2\x9crm\x1d\xe72\xc26 a\xdb8\x97.\xb7\x8b\x8b\xa1j\x0f\xe6t\xc0\xff\x1dQv\xc2]\x9d\xf1\u007f\x978\x14\xb0k\x9c\x96\xb5\x9b^\xbb\xc7\xc5/\xf5\x88\v,\xe8\x19\xc7\x01\xaf\xbd\xe2X\xda\xd0;\x0eS\xd5'\x0e\xb3\xff1\t\xf7\t\xda\xf8\x94u\xf5U\xba\xf5\x03\xa1\xfaǙ K\x8d\xd3^\x0e\xd0\xeb\xc08\xd4tP\x9c\xd83\x8d\xb5\u007fƶ\x06ǹ\x11?\x0e;\x9eN\xb2\r\x8d\xf3@\xb8aq8\xf4\xcf\xe3p\x80\xacfD\\\xd4*#.\x9e \x93]\x1b\x19\xe7;\xfa\xc1\xf7\xd1q\x98\xb6,eNv\\`Ҙx£\x8f\x8d\xcbK\xb6\xc7\xe1\xf9\xf1\xda\xc2\x04>\xfaE\x9c\xb6\xe3K\xb6\xf1U\x1c\xe6\xefk\x10\xe5\x1b\x8e\xf5[\xa5\xd7D\xd0k\x12{\xff\x1d\x06>Y\a\xfa=\t\xf6\x83\xd2!\a\xa42\xf0N#\xc6`\xd2f\xcd\xe8\xaa\x05\x1d\xb2Ɖ\x18mq\xaeڰ\xc7u\v\xa2~vR\xbc\\z\x9b[\xaf\x1e\xbd\xcd\x1b\xc7\xd6\x1a_\\\xd2o~\xedI\x00\x9f\x82zkHo\r\xf3\xd6H\x1c\xe9\xd5(e3F\xcb\x10\xe7\x97S\xe2\x00\xabS\xe3\xdc$\xf4#\x06;-\x8e\x18\xe2'2n:F2#\x9e7\xe1\x8af\xa2\x9c\x85r6\xca9(碜\x87r>\xca\x05(\x17\xa2\\\x84r1\xca%(\x97\xa2\\\x86r9\xca\x15(W\xa2\\\x85r5\xca5(ע\\\x87r=\xca\r(7\xa2܄\xf2g\x94\x9bQnA\xb9\x15\xe5/(\xb7\xa1\u070e\xf2W\x94;P\xfe\x86r'\xca](w\xa3܃r/\xca\xdfQ\xeeC\xf9\a\xca\xfd(\x0f\xa0<\x88\xf2\x10\xca\xc3(\x8f\xa0<\x8a\xf2\x18\xca\xe3(O\xa0<\x89\xf2\x14\xca\xd3(\xffD\xf9\x17\xca3(Ϣ<\x87\xf2<\xca\v(/\xa2\xbc\x84\xf22\xca+(\xaf\xa2\xbc\x86\xf2:\xca\x1b(o\xa2\xfc\x1b\xe5?(\xffEy\v\xe5m\x94wP\xdeEy\x0f\xe5}\x94\x0fP>D\xf9\b\xe5\u007f(\x1f\xa3|\x822ה<\xe9Y\xb9\x13Ÿ%OF\xd6s\x89b\xdc\xf3Srg\x94H\xfc\x93YrJ\x9e\xb4q/Lɝ\xf6\xe2\x94\xab\xb3\x94\xe3\xba$\xee\x19\xdfU\xfe\xcd언'\xd1\xe9\xee\xf2aT\x8f\xc4\b\x12,\xe8\x89˸^\x89\x81\fH\xef\x8d\x0f\x99}\xa6\xe4\x1f l\xf8?\x9a\xce:\xc0\x8d\x9b\x89\xe2\xfd\x0e\x9223333\xb7i\x03\xc5\x14\x92\xa2\xe5\xddH^/(\x1e9\xb7N\x99\x99\x99sP\x0esRfffffn?\xcd\x1b\xdd?\xf3{\xef͊\xbc\xb6\xef\xec&\xcd\x11\xc2\xf2H\xc4\xf1Qb\xed\xd1l+\xee\x18\xa0<\x96GV*0V\xf1%\xfe U\xb6\xcd\"\x12kc\xb6\x85\x1b\x05\x94\x9aG\x14\x06\xc6\xd6\x18q\x99p\x16\xd7al\x8a\xd1.\x03ʜ[\xcd\x02\xc6Z\xcc\xd8(G\xc36\x1a\x8c\x96#\xa0t|e\xab\tcnj\xeb\xc8\xfd\xf9\xba\x80\xb2\x1c\xd7\xeeт\xb1c\xc7u\xe6|\xae\xe3`\xe3\xe3\xc5\xda\x13\xd8V܉@y\x12\x8f\xa8\x9c\fcOa\x14\xeeT\xa0<\x8d[\xc5\xe90\xf6\fFӝ\t\x94gq\xaby6\x8c=\x87'\xf6\x9b=\x17\xb6q\x1e\xa3\xe5\xce\a\xca\v\xf8\xcaօ0\xf6\"\xbe\xd2ߚ\x8ba\x1b\x97\x8c\xeb0Y\xcd]\n\x94\x97\x8dk\xf7\xb8\x1c\xc6^1\xae\xd3#.\xaf\x84\x8d\xaf\x12k\xaff[q\xd7\x00\xe5\xb5<\xa2r\x1d\x8c\xbd\x9e/\xf1\xf7\xe4\x06\xb6\xcd\xe2F\xb1\xf6&\xb6\x85\x1b\a\x94\xdd<\xa2聱\xbd\xb8\xd2\xf5\x01\xe5\xcd\xdcj\xde\x02co\xc5\xe8Fy\x1bl\xe3vF\xab\xbc\x83/i\xdd\tc\xc7\xf3%\xfe,\x13`\x1b\x13ǵ\xfb\xa3L\xe2ZN\x1eזզ\xb0\xb4S\xc7u\xf01\xa6\xb1\x89\xa7\xc3\xd8\x19\xdeT\xdcL\xae\xe5,\u007fie6K;\xc7w\x9b\x85\x9b\v\x94w\xf9\xacY\xdc\rc\xef\xf1\xa6p\xf7r-\xef\xf3#\x8a\xfbY\xda\a|\x8d\xcb\a}\x10?ė\xbb\x87\xb9\x96\x8f\xf8\xa0\xf9(K\xfb\x18\x8fo\x94\x8f\xb3i<\xe1k\xcb=ɵ|\xca_\xd3z\x9a\xa5}f\\\xfb\xa8\x9a{\x96k\xf9ܸ\xb6Q\xb5\xe7Y\xda\x17|\xad\xb8\x17\xb9\x96/\xf9\xb8\xf22K\xfb\x8a\xafE\xf9\xaa\x0f\x8a\xd7X\xda\xd7}m\xba7\xb8\x96o\xfa\xb8\xf9\x16K\xfb\xf6\xb8\x8eQ~\xe5w\xd84\xde\xf5\xb5\xe5\xde\xe3Z\xbe\xef\xafi}\xc0\xd2~8\xae}L\xcd}ĵ\xfcx\\ۘ\xda',\xed\xa7\xe3:\xc6\xf8\x97\xe5g@\xf99g\xf1\x170\xf6Ko*\xee+\xae\xe5\xd7~D\xe5\x1b\x96\xf6[_\v\xf7\x1d\xd7\xf2{\x1f\x17?\xb0\xb4?\xfa\x1a\x97?q\xb5?\xfb\xdat\xbfp-\u007f\xf5\x974\u007fci\u007f\xf7\xf3\xfam\xfe\xc1\xa6\xf1\xa7\xaf-\xf7\x17\xd7\xf2o\u007fM\xeb\x1f\x96\xf6_\u007f\x8d\xbf\xd1\xff\xb1i\xcc\xd3\xdd\x1e\xf9\x9f \\˶\ueda8\xd6\xce\xd2vtwD~\xb3\x9dl\xe2\x010v\xa07\x157/\xd7r>\u007fie~\x96v\x01\xdf\xf57xAo\x9a\xc5B\xbe\x16na\xae\xe5\"\xfe\x9abQ\x96v1_\xe3rq\x1f\xc4K\xb0\xb4K\xf2\xd5n)\xae\xe5\xd2>n.\xc3\xd2.\xcbs5\xca\xe5\xd84\x96\xefnw5\xb7\x02\xd7r\xc5\xee6W[\x89\xa5]\xb9\xbb\xc3\xf9\xad\xad\xc2\xc6\xff\xe2\xc4Ʈ\xe6Mŭε\\\xc3_ZY\x93\xa5]\xcbw\xfdSpm\xa0\\\xc7g\xcdb]\x18\xbb\x9e7\x85[\x9fk\xb9\x81\x1fQl\xc8\xd2n\xe4k\\n\xec\x83x\x13\x96vS\x1e\xe46\xe3Zn\xee\xe3\xe6\x16,\xed\x96\xf7+\x9f\xedM\xb38\aƞ\xebM\xe1\xce\xe3Z\x9e\xef/-.`i/\xf45./\xf2A|1K{\t\x0fr\x97r-/\xf3q\xf3r\x96\xf6\n\x9e\xa5Q^ɦq\x95\xdfbZsW\x03\xe55~\xf7i\xedZ\x18{\x9d?u\xea7x=l|\x83X{#ۊ\xbb\t(\xc7\xf1\x88J7\x8c\xed\xe1K\xfcn{\xd96\x8b>\xb1\xf6f\xb6Ey\v_Z\xdc\ncoc\xc4\xe5\xed\x9c\xc5w\xc0\xd8;1̍\a\xca\t\xdcjN\x84\xb1\x930U\xa3\x9c\fۘ\xc2h\xb9\xa9@9\x8d\xaflM\x87\xb13\xf8J\xffn5\x13\xb61\xab\xbb\xdd\x1fo6\xd7rNw[Z\x9b\xcb\xd2\xde\xd5\xdd\xe1\xcf\xe2\xee\x06\xca{8\x8b\uf171\xf7ySq\xf7s-\x1f\xf0#*\x0f\xb2\xb4\x0f\xf9\xae\u007fkx\x18(\x1f\xf1Y\xb3x\x14\xc6>\xe6M\xe1\x1e\xe7Z>\xe1G\x14O\xb2\xb4O\xf9\x1a\x97O\xfb ~\x86\xa5}\x96\a\xb9縖\xcf\xfb\xb8\xf9\x02K\xfb\"\xcf\xd2(_b\xd3x\xd9ז{\x85k\xf9\xaa\xbf\xa6\xf5\x1aK\xfb\xba\xbf\xc6\x1f\xea\r6\x8d7\xbb\xdbuͽŵ|\xbb\xbbM\xd7\xdeai\xdf\xed\xee\xd0\xfeL\xef\x01\xe5\xfb\x9c\xc5\x1f\xc0\xd8\x0f\xbd\xa9\xb8\x8f\xb8\x96\x1f\xfb\x11\x95OX\xdaO}ן\xe93\xa0\xfc\xdcg\xcd\xe2\v\x18\xfb\xa57\x85\xfb\x8ak\xf9\xb5\x1fQ|\xc3\xd2~\xebk\xec\xbe\xe3Z~\xef\xe3\xf8\a\x96\xf6G\x1e\xea~\xe2Z\xfe\xec\xe3\xe6/,\xed\xaf\x96v~_c\xb7\x00\xd7rA\x1f\xc7\v\xb1\xb4\v\xf3P\xb7\b\xd7rQ\x1f7\x17ci\x17\xe7\xb9\x1a\xe5\x12l\x1aK\xf6th\xff\xf0.\x05\x94K\xf7\xb4{,\xd3ө\xf9A]\x16a\xbc\x9cX\xbb<ۊ[\x01(W\xe4K++\xc1ؕ\xf9\x12\xffخ\",W\xe5\xb8Y\xac&֮ζpk\x00\xe5\x9a<\xb2X\vƮ͈\xdd:@\xb9.\xb7\xe2\xf5`\xec\xfa\x98\xc4m\x00\x94\x1br\xab\xb9\x11\x8c\xdd\x18\x137\xcaM`\x1b\x9b\xf6tf\xbc\xe1\xcdz:\x98\x9b3*n\v\xa0ܲ\xa7\xddc+\x18\xbb5_\xe97\xb8\r\xdbf\xb1\xadX\xbb\x1d\xdb\xc2m\x0f\x94;\xf0\x88bG\x18\xbb\x13#.w\xe6,\xde\x05\xc6\xee\x8a\xd1n7\xa0ܝ[\xcd=`잘\xb1Q\xee\x05\xdbػ\xa7Ô57\b(\xf7\xe9i\xf7\xd8\x17\xc6\x0e\xee\xe9\xf4\x88\xdd\x10a9\x14q\x88\xbbY\xda\x1e\x1e\xe4z\xb9\x96}>n\xde\xcc\xd2\xde³4\xca[\xd94n\xf3\xb5\xe5n\xe7Z\xde\xe1\xafi\xdd\xc9Ҏ\xf7\xd7\xf0g\x186\x8d\x89=\xedU\xff\x11\x86k9\xb9\xa7\xadZ\x9b\xc2\xd2N\xed\xe9\xa8\xfag\xe54\xa0\x9c\xceY<\x03\xc6\xce\xf4\xa6\xe2fq-g\xfb\x11\x959,\xed\\\xdf\xe5\x8f0\xde\xf8\x8f00\xf6\x1eo\xfcG\x18\xae\xe5}\xfe\xd2\xe2~\x96\xf6\x01_\xfdG\x18\x1f\xc4\x0f\xb1\xb4\x0f\xf3 \xf7\b\xd7\xf2Q\x1f7\x1fci\x1f\xe7Y\x1a\xe5\x13l\x1aO\xfa\xdarOq-\x9f\xf6״\x9eai\x9f\xf5\xd7\xf8\xc3<Ǧ\xf1\xbc?\x99\xbf'/\x00\xe5\x8b\xfe\x80ck/\xc1ؗ{:=b\xf7\x8a\xb0|\x15q\xfc\x9aX\xfb:ۊ{\x03(\xdf䑕\xb7`\xecی\xa2|\x87\xb3\xe2]\x18\xfb\x1e\xc3\xff\xbc\xe1,\xfe\x00\xc6~\xc8h\x96\x1fq\xd6\xfc\x18\xc6~\xc2\xd3\xfb#|\n\xdb\xf8\x8c\xd1r\x9f\x03\xe5\x17|e\xebK\x18\xfb\x15_\xe9\x0f\xf25l\xe3\x1b\xff\xea\xf0'\xf9\x16(\xbf\U000ef631\xb5\xefa\xec\x0f\xfe\xf5\xc6'\xf8\x116\xfeI\xac\xfd\x99m\xc5\xfd\x02\x94\xbf\xf2\x88\xcao0\xf6w\xbe\xc4ߛ?\xd86\x8b?\x19E\xf9\x17`\xfff\xf8\x9fE< \xfe\x17W\x94\xff\xb1i\xce\xd3\xcb\xc6\xfe\xaf\x97G7\xca6\xd8F;\xa3\xe5:\x80\xb2\xb3\xd7_\xd9\x1a\x00c\a\xf2\x95\xfe\f\xf3\xc26\xe6\xebm\xa7\x9a\x9b\x9fk\xb9@o\x1b\xd5\x16di\x17\xea\xed \xbf\xfd\x85\xd9ċ\xc0\xd8E\xbd\xa9\xb8Ÿ\x96\x8b\xfbK+K\xb0\xb4K\xfa\xae\xdf\xf7R\xde4\x8b\xa5a\xec2\xde\x14nY\xae\xe5r\xfe\xd2by\x96v\x05_\xe3rE\x1f\xc4+\xb1\xb4+\xf3 \xb7\n\xd7rU\x1f7WciW\xe7Y\x1a\xe5\x1al\x1ak\xfa\xdarkq-\xd7\xf6״\xd6ai\xd7\xf5\xd7\xf8c\xacǦ\xb1\xbe7\xfe\x18\x1b\x00\xe5\x86>\xa3\xdaF0v\xe3\xdeN\xe2\xa3l\x02\x1bo*\xd6nƶ\xe26\a\xca-xDeK\x18\xbb\x15\xa3p[\x03\xe56\xdc*\xb6\x85\xb1\xdb1\xe2r{\xce\xe2\x1d`쎌\xa6\xdb\t(w\xe6Vs\x17\x18\xbb+\xa3\xe5v\x03\xcaݹ\xd5\xda\x03\xc6\xee\xc9\xfb\xf0\xfb\xdf\v\xb6\xb1wo\xc7X\xff\x1e:\b(\xf7\xe9m\xf7\xd8\x17\xc6\x0e\xee\xed\x1c\xcb\xef\xa2C\xd86\x8b\xa1b\xed0\xb6\x85\xdb\x0f(\xf7\xe7\x11\xc5\x010\xf6@F\xec\x0e\x02ʃ\xb9\x15\x0f\x87\xb1\x87`\x12w(P\x1eƭ\xe6\xe10v\x04&n\x94#a\x1bG0Z\xeeH\xa0<\x8a\xafl\x1d\rc\x8f\xe1+\xfdޏ\x85mTz;\xaa~\xef\n(\xab\xbd\xed\x1e\x11\x8c\x8d{;\xab\xfc\xf3`\x94\xb0\xd4\x1c7\v#\xd6\xd6\xd8\x16.\x01\xca:\x8f,R\x18\x9b1b\x97\x03e\xc1\xad\xd8\xc2\xd8ј\xa4lp\xd6$\x18\xeb0c\xa3l\xc26\xc60Z\xae\v(K\xbe\xb2Ղ\xb1c\xf9J\xbf\xf9\xe3`\x1b\xc7\xf7v4\x1a\x95\xf2\x84\xdev\x8f\x13{;\x1b\r\xbf͓8l\x16'3\nw\nP\x9eʗ\x14\xa7\xc1\xd8\xd3\x19\xb1;\x03(\xcf\xe4V|\x16\x8c=\x1b\x83\xdd9@y.\xb7\x9a\xe7\xc1\xd8\xf31\u007f\xa3\xbc\x00\xb6q!\xa3\xe5.\x02ʋ\xf9\xca\xd6%0\xf6R\xbe\xd2\xef\xf22\xd8\xc6\xe5\xfe\xc5\xda\xf0?\x9c\x80\xf2J\xffznT\xae\x82\xb1W3\xfc\xcf'Ίka\xecu\x8c\xd8]\x0f\x947p+\xbe\x11\xc6\xde\xc4h\xbaq@\xd9ͭf\x0f\x8c\xed\xf5\xef\f\xbc\xbb>\xd8\xc6͌\x96\xbb\x05(o\xe5+[\xb7\xc1\xd8\xdb\xf9J\xbf\xbb;`\x1bw\xfa\xe7\xb0\u007f\x02\x8c\a\xca\t\xfein*\x13a\xec$\xff4\xe7\x1b?\x99m\xb3\x98\"\xd6Ne[\xb8i@9\x9dG\x143`\xecLF\xecf\x01\xe5ln\xc5s`\xec\\L\xe2\xee\x02ʻ\xb9ռ\a\xc6ދ\x89\x1b\xe5}\xb0\x8d\xfb\x19-\xf7\x00P>\xc8W\xb6\x1e\x82\xb1\x0f\xf3\x95~\xef\x8f\xc06\x1e\xf5\x8fz\xc5=Ƶ|\xbc\xb7\xadQy\x82\xa5}\xd2?\xee~\xdbOy\xd3,\x9e\x86\xb1\xcfxS\xb8g\xb9\x96\xcf\xf9K\x8b\xe7Y\xda\x17|\x8d\xcb\x17}\x10\xbf\xc4Ҿ̃\xdc+\\\xcbW}\xdc|\x8d\xa5}\x9dg\xf1\x9f\x94\xd84\xde\xf4\xb5\xe5\xde\xe2Z\xbe\xed\xafi\xbd\xc3Ҿ\xeb\xaf\xf1{{\x8fM\xe3\xfd\xde\xf6\xa4\xe6>\xe0Z~\xd8ۖ\xd4>bi?\xee\xedH\xfc\xcf\xc8O\x80\xf2S\xce\xe2\xcf`\xec\xe7\x1e\xfe\xd5\xf6\x05P~\xe9[\xcd\xe2+\x18\xfb\xb57\x85\xfb\x86k\xf9\xad\x9f\xac\xf8\x8e\xa5\xfd\x9e\xafq?p-\u007f\xf4q\xf3'\x96\xf6g\x1e\xd4(\u007fa\xd3\xf8\xd5ז\xfb\x8dk\xf9\xbb\xbf\xa6\xf5\aK\xfb\xa7\xbf\xc6\xef\xf5/6\x8d\xbf{\xdbG\xd7\xdc?\\\xcb\u007f{\xdbF\xd7\xfeci\xe7\xe9\xeb\x18\xed\xf7\xfa?\xa0l\xeb\xf3Y\xdc\x0ec;<\xfc^;\x81r\x80o5\x8b\x810v^o\n7\x1f\xd7r\xfe\xbe\xb6\xd1\xc5\x02,\xed\x82|\x8d[\x88k\xb9\xb0\x8f\x9b\x8b\xb0\xb4\x8b\xf2\xa0F\xb9\x18\x9b\xc6⾶\xdc\x12\\\xcb%\xfd5\xad\xa5Xڥ\xfd5~\xaf˰i,\xdbב\xf8\av9\xa0\\\xbe\xaf\xddc\x05\x18\xbbb_g\xc2\x0f\xeeJ\xc2re\xc4\xf1*b\xed\xaaL\xbf\xdb\xd58n\x16\xab\x8b\xb5k\xb0-ܚ@\xb9\x16OX\xac\rc\xd7\xc1\x95n]\xa0\\\x8f[\xcd\xf5a\xec\x06\x18\xdd(7\x84ml\xc4h\xb9\x8d\x81r\x13\xbe\xb2\xb5)\x8cݬ\xaf#\xf7\x1b\xde\x1c(\xb7\xe8k\xf7\xd8\x12\xc6n\xd5י\xf3\x86\xb7\x16\x96\xdb \x8e\xb7\x15k\xb7c\xfa\ro\xcfq\xb3\u0601Q\xb8\x1d\x81r'\x9e\xa8\xd8\x19\xc6\xee\x82+\xca]9k\xee\x06cw\xc7\xe8F\xb9\alcOF\xcb\xed\x05\x94{\xf3\x95\xadA0v\x1f\xbe\xd2?\xc0\xfb\xc26\x06{\xb4jn\bP\x0e\xf5W\xb6j\xc3`\xec~\xfeʖ\xdf\xf0\xfe\xc2\xf2\x00\xc4\xf1\x81b\xedAL\xbf\xe1\x839n\x16\xc3\xc5\xdaC\xd8\x16\xeeP\xa0<\x8c',\x0e\x87\xb1#p\xa5\x1b\t\x94Gp\xaby$\x8c=\xaa\xaf\xdd\u007f\xa0;\x9akyL_[Y;\x96\xa5\xad\xf4u\xf0\x879\x05\x94U\xce\xe2\b\xc6\xc6\x1e\xfc)\xc9g\xfeC\x92\xaf\xfe3\x12ײ\xe6\x87\x17\tK[\xf7\xb5\xe5R\xaee\xe6\xe3V\xce\xd2\x16~\xa8\u007f\x04,\x9b\xc6\xe8\xbev\u007f\xfe\x06ג\xfaڼfi\x9b}\x1d|\xf61@\xd9\xc5Y\\\xc2ؖ\x87\u007f9\x8c\x05\xca\xe3|\xabY\x1c\x0fcO\xf0\xa6p'r-O\xf2\x93\x15'\xb3\xb4\xa7\xf05\xeeT\xae\xe5i>n\x9e\xceҞ\xc1\x83\x1a\xe5\x99l\x1ag\xf9\xdargs-\xcf\xf1״\xceei\xcf\xf3\xd7\xf8\xbd\x9eϦqA\x1f\xff\xe7\xd7\vQ/B\xbd\xb8\xaf\xfd\xc0\xc2]\xd2\xd76\xb4vi_\xfb\x90\x9a\xbb\xac\xafc?\xbf\xfd\xcb\xfb\xda\xf7h\xd9+\xfa\xda\x0f\xa6ڕ}\x1d\x83\xfc\xa7ū\xfa\xda\a\xc5\xf6꾶a\xb5k\xfa:\xf6\xf1\x0f\xf7\xb5}\xedC[\x8d\xeb\xfa:vWMw}_\xfb\xb0\xc2\xde\xd0\xd76\xa2\xb8\xb1\xaf\xfd\x80\xa6\xbb\x89/j\x16\xe3\xfaڇW\\w_۠J\x0f\x96\xecE\xed\xeb\xeb\xd83\xf2?y\xfa\xdawo6n\xe1\x15\x9aŭ\xbcvao\xebk\x1b\u07bc\xbd\xafm\u007f{G_\xc7`\xff\x92\xba\xb3\xaf}d\xe1\xc6\xfbY[nB_\xfb>Y1\xb1\xaf}\x84\xff\x94\xd4\xd7~h\xb31\xd9oҴ\xa6x\x1d۩}m#+\xd3\xfa\xda\x06\x17ӱʌ\xbe\xf6\xc1Ik\xa6\xdfy\xe1f\xf1d\xb5xv_\xdbaŜ\xbe\xb6=\x9bs\xfb\xf8\x8f\x0e5\xee\xf2\xa7\xa8\xc5w\xf7\xb5\xedѺ\xa7\x8f\xff\xa4\x88\xbd\xd7\x1f\xbef\xef\xe3\xfd\x17\xf6~\xbe\xaa\xe2\x1e\xc0|\x0f\xb2)\xecC\xfe\x02\x13?\xdc\xd79\x92?\xc2<\x82֣}mC\xe2\xc7 \x1fG}\x02\xf5IԧP\x9fF}\x06\xf5Y\xd4\xe7P\x9fG}\x01\xf5EԗP_F}\x05\xf5U\xd4\xd7P_G}\x03\xf5MԷP\xdfF}\a\xf5]\xd4\xf7P\xdfG\xfd\x00\xf5CԏP?F\xfd\x04\xf5S\xd4\xcfP?G\xfd\x02\xf5K\u052fP\xbfF\xfd\x06\xf5[\xd4\xefP\xbfG\xfd\x01\xf5GԟP\u007fF\xfd\x05\xf5W\xd4\xdfP\u007fG\xfd\x03\xf5OԿP\xffF\xfd\a\xf5_\xd4yƷ\xe9\xca\xffƷ\xeb\x8an\x1b\xdf\xe1\xabn\a\xa8\x83\xb3\xbc\x93M\x9e\f\x00\xcc@\u03a2y\xb9\xa6\xf3q\x94\xea\xf9\x81l\x01@-\b\xd0B\x80[\x18\xb0\x8b\x00fQ\x1e\x96-\xc6U-Α\xa2%\xd8Вl\x88\x96\xc2\x1aziΒe\xb8V\x97\xe5Z_\x8e\xab[\x9e\xab]\x81\xabY\x91k\xbc\x12\x0f\x88\xf5\xca\xe3;\x19z\x15!\xad\x8a8_\r6OV\x17\x9a5\x10Gk\x02\xe9ZHS\xbd\xb60[G\xa8\xd6\x15\xd2zB\xb7\xbe\xd0n 4\x1bbx\xb6\x11\xa06F\xaah\x13X\xda\x14\x96h3YRo\x8e8\xd9\x02\xa8n\tԷ\x02\xdcր\xdd\x060\xdb\xfa\x03\xb5*\xdbyӪ\xe8\xed\xfdp\x0f\xbd\x83\x90vD\x9c\xef\x04\x9b';\v\xcd.\x88\xa3]\x81t7\xa4\xa9\xde]\x98\xed!T{\ni/\xa1\xdb[h\a\t\xcd>\x18\x9e\xed\v\xa8\xc1H\x15\r\x81\xa5\xa1\xb0D\xc3dI\xbd\x1f\xe2d\u007f\xa0z\x00P?\x10p\a\x01\xf6`\xc0\f\a\xe2C00և\x8e\x1f\x00\xeaÂ\xa0å\x93\x8f\x90 OF\x06a\x8e\x90Nt\xa40=J\x1a\xa9>:\x88\xec\x98 ԱAP%\b\xa7\x82\xb0\xd5 L$\xd3d\xb1P\x8d\x92\x86\"-\x01\x19\t\xfc\aٰ\x03\x9dH'\xa9\v\xab\xa9\xb0\x9e\t].\xb4\x85\xd0X\u007f\xf7\xe2b\xb4?r\\\xe8\x86\x0f=4\t\xc9!Λ\xb0y2Fh\xba\x10G%\x90\xb6\x90\xa6z\xac0;N\xa8\x8e\x17\xd2\tBw\xa2О$4'cxv\n\xa0NE\xaa\xe84X:\x1d\x96\xe8\fYR\x9f\x8989\v\xa8\x9e\r\xd4\xcf\x01ܹ\x80=\x0f0\xe7\xfb7\x85\xf8\x02>\x95\xbe\x90\x13\xad/\x02\xe8b\xce\xf2K\xd8\xe4ɥ\x80\xb9\x8c\xb3\xe8r\xae\xe9\x15\x1c\xa5\xfaJ \xbb\nPW\x03t\r\xe0\xae\x05\xecu\x80\xb9\x9e\x87e7pU7r\xa4\xe8&64\x8e\rQ7\xd6\xd0=\x9c%\xbd\\\xab}\\\xeb7su\xb7p\xb5\xb7r5\xb7\xf1S..n\xe7\x9b\xe2\x1f\xf8;\xf8n\xf2\x8d\xb83\b\x1a/\x9d|\x82\x04y21\b3I:\xd1da:E\x1a\xa9\x9e\x1aD6-\b5=\b\x9a\x11\x84\x9b\x19\x84\x9d\x15\x84\x99-\xd3ds\x84j\xae4\x14\xdd%\x01\xdd-\x01\xd1=a\a\xfa^\xe9$\xf7\t\xab\xf7\v\xeb\x0f\b݃B\xfb\x90\xd0<\xcco\x18\xf1#8\xb2~\x14\xa1֏\t\xe9q\xc4\xf9\x13\xb0y\xf2\xa4\xd0<\x858z\x1aH\x9fA\x9a\xeag\x85\xd9sB\xf5\xbc\x90^\x10\xba\x17\x85\xf6%\xa1y\x19óW\x00\xf5*RE\xaf\xc1\xd2\xeb\xb0DoȒ\xfaM\xc4\xc9[@\xf5m\xa0\xfe\x0e\xe0\xde\x05\xec{\x80y\xdf?\xe5\x8a\x0f\xfc\xa9\n\xfd\xa1O\xfc}\xfb\b\xa0\x8f9\xcb?a\x93'\x9f\x02\xe63\u03a2Ϲ\xa6_p\x94\xea/\x81\xec+@}\r\xd07\x80\xfb\x16\xb0\xdf\x01\xe6{\x1e\x96\xfd\xc0U\xfdȑ\xa2\x9f\xd8\xd0\xcfl\x88~\xc1\x1a\xfaWΒ߸V\u007f\xe7Z\xff\x83\xab\xfb\x93\xab\xfd\x8b\xab\xf9\xdb\u05ee\xca?~@WE\xff\xeb\xcf\xec\xa1\xff\x13\xd2<\x138\xce\xff7\x81m\x9e\xb4\tM;\xe2\xa8\x03H;\x91\xa6z\x800\x1b(T\xf3\ni>\xa1\x9b_h\x17\x10\x9a\x051<[\bP\v#U\xb4\b,-\nK\xb4\x98,\xa9\x17G\x9c,\x01T\x97\x04\xeaK\x01ni\xc0.\x03\x98e\x81x9\f\x8c\xf5\xf2\x13\x06\x80z\x85 hE\xe9\xe4+I\x90'+\aaV\x91N\xb4\xaa0]M\x1a\xa9^=\x88l\x8d ԚA\xd0ZA\xb8\xb5\x83\xb0\xeb\x04a֕i\xb2\xf5\x84j}i(\xda@\x02\xdaP\x02\xa2\x8d\xc2\x0e\xf4\xc6\xd2I6\x11V7\x15\xd67\x13\xbaͅv\v\xa1\xd9r\x82\xbf\x87\xf1V\xfe\xc8E\xac\xb7\xf6\xa1\x87\xdeFH\xdb\"η\x83͓\xed\x85f\a\xc4ю@\xba\x13\xd2T\xef,\xccv\x11\xaa]\x85\xb4\x9b\xd0\xed.\xb4{\b͞\x18\x9e\xed\x05\xa8\xbd\x91*\x1a\x04K\xfb\xc0\x12\xed+K\xea\xc1\x88\x93!@u(P\x1f\x06\xb8\xfd\x00\xbb?`\x0e\xf0\aj\x15\az\xd3*\xf4A~\xb8\x87>XH\xc3\x11\xe7\x87\xc0\xe6ɡBs\x18\xe2\xe8p \x1d\x814\xd5#\x85\xd9\x11Bu\xa4\x90\x8e\x12\xba\xa3\x85\xf6\x18\xa19\x16ó\n\xa0\x14REUX\x8a`\x89bYR\x8fB\x9ch\xa0j\x80z\rp\t`\xeb\x80I'\xb4\xe9f\xe6O\xd5ԹO\x9aZ\x17\x00Y\xce\xf2\xd1l\xf2\xa4\x01\x18\xe2,r\\\xd3&G\xa9\x1e\x03d]\x80*\x01j\x01n,`\x8f\x03\xcc\xf1<,;\x81\xab:\x91#E'\xb1\xa1\x93\xd9\x10\x9d\x825\xf4\xa9\x9c%\xa7q\xad\x9eε~\x06Ww&W{\x16Ws6\xbf\x86\xe2\xe2\x1c~\x96\xf9\x1f;\xe7\xf2ӓ\u007f\x0e\x9d\x17\x04\x9d/\x9d\xfc\x02\t\xf2\xe4\xc2 \xccE҉.\x16\xa6\x97H#\u0557\x06\x91]\x16\x84\xba<\b\xba\"\bwe\x10\xf6\xaa \xcc\xd52Mv\x8dP]+\rE\xd7I@\xd7K@tC\u0601\xbeQ:\xc9M\xc2\xea8a\xbd[\xe8z\x84\xb6Wh\xfa\xfc\x91\xbb\xe2\x9bqd}\vB\xado\x15\xd2m\x88\xf3\xdba\xf3\xe4\x0e\xa1\xb9\x13q4\x1eH' M\xf5Da6I\xa8&\vi\x8a\xd0M\x15\xdaiB3\x1dó\x19\x80\x9a\x89T\xd1,X\x9a\rK4G\x96\xd4s\x11'w\x01ջ\x81\xfa=\x80\xbb\x17\xb0\xf7\x01\xe6~>P\xed\x0165\xfd \x0f\xafi\xfd\x90\x90\x1eF\x9c?\x02\x9b'\x8f\n\xcdc\x88\xa3ǁ\xf4\t\xa4\xa9~R\x98=%TO\v\xe9\x19\xa1{Vh\x9f\x13\x9a\xe71<{\x01P/\"U\xf4\x12,\xbd\fK\xf4\x8a,\xa9_E\x9c\xbc\x06T_\a\xeao\x00\xeeM\xc0\xbe\x05\x98\xb7\xf9M\xa1\xf9\x0e\xbf\xa0\x9a\xfa]~\t\xfa\x97\xd1{Bz\x1fq\xfe\x01l\x9e|(4\x1f!\x8e>\x06\xd2O\x90\xa6\xfaSa\xf6\x99P}.\xa4/\x84\xeeK\xa1\xfdJh\xbe\xc6\xf0\xec\x1b@}\x8bT\xd1w\xb0\xf4=,\xd1\x0f\xb2\xa4\xfe\x11q\xf2\x13P\xfd\x19\xa8\xff\x02\xb8_\x01\xfb\x1b`~\xf7\a\x8a\x9b\u007fx\x137\xf5\x9f~\xb8\x87\xfeKH\u007f#\xce\xff\x81͓\u007f\x85\xe6?\xc4\xd1<\x13\x19\xe9\xff&r\x9a\xea6a\xd6.T\x1dB\xea\x14\xba\x01B;Ph\xe6\xc5\xf0l>@͏T\xd1\x02\xb0\xb4 ,\xd1B`\xae\x17F\x9c,\x02T\x17\x05\xea\x8b\x01nq\xc0.\x01\x98%'\xfa;T[ʛVM/\xed\x87{\xe8e\x84\xb4,\xe2|9\xd8\xe2d\x03\xa0\xba!P\xdf\bp\x1b\x03v\x13\xc0l:\xb1M\xd76\xf3\xa7\xaa\xe9\xcd}\xe2O\xb3\x05@[r\x96o\xc5&O\xb6\x06\xcc6\x9cE\xdbrM\xb7\xe3(\xd5\xdb\x03\xd9\x0e\x80\xda\x11\xa0\x9d\x00\xb73`w\x01̮<,ۍ\xabڝ#E{\xb0\xa1=\xd9\x10\xed\x855\xf4ޜ%\x83\xb8V\xf7\xe1Zߗ\xab\x1b\xcc\xd5\x0e\xe1j\x86N\xe4?\xd73l\"\xff\xb9\x1e\xbd\x9f?3\u007f\x17\xb2\xbf\x90\x0e@\x9c\x1f\b\x9b'\a\t\xcd\xc1\x88\xa3\xe1@z\b\xd2T\x1f*\xcc\x0e\x13\xaaÅ4B\xe8F\n\xed\x11Bs$\x86gG\x01\xeah\xa4\x8a\x8e\x81\xa5ca\x89*\xb2\xa4V\x88\x93*P\x8d\x80z\f\xb8Q\x80Հ1@\\\xc3\xc0X'\x13\a\x80\xba\x1e\x04\xa5\xd2\xc93\t\xf2$\x0f\xc2\x14҉\xac0\x1d-\x8dT7\x82\xc8(\b傠f\x10nL\x10\xb6+\bS\xca4YK\xa8\xc6JC\xd1q\x12\xd0\xf1\x12\x10\x9d\x10v\xa0O\x94Nr\x92\xb0z\xb2\xb0~\x8aН*\xb4\xa7\t\xcd\xe9|\xd8V\xe5\f\xb6\xad\x8a>\x93\xe7\xe1\xefP\xce\n\x82ΖN~\x8e\x04yrn\x10\xe6<\xe9D\xe7\v\xd3\v\xa4\x91\xea\v\x83\xc8.\nB]\x1c\x04]\x12\x84\xbb4\b{Y\x10\xe6r\x99&\xbbB\xa8\xae\x94\x86\xa2\xab$\xa0\xab% \xba&\xec@_+\x9d\xe4:a\xf5za\xfd\x06\xa1\xbbQho\x12\x9aq¸[&\x88u\xcfā\"to\xbf\xa2\xbe\xd0\xcco\x0eQ\x9e\xdcү̭\xa1\x19\xdd\x16Dz{\xe8\xa5\xfa\x8e~\x95\xddٯ\xd4\xf8~E\x13\xfa\x95\x9bد\xec\xa4~e&\x87\xe9\xb2)A\xa8\xa9\xa1\xa7hZ\x88hz\x88\x88f\xf4oH\xcf\f\xcddV\x10\xd5\xd9A\xd4\xe7\x04\xe1\xe6\x06a\xef\n\xc2\xdc\xcdw=.\xee\xe1\xc7\xc3\xfffu/\xe7\xfc\xab\xd6}A\xd0\xfd\xd2\xc9\x1f\x90 O\x1e\f\xc2<$\x9d\xe8aa\xfa\x884R\xfdh\x10\xd9cA\xa8ǃ\xa0'\x82pO\x06a\x9f\n\xc2<-\xd3d\xcf\bճ\xd2P\xf4\x9c\x04\xf4\xbc\x04D/\x84\x1d\xe8\x17\xa5\x93\xbc$\xac\xbe,\xac\xbf\"t\xaf\n\xedkB\xf3:\xbfA\xc5o\xe0\xc8\xfaM\x84Z\xbf%\xa4\xb7\x11\xe7\xef\xc0\xe6ɻB\xf3\x1e\xe2\xe8} \xfd\x00i\xaa?\x14f\x1f\t\xd5\xc7B\xfaD\xe8>\x15\xdaτ\xe6s\fϾ\x00ԗH\x15}\x05K_\xc3\x12}#K\xeao\x11'\xdf\x01\xd5\xef\x81\xfa\x0f\x80\xfb\x11\xb0?\x01\xe6g<\x8d\xe3\xe2\x17\xdcN\u007f\xbb~\xc5Ӂo\xe0o\xfd\x8a~\x0f\xcd\xfc\x8f\x10\xe5ɟ\xfd\xca\xfc\x15\x9a\xd1\xdfA\xa4\xff\x84^\xaa\xff\xedW\xd9\u007f\xfdJ\xcd3)(\xfa_\xbfrm\xfdʶ\xf7+\xd31I\xa6\xcb:\x83P\x03BO\xd1\xc0\x10Ѽ!\"\x9a/\xa8\\\xcf\x1f\x9a\xc9\x02AT\x17\f\xa2\xbeP\x10n\xe1 \xec\"A\x98E'\xf1\x9bW\xbc\xd8$<\x1ezqɵ^\"\bZR:\xf9R\x12\xe4\xc9\xd2A\x98e\xa4\x13-+L\x97\x93F\xaa\x97\x0f\"[!\b\xb5b\x10\xb4R\x10n\xe5 \xec*A\x98Ue\x9al5\xa1Z]\x1a\x8a\u0590\x80֔\x80h\xad\xb0\x03\xbd\xb6t\x92u\x84\xd5u\x85\xf5\xf5\x84n}\xa1\xdd@h6\x9c\xc4\u007f\nv#>r\xa17\xe6\xd0\xdf\xefM\x84\xb4)\xe2|3\xd8<\xd9\\h\xb6@\x1cm\t\xa4[!M\xf5\xd6\xc2l\x1b\xa1\xdaVH\xdb\t\xdd\xf6B\xbb\x83\xd0\xec\x88\xe1\xd9N\x80\xda\x19\xa9\xa2]`iWX\xa2\xdddI\xbd;\xe2d\x0f\xa0\xba'P\xdf\vp{\x03v\x10`\xf6atU\xf6\xe5\x81]\x15=\x98\x1f\x18\xfe\x1ehH\x104T:\xf90\t\xf2d\xbf \xcc\xfe҉\x0e\x10\xa6\aJ#\xd5\a\x05\x91\x1d\x1c\x84\x1a\x1e\x04\x1d\x12\x84;4\b{X\x10\xe6p\x99&\x1b!T#\xa5\xa1\xe8\b\t\xe8H\t\x88\x8e\n;\xd0GK'9FX=VX\xaf\b\x9d\x12ڪ\xd0D\xc28\x96\tb=\x8a\x9f\xfb\xf8\x8eH\xf7+2\xa1\x99\xd7B\x94'I\xbf2\xf5Ќ\xd2 \xfcG>\xe9\xa5:\xefWYѯ\x94\xedW4\xba_\xb9F\xbf\xb2\u052f\x8c\v\xd3e\xcd Ԙ\xd0S\xd4\x15\"*CD\xd4\xeaߐ\x1e\x1b\x9a\xc9qAT\x8f\x0f\xa2~B\x10\xee\xc4 \xecIA\x98\x93q\xf3\xe3S\xf0t\x89\xf5\xa9\x9c\xf3\xf7G\xa7\x05A\xa7K'?C\x82<93\bs\x96t\xa2\xb3\x85\xe99\xd2H\xf5\xb9Ad\xe7\x05\xa1\xce\x0f\x82.\b\xc2]\x18\x84\xbd(\bs\xb1L\x93]\"T\x97JC\xd1e\x12\xd0\xe5\x12\x10]\x11v\xa0\xaf\x94Nr\x95\xb0z\xb5\xb0~\x8d\xd0]+\xb4\xd7\t\xcd\xf5x\x83*n\xc0K\xb8\xd07\xe2\xb5\xef_\xb67\x05A㤓wK\x90'=A\x98^\xe9D}\xc2\xf4fi\xa4\xfa\x96 \xb2[\x83P\xb7\x05A\xb7\a\xe1\xee\b\xc2\xde\x19\x84\x19/\xd3d\x13\x84j\xa24\x14M\x92\x80&K@4%\xec@O\x95N2MX\x9d.\xac\xcf\x10\xba\x99B;Khf\xf3\x1bTs\x0e\x1f\xb9\xa9\xe7r\xe8?_\xde%\xa4\xbb\x11\xe7\xf7\xc0\xe6ɽBs\x1f\xe2\xe8~ }\x00i\xaa\x1f\x14f\x0f\t\xd5\xc3BzD\xe8\x1e\x15\xdaDŽ\xe6q\fϞ\x00ԓH\x15=\x05KO\xc3\x12=#K\xeag\x11'\xcf\x01\xd5\xe7\x81\xfa\v\x80{\x11\xb0/\x01\xe6e\xbcf\xe3\xe2\x15\b\xbbB\x10fE\x99&[I\xa8V\x96\x86\xa2U$\xa0U% Z-\xec@\xaf.\x9dd\rauMa}-\xa1[[h\xd7\x11\x9au\xf9\xb0\xad\xe6zl[M\xbd>\xcf\xc3\xdfsm\x10\x04m(\x9d|#\t\xf2d\xe3 \xcc&҉6\x15\xa6\x9bI#՛\a\x91m\x11\x84\xda2\b\xda*\b\xb7u\x10v\x9b ̶2M\xb6\x9dPm/\rE;H@;J@\xb4S\u0601\xdeY:\xc9.\xc2\xea\xae\xc2\xfanB\xb7\xbb\xd0\xee!4{\xf2a\xe3\xe6^l\xe3\xa6ޛ\xe7\xe1\xef\xc0\x06\x05A\xfbH'\xdfW\x82<\x19\x1c\x84\x19\"\x9dh\xa80\x1d&\x8dT\xef\x17D\xb6\u007f\x10\xea\x80 \xe8\xc0 \xdcAA\u0603\x830\xc3e\x9a\xec\x10\xa1:T\x1a\x8a\x0e\x93\x80\x0e\x97\x80hD\u0601\x1e)\x9d\xe4\ba\xf5Ha\xfd(\xa1;Zh\x8f\x11\x9acqgk\x15\x9c\xbd\xa6\x15\x1e4\xff4\xae\x06A\x91t\xf2X\x82<\x19\x15\x84\xd1҉\x8c0\xadI#\xd5I\x10Y=\b\x95\x06AY\x10.\x0f\xc2\x16A\x18+\xd3d\xa3\x85\xaa!\rE$\x019\t\x88\x9aa\az\x8ct\x92.a\xb5\x14\xd6[B7Vh\x8f\x13\x9a\xe3'\xf3_C;\x81\x8f\\\xd3'r\xe8Oz\x92\x90NF\x9c\x9f\x02\x9b'\xa7\n\xcdi\x88\xa3Ӂ\xf4\f\xa4\xa9>S\x98\x9d%Tg\v\xe9\x1c\xa1;Wh\xcf\x13\x9a\xf31<\xbb\x00P\x17\"Ut\x11,]\fKt\x89,\xa9/E\x9c\\\x06T/\a\xeaW\x00\xeeJ\xc0^\x05\x98\xab'\xb7\xe5\x95k&\xb7\xe7\x15}\xed\xe4\x0e_\xf5u\x00]\xcfY~\x03\x9b<\xb9\x1107q\x16\x8d\xe3\x9avs\x94\xea\x1e \xeb\x05T\x1f@7\x03\xee\x16\xc0\xde\n\x98\xdbxXv;Wu\aG\x8a\xeedC\xe3\xd9\x10M\xc0\x1az\"g\xc9$\xae\xd5\xc9\\\xebS\xb8\xba\xa9\\\xed4\xaef:\xd7x\x06\x0f\x88\xf5\xccɝ\f=KH\xb3\x11\xe7s`\xf3d\xae\xd0܅8\xba\x1bH\xefA\x9a\xea{\x85\xd9}Bu\xbf\x90\x1e\x10\xba\a\x85\xf6!\xa1y\x18óG\x00\xf5(RE\x8f\xc1\xd2\xe3\xb0DOȒ\xfaI\xc4\xc9S@\xf5i\xa0\xfe\f\xe0\x9e\x05\xecs\x80y\xde\x1f\xa8Uy\xc1\x9bVE\xbf\xe8\x87\xf37c/\t\xe9e\xc4\xf9+\xb0y\xf2\xaaм\x868z\x1dH\xdf@\x9a\xea7\x85\xd9[B\xf5\xb6\x90\xde\x11\xbaw\x85\xf6=\xa1y\x1fó\x0f\x00\xf5!RE\x1f\xc1\xd2ǰD\x9fȒ\xfaS\xc4\xc9g@\xf5s\xa0\xfe\x05\xe0\xbe\x04\xecW\x80\xf9\x1a\x88\xbf\xc1\xc0X\u007f;y\x00\xa8\xbf\v\x82\xbe\x97N\xfe\x83\x04y\xf2c\x10\xe6'\xe9D?\v\xd3_\xa4\x91\xea_\x83\xc8~\vB\xfd\x1e\x04\xfd\x11\x84\xfb3\b\xfbW\x10\xe6o\x99&\xfbG\xa8\xfe\x95\x86\xa2\xff$\xa0y\xa6 \xfa\x9f\x88\\\xb7MA'i\x17V;\x84\xf5N\xa1\x1b \xb4\x03\x85f\xde)\xedy\\\xcc7\xa5\xc3W=\xbf\x0f\xf9\x17\xb7\x05\x84\xb4 \xe2|!\xd8\x01p\x13\x01;\t0\x93\x81x\n\x06\xc6z\xaa\u007fz⛣iA\xd0t\xe9\xe43$ȓ\x99A\x98Y҉f\v\xd39\xd2H\xf5\xdc \xb2\xbb\x82Pw\aA\xf7\x04\xe1\xee\r\xc2\xde\x17\x84\xb9_\xa6\xc9\x1e\x10\xaa\a\xa5\xa1\xe8!\t\xe8a\t\x88\x1e\t;ЏJ'yLX}\\X\u007fB\xe8\x9e\x14ڧ\x84\xe6i\xbe\x87\xf13|\xbbc\xfd\xac\x0f\xf9ۡ\xe7\x84\xf4<\xe2\xfc\x05\xd8\x1ap\r\xc0\x12`\xdcT\xfe+bM~A5\xf5\x98\xa9\xfc\x17̴\xee\x12R\x898o\xc1\xe6\xc9X\xa19\x0eqt<\x90\x9e\x804\xd5'\n\xb3\x93\x84\xead!\x9d\"t\xa7\n\xediBs:\x86gg\x00\xeaL\xa4\x8a\u0382\xa5\xb3a\x89Α%\xf5\xb9\x88\x93\xf3\x80\xea\xf9@\xfd\x02\xc0]\b؋\x00s\xb1?Pܼě\xb8\xa9/\xf5\xc3\xf9\x9b\x95˄t9\xe2\xfc\n\xd8<\xb9Rh\xaeB\x1c]\r\xa4\xd7 M\xf5\xb5\xc2\xec:\xa1\xba^H7\bݍB{\x93Ќ\xc3\xf0\xac\x1bP=H\x15\xf5\xc2R\x1f,\xd1Ͳ\xa4\xbe\x05qr+P\xbd\r\xa8\xdf\x0e\xb8;\x00{'`\xc6\xf3\x1d\xaaM\xe0\xd3\xd5\xf4D~<\xfcSn\x92\x90&#Χ\xc0\xe6\xc9T\xa1\x99\x868\x9a\x0e\xa43\x90\xa6z\xa60\x9b%T\xb3\x854G\xe8\xe6\n\xed]Bs7\x86g\xf7\x00\xea^\xa4\x8a\ue0e5\xfba\x89\x1e\x90%\xf5\x83\x88\x93\x87\x80\xea\xc3@\xfd\x11\xc0=\n\xd8\xc7\x00\xf3\xb8\u007fۮ=\xe1OU\xd3O\xfağ\xe6)\x80\x9e\xe6,\u007f\x86M\x9e<\v\x98\xe78\x8b\x9e皾\xc0Q\xaa_\x04\xb2\x97\x00\xf52@\xaf\x00\xeeU\xc0\xbe\x06\x98\xd7yX\xf6\x06W\xf5&G\x8a\xdebCo\xb3!z\ak\xe8w9K\xde\xe3Z}\x9fk\xfd\x03\xae\xeeC\xae\xf6#\xae\xe6\xe3\xa9mQ哩\xedQE\u007f:\xb5\xc3W\xfd\x19@\x9fs\x96\u007f\xc1&O\xbe\x04\xccW\x9cE_sM\xbf\xe1(\xd5\xdf\x02\xd9w\x80\xfa\x1e\xa0\x1f\x00\xf7#`\u007f\x02\xcc\xcf<,\xfb\x85\xab\xfa\x95#E\xbf\xb1\xa1\xdf\xd9\x10\xfd\x815\xf4\x9f\x9c%\u007fq\xad\xfe͵\xfe\x0fW\xf7/W\xfb\x1fW3\xcf4_\xe3\xffM\xf3\x03b\xdd6\xad\x93\xa1ۅԁ8\xef\x84͓\x01B3\x10q4/\x90·4\xd5\xf3\v\xb3\x05\x84jA!-$t\v\v\xed\"B\xb3(\x86g\x8b\x01jq\xa4\x8a\x96\x80\xa5%a\x89\x96\x92%\xf5҈\x93e\x80\xea\xb2@}9\xc0-\x0f\xd8\x15\x00\xb3\xa2?P\xab\xb2\x927\xad\x8a^\xd9\x0f\xe7/BV\x11Ҫ\x88\xf3\xd5`\xf3du\xa1Y\x03q\xb4&\x90\xae\x854\xd5k\v\xb3u\x84j]!\xad't\xeb\v\xed\x06B\xb3!\x86g\x1b\x01jc\xa4\x8a6\x81\xa5Ma\x896\x93%\xf5戓-\x80\xea\x96@}+\xc0m\r\xd8m\x00\xb3-\x10o\x87\x81\xb1\xde~\xda\x00P\xef\x10\x04\xed(\x9d|'\t\xf2d\xe7 \xcc.҉v\x15\xa6\xbbI#ջ\a\x91\xed\x11\x84\xda3\b\xda+\b\xb7w\x10vP\x10f\x1f\x99&\xdbW\xa8\x06KC\xd1\x10\th\xa8\x04D\xc3\xc2\x0e\xf4~\xd2I\xf6\x17V\x0f\x10\xd6\x0f\x14\xba\x83\x84\xf6`\xa1\x19\xee\xef^\\\x1c\xe2\x8f\xec\u007f\xcf9ԇ\xfc{\xcfaB:\x1cq>\x026OF\n\xcd\x11\x88\xa3#\x81\xf4(\xa4\xa9>Z\x98\x1d#T\xc7\n\xa9\"tJh\xabB\x13ax\x16\x03j\x14RE\x1a\x96\f,QM\x96\xd4\t\xe2\xa4\x0eTS\xa0\x9e\x01.\al\x01\x18;\xad-\x8aG\xf3\xa9t\x83\x13\xad\t \xc7Y\xded\x93'c\x00\xd3\xc5YTrM[\x1c\xa5z,\x90\x1d\a\xa8\xe3\x01:\x01p'\x02\xf6$\xc0\x9c\xccòS\xb8\xaaS9Rt\x1a\x1b:\x9d\r\xd1\x19XC\x9f\xc9Yr\x16\xd7\xea\xd9\\\xeb\xe7pu\xe7r\xb5\xe7q5\xe7\xf3S...\xe0\x9b\xe2\x1f\xf8\v\xf9n\xf2\x8d\xb8(\b\xbaX:\xf9%\x12\xe4ɥA\x98ˤ\x13].L\xaf\x90F\xaa\xaf\f\"\xbb*\buu\x10tM\x10\xee\xda \xecuA\x98\xebe\x9a\xec\x06\xa1\xbaQ\x1a\x8an\x92\x80\xc6I@\xd4\x1dv\xa0{\xa4\x93\xf4\n\xab}\xc2\xfa\xcdBw\x8b\xd0\xde*4\xb7\xf1\x1bF|;\x8e\xac\xef@\xa8\xf5\x9dB\x1a\x8f8\x9f\x00\x9b'\x13\x85f\x12\xe2h2\x90NA\x9a\xea\xa9\xc2l\x9aPM\x17\xd2\f\xa1\x9b)\xb4\xb3\x84f6\x86gs\x005\x17\xa9\xa2\xbb`\xe9nX\xa2{dI}/\xe2\xe4>\xa0z?P\u007f\x00p\x0f\x02\xf6!\xc0<\xec\x9fr\xc5#\xfeT\x85~\xd4'\xfe\xbe=\x06\xd0\xe3\x9c\xe5O\xb0ɓ'\x01\xf3\x14g\xd1\xd3\\\xd3g8J\xf5\xb3@\xf6\x1c\xa0\x9e\a\xe8\x05\xc0\xbd\bؗ\x00\xf32\x0f\xcb^\xe1\xaa^\xe5H\xd1kl\xe8u6Do`\r\xfd&g\xc9[\\\xabos\xad\xbf\xc3ս\xcbվ\xc7ռ\xefkW\xe5\x03?\xa0\xab\xa2?\xf4g\xe6/B>\x12\xd2Lj\xf3O`\xf3\xe4S\xa1\xf9\fq\xf49\x90~\x814\xd5_\n\xb3\xaf\x84\xeak!}#t\xdf\n\xedwB\xf3=\x86g?\x00\xeaG\xa4\x8a~\x82\xa5\x9fa\x89~\x91%\xf5\xaf\x88\x93߀\xea\xef@\xfd\x0f\xc0\xfd\tؿ\x00\xf37\x10\xff\x83\x81\xb1\xfe\xd7?=\xf1E\xc8\u007fA\xd0<\xd3\xd1\xc9\xff7\x1dA\x9e\xb4\x05aڥ\x13u\b\xd3Ni\xa4z@\x10\xd9\xc0 ԼA\xd0|A\xb8\xf9\x83\xb0\v\x04a\x16\x94i\xb2\x85\x84jai(ZD\x02ZT\x02\xa2\xc5\xc2\x0e\xf4\xe2\xd2I\x96\x10V\x97\x14֗\x12\xba\xa5\x85v\x19\xa1Yv\xba\xbf\x87\xf1r\xd3\xfd\xed\x8e\xf5\xf2>\xe4/BV\x10Ҋ\x88\xf3\x95`\xf3de\xa1Y\x05q\xb4*\x90\xae\x864ի\v\xb35\x84jM!\xad%tk\v\xed:B\xb3.\x86g\xeb\x01j}\xa4\x8a6\x80\xa5\ra\x896\x92%\xf5ƈ\x93M\x80\xea\xa6@}3\xc0m\x0e\xd8-\x00\xb3\xa5?P\xab\xd8ʛV\xa1\xb7\xf6\xc3\xf9\x8b\x90m\x84\xb4-\xe2|;\xd8<\xd9^hv@\x1c\xed\b\xa4;!M\xf5\xce\xc2l\x17\xa1\xdaUH\xbb\t\xdd\xeeB\xbb\x87\xd0\xec\x89\xe1\xd9^\x80\xda\x1b\xa9\xa2A\xb0\xb4\x0f,Ѿ\xb2\xa4\x1e\x8c8\x19\x02T\x87\x02\xf5a\x80\xdb\x0f\xb0\xfb\x03\xe6\x80\xe9mQ\xf3@\u007f\xaa\xa6>\xc8'\xfe\x03\xcf\xc1\x00\r\xe7,?\x84M\x9e\x1c\n\x98\xc38\x8b\x0e皎\xe0(\xd5#\x81\xec\b@\x1d\t\xd0Q\x80;\x1a\xb0\xc7\x00\xe6X\x1e\x96U\xb8*ő\xa2*\x1b\x8a\xd8\x10\xc5XC\x8f\xe2,\xd1\\\xab\x86k\xbd\xc6\xd5%\\m\x9d\xabI\xfd\xa5\xfc\xf5\x03?\xcb\xfc\x8f\x9d\x9c\x9f\x9e\xfcs\xa8\b\x82\xact\xf2\xd1\x12\xe4I#\bC҉\x9c0mJ#\xd5c\x82Ⱥ\x82Pe\x10\xd4\n\u008d\r\xc2\x1e\x17\x849^\xa6\xc9N\x10\xaa\x13\xa5\xa1\xe8$\t\xe8d\t\x88N\t;ЧJ'9MX=]X?C\xe8\xce\x14ڳ\x84\xe6l\u007f\xe4\xae\xf8\x1c\x1cY\x9f\x8bP\xeb\xf3\x84t>\xe2\xfc\x02\xd8<\xb9Ph.B\x1c]\f\xa4\x97 M\xf5\xa5\xc2\xec2\xa1\xba\\HW\bݕB{\x95\xd0\\\x8d\xe1\xd95\x80\xba\x16\xa9\xa2\xeb`\xe9zX\xa2\x1bdI}#\xe2\xe4&\xa0:\x0e\xa8w\x03\xae\a\xb0\xbd\x80\xe9\xe3\x03\xd5nfSӷ\xf0p\xff9\xeeV!݆8\xbf\x1d6O\xee\x10\x9a;\x11G\xe3\x81t\x02\xd2TO\x14f\x93\x84j\xb2\x90\xa6\b\xddT\xa1\x9d&4\xd31<\x9b\x01\xa8\x99H\x15͂\xa5ٰDsdI=\x17qr\x17P\xbd\x1b\xa8\xdf\x03\xb8{\x01{\x1f`\xee\xe77\x85\xe6\x03\xfc\x82j\xea\a\xf9%\xe8_F\x0f\t\xe9a\xc4\xf9#\xb0y\xf2\xa8\xd0<\x868z\x1cH\x9f@\x9a\xea'\x85\xd9SB\xf5\xb4\x90\x9e\x11\xbag\x85\xf69\xa1y\x1eó\x17\x00\xf5\"RE/\xc1\xd2˰D\xafȒ\xfaU\xc4\xc9k@\xf5u\xa0\xfe\x06\xe0\xde\x04\xec[\x80y\xdb\x1f(n\xbe\xe3M\xdc\xd4\xef\xfa\xe1\xfcE\xc8{Bz\x1fq\xfe\x01l\x9e|(4\x1f!\x8e>\x06\xd2O\x90\xa6\xfaSa\xf6\x99P}.\xa4/\x84\xeeK\xa1\xfdJh\xbe\xc6\xf0\xec\x1b@}\x8bT\xd1w\xb0\xf4=,\xd1\x0f\xb2\xa4\xfe\x11q\xf2\x13P\xfd\x19\xa8\xff\x02\xb8_\x01\xfb\x1b`~\xe7;T\xfb\x83OW\xd3\u007f\xf2\xe3\xe1\x9fr\u007f\t\xe9o\xc4\xf9?\xb0y\xf2\xaf\xd0\xfc\x878\x9ag\x06#\xfd\xdf\fNS\xdd&\xccڅ\xaaCH\x9dB7@h\a\nͼ\x18\x9e\xcd\a\xa8\xf9\x91*Z\x00\x96\x16\x84%Z\b\xcc\xf5\u0088\x93E\x80\xea\xa2@}1\xc0-\x0e\xd8%\x00\xb3䌶\xa8\xb6Ԍ\xf6\xa8\xa6\x97\xf6\t\xff\xa51\x80\x96\xe5,_\x8eM\x9e,\x0f\x98\x158\x8bV䚮\xc4Q\xaaW\x06\xb2U\x00\xb5*@\xab\x01nu\xc0\xae\x01\x985yX\xb6\x16W\xb56G\x8a\xd6aC\xeb\xb2!Z\x0fk\xe8\xf59K6\xe0Zݐk}#\xaenc\xaev\x13\xaef\xd3\x19\xfc?\xb5\xdfl\x06\xffO\xed\xf5\xe6\xfe\xcc\xfc]\xc8\x16B\xda\x12q\xbe\x15l\x9el-4\xdb \x8e\xb6\x05\xd2퐦z{a\xb6\x83P\xed(\xa4\x9d\x84ng\xa1\xddEhv\xc5\xf0l7@\xed\x8eT\xd1\x1e\xb0\xb4',\xd1^\xb2\xa4\xde\x1bq2\b\xa8\xee\x03\xd4\xf7\x05\xdc`\xc0\x0e\x01\xccP \x1e\x86\x81\xb1\xdeo\xc6\x00P\xef\x1f\x04\x1d \x9d\xfc@\t\xf2\xe4\xa0 \xcc\xc1҉\x86\v\xd3C\xa4\x91\xeaC\x83\xc8\x0e\vB\x1d\x1e\x04\x8d\b\u008d\f\xc2\x1e\x11\x849R\xa6Ɏ\x12\xaa\xa3\xa5\xa1\xe8\x18\t\xe8X\t\x88*a\aZI'\xa9\n\xab\x91\xb0\x1e\v\xdd(\xa1\xd5Bc\xf8\xb0\xadJ\x8dm\xab\xa2\x13\x9e\x87\xbfC\xa9\aA\xa9t\xf2L\x82<Ƀ0\x85t\"+LGK#Ս 2\nB\xb9 \xa8\x19\x84\x1b\x13\x84\xed\n\u00942M\xd6\x12\xaa\xb1\xd2Pt\x9c\x04t\xbc\x04D'\x84\x1d\xe8\x13\xa5\x93\x9c$\xac\x9e,\xac\x9f\"t\xa7\n\xediBs\xba0>C&\x88\xf5\x993\x06\x8a\xd0g\xf5+:;4\xf3sB\x94'\xe7\xf6+s^hF\xe7\a\x91^\x10z\xa9\xbe\xb0_e\x17\xf5+uq\xbf\xa2K\xfa\x95\xbb\xb4_\xd9\xcb\xfa\x95\xb9\x11\xb9\x9e_:\xc9\x02\xc2\xea\x82\xc2\xfaBB\xb7\xb0\xd0.\"4\x8b\xce\xe4\u007f\nf\xb1\x99\xfcO\xc1\xe8\xc59\xf4\xf7{\t!-\x898_\n6O\x96\x16\x9ae\x10G\xcb\x02\xe9rHS\xbd\xbc0[A\xa8V\x14\xd2JB\xb7\xb2Ю\"4\xabbx\xb6\x1a\xa0VG\xaah\rXZ\x13\x96h-YR\xaf\x8d8Y\a\xa8\xae\v\xd4\xd7\x03\xdc\xfa\x80\xdd\x000\x1b2\xba*\x1b\xf1\xc0\xae\x8aޘ\x1f\x18\xfe\x1eh\x93 hS\xe9\xe4\x9bI\x90'\x9b\aa\xb6\x90N\xb4\xa50\xddJ\x1a\xa9\xde:\x88l\x9b ԶA\xd0vA\xb8탰;\x04av\x94i\xb2\x9d\x84jgi(\xdaE\x02\xdaU\x02\xa2\xdd\xc2\x0e\xf4\xee\xd2I\xf6\x10V\xf7\x14\xd6\xf7\x12\xba\xbd\x85v\x90\xd0\xec#\x8c\xf7\x95\tb=x\xe6@\x11zH\xbf\xa2\xa1\xa1\x99\x0f\vQ\x9e\xec\u05ef\xcc\xfe\xa1\x19\x1d\x10Dz`\xe8\xa5\xfa\xa0~\x95\x1dܯ\xd4\xf0~E\x87\xf4+wh\xbf\xb2\x87\xf5+sx\x98.\x1b\x11\x84\x1a\x19z\x8a\x8e\b\x11\x1d\x19\"\xa2\xa3\xfa7\xa4\x8f\x0e\xcd\xe4\x98 \xaa\xc7\x06Q\xaf\x04\xe1T\x10\xb6\x1a\x84\x89p\xf3\xe3\x18O\x97X\x8f✿?\xd2A\x90\x91N^\x93 O\x92 L]:Q*L3i\xa4:\x0f\"+\x82P6\b\x1a\x1d\x84k\x04a)\b\xe3d\x9a\xac)Tc\xa4\xa1\xa8K\x02*% j\x85\x1d\xe8\xb1\xd2I\x8e\x13V\x8f\x17\xd6O\x10\xba\x13\x85\xf6$\xa19\x99\x0f\xdb*N\xc1K\xb8Ч\xe2\xb5\xef_\xb6\xa7\x05A\xa7K'?C\x82<93\bs\x96t\xa2\xb3\x85\xe99\xd2H\xf5\xb9Ad\xe7\x05\xa1\xce\x0f\x82.\b\xc2]\x18\x84\xbd(\bs\xb1L\x93]\"T\x97JC\xd1e\x12\xd0\xe5\x12\x10]\x11v\xa0\xaf\x94Nr\x95\xb0z\xb5\xb0~\x8d\xd0]+\xb4\xd7\t\xcd\xf5\xfc\x06ռ\x81\x8f\xdc\xd47r\xe8?_\xde$\xa4q\x88\xf3n\xd8<\xe9\x11\x9a^\xc4Q\x1f\x90ތ4շ\b\xb3[\x85\xea6!\xdd.tw\b\xed\x9dB3\x1eó\t\x80\x9a\x88T\xd1$X\x9a\fK4E\x96\xd4S\x11'Ӏ\xeat\xa0>\x03p3\x01;\v0\xb3\U0005a34b9x\xee\xfa\x1f\xaas\xf1\xdc石w\xf5+\xba;4\xf3{B\x94'\xf7\xf6+s_hF\xf7\a\x91>\x10z\xa9~\xb0_e\x0f\xf5+\xf5p\xbf\xa2G\xfa\x95{\xb4_\xd9\xc7\xfa\x95y\x95\x86\xa2\xcf$\xa0\xcf% \xfa\"\xec@\u007f)\x9d\xe4+a\xf5ka\xfd\x1b\xa1\xfbVh\xbf\x13\x9a\xefq\xd8\xda\x0f\xb05\xfd#\xe6\xf1\x1f\xc5\u007f\n\x82~\x96N\xfe\x8b\x04y\xf2k\x10\xe67\xe9D\xbf\v\xd3?\xa4\x91\xea?\x83\xc8\xfe\nB\xfd\x1d\x04\xfd\x13\x84\xfb7\b\xfb_\x10f\x9eY\x98&\xfb\x9fP\xb5\xcdBCQ\xbb\x04\xd4!\x01Q\xa7\x88\\\x0f\x90N2PX\x9dWX\x9fO\xe8\xe6\x17\xda\x05\x84f\xc1Y\xfc\x06\xd5\\\x88m\xab\xa9\x17\xe6y\xf8{\xaeE\x82\xa0E\xa5\x93/&A\x9e,\x1e\x84YB:ђ\xc2t)i\xa4z\xe9 \xb2e\x82P\xcb\x06A\xcb\x05\xe1\x96\x0f®\x10\x84YQ\xa6\xc9V\x12\xaa\x95\xa5\xa1h\x15\thU\t\x88V\v;ЫK'YCX]SX_K\xe8\xd6\x16\xdau\x84f]>l\xdc\\\x8fm\xdc\xd4\xeb\xf3<\xfc\x1d\xd8\x06AІ\xd2\xc97\x92 O6\x0e\xc2l\"\x9dhSa\xba\x994R\xbdy\x10\xd9\x16A\xa8-\x83\xa0\xad\x82p[\aa\xb7\t\xc2l+\xd3d\xdb\t\xd5\xf6\xd2P\xb4\x83\x04\xb4\xa3\x04D;\x85\x1d蝥\x93\xec\"\xac\xee*\xac\xef&t\xbb\v\xed\x1eB\xb3'\xeelm/\x9c\xbd\xa6\xf7ƃ\xe6\x9fƃ\x82\xa0}\xa4\x93\xef+A\x9e\f\x0e\xc2\f\x91N4T\x98\x0e\x93F\xaa\xf7\v\"\xdb?\bu@\x10t`\x10\xee\xa0 \xec\xc1A\x98\xe12Mv\x88P\x1d*\rE\x87I@\x87K@4\"\xec@\x8f\x94Nr\x84\xb0z\xa4\xb0~\x94\xd0\x1d-\xb4\xc7\bͱ\xb3\xf8\x9fb\xac\xf0\x91kZq\xc8\u007f\xa1LH\x11\xe2<\x86͓QB\xa3\x11G\x06HkHS\x9d\b\xb3\xbaP\xa5Bʄ.\x17\xdaBh,\x86g\xa3\x01\xd5@\xaa\x88`\xc9\xc1\x125eI=\x06q\xd2\x05TK\xa0\xde\x02\xdcX\xc0\x1e\a\x98\xe3g\xb55*'\xccjoT\xf4\x89\xb3:|\xd5'\x01t2g\xf9)l\xf2\xe4T\xc0\x9c\xc6Yt:\xd7\xf4\f\x8eR}&\x90\x9d\x05\xa8\xb3\x01:\ap\xe7\x02\xf6<\xc0\x9c\xcfò\v\xb8\xaa\v9Rt\x11\x1b\xba\x98\r\xd1%XC_\xcaYr\x19\xd7\xea\xe5\\\xebWpuWr\xb5Wq5Ws\x8d\xaf\xe1\x01\xb1\xbevV'C_'\xa4\xeb\x11\xe77\xc0\xe6ɍBs\x13\xe2h\x1c\x90v#Mu\x8f0\xeb\x15\xaa>!\xdd,t\xb7\b\xed\xadBs\x1b\x86g\xb7\x03\xea\x0e\xa4\x8a\ue125\xf1\xb0D\x13dI=\x11q2\t\xa8N\x06\xeaS\x007\x15\xb0\xd3\x003\xdd\x1f\xa8U\x99\xe1M\xab\xa2g\xfa\xe1\xfc\xcd\xd8,!\xcdF\x9cρ͓\xb9Bs\x17\xe2\xe8n \xbd\ai\xaa\xef\x15f\xf7\t\xd5\xfdBz@\xe8\x1e\x14ڇ\x84\xe6a\f\xcf\x1e\x01ԣH\x15=\x06K\x8f\xc3\x12=!K\xea'\x11'O\x01է\x81\xfa3\x80{\x16\xb0\xcf\x01\xe6y ~\x01\x03c\xfd\xe2\xac\x01\xa0~)\bzY:\xf9+\x12\xe4ɫA\x98פ\x13\xbd.LߐF\xaa\xdf\f\"{+\b\xf5v\x10\xf4N\x10\xee\xdd \xec{A\x98\xf7e\x9a\xec\x03\xa1\xfaP\x1a\x8a>\x92\x80>\x96\x80蓰\x03\xfd\xa9t\x92τ\xd5υ\xf5/\x84\xeeK\xa1\xfdJh\xbe\xf6w/.\xbe\xf1G\xf6\xbf\xa7}\xebC\xfe\xc5\xed;!}\x8f8\xff\x016O~\x14\x9a\x9f\x10G?\x03\xe9/HS\xfd\xab0\xfbM\xa8~\x17\xd2\x1fB\xf7\xa7\xd0\xfe%4\u007fcx\xf6\x0f\xa0\xfeE\xaa\xe8?X\x9ag6[\xa2\xff\x81\xb9n\x9b\xcdq\xd2\x0eT;\x80z'\xe0\x06\x00v `\xe6\x9d\xdd\u0588\xe7\x9b\xedO\xa5\xe7\xe7D\xeb\x05\x00Z\x90\xb3|!6y\xb20`\x16\xe1,Z\x94k\xba\x18G\xa9^\x1cȖ\x00Ԓ\x00-\x05\xb8\xa5\x01\xbb\f`\x96\xe5a\xd9r\\\xd5\xf2\x1c)Z\x81\r\xadȆh%\xac\xa1W\xe6,Y\x85kuU\xae\xf5ո\xbaչ\xda5\xb8\x9a5\xfd\xa5\xad\xb8X˟\x96\xbf\x97Z{\xf6\x00P\xaf\x13\x04\xad+\x9d|=\t\xf2d\xfd \xcc\x06҉6\x14\xa6\x1bI#\xd5\x1b\a\x91m\x12\x84\xda4\b\xda,\b\xb7y\x10v\x8b ̖2M\xb6\x95Pm-\rE\xdbH@\xdbJ@\xb4]\u0601\xde^:\xc9\x0e\xc2\xea\x8e\xc2\xfaNB\xb7\xb3\xd0\xee\"4\xbb\xfa#\xb7\xe2\xddpd\xbd;B\xad\xf7\x10Ҟ\x88\xf3\xbd`\xf3do\xa1\x19\x848\xda\aH\xf7E\x9a\xea\xc1\xc2l\x88P\r\x15\xd20\xa1\xdbOh\xf7\x17\x9a\x030<;\x10P\a!Ut0,\r\x87%:D\x96ԇ\"N\x0e\x03\xaa\x87\x03\xf5\x11\x80\x1b\t\xd8#\x00s\xa4\u007f\xca\x15G\xf9S\x15\xfah\x9f\xf8\xfbv\f@\xc7r\x96W\xd8\xe4\x89\x02L\x95\xb3(\xe2\x9a\xc6\x1c\xa5z\x14\x90i@\x19\x80j\x80K\x00[\aL\xcaò\x8c\xab\xca9RT\xb0!ˆh4\xd6\xd0\r\xce\x12\xe2Zu\\\xebM\xaen\fW\xdb\xc5Ք\xbevUZ~@WE\x8f\xf5g\xe6o\x95\x8e\x13\xd2\xf1\x88\xf3\x13`\xf3\xe4D\xa19\tqt2\x90\x9e\x824է\n\xb3ӄ\xeat!\x9d!tg\n\xedYBs6\x86g\xe7\x00\xea\\\xa4\x8a\u0383\xa5\xf3a\x89.\x90%\xf5\x85\x88\x93\x8b\x80\xea\xc5@\xfd\x12\xc0]\n\xd8\xcb\x00s9\x10_\x81\x81\xb1\xbe\xd2?=\xf1\xcd\xd1UA\xd0\xd5\xd2ɯ\x91 O\xae\r\xc2\\'\x9d\xe8zaz\x834R}c\x10\xd9MA\xa8qAPw\x10\xae'\b\xdb\x1b\x84\xe9\x93i\xb2\x9b\x85\xea\x16i(\xbaU\x02\xbaM\x02\xa2\xdb\xc3\x0e\xf4\x1d\xd2I\xee\x14V\xc7\v\xeb\x13\x84n\xa2\xd0N\x12\x9a\xc9|\x0f\xe3)|\xbbc=Շ\xfc\xed\xd04!MG\x9cπ͓\x99B3\vq4\x1bH\xe7 M\xf5\\av\x97P\xdd-\xa4{\x84\xee^\xa1\xbdOh\xee\xc7\xf0\xec\x01@=\x88T\xd1C\xb0\xf40,\xd1#\xb2\xa4~\x14q\xf2\x18P}\x1c\xa8?\x01\xb8'\x01\xfb\x14`\x9e\xe67\x85\xe2\x19~A\x15\xfaY~\t\xfa\x97\xd1sBz\x1eq\xfe\x02l\x9e\xbc(4/!\x8e^\x06\xd2W\x90\xa6\xfaUa\xf6\x9aP\xbd.\xa47\x84\xeeM\xa1}Kh\xde\xc6\xf0\xec\x1d@\xbd\x8bT\xd1{\xb0\xf4>,\xd1\a\xb2\xa4\xfe\x10q\xf2\x11P\xfd\x18\xa8\u007f\x02\xb8O\x01\xfb\x19`>\xf7o\n\xcd/\xfc\xa9\x9a\xfaK\x9f\xf8OP_\x01\xf45g\xf97l\xf2\xe4[\xc0|\xc7Y\xf4=\xd7\xf4\a\x8eR\xfd#\x90\xfd\x04\xa8\x9f\x01\xfa\x05p\xbf\x02\xf67\xc0\xfc\xceò?\xb8\xaa?9R\xf4\x17\x1b\xfa\x9b\r\xd1?XC\xff\xcbY\xf2\x1f\xd7\xea\t\xf2d\xfe \xcc\x02҉\x16\x14\xa6\vI#\xd5\v\a\x91-\x12\x84Z4\bZ,\b\xb7x\x10v\x89 ̒2M\xb6\x94P--\rE\xcbH@\xcbJ@\xb4\\\u0601^^:\xc9\n\xc2\xea\x8a\xc2\xfaJB\xb7\xb2Ю\"4\xab\xfa#wū\xe1\xc8zu\x84Z\xaf!\xa45\x11\xe7k\xc1\xe6\xc9\xdaB\xb3\x0e\xe2h] ]\x0fi\xaa\xd7\x17f\x1b\bՆB\xdaH\xe86\x16\xdaM\x84fS\f\xcf6\x03\xd4\xe6H\x15m\x01K[\xc2\x12m%K\xea\xad\x11'\xdb\x00\xd5m\x81\xfav\x80\xdb\x1e\xb0;\x00fG>Pm'65\xbd3\x0f\xf7\x1f\xf0v\x11Ү\x88\xf3\xdd`\xf3dw\xa1\xd9\x03q\xb4'\x90\xee\x854\xd5{\v\xb3AB\xb5\x8f\x90\xf6\x15\xba\xc1B;Dh\x86bx6\fP\xfb!U\xb4?,\x1d\x00Kt\xa0,\xa9\x0fB\x9c\x1c\fT\x87\x03\xf5C\x00w(`\x0f\x03\xcc\xe1\xfe@\xad\xe6\boZM=\xd2\x0f\xe7o]\x8e\x10ґ\x88\xf3\xa3`\xf3\xe4h\xa19\x06qt,\x90V\x90\xa6Z\t\xb3\xaaPEB\x8a\x85n\x94\xd0j\xa11\x18\x9e\xd5\x00\x95 UT\x87\xa5\x14\x96(\x93%u\x8e8)\x80\xaa\x05\xea\xa3\x01\xd7\x00,\x01\xc6\xf9\x03\xc5ͦ7qS\x8f\xf1\xc3\xf9\x9b\x95.!\x95\x88\xf3\x16l\x9e\x8c\x15\x9a\xe3\x10G\xc7\x03\xe9\tHS}\xa20;I\xa8N\x16\xd2)Bw\xaaО&4\xa7cxv\x06\xa0\xceD\xaa\xe8,X:\x1b\x96\xe8\x1cYR\x9f\x8b89\x0f\xa8\x9e\x0f\xd4/\x00܅\x80\xbd\b0\x17\xf3\x1d\xaa]§\xab\xe9K\xf9\xf1\xf0O\xb9˄t9\xe2\xfc\n\xd8<\xb9Rh\xaeB\x1c]\r\xa4\xd7 M\xf5\xb5\xc2\xec:\xa1\xba^H7\bݍB{\x93Ќ\xc3\xf0\xac\x1bP=H\x15\xf5\xc2R\x1f,\xd1Ͳ\xa4\xbe\x05qr+P\xbd\r\xa8\xdf\x0e\xb8;\x00{'`\xc6\xcfik\xd4&\xf8S\xd5\xf4D\x9f\xf0_\x1a\x03h2g\xf9\x146y2\x150\xd38\x8b\xa6sMgp\x94\xea\x99@6\vP\xb3\x01\x9a\x03\xb8\xb9\x80\xbd\v0w\xf3\xb0\xec\x1e\xae\xea^\x8e\x14\xdddž\xeegC\xf4\x00\xd6\xd0\x0fr\x96<ĵ\xfa0\xd7\xfa#\\ݣ\\\xedc\\\xcd\xe3sڲ\xca\x13sڳ\x8a~rN\x87\xaf\xfa)\x80\x9e\xe6,\u007f\x86M\x9e<\v\x98\xe78\x8b\x9e皾\xc0Q\xaa_\x04\xb2\x97\x00\xf52@\xaf\x00\xeeU\xc0\xbe\x06\x98\xd7yX\xf6\x06W\xf5&G\x8a\xdebCo\xb3!z\ak\xe8w9K\xde\xe3Z}\x9fk\xfd\x03\xae\xeeC\xae\xf6#\xae\xe6c\xae\xf1'< ֟\xce\xe9d\xe8τ\xf49\xe2\xfc\v\xd8<\xf9Rh\xbeB\x1c}\r\xa4\xdf M\xf5\xb7\xc2\xec;\xa1\xfa^H?\bݏB\xfb\x93\xd0\xfc\x8c\xe1\xd9/\x80\xfa\x15\xa9\xa2\xdf`\xe9wX\xa2?dI\xfd'\xe2\xe4/\xa0\xfa7P\xff\ap\xff\x02\xf6?\xc0\xcc3\xb7=kU\xfe7\xb7\xc3W\xdd6\xb7\x93\xa1ۅԁ8\xef\x84͓\x01B3\x10q4/\x90·4\xd5\xf3\v\xb3\x05\x84jA!-$t\v\v\xed\"B\xb3(\x86g\x8b\x01jq\xa4\x8a\x96\x80\xa5%a\x89\x96\x92%\xf5҈\x93e\x80\xea\xb2@}9\xc0-\x0f\xd8\x15\x00\xb3\"\x10\xaf\x84\x81\xb1^y\xee\x00P\xaf\x12\x04\xad*\x9d|5\t\xf2d\xf5 \xcc\x1a҉\xd6\x14\xa6kI#\xd5k\a\x91\xad\x13\x84Z7\bZ/\b\xb7~\x10v\x83 ̆2M\xb6\x91Pm,\rE\x9bH@\x9bJ@\xb4Y\u0601\xde\\:\xc9\x16\xc2\xea\x96\xc2\xfaVB\xb7\xb5\xd0n#4\xdb\xfa\xbb\x17\x17\xdb\xf9#\xfb\xdfs\xb6\xf7!\xff\u07b3\x83\x90vD\x9c\xef\x04\x9b';\v\xcd.\x88\xa3]\x81t7\xa4\xa9\xde]\x98\xed!T{\ni/\xa1\xdb[h\a\t\xcd>\x18\x9e\xed\v\xa8\xc1H\x15\r\x81\xa5\xa1\xb0D\xc3dI\xbd\x1f\xe2d\u007f\xa0z\x00P?\x10p\a\x01\xf6`\xc0\f\x9fۖŇ\xf0\xa9\xf4\xa1\x9ch}\x18@\x87s\x96\x8f`\x93'#\x01s\x04gё\\ӣ8J\xf5\xd1@v\f\xa0\x8e\x05\xa8\x028\x05\xd8*`\"\x1e\x96\xc5\\\xd5(\x8e\x14i6d\xd8\x10հ\x86N8K\xea\\\xab)\xd7z\xc6\xd5\xe5\\m\xc1\xd5X~\xca\xc5\xc5h\xbe)\xfc\xaf\x8a\xf1\xdd\xc4?+\x16\x049\xe9\xe4M\t\xf2dL\x10\xa6K:Q)L[\xd2H\xf5\xd8 \xb2\xe3\x82P\xc7\aA'\x04\xe1N\f\u009e\x14\x849Y\xa6\xc9N\x11\xaaS\xa5\xa1\xe84\t\xe8t\t\x88\xce\b;\xd0gJ'9KX=[X?G\xe8\xce\x15\xda\xf3\x84\xe6|~È/\xc0\x91\xf5\x85\b\xb5\xbeHH\x17#\xce/\x81͓K\x85\xe62\xc4\xd1\xe5@z\x05\xd2T_)̮\x12\xaa\xab\x85t\x8d\xd0]+\xb4\xd7\t\xcd\xf5\x18\x9e\xdd\x00\xa8\x1b\x91*\xba\t\x96\xc6\xc1\x12u˒\xba\aq\xd2\vT\xfb\x80\xfà\xbb\x05\xb0\xb7\x02\xe66\xff\x94+n\xf7\xa7*\xf4\x1d>\xe1\u007f\x85\f\xa0\xf1\x9c\xe5\x13\xd8\xe4\xc9D\xc0L\xe2,\x9a\xcc5\x9d\xc2Q\xaa\xa7\x02\xd94@M\ah\x06\xe0f\x02v\x16`f\xf3\xb0l\x0eW5\x97#Ew\xb1\xa1\xbb\xd9\x10݃5\xf4\xbd\x9c%\xf7q\xad\xdeϵ\xfe\x00W\xf7 W\xfb\x10W\xf3\xb0\xaf]\x95G\xfc\x80\xae\x8a~ԟ\x99\xbf\byLH\x8f#Ο\x80͓'\x85\xe6)\xc4\xd1\xd3@\xfa\f\xd2T?+̞\x13\xaa\xe7\x85\xf4\x82н(\xb4/\t\xcd\xcb\x18\x9e\xbd\x02\xa8W\x91*z\r\x96^\x87%zC\x96\xd4o\"N\xde\x02\xaao\x03\xf5w\x00\xf7.`\xdf\x03\xcc\xfb@\xfc\x01\x06\xc6\xfaC\xff\xf4\xc4\x17!\x1f\x05A\x1fK'\xffD\x82<\xf94\b\xf3\x99t\xa2υ\xe9\x17\xd2H\xf5\x97Ad_\x05\xa1\xbe\x0e\x82\xbe\t\xc2}\x1b\x84\xfd.\b\xf3\xbdL\x93\xfd T?JC\xd1O\x12\xd0\xcf\x12\x10\xfd\x12v\xa0\u007f\x95N\xf2\x9b\xb0\xfa\xbb\xb0\xfe\x87\xd0\xfd)\xb4\u007f\t\xcd\xdf|\x0f\xffO\xd3YGWn3Q\xbc\x9b\xa52333333Sd\xbfJ\x91m\xc5\xed(MSfffffZ\xe82\xef\xb6\xfd\xca\xcc\xcc\xcc\xed\xe7\xb9W\xef\x9f\xf9\xdd\xf9\xcdʲ\x1f%\xcf\xe7\xecI\xeb\x1f}\xba[\xf6\xdfFꍐ\xffH\x99n\x88\xea\xd0o\x88\xb6\xc1w\x90\xae?t>\x00(\a\u0096v\x10Y\r&\xcd\xf4\xa4\xcc@\xc6\x19\xc9z&\xd2͌\xe5\xd5,\x80\x99\x15\xd6\xc8lhev\xb4\"spK;'\xb4\x9f\v\xc8\xe6\x06\x8ay\x808/P\xcf\a\xb8\xf9\x874\x1f\n\xdd\v4M_\xb7]\xb0Y\xae7B\x16\"ea\xe8\xb0\b\xda\xe0\x17%\xddb\xd0\xf9\xe2@\xb9\x04li\x97$\xab\xa5H\xb34)ːqY\xb2^\x8et\xcbcy\xb5\x02`V\x845\xb2\x12ZY\x19\xad\xc8*\xdcҮ\n\xedW\x03\xb2Ձb\r \xae\t\xd4k\x01n\xed!\x1dU\xcf:\xcdU\xf5\xd8u\x1b\xd3|\xe1Y\x0f\x90\xf5Յ\r\xb4\t~C\xc0m\xa4.\xdfXk\xb9\x89\xaa\xd2n\nT\x9b\x01fs@\xb6\x00\xe2\x96@\xbd\x15\xe0\xb6\xd6e\xd56ZͶ\xaa\x8cl\xa7\x8dl\xaf\x8d\xc8\x0e\xd8\xc3\xee\xa8\xce\xef\xa45\xdbYk\xb1\x8bָ\xab\xd6z7\xadn\xf7\xe6\x9f\xf6\xb6\xba\xf7h\xaeV\xef{\xec9d\x10h\xf7JA\xf6\xe6$\xecC\x11\xfc\xbe)\xb8\xfd8\xc9\xf7'\xcb\x038(\xed\x81)T\a\xa5`\x0eNA\x0eI!\x1e\x9aB}X\n\xeep\x1e\xa6\xea$\x8d\xe1\xc0HF!9\x85H+\x9d\x81=\x82\x13o\xc9̑E\x17\x19=Y\x17\xa4+\x9bK\xeemU\xb8d\x1b \xad\xed&\xa5\x86\x0eG\xa2\r\xfe(\xd2\tt\x1e\x81\xb2\a\xb6\xb4G\x93U/i\x8e!\xa5\x8f\x8cǒ\xf5q\xa4;\x1e˫\x13\x00s\"\xac\x91\x93\xd0\xca\xc9hEN\xe1\x96\xf6Th\u007f\x1a\x90\x9d\x0e\x14g\x00\xf1L\xa0>\vpg\xeb\x05u\x9d\xa3M\x97=W\x977\xdf\xe3\xce#\xe5|\xe8p\x01\xda\xe0/$\xddE\xd0\xf9\xc5@y\tli/%\xab\xcbHs9)W\x90\xf1J\xb2\xbe\x8atWcyu\r`\xae\x855r\x1dZ\xb9\x1e\xad\xc8\r\xdc\xd2\xde\b\xedo\x02\xb2\x9b\x81\xe2\x16 \xde\nԷ\x01\xeev\xfdP\xe8\xb9C\xdfP=\xf6N}\v6o\xa3\xbbH\xb9\x1b:܃6\xf8{Iw\x1ft~?P>\x00[\xda\a\xc9\xea!\xd2\x82\xce?\x06\xcaO`K\xfb)Y}F\x9a\xcfI\xf9\x82\x8c_\x92\xf5W\xa4\xfb\x1a˫o\x00\xf3-\xac\x91\xef\xd0\xca\xf7hE~\xe0\x96\xf6Gh\xff\x13\x90\xfd\f\x14\xbf\x00\xf1W\xa0\xfe\rp\xbf7\x1f\xdb]\u007f4W\xd5e\xffl\x8c\xfe\xa71@\xfeV\x17\xfe\xd1&\xf8\u007f\x01\xf7\x9f\xba|\xba\xa1M-\xfb\rmTi;\x80\xaa?`\x06\x002\x10\x88\x83\x80z0\xe0\xa6\xd7e\xd5\fZ͌\xaa\x8c̤\x8d̬\x8d\xc8,\x8a`gU\xe7gӚͮ\xb5\x98Ck\x9cSk=\x97V7\xf7\xd0\x0e\xd39\xcf\xd0\xfe\xa6\xd3\xce;t@S\xed|\x80̯.,\xa0M\xf0\v\x02n!u\xf9\xc2Z\xcbET\x95vQ\xa0Z\f0\x8b\x03\xb2\x04\x10\x97\x04\xea\xa5\x00\xb7\xb4.\xab\x96\xd1j\x96Ued9mdymDV\xc0\x1evEu~%\xad\xd9\xcaZ\x8bU\xb4\xc6U\xb5֫iu\xabkm\xad\xa1\vZv͡\x03\x15v-Rֆ\x0e\xeb\xa0\r~]ҭ\a\x9d\xaf\x0f\x94\x1b\xc0\x96vC\xb2ڈ4\x1b\x93\xb2\t\x197%\xeb\xcdH\xb79\x96W[\x00fKX#[\xa1\x95\xadъl\xc3-\xed\xb6\xd0~; \xdb\x1e(v\x00\xe2\x8e@\xbd\x13\xe0vn.\xa8\xafs\x97\xa6\xe9봻6\xcb\xf5F\xc8n\xa4\xec\x0e\x1d\xf6@\x1b\xfc\x9e\xa4\xdb\v:\xdf\x1b(\xf7\x81-\xed\xbed\xb5\x1fi\xf6'\xe5\x002\x1eH\xd6\a\x91\xee`,\xaf\x0e\x01̡\xb0F\x0eC+\x87\xa3\x15\xe9\xe4\x96\xd6@\xfb\f\xc8r\xa0h\x01\xf1\b\xa0\xb6\x80s@\xab\v\v[\xd6\x0f\x1d\x04\xda\"\x05)9\t\x15E\xf0!\x05\xd7\xcdI^\x93\xe5\x91\x1c\x94\xf6\xa8\x14*I\xc1\xc4\x14\xa4'\x85xt\nuo\n\xee\x18\x1e\xa6\xea#ͱ\x1c\x189\x8eB\x8e\xa7\x109!\x9d\x81=\x91\x13\u007f\x12\x99\x9dL\x16\xa7\x90\xf1T\xb2>\x8dt\xa77\xcf^\xab\xfb\x8c撛\xdfs\xcel\xa4\xfe\xdes\x16)gC\x87s\xd0\x06\u007f.\xe9\u0383\xce\xcf\a\xca\v`K{!Y]D\x9a\x8bI\xb9\x84\x8c\x97\x92\xf5e\xa4\xbb\x1c˫+\x00s%\xac\x91\xab\xd0\xca\xd5hE\xae\xe1\x96\xf6Zh\u007f\x1d\x90]\x0f\x147\x00\xf1F\xa0\xbe\tp77\x1f\n\xad[\xf4\xaa\xec\xadj\xac\xbd\r\x90\xdbՅ;\xb4\t\xfeN\xc0ݥ.\xbf[ky\x8f\xaa\xd2\xde\vT\xf7\x01\xe6~@\x1e\x00\xe2\x83@\xfd\x10\xe0\x1e\xd6e\xd5#Zͣ\xaa\x8c<\xa6\x8d<\xae\x8d\xc8\x13\xd8\xc3>\xa9\xce?\xa55{Zk\xf1\x8c\xd6\xf8\xac\xd6z\x88V7T_r\xad\xeea\xfa\xa4\xe8\xdf\xf8\xd2g\x13\u007f\xe3+\x05\x19\xc1I\x18I\x11\xfc\xa8\x14\xdchN\xf21d9\x96\x83ҎK\xa1\x1a\x9f\x82\x99\x90\x82LL!NJ\xa1\x9e\x9c\x82\x9b\xc2\xc3TSI3\x8d\x03#\xcfS\xc8\v\x14\"/\xa63\xb0\xff\xe3ĿDf/\x93\xc5+d|\x95\xac_#\xdd\xeb\xfa\x81\xd1z\x03\x97l߄\xb4\xf6-Rކ\x0e\xef\xa0\r\xfe]ҽ\a\x9d\xbf\x0f\x94\x1f\xc0\x96\xf6C\xb2\xfa\x884\x1f\x93\xf2\t\x19?%\xeb\xcfH\xf79\x96W_\x00\xe6KX#_\xa1\x95\xafъ|\xc3-\xed\xb7\xd0\xfe; \xfb\x1e(~\x00\xe2\x8f@\xfd\x13\xe0~n^rݿ4W\xd5m\u007fm\x8c\xfei/@~W\x17\xfe\xd0&\xf8?\x01\xf7\x97\xba\xfco\xad\xe5?\xaaJ\xfb/P\xfd\a\x98\xe9\x86)\xa4\x1f\x10;\x80\xba?\xe0\x06\fk\x96U\x03\xb5\x9aA\xaa\x8c\f\xd6F\xa6\xd7Fd\x06E\xb03\xaa\xf33i\xcdf\xd6Z̢5Ϊ\xb5\x9eM\xab\x9b\xbd\xa9\xbd\x9ds4\vz;\xed\x9c\xc3\x06*\xec\\\xa4\xcc\r\x1d\xe6A\x1b\xfc\xbc\xa4\x9b\x0f:\x9f\x1f(\x17\x80-\xed\x82d\xb5\x10i\x16&e\x112.J\u058b\x91nq,\xaf\x96\x00̒\xb0F\x96B+K\xa3\x15Y\x86[\xdae\xa1\xfdr@\xb6\x02(G\u0096v\x14Y\x8d&\xcd\x18Rƒq\x1cY\x8f'\xdd\x04,\xaf&\x02f\x12\xac\x91\xc9he\nZ\x91\xa9\xdc\xd2N\x83\xf6\xcf\x03\xd9\v@\xf1\"\x10\xff\a\xd4/\x01\xeee\xbd\xa0\xaeW\xb4鲯\xea\xf2\xe6{\xdck\xa4\xbc\x0e\x1d\xde@\x1b\xfc\x9b\xa4{\v:\u007f\x1b(߁-\xed\xbbd\xf5\x1ei\xde'\xe5\x032~H\xd6\x1f\x91\xeec,\xaf>\x01̧\xb0F>C+\x9f\xa3\x15\xf9\x82[\xda/\xa1\xfdW@\xf65P|\x03\xc4o\x81\xfa;\xc0}\xaf\x1f\n=?\xe8\x1b\xaa\xc7\xfe\xa8o\xc1\xe6m\xf4\x13)?C\x87_\xd0\x06\xff+\xe9~\x83\xce\u007f\a\xca?`K\xfb'Y\xfdE\x9a\xbfI\xf9\x87\x8c\xff\x92\xf5\u007f\xa4\x9bn\xb8.\xaf\xfa\x01\xa6c\xb8Z#\xfd\xd1\xca\x00\xb4\"\x03\xc1`\aA\xfb\xc1@6=P\xcc\x00\xc4\x19\x81z&\xc0\xcd<\xbc\xf9m\xafg\x96\xa6i\xf5\xd8Y\x9b\xe5z#d6Rf\x87\x0es\xa0\r~N\xd2\xcd\x05\x9d\xcf\r\x94\xf3\xc0\x96v^\xb2\x9a\x8f4\xf3\x93\xb2\x00\x19\x17$\xeb\x85H\xb70\x96W\x8b\x00fQX#\x8b\xa1\x95\xc5ъ,\xc1-\xed\x92\xd0~) [\x1a(\x96\x01\xe2\xb2@\xbd\x1c\xe0\x96o.\xa8\xafk\x05\xbd\xba.\xbb\xa2>\x1e\xcdKn%RV\x86\x0e\xab\xa0\r~Uҭ\x06\x9d\xaf\x0e\x94k\xc0\x96vM\xb2Z\x8b4k\x93\xb2\x0e\x19\xd7%\xeb\xf5H\xb7>\x96W\x1b\x00fCX#\x1b\xa1\x95\x8dъl\xc2-\xed\xa6\xd0~3 \xdb\x1c(\xb6\x00\xe2\x96@\xbd\x15\xe0\xb6\x1e\xdea\xba\xb6i\xae\xaa\xcbn\xdb\x18\xfd\xdfA\x80l\xaf.\xec\xa0M\xf0;\x02n'u\xf9\xceZ\xcb]T\x95vW\xa0\xda\r0\xbb\x03\xb2\a\x10\xf7\x04\xea\xbd\x00\xb7\xb7.\xab\xf6\xd1j\xf6Ued?md\u007fmD\x0e\xc0\x1e\xf6@u\xfe \xad\xd9\xc1Z\x8bC\xb4\xc6C\xb5ևiu\x877\xd5tv6\vL\xa75\xcd5뽐\x8c\x94\x1c:\xb4\xd0\x06\u007f\x04\xe9,t\ue032\v\xb6\xb4\x9e\xac\nҔ\xa4Td\fd\xddM\xba\x1a˫#\x01s\x14\xac\x11A+\x11\xadH\x0f\xb7\xb4GC\xfb^ ;\x06(\xfa\x80x,P\x1f\a\xb8\xe3\x81\xd6\tXز'\x0e\x1f\x04ړR\x90\x939\t\xa7P\x04\u007fj\n\xee4N\xf2\xd3\xc9\xf2\f\x0eJ{f\n\xd5Y)\x98\xb3S\x90sR\x88\xe7\xa6P\x9f\x97\x82;\x9f\x87\xa9. ͅ\x1c\x18\xb9\x88B.\xa6\x10\xb9$\x9d\x81\xbd\x94\x13\u007f\x19\x99]N\x16W\x90\xf1J\xb2\xbe\x8atW\xeb\xc5\xf6u^\xa3m_\xa7\xbdV\x8f\xa3\xf7P\xaeKA\xae\xe7$\xdc@\x11\xfc\x8d)\xb8\x9b8\xc9o&\xcb[8(\xed\xad)T\xb7\xa5`nOA\xeeH!ޙB}W\n\xeen\x1e\xa6\xba\x874\xf7r`\xe4>\n\xb9\x9fB\xe4\x81t\x06\xf6AN\xfcCd\xf60Y\x05\xf7\x82>\xeb\xad\xee\x17\xf5\xf1h~\xb3\xfa\x9fz\xfdU\xeb\xa5\x14\xe4eN\xc2+\x14\xc1\xbf\x9a\x82{\x8d\x93\xfcu\xb2|\x83\x83Ҿ\x99B\xf5V\n\xe6\xed\x14\xe4\x9d\x14\xe2\xbb)\xd4\xef\xa5\xe0\xde\xe7a\xaa\x0fH\xf3!\aF>\xa2\x90\x8f)D>Ig`?\xe5\xc4\u007fFf\x9f\x93\xc5\x17d\xfc\x92\xac\xbf\"\xdd\xd7\xfa\x01\xd5\xfa\x06\x97l\xbf\x85\xb4\xf6;R\xbe\x87\x0e?\xa0\r\xfeG\xd2\xfd\x04\x9d\xff\f\x94\xbf\xc0\x96\xf6W\xb2\xfa\x8d4\xbf\x93\xf2\a\x19\xff$\xeb\xbfH\xf77\x96W\xff\x00\xe6_X#\xff\xa1\x95\xe9\x9e\xd3V\xa4\x1f\x18l\xc7s\xaa}\u007f \x1b\x00\x14\x03\x818\b\xa8\a\x03nz]\xd1\xd7\xea\x9e\xe1\xb9A\xa0\x9d\xf1\xb9\xc1\fv\xa6v\x92\x99\xd30̒T\U00033d93\x9b-\r\xf3\xd9S(\xe7H\xb3\xd2\xce\xd9N\xd5\\\xedd\xe6n'\x99\xa7\x9d\xe2\xbc\xedT\xcf\xd7Nn\xfet\xb8j\x81\x14̂ifd\xa1\xa4d\xe1\xa4D\x16i\x9f\x90]4\r\xfdb)d\x8b\xa7P,\x91B\\2\x85z\xa9\x14\xdc\xd2\xfax\xf4\xb5\x96\xe1\xe3a\x97\xa5\xb7v\xb9\x14dyN\xc2\n\x14\xc1\xaf\x98\x82[\x89\x93|e\xb2\\\x85\x83Ү\x9aB\xb5Z\nf\xf5\x14d\x8d\x14\xe2\x9a)\xd4k\xa5\xe0\xd6\xe6a\xaauH\xb3.\aF֣\x90\xf5)D6Hg`7\xe4\xc4oDf\x1b\x93\xc5&dܔ\xac7#\xdd\xe6\xcf5/\xe3\xee-\xf4\x92\xbb\xed\x96*\xf5\x8fc\x91\xb25t\xd8\x06m\xf0ےn;\xe8|{\xa0\xdc\x01\xb6\xb4;\x92\xd5N\xa4ٙ\x94]ȸ+Y\xefF\xbaݱ\xbc\xda\x030{\xc2\x1a\xd9\v\xad\xec\x8dVd\x1fni\xf7\x85\xf6\xfb\x01\xd9\xfe@q\x00\x10\x0f\x04\xea\x83\x00w\xb0\xa2\xb7\xf3\x10]\xd8\xdbi\x0f\xd5\aF\xef\x03\x1d\x96\x82\x1c\xceI\xe8\xa4\bޤ\xe02N\xf2\x9c,[\x1c\x94\xf6\x88\x14*\x9b\x82q)HW\nѧP\x17)\xb8\x92\x87\xa9*\xd2\x04\x0e\x8ctSHM!rd:\x03{\x14'^\xc8,\x92E\x0f\x19\x8f&\xeb^\xd2\x1dC\xb6\xfax\x80\x96=V_\xfb\xb8Gt\\;\xc9\xf1i\x18NH*\xf8\x13\xdbɝ\x94\x86\xf9\xc9)\x94\xa7\xa4YiOm\xa7\xea\xb4v2\xa7\xb7\x93\x9c\xd1N\xf1\xccv\xaa\xcfj'wv:\\uN\n\xe6\xdc43r^Rr~R\"\x17\xb4O\xc8^\x98\x86\xfe\xa2\x14\xb2\x8bS(.I!^\x9aB}Y\n\xeer<\xf9\xad+\xf0ri\xd9+\xd5\xeb\xfd\xa3\xabR\x90\xab9\t\xd7P\x04\u007fm\n\xee:N\xf2\xeb\xc9\xf2\x06\x0eJ{c\n\xd5M)\x98\x9bS\x90[R\x88\xb7\xa6Pߖ\x82\xbb\x9d\x87\xa9\xee ͝\x1c\x18\xb9\x8bB\xee\xa6\x10\xb9'\x9d\x81\xbd\x97\x13\u007f\x1f\x99\xddO\x16\x0f\x90\xf1A\xb2~\x88t\x0f\xe3\x03\xaa\xfb\x11\xbc\x85\xbb\xed\xa3x\xef7o\xdb\xc7R\x90\xc79\tOP\x04\xffd\n\xee)N\xf2\xa7\xc9\xf2\x19\x0eJ\xfbl\nՐ\x14\xcc\xd0\x14dX\nqx\n\xf5s)\xb8\x11\x01\xe2\xa7@\xfd\x19\xe0>\xc7{\xb6\xd5\xfd\x05^\xbb\xcd\x0f\xd5/\xf1\xdaן\xb3_\xb5\x93|\x9d\x86ᛤ\x82\xff\xb6\x9d\xdcwi\x98\u007f\x9fB\xf9C\x9a\x95\xf6\xc7v\xaa~j'\xf3s;\xc9/\xed\x14\u007fm\xa7\xfa\xb7vr\xbf\xa7\xc3U\u007f\xa4`\xfeL3#\u007f%%\u007f'%\xf2O\xfb\x84\xec\xbfi\xe8\xffK!\x9bn\x04C\xd1/\x85ؑB\xdd?\x057`\x84~R\xb7\x06\x8e\xc0\xe3a\a\xd1[;8\x05\x99\x9e\x930\x03E\xf03\xa6\xe0f\xe2$\x9f\x99,gᠴ\xb3\xa6P͖\x82\x99=\x05\x99#\x858g\n\xf5\\)\xb8\xb9y\x98j\x1e\xd2\xccˁ\x91\xf9(d~\n\x91\x05\xd2\x19\xd8\x059\xf1\v\x91\xd9\xc2d\xb1\b\x19\x17%\xeb\xc5H\xb78.\xb6k\t\xb4]vI\x1c\xa7\xf9*\xbeT\n\xb24'a\x19\x8a\xe0\x97M\xc1-\xc7I\xbe\xd7f)\xc8朄-(\x82\xdf2\x05\xb7\x15'\xf9\xd6d\xb9\r\a\xa5\xdd6\x85j\xbb\x14\xcc\xf6)\xc8\x0e)\xc4\x1dS\xa8wJ\xc1\xed\xcc\xc3T\xbb\x90fW\x0e\x8c\xecF!\xbbS\x88\xec\x91\xce\xc0\xeeɉߋ\xcc\xf6&\x8b}ȸ/Y\xefG\xba\xfd\xf5b[=\ah\xdb\xea\xb1\a\xeaq\xf4\x1e\xd8A)\xc8\xc1\x9c\x84C(\x82?4\x05w\x18'\xf9\xe1d\xd9\xc9AiM\nU\x96\x82\xc9S\x90V\n\xf1\x88\x14j\x9b\x82s\xfa\xa4\xe8_\x15\xd3g\x13\u007fV,\x05ٟ\x93p\x00E\xf0\a\xa6\xe0\x0e\xe2$?\x98,\x0fᠴ\x87\xa6P\x1d\x96\x829<\x05\xe9L!\x9a\x14\xea,\x05\x97\xf30U\x8b4Gp`\xc4R\x88\xa3\x10\xe9Jg`='\xbe \xb3\x92,*2\x06\xb2\xee&]\xdd\\r_\xebH\\\xb2=\n\xd2Z!%B\x87\x1e\xb4\xc1\x1fM\xba^\xe8\xfc\x18\xa0\xec\x83-\xed\xb1du\x1ci\x8e'\xe5\x042\x9eH\xd6'\x91\xeed,\xafN\x01̩\xb0FNC+\xa7\xa3\x159\x83[\xda3\xa1\xfdY@v6P\x9c\x03\xc4s\x81\xfa<\xc0\x9d\u07fc\xe4\xba/h\xae\xaa\xdb^\xd8\x18\xfd+d\x80\\\xac.\\\xa2M\xf0\x97\x02\xee2u\xf9\xe5Z\xcb+T\x95\xf6J\xa0\xba\n0W\x03r\r\x10\xaf\x05\xea\xeb\x00w\xbd.\xabn\xd0jnTe\xe4&m\xe4fmDn\xc1\x1e\xf6Vu\xfe6\xad\xd9\xedZ\x8b;\xb4\xc6;\xb5\xd6wiuw7\xb5\xb7\xf3\x9efAo\xa7\xbd\xb7\xb9f\xbd\xabt\x1f)\xf7C\x87\a\xd0\x06\xff \xe9\x1e\x82\xce\x1f\x06\xcaG`K\xfb(Y=F\x9a\xc7Iy\x82\x8cO\x92\xf5S\xa4{\x1a˫g\x00\xf3,\xac\x91!he(Z\x91a\xdc\xd2\x0e\x87\xf6\xcf\x01\xd9\b\xa0\x18\t\xc4Q@=\x1apc\x80\xd6X,l\xd9q\xcd\xcb\x13w\x8eƧ \x138\t\x13)\x82\x9f\x94\x82\x9b\xccI>\x85,\xa7rP\xdai)Tϧ`^HA^L!\xfe/\x85\xfa\xa5\x14\xdc\xcb'a\x03\x8a\xe07L\xc1m\xc4I\xbe1Yn\xc2Ai7M\xa1\xda,\x05\xb3y\n\xb2E\nq\xcb\x14\xea\xadRp[\xf30\xd56\xa4ٖ\x03#\xdbQ\xc8\xf6\x14\";\xa43\xb0;r\xe2w\"\xb3\x9d\xc9b\x172\xeeJֻ\x91n\xf7\xe6\x92{[{\xe0\x92힐\xd6\xeeE\xca\xde\xd0a\x1f\xb4\xc1\xefK\xba\xfd\xa0\xf3\xfd\x81\xf2\x00\xd8\xd2\x1eHV\a\x91\xe6`R\x0e!\xe3\xa1d}\x18\xe9\x0e\xc7\xf2\xaa\x130\x06\xd6H\x86Vr\xb4\"-ni\x8f\x80\xf6\x16\xc8\x1cPt\x01\xd1\x03u\x01\xb8R/\xa8\xabҦ\xcb\x06]\xde|\xc1\xeb&\xa5\x86\x0eG\xa2\r\xfe(\xd2\tt\x1e\x81\xb2\a\xb6\xb4G\x93U/i\x8e!\xa5\x8f\x8cǒ\xf5q\xa4;\x1e˫\x13\x00s\"\xac\x91\x93\xd0\xca\xc9hEN\xe1\x96\xf6Th\u007f\x1a\x90\x9d\x0e\x14g\x00\xf1L\xa0>\vpg7\x17\xd4\xd7s\x8e\xbe\xa1z\xec\xb9\xfa\x16l\xdeF\xe7\x91r>t\xb8\x00m\xf0\x17\x92\xee\"\xe8\xfcb\xa0\xbc\x04\xb6\xb4\x97\x92\xd5e\xa4\xb9\x9c\x94+\xc8x%Y_E\xba\xab\xb1\xbc\xba\x060\xd7\xc2\x1a\xb9\x0e\xad\\\x8fV\xe4\x06nio\x84\xf67\x01\xd9\xcd@q\v\x10o\x05\xea\xdb\x00w{sA\xad\x9e;\x9a\xa6\xd5c\xefl\x96띕\xbbH\xb9\x1b:܃6\xf8{Iw\x1ft~?P>\x00[\xda\a\xc9\xea!\xd2\xb6\xbb\xdei\xae\xaa˾\xdb\x18\xfdOc\x80\xbc\xaf.|\xa0M\xf0\x1f\x02\xee#u\xf9\xc7Z\xcbOT\x95\xf6S\xa0\xfa\f0\x9f\x03\xf2\x05\x10\xbf\x04\xea\xaf\x00\xf7\xb5.\xab\xbe\xd1j\xbeUe\xe4;m\xe4{mD~\xc0\x1e\xf6Gu\xfe'\xad\xd9\xcfZ\x8b_\xb4\xc6_\xb5ֿiu\xbf7U:\xffh\x16H\xa7\xfd\xb3\xb9f\xbd\x17\xf2\x17)\u007fC\x87\u007f\xd0\x06\xff/\xe9\xfe\x83Χ\x1b\xad(\xfb\x8dV[\xda\x0e\xb2\xeaO\x9a\x01\xa4\f$\xe3 \xb2\x1eL\xba鱼\x9a\x0103\xc2\x1a\x99\t\xaďVd\x160\xd8Y\xa1\xfdl@6;P\xcc\x01\xc49\x81z.\xc0\xcd\r\xb4\xe6\xc1\u0096\x9dw\xf4 \xd0Η\x82\xcc\xcfIX\x80\"\xf8\x05Sp\vq\x92/L\x96\x8bpP\xdaES\xa8\x16K\xc1,\x9e\x82,\x91B\\2\x85z\xa9\x14\xdc\xd2Yn\xc0Ai7L\xa1\xda(\x05\xb3q\n\xb2I\nq\xd3\x14\xea\xcdRp\x9b\xf30\xd5\x16\xa4ْ\x03#[Q\xc8\xd6\x14\"ۤ3\xb0\xdbr\xe2\xb7#\xb3\xed\xc9b\a2\xeeH\xd6;\x91ng\xb2\xb5\v\x0fв\xbb\x8e\x1e\xcc`wk'\xd9=\r\xc3\x1eI\x05\xbfg;\xb9\xbd\xd20\xdf;\x85r\x9f4+\xed\xbe\xedT\xed\xd7Nf\xffv\x92\x03\xda)\x1e\xd8N\xf5A\xed\xe4\x0eN\x87\xab\x0eI\xc1\x1c\x9afF\x0eKJ\x0eO\xaay\xe2\xda'dM\x1a\xfa,\x85,O\xa1h\xa5\x10\x8fH\xa1\xb6)8\xa7\xcfz\xab\xbbK\x1f\x8f\xe67+\xaf^\u007f\xd5*R\x90\x92\x93PQ\x04\x1fRpݜ\xe45Y\x1e\xc9Ai\x8fJ\xa1\x92\x14LLAzR\x88G\xa7P\xf7\xa6\xe0\x8e\xe1a\xaa>\xd2\x1cˁ\x91\xe3(\xe4x\n\x91\x13\xd2\x19\xd8\x139\xf1'\x91\xd9\xc9dq\n\x19O%\xeb\xd3Hw\xfa\xe8\xe6\x03\xaau\x06.ٞ\ti\xedY\xa4\x9c\r\x1d\xceA\x1b\xfc\xb9\xa4;\x0f:?\x1f(/\x80-\xed\x85du\x11i.&\xe5\x122^J֗\x91\xeer,\xaf\xae\x00̕\xb0F\xaeB+W\xa3\x15\xb9\x86[\xdak\xa1\xfdu@v=P\xdc\x00\xc4\x1b\x81\xfa&\xc0\u074c\x97q\xab\xfb\x16<\x9d\xfa\xd7\xc8\xf0r\xc0\x9f#k'\xb9=\r\xc3\x1dI\x05\u007fg;\xb9\xbb\xd20\xbf;\x85\xf2\x9e4+\xed\xbd\xedT\xdd\xd7N\xe6\xfev\x92\a\xda)>\xd8N\xf5C\xed\xe4\x1eN\x87\xab\x1eI\xc1<\x9afF\x1eKJ\x1eOJ\xe4\x89\xf6\t\xd9'\xd3\xd0?\x95B\xf6t\n\xc53)\xc4gS\xa8\x87\xa4\xe0\x86\xe2ë5\x8c\x8f\x87\x1dNo\xeds)\xc8\bN\xc2H\x8a\xe0G\xa5\xe0Fs\x92\x8f!˱\x1c\x94v\\\n\xd5\xf8\x14̄\x14db\nqR\n\xf5\xe4\x14\xdc\x14\x1e\xa6\x9aJ\x9ai\x1c\x18y\x9eB^\xa0\x10y1\x9d\x81\xfd\x1f'\xfe%2{\x99,^!\xe3\xabd\xfd\x1a\xe9^חq\xf7\x1bz\xc9\xdd\xf6M\x95\xfa\xd7\xcbHy\x1b:\xbc\x836\xf8wI\xf7\x1et\xfe>P~\x00[\xda\x0f\xc9\xea#\xd2|L\xca'd\xfc\x94\xac?#\xdd\xe7X^}\x01\x98/a\x8d|\x85V\xbeF+\xf2\r\xb7\xb4\xdfB\xfb\xef\x80\xec{\xa0\xf8\x01\x88?\x02\xf5O\x80\xfbY\xd1\xdb\xf9\x8b.\xec\xed\xb4\xbf\xea\x03\xa3\xf7\x81~KA~\xe7$\xfcA\x11\xfc\x9f)\xb8\xbf8\xc9\xff&\xcb\u007f8(\xed\xbf)T\xff\xa5`\xa6\x1b\xc3 \xfdR\x88\x1d)\xd4\xfdSp\x03\xc6\xe00\xd5@\xd2\f\xe2\xc0\xc8`\n\x99\x9eBd\x06\x86`g\xe4\xc4\xcfDf3\x93\xc5,d\x9c\x95\xacg#\xdd\xecdk\x0e\x1e\xa0e\xe7\x1c3\x98\xc1\xce\xd5N2w\x1a\x86y\x92\n~\xdevr\xf3\xa5a>\u007f\n\xe5\x02iV\xda\x05۩Z\xa8\x9d\xcc\xc2\xed$\x8b\xb4S\\\xb4\x9d\xea\xc5\xda\xc9-\x9e\x0eW-\x91\x82Y2͌,\x95\x94,\x9d\x94\xc82\xed\x13\xb2˦\xa1_.\x85l\xf9\x14\x8a\x15R\x88+\xa6P\xaf\x94\x82[y\x8c>\xf9\xadU\xf4\xf1\xe8n\xd9U\xd5\xeb\xfd\xa3\xd5R\x90\xd59\tkP\x04\xbff\nn-N\xf2\xb5\xc9r\x1d\x0eJ\xbbn\n\xd5z)\x98\xf5S\x90\rR\x88\x1b\xa6Po\x94\x82ۘ\x87\xa96!ͦ\x1c\x18ٌB6\xa7\x10\xd9\"\x9d\x81ݒ\x13\xbf\x15\x99mM\x16ېq[\xb2ގt\xdb\xeb\xc5\xf6u\xef\xa0m_\xb7\xddQ\x8f\xa3\xf7\x96vJAv\xe6$\xecB\x11\xfc\xae)\xb8\xdd8\xc9w'\xcb=8(\xed\x9e)T{\xa5`\xf6NA\xf6I!\xee\x9bB\xbd_\nn\u007f\x1e\xa6:\x804\ar`\xe4 \n9\x98B\xe4\x90t\x06\xf6PN\xfcadv8Yt\x92ѐuF\xba|L\xf3\x01\xd5\xd3\xd2K\xee\xb1G\xa8l\xbe_ZR\x1ct\xe8B\x1b\xbc']\x01\x9d\x97@Y\xc1\x966\x90U7ijR\x8e$\xe3Qd-\xa4\x8bX^\xf5\x00\xe6hX#\xbdh\xe5\x18\xb4\xcd\x19rK{,\xb4?\x0eȎ\a\x8a\x13\x80x\"P\x9f\x04\xb8\x93\xf1\x9emu\x9f\x82\xd7n\xf3C\xf5T\xbc\xf6\xf5\xe7\xeci\xed$\xa7\xa7a8#\xa9\xe0\xcfl'wV\x1a\xe6g\xa7P\x9e\x93f\xa5=\xb7\x9d\xaa\xf3\xdaɜ\xdfNrA;\xc5\v۩\xbe\xa8\x9d\xdc\xc5\xe9p\xd5%)\x98K\xd3\xcc\xc8eI\xc9\xe5I\x89\\\xd1>!{e\x1a\xfa\xabRȮN\xa1\xb8&\x85xm\n\xf5u)\xb8\xeb\xf5\xf1\xe8m\xdd\xc0\xc7\xc3\xdeHo\xedM)\xc8͜\x84[(\x82\xbf5\x05w\x1b'\xf9\xeddy\a\a\xa5\xbd3\x85\xea\xae\x14\xcc\xdd)\xc8=)\xc4{S\xa8\xefK\xc1\xdd\xcf\xc3T\x0f\x90\xe6A\x0e\x8cʉ\u007f\x8c\xcc\x1e'\x8b'\xc8\xf8$Y?E\xba\xa7q\xb1]Ϡ\xed\xb2\xcf\xe28\xcdW\xf1!)\xc8PN\xc20\x8a\xe0\x87\xa7\xe0\x9e\xe3$\x1fA\x96#9(\xed\xa8\x14\xaa\xd1)\x981)\xc8\xd8\x14\xe2\xb8\x14\xea\xf1)\xb8\t\xe6a\xaaOH\xf3)\aF>\xa3\x90\xcf)D\xbeHg`\xbf\xe4\xc4\u007fEf_\x93\xc57d\xfc\x96\xac\xbf#\xdd\xf7z\xb1\xad\x9e\x1f\xb4m\xf5\xd8\x1f\xf58z\x0f\xec\xa7\x14\xe4gN\xc2/\x14\xc1\xff\x9a\x82\xfb\x8d\x93\xfcw\xb2\xfc\x83\x83\xd2\xfe\x99B\xf5W\n\xe6\xef\x14\xe4\x9f\x14\xe2\xbf)\xd4\xff\xa5\xe0\xa6\x1b\x8b\xc3T\xfdH\xd31\x16\x03#\xfd)d\x00\x85\xc8@\x86`\aq\xe2\a\x93\xd9\xf4d1\x03\x19g$\xeb\x99H7\xf3X}f\xbbfѶ\xaf\xcbΪ\xc7\xd1\xfbc\xb3\xa5 \xb3s\x12\xe6\xa0\b~\xce\x14\xdc\\\x9c\xe4s\x93\xe5<\x1c\x94v\xde\x14\xaa\xf9R0\xf3\xa7 \v\xa4\x10\x17L\xa1^(\x05\xb70\x0fS-B\x9aE90\xb2\x18\x85,N!\xb2D:\x03\xbb$'~)2[\x9a,\x96!\xe3\xb2d\xbd\x1c\xe9\x96\x1f\xdb\xfc\xe8\xe9ZA/\xb9ˮ\xa8R\xff\x9f!)+C\x87U\xd0\x06\xbf*\xe9V\x83\xceW\a\xca5`K\xbb&Y\xadE\x9a\xb5IY\x87\x8c\xeb\x92\xf5z\xa4[\x1f˫\r\x00\xb3!\xac\x91\x8d\xd0\xca\xc6hE6\xe1\x96vSh\xbf\x19\x90m\x0e\x14[\x00qK\xa0\xde\np[\x8f\xed\u05f9\xcd؎N\xbb\xed\xd8\xfeͯ\xc4\xdbi\x95\xed\x1b\x11vhb\xf0;ju;5\"߹)\xe5.M_\xda]\xb5V\xbbi5\xbbk\x95=\xb4\xc6=\xb5\xd6{iu{7\xff\xbcڧ)fߦ7\xb2_\x13e\xff&\x8a\x1c\xa0\a\xb5\a6\xc2\x1fԔ\xec\xe0\xa6\x14\x874%\x1eڔ\xfa\xb0\xa6\xb8Û\xd2\xeal\xfea˚\xb1\x03\xf4\xd7\xd7\f\x90\\]hi\x13\xfc\x11\x80\xb3\xear\xa7\xb5\xecRUZ\x0fT\x05`J@* \x06\xa0\xee\x06\\\xad˪#\xb5\x9a\xa3T\x19\x11m$j\xd3\xfc|\xc6\x1e\xf6hu\xbeWkv\x8c֢Ok\xad\xd9\xfdZ\x8b\a\xb4\xc6\a\xb5\xd6\x0fiu\x0f\x8f\xeb\xd7\xf3ȸ\x8e\x1e\xfb\xe8\xb8\xfeͯ\xf4\x8fi\x95\xc7\x1b\x11\x9ehb\xf0OjuO5\"\u007f\xba)\xe53M_\xdag\xb5VC\xb4\x9a\xa1Ze\x98\xd68\\k\xfd\x9cV7\xa2\xf9\xe7\xd5Ȧ\x98QModt\x13eL\x13\x9b_G\xf4\xa0v\\#\xfc\xf8\xa6d\x13\x9aRLlJ\x9cԔzrSܔ\xe65\xdd\xea\x9eڼ\x1e\x9a\x0f\xe6i\xcd+H?\xa7\x9f'\xe5\x05\xe8\xf0\"\xda\xe0\xffG\xba\x97\xa0\xf3\x97\x81\xf2\x15\xd8ҾJV\xaf\x91\xe6uR\xde \xe3\x9bd\xfd\x16\xe9\xde\xc6\xf2\xea\x1d\xc0\xbc\vk\xe4=\xb4\xf2>Z\x91\x0f\xb8\xa5\xfd\x10\xda\u007f\x04d\x1f\x03\xc5'@\xfc\x14\xa8?\x03\xdc\xe7\xcd'K\xeb\v\xbd*\xfb\xa5\x1ak\xbf\x02\xe4ku\xe1\x1bm\x82\xff\x16pߩ˿\xd7Z\xfe\xa0\xaa\xb4?\x02\xd5O\x80\xf9\x19\x90_\x80\xf8+P\xff\x06\xb8\xdfuY\xf5\x87V\xf3\xa7*#\u007fi#\u007fk#\xf2\x0f\xf6\xb0\xff\xaa\xf3\xffiͦ\x1b\xdfԢ\x9f\xd6ء\xb5\xee\xaf\xd5\r\x18\xdf\xd1\xdb5\xb0\x89]v\xd0\xf8\x01\xfau~0 ӫ\v3h\x13\xfc\x8c\x80\x9bI]>\xb3\xd6r\x16U\xa5\x9d\x15\xa8f\x03\xcc\xec\x80\xcc\x01\xc49\x81z.\xc0ͭ˪y\xb4\x9ayU\x19\x99O\x1b\x99_\x1b\x91\x05\xb0\x87]P\x9d_Hk\xb6\xb0\xd6b\x11\xadqQ\xad\xf5bZ\xdd\xe2\xe3;\xfaz\x96\x18\u07ff\xf9\x1e\xbe\xe4\xf8\x01\xfa\xb5|)@\x96V\x17\x96\xd1&\xf8e\x01\xb7\x9c\xba|y\xad\xe5\n\xaaJ\xbb\"P\xad\x04\x98\x95\x01Y\x05\x88\xab\x02\xf5j\x80[]\x97Ukh5k\xaa2\xb2\x966\xb2\xb66\"\xeb`\x0f\xbb\xae:\xbf\x9e\xd6l}\xad\xc5\x06Z\xe3\x86Z덴\xba\x8d\xc7w\xb4z6\x19\u07ff\xf9>\xbd\xe9\xf8\x01\xfa\xf5z3@6W\x17\xb6\xd0&\xf8-\x01\xb7\x95\xba|k\xad\xe56\xaaJ\xbb-Pm\a\x98\xed\x01\xd9\x01\x88;\x02\xf5N\x80\xdbY\x97U\xbbh5\xbb\xaa2\xb2\x9b6\xb2\xbb6\"{`\x0f\xbb\xa7:\xbf\x97\xd6lo\xad\xc5>Z\xe3\xbeZ\xeb\xfd\xb4\xba\xfd\x9bG\xba\xeb\x80\xe6\xfc\xbb\xec\x81ͥ6/\x8f\x83\x009X]8D\x9b\xe0\x0f\x05\xdca\xea\xf2õ\x96\x9d\xaaJk\x80*\x03L\x0eH\v\x88G\x00\xb5\x05\x9c\xd3eU\x97V\xe3U\x19)\xb4\x91R\x1b\x91\n{ؠ\xcewk\xcdj\xadőZ\xe3QZk\xd1\xea\xe2\xf8~]=\xe3;\xba\xec\xd1\xe3\xfb\xeb\u007f\x1b\xd2*\xc74\"\xf451\xf8c\xb5\xba\xe3\x1a\x91\x1fߔ\xf2\x84\xa6/\xed\x89Z\xab\x93\xb4\x9a\x93\xb5\xca)Z\xe3\xa9Z\xebӴ\xbaӛ\u007f^\x9d\xd1\x14sf\xd3\x1b9\xab\x89rv\x13E\xceу\xdas\x1b\xe1\xcfkJv~S\x8a\v\x9a\x12/lJ}QS\xdc\xc5\xe3;|\xe7%\xe3\xfb\xfbN{\xe9\xf8\x01M\xb5\x97\x01r\xb9\xbap\x856\xc1_\t\xb8\xab\xd4\xe5Wk-\xafQU\xdak\x81\xea:\xc0\\\x0f\xc8\r@\xbc\x11\xa8o\x02\xdcͺ\xac\xbaE\xab\xb9U\x95\x91۴\x91۵\x11\xb9\x03{\xd8;\xd5\xf9\xbb\xb4fwk-\xee\xd1\x1a\xef\xd5Zߧ\xd5ݯ\xb5\xf5\x80.h\xd9\a\xc7\x0fT؇Hy\x18:<\x826\xf8GI\xf7\x18t\xfe8P>\x01[\xda'\xc9\xea)\xd2\"\xe5c\xe8\xf0\t\xda\xe0?%\xddg\xd0\xf9\xe7@\xf9\x05li\xbf$\xab\xafH\xf35)ߐ\xf1[\xb2\xfe\x8et\xdfcy\xf5\x03`~\x845\xf2\x13Z\xf9\x19\xad\xc8/\xdc\xd2\xfe\n\xed\u007f\x03\xb2߁\xe2\x0f \xfe\t\xd4\u007f\x01\xee\xef\xe6C\xa1\xe7\x9f\xe6\xaaz쿍i\xbe\x9f\xfc\a\xc8t\x13\x1b\x17\xfaMl\x9a\xe0;\x00\xd7_]>@k9PUi\a\x01\xd5`\xc0L\x0f\xc8\f@\x9c\x11\xa8g\x02\xdc̺\xac\x9aE\xab\x99U\x95\x91ٴ\x91ٵ\x11\x99\x03{\xd89\xd5\xf9\xb9\xb4fsk-\xe6\xd1\x1a\xe7\xd5Zϧ\xd5\xcd\xdf\xfc\xd3\xe6\xbb\xf7\x02\x13\a*\xec\x82\x13\a\x81v\xa1\x14daN\xc2\"\x14\xc1/\x9a\x82[\x8c\x93|q\xb2\\\x82\x83\xd2.\x99B\xb5T\nf\xe9\x14d\x99\x14\xe2\xb2)\xd4˥\xe0\x96\xe7a\xaa\x15H\xb3\"\aFV\xa2\x90\x95)DVIg`W\xe5įFf\xab\x93\xc5\x1ad\\\x93\xac\xd7\"\xdd\xda\xcd%\xf7\xb6\xd6\xc1%\xdbu!\xad]\x8f\x94\xf5\xa1\xc3\x06h\x83ߐt\x1bA\xe7\x1b\x03\xe5&\xb0\xa5ݔ\xac6#\xcd\xe6\xa4lA\xc6-\xc9z+\xd2m\x8d\xe5\xd56\x80\xd9\x16\xd6\xc8vhe{\xb4\";pK\xbb#\xb4\xdf\t\xc8v\x06\x8a]\x80\xb8+P\xef\x06\xb8\xdd\xf5\x82\xba\xf6Ц\xcb\xee\xa9˛\xafk{\x91\xb27t\xd8\am\xf0\xfb\x92n?\xe8|\u007f\xa0<\x00\xb6\xb4\a\x92\xd5A\xa49\x98\x94C\xc8x(Y\x1fF\xbañ\xbc\xea\x04\x8c\x815\x92\xa1\x95\x1c\xadH\x8b[\xda#\xa0\xbd\x052\a\x14]@\xf4@]\x00\xael.\xa8\xaf\xa7j\x9a\xbe\x1e\x1b\x9a\xe5zo\xa2\x9b\x94\x1a:\x1c\x896\xf8\xa3H'\xd0y\x04\xca\x1e\xd8\xd2\x1eMV\xbd\xa49\x86\x94>2\x1eK\xd6Ǒ\xeex,\xafN\x00̉\xb0FNB+'\xa3\x159\x85[\xdaS\xa1\xfdi@v:P\x9c\x01\xc43\x81\xfa,\xc0\x9d\xdd\\P\xab眦i\xf5\xd8s\x9b\xe5z\xdf\xe2\x1e\xcdK\xee.R\xee\x86\x0e\xf7\xa0\r\xfe^\xd2\xdd\a\x9d\xdf\x0f\x94\x0f\xc0\x96\xf6A\xb2z\x884\x0f\x93\xf2\b\x19\x1f%\xeb\xc7H\xf78\x96WO\x00\xe6IX#O\xa1\x95\xa7ъ<\xc3-\xed\xb3\xd0~\b\x90\r\x05\x8aa@\x1c\x0e\xd4\xcf\x01n\xc4\xc4\x0e\xdf5\xb2\xb9\xaa.;\xaa1\xfa\x1f}\x00\x19\xa3.\x8c\xd5&\xf8q\x80\x1b\xaf.\x9f\xa0\xb5\x9c\xa8\xaa\xb4\x93\x80j2`\xa6\x002\x15\x88Ӏ\xfay\xc0\xbd\xa0˪\x17\xb5\x9a\xff\xa92\xf2\x926\xf2\xb26\"\xaf`\x0f\xfb\xaa:\xff\x9a\xd6\xecu\xad\xc5\x1bZ\xe3\x9bZ뷴\xba\xb7\x9b\xea;\xdfi\x16\xf8N\xfbns\xcdz/\xe4=Rއ\x0e\x1f\xa0\r\xfeC\xd2}\x04\x9d\u007f\f\x94\x9f\xc0\x96\xf6S\xb2\xfa\x8c4\x9f\x93\xf2\x05\x19\xbf$\xeb\xafH\xf75\x96W\xdf\x00\xe6[X#ߡ\x95\xefъ\xfc\xc0-\xed\x8f\xd0\xfe' \xfb\x19(~\x01\xe2\xaf@\xfd\x1b\xe0~\aZ\u007f`a\xcb\xfe\xd9|\xc4\xe3>\xc9_)\xc8ߜ\x84\u007f(\x82\xff7\x05\xf7\x1f'\xf9t\x93\xc0\xb2\xdf$\fJۑB\xd5?\x053 \x05\x19\x98B\x1c\x94B=8\x057=\x0fS\xcd@\x9a\x19902\x13\x85\xccL!2\vC\xb0\xb3r\xe2g#\xb3\xd9\xc9b\x0e2\xceI\xd6s\x91n\xeeI\xcd\xc5\xf6uΣm_\xa7\x9dW\x8f\xa3\xf7P\xe6KA\xe6\xe7$,@\x11\xfc\x82)\xb8\x858\xc9\x17&\xcbE8(\xed\xa2)T\x8b\xa5`\x16OA\x96H!.\x99B\xbdT\nni\x1e\xa6Z\x864\xcbr`d9\nY\x9eBd\x85t\x06vEN\xfcJd\xb62Y\xacB\xc6U\xc9z5ҭN\xb6\xd6\xe0\x01Zv\xcdI\x83\x19\xecZ\xed$k\xa7aX'\xa9\xe0\xd7m'\xb7^\x1a\xe6\xeb\xa7Pn\x90f\xa5ݰ\x9d\xaa\x8d\xda\xc9l\xdcN\xb2I;\xc5M۩ެ\x9d\xdc\xe6\xe9p\xd5\x16)\x98-\xd3\xcc\xc8VI\xc9\xd6I\x89l\xd3>!\xbbm\x1a\xfa\xedRȶO\xa1\xd8!\x85\xb8c\n\xf5N)\xb8\x9d\xf5You\uf88fG\xf3\x9bծ\xea\xf5W\xad\xddR\x90\xdd9\t{P\x04\xbfg\nn/N\xf2\xbd\xc9r\x1f\x0eJ\xbbo\n\xd5~)\x98\xfdS\x90\x03R\x88\a\xa6P\x1f\x94\x82;\x98\x87\xa9\x0e!͡\x1c\x189\x8cB\x0e\xa7\x10\xe9Lg`\r'>#\xb3\x9c,Zd<\x82\xac-\xe9ܤ\xe6\x03\xaaՅK\xb6\x1e\xd2ڂ\x94\x12:Th\x83\x0f\xa4\xeb\x86\xcek\xa0<\x12\xb6\xb4G\x91\x95\x90&\x92\xd2Cƣɺ\x97t\xc7`y\xd5\a\x98ca\x8d\x1c\x87V\x8eG+r\x02\xb7\xb4'B\xfb\x93\x80\xecd\xa08\x05\x88\xa7\x02\xf5i\x80;\x1d/\xe3V\xf7\x19x:\xf5oV\xe1倿Z\xd5Nrv\x1a\x86s\x92\n\xfe\xdcvr\xe7\xa5a~~\n\xe5\x05iV\xda\v۩\xba\xa8\x9d\xcc\xc5\xed$\x97\xb4S\xbc\xb4\x9d\xea\xcb\xda\xc9]\x9e\x0eW]\x91\x82\xb92͌\\\x95\x94\\\x9d\x94\xc85\xed\x13\xb2צ\xa1\xbf.\x85\xec\xfa\x14\x8a\x1bR\x887\xa6Pߔ\x82\xbb\x19\x1f^\xad[\xf8x\xd8[魽-\x05\xb9\x9d\x93p\aE\xf0w\xa6\xe0\xee\xe2$\xbf\x9b,\xefᠴ\xf7\xa6Pݗ\x82\xb9?\x05y \x85\xf8`\n\xf5C)\xb8\x87y\x98\xea\x11\xd2<ʁ\x91\xc7(\xe4q\n\x91'\xd2\x19\xd8'9\xf1O\x91\xd9\xd3d\xf1\f\x19\x9f%\xeb!\xa4\x1b\xaa/\xe3\xeeaz\xc9\xddv\xb8J\xfd\xe3X\xa4\x8c\x80\x0e#\xd1\x06?\x8at\xa3\xa1\xf31@9\x16\xb6\xb4\xe3\xc8jJ\xc1|\x9c\x82|\x92B\xfc4\x85\xfa\xb3\x14\xdc\xe7Y\x9f\xfc\xd6\x1c\x93\xf5\xe5Ҳs\xaa\xd7\xfbGs\xa5 ss\x12\xe6\xa1\b~\xde\x14\xdc|\x9c\xe4\xf3\x93\xe5\x02\x1c\x94v\xc1\x14\xaa\x85R0\v\xa7 \x8b\xa4\x10\x17M\xa1^,\x05\xb78\x0fS-A\x9a%90\xb2\x14\x85,M!\xb2L:\x03\xbb,'~92[\x9e,V \xe3\x8ad\xbd\x12\xe9V\u058b\xed\xeb^E۾n\xbb\xaa\x1eG\xef-\xad\x96\x82\xac\xceIX\x83\"\xf85Spkq\x92\xafM\x96\xebpP\xdauS\xa8\xd6K\xc1\xac\x9f\x82l\x90B\xdc0\x85z\xa3\x14\xdc\xc6\x1e\xf6TzkOKAN\xe7$\x9cA\x11\xfc\x99)\xb8\xb38\xc9\xcf&\xcbs8(\xed\xb9)T\xe7\xa5`\xceOA.H!^\x98B}Q\n\xeeb\x1e\xa6\xba\x844\x97r`\xe42\n\xb9\x9cB\xe4\x8at\x06\xf6JN\xfcUdv5Y\\C\xc6k\xc9\xfa:\xd2]\x8f\x8b\xed\xba\x01m\x97\xbd\x11\xc7i\xbe\x8aߔ\x82\xdc\xccI\xb8\x85\"\xf8[Sp\xb7q\x92\xdfN\x96wpP\xda;S\xa8\xeeJ\xc1ܝ\x82ܓB\xbc7\x85\xfa\xbe\x14\xdc\xfd7P\xce\x03[\xday\xc9j>\xd2\xccO\xca\x02d\\\x90\xac\x17\"\xdd\xc2X^-\x02\x98Ea\x8d,\x86V\x16G+\xb2\x04\xb7\xb4KB\xfb\xa5\x80li\xa0X\x06\x88\xcb\x02\xf5r\x80[~JGֹ\u0094\xfeY\xa7]qʀ\xa6ڕ\x00YY]XE\x9b\xe0W\x05\xdcj\xea\xf2յ\x96k\xa8*\xed\x9a@\xb5\x16`\xd6\x06d\x1d \xae\v\xd4\xeb\x01n}]Vm\xa0\xd5l\xa8\xca\xc8F\xda\xc8\xc6ڈl\x82=\xec\xa6\xea\xfcfZ\xb3͵\x16[h\x8d[j\xad\xb7\xd2\xea\xb6\xd6\xda\xdaF\x17\xb4\xec\xb6S\x06*\xecv\xa4l\x0f\x1dv@\x1b\xfc\x8e\xa4\xdb\t:\xdf\x19(w\x81-\xed\xaed\xb5\x1biv'e\x0f2\xeeI\xd6{\x91no,\xaf\xf6\x01̾\xb0F\xf6C+\xfb\xa3\x159\x80[\xda\x03\xa1\xfdA@v0P\x1c\x02\xc4C\x81\xfa0\xc0\x1d\xde\\P_gg\xd3\xf4uZ\xd3,\xd7;c\x19)9th\xa1\r\xfe\b\xd2Y\xe8\xdc\x01e\x17li=Y\x15\xa4)I\xa9\xc8\x18Ⱥ\x9bt5\x96WG\x02\xe6(X#\x82V\"Z\x91\x1eni\x8f\x86\xf6\xbd@v\fP\xf4\x01\xf1X\xa0>\x0ep\xc7\x03\xad\x13\xb0\xb0eO\x9c2\b\xb4'\xa5 's\x12N\xa1\b\xfe\xd4\x14\xdci\x9c䧓\xe5\x19\x1c\x94\xf6\xcc\x14\xaa\xb3R0g\xa7 \xe7\xa4\x10\xcfM\xa1>/\x05w>\x0fS]@\x9a\v90r\x11\x85\\L!rI:\x03{)'\xfe22\xbb\x9c,\xae \xe3\x95d}\x15\xe9\xaen\x9e\xbdV\xf75\xcd%7\xbf\xa7]\xdbH\xfd\xc5\xed:R\xae\x87\x0e7\xa0\r\xfeF\xd2\xdd\x04\x9d\xdf\f\x94\xb7\xc0\x96\xf6V\xb2\xba\x8d4\xb7\x93r\a\x19\xef$\xeb\xbbHw7\x96W\xf7\x00\xe6^X#\xf7\xa1\x95\xfbъ<\xc0-\xed\x83\xd0\xfe! {\x18(\x1e\x01\xe2\xa3@\xfd\x18\xe0\x1eo>\x14ZO\xe8U\xd9'\xd5X\xfb\x14 O\xab\v\xcfh\x13\xfc\xb3\x80\x1b\xa2.\x1f\xaa\xb5\x1c\xa6\xaa\xb4Á\xea9\xc0\x8c\x00d$\x10G\x01\xf5h\xc0\x8d\xd1e\xd5X\xadf\x9c*#㵑\tڈL\xc4\x1ev\x92:?Yk6Ek1Uk\x9c\xa6\xb5~^\xab{A_r\xad\xee\x17\xf5Iѿ\xf1\xa5\xcf&\xfe\xc6W\n\xf22'\xe1\x15\x8a\xe0_M\xc1\xbd\xc6I\xfe:Y\xbe\xc1Ai\xdfL\xa1z+\x05\xf3v\n\xf2N\n\xf1\xdd\x14\xea\xf7Rp\xef\xf30\xd5\a\xa4\xf9\x90\x03#\x1fQ\xc8\xc7\x14\"\x9f\xa43\xb0\x9fr\xe2?#\xb3\xcf\xc9\xe2\v2~I\xd6_\x91\xeek\xfd\xc0h}\x83K\xb6\xdfBZ\xfb\x1d)\xdfC\x87\x1f\xd0\x06\xff#\xe9~\x82\xce\u007f\x06\xca_`K\xfb+Y\xfdF\x9a\xdfI\xf9\x83\x8c\u007f\x92\xf5_\xa4\xfb\x1b˫\u007f\x00\xf3/\xac\x91\xff\xd0\xcatS\xb5\x15\xe9\a\x06\xdb1U\xb5\xef\x0fd\x03\x80b \x10\a\x01\xf5`\xc0M?\xb5#\xeb\x9eaj\xff\xac\xdb\xce\xd8\x18\xfd\xd3^\x80̬.̢M\xf0\xb3\x02n6u\xf9\xecZ\xcb9T\x95vN\xa0\x9a\v0s\x032\x0f\x10\xe7\x05\xea\xf9\x007\xbf.\xab\x16\xd0j\x16Ted!mdamD\x16\xc1\x1evQu~1\xad\xd9\xe2Z\x8b%\xb4\xc6%\xb5\xd6KiuK7\xb5\xb7s\x99fAo\xa7]\xb6\xb9f\xbd\xab\xb4\x1c)\xcbC\x87\x15\xd0\x06\xbf\"\xe9V\x82\xceW\x06\xcaU`K\xbb*Y\xadF\x9a\xd5IY\x83\x8ck\x92\xf5Z\xa4[\x1b˫u\x00\xb3.\xac\x91\xf5\xd0\xca\xfahE6\xe0\x96vCh\xbf\x11\x90m\f\x14\x9b\x00qS\xa0\xde\fp\x9b\x03\xad-\xb0\xb0e\xb7\x9c:\b\xb4[\xa5 [s\x12\xb6\xa1\b~\xdb\x14\xdcv\x9c\xe4ۓ\xe5\x0e\x1c\x94v\xc7\x14\xaa\x9dR0;\xa7 \xbb\xa4\x10wM\xa1\xde-\x05\xb7;\x0fS\xedA\x9a=90\xb2\x17\x85\xecM!\xb2O:\x03\xbb/'~?2۟,\x0e \xe3\x81d}\x10\xe9\x0e\xd6\xe7\xb0u\x88>\xdd-{h#\xf5\xee\xd0a\xa4\x1c\x0e\x1d:\xd1\x06oH\x97A\xe79P\xb6`K{\x04YY\xd28R\xba\xc8\xe8ɺ ]\x89\xe5U\x05\x98\x00k\xa4\x1b\xad\xd4hE\x8e\xe4\x96\xf6(h/@\x16\x81\xa2\a\x88G\x03u/\xe0\x8ei.\xa8\xaf\xbbO\xdfP\xdd\xf6X}\v6o\xa3\xe3H9\x1e:\x9c\x806\xf8\x13Iw\x12t~2P\x9e\x02[\xdaS\xc9\xea4ҜN\xca\x19d<\x93\xac\xcf\"\xdd\xd9X^\x9d\x03\x98sa\x8d\x9c\x87V\xceG+r\x01\xb7\xb4\x17B\xfb\x8b\x80\xecb\xa0\xb8\x04\x88\x97\x02\xf5e\x80\xbb\xbc\xf9P蹢\xb9\xaa\x1e{ec\x9aoPW\x01r\xb5\xbap\x8d6\xc1_\v\xb8\xeb\xd4\xe5\xd7k-oPU\xda\x1b\x81\xea&\xc0\xdc\f\xc8-@\xbc\x15\xa8o\x03\xdc\xed\xba\xac\xbaC\xab\xb9S\x95\x91\xbb\xb4\x91\xbb\xb5\x11\xb9\a{\xd8{\xd5\xf9\xfb\xb4f\xf7k-\x1e\xd0\x1a\x1f\xd4Z?\xa4\xd5=\xac\xef\xa1V\xf7#\xfa*k~\xec<\xaa/O\xfd9\xf4X\n\xf28'\xe1\t\x8a\xe0\x9fL\xc1=\xc5I\xfe4Y>\xc3Ai\x9fM\xa1\x1a\x92\x82\x19\x9a\x82\fK!\x0eO\xa1~.\x057\x82\x87\xa9F\x92f\x14\aFFS\xc8\x18\n\x91\xb1\xe9\f\xec8N\xfcx2\x9b@\x16\x13\xc98\x89\xac'\x93n\x8a~\x02\xb6\xa6\xe2\x92\xed4Hk\x9f'\xe5\x05\xe8\xf0\"\xda\xe0\xffG\xba\x97\xa0\xf3\x97\x81\xf2\x15\xd8ҾJV\xaf\x91\xe6uR\xde \xe3\x9bd\xfd\x16\xe9\xde\xc6\xf2\xea\x1d\xc0\xbc\vk\xe4=\xb4\xf2>Z\x91\x0f\xb8\xa5\xfd\x10\xda\u007f\x04d\x1f\x03\xc5'@\xfc\x14\xa8?\x03\xdc\xe7zA]_h\xd3e\xbf\xd4\xe5\xcd\x17\xbc\xafH\xf9\x1a:|\x836\xf8oI\xf7\x1dt\xfe=P\xfe\x00[\xda\x1f\xc9\xea'\xd2\xfcL\xca/d\xfc\x95\xac\u007f#\xdd\xefX^\xfd\x01\x98?a\x8d\xfc\x85V\xfeF+\xf2\x0f\xb7\xb4\xffB\xfb\xff\x80l\xbai\x8a\xa2\x1f\x10;\x80\xba?\xe0\x06Lk>\x14z\x066M_\x8f\x1d4m\xa0\xc2\x0e&ez\xe80\x03\xda\xe0g$\xddL\xd0\xf9\xcc@9\vlig%\xab\xd9H3;)s\x90qN\xb2\x9e\x8btscy5\x0f`\xe6\x8552\x1fZ\x99\x1f\xad\xc8\x02\xdc\xd2.\b\xed\x17\x02\xb2\x85\x81b\x11 .\nԋ\x01n\xf1\xe6\x82Z=K4M\xab\xc7.\xd9,\xd7;+K\x91\xb24tX\x06m\xf0˒n9\xe8|y\xa0\\\x01\xb6\xb4+\x92\xd5J\xa4Y\x99\x94Uȸ*Y\xafF\xbaձ\xbcZ\x030k\xc2\x1aY\v\xad\xac\x8dVd\x1dniׅ\xf6\xeb\x01\xd9\xfa@\xb1\x01\x107\x04\xea\x8d\x00\xb7\xb1>C]\x9b\xe8\xd5u\xd9M\xf5\xf1h^r\x9b\x91\xb29t\xd8\x02m\xf0[\x92n+\xe8|k\xa0\xdc\x06\xb6\xb4ے\xd5v\xa4ٞ\x94\x1dȸ#Y\xefD\xba\x9d\xb1\xbc\xda\x050\xbb\xc2\x1a\xd9\r\xad\xec\x8eVd\x0fni\xf7\x84\xf6{\x01\xd9\xde@\xb1\x0f\x10\xf7\x05\xea\xfd\x00\xb7\xff\xb4\x8e\xac\xeb\x80檺쁍\xd1\xff\xff\x05\xc8\xc1\xea\xc2!\xda\x04\u007f(\xe0\x0eS\x97\x1f\xae\xb5\xecTUZ\x03T\x19`r@Z@<\x02\xa8-\xe0\x9c.\xab\xba\xb4\x1a\xaf\xcaH\xa1\x8d\x94ڈT\xd8\xc3\x06u\xbe[kVk-\x8e\xd4\x1a\x8f\xd2Z\x8bV\x17\xa7u\x14\x9d=\xd3\xfa\x17\x9d\xf6\xe8i\x03\x9aj{\x019F]\xe8\xd3&\xf8c\x01w\x9c\xba\xfcx\xad\xe5\t\xaaJ{\"P\x9d\x04\x98\x93\x019\x05\x88\xa7\x02\xf5i\x80;]\x97Ugh5g\xaa2r\x966r\xb66\"\xe7`\x0f{\xae:\u007f\x9e\xd6\xec|\xad\xc5\x05Z\xe3\x85Z담\xba\x8b\xb5\xb6.\xd1\x05-{鴁\n{\x19)\x97C\x87+\xd0\x06\u007f%鮂ί\x06\xcak`K{-Y]G\x9a\xebI\xb9\x81\x8c7\x92\xf5M\xa4\xbb\x19˫[\x00s+\xac\x91\xdb\xd0\xca\xedhE\xee\xe0\x96\xf6Nh\u007f\x17\x90\xdd\r\x14\xf7\x00\xf1^\xa0\xbe\x0fp\xf77\x17\xd4\xd7\xf9@\xd3\xf4u\xda\a\x9b\xe5z#\xe4!R\x1e\x86\x0e\x8f\xa0\r\xfeQ\xd2=\x06\x9d?\x0e\x94O\xc0\x96\xf6I\xb2z\x8a4O\x93\xf2\f\x19\x9f%\xeb!\xa4\x1b\x8a\xe5\xd50\xc0\f\x875\xf2\x1cZ\x19\x81Vd$\xb7\xb4\xa3\xa0\xfdh \x1b\x03\x14c\x818\x0e\xa8\xc7\x03n\x02К\x88\x85-;i\xda \xd0NNA\xa6p\x12\xa6R\x04\xff\u007f\x96\xce:\xcem\xa3\tÕ\x0f\xca\xcc\xec6\xcc\r33'M\xdaP\xd3\xe4\xd6vv-K\xb2\x9a\x91s\xbd\xb6)\xf3Wfffff\fC\x1bfN\xcapw\xcd\xe9\xdbyG\u007f\xe4yf\xde\xf5j\xb5\x96\xec\xf3\xb9\xbf\xfen^R\x98\xf92\x92] \xf6\x16ʀ\xa7\x17%\x85\xbf8)Ԓ\xa4\xa0\xa5I\x11-K\x8apyR\x98\x9f\xe40\xfe\xcfb\xb5B\x06\x14\xad\x94\x80VI@\xb4:9\x03\xbdFFܵ\xe2\xcc:qa\xbd8\xda \x0e7\x8a\xcd&{\xf5r\xc5\xcdv\xcb\xf6s\xce\x16\x1b\xf2瞭bچ8؎6pw\x88\xcdN\xc4\xd9]\x90\xb7\x1b\xa9\xa7\xf7\x88\xfd_\xc4\xeaW1\xfd&\x8e~\x17\x87\u007f\x88͟\x98\xee\xff\x05\xa9\xbf\x91*\xfa\a-\xfd\x8b\x96\xa8V\x96\xd4u\x88\xddz(\xf3\x1fT\xd8\vE\rP\x18Cf\x9f\xf9\xa9BΙow\xa5S\xf3m\xa2u\x19D\xe5\x9c\x05\x15\xdc\x04n%d\xf6\xe5,\xbb\x1f\xd3۟#O\x1f\x00\xf9\aB\xea \x88\x0e\x86\xa2C\xa0\xf0P\xc8\x1c\xc6\xd3\xfcÙ\xea\b\x8e\x14\x1d\xc9\r\x1d\xc5\r\xd1\xd1XC\x1fÙ{,3s\x1c\xb3p<3:\x81\x19\x9e\xc84'ه\xd6\xe4\x8a'ϯ`\xe9S\xe6W\xc2\xfaԤ\xa0\xb4\x8c\x04\xa7I\x10\xb8\xa7'\x85i$#\xd9\xc6b\xaf\x89\fx\xbaiR\xf8͒B5O\nj\x91\x14Qˤ\b[%\x85i-\x87\xf1ۈU[\x19P\xd4N\x02:C\x02\xa2\xf6\xc9\x19\xe8\x0e2\xe2v\x14g:\x89\v\x9d\xc5Q\x17q\xd8Ul\xba\xd9-\xd7\xe4\xbac˺\aB\xad{\x8a\xa9\x17\xe2\xa07\xda\xc0\xed#6}\x11g\xfbA^\u007f\xa4\x9e\x1e \xf6\a\x8a\xd5 1\r\x16GC\xc4\xe1P\xb1\x19\x86\xe9\xfepH\x8d@\xaah$Z\x1a\x85\x96h\xb4,\xa9\xc7 v\xc7B\x99qPa<\x14\x9d\t\x85\x13 3\xd1\xderų쮊\xfal\x9b\xf0_\x8e\x82h2g\xc1\x14n\x02w*d\xa6q\x96=\x87\xe9M\xe7\xc8\xd3\xe7B\xfe\fḦ́\xa8\n\x8a\x14\x14f \x93\xe5i~\x8e\xa9fq\xa4HsC\x86\x1b\xa2<\xd6\xd0.gn\x81\x99\xf1\x98\x05\x9f\x19\x05̰\xc84\xa1eu\xd5yvBu\x95\x9em\xf7\xcc_\x84\x90\x98\"\xc4A\tm\xe0\xce\x11\x9bj\xc4\xd9\xf3!\xaf\x06\xa9\xa7/\x10\xfb\x17\x8a\xd5Eb\x9a+\x8e.\x16\x87\x97\x88ͥ\x98\xee_\x06\xa9ˑ*\xba\x02-]\x89\x96\xe8*YR_\x8dؽ\x06\xca\\\v\x15\xae\x83\xa2\xeb\xa1\xf0\u007f\x90\xb9\x01\xca݈\x899}\x93\xbd=\xf1E\xc8\xcdIA\xb7\xc8Hp\xab\x04\x81{[R\x98\xdbe${\x87ػS\x06<}WR\xf8w'\x85\xba')\xe8ޤ\x88\xeeK\x8a\xf0\xfe\xa40\x0f\xc8a\xfc\a\xc5\xea!\x19P\xf4\xb0\x04\xf4\x88\x04D\x8f&g\xa0\x1f\x93\x11\xf7qq\xe6\tq\xe1Iq\xf4\x948|Zl\x9e\xe1k\x98{\x96/wN?gC\xfe\"\xe4y1\xbd\x808x\x11m\xe0\xbe$6/#ξ\x02y\xaf\"\xf5\xf4kb\xffu\xb1zCLo\x8a\xa3\xb7\xc4\xe1\xdbb\xf3\x0e\xa6\xfb\xefB\xea=\xa4\x8a\xdeGK\x1f\xa0%\xfaP\x96\xd4\x1f!v?\x862\x9f@\x85O\xa1\xe83(\xfc\x1c2_\xf0\x9bB\xf1K~A\x15\xf5W\xfc\x12\xb4/\xa3\xaf\xc5\xf4\r\xe2\xe0[\xb4\x81\xfb\x9d\xd8|\x8f8\xfb\x03\xe4\xfd\x88\xd4\xd3\xf3\xc4\xfe|\xb1Z \xa6\x85\xe2h\x918\\,6K0\xdd_\n\xa9eH\x15-GK?\xa1%\xfaY\x96\xd4+\x10\xbb+\xa1\xcc*\xa8\xb0\x1a\x8a\xd6@\xe1ZȬ\xb3o\n\xa5\xf5vW%\xbd\xc1&\xf6\x17\x9e\x8d\x10m\xe2,\xd8\xccM\xe0n\x81\xccVβۘ\xdev\x8e<\xbd\x03\xf2wBj\x17D\xbb\xa1h\x0f\x14\xfe\x02\x99_y\x9a\xff\x1bS\xfdΑ\xa2?\xb8\xa1?\xb9!\xfa\vk\xe8\xbf9s\xffaf\xfee\x16j\x99Q\x1d3\xacg\x9a\xff\xf85\x94+\xee\xe5\xbb\xcc\xfe\xd8i\xe0ۓ\u007f\x0e\xc5IA\xfb,\xc0H\xe0,@\x10\xb8\xa9\xa40e2\x92-\x17{\x152\xe0\xe9ʤ\xf0\xf7M\n\xb5_R\xd0\xfeI\x11\x1d\x90\x14\xe1\x81Ia\x0e\x92\xc3\xf8\a\x8b\xd5!2\xa0\xe8P\t\xe80\t\x88\x0eO\xce@\x1f!#\xee\x91\xe2\xccQ\xe2\xc2\xd1\xe2\xe8\x18qx\xac\xd8\x1c\xb7\xc0\xbe\x03\xe6\x8e_\xc0[\xd6' \xd4\xfaD1\x9d\x8488\x19m\xe0\x9e\"6\xa7\"Φ!\xef4\xa4\x9e>]\xec7\x12\xab\xc6bj\"\x8e\x9a\x8a\xc3fb\xd3\x1c\xd3\xfd\x16\x90j\x89TQ+\xb4\xd4\x1a-Q\x1bYR\xb7E춃2g@\x85\xf6P\xd4\x01\n;B\xa6\x13o(ߙ\x9b\xbc\xee\xc2\xd3\xed\xefq]\xc5\xd4\rq\xd0\x1dm\xe0\xf6\x10\x9b\x9e\x88\xb3\xbd \xaf7RO\xf7\x11\xfb}Ū\x9f\x98\xfa\x8b\xa3\x01\xe2p\xa0\xd8\f\xc2t\u007f0\xa4\x86 U4\x14-\rCK4\\\x96\xd4#\x10\xbb#\xa1\xcc(\xa80\x1a\x8a\xc6@\xe1XȌ\xb3\x1b\xaa)\x8d\xb7MMI\x9fi\xa7\xf3\x17!\x13\xc44\x11qp\x16\xda\xc0=[l&!\xceN\x86\xbc)H==U\xecO\x13\xabs\xc44]\x1c\x9d+\x0eg\x88\xcdLL\xf7\xab \xa5\x90*ʠ\xa5,Z\xa2\x9c,\xa9g!v5\x941P!\x0fE.\x14\x16 \xe3\xd9\r\xe5J\xbemr%\x1d\xd8\xe9\xfcEHQL!\xe2\xe0<\xb4\x81;[l\bq6\x82\xbc\x12RO\xcf\x11\xfb\xd5bu\xbe\x98j\xc4\xd1\x05\xe2\xf0B\xb1\xb9\b\xd3\xfd\xb9\x90\xba\x18\xa9\xa2K\xd0ҥh\x89.\x93%\xf5\xe5\x88\xdd+\xa0̕P\xe1*(\xba\x1a\n\xaf\x81̵|\x85\xf2\xd7\xf1\xee\xf2\xfaz~>\xec-\xf7?1݀8\xb8\x11m\xe0\xde$67#\xce\xde\x02y\xb7\"\xf5\xf4mb\xffv\xb1\xbaCLw\x8a\xa3\xbb\xc4\xe1\xddbs\x0f\xa6\xfb\xf7B\xea>\xa4\x8a\xeeGK\x0f\xa0%zP\x96\xd4\x0f!v\x1f\x862\x8f@\x85G\xa1\xe81(|\x1c2O,H\x15\xf2O\xda]\xe5\xf5S6\xe1\xffi\f\xa2g8\v\x9e\xe5&p\x9f\x83\xcc\xf3\x9ce_`z/r\xe4\xe9\x97 \xffeH\xbd\x02ѫP\xf4\x1a\x14\xbe\x0e\x997x\x9a\xff&S\xbdő\xa2\xb7\xb9\xa1w\xb8!z\x17k\xe8\xf78s\xdfgf>`\x16>dF\x1f1Ï\x99\xe6\x93\x05\xa9\xa8\xea\xd3\x05eQ\x95\xfelA\xb9\xa5\xfe\x1c\xa2/8\v\xbe\xe4&p\xbf\x82\xccלe\xbfaz\xdfr\xe4\xe9\xef \xff{H\xfd\x00яP4\x0f\n\xe7Cf\x01O\xf3\x172\xd5\"\x8e\x14-憖pC\xb4\x14k\xe8e\x9c\xb9˙\x99\x9f\x98\x85\x9f\x99\xd1\nf\xb8\x92iV1s\xabyBN\xafYP\xc1\xd2kŴ\x0eq\xb0\x1em\xe0n\x10\x9b\x8d\x88\xb3\x9b o3ROo\x11\xfb[\xc5j\x9b\x98\xb6\x8b\xa3\x1d\xe2p\xa7\xd8\xec\xc2t\u007f7\xa4\xf6 U\xf4\vZ\xfa\x15-\xd1o\xb2\xa4\xfe\x1d\xb1\xfb\a\x94\xf9\x13*\xfc\x05E\u007fC\xe1?\x90\xf9\xd7n\xa8\xa6\xaa\xd665U\xba\xceN\xe7/B\xea\xc5\xf4\x1f\xe2`/\xda\xc0m\x10\x9b\x18qv\x9f\x85,\xcfYȩ\xa7Sb\xbfL\xac\xca\xc5T!\x8e*\xc5\xe1\xbeb\xb3\x1f\xa6\xfb\xfbC\xea\x00\xa4\x8a\x0eDK\a\xa1%:\x18\x0e\xf4!\x88\xddC\xa1\xccaP\xe1p(:\x02\n\x8f\x84\xccQP\xeehL\xcc\xe9c\x16V\xc2\xfaؤ\xa0\xe3d$8^\x82\xc0=!)̉2\x92=I\xec\x9d,\x03\x9e>%)\xfcS\x93B\xa5\x93\x82NK\x8a\xe8\xf4\xa4\b\x1b%\x85i,\x87\xf1\x9b\x88US\x19P\xd4L\x02j.\x01Q\x8b\xe4\ftK\x19q[\x893\xadŅ6⨭8l'6g,,\x8br\xc5\xf6v\xcb\xf6sN\a\x1b\xf2瞎b\xea\x848\xe8\x8c6p\xbb\x88MW\xc4\xd9n\x90\xd7\x1d\xa9\xa7{\x88\xfd\x9eb\xd5KL\xbd\xc5Q\x1fq\xd8Wl\xfaa\xba\xdf\x1fR\x03\x90*\x1a\x88\x96\x06\xa1%\x1a,K\xea!\x88ݡPf\x18T\x18\x0eE#\xa0p$dF-LE\xb9Ѽ+=\x86\x13\xad\xc7B4\x8e\xb3`<7\x81{&d&p\x96\x9d\xc8\xf4\xce\xe2\xc8\xd3gC\xfe$HM\x86h\n\x14M\x85\xc2i\x909\x87\xa7\xf9ә\xea\\\x8e\x14\xcd\xe0\x86frCT\x855\xb4\xe2\xcc\xcd03Yf!njf1C\xcd4\x86o\xb9\\1\xcf\x17\x85\xff.\x13_M\xfc]\xa6\xa4 OF\x02_\x82\xc0\r\x92\xc2\x14e$\x1b\x8a\xbd\xf3d\xc0ӳ\x93§\xa4PQRP))\xa29I\x11V'\x859_\x0e\xe3\u05c8\xd5\x052\xa0\xe8B\t\xe8\"\t\x88\xe6&g\xa0/\x96\x11\xf7\x12q\xe6Rq\xe12qt\xb98\xbcBl\xae\xb4[\xae\xc9]\x85-\xeb\xab\x11j}\x8d\x98\xaeE\x1c\\\x876p\xaf\x17\x9b\xff!\xce\xde\x00y7\"\xf5\xf4Mb\xfff\xb1\xbaEL\xb7\x8a\xa3\xdb\xc4\xe1\xedbs\a\xa6\xfbwB\xea.\xa4\x8a\xeeFK\xf7\xa0%\xbaW\x96\xd4\xf7!v\xef\x872\x0f@\x85\a\xa1\xe8!(|\x182\x8f\xd8[\xae\xf8\xa8\xddUQ?f\x13\xfesL\x10=\xc1Y\xf0$7\x81\xfb\x14d\x9e\xe6,\xfb\f\xd3{\x96#O?\a\xf9\xcfC\xea\x05\x88^\x84\xa2\x97\xa0\xf0eȼ\xc2\xd3\xfcW\x99\xea5\x8e\x14\xbd\xce\r\xbd\xc1\rћXC\xbfř\xfb63\xf3\x0e\xb3\xf0.3z\x8f\x19\xbe\xcf4\x1fXVW}h'TW\xe9\x8f\xec\x9e\xf9\x8b\x90\x8f\xc5\xf4\t\xe2\xe0S\xb4\x81\xfb\x99\xd8|\x8e8\xfb\x05\xe4}\x89\xd4\xd3_\x89\xfd\xaf\xc5\xea\x1b1}+\x8e\xbe\x13\x87ߋ\xcd\x0f\x98\xee\xff\b\xa9yH\x15\xcdGK\v\xd0\x12-\x94%\xf5\"\xc4\xeeb(\xb3\x04*,\x85\xa2eP\xb8\x1c2?A\xb9\x9f11\xa7W\xd8\xdb\x13_\x84\xacL\nZ%#\xc1j\t\x02wMR\x98\xb52\x92]'\xf6\xd6ˀ\xa77$\x85\xbf1)Ԧ\xa4\xa0\xcdI\x11mI\x8apkR\x98mr\x18\u007f\xbbX\xed\x90\x01E;%\xa0]\x12\x10\xedN\xce@\xef\x91\x11\xf7\x17q\xe6Wq\xe17q\xf4\xbb8\xfcCl\xfe\xe4k\x98\xfb\x8b/wN\xffmC\xfe\"\xe4\x1f1\xfd\x8b8\xa8E\x1b\xb8ubS\x8f8\xfb\x1f\xe4\xedE\xea\xe9\x06\xb1\x1f\x8b\xd5>\x8b`r\xc4QJ\x1c\x96\x89M\xf9\"\x9e\xeeW@\xaa\x12\xa9\xa2}\xd1\xd2~h\x89\xf6\x87\x03}\x00b\xf7@(s\x10T8\x18\x8a\x0e\x81\xc2C!s\xd8\"\xfb\xa6P<\xdc65E}\x84\x9d\xce_\x84\x1c)\xa6\xa3\x10\aG\xa3\r\xdcc\xc4\xe6X\xc4\xd9\xe3 \xefx\xa4\x9e>A\xec\x9f(V'\x89\xe9dqt\x8a83)\xfc\tI\xa1&&\x05\x9d\x95\x14\xd1\xd9I\x11NJ\n3Y\x0e\xe3O\x11\xab\xa92\xa0h\x9a\x04t\x8e\x04Dӓ3\xd0\xe7ʈ;C\x9c\x99).T\x89#%\x0e3b\x93\xb5[\xae\xce\xe5\xb0e=\v\xa1\xd6ZL\x06q\x90G\x1b\xb8\xae\xd8\x14\x10g=\xc8\xf3\x91z:\x10\xfbE\xb1\n\xc5t\x9e8\x9a-\x0eIl\"L\xf7K\x90\x9a\x83TQ5Z:\x1f-Q\x8d,\xa9/@\xec^\be.\x82\ns\xa1\xe8b(\xbc\x042\x97\xf2\x86\xf2\x97q\x93ח\xf3t\xfb{\xdc\x15b\xba\x12qp\x15\xda\xc0\xbdZl\xaeA\x9c\xbd\x16\xf2\xaeC\xea\xe9\xeb\xc5\xfe\xff\xc4\xea\x061\xdd(\x8en\x12\x877\x8b\xcd-\x98\xee\xdf\n\xa9ې*\xba\x1d-݁\x96\xe8NYR߅ؽ\x1b\xca\xdc\x03\x15\ue162\xfb\xa0\xf0~\xc8<\xc0o\n\xa5\a\xf9\x05U\xd2\x0f\xf1Kо\x8c\x1e\x16\xd3#\x88\x83G\xd1\x06\xeecb\xf38\xe2\xec\x13\x90\xf7$RO?%\xf6\x9f\x16\xabg\xc4\xf4\xac8zN\x1c>/6/`\xba\xff\"\xa4^B\xaa\xe8e\xb4\xf4\nZ\xa2WeI\xfd\x1ab\xf7u(\xf3\x06Tx\x13\x8aނ·!\xf3\x8e\xddP\xae\xf4\xaemr%\xfd\x9e\x9d\xce_\x84\xbc/\xa6\x0f\x10\a\x1f\xa2\r\u070f\xc4\xe6c\xc4\xd9O \xefS\xa4\x9e\xfeL\xec\u007f.V_\x88\xe9Kq\xf4\x958\xfcZl\xbe\xc1t\xff[H}\x87T\xd1\xf7h\xe9\a\xb4D?ʒz\x1ebw>\x94Y\x00\x15\x16B\xd1\"(\\\f\x99%|\x85\xf2Kywy\xbd\x8c\x9f\x0f{\xcb-\x17\xd3O\x88\x83\x9f\xd1\x06\xee\n\xb1Y\x898\xbb\n\xf2V#\xf5\xf4\x1a\xb1\xbfV\xac։i\xbd8\xda \x0e7\x8a\xcd&L\xf77Cj\vRE[\xd1\xd26\xb4D\xdbeI\xbd\x03\xb1\xbb\x13\xca\xec\x82\n\xbb\xa1h\x0f\x14\xfe\x02\x99_\xed\xdbv\xfe7\xbb\xab\xbc\xfe\xdd&\xfc\u007f\aA\xf4'g\xc1_\xdc\x04\xeeߐ\xf9\x87\xb3\xec\xbfL\xaf\x96#O\xd7A~=\xa4\xfe\x83h/\x145@a\f\x99}\x16\xdbi\xbe\xc3T\xa9\xc56RT\xc6\r\x95sCT\xc1\nt%g\xee\xbe\xcc\xcc~\xcc\xc2\xfe\xcc\xe8\x00fx \xd3\x1c\xb48\x15V\x1d\xbc\xb8,\xac҇,.\xb7ԇBt\x18g\xc1\xe1\xdc\x04\xee\x11\x909\x92\xb3\xecQL\xefh\x8e<}\f\xe4\x1f\v\xa9\xe3 :\x1e\x8aN\x80\xc2\x13!s\x12O\xf3Of\xaaS8Rt*7\x94\xe6\x86\xe84\xac\xa1O\xe7\xccm\xc4\xcc4f\x16\x9a0\xa3\xa6̰\x19\xd34g\xe6Z\xf0\x84\x9cn\xb9\xb8\x82\xa5[\x89\xa95\xe2\xa0\r\xda\xc0m+6\xed\x10gπ\xbc\xf6H=\xddA\xecw\x14\xabNb\xea,\x8e\xba\x88îb\xd3\r\xd3\xfd\xee\x90\xea\x81TQO\xb4\xd4\v-QoYR\xf7A\xec\xf6\x852\xfd\xa0B\u007f(\x1a\x00\x85\x03!3\xc8n\xa8\xa6j\xb0mj\xaa\xf4\x10;\x9d\xbf\b\x19*\xa6a\x88\x83\xe1h\x03w\x84،D\x9c\x1d\x05y\xa3\x91zz\x8c\xd8\x1f+V\xe3\xc44^\x1c\x9d)\x0e'\x88\xcdDL\xf7ς\xd4\xd9H\x15MBK\x93\xd1\x12M\x91%\xf5T\xc4\xee4(s\x0eT\x98\x0eE\xe7B\xe1\f\xc8̄rU\x98\x98\xd3jq%\xac3IAY\x19\tr\x12\x04\ueb240ZF\xb2F\xec\xe5e\xc0\xd3nR\xf8\x85\xa4P^R\x90\x9f\x14Q\x90\x14a1)L(\x87\xf1\xcf\x13\xab\xd92\xa0\x88$\xa0H\x02\xa2Rr\x06z\x8e\x8c\xb8\xd5\xe2\xcc\xf9\xe2B\x8d8\xba@\x1c^(6\x17٫\x97+ε[\xb6\x9fs.\xb6!\u007f\xee\xb9DL\x97\"\x0e.C\x1b\xb8\x97\x8b\xcd\x15\x88\xb3WB\xdeUH=}\xb5ؿF\xac\xae\x15\xd3u\xe2\xe8zq\xf8?\xb1\xb9\x01\xd3\xfd\x1b!u\x13RE7\xa3\xa5[\xd0\x12\xdd*K\xea\xdb\x10\xbb\xb7C\x99;\xa0\u009dPt\x17\x14\xde\r\x99{\xec\x9bB\xee^ޕ\xbe\x8f\x13\xad\xef\x87\xe8\x01\u0382\a\xb9\t܇ \xf30g\xd9G\x98ޣ\x1cy\xfa1\xc8\u007f\x1cRO@\xf4$\x14=\x05\x85OC\xe6\x19\x9e\xe6?\xcbT\xcfq\xa4\xe8yn\xe8\x05n\x88^\xc4\x1a\xfa%\xceܗ\x99\x99W\x98\x85W\x99\xd1k\xcc\xf0u\xa6y\x83o\xb9\\\xf1M\xbe(\xfc\xf7\x82\xf8j\xe2/\x06%\x05\xbd##\xc1\xbb\x12\x04\xee{Iaޗ\x91\xec\ab\xefC\x19\xf0\xf4GI\xe1\u007f\x9c\x14ꓤ\xa0O\x93\"\xfa,)\xc2ϓ\xc2|!\x87\xf1\xbf\x14\xab\xafd@\xd1\xd7\x12\xd07\x12\x10}\x9b\x9c\x81\xfeNF\xdc\xefř\x1fą\x1f\xc5\xd1\u2c2f\xd8\xf4\xe3k\x98\xebϗ;\xa7\aؐ\xbf\b\x19(\xa6A\x88\x83\xc1h\x03w\x88\xd8\fE\x9c\x1d\x06yÑzz\x84\xd8\x1f)V\xa3\xc44Z\x1c\x8d\x11\x87c\xc5f\x1c\xa6\xfb\xe3!u&RE\x13\xd0\xd2D\xb4Dgɒ\xfal\xc4\xee$(3\x19*L\x81\xa2\xa9P8\r2\xe7\xd8\r\xd5\x14\xa7ۦ\xa6\xa8ϵ\xd3\xf9\x8b\x90\x19b\x9a\x898\xa8B\x1b\xb8Jl2\x88\xb3Y\xc8\xcb!\xf5\xf4,\xb1\xaf\xc5ʈ)/\x8e\\qX\x10\x1b\x0f\xd3}\x1fR\x01REE\xb4\x14\xa2%:O\x96Գ\x11\xbb\x04e\"\xa8P\x82\xa29PX\r\x99\xf3\x97\xa4\xc2R\x8d\xddUI_`\x13\xfb\vυ\x10]\xc4Y0\x97\x9b\xc0\xbd\x182\x97p\x96\xbd\x94\xe9]Ƒ\xa7/\x87\xfc+ u%DWA\xd1\xd5Px\rd\xae\xe5i\xfeuLu=G\x8a\xfe\xc7\r\xdd\xc0\rэXC\xdfę{33s\v\xb3p+3\xba\x8d\x19\xde\xce4w\xf0k(W\xbc\x93\xef2\xfbc\xe7.\xbe=\xf9\xe7\xd0\xddIA\xf7\xc8Hp\xaf\x04\x81{_R\x98\xfbe$\xfb\x80\xd8{P\x06<\xfdPR\xf8\x0f'\x85z$)\xe8Ѥ\x88\x1eK\x8a\xf0\xf1\xa40O\xc8a\xfc'\xc5\xea)\x19P\xf4\xb4\x04\xf4\x8c\x04D\xcf&g\xa0\x9f\x93\x11\xf7yq\xe6\x05q\xe1Eq\xf4\x928|Yl^\xe1w\xc0ܫز~\r\xa1֯\x8b\xe9\r\xc4\xc1\x9bh\x03\xf7-\xb1y\x1bq\xf6\x1d\xc8{\x17\xa9\xa7\xdf\x13\xfb\xef\x8b\xd5\ab\xfaP\x1c}$\x0e?\x16\x9bO0\xdd\xff\x14R\x9f!U\xf49Z\xfa\x02-ї\xb2\xa4\xfe\n\xb1\xfb5\x94\xf9\x06*|\vE\xdfA\xe1\xf7\x90\xf9\x817\x94\xff\x91\x9b\xbc\x9e\xc7\xd3\xed\xefq\xf3Ŵ\x00q\xb0\x10m\xe0.\x12\x9bň\xb3K o)RO/\x13\xfb\xcb\xc5\xea'1\xfd,\x8eV\x88Õb\xb3\n\xd3\xfdՐZ\x83T\xd1Z\xb4\xb4\x0e-\xd1zYRo@\xecn\x842\x9b\xa0\xc2f(\xda\x02\x85[!\xb3\x8d\xdf\x14J\xdb\xf9\x05U\xd2;\xf8%h_F;Ŵ\vq\xb0\x1bm\xe0\xee\x11\x9b_\x10g\u007f\x85\xbcߐz\xfaw\xb1\xff\x87X\xfd)\xa6\xbf\xc4\xd1\xdf\xe2\xf0\x1f\xb1\xf9\x17\xd3\xfdZH\xd5!UT\x8f\x96\xfeCK\xb4W\x96\xd4\r\x88\xdd\x18\xca쳔Up\xa0(\x05\x85e\x90)_j?\xed\x95*l\x93+\xe9ʥ\x15,\xbd\xaf\x98\xf6C\x1c\xec\x8f6p\x0f\x10\x9b\x03\x11g\x0f\x82\xbc\x83\x91z\xfa\x10\xb1\u007f\xa8X\x1d&\xa6\xc3\xc5\xd1\x11\xe2\xf0H\xb19\n\xd3\xfd\xa3!u\fREǢ\xa5\xe3\xd0\x12\x1d/K\xea\x13\x10\xbb'B\x99\x93\xa0\xc2\xc9Pt\n\x14\x9e\n\x99\xb4\xddPM\xfe4\xde]^\x9fn\xa7\xf3\x17!\x8d\xc4\xd4\x18q\xd0\x04m\xe06\x15\x9bf\x88\xb3\xcd!\xaf\x05RO\xb7\x14\xfb\xadĪ\xb5\x98ڈ\xa3\xb6Ⱍ\u061c\x81\xe9~{Hu@\xaa\xa8#Zꄖ\xa8\xb3,\xa9\xbb v\xbbB\x99nP\xa1;\x14\xf5\x80\u009e\x90\xe9\xb54\x15\xe6{\xdb]\xe5u\x1f\x9b\xf0\xff\xe8\x03Q?\u0382\xfe\xdc\x04\xee\x00\xc8\f\xe4,;\x88\xe9\r\xe6\xc8\xd3C \u007f(\xa4\x86A4\x1c\x8aF@\xe1HȌ\xe2i\xfeh\xa6\x1aÑ\xa2\xb1\xdc\xd08n\x88\xc6c\r}&g\xee\x04ff\"\xb3p\x163:\x9b\x19Nb\x9a\xc9KS\xa6j\xca\xd22S\xa5\xa7.-\xb7\xd4\xd3 :\x87\xb3`:7\x81{.dfp\x96\x9d\xc9\xf4\xaa8\xf2\xb4\x82\xfc\f\xa4\xb2\x10\xe5\xa0h\x16\x14j\xc8\x18\x9e\xe6\xe7\x99\xca\xe5HQ\x81\x1b\xf2\xb8!\xf2\xb1\x86\x0e8s\x8b\xccL\xc8,\x9cnjf3Cb\x9a\x88\x99+\U0004471e\xb3\xb4\x82\xa5\xab\xc5t>\xe2\xa0\x06m\xe0^ 6\x17\"\xce^\x04ys\x91z\xfab\xb1\u007f\x89X]*\xa6\xcb\xc4\xd1\xe5\xe2\xf0\n\xb1\xb9\x12\xd3\xfd\xab u5REנ\xa5k\xd1\x12]'K\xea\xeb\x11\xbb\xff\x8327@\x85\x1b\xa1\xe8&(\xbc\x192\xb7\xd8\r\xd5T\xddj\x9b\x9a*}\x9b\x9d\xce_\x84\xdc.\xa6;\x10\aw\xa2\rܻ\xc4\xe6n\xc4\xd9{ \xef^\xa4\x9e\xbeO\xec\xdf/V\x0f\x88\xe9Aq\xf4\x908|Xl\x1e\xc1t\xffQH=\x86T\xd1\xe3h\xe9\t\xb4DOʒ\xfa)\xc4\xee\xd3P\xe6\x19\xa8\xf0,\x14=\a\x85\xcfC\xe6\x05(\xf7\"&\xe6\xf4KK+a\xfdrR\xd0+2\x12\xbc*Aྖ\x14\xe6u\x19ɾ!\xf6ޔ\x01O\xbf\x95\x14\xfe\xdbI\xa1\xdeI\nz7)\xa2\xf7\x92\"|?)\xcc\ar\x18\xffC\xb1\xfaH\x06\x14},\x01}\"\x01ѧ\xc9\x19\xe8\xcfd\xc4\xfd\\\x9c\xf9B\\\xf8R\x1c}%\x0e\xbf\x16\x9bo\xec\xd5\xcb\x15\xbf\xb5[\xb6\x9fs\xbe\xb3!\u007f\xee\xf9^L? \x0e~D\x1b\xb8\xf3\xc4f>\xe2\xec\x02\xc8[\x88\xd4Ӌ\xc4\xfeb\xb1Z\"\xa6\xa5\xe2h\x998\\.6?a\xba\xff3\xa4V U\xb4\x12-\xadBK\xb4Z\x96\xd4k\x10\xbbk\xa1\xcc:\xa8\xb0\x1e\x8a6@\xe1F\xc8l\xb2o\n\xb9ͼ+\xbd\x85\x13\xad\xb7B\xb4\x8d\xb3`;7\x81\xbb\x032;9\xcb\xeebz\xbb9\xf2\xf4\x1e\xc8\xff\x05R\xbfB\xf4\x1b\x14\xfd\x0e\x85\u007f@\xe6O\x9e\xe6\xff\xc5T\u007fs\xa4\xe8\x1fn\xe8_n\x88j\xb1\x86\xae\xe3̭gf\xfec\x16\xf62\xa3\x06f\x183\xcd>\xcb\xec-\x97+:\xcb*X:\xb5\xac\x12\xd6eIA\xe52\x12TH\x10\xb8\x95Ia\xf6\x95\x91\xec~bo\u007f\x19\xf0\xf4\x01I\xe1\x1f\x98\x14ꠤ\xa0\x83\x93\":$)\xc2C\x93\xc2\x1c&\x87\xf1\x0f\x17\xab#d@ё\x12\xd0Q\x12\x10\x1d\x9d\x9c\x81>FF\xdccř\xe3ą\xe3\xc5\xd1\t\xe2\xf0D\xb19i\x99}\xc3ȝ\x8c-\xebS\x10j}\xaa\x98҈\x83\xd3\xd0\x06\xee\xe9b\xd3\bq\xb61\xe45A\xea\xe9\xa6b\xbf\x99X5\x17S\vq\xd4R\x1c\xb6\x12\x9b֘\uedc1T[\xa4\x8aڡ\xa53\xd0\x12\xb5\x97%u\a\xc4nG(\xd3\t*t\x86\xa2.P\xd8\x152ݖ\xa5L\xb1\xbb\xddUQ\xf7\xb0\t\xff\xe5(\x88zq\x16\xf4\xe6&p\xfb@\xa6/g\xd9~L\xaf?G\x9e\x1e\x00\xf9\x03!5\b\xa2\xc1P4\x04\n\x87Bf\x18O\xf3\x873\xd5\b\x8e\x14\x8d\xe4\x86FqC4\x1ak\xe81\x9c\xb9c\x99\x99q\xcc\xc2xft&3\x9c\xc04\x13-\xab\xabβ\x13\xaa\xab\xf4\xd9v\xcf\xfcE\xc8$1MF\x1cLA\x1b\xb8S\xc5f\x1a\xe2\xec9\x907\x1d\xa9\xa7\xcf\x15\xfb3\xc4j\xa6\x98\xaađ\x12\x87\x19\xb1\xc9b\xba\x9f\x83\xd4,\xa4\x8a4Z2h\x89\xf2\xb2\xa4v\x11\xbb\x05(\xe3A\x05\x1f\x8a\x02(,B&\x84r\xe7abN϶\xb7'\xbe\b\xa1\xa4\xa0HF\x82\x92\x04\x81;')L\xb5\x8cd\xcf\x17{52\xe0\xe9\v\x92¿0)\xd4EIAs\x93\"\xba8)\xc2K\x92\xc2\\*\x87\xf1/\x13\xab\xcbe@\xd1\x15\x12Е\x12\x10]\x95\x9c\x81\xbeZF\xdckękŅ\xeb\xc4\xd1\xf5\xe2\xf0\u007fbs\x03_\xc3܍|\xb9s\xfa&\x1b\xf2\x17!7\x8b\xe9\x16\xc4\xc1\xadh\x03\xf76\xb1\xb9\x1dq\xf6\x0eȻ\x13\xa9\xa7\xef\x12\xfbw\x8b\xd5=b\xbaW\x1c\xdd'\x0e\xef\x17\x9b\a0\xdd\u007f\x10R\x0f!U\xf40Zz\x04-ѣ\xb2\xa4~\f\xb1\xfb8\x94y\x02*<\tEOA\xe1Ӑy\x86\xdf\x14\x8a\xcf\xf2\v\xaa\xa8\x9f㗠}\x19=/\xa6\x17\x10\a/\xa2\rܗ\xc4\xe6e\xc4\xd9W \xefU\xa4\x9e~M\xec\xbf.Vo\x88\xe9Mq\xf4\x968|[l\xde\xc1t\xff]H\xbd\x87T\xd1\xfbh\xe9\x03\xb4D\x1fʒ\xfa#\xc4\xee\xc7P\xe6\x13\xa8\xf0)\x14}\x06\x85\x9fC\xe6\v\xfb\xa6P\xfa\xd2\ueaa4\xbf\xb2\x89\xfd\x85\xe7k\x88\xbe\xe1,\xf8\x96\x9b\xc0\xfd\x0e2\xdfs\x96\xfd\x81\xe9\xfdȑ\xa7\xe7A\xfe|H-\x80h!\x14-\x82\xc2ŐY\xc2\xd3\xfc\xa5L\xb5\x8c#E˹\xa1\x9f\xb8!\xfa\x19k\xe8\x15\x9c\xb9+\x99\x99U\xcc\xc2jf\xb4\x86\x19\xaee\x9au\xfc\x1a\xca\x15\xd7\xf3]f\u007f\xecl\xe0ۓ\u007f\x0emL\n\xda$#\xc1f\t\x02wKR\x98\xad2\x92\xdd&\xf6\xb6ˀ\xa7w$\x85\xbf3)\u052e\xa4\xa0\xddI\x11\xedI\x8a\xf0\x97\xa40\xbf\xcaa\xfc\xdf\xc4\xeaw\x19P\xf4\x87\x04\xf4\xa7\x04D\u007f%g\xa0\xff\x96\x11\xf7\x1fq\xe6_q\xa1V\x1cՉ\xc3z\xb1\xf9\x8f\xdf\x01s{\xb1e݀P\xebXL\xfb,\xe78p\x96s\x1b\xb8)\xb1)C\x9c-\x87\xbc\n\xa4\x9e\xae\x14\xfb\xfb\x8a\xd5~b\xda_\x1c\x1d \x0e\x0f\x14\x9b\x830\xdd?\x18R\x87 Ut(Z:\f-\xd1\u1ca4>\x02\xb1{$\x949\n*\x1c\rE\xc7@᱐9n\xb9\xddP\xfexn\xf2\xfa\x04\x9en\u007f\x8f;QL'!\x0eNF\x1b\xb8\xa7\x88ͩ\x88\xb3i\xc8;\r\xa9\xa7O\x17\xfb\x8dĪ\xb1\x98\x9a\x88\xa3\xa6Ⱉ\xd84\xc7t\xbf\x05\xa4Z\"U\xd4\n-\xb5FK\xd4F\x96\xd4m\x11\xbb\xed\xa0\xcc\x19P\xa1=\x14u\x80\u008e\x90\xe9d7TS\xeal\x9b\x9a\x92\xeeb\xa7\xf3\x17!]\xc5\xd4\rq\xd0\x1dm\xe0\xf6\x10\x9b\x9e\x88\xb3\xbd \xaf7RO\xf7\x11\xfb}Ū\x9f\x98\xfa\x8b\xa3\x01\xe2p\xa0\xd8\f\xc2t\u007f0\xa4\x86 U4\x14-\rCK4\\\x96\xd4#\x10\xbb#\xa1\xcc(\xa80\x1a\x8a\xc6@\xe1XȌ\xb3\x1bʕ\xc6\xdb&W\xd2g\xda\xe9\xfcE\xc8\x041MD\x1c\x9c\x856p\xcf\x16\x9bI\x88\xb3\x93!o\nROO\x15\xfb\xd3\xc4\xea\x1c1M\x17G\xe7\x8a\xc3\x19b3\x13\xd3\xfd*H)\xa4\x8a2h)\x8b\x96('K\xeaY\x88]\re\fT\xc8C\x91\v\x85\x05\xc8x|\x85\xf2>\xef.\xaf\x03~>\xec-W\x14S\x8888\x0fm\xe0\xce\x16\x1bB\x9c\x8d \xaf\x84\xd4\xd3s\xc4~\xb5X\x9d/\xa6\x1aqt\x818\xbcPl.\xc2t\u007f.\xa4.F\xaa\xe8\x12\xb4t)Z\xa2\xcbdI}9b\xf7\n(s%T\xb8\n\x8a\xae\x86\xc2k s\xed\xf2\x94\xc9_gw\x95\xd7\xd7ۄ\xffG\x1f\x88n\xe0,\xb8\x91\x9b\xc0\xbd\t27s\x96\xbd\x85\xe9\xddʑ\xa7o\x83\xfc\xdb!u\aDwB\xd1]Px7d\xee\xe1i\xfe\xbdLu\x1fG\x8a\xee\xe7\x86\x1e\xe0\x86\xe8A\xac\xa1\x1f\xe2\xcc}\x98\x99y\x84Yx\x94\x19=\xc6\f\x1fg\x9a'\x96\x97M\xeb;\xfdI\xf0)\xf0i\xf0\x19\xf0Y\xf09\xf0y\xf0\x05\xf0E\xf0%\xf0e\xf0\x15\xf0U\xf05\xf0u\xf0\r\xf0M\xf0-\xf0m\xf0\x1d\xf0]\xf0=\xf0}\xf0\x03\xf0C\xf0#\xf0c\xf0\x13\xf0S\xf03\xf0s\xf0\v\xf0K\xf0+\xf0k\xf0\x1b\xf0[\xf0;\xf0{\xf0\a\xf0Gp\x1e8\x1f\\\x00.\x04\x17\x81\x8b\xc1%\xe0Rp\x19\xb8\x1c\xfc\t\xfc\x19\\\x01\xae\x04W\x81\xab\xc15\xe0Zp\x1d\xb8\x1e\xdc\x00n\x047\x81\x9b\xc1-\xe0Vp\x1b\xb8\x1d\xdc\x01\xee\x04w\x81\xbb\xc1=\xe0/\xe0\xaf\xe0o\xe0\xef\xe0\x1f\xe0\x9f\xe0_\xe0\xdf\xe0?\xe0\xbf`-X\aփ\xff\x81{\xc1\x06p\x9f\xda\xf2\x91U5i\xa7\xb6\xd2*\xd0\xe9Tm\xd9\xc8\\\xba̲\x98.\xb7cE/]\xc1ʤ+\xad\xaa\xf3\xe9}E\xfb\xd5V\x8c\xb4oq\xe9\xfdm[\xf2\xd2\a\xb0\xfc\xf4\x81\xb5ec\xaa\xd2\a\x81\a\x83\x87Ԗ\x8d\xaaJ\x1f\x8a\xfa0\xf0p\xf0\b\xf0H\xf0\xa8\xda\xf21U\x85\xf4ѢcDNJ\x8e\x13\x1d/:At\"+H\x9f$:Yt\x8a\xe8TQZt\x1a\xcbO\x9f.j$j,j\xc2\n\xd3ME\xcdD\xcdk+\xec<\x9dn\x91\xb8e\xe2V\x89['n\xc3\x0f\xafI\xb7\xad\xad\x1c\x83筝\xddI1}\x06\xd8\x1e\xec\x00v\x04;\x81\x9d\xc1.`W\xb0\x1b\xd8\x1d\xec\x01\xf6\xb4\xc7-\x16ҽD\xbdE}D}E\xfdD\xfdYAz\x80=!\xfb\x19'=0\xf1\xa0ă\x13\x0f\xe1\x87դ\x87\x8a\x86\x89\x86\x8bFXU\x97\xd2#E\xa3D\xa3EcDcE\xe3D\xe3EgZ\x95\n\xe9\t\xa2\x89,?}\x96]\xd0\xfe\x88H\x9f\x9dxR\xe2ɉ\xa7$\x9eZ[>\xd1\x1ec\x1an\x8csj\xcbG\xd9\v:]t.+HϨ\xad\x1cſh\xa7g\xda\xc7\x14\xd3U\xb5\x15\xa3\xec\x8f\u07b4\xb2]>\x9d\xa9-\x1f\x97\xabIgYA:W[1\xce>4=˶\xf6\xa0ڶ\xd5\xf6\xa1\xa6\xb6l\\>\x9d\xaf-\x9f`\x8f\xea\x8a\n,?\xed\xd5VL\xa8\xaa)\xa4\xfd\xda\xca\t\xb8r\x81\xcdsa\xbaȪI\x87v\xb8\xda^\xd8\xf3l\x9b\x0fҳY~\x9aXa:\xaa-\x9bR\x95.ՖO\xb1Ǜ#\xaa\xae\xad\x98\xc27\xc4\xf9\x89k\x12_\x90\xf8\xc2\xc4\x17%\x9e\x9b\xf8\xe2ė\xd8c\xe6җ\x82\x97\x81\x97\x83W\x80W\x82W\x81W\x83׀ׁׂ\xd7\xdb\x13\xc9\x15\xd2\xff\x13\xdd \xbaQt\x13+H\xdf,\xbaEt\xab\xe86\xd1\xed\xa2;Dw\x8a\xee\x12\xdd-\xbaGt\xaf\xe8>\xd1\xfd\xa2\aX^\xfaA\xd1C\xa2\x87E\x8f\x88\x1e\x15=\xc6\xf2ӏ\x8b\x9e\x10=)zJ\xf44+L?c\x9f\x1b\xbe\xfe\xcf&~.\xf1\xf3\x89_H\xfcb\xe2\x97\x12\xbf\x9c\xf8\x95į&~-\xf1\xeb\x89\xdfH\xfc&/W\x93~K\xf4\xb6\xe8\x1dѻ\xb5\xa9\xb1\xe9\xf7\xec\x13\\L\xbf\x0f~\x00~\b~\x04~\f~\x02~\n~\x06~\x0e~a\x17\xe1\x17\xe0\x97\xb5\xe5\x93\xec\x1b\xe5WV\xf6\xe9\xfaڎ\x95\xd2߀߂߁߃?\x80?\x82\xf3\xc0\xf9\xe0\x02p\xa1=3\xfbz[$Z,Z\xc2\n\xd2KE\xcbD\xcbE?\xb1\xbc\xf4Ϣ\x15\xa2\x95\xa2U\xf6\xf4\xf8帺65<\xbd\x86\xb1\x96\xb1\x8e\xb1\x9e\xb1\x81\xb1\x91\xb1\x89\xb1\x99\xb1\x85\xb1\x95\xb1\x8d\xb1\x9d\xb1\x83\xb1\xb3\xb6lx!\xbd\v\xdcm\x19\xa4\xf7\x80\xbf\x80\xbf\x82\xbf\x81\xbf\x83\u007f\x80\u007fZ\xfa\xe9\xbf\xc0\xbf\xc1\u007f,\xc3\xf4\xbf`-XW[1\x90_'\xf5\xb5\xe5\x03\xed\r\xfd_m\xd9\xc0|z\xafm\xec\xeb\xb1\xc1\xcaT\xa5c\xfb\x10c\xc7\xf6\xa9c\xdb\x1ffu\x15\x13\x8d}i\xa6\x12\x97\xd5UN\xe4\xff\n\x93.Ga_\xfc\x15\\\xf0ũ\xac+\x1fg\x8a\xe9}\xeb*\xac\n\xe9\xfd\xea*\x86\xf1\x03\xf7O|\x805\xbf\xbd\x1ch]m\x8ftP]٤R\xfa\xe0\xba\xf2a\xa5b\xfa\x90\xbar\xfb\x034}\xa8谺ʩ8\xe4\xe1\xd2\x1fQW1\xde~JK\x1f)\xedQ\xa2\xa3\xeb\xca&\xe7\xd3\xc7ԕO5\xa5\xf4\xb1ueS\xf2\xe9\xe3\xea\xf8m\xed\xf8\xba\x8a\tƮtB]\xe5\xe45k\x96c\x91OYxe\xf5e\xb3f\xe5˙^E}\x8a\xa2Jƾ\xf5\xfc\xd0\xfd\xc0\xfd\xc1\x03\xc0\x03\xc1\x83\xc0\x83\xc1C\xc0C\xc1\xc3\xc0\xc3\xc1#\xc0#\xebS~p\x94E\xeeh\x8b\xfc1\xf5\xa99\xc1\xb1\xf5e~\xc1\x1c\x87\xf1\xe3\xc1\x13\xc0\x13\xc1\x93\xc0\x93\xebS5\xf9S\xebS\xf6\x93i\xbd3\xf3\xf4z'ۨ\xde1\x8d\xeb\x9dB\x93z\xc7kZ\xef\xf8\xcd\xec\xbf\xe6\xf5NԢ\xdei\xd5Ҟ\xb2iU\xefPk.\xdaآm\xbdS\xd5\xce\xfek_\xef\xa8\x0e\xf5\x8e\xeeh\x8f\xd0\xc9\x1e\xa1s\xbd3\xa7K\xbdsAW\xac\xd2\xcd\xce\xef^\xef\xd4\xf4\xb0\xc7\xedi\xff\xf5\xb2\xc7\ue351>\xb6ꋪ_\xbd\x13\xf4\xb7\xff\x06\xa0\x1bX\uf103\xec\xbf\xc1\xe8\x86ԧ\"\x1a\xca\x18V\xef\xcc\x1e\u038b\x8f\xb0\x87\x1ciwY\x1ceW\x1em\x8f9\xc6>z\xac=\xdak\x98\xf1:\xf8\x06\xf8&\xf8\x16\xf86\xf8\x0e\xf8.\xf8\x1e\xf8>\xf8\x01\xf8!\xf8\x11\xf81\xf8\t\xf8)\xf8\x19\xf89\xf8\x05\xf8%\xf8\x15\xf85\xf8\r\xf8-\xf8\x1d\xf8=\xf8\x03\xf8#8\x0f\x9c\x0f.\x00\x17\x82\x8b\xe4\xd9؋\x1f[\xe0\x00p 8\b\x1c\f\x0e\x01\x87\x82\xc3\xc0\xe1\xe0\bp$8\n\x1c\r\x8e\x01ǂ\xb7\x80\xb7\x82߀߂߁߃?\x80?\x82\xf3\xc0\xf9\xe0\x02p!\xb8\b\\\f.\x01\x97\x82\xcb\xc0\xe5\xe0O\xe0\xcf\xe0\np%\xb8\n\\\r\xae\x01ׂ\xeb\xc0\xf5\xe0\x06p#\xb8\t\xdc\fn\x01\xb7\x82\xdb\xc0\xed\xe0\x0ep'\xb8\v\xdc\r\xee\x01\u007f\x01\xff\x03\xf7\x82\r\xe0>\rL\aL\x81e`9X\x01V\x82\xfb\x82\xfb\x81\xfb\x83\a\x80\a\x82\a\x81\a\x83\x87\x80\x87\x82\x87\x81\x87\x83G\x80G\x82G\x81G\x83ǀǂǁǃ'\x80'\x82'\x81'\x83\xa7\x80\xa7\x82\x8d\x1a\x9c\x8b\x1b\xa3j\x026\x05\x9b\x81\xcd\xc1\x16`K\xb0\x15\xd8\x1al\x03\xb6\x05ہg4\xa4ڶmߐjӦC\x83Ӧc\x833\xa3\x93\xfd\u05f9\xc1iޥ!\xd5\"ݵ\xc1\xb9\xb0[Cjn\xba{\x833\xadGCjz\xbagCjZ\xf3^\re-\xa6\xa7{7\xa4z\xf5\xea\xd3P֧O\xbao\x83ӫ_C\xaaO\xba\xbf}\xdc\x00~\xdc@;sP\x833w0\x96\x19\x02\x0e\x05\x87\x81\xe3\x1a\x9c\xd6\xe3\xed\xbf3\x1b\x9c\xb6\x13\x1b\x9c\x9eg58=\xcenp\xfaNjpN\x9blOe\x8a=\x85\xa9\rN\x8bi\xf68\xe7\xd8\xe3L\xb7>\xd7zF\x83\xd3hf\x83Ӵ\xaa\xc1i\xa9\x1a\x9cV\x19\xfbج]=\xd7\xe0\xf4\x99\xd5\xe0\xf46\r\xce9\xf9\x06\xa7\xb1\xdb\xe04)48\xfd<\xac\xe6\x83\x01X\x04\t,\x81{\xc1\x06p\x9f\x187G윖\x8a\x9d\xd3\xcbb\xa7Qy\xec4\xae\x88\x9d&\x95\xb1\xd3t\xdf\xd8i\xb6_\xec4\xdf?vZ\x1c\x10;-\x0f\x8c\x9dV\a\xc5N\xeb\x83c\xa7\xcd!\xb1\xd3\xf6\xd0\xd8iwX\xec\x9cqx\xec\xb4?\"v:\x1c\x19;\x1d\x8f\x8a\x9dNG\xc7N\xe7cb\xa7˱\xb1\xd3\xf5\xb8\xd8\xe9v|\xect?!vz\x9c\x18;=O\x8a\x9d^'\xc7N\xefSb\xa7ϩ\xb1\xd37\x1d;\xfdN\x8b\x9d\xfe\xa7\xc7\u0380F\xb13\xb0q\xec\fj\x12;\x83\x9b\xc6ΐf\xb13\xb4y\xec\fk\x11;\xc3[\xc6ΈV\xb13\xb2u\xec\x8cj\x13;\xa3\xdb\xc6Θv\xb13\xf6\x8c\xd8\x19\xd7>v\xc6w\x88\x9d3;\xc6΄N\xb13\xb1s\xec\x9c\xd5%v\xce\xee\x1a;\x93\xba\xc5\xce\xe4\xee\xb13\xa5G\xecL\xed\x19;\xd3z\xc5\xce9\xbdcgz\x9f\xd89\xb7o\xec\xcc\xe8\x17;3\xfb\xc7NՀ\xd8Q\x03c'3(v\xb2\x83c'7$vf\r\x8d\x1d=,v\xcc\xf0\xd8ɏ\x88\x1dwd\xec\x14FŎ7:v\xfc1\xb1\x13\x8c\x8d\x9d\xe2\xb8\xd8\t\xc7\xc7\xceyg\xc6\xce\xec\t\xb1C\x13c':+vJg\xc7ΜI\xb1S=9vΟ\x12;5Sc\xe7\x82i\xb1\xbd\xba\xb1s\xd1\xf4ؙ{n\xec\\<\x03\xcf\xfeL\xb0\xca>\x9fʞ_ƞ[\xd6>\xc79\xfb|ϊS\xd5EmO\xce\xd8\x13\xc8ۃ\xba\xf6\xc4\nvQ/N\xd5T\xf9\x16\xa5\xc0\xa2X\x8cSQ)\xb4\x17\xe7<\xfb\xd8\xd9\xf6\xb1d\x1f\x1b\xd9ǖ\xecc\xe7ĩBU\xb5E\xfe|\x8bR\x8dE\xee\x02\x8b\xe2\x85q\x8a\xaa.\xb2\xc8ϵ(]l\x91\xbbĢx\xa9=\\\xd5e\x16\xf9\xcb\xf9\xc0WX䮴(^\x15\xa7\x82\xaa\xab-\xf2\xd7X\x94\xae\xb5\xc8]gQ\xbc>N\x99\xaa\xffY\xe4o\xb0(\xddh\x91\xbbɢxs\x9c\xf2\xabn\xb1\xc8\xdfjQ\xba\xcd\"w\xbbE\xf1\x0e\xde\xc1\x9d\xbc\x83\xbbx\awǩ\xd9U\xf7X\xe4\xef\xb5(\xddg\x91\xbbߢ\xf8\x80}\n\xaa\x1e\xb4\xcf\xf5C\xf6\xfey\xd8\xde?\x8f\xdak\xf2X\x9c\xd2\xfaq\vz\u008e Date: Fri, 12 Jun 2015 20:06:47 +0200 Subject: [PATCH 298/398] Added new style override, transform negative-Y, Closes #2162 --- CHANGELOG.md | 1 + public/app/components/timeSeries.js | 1 + public/app/panels/graph/seriesOverridesCtrl.js | 3 ++- public/vendor/jquery/jquery.flot.js | 13 +++++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5988579123a..4f89aa88b9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [Issue #1888](https://github.com/grafana/grafana/issues/1144). Templating: Repeat panel or row for each selected template variable value - [Issue #1888](https://github.com/grafana/grafana/issues/1944). Dashboard: Custom Navigation links & dynamic links to related dashboards - [Issue #590](https://github.com/grafana/grafana/issues/590). Graph: Define series color using regex rule +- [Issue #2162](https://github.com/grafana/grafana/issues/2162). Graph: New series style override, negative-y transform and stack groups - [Issue #2096](https://github.com/grafana/grafana/issues/2096). Dashboard list panel: Now supports search by multiple tags **User or Organization admin** diff --git a/public/app/components/timeSeries.js b/public/app/components/timeSeries.js index 679777bfb92..3c41378947e 100644 --- a/public/app/components/timeSeries.js +++ b/public/app/components/timeSeries.js @@ -54,6 +54,7 @@ function (_, kbn) { if (override.zindex !== void 0) { this.zindex = override.zindex; } if (override.fillBelowTo !== void 0) { this.fillBelowTo = override.fillBelowTo; } if (override.color !== void 0) { this.color = override.color; } + if (override.transform !== void 0) { this.transform = override.transform; } if (override.yaxis !== void 0) { this.yaxis = override.yaxis; diff --git a/public/app/panels/graph/seriesOverridesCtrl.js b/public/app/panels/graph/seriesOverridesCtrl.js index 81cb41a8572..8cbf7dff03a 100644 --- a/public/app/panels/graph/seriesOverridesCtrl.js +++ b/public/app/panels/graph/seriesOverridesCtrl.js @@ -99,10 +99,11 @@ define([ $scope.addOverrideOption('Staircase line', 'steppedLine', [true, false]); $scope.addOverrideOption('Points', 'points', [true, false]); $scope.addOverrideOption('Points Radius', 'pointradius', [1,2,3,4,5]); - $scope.addOverrideOption('Stack', 'stack', [true, false, 2, 3, 4, 5]); + $scope.addOverrideOption('Stack', 'stack', [true, false, 'A', 'B', 'C', 'D']); $scope.addOverrideOption('Color', 'color', ['change']); $scope.addOverrideOption('Y-axis', 'yaxis', [1, 2]); $scope.addOverrideOption('Z-index', 'zindex', [-1,-2,-3,0,1,2,3]); + $scope.addOverrideOption('Transform', 'transform', ['negative-Y']); $scope.updateCurrentOverrides(); }); diff --git a/public/vendor/jquery/jquery.flot.js b/public/vendor/jquery/jquery.flot.js index f49ce088dfb..380030a77c9 100644 --- a/public/vendor/jquery/jquery.flot.js +++ b/public/vendor/jquery/jquery.flot.js @@ -1226,6 +1226,19 @@ Licensed under the MIT license. // give the hooks a chance to run for (i = 0; i < series.length; ++i) { s = series[i]; + points = s.datapoints.points; + ps = s.datapoints.pointsize; + + // grafana + if (s.transform === 'negative-Y') { + for (j = 0; j < points.length; j += ps) { + if (points[j] == null) + continue; + + val = points[j + 1]; + points[j + 1] = -val; + } + } executeHooks(hooks.processDatapoints, [ s, s.datapoints]); } From 30db7e64fbff206c0795602931ba47f186c21382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 13 Jun 2015 20:06:53 +0200 Subject: [PATCH 299/398] Fixed example redis session config, Fixes #2157 --- conf/defaults.ini | 2 +- conf/sample.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 5d1d1831cb3..bd1a069c744 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -72,7 +72,7 @@ provider = file # Provider config options # memory: not have any config yet # file: session dir path, is relative to grafana data_path -# redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana` +# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana` # postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable # mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name` diff --git a/conf/sample.ini b/conf/sample.ini index cd01c588766..2ac1fd6ee1e 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -72,7 +72,7 @@ # Provider config options # memory: not have any config yet # file: session dir path, is relative to grafana data_path -# redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana` +# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana` # mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name` # postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable ;provider_config = sessions From 66e60357dc1c03153d35668c5b966b7f7a41e43d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 13 Jun 2015 20:14:44 +0200 Subject: [PATCH 300/398] Set email when creating user from auth_proxy header, Fixes #2156 --- pkg/middleware/auth_proxy.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go index 42cd91a3ad1..2529fef67a9 100644 --- a/pkg/middleware/auth_proxy.go +++ b/pkg/middleware/auth_proxy.go @@ -60,8 +60,10 @@ func getCreateUserCommandForProxyAuth(headerVal string) *m.CreateUserCommand { cmd := m.CreateUserCommand{} if setting.AuthProxyHeaderProperty == "username" { cmd.Login = headerVal + cmd.Email = headerVal } else if setting.AuthProxyHeaderProperty == "email" { cmd.Email = headerVal + cmd.Login = headerVal } else { panic("Auth proxy header property invalid") } From 2c88b418fd757efd7be1a47d5992ed57c1335213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 13 Jun 2015 20:20:48 +0200 Subject: [PATCH 301/398] Fix import from elasticsearch limit, Fixes #1843, Fixes 2154 --- public/app/plugins/datasource/elasticsearch/datasource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js index 957d8b7ffe7..9568b66ad74 100644 --- a/public/app/plugins/datasource/elasticsearch/datasource.js +++ b/public/app/plugins/datasource/elasticsearch/datasource.js @@ -264,7 +264,7 @@ function (angular, _, config, kbn, moment) { var query = { query: { query_string: { query: queryString } }, facets: { tags: { terms: { field: "tags", order: "term", size: 50 } } }, - size: this.searchMaxResults, + size: 10000, sort: ["_uid"], }; From 6f4b206a9980e638b04f201944e86f120eca5a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 13 Jun 2015 20:43:12 +0200 Subject: [PATCH 302/398] Added bowerrc file --- .bowerrc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .bowerrc diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 00000000000..36643c6062c --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "public/vendor/" +} From 87c65bcea05f5ffc613591feb1b53716360d8f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 13 Jun 2015 20:53:08 +0200 Subject: [PATCH 303/398] Migrating to use bower for component dependencies --- bower.json | 18 + public/app/components/require.config.js | 20 +- public/test/test-main.js | 20 +- .../{jquery => flot}/jquery.flot.crosshair.js | 0 .../{jquery => flot}/jquery.flot.events.js | 0 .../{jquery => flot}/jquery.flot.fillbelow.js | 0 .../jquery.flot.fillbetween.js | 0 public/vendor/{jquery => flot}/jquery.flot.js | 0 .../{jquery => flot}/jquery.flot.pie.js | 0 .../{jquery => flot}/jquery.flot.selection.js | 0 .../{jquery => flot}/jquery.flot.stack.js | 0 .../jquery.flot.stackpercent.js | 0 .../{jquery => flot}/jquery.flot.time.js | 0 public/vendor/jquery/.bower.json | 39 + public/vendor/jquery/MIT-LICENSE.txt | 21 + public/vendor/jquery/bower.json | 28 + public/vendor/jquery/dist/jquery.js | 9210 +++++++++++++++++ public/vendor/jquery/dist/jquery.min.js | 5 + public/vendor/jquery/dist/jquery.min.map | 1 + public/vendor/jquery/src/ajax.js | 786 ++ public/vendor/jquery/src/ajax/jsonp.js | 89 + public/vendor/jquery/src/ajax/load.js | 75 + public/vendor/jquery/src/ajax/parseJSON.js | 13 + public/vendor/jquery/src/ajax/parseXML.js | 28 + public/vendor/jquery/src/ajax/script.js | 64 + public/vendor/jquery/src/ajax/var/nonce.js | 5 + public/vendor/jquery/src/ajax/var/rquery.js | 3 + public/vendor/jquery/src/ajax/xhr.js | 136 + public/vendor/jquery/src/attributes.js | 11 + public/vendor/jquery/src/attributes/attr.js | 141 + .../vendor/jquery/src/attributes/classes.js | 158 + public/vendor/jquery/src/attributes/prop.js | 94 + .../vendor/jquery/src/attributes/support.js | 35 + public/vendor/jquery/src/attributes/val.js | 161 + public/vendor/jquery/src/callbacks.js | 205 + public/vendor/jquery/src/core.js | 502 + public/vendor/jquery/src/core/access.js | 60 + public/vendor/jquery/src/core/init.js | 123 + public/vendor/jquery/src/core/parseHTML.js | 39 + public/vendor/jquery/src/core/ready.js | 97 + .../vendor/jquery/src/core/var/rsingleTag.js | 4 + public/vendor/jquery/src/css.js | 450 + public/vendor/jquery/src/css/addGetHookIf.js | 22 + public/vendor/jquery/src/css/curCSS.js | 57 + .../vendor/jquery/src/css/defaultDisplay.js | 70 + .../jquery/src/css/hiddenVisibleSelectors.js | 15 + public/vendor/jquery/src/css/support.js | 96 + public/vendor/jquery/src/css/swap.js | 28 + public/vendor/jquery/src/css/var/cssExpand.js | 3 + public/vendor/jquery/src/css/var/getStyles.js | 12 + public/vendor/jquery/src/css/var/isHidden.js | 13 + public/vendor/jquery/src/css/var/rmargin.js | 3 + public/vendor/jquery/src/css/var/rnumnonpx.js | 5 + public/vendor/jquery/src/data.js | 178 + public/vendor/jquery/src/data/Data.js | 181 + public/vendor/jquery/src/data/accepts.js | 20 + .../vendor/jquery/src/data/var/data_priv.js | 5 + .../vendor/jquery/src/data/var/data_user.js | 5 + public/vendor/jquery/src/deferred.js | 149 + public/vendor/jquery/src/deprecated.js | 13 + public/vendor/jquery/src/dimensions.js | 50 + public/vendor/jquery/src/effects.js | 648 ++ public/vendor/jquery/src/effects/Tween.js | 114 + .../jquery/src/effects/animatedSelector.js | 13 + public/vendor/jquery/src/event.js | 868 ++ public/vendor/jquery/src/event/ajax.js | 13 + public/vendor/jquery/src/event/alias.js | 39 + public/vendor/jquery/src/event/support.js | 9 + public/vendor/jquery/src/exports/amd.js | 24 + public/vendor/jquery/src/exports/global.js | 32 + public/vendor/jquery/src/intro.js | 44 + public/vendor/jquery/src/jquery.js | 37 + public/vendor/jquery/src/manipulation.js | 580 ++ .../jquery/src/manipulation/_evalUrl.js | 18 + .../vendor/jquery/src/manipulation/support.js | 32 + .../src/manipulation/var/rcheckableType.js | 3 + public/vendor/jquery/src/offset.js | 207 + public/vendor/jquery/src/outro.js | 1 + public/vendor/jquery/src/queue.js | 142 + public/vendor/jquery/src/queue/delay.js | 22 + public/vendor/jquery/src/selector-native.js | 172 + public/vendor/jquery/src/selector-sizzle.js | 14 + public/vendor/jquery/src/selector.js | 1 + public/vendor/jquery/src/serialize.js | 111 + .../vendor/jquery/src/sizzle/dist/sizzle.js | 2067 ++++ .../jquery/src/sizzle/dist/sizzle.min.js | 3 + .../jquery/src/sizzle/dist/sizzle.min.map | 1 + public/vendor/jquery/src/traversing.js | 199 + .../jquery/src/traversing/findFilter.js | 100 + .../src/traversing/var/rneedsContext.js | 6 + public/vendor/jquery/src/var/arr.js | 3 + public/vendor/jquery/src/var/class2type.js | 4 + public/vendor/jquery/src/var/concat.js | 5 + public/vendor/jquery/src/var/hasOwn.js | 5 + public/vendor/jquery/src/var/indexOf.js | 5 + public/vendor/jquery/src/var/pnum.js | 3 + public/vendor/jquery/src/var/push.js | 5 + public/vendor/jquery/src/var/rnotwhite.js | 3 + public/vendor/jquery/src/var/slice.js | 5 + public/vendor/jquery/src/var/strundefined.js | 3 + public/vendor/jquery/src/var/support.js | 4 + public/vendor/jquery/src/var/toString.js | 5 + public/vendor/jquery/src/wrap.js | 79 + 103 files changed, 19195 insertions(+), 20 deletions(-) create mode 100644 bower.json rename public/vendor/{jquery => flot}/jquery.flot.crosshair.js (100%) rename public/vendor/{jquery => flot}/jquery.flot.events.js (100%) rename public/vendor/{jquery => flot}/jquery.flot.fillbelow.js (100%) rename public/vendor/{jquery => flot}/jquery.flot.fillbetween.js (100%) rename public/vendor/{jquery => flot}/jquery.flot.js (100%) rename public/vendor/{jquery => flot}/jquery.flot.pie.js (100%) rename public/vendor/{jquery => flot}/jquery.flot.selection.js (100%) rename public/vendor/{jquery => flot}/jquery.flot.stack.js (100%) rename public/vendor/{jquery => flot}/jquery.flot.stackpercent.js (100%) rename public/vendor/{jquery => flot}/jquery.flot.time.js (100%) create mode 100644 public/vendor/jquery/.bower.json create mode 100644 public/vendor/jquery/MIT-LICENSE.txt create mode 100644 public/vendor/jquery/bower.json create mode 100644 public/vendor/jquery/dist/jquery.js create mode 100644 public/vendor/jquery/dist/jquery.min.js create mode 100644 public/vendor/jquery/dist/jquery.min.map create mode 100644 public/vendor/jquery/src/ajax.js create mode 100644 public/vendor/jquery/src/ajax/jsonp.js create mode 100644 public/vendor/jquery/src/ajax/load.js create mode 100644 public/vendor/jquery/src/ajax/parseJSON.js create mode 100644 public/vendor/jquery/src/ajax/parseXML.js create mode 100644 public/vendor/jquery/src/ajax/script.js create mode 100644 public/vendor/jquery/src/ajax/var/nonce.js create mode 100644 public/vendor/jquery/src/ajax/var/rquery.js create mode 100644 public/vendor/jquery/src/ajax/xhr.js create mode 100644 public/vendor/jquery/src/attributes.js create mode 100644 public/vendor/jquery/src/attributes/attr.js create mode 100644 public/vendor/jquery/src/attributes/classes.js create mode 100644 public/vendor/jquery/src/attributes/prop.js create mode 100644 public/vendor/jquery/src/attributes/support.js create mode 100644 public/vendor/jquery/src/attributes/val.js create mode 100644 public/vendor/jquery/src/callbacks.js create mode 100644 public/vendor/jquery/src/core.js create mode 100644 public/vendor/jquery/src/core/access.js create mode 100644 public/vendor/jquery/src/core/init.js create mode 100644 public/vendor/jquery/src/core/parseHTML.js create mode 100644 public/vendor/jquery/src/core/ready.js create mode 100644 public/vendor/jquery/src/core/var/rsingleTag.js create mode 100644 public/vendor/jquery/src/css.js create mode 100644 public/vendor/jquery/src/css/addGetHookIf.js create mode 100644 public/vendor/jquery/src/css/curCSS.js create mode 100644 public/vendor/jquery/src/css/defaultDisplay.js create mode 100644 public/vendor/jquery/src/css/hiddenVisibleSelectors.js create mode 100644 public/vendor/jquery/src/css/support.js create mode 100644 public/vendor/jquery/src/css/swap.js create mode 100644 public/vendor/jquery/src/css/var/cssExpand.js create mode 100644 public/vendor/jquery/src/css/var/getStyles.js create mode 100644 public/vendor/jquery/src/css/var/isHidden.js create mode 100644 public/vendor/jquery/src/css/var/rmargin.js create mode 100644 public/vendor/jquery/src/css/var/rnumnonpx.js create mode 100644 public/vendor/jquery/src/data.js create mode 100644 public/vendor/jquery/src/data/Data.js create mode 100644 public/vendor/jquery/src/data/accepts.js create mode 100644 public/vendor/jquery/src/data/var/data_priv.js create mode 100644 public/vendor/jquery/src/data/var/data_user.js create mode 100644 public/vendor/jquery/src/deferred.js create mode 100644 public/vendor/jquery/src/deprecated.js create mode 100644 public/vendor/jquery/src/dimensions.js create mode 100644 public/vendor/jquery/src/effects.js create mode 100644 public/vendor/jquery/src/effects/Tween.js create mode 100644 public/vendor/jquery/src/effects/animatedSelector.js create mode 100644 public/vendor/jquery/src/event.js create mode 100644 public/vendor/jquery/src/event/ajax.js create mode 100644 public/vendor/jquery/src/event/alias.js create mode 100644 public/vendor/jquery/src/event/support.js create mode 100644 public/vendor/jquery/src/exports/amd.js create mode 100644 public/vendor/jquery/src/exports/global.js create mode 100644 public/vendor/jquery/src/intro.js create mode 100644 public/vendor/jquery/src/jquery.js create mode 100644 public/vendor/jquery/src/manipulation.js create mode 100644 public/vendor/jquery/src/manipulation/_evalUrl.js create mode 100644 public/vendor/jquery/src/manipulation/support.js create mode 100644 public/vendor/jquery/src/manipulation/var/rcheckableType.js create mode 100644 public/vendor/jquery/src/offset.js create mode 100644 public/vendor/jquery/src/outro.js create mode 100644 public/vendor/jquery/src/queue.js create mode 100644 public/vendor/jquery/src/queue/delay.js create mode 100644 public/vendor/jquery/src/selector-native.js create mode 100644 public/vendor/jquery/src/selector-sizzle.js create mode 100644 public/vendor/jquery/src/selector.js create mode 100644 public/vendor/jquery/src/serialize.js create mode 100644 public/vendor/jquery/src/sizzle/dist/sizzle.js create mode 100644 public/vendor/jquery/src/sizzle/dist/sizzle.min.js create mode 100644 public/vendor/jquery/src/sizzle/dist/sizzle.min.map create mode 100644 public/vendor/jquery/src/traversing.js create mode 100644 public/vendor/jquery/src/traversing/findFilter.js create mode 100644 public/vendor/jquery/src/traversing/var/rneedsContext.js create mode 100644 public/vendor/jquery/src/var/arr.js create mode 100644 public/vendor/jquery/src/var/class2type.js create mode 100644 public/vendor/jquery/src/var/concat.js create mode 100644 public/vendor/jquery/src/var/hasOwn.js create mode 100644 public/vendor/jquery/src/var/indexOf.js create mode 100644 public/vendor/jquery/src/var/pnum.js create mode 100644 public/vendor/jquery/src/var/push.js create mode 100644 public/vendor/jquery/src/var/rnotwhite.js create mode 100644 public/vendor/jquery/src/var/slice.js create mode 100644 public/vendor/jquery/src/var/strundefined.js create mode 100644 public/vendor/jquery/src/var/support.js create mode 100644 public/vendor/jquery/src/var/toString.js create mode 100644 public/vendor/jquery/src/wrap.js diff --git a/bower.json b/bower.json new file mode 100644 index 00000000000..ad8c3087cd4 --- /dev/null +++ b/bower.json @@ -0,0 +1,18 @@ +{ + "name": "grafana", + "version": "2.0.2", + "homepage": "https://github.com/grafana/grafana", + "authors": [], + "license": "Apache 2.0", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "public/vendor/", + "test", + "tests" + ], + "dependencies": { + "jquery": "~2.1.4" + } +} diff --git a/public/app/components/require.config.js b/public/app/components/require.config.js index bbe9674aecf..f8cf6e19794 100644 --- a/public/app/components/require.config.js +++ b/public/app/components/require.config.js @@ -29,19 +29,19 @@ require.config({ 'lodash-src': '../vendor/lodash', bootstrap: '../vendor/bootstrap/bootstrap', - jquery: '../vendor/jquery/jquery-2.1.3', + jquery: '../vendor/jquery/dist/jquery', 'extend-jquery': 'components/extend-jquery', - 'jquery.flot': '../vendor/jquery/jquery.flot', - 'jquery.flot.pie': '../vendor/jquery/jquery.flot.pie', - 'jquery.flot.events': '../vendor/jquery/jquery.flot.events', - 'jquery.flot.selection': '../vendor/jquery/jquery.flot.selection', - 'jquery.flot.stack': '../vendor/jquery/jquery.flot.stack', - 'jquery.flot.stackpercent':'../vendor/jquery/jquery.flot.stackpercent', - 'jquery.flot.time': '../vendor/jquery/jquery.flot.time', - 'jquery.flot.crosshair': '../vendor/jquery/jquery.flot.crosshair', - 'jquery.flot.fillbelow': '../vendor/jquery/jquery.flot.fillbelow', + 'jquery.flot': '../vendor/flot/jquery.flot', + 'jquery.flot.pie': '../vendor/flot/jquery.flot.pie', + 'jquery.flot.events': '../vendor/flot/jquery.flot.events', + 'jquery.flot.selection': '../vendor/flot/jquery.flot.selection', + 'jquery.flot.stack': '../vendor/flot/jquery.flot.stack', + 'jquery.flot.stackpercent':'../vendor/flot/jquery.flot.stackpercent', + 'jquery.flot.time': '../vendor/flot/jquery.flot.time', + 'jquery.flot.crosshair': '../vendor/flot/jquery.flot.crosshair', + 'jquery.flot.fillbelow': '../vendor/flot/jquery.flot.fillbelow', modernizr: '../vendor/modernizr-2.6.1', diff --git a/public/test/test-main.js b/public/test/test-main.js index bbc6b239fa0..8cbefcd8098 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -29,22 +29,22 @@ require.config({ crypto: '../vendor/crypto.min', spectrum: '../vendor/spectrum', - jquery: '../vendor/jquery/jquery-2.1.3', + jquery: '../vendor/jquery/dist/jquery', bootstrap: '../vendor/bootstrap/bootstrap', 'bootstrap-tagsinput': '../vendor/tagsinput/bootstrap-tagsinput', 'extend-jquery': 'components/extend-jquery', - 'jquery.flot': '../vendor/jquery/jquery.flot', - 'jquery.flot.pie': '../vendor/jquery/jquery.flot.pie', - 'jquery.flot.events': '../vendor/jquery/jquery.flot.events', - 'jquery.flot.selection': '../vendor/jquery/jquery.flot.selection', - 'jquery.flot.stack': '../vendor/jquery/jquery.flot.stack', - 'jquery.flot.stackpercent':'../vendor/jquery/jquery.flot.stackpercent', - 'jquery.flot.time': '../vendor/jquery/jquery.flot.time', - 'jquery.flot.crosshair': '../vendor/jquery/jquery.flot.crosshair', - 'jquery.flot.fillbelow': '../vendor/jquery/jquery.flot.fillbelow', + 'jquery.flot': '../vendor/flot/jquery.flot', + 'jquery.flot.pie': '../vendor/flot/jquery.flot.pie', + 'jquery.flot.events': '../vendor/flot/jquery.flot.events', + 'jquery.flot.selection': '../vendor/flot/jquery.flot.selection', + 'jquery.flot.stack': '../vendor/flot/jquery.flot.stack', + 'jquery.flot.stackpercent':'../vendor/flot/jquery.flot.stackpercent', + 'jquery.flot.time': '../vendor/flot/jquery.flot.time', + 'jquery.flot.crosshair': '../vendor/flot/jquery.flot.crosshair', + 'jquery.flot.fillbelow': '../vendor/flot/jquery.flot.fillbelow', modernizr: '../vendor/modernizr-2.6.1', }, diff --git a/public/vendor/jquery/jquery.flot.crosshair.js b/public/vendor/flot/jquery.flot.crosshair.js similarity index 100% rename from public/vendor/jquery/jquery.flot.crosshair.js rename to public/vendor/flot/jquery.flot.crosshair.js diff --git a/public/vendor/jquery/jquery.flot.events.js b/public/vendor/flot/jquery.flot.events.js similarity index 100% rename from public/vendor/jquery/jquery.flot.events.js rename to public/vendor/flot/jquery.flot.events.js diff --git a/public/vendor/jquery/jquery.flot.fillbelow.js b/public/vendor/flot/jquery.flot.fillbelow.js similarity index 100% rename from public/vendor/jquery/jquery.flot.fillbelow.js rename to public/vendor/flot/jquery.flot.fillbelow.js diff --git a/public/vendor/jquery/jquery.flot.fillbetween.js b/public/vendor/flot/jquery.flot.fillbetween.js similarity index 100% rename from public/vendor/jquery/jquery.flot.fillbetween.js rename to public/vendor/flot/jquery.flot.fillbetween.js diff --git a/public/vendor/jquery/jquery.flot.js b/public/vendor/flot/jquery.flot.js similarity index 100% rename from public/vendor/jquery/jquery.flot.js rename to public/vendor/flot/jquery.flot.js diff --git a/public/vendor/jquery/jquery.flot.pie.js b/public/vendor/flot/jquery.flot.pie.js similarity index 100% rename from public/vendor/jquery/jquery.flot.pie.js rename to public/vendor/flot/jquery.flot.pie.js diff --git a/public/vendor/jquery/jquery.flot.selection.js b/public/vendor/flot/jquery.flot.selection.js similarity index 100% rename from public/vendor/jquery/jquery.flot.selection.js rename to public/vendor/flot/jquery.flot.selection.js diff --git a/public/vendor/jquery/jquery.flot.stack.js b/public/vendor/flot/jquery.flot.stack.js similarity index 100% rename from public/vendor/jquery/jquery.flot.stack.js rename to public/vendor/flot/jquery.flot.stack.js diff --git a/public/vendor/jquery/jquery.flot.stackpercent.js b/public/vendor/flot/jquery.flot.stackpercent.js similarity index 100% rename from public/vendor/jquery/jquery.flot.stackpercent.js rename to public/vendor/flot/jquery.flot.stackpercent.js diff --git a/public/vendor/jquery/jquery.flot.time.js b/public/vendor/flot/jquery.flot.time.js similarity index 100% rename from public/vendor/jquery/jquery.flot.time.js rename to public/vendor/flot/jquery.flot.time.js diff --git a/public/vendor/jquery/.bower.json b/public/vendor/jquery/.bower.json new file mode 100644 index 00000000000..49cf1b54efb --- /dev/null +++ b/public/vendor/jquery/.bower.json @@ -0,0 +1,39 @@ +{ + "name": "jquery", + "version": "2.1.4", + "main": "dist/jquery.js", + "license": "MIT", + "ignore": [ + "**/.*", + "build", + "dist/cdn", + "speed", + "test", + "*.md", + "AUTHORS.txt", + "Gruntfile.js", + "package.json" + ], + "devDependencies": { + "sizzle": "2.1.1-jquery.2.1.2", + "requirejs": "2.1.10", + "qunit": "1.14.0", + "sinon": "1.8.1" + }, + "keywords": [ + "jquery", + "javascript", + "library" + ], + "homepage": "https://github.com/jquery/jquery", + "_release": "2.1.4", + "_resolution": { + "type": "version", + "tag": "2.1.4", + "commit": "7751e69b615c6eca6f783a81e292a55725af6b85" + }, + "_source": "git://github.com/jquery/jquery.git", + "_target": "~2.1.4", + "_originalSource": "jquery", + "_direct": true +} \ No newline at end of file diff --git a/public/vendor/jquery/MIT-LICENSE.txt b/public/vendor/jquery/MIT-LICENSE.txt new file mode 100644 index 00000000000..cdd31b5c710 --- /dev/null +++ b/public/vendor/jquery/MIT-LICENSE.txt @@ -0,0 +1,21 @@ +Copyright 2014 jQuery Foundation and other contributors +http://jquery.com/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/public/vendor/jquery/bower.json b/public/vendor/jquery/bower.json new file mode 100644 index 00000000000..0c80cd53a79 --- /dev/null +++ b/public/vendor/jquery/bower.json @@ -0,0 +1,28 @@ +{ + "name": "jquery", + "version": "2.1.4", + "main": "dist/jquery.js", + "license": "MIT", + "ignore": [ + "**/.*", + "build", + "dist/cdn", + "speed", + "test", + "*.md", + "AUTHORS.txt", + "Gruntfile.js", + "package.json" + ], + "devDependencies": { + "sizzle": "2.1.1-jquery.2.1.2", + "requirejs": "2.1.10", + "qunit": "1.14.0", + "sinon": "1.8.1" + }, + "keywords": [ + "jquery", + "javascript", + "library" + ] +} diff --git a/public/vendor/jquery/dist/jquery.js b/public/vendor/jquery/dist/jquery.js new file mode 100644 index 00000000000..eed17778c68 --- /dev/null +++ b/public/vendor/jquery/dist/jquery.js @@ -0,0 +1,9210 @@ +/*! + * jQuery JavaScript Library v2.1.4 + * http://jquery.com/ + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * + * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2015-04-28T16:01Z + */ + +(function( global, factory ) { + + if ( typeof module === "object" && typeof module.exports === "object" ) { + // For CommonJS and CommonJS-like environments where a proper `window` + // is present, execute the factory and get jQuery. + // For environments that do not have a `window` with a `document` + // (such as Node.js), expose a factory as module.exports. + // This accentuates the need for the creation of a real `window`. + // e.g. var jQuery = require("jquery")(window); + // See ticket #14549 for more info. + module.exports = global.document ? + factory( global, true ) : + function( w ) { + if ( !w.document ) { + throw new Error( "jQuery requires a window with a document" ); + } + return factory( w ); + }; + } else { + factory( global ); + } + +// Pass this if window is not defined yet +}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) { + +// Support: Firefox 18+ +// Can't be in strict mode, several libs including ASP.NET trace +// the stack via arguments.caller.callee and Firefox dies if +// you try to trace through "use strict" call chains. (#13335) +// + +var arr = []; + +var slice = arr.slice; + +var concat = arr.concat; + +var push = arr.push; + +var indexOf = arr.indexOf; + +var class2type = {}; + +var toString = class2type.toString; + +var hasOwn = class2type.hasOwnProperty; + +var support = {}; + + + +var + // Use the correct document accordingly with window argument (sandbox) + document = window.document, + + version = "2.1.4", + + // Define a local copy of jQuery + jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + // Need init if jQuery is called (just allow error to be thrown if not included) + return new jQuery.fn.init( selector, context ); + }, + + // Support: Android<4.1 + // Make sure we trim BOM and NBSP + rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, + + // Matches dashed string for camelizing + rmsPrefix = /^-ms-/, + rdashAlpha = /-([\da-z])/gi, + + // Used by jQuery.camelCase as callback to replace() + fcamelCase = function( all, letter ) { + return letter.toUpperCase(); + }; + +jQuery.fn = jQuery.prototype = { + // The current version of jQuery being used + jquery: version, + + constructor: jQuery, + + // Start with an empty selector + selector: "", + + // The default length of a jQuery object is 0 + length: 0, + + toArray: function() { + return slice.call( this ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num != null ? + + // Return just the one element from the set + ( num < 0 ? this[ num + this.length ] : this[ num ] ) : + + // Return all the elements in a clean array + slice.call( this ); + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems ) { + + // Build a new jQuery matched element set + var ret = jQuery.merge( this.constructor(), elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + ret.context = this.context; + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function( elem, i ) { + return callback.call( elem, i, elem ); + })); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ) ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + eq: function( i ) { + var len = this.length, + j = +i + ( i < 0 ? len : 0 ); + return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] ); + }, + + end: function() { + return this.prevObject || this.constructor(null); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: arr.sort, + splice: arr.splice +}; + +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[0] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + + // Skip the boolean and the target + target = arguments[ i ] || {}; + i++; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction(target) ) { + target = {}; + } + + // Extend jQuery itself if only one argument is passed + if ( i === length ) { + target = this; + i--; + } + + for ( ; i < length; i++ ) { + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) { + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( copyIsArray ) { + copyIsArray = false; + clone = src && jQuery.isArray(src) ? src : []; + + } else { + clone = src && jQuery.isPlainObject(src) ? src : {}; + } + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend({ + // Unique for each copy of jQuery on the page + expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), + + // Assume jQuery is ready without the ready module + isReady: true, + + error: function( msg ) { + throw new Error( msg ); + }, + + noop: function() {}, + + isFunction: function( obj ) { + return jQuery.type(obj) === "function"; + }, + + isArray: Array.isArray, + + isWindow: function( obj ) { + return obj != null && obj === obj.window; + }, + + isNumeric: function( obj ) { + // parseFloat NaNs numeric-cast false positives (null|true|false|"") + // ...but misinterprets leading-number strings, particularly hex literals ("0x...") + // subtraction forces infinities to NaN + // adding 1 corrects loss of precision from parseFloat (#15100) + return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0; + }, + + isPlainObject: function( obj ) { + // Not plain objects: + // - Any object or value whose internal [[Class]] property is not "[object Object]" + // - DOM nodes + // - window + if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + return false; + } + + if ( obj.constructor && + !hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) { + return false; + } + + // If the function hasn't returned already, we're confident that + // |obj| is a plain object, created by {} or constructed with new Object + return true; + }, + + isEmptyObject: function( obj ) { + var name; + for ( name in obj ) { + return false; + } + return true; + }, + + type: function( obj ) { + if ( obj == null ) { + return obj + ""; + } + // Support: Android<4.0, iOS<6 (functionish RegExp) + return typeof obj === "object" || typeof obj === "function" ? + class2type[ toString.call(obj) ] || "object" : + typeof obj; + }, + + // Evaluates a script in a global context + globalEval: function( code ) { + var script, + indirect = eval; + + code = jQuery.trim( code ); + + if ( code ) { + // If the code includes a valid, prologue position + // strict mode pragma, execute code by injecting a + // script tag into the document. + if ( code.indexOf("use strict") === 1 ) { + script = document.createElement("script"); + script.text = code; + document.head.appendChild( script ).parentNode.removeChild( script ); + } else { + // Otherwise, avoid the DOM node creation, insertion + // and removal by using an indirect global eval + indirect( code ); + } + } + }, + + // Convert dashed to camelCase; used by the css and data modules + // Support: IE9-11+ + // Microsoft forgot to hump their vendor prefix (#9572) + camelCase: function( string ) { + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); + }, + + // args is for internal usage only + each: function( obj, callback, args ) { + var value, + i = 0, + length = obj.length, + isArray = isArraylike( obj ); + + if ( args ) { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { + break; + } + } + } else { + for ( i in obj ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { + break; + } + } + } + + // A special, fast, case for the most common use of each + } else { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { + break; + } + } + } else { + for ( i in obj ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { + break; + } + } + } + } + + return obj; + }, + + // Support: Android<4.1 + trim: function( text ) { + return text == null ? + "" : + ( text + "" ).replace( rtrim, "" ); + }, + + // results is for internal usage only + makeArray: function( arr, results ) { + var ret = results || []; + + if ( arr != null ) { + if ( isArraylike( Object(arr) ) ) { + jQuery.merge( ret, + typeof arr === "string" ? + [ arr ] : arr + ); + } else { + push.call( ret, arr ); + } + } + + return ret; + }, + + inArray: function( elem, arr, i ) { + return arr == null ? -1 : indexOf.call( arr, elem, i ); + }, + + merge: function( first, second ) { + var len = +second.length, + j = 0, + i = first.length; + + for ( ; j < len; j++ ) { + first[ i++ ] = second[ j ]; + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, invert ) { + var callbackInverse, + matches = [], + i = 0, + length = elems.length, + callbackExpect = !invert; + + // Go through the array, only saving the items + // that pass the validator function + for ( ; i < length; i++ ) { + callbackInverse = !callback( elems[ i ], i ); + if ( callbackInverse !== callbackExpect ) { + matches.push( elems[ i ] ); + } + } + + return matches; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var value, + i = 0, + length = elems.length, + isArray = isArraylike( elems ), + ret = []; + + // Go through the array, translating each of the items to their new values + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + + // Go through every key on the object, + } else { + for ( i in elems ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + } + + // Flatten any nested arrays + return concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + // Bind a function to a context, optionally partially applying any + // arguments. + proxy: function( fn, context ) { + var tmp, args, proxy; + + if ( typeof context === "string" ) { + tmp = fn[ context ]; + context = fn; + fn = tmp; + } + + // Quick check to determine if target is callable, in the spec + // this throws a TypeError, but we will just return undefined. + if ( !jQuery.isFunction( fn ) ) { + return undefined; + } + + // Simulated bind + args = slice.call( arguments, 2 ); + proxy = function() { + return fn.apply( context || this, args.concat( slice.call( arguments ) ) ); + }; + + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || jQuery.guid++; + + return proxy; + }, + + now: Date.now, + + // jQuery.support is not used in Core but other projects attach their + // properties to it so it needs to exist. + support: support +}); + +// Populate the class2type map +jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +}); + +function isArraylike( obj ) { + + // Support: iOS 8.2 (not reproducible in simulator) + // `in` check used to prevent JIT error (gh-2145) + // hasOwn isn't used here due to false negatives + // regarding Nodelist length in IE + var length = "length" in obj && obj.length, + type = jQuery.type( obj ); + + if ( type === "function" || jQuery.isWindow( obj ) ) { + return false; + } + + if ( obj.nodeType === 1 && length ) { + return true; + } + + return type === "array" || length === 0 || + typeof length === "number" && length > 0 && ( length - 1 ) in obj; +} +var Sizzle = +/*! + * Sizzle CSS Selector Engine v2.2.0-pre + * http://sizzlejs.com/ + * + * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2014-12-16 + */ +(function( window ) { + +var i, + support, + Expr, + getText, + isXML, + tokenize, + compile, + select, + outermostContext, + sortInput, + hasDuplicate, + + // Local document vars + setDocument, + document, + docElem, + documentIsHTML, + rbuggyQSA, + rbuggyMatches, + matches, + contains, + + // Instance-specific data + expando = "sizzle" + 1 * new Date(), + preferredDoc = window.document, + dirruns = 0, + done = 0, + classCache = createCache(), + tokenCache = createCache(), + compilerCache = createCache(), + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + } + return 0; + }, + + // General-purpose constants + MAX_NEGATIVE = 1 << 31, + + // Instance methods + hasOwn = ({}).hasOwnProperty, + arr = [], + pop = arr.pop, + push_native = arr.push, + push = arr.push, + slice = arr.slice, + // Use a stripped-down indexOf as it's faster than native + // http://jsperf.com/thor-indexof-vs-for/5 + indexOf = function( list, elem ) { + var i = 0, + len = list.length; + for ( ; i < len; i++ ) { + if ( list[i] === elem ) { + return i; + } + } + return -1; + }, + + booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", + + // Regular expressions + + // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace + whitespace = "[\\x20\\t\\r\\n\\f]", + // http://www.w3.org/TR/css3-syntax/#characters + characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", + + // Loosely modeled on CSS identifier characters + // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors + // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier + identifier = characterEncoding.replace( "w", "w#" ), + + // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors + attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace + + // Operator (capture 2) + "*([*^$|!~]?=)" + whitespace + + // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]" + "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace + + "*\\]", + + pseudos = ":(" + characterEncoding + ")(?:\\((" + + // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: + // 1. quoted (capture 3; capture 4 or capture 5) + "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + + // 2. simple (capture 6) + "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + + // 3. anything else (capture 2) + ".*" + + ")\\)|)", + + // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter + rwhitespace = new RegExp( whitespace + "+", "g" ), + rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), + + rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), + rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), + + rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ), + + rpseudo = new RegExp( pseudos ), + ridentifier = new RegExp( "^" + identifier + "$" ), + + matchExpr = { + "ID": new RegExp( "^#(" + characterEncoding + ")" ), + "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), + "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), + "ATTR": new RegExp( "^" + attributes ), + "PSEUDO": new RegExp( "^" + pseudos ), + "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), + "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), + // For use in libraries implementing .is() + // We use this for POS matching in `select` + "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + + whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) + }, + + rinputs = /^(?:input|select|textarea|button)$/i, + rheader = /^h\d$/i, + + rnative = /^[^{]+\{\s*\[native \w/, + + // Easily-parseable/retrievable ID or TAG or CLASS selectors + rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, + + rsibling = /[+~]/, + rescape = /'|\\/g, + + // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), + funescape = function( _, escaped, escapedWhitespace ) { + var high = "0x" + escaped - 0x10000; + // NaN means non-codepoint + // Support: Firefox<24 + // Workaround erroneous numeric interpretation of +"0x" + return high !== high || escapedWhitespace ? + escaped : + high < 0 ? + // BMP codepoint + String.fromCharCode( high + 0x10000 ) : + // Supplemental Plane codepoint (surrogate pair) + String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); + }, + + // Used for iframes + // See setDocument() + // Removing the function wrapper causes a "Permission Denied" + // error in IE + unloadHandler = function() { + setDocument(); + }; + +// Optimize for push.apply( _, NodeList ) +try { + push.apply( + (arr = slice.call( preferredDoc.childNodes )), + preferredDoc.childNodes + ); + // Support: Android<4.0 + // Detect silently failing push.apply + arr[ preferredDoc.childNodes.length ].nodeType; +} catch ( e ) { + push = { apply: arr.length ? + + // Leverage slice if possible + function( target, els ) { + push_native.apply( target, slice.call(els) ); + } : + + // Support: IE<9 + // Otherwise append directly + function( target, els ) { + var j = target.length, + i = 0; + // Can't trust NodeList.length + while ( (target[j++] = els[i++]) ) {} + target.length = j - 1; + } + }; +} + +function Sizzle( selector, context, results, seed ) { + var match, elem, m, nodeType, + // QSA vars + i, groups, old, nid, newContext, newSelector; + + if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { + setDocument( context ); + } + + context = context || document; + results = results || []; + nodeType = context.nodeType; + + if ( typeof selector !== "string" || !selector || + nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { + + return results; + } + + if ( !seed && documentIsHTML ) { + + // Try to shortcut find operations when possible (e.g., not under DocumentFragment) + if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { + // Speed-up: Sizzle("#ID") + if ( (m = match[1]) ) { + if ( nodeType === 9 ) { + elem = context.getElementById( m ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document (jQuery #6963) + if ( elem && elem.parentNode ) { + // Handle the case where IE, Opera, and Webkit return items + // by name instead of ID + if ( elem.id === m ) { + results.push( elem ); + return results; + } + } else { + return results; + } + } else { + // Context is not a document + if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && + contains( context, elem ) && elem.id === m ) { + results.push( elem ); + return results; + } + } + + // Speed-up: Sizzle("TAG") + } else if ( match[2] ) { + push.apply( results, context.getElementsByTagName( selector ) ); + return results; + + // Speed-up: Sizzle(".CLASS") + } else if ( (m = match[3]) && support.getElementsByClassName ) { + push.apply( results, context.getElementsByClassName( m ) ); + return results; + } + } + + // QSA path + if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { + nid = old = expando; + newContext = context; + newSelector = nodeType !== 1 && selector; + + // qSA works strangely on Element-rooted queries + // We can work around this by specifying an extra ID on the root + // and working up from there (Thanks to Andrew Dupont for the technique) + // IE 8 doesn't work on object elements + if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + groups = tokenize( selector ); + + if ( (old = context.getAttribute("id")) ) { + nid = old.replace( rescape, "\\$&" ); + } else { + context.setAttribute( "id", nid ); + } + nid = "[id='" + nid + "'] "; + + i = groups.length; + while ( i-- ) { + groups[i] = nid + toSelector( groups[i] ); + } + newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context; + newSelector = groups.join(","); + } + + if ( newSelector ) { + try { + push.apply( results, + newContext.querySelectorAll( newSelector ) + ); + return results; + } catch(qsaError) { + } finally { + if ( !old ) { + context.removeAttribute("id"); + } + } + } + } + } + + // All others + return select( selector.replace( rtrim, "$1" ), context, results, seed ); +} + +/** + * Create key-value caches of limited size + * @returns {Function(string, Object)} Returns the Object data after storing it on itself with + * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) + * deleting the oldest entry + */ +function createCache() { + var keys = []; + + function cache( key, value ) { + // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) + if ( keys.push( key + " " ) > Expr.cacheLength ) { + // Only keep the most recent entries + delete cache[ keys.shift() ]; + } + return (cache[ key + " " ] = value); + } + return cache; +} + +/** + * Mark a function for special use by Sizzle + * @param {Function} fn The function to mark + */ +function markFunction( fn ) { + fn[ expando ] = true; + return fn; +} + +/** + * Support testing using an element + * @param {Function} fn Passed the created div and expects a boolean result + */ +function assert( fn ) { + var div = document.createElement("div"); + + try { + return !!fn( div ); + } catch (e) { + return false; + } finally { + // Remove from its parent by default + if ( div.parentNode ) { + div.parentNode.removeChild( div ); + } + // release memory in IE + div = null; + } +} + +/** + * Adds the same handler for all of the specified attrs + * @param {String} attrs Pipe-separated list of attributes + * @param {Function} handler The method that will be applied + */ +function addHandle( attrs, handler ) { + var arr = attrs.split("|"), + i = attrs.length; + + while ( i-- ) { + Expr.attrHandle[ arr[i] ] = handler; + } +} + +/** + * Checks document order of two siblings + * @param {Element} a + * @param {Element} b + * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b + */ +function siblingCheck( a, b ) { + var cur = b && a, + diff = cur && a.nodeType === 1 && b.nodeType === 1 && + ( ~b.sourceIndex || MAX_NEGATIVE ) - + ( ~a.sourceIndex || MAX_NEGATIVE ); + + // Use IE sourceIndex if available on both nodes + if ( diff ) { + return diff; + } + + // Check if b follows a + if ( cur ) { + while ( (cur = cur.nextSibling) ) { + if ( cur === b ) { + return -1; + } + } + } + + return a ? 1 : -1; +} + +/** + * Returns a function to use in pseudos for input types + * @param {String} type + */ +function createInputPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for buttons + * @param {String} type + */ +function createButtonPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for positionals + * @param {Function} fn + */ +function createPositionalPseudo( fn ) { + return markFunction(function( argument ) { + argument = +argument; + return markFunction(function( seed, matches ) { + var j, + matchIndexes = fn( [], seed.length, argument ), + i = matchIndexes.length; + + // Match elements found at the specified indexes + while ( i-- ) { + if ( seed[ (j = matchIndexes[i]) ] ) { + seed[j] = !(matches[j] = seed[j]); + } + } + }); + }); +} + +/** + * Checks a node for validity as a Sizzle context + * @param {Element|Object=} context + * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value + */ +function testContext( context ) { + return context && typeof context.getElementsByTagName !== "undefined" && context; +} + +// Expose support vars for convenience +support = Sizzle.support = {}; + +/** + * Detects XML nodes + * @param {Element|Object} elem An element or a document + * @returns {Boolean} True iff elem is a non-HTML XML node + */ +isXML = Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = elem && (elem.ownerDocument || elem).documentElement; + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +/** + * Sets document-related variables once based on the current document + * @param {Element|Object} [doc] An element or document object to use to set the document + * @returns {Object} Returns the current document + */ +setDocument = Sizzle.setDocument = function( node ) { + var hasCompare, parent, + doc = node ? node.ownerDocument || node : preferredDoc; + + // If no document and documentElement is available, return + if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { + return document; + } + + // Set our document + document = doc; + docElem = doc.documentElement; + parent = doc.defaultView; + + // Support: IE>8 + // If iframe document is assigned to "document" variable and if iframe has been reloaded, + // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936 + // IE6-8 do not support the defaultView property so parent will be undefined + if ( parent && parent !== parent.top ) { + // IE11 does not have attachEvent, so all must suffer + if ( parent.addEventListener ) { + parent.addEventListener( "unload", unloadHandler, false ); + } else if ( parent.attachEvent ) { + parent.attachEvent( "onunload", unloadHandler ); + } + } + + /* Support tests + ---------------------------------------------------------------------- */ + documentIsHTML = !isXML( doc ); + + /* Attributes + ---------------------------------------------------------------------- */ + + // Support: IE<8 + // Verify that getAttribute really returns attributes and not properties + // (excepting IE8 booleans) + support.attributes = assert(function( div ) { + div.className = "i"; + return !div.getAttribute("className"); + }); + + /* getElement(s)By* + ---------------------------------------------------------------------- */ + + // Check if getElementsByTagName("*") returns only elements + support.getElementsByTagName = assert(function( div ) { + div.appendChild( doc.createComment("") ); + return !div.getElementsByTagName("*").length; + }); + + // Support: IE<9 + support.getElementsByClassName = rnative.test( doc.getElementsByClassName ); + + // Support: IE<10 + // Check if getElementById returns elements by name + // The broken getElementById methods don't pick up programatically-set names, + // so use a roundabout getElementsByName test + support.getById = assert(function( div ) { + docElem.appendChild( div ).id = expando; + return !doc.getElementsByName || !doc.getElementsByName( expando ).length; + }); + + // ID find and filter + if ( support.getById ) { + Expr.find["ID"] = function( id, context ) { + if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { + var m = context.getElementById( id ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + return m && m.parentNode ? [ m ] : []; + } + }; + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + return elem.getAttribute("id") === attrId; + }; + }; + } else { + // Support: IE6/7 + // getElementById is not reliable as a find shortcut + delete Expr.find["ID"]; + + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); + return node && node.value === attrId; + }; + }; + } + + // Tag + Expr.find["TAG"] = support.getElementsByTagName ? + function( tag, context ) { + if ( typeof context.getElementsByTagName !== "undefined" ) { + return context.getElementsByTagName( tag ); + + // DocumentFragment nodes don't have gEBTN + } else if ( support.qsa ) { + return context.querySelectorAll( tag ); + } + } : + + function( tag, context ) { + var elem, + tmp = [], + i = 0, + // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too + results = context.getElementsByTagName( tag ); + + // Filter out possible comments + if ( tag === "*" ) { + while ( (elem = results[i++]) ) { + if ( elem.nodeType === 1 ) { + tmp.push( elem ); + } + } + + return tmp; + } + return results; + }; + + // Class + Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { + if ( documentIsHTML ) { + return context.getElementsByClassName( className ); + } + }; + + /* QSA/matchesSelector + ---------------------------------------------------------------------- */ + + // QSA and matchesSelector support + + // matchesSelector(:active) reports false when true (IE9/Opera 11.5) + rbuggyMatches = []; + + // qSa(:focus) reports false when true (Chrome 21) + // We allow this because of a bug in IE8/9 that throws an error + // whenever `document.activeElement` is accessed on an iframe + // So, we allow :focus to pass through QSA all the time to avoid the IE error + // See http://bugs.jquery.com/ticket/13378 + rbuggyQSA = []; + + if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { + // Build QSA regex + // Regex strategy adopted from Diego Perini + assert(function( div ) { + // Select is set to empty string on purpose + // This is to test IE's treatment of not explicitly + // setting a boolean content attribute, + // since its presence should be enough + // http://bugs.jquery.com/ticket/12359 + docElem.appendChild( div ).innerHTML = "" + + ""; + + // Support: IE8, Opera 11-12.16 + // Nothing should be selected when empty strings follow ^= or $= or *= + // The test attribute must be unknown in Opera but "safe" for WinRT + // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section + if ( div.querySelectorAll("[msallowcapture^='']").length ) { + rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); + } + + // Support: IE8 + // Boolean attributes and "value" are not treated correctly + if ( !div.querySelectorAll("[selected]").length ) { + rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); + } + + // Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+ + if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) { + rbuggyQSA.push("~="); + } + + // Webkit/Opera - :checked should return selected option elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":checked").length ) { + rbuggyQSA.push(":checked"); + } + + // Support: Safari 8+, iOS 8+ + // https://bugs.webkit.org/show_bug.cgi?id=136851 + // In-page `selector#id sibing-combinator selector` fails + if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) { + rbuggyQSA.push(".#.+[+~]"); + } + }); + + assert(function( div ) { + // Support: Windows 8 Native Apps + // The type and name attributes are restricted during .innerHTML assignment + var input = doc.createElement("input"); + input.setAttribute( "type", "hidden" ); + div.appendChild( input ).setAttribute( "name", "D" ); + + // Support: IE8 + // Enforce case-sensitivity of name attribute + if ( div.querySelectorAll("[name=d]").length ) { + rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); + } + + // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":enabled").length ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } + + // Opera 10-11 does not throw on post-comma invalid pseudos + div.querySelectorAll("*,:x"); + rbuggyQSA.push(",.*:"); + }); + } + + if ( (support.matchesSelector = rnative.test( (matches = docElem.matches || + docElem.webkitMatchesSelector || + docElem.mozMatchesSelector || + docElem.oMatchesSelector || + docElem.msMatchesSelector) )) ) { + + assert(function( div ) { + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9) + support.disconnectedMatch = matches.call( div, "div" ); + + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( div, "[s!='']:x" ); + rbuggyMatches.push( "!=", pseudos ); + }); + } + + rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); + rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); + + /* Contains + ---------------------------------------------------------------------- */ + hasCompare = rnative.test( docElem.compareDocumentPosition ); + + // Element contains another + // Purposefully does not implement inclusive descendent + // As in, an element does not contain itself + contains = hasCompare || rnative.test( docElem.contains ) ? + function( a, b ) { + var adown = a.nodeType === 9 ? a.documentElement : a, + bup = b && b.parentNode; + return a === bup || !!( bup && bup.nodeType === 1 && ( + adown.contains ? + adown.contains( bup ) : + a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 + )); + } : + function( a, b ) { + if ( b ) { + while ( (b = b.parentNode) ) { + if ( b === a ) { + return true; + } + } + } + return false; + }; + + /* Sorting + ---------------------------------------------------------------------- */ + + // Document order sorting + sortOrder = hasCompare ? + function( a, b ) { + + // Flag for duplicate removal + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + // Sort on method existence if only one input has compareDocumentPosition + var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; + if ( compare ) { + return compare; + } + + // Calculate position if both inputs belong to the same document + compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ? + a.compareDocumentPosition( b ) : + + // Otherwise we know they are disconnected + 1; + + // Disconnected nodes + if ( compare & 1 || + (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { + + // Choose the first element that is related to our preferred document + if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { + return -1; + } + if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { + return 1; + } + + // Maintain original order + return sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + } + + return compare & 4 ? -1 : 1; + } : + function( a, b ) { + // Exit early if the nodes are identical + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + var cur, + i = 0, + aup = a.parentNode, + bup = b.parentNode, + ap = [ a ], + bp = [ b ]; + + // Parentless nodes are either documents or disconnected + if ( !aup || !bup ) { + return a === doc ? -1 : + b === doc ? 1 : + aup ? -1 : + bup ? 1 : + sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + + // If the nodes are siblings, we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + } + + // Otherwise we need full lists of their ancestors for comparison + cur = a; + while ( (cur = cur.parentNode) ) { + ap.unshift( cur ); + } + cur = b; + while ( (cur = cur.parentNode) ) { + bp.unshift( cur ); + } + + // Walk down the tree looking for a discrepancy + while ( ap[i] === bp[i] ) { + i++; + } + + return i ? + // Do a sibling check if the nodes have a common ancestor + siblingCheck( ap[i], bp[i] ) : + + // Otherwise nodes in our document sort first + ap[i] === preferredDoc ? -1 : + bp[i] === preferredDoc ? 1 : + 0; + }; + + return doc; +}; + +Sizzle.matches = function( expr, elements ) { + return Sizzle( expr, null, null, elements ); +}; + +Sizzle.matchesSelector = function( elem, expr ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + // Make sure that attribute selectors are quoted + expr = expr.replace( rattributeQuotes, "='$1']" ); + + if ( support.matchesSelector && documentIsHTML && + ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && + ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { + + try { + var ret = matches.call( elem, expr ); + + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || support.disconnectedMatch || + // As well, disconnected nodes are said to be in a document + // fragment in IE 9 + elem.document && elem.document.nodeType !== 11 ) { + return ret; + } + } catch (e) {} + } + + return Sizzle( expr, document, null, [ elem ] ).length > 0; +}; + +Sizzle.contains = function( context, elem ) { + // Set document vars if needed + if ( ( context.ownerDocument || context ) !== document ) { + setDocument( context ); + } + return contains( context, elem ); +}; + +Sizzle.attr = function( elem, name ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + var fn = Expr.attrHandle[ name.toLowerCase() ], + // Don't get fooled by Object.prototype properties (jQuery #13807) + val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? + fn( elem, name, !documentIsHTML ) : + undefined; + + return val !== undefined ? + val : + support.attributes || !documentIsHTML ? + elem.getAttribute( name ) : + (val = elem.getAttributeNode(name)) && val.specified ? + val.value : + null; +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Document sorting and removing duplicates + * @param {ArrayLike} results + */ +Sizzle.uniqueSort = function( results ) { + var elem, + duplicates = [], + j = 0, + i = 0; + + // Unless we *know* we can detect duplicates, assume their presence + hasDuplicate = !support.detectDuplicates; + sortInput = !support.sortStable && results.slice( 0 ); + results.sort( sortOrder ); + + if ( hasDuplicate ) { + while ( (elem = results[i++]) ) { + if ( elem === results[ i ] ) { + j = duplicates.push( i ); + } + } + while ( j-- ) { + results.splice( duplicates[ j ], 1 ); + } + } + + // Clear input after sorting to release objects + // See https://github.com/jquery/sizzle/pull/225 + sortInput = null; + + return results; +}; + +/** + * Utility function for retrieving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +getText = Sizzle.getText = function( elem ) { + var node, + ret = "", + i = 0, + nodeType = elem.nodeType; + + if ( !nodeType ) { + // If no nodeType, this is expected to be an array + while ( (node = elem[i++]) ) { + // Do not traverse comment nodes + ret += getText( node ); + } + } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { + // Use textContent for elements + // innerText usage removed for consistency of new lines (jQuery #11153) + if ( typeof elem.textContent === "string" ) { + return elem.textContent; + } else { + // Traverse its children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + // Do not include comment or processing instruction nodes + + return ret; +}; + +Expr = Sizzle.selectors = { + + // Can be adjusted by the user + cacheLength: 50, + + createPseudo: markFunction, + + match: matchExpr, + + attrHandle: {}, + + find: {}, + + relative: { + ">": { dir: "parentNode", first: true }, + " ": { dir: "parentNode" }, + "+": { dir: "previousSibling", first: true }, + "~": { dir: "previousSibling" } + }, + + preFilter: { + "ATTR": function( match ) { + match[1] = match[1].replace( runescape, funescape ); + + // Move the given value to match[3] whether quoted or unquoted + match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape ); + + if ( match[2] === "~=" ) { + match[3] = " " + match[3] + " "; + } + + return match.slice( 0, 4 ); + }, + + "CHILD": function( match ) { + /* matches from matchExpr["CHILD"] + 1 type (only|nth|...) + 2 what (child|of-type) + 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) + 4 xn-component of xn+y argument ([+-]?\d*n|) + 5 sign of xn-component + 6 x of xn-component + 7 sign of y-component + 8 y of y-component + */ + match[1] = match[1].toLowerCase(); + + if ( match[1].slice( 0, 3 ) === "nth" ) { + // nth-* requires argument + if ( !match[3] ) { + Sizzle.error( match[0] ); + } + + // numeric x and y parameters for Expr.filter.CHILD + // remember that false/true cast respectively to 0/1 + match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); + match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); + + // other types prohibit arguments + } else if ( match[3] ) { + Sizzle.error( match[0] ); + } + + return match; + }, + + "PSEUDO": function( match ) { + var excess, + unquoted = !match[6] && match[2]; + + if ( matchExpr["CHILD"].test( match[0] ) ) { + return null; + } + + // Accept quoted arguments as-is + if ( match[3] ) { + match[2] = match[4] || match[5] || ""; + + // Strip excess characters from unquoted arguments + } else if ( unquoted && rpseudo.test( unquoted ) && + // Get excess from tokenize (recursively) + (excess = tokenize( unquoted, true )) && + // advance to the next closing parenthesis + (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { + + // excess is a negative index + match[0] = match[0].slice( 0, excess ); + match[2] = unquoted.slice( 0, excess ); + } + + // Return only captures needed by the pseudo filter method (type and argument) + return match.slice( 0, 3 ); + } + }, + + filter: { + + "TAG": function( nodeNameSelector ) { + var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); + return nodeNameSelector === "*" ? + function() { return true; } : + function( elem ) { + return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; + }; + }, + + "CLASS": function( className ) { + var pattern = classCache[ className + " " ]; + + return pattern || + (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && + classCache( className, function( elem ) { + return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" ); + }); + }, + + "ATTR": function( name, operator, check ) { + return function( elem ) { + var result = Sizzle.attr( elem, name ); + + if ( result == null ) { + return operator === "!="; + } + if ( !operator ) { + return true; + } + + result += ""; + + return operator === "=" ? result === check : + operator === "!=" ? result !== check : + operator === "^=" ? check && result.indexOf( check ) === 0 : + operator === "*=" ? check && result.indexOf( check ) > -1 : + operator === "$=" ? check && result.slice( -check.length ) === check : + operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : + operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : + false; + }; + }, + + "CHILD": function( type, what, argument, first, last ) { + var simple = type.slice( 0, 3 ) !== "nth", + forward = type.slice( -4 ) !== "last", + ofType = what === "of-type"; + + return first === 1 && last === 0 ? + + // Shortcut for :nth-*(n) + function( elem ) { + return !!elem.parentNode; + } : + + function( elem, context, xml ) { + var cache, outerCache, node, diff, nodeIndex, start, + dir = simple !== forward ? "nextSibling" : "previousSibling", + parent = elem.parentNode, + name = ofType && elem.nodeName.toLowerCase(), + useCache = !xml && !ofType; + + if ( parent ) { + + // :(first|last|only)-(child|of-type) + if ( simple ) { + while ( dir ) { + node = elem; + while ( (node = node[ dir ]) ) { + if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { + return false; + } + } + // Reverse direction for :only-* (if we haven't yet done so) + start = dir = type === "only" && !start && "nextSibling"; + } + return true; + } + + start = [ forward ? parent.firstChild : parent.lastChild ]; + + // non-xml :nth-child(...) stores cache data on `parent` + if ( forward && useCache ) { + // Seek `elem` from a previously-cached index + outerCache = parent[ expando ] || (parent[ expando ] = {}); + cache = outerCache[ type ] || []; + nodeIndex = cache[0] === dirruns && cache[1]; + diff = cache[0] === dirruns && cache[2]; + node = nodeIndex && parent.childNodes[ nodeIndex ]; + + while ( (node = ++nodeIndex && node && node[ dir ] || + + // Fallback to seeking `elem` from the start + (diff = nodeIndex = 0) || start.pop()) ) { + + // When found, cache indexes on `parent` and break + if ( node.nodeType === 1 && ++diff && node === elem ) { + outerCache[ type ] = [ dirruns, nodeIndex, diff ]; + break; + } + } + + // Use previously-cached element index if available + } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { + diff = cache[1]; + + // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) + } else { + // Use the same loop as above to seek `elem` from the start + while ( (node = ++nodeIndex && node && node[ dir ] || + (diff = nodeIndex = 0) || start.pop()) ) { + + if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { + // Cache the index of each encountered element + if ( useCache ) { + (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; + } + + if ( node === elem ) { + break; + } + } + } + } + + // Incorporate the offset, then check against cycle size + diff -= last; + return diff === first || ( diff % first === 0 && diff / first >= 0 ); + } + }; + }, + + "PSEUDO": function( pseudo, argument ) { + // pseudo-class names are case-insensitive + // http://www.w3.org/TR/selectors/#pseudo-classes + // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters + // Remember that setFilters inherits from pseudos + var args, + fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || + Sizzle.error( "unsupported pseudo: " + pseudo ); + + // The user may use createPseudo to indicate that + // arguments are needed to create the filter function + // just as Sizzle does + if ( fn[ expando ] ) { + return fn( argument ); + } + + // But maintain support for old signatures + if ( fn.length > 1 ) { + args = [ pseudo, pseudo, "", argument ]; + return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? + markFunction(function( seed, matches ) { + var idx, + matched = fn( seed, argument ), + i = matched.length; + while ( i-- ) { + idx = indexOf( seed, matched[i] ); + seed[ idx ] = !( matches[ idx ] = matched[i] ); + } + }) : + function( elem ) { + return fn( elem, 0, args ); + }; + } + + return fn; + } + }, + + pseudos: { + // Potentially complex pseudos + "not": markFunction(function( selector ) { + // Trim the selector passed to compile + // to avoid treating leading and trailing + // spaces as combinators + var input = [], + results = [], + matcher = compile( selector.replace( rtrim, "$1" ) ); + + return matcher[ expando ] ? + markFunction(function( seed, matches, context, xml ) { + var elem, + unmatched = matcher( seed, null, xml, [] ), + i = seed.length; + + // Match elements unmatched by `matcher` + while ( i-- ) { + if ( (elem = unmatched[i]) ) { + seed[i] = !(matches[i] = elem); + } + } + }) : + function( elem, context, xml ) { + input[0] = elem; + matcher( input, null, xml, results ); + // Don't keep the element (issue #299) + input[0] = null; + return !results.pop(); + }; + }), + + "has": markFunction(function( selector ) { + return function( elem ) { + return Sizzle( selector, elem ).length > 0; + }; + }), + + "contains": markFunction(function( text ) { + text = text.replace( runescape, funescape ); + return function( elem ) { + return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; + }; + }), + + // "Whether an element is represented by a :lang() selector + // is based solely on the element's language value + // being equal to the identifier C, + // or beginning with the identifier C immediately followed by "-". + // The matching of C against the element's language value is performed case-insensitively. + // The identifier C does not have to be a valid language name." + // http://www.w3.org/TR/selectors/#lang-pseudo + "lang": markFunction( function( lang ) { + // lang value must be a valid identifier + if ( !ridentifier.test(lang || "") ) { + Sizzle.error( "unsupported lang: " + lang ); + } + lang = lang.replace( runescape, funescape ).toLowerCase(); + return function( elem ) { + var elemLang; + do { + if ( (elemLang = documentIsHTML ? + elem.lang : + elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { + + elemLang = elemLang.toLowerCase(); + return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; + } + } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); + return false; + }; + }), + + // Miscellaneous + "target": function( elem ) { + var hash = window.location && window.location.hash; + return hash && hash.slice( 1 ) === elem.id; + }, + + "root": function( elem ) { + return elem === docElem; + }, + + "focus": function( elem ) { + return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); + }, + + // Boolean properties + "enabled": function( elem ) { + return elem.disabled === false; + }, + + "disabled": function( elem ) { + return elem.disabled === true; + }, + + "checked": function( elem ) { + // In CSS3, :checked should return both checked and selected elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + var nodeName = elem.nodeName.toLowerCase(); + return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); + }, + + "selected": function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + elem.parentNode.selectedIndex; + } + + return elem.selected === true; + }, + + // Contents + "empty": function( elem ) { + // http://www.w3.org/TR/selectors/#empty-pseudo + // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), + // but not by others (comment: 8; processing instruction: 7; etc.) + // nodeType < 6 works because attributes (2) do not appear as children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + if ( elem.nodeType < 6 ) { + return false; + } + } + return true; + }, + + "parent": function( elem ) { + return !Expr.pseudos["empty"]( elem ); + }, + + // Element/input types + "header": function( elem ) { + return rheader.test( elem.nodeName ); + }, + + "input": function( elem ) { + return rinputs.test( elem.nodeName ); + }, + + "button": function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === "button" || name === "button"; + }, + + "text": function( elem ) { + var attr; + return elem.nodeName.toLowerCase() === "input" && + elem.type === "text" && + + // Support: IE<8 + // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" + ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" ); + }, + + // Position-in-collection + "first": createPositionalPseudo(function() { + return [ 0 ]; + }), + + "last": createPositionalPseudo(function( matchIndexes, length ) { + return [ length - 1 ]; + }), + + "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { + return [ argument < 0 ? argument + length : argument ]; + }), + + "even": createPositionalPseudo(function( matchIndexes, length ) { + var i = 0; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "odd": createPositionalPseudo(function( matchIndexes, length ) { + var i = 1; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; --i >= 0; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; ++i < length; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }) + } +}; + +Expr.pseudos["nth"] = Expr.pseudos["eq"]; + +// Add button/input type pseudos +for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { + Expr.pseudos[ i ] = createInputPseudo( i ); +} +for ( i in { submit: true, reset: true } ) { + Expr.pseudos[ i ] = createButtonPseudo( i ); +} + +// Easy API for creating new setFilters +function setFilters() {} +setFilters.prototype = Expr.filters = Expr.pseudos; +Expr.setFilters = new setFilters(); + +tokenize = Sizzle.tokenize = function( selector, parseOnly ) { + var matched, match, tokens, type, + soFar, groups, preFilters, + cached = tokenCache[ selector + " " ]; + + if ( cached ) { + return parseOnly ? 0 : cached.slice( 0 ); + } + + soFar = selector; + groups = []; + preFilters = Expr.preFilter; + + while ( soFar ) { + + // Comma and first run + if ( !matched || (match = rcomma.exec( soFar )) ) { + if ( match ) { + // Don't consume trailing commas as valid + soFar = soFar.slice( match[0].length ) || soFar; + } + groups.push( (tokens = []) ); + } + + matched = false; + + // Combinators + if ( (match = rcombinators.exec( soFar )) ) { + matched = match.shift(); + tokens.push({ + value: matched, + // Cast descendant combinators to space + type: match[0].replace( rtrim, " " ) + }); + soFar = soFar.slice( matched.length ); + } + + // Filters + for ( type in Expr.filter ) { + if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || + (match = preFilters[ type ]( match ))) ) { + matched = match.shift(); + tokens.push({ + value: matched, + type: type, + matches: match + }); + soFar = soFar.slice( matched.length ); + } + } + + if ( !matched ) { + break; + } + } + + // Return the length of the invalid excess + // if we're just parsing + // Otherwise, throw an error or return tokens + return parseOnly ? + soFar.length : + soFar ? + Sizzle.error( selector ) : + // Cache the tokens + tokenCache( selector, groups ).slice( 0 ); +}; + +function toSelector( tokens ) { + var i = 0, + len = tokens.length, + selector = ""; + for ( ; i < len; i++ ) { + selector += tokens[i].value; + } + return selector; +} + +function addCombinator( matcher, combinator, base ) { + var dir = combinator.dir, + checkNonElements = base && dir === "parentNode", + doneName = done++; + + return combinator.first ? + // Check against closest ancestor/preceding element + function( elem, context, xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + return matcher( elem, context, xml ); + } + } + } : + + // Check against all ancestor/preceding elements + function( elem, context, xml ) { + var oldCache, outerCache, + newCache = [ dirruns, doneName ]; + + // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching + if ( xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + if ( matcher( elem, context, xml ) ) { + return true; + } + } + } + } else { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + outerCache = elem[ expando ] || (elem[ expando ] = {}); + if ( (oldCache = outerCache[ dir ]) && + oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { + + // Assign to newCache so results back-propagate to previous elements + return (newCache[ 2 ] = oldCache[ 2 ]); + } else { + // Reuse newcache so results back-propagate to previous elements + outerCache[ dir ] = newCache; + + // A match means we're done; a fail means we have to keep checking + if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { + return true; + } + } + } + } + } + }; +} + +function elementMatcher( matchers ) { + return matchers.length > 1 ? + function( elem, context, xml ) { + var i = matchers.length; + while ( i-- ) { + if ( !matchers[i]( elem, context, xml ) ) { + return false; + } + } + return true; + } : + matchers[0]; +} + +function multipleContexts( selector, contexts, results ) { + var i = 0, + len = contexts.length; + for ( ; i < len; i++ ) { + Sizzle( selector, contexts[i], results ); + } + return results; +} + +function condense( unmatched, map, filter, context, xml ) { + var elem, + newUnmatched = [], + i = 0, + len = unmatched.length, + mapped = map != null; + + for ( ; i < len; i++ ) { + if ( (elem = unmatched[i]) ) { + if ( !filter || filter( elem, context, xml ) ) { + newUnmatched.push( elem ); + if ( mapped ) { + map.push( i ); + } + } + } + } + + return newUnmatched; +} + +function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { + if ( postFilter && !postFilter[ expando ] ) { + postFilter = setMatcher( postFilter ); + } + if ( postFinder && !postFinder[ expando ] ) { + postFinder = setMatcher( postFinder, postSelector ); + } + return markFunction(function( seed, results, context, xml ) { + var temp, i, elem, + preMap = [], + postMap = [], + preexisting = results.length, + + // Get initial elements from seed or context + elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), + + // Prefilter to get matcher input, preserving a map for seed-results synchronization + matcherIn = preFilter && ( seed || !selector ) ? + condense( elems, preMap, preFilter, context, xml ) : + elems, + + matcherOut = matcher ? + // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, + postFinder || ( seed ? preFilter : preexisting || postFilter ) ? + + // ...intermediate processing is necessary + [] : + + // ...otherwise use results directly + results : + matcherIn; + + // Find primary matches + if ( matcher ) { + matcher( matcherIn, matcherOut, context, xml ); + } + + // Apply postFilter + if ( postFilter ) { + temp = condense( matcherOut, postMap ); + postFilter( temp, [], context, xml ); + + // Un-match failing elements by moving them back to matcherIn + i = temp.length; + while ( i-- ) { + if ( (elem = temp[i]) ) { + matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); + } + } + } + + if ( seed ) { + if ( postFinder || preFilter ) { + if ( postFinder ) { + // Get the final matcherOut by condensing this intermediate into postFinder contexts + temp = []; + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) ) { + // Restore matcherIn since elem is not yet a final match + temp.push( (matcherIn[i] = elem) ); + } + } + postFinder( null, (matcherOut = []), temp, xml ); + } + + // Move matched elements from seed to results to keep them synchronized + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) && + (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) { + + seed[temp] = !(results[temp] = elem); + } + } + } + + // Add elements to results, through postFinder if defined + } else { + matcherOut = condense( + matcherOut === results ? + matcherOut.splice( preexisting, matcherOut.length ) : + matcherOut + ); + if ( postFinder ) { + postFinder( null, results, matcherOut, xml ); + } else { + push.apply( results, matcherOut ); + } + } + }); +} + +function matcherFromTokens( tokens ) { + var checkContext, matcher, j, + len = tokens.length, + leadingRelative = Expr.relative[ tokens[0].type ], + implicitRelative = leadingRelative || Expr.relative[" "], + i = leadingRelative ? 1 : 0, + + // The foundational matcher ensures that elements are reachable from top-level context(s) + matchContext = addCombinator( function( elem ) { + return elem === checkContext; + }, implicitRelative, true ), + matchAnyContext = addCombinator( function( elem ) { + return indexOf( checkContext, elem ) > -1; + }, implicitRelative, true ), + matchers = [ function( elem, context, xml ) { + var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( + (checkContext = context).nodeType ? + matchContext( elem, context, xml ) : + matchAnyContext( elem, context, xml ) ); + // Avoid hanging onto element (issue #299) + checkContext = null; + return ret; + } ]; + + for ( ; i < len; i++ ) { + if ( (matcher = Expr.relative[ tokens[i].type ]) ) { + matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; + } else { + matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); + + // Return special upon seeing a positional matcher + if ( matcher[ expando ] ) { + // Find the next relative operator (if any) for proper handling + j = ++i; + for ( ; j < len; j++ ) { + if ( Expr.relative[ tokens[j].type ] ) { + break; + } + } + return setMatcher( + i > 1 && elementMatcher( matchers ), + i > 1 && toSelector( + // If the preceding token was a descendant combinator, insert an implicit any-element `*` + tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) + ).replace( rtrim, "$1" ), + matcher, + i < j && matcherFromTokens( tokens.slice( i, j ) ), + j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), + j < len && toSelector( tokens ) + ); + } + matchers.push( matcher ); + } + } + + return elementMatcher( matchers ); +} + +function matcherFromGroupMatchers( elementMatchers, setMatchers ) { + var bySet = setMatchers.length > 0, + byElement = elementMatchers.length > 0, + superMatcher = function( seed, context, xml, results, outermost ) { + var elem, j, matcher, + matchedCount = 0, + i = "0", + unmatched = seed && [], + setMatched = [], + contextBackup = outermostContext, + // We must always have either seed elements or outermost context + elems = seed || byElement && Expr.find["TAG"]( "*", outermost ), + // Use integer dirruns iff this is the outermost matcher + dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), + len = elems.length; + + if ( outermost ) { + outermostContext = context !== document && context; + } + + // Add elements passing elementMatchers directly to results + // Keep `i` a string if there are no elements so `matchedCount` will be "00" below + // Support: IE<9, Safari + // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id + for ( ; i !== len && (elem = elems[i]) != null; i++ ) { + if ( byElement && elem ) { + j = 0; + while ( (matcher = elementMatchers[j++]) ) { + if ( matcher( elem, context, xml ) ) { + results.push( elem ); + break; + } + } + if ( outermost ) { + dirruns = dirrunsUnique; + } + } + + // Track unmatched elements for set filters + if ( bySet ) { + // They will have gone through all possible matchers + if ( (elem = !matcher && elem) ) { + matchedCount--; + } + + // Lengthen the array for every element, matched or not + if ( seed ) { + unmatched.push( elem ); + } + } + } + + // Apply set filters to unmatched elements + matchedCount += i; + if ( bySet && i !== matchedCount ) { + j = 0; + while ( (matcher = setMatchers[j++]) ) { + matcher( unmatched, setMatched, context, xml ); + } + + if ( seed ) { + // Reintegrate element matches to eliminate the need for sorting + if ( matchedCount > 0 ) { + while ( i-- ) { + if ( !(unmatched[i] || setMatched[i]) ) { + setMatched[i] = pop.call( results ); + } + } + } + + // Discard index placeholder values to get only actual matches + setMatched = condense( setMatched ); + } + + // Add matches to results + push.apply( results, setMatched ); + + // Seedless set matches succeeding multiple successful matchers stipulate sorting + if ( outermost && !seed && setMatched.length > 0 && + ( matchedCount + setMatchers.length ) > 1 ) { + + Sizzle.uniqueSort( results ); + } + } + + // Override manipulation of globals by nested matchers + if ( outermost ) { + dirruns = dirrunsUnique; + outermostContext = contextBackup; + } + + return unmatched; + }; + + return bySet ? + markFunction( superMatcher ) : + superMatcher; +} + +compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { + var i, + setMatchers = [], + elementMatchers = [], + cached = compilerCache[ selector + " " ]; + + if ( !cached ) { + // Generate a function of recursive functions that can be used to check each element + if ( !match ) { + match = tokenize( selector ); + } + i = match.length; + while ( i-- ) { + cached = matcherFromTokens( match[i] ); + if ( cached[ expando ] ) { + setMatchers.push( cached ); + } else { + elementMatchers.push( cached ); + } + } + + // Cache the compiled function + cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); + + // Save selector and tokenization + cached.selector = selector; + } + return cached; +}; + +/** + * A low-level selection function that works with Sizzle's compiled + * selector functions + * @param {String|Function} selector A selector or a pre-compiled + * selector function built with Sizzle.compile + * @param {Element} context + * @param {Array} [results] + * @param {Array} [seed] A set of elements to match against + */ +select = Sizzle.select = function( selector, context, results, seed ) { + var i, tokens, token, type, find, + compiled = typeof selector === "function" && selector, + match = !seed && tokenize( (selector = compiled.selector || selector) ); + + results = results || []; + + // Try to minimize operations if there is no seed and only one group + if ( match.length === 1 ) { + + // Take a shortcut and set the context if the root selector is an ID + tokens = match[0] = match[0].slice( 0 ); + if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && + support.getById && context.nodeType === 9 && documentIsHTML && + Expr.relative[ tokens[1].type ] ) { + + context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; + if ( !context ) { + return results; + + // Precompiled matchers will still verify ancestry, so step up a level + } else if ( compiled ) { + context = context.parentNode; + } + + selector = selector.slice( tokens.shift().value.length ); + } + + // Fetch a seed set for right-to-left matching + i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; + while ( i-- ) { + token = tokens[i]; + + // Abort if we hit a combinator + if ( Expr.relative[ (type = token.type) ] ) { + break; + } + if ( (find = Expr.find[ type ]) ) { + // Search, expanding context for leading sibling combinators + if ( (seed = find( + token.matches[0].replace( runescape, funescape ), + rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context + )) ) { + + // If seed is empty or no tokens remain, we can return early + tokens.splice( i, 1 ); + selector = seed.length && toSelector( tokens ); + if ( !selector ) { + push.apply( results, seed ); + return results; + } + + break; + } + } + } + } + + // Compile and execute a filtering function if one is not provided + // Provide `match` to avoid retokenization if we modified the selector above + ( compiled || compile( selector, match ) )( + seed, + context, + !documentIsHTML, + results, + rsibling.test( selector ) && testContext( context.parentNode ) || context + ); + return results; +}; + +// One-time assignments + +// Sort stability +support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; + +// Support: Chrome 14-35+ +// Always assume duplicates if they aren't passed to the comparison function +support.detectDuplicates = !!hasDuplicate; + +// Initialize against the default document +setDocument(); + +// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) +// Detached nodes confoundingly follow *each other* +support.sortDetached = assert(function( div1 ) { + // Should return 1, but returns 4 (following) + return div1.compareDocumentPosition( document.createElement("div") ) & 1; +}); + +// Support: IE<8 +// Prevent attribute/property "interpolation" +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !assert(function( div ) { + div.innerHTML = ""; + return div.firstChild.getAttribute("href") === "#" ; +}) ) { + addHandle( "type|href|height|width", function( elem, name, isXML ) { + if ( !isXML ) { + return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); + } + }); +} + +// Support: IE<9 +// Use defaultValue in place of getAttribute("value") +if ( !support.attributes || !assert(function( div ) { + div.innerHTML = ""; + div.firstChild.setAttribute( "value", "" ); + return div.firstChild.getAttribute( "value" ) === ""; +}) ) { + addHandle( "value", function( elem, name, isXML ) { + if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { + return elem.defaultValue; + } + }); +} + +// Support: IE<9 +// Use getAttributeNode to fetch booleans when getAttribute lies +if ( !assert(function( div ) { + return div.getAttribute("disabled") == null; +}) ) { + addHandle( booleans, function( elem, name, isXML ) { + var val; + if ( !isXML ) { + return elem[ name ] === true ? name.toLowerCase() : + (val = elem.getAttributeNode( name )) && val.specified ? + val.value : + null; + } + }); +} + +return Sizzle; + +})( window ); + + + +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; +jQuery.expr[":"] = jQuery.expr.pseudos; +jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; + + + +var rneedsContext = jQuery.expr.match.needsContext; + +var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/); + + + +var risSimple = /^.[^:#\[\.,]*$/; + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, not ) { + if ( jQuery.isFunction( qualifier ) ) { + return jQuery.grep( elements, function( elem, i ) { + /* jshint -W018 */ + return !!qualifier.call( elem, i, elem ) !== not; + }); + + } + + if ( qualifier.nodeType ) { + return jQuery.grep( elements, function( elem ) { + return ( elem === qualifier ) !== not; + }); + + } + + if ( typeof qualifier === "string" ) { + if ( risSimple.test( qualifier ) ) { + return jQuery.filter( qualifier, elements, not ); + } + + qualifier = jQuery.filter( qualifier, elements ); + } + + return jQuery.grep( elements, function( elem ) { + return ( indexOf.call( qualifier, elem ) >= 0 ) !== not; + }); +} + +jQuery.filter = function( expr, elems, not ) { + var elem = elems[ 0 ]; + + if ( not ) { + expr = ":not(" + expr + ")"; + } + + return elems.length === 1 && elem.nodeType === 1 ? + jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : + jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { + return elem.nodeType === 1; + })); +}; + +jQuery.fn.extend({ + find: function( selector ) { + var i, + len = this.length, + ret = [], + self = this; + + if ( typeof selector !== "string" ) { + return this.pushStack( jQuery( selector ).filter(function() { + for ( i = 0; i < len; i++ ) { + if ( jQuery.contains( self[ i ], this ) ) { + return true; + } + } + }) ); + } + + for ( i = 0; i < len; i++ ) { + jQuery.find( selector, self[ i ], ret ); + } + + // Needed because $( selector, context ) becomes $( context ).find( selector ) + ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); + ret.selector = this.selector ? this.selector + " " + selector : selector; + return ret; + }, + filter: function( selector ) { + return this.pushStack( winnow(this, selector || [], false) ); + }, + not: function( selector ) { + return this.pushStack( winnow(this, selector || [], true) ); + }, + is: function( selector ) { + return !!winnow( + this, + + // If this is a positional/relative selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + typeof selector === "string" && rneedsContext.test( selector ) ? + jQuery( selector ) : + selector || [], + false + ).length; + } +}); + + +// Initialize a jQuery object + + +// A central reference to the root jQuery(document) +var rootjQuery, + + // A simple way to check for HTML strings + // Prioritize #id over to avoid XSS via location.hash (#9521) + // Strict HTML recognition (#11290: must start with <) + rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, + + init = jQuery.fn.init = function( selector, context ) { + var match, elem; + + // HANDLE: $(""), $(null), $(undefined), $(false) + if ( !selector ) { + return this; + } + + // Handle HTML strings + if ( typeof selector === "string" ) { + if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) { + // Assume that strings that start and end with <> are HTML and skip the regex check + match = [ null, selector, null ]; + + } else { + match = rquickExpr.exec( selector ); + } + + // Match html or make sure no context is specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) { + context = context instanceof jQuery ? context[0] : context; + + // Option to run scripts is true for back-compat + // Intentionally let the error be thrown if parseHTML is not present + jQuery.merge( this, jQuery.parseHTML( + match[1], + context && context.nodeType ? context.ownerDocument || context : document, + true + ) ); + + // HANDLE: $(html, props) + if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { + for ( match in context ) { + // Properties of context are called as methods if possible + if ( jQuery.isFunction( this[ match ] ) ) { + this[ match ]( context[ match ] ); + + // ...and otherwise set as attributes + } else { + this.attr( match, context[ match ] ); + } + } + } + + return this; + + // HANDLE: $(#id) + } else { + elem = document.getElementById( match[2] ); + + // Support: Blackberry 4.6 + // gEBID returns nodes no longer in the document (#6963) + if ( elem && elem.parentNode ) { + // Inject the element directly into the jQuery object + this.length = 1; + this[0] = elem; + } + + this.context = document; + this.selector = selector; + return this; + } + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return ( context || rootjQuery ).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return this.constructor( context ).find( selector ); + } + + // HANDLE: $(DOMElement) + } else if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) { + return typeof rootjQuery.ready !== "undefined" ? + rootjQuery.ready( selector ) : + // Execute immediately if ready is not present + selector( jQuery ); + } + + if ( selector.selector !== undefined ) { + this.selector = selector.selector; + this.context = selector.context; + } + + return jQuery.makeArray( selector, this ); + }; + +// Give the init function the jQuery prototype for later instantiation +init.prototype = jQuery.fn; + +// Initialize central reference +rootjQuery = jQuery( document ); + + +var rparentsprev = /^(?:parents|prev(?:Until|All))/, + // Methods guaranteed to produce a unique set when starting from a unique set + guaranteedUnique = { + children: true, + contents: true, + next: true, + prev: true + }; + +jQuery.extend({ + dir: function( elem, dir, until ) { + var matched = [], + truncate = until !== undefined; + + while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) { + if ( elem.nodeType === 1 ) { + if ( truncate && jQuery( elem ).is( until ) ) { + break; + } + matched.push( elem ); + } + } + return matched; + }, + + sibling: function( n, elem ) { + var matched = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + matched.push( n ); + } + } + + return matched; + } +}); + +jQuery.fn.extend({ + has: function( target ) { + var targets = jQuery( target, this ), + l = targets.length; + + return this.filter(function() { + var i = 0; + for ( ; i < l; i++ ) { + if ( jQuery.contains( this, targets[i] ) ) { + return true; + } + } + }); + }, + + closest: function( selectors, context ) { + var cur, + i = 0, + l = this.length, + matched = [], + pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? + jQuery( selectors, context || this.context ) : + 0; + + for ( ; i < l; i++ ) { + for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { + // Always skip document fragments + if ( cur.nodeType < 11 && (pos ? + pos.index(cur) > -1 : + + // Don't pass non-elements to Sizzle + cur.nodeType === 1 && + jQuery.find.matchesSelector(cur, selectors)) ) { + + matched.push( cur ); + break; + } + } + } + + return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched ); + }, + + // Determine the position of an element within the set + index: function( elem ) { + + // No argument, return index in parent + if ( !elem ) { + return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; + } + + // Index in selector + if ( typeof elem === "string" ) { + return indexOf.call( jQuery( elem ), this[ 0 ] ); + } + + // Locate the position of the desired element + return indexOf.call( this, + + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[ 0 ] : elem + ); + }, + + add: function( selector, context ) { + return this.pushStack( + jQuery.unique( + jQuery.merge( this.get(), jQuery( selector, context ) ) + ) + ); + }, + + addBack: function( selector ) { + return this.add( selector == null ? + this.prevObject : this.prevObject.filter(selector) + ); + } +}); + +function sibling( cur, dir ) { + while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {} + return cur; +} + +jQuery.each({ + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return jQuery.dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, i, until ) { + return jQuery.dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return sibling( elem, "nextSibling" ); + }, + prev: function( elem ) { + return sibling( elem, "previousSibling" ); + }, + nextAll: function( elem ) { + return jQuery.dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return jQuery.dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, i, until ) { + return jQuery.dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, i, until ) { + return jQuery.dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); + }, + children: function( elem ) { + return jQuery.sibling( elem.firstChild ); + }, + contents: function( elem ) { + return elem.contentDocument || jQuery.merge( [], elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var matched = jQuery.map( this, fn, until ); + + if ( name.slice( -5 ) !== "Until" ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + matched = jQuery.filter( selector, matched ); + } + + if ( this.length > 1 ) { + // Remove duplicates + if ( !guaranteedUnique[ name ] ) { + jQuery.unique( matched ); + } + + // Reverse order for parents* and prev-derivatives + if ( rparentsprev.test( name ) ) { + matched.reverse(); + } + } + + return this.pushStack( matched ); + }; +}); +var rnotwhite = (/\S+/g); + + + +// String to Object options format cache +var optionsCache = {}; + +// Convert String-formatted options into Object-formatted ones and store in cache +function createOptions( options ) { + var object = optionsCache[ options ] = {}; + jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) { + object[ flag ] = true; + }); + return object; +} + +/* + * Create a callback list using the following parameters: + * + * options: an optional list of space-separated options that will change how + * the callback list behaves or a more traditional option object + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible options: + * + * once: will ensure the callback list can only be fired once (like a Deferred) + * + * memory: will keep track of previous values and will call any callback added + * after the list has been fired right away with the latest "memorized" + * values (like a Deferred) + * + * unique: will ensure a callback can only be added once (no duplicate in the list) + * + * stopOnFalse: interrupt callings when a callback returns false + * + */ +jQuery.Callbacks = function( options ) { + + // Convert options from String-formatted to Object-formatted if needed + // (we check in cache first) + options = typeof options === "string" ? + ( optionsCache[ options ] || createOptions( options ) ) : + jQuery.extend( {}, options ); + + var // Last fire value (for non-forgettable lists) + memory, + // Flag to know if list was already fired + fired, + // Flag to know if list is currently firing + firing, + // First callback to fire (used internally by add and fireWith) + firingStart, + // End of the loop when firing + firingLength, + // Index of currently firing callback (modified by remove if needed) + firingIndex, + // Actual callback list + list = [], + // Stack of fire calls for repeatable lists + stack = !options.once && [], + // Fire callbacks + fire = function( data ) { + memory = options.memory && data; + fired = true; + firingIndex = firingStart || 0; + firingStart = 0; + firingLength = list.length; + firing = true; + for ( ; list && firingIndex < firingLength; firingIndex++ ) { + if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { + memory = false; // To prevent further calls using add + break; + } + } + firing = false; + if ( list ) { + if ( stack ) { + if ( stack.length ) { + fire( stack.shift() ); + } + } else if ( memory ) { + list = []; + } else { + self.disable(); + } + } + }, + // Actual Callbacks object + self = { + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + // First, we save the current length + var start = list.length; + (function add( args ) { + jQuery.each( args, function( _, arg ) { + var type = jQuery.type( arg ); + if ( type === "function" ) { + if ( !options.unique || !self.has( arg ) ) { + list.push( arg ); + } + } else if ( arg && arg.length && type !== "string" ) { + // Inspect recursively + add( arg ); + } + }); + })( arguments ); + // Do we need to add the callbacks to the + // current firing batch? + if ( firing ) { + firingLength = list.length; + // With memory, if we're not firing then + // we should call right away + } else if ( memory ) { + firingStart = start; + fire( memory ); + } + } + return this; + }, + // Remove a callback from the list + remove: function() { + if ( list ) { + jQuery.each( arguments, function( _, arg ) { + var index; + while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { + list.splice( index, 1 ); + // Handle firing indexes + if ( firing ) { + if ( index <= firingLength ) { + firingLength--; + } + if ( index <= firingIndex ) { + firingIndex--; + } + } + } + }); + } + return this; + }, + // Check if a given callback is in the list. + // If no argument is given, return whether or not list has callbacks attached. + has: function( fn ) { + return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); + }, + // Remove all callbacks from the list + empty: function() { + list = []; + firingLength = 0; + return this; + }, + // Have the list do nothing anymore + disable: function() { + list = stack = memory = undefined; + return this; + }, + // Is it disabled? + disabled: function() { + return !list; + }, + // Lock the list in its current state + lock: function() { + stack = undefined; + if ( !memory ) { + self.disable(); + } + return this; + }, + // Is it locked? + locked: function() { + return !stack; + }, + // Call all callbacks with the given context and arguments + fireWith: function( context, args ) { + if ( list && ( !fired || stack ) ) { + args = args || []; + args = [ context, args.slice ? args.slice() : args ]; + if ( firing ) { + stack.push( args ); + } else { + fire( args ); + } + } + return this; + }, + // Call all the callbacks with the given arguments + fire: function() { + self.fireWith( this, arguments ); + return this; + }, + // To know if the callbacks have already been called at least once + fired: function() { + return !!fired; + } + }; + + return self; +}; + + +jQuery.extend({ + + Deferred: function( func ) { + var tuples = [ + // action, add listener, listener list, final state + [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ], + [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ], + [ "notify", "progress", jQuery.Callbacks("memory") ] + ], + state = "pending", + promise = { + state: function() { + return state; + }, + always: function() { + deferred.done( arguments ).fail( arguments ); + return this; + }, + then: function( /* fnDone, fnFail, fnProgress */ ) { + var fns = arguments; + return jQuery.Deferred(function( newDefer ) { + jQuery.each( tuples, function( i, tuple ) { + var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; + // deferred[ done | fail | progress ] for forwarding actions to newDefer + deferred[ tuple[1] ](function() { + var returned = fn && fn.apply( this, arguments ); + if ( returned && jQuery.isFunction( returned.promise ) ) { + returned.promise() + .done( newDefer.resolve ) + .fail( newDefer.reject ) + .progress( newDefer.notify ); + } else { + newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); + } + }); + }); + fns = null; + }).promise(); + }, + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + return obj != null ? jQuery.extend( obj, promise ) : promise; + } + }, + deferred = {}; + + // Keep pipe for back-compat + promise.pipe = promise.then; + + // Add list-specific methods + jQuery.each( tuples, function( i, tuple ) { + var list = tuple[ 2 ], + stateString = tuple[ 3 ]; + + // promise[ done | fail | progress ] = list.add + promise[ tuple[1] ] = list.add; + + // Handle state + if ( stateString ) { + list.add(function() { + // state = [ resolved | rejected ] + state = stateString; + + // [ reject_list | resolve_list ].disable; progress_list.lock + }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); + } + + // deferred[ resolve | reject | notify ] + deferred[ tuple[0] ] = function() { + deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); + return this; + }; + deferred[ tuple[0] + "With" ] = list.fireWith; + }); + + // Make the deferred a promise + promise.promise( deferred ); + + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); + } + + // All done! + return deferred; + }, + + // Deferred helper + when: function( subordinate /* , ..., subordinateN */ ) { + var i = 0, + resolveValues = slice.call( arguments ), + length = resolveValues.length, + + // the count of uncompleted subordinates + remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, + + // the master Deferred. If resolveValues consist of only a single Deferred, just use that. + deferred = remaining === 1 ? subordinate : jQuery.Deferred(), + + // Update function for both resolve and progress values + updateFunc = function( i, contexts, values ) { + return function( value ) { + contexts[ i ] = this; + values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; + if ( values === progressValues ) { + deferred.notifyWith( contexts, values ); + } else if ( !( --remaining ) ) { + deferred.resolveWith( contexts, values ); + } + }; + }, + + progressValues, progressContexts, resolveContexts; + + // Add listeners to Deferred subordinates; treat others as resolved + if ( length > 1 ) { + progressValues = new Array( length ); + progressContexts = new Array( length ); + resolveContexts = new Array( length ); + for ( ; i < length; i++ ) { + if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { + resolveValues[ i ].promise() + .done( updateFunc( i, resolveContexts, resolveValues ) ) + .fail( deferred.reject ) + .progress( updateFunc( i, progressContexts, progressValues ) ); + } else { + --remaining; + } + } + } + + // If we're not waiting on anything, resolve the master + if ( !remaining ) { + deferred.resolveWith( resolveContexts, resolveValues ); + } + + return deferred.promise(); + } +}); + + +// The deferred used on DOM ready +var readyList; + +jQuery.fn.ready = function( fn ) { + // Add the callback + jQuery.ready.promise().done( fn ); + + return this; +}; + +jQuery.extend({ + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, + + // Hold (or release) the ready event + holdReady: function( hold ) { + if ( hold ) { + jQuery.readyWait++; + } else { + jQuery.ready( true ); + } + }, + + // Handle when the DOM is ready + ready: function( wait ) { + + // Abort if there are pending holds or we're already ready + if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { + return; + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + + // If there are functions bound, to execute + readyList.resolveWith( document, [ jQuery ] ); + + // Trigger any bound ready events + if ( jQuery.fn.triggerHandler ) { + jQuery( document ).triggerHandler( "ready" ); + jQuery( document ).off( "ready" ); + } + } +}); + +/** + * The ready event handler and self cleanup method + */ +function completed() { + document.removeEventListener( "DOMContentLoaded", completed, false ); + window.removeEventListener( "load", completed, false ); + jQuery.ready(); +} + +jQuery.ready.promise = function( obj ) { + if ( !readyList ) { + + readyList = jQuery.Deferred(); + + // Catch cases where $(document).ready() is called after the browser event has already occurred. + // We once tried to use readyState "interactive" here, but it caused issues like the one + // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 + if ( document.readyState === "complete" ) { + // Handle it asynchronously to allow scripts the opportunity to delay ready + setTimeout( jQuery.ready ); + + } else { + + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", completed, false ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", completed, false ); + } + } + return readyList.promise( obj ); +}; + +// Kick off the DOM ready check even if the user does not +jQuery.ready.promise(); + + + + +// Multifunctional method to get and set values of a collection +// The value/s can optionally be executed if it's a function +var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) { + var i = 0, + len = elems.length, + bulk = key == null; + + // Sets many values + if ( jQuery.type( key ) === "object" ) { + chainable = true; + for ( i in key ) { + jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); + } + + // Sets one value + } else if ( value !== undefined ) { + chainable = true; + + if ( !jQuery.isFunction( value ) ) { + raw = true; + } + + if ( bulk ) { + // Bulk operations run against the entire set + if ( raw ) { + fn.call( elems, value ); + fn = null; + + // ...except when executing function values + } else { + bulk = fn; + fn = function( elem, key, value ) { + return bulk.call( jQuery( elem ), value ); + }; + } + } + + if ( fn ) { + for ( ; i < len; i++ ) { + fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); + } + } + } + + return chainable ? + elems : + + // Gets + bulk ? + fn.call( elems ) : + len ? fn( elems[0], key ) : emptyGet; +}; + + +/** + * Determines whether an object can have data + */ +jQuery.acceptData = function( owner ) { + // Accepts only: + // - Node + // - Node.ELEMENT_NODE + // - Node.DOCUMENT_NODE + // - Object + // - Any + /* jshint -W018 */ + return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); +}; + + +function Data() { + // Support: Android<4, + // Old WebKit does not have Object.preventExtensions/freeze method, + // return new empty object instead with no [[set]] accessor + Object.defineProperty( this.cache = {}, 0, { + get: function() { + return {}; + } + }); + + this.expando = jQuery.expando + Data.uid++; +} + +Data.uid = 1; +Data.accepts = jQuery.acceptData; + +Data.prototype = { + key: function( owner ) { + // We can accept data for non-element nodes in modern browsers, + // but we should not, see #8335. + // Always return the key for a frozen object. + if ( !Data.accepts( owner ) ) { + return 0; + } + + var descriptor = {}, + // Check if the owner object already has a cache key + unlock = owner[ this.expando ]; + + // If not, create one + if ( !unlock ) { + unlock = Data.uid++; + + // Secure it in a non-enumerable, non-writable property + try { + descriptor[ this.expando ] = { value: unlock }; + Object.defineProperties( owner, descriptor ); + + // Support: Android<4 + // Fallback to a less secure definition + } catch ( e ) { + descriptor[ this.expando ] = unlock; + jQuery.extend( owner, descriptor ); + } + } + + // Ensure the cache object + if ( !this.cache[ unlock ] ) { + this.cache[ unlock ] = {}; + } + + return unlock; + }, + set: function( owner, data, value ) { + var prop, + // There may be an unlock assigned to this node, + // if there is no entry for this "owner", create one inline + // and set the unlock as though an owner entry had always existed + unlock = this.key( owner ), + cache = this.cache[ unlock ]; + + // Handle: [ owner, key, value ] args + if ( typeof data === "string" ) { + cache[ data ] = value; + + // Handle: [ owner, { properties } ] args + } else { + // Fresh assignments by object are shallow copied + if ( jQuery.isEmptyObject( cache ) ) { + jQuery.extend( this.cache[ unlock ], data ); + // Otherwise, copy the properties one-by-one to the cache object + } else { + for ( prop in data ) { + cache[ prop ] = data[ prop ]; + } + } + } + return cache; + }, + get: function( owner, key ) { + // Either a valid cache is found, or will be created. + // New caches will be created and the unlock returned, + // allowing direct access to the newly created + // empty data object. A valid owner object must be provided. + var cache = this.cache[ this.key( owner ) ]; + + return key === undefined ? + cache : cache[ key ]; + }, + access: function( owner, key, value ) { + var stored; + // In cases where either: + // + // 1. No key was specified + // 2. A string key was specified, but no value provided + // + // Take the "read" path and allow the get method to determine + // which value to return, respectively either: + // + // 1. The entire cache object + // 2. The data stored at the key + // + if ( key === undefined || + ((key && typeof key === "string") && value === undefined) ) { + + stored = this.get( owner, key ); + + return stored !== undefined ? + stored : this.get( owner, jQuery.camelCase(key) ); + } + + // [*]When the key is not a string, or both a key and value + // are specified, set or extend (existing objects) with either: + // + // 1. An object of properties + // 2. A key and value + // + this.set( owner, key, value ); + + // Since the "set" path can have two possible entry points + // return the expected data based on which path was taken[*] + return value !== undefined ? value : key; + }, + remove: function( owner, key ) { + var i, name, camel, + unlock = this.key( owner ), + cache = this.cache[ unlock ]; + + if ( key === undefined ) { + this.cache[ unlock ] = {}; + + } else { + // Support array or space separated string of keys + if ( jQuery.isArray( key ) ) { + // If "name" is an array of keys... + // When data is initially created, via ("key", "val") signature, + // keys will be converted to camelCase. + // Since there is no way to tell _how_ a key was added, remove + // both plain key and camelCase key. #12786 + // This will only penalize the array argument path. + name = key.concat( key.map( jQuery.camelCase ) ); + } else { + camel = jQuery.camelCase( key ); + // Try the string as a key before any manipulation + if ( key in cache ) { + name = [ key, camel ]; + } else { + // If a key with the spaces exists, use it. + // Otherwise, create an array by matching non-whitespace + name = camel; + name = name in cache ? + [ name ] : ( name.match( rnotwhite ) || [] ); + } + } + + i = name.length; + while ( i-- ) { + delete cache[ name[ i ] ]; + } + } + }, + hasData: function( owner ) { + return !jQuery.isEmptyObject( + this.cache[ owner[ this.expando ] ] || {} + ); + }, + discard: function( owner ) { + if ( owner[ this.expando ] ) { + delete this.cache[ owner[ this.expando ] ]; + } + } +}; +var data_priv = new Data(); + +var data_user = new Data(); + + + +// Implementation Summary +// +// 1. Enforce API surface and semantic compatibility with 1.9.x branch +// 2. Improve the module's maintainability by reducing the storage +// paths to a single mechanism. +// 3. Use the same single mechanism to support "private" and "user" data. +// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) +// 5. Avoid exposing implementation details on user objects (eg. expando properties) +// 6. Provide a clear path for implementation upgrade to WeakMap in 2014 + +var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, + rmultiDash = /([A-Z])/g; + +function dataAttr( elem, key, data ) { + var name; + + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { + name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); + data = elem.getAttribute( name ); + + if ( typeof data === "string" ) { + try { + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : + // Only convert to a number if it doesn't change the string + +data + "" === data ? +data : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch( e ) {} + + // Make sure we set the data so it isn't changed later + data_user.set( elem, key, data ); + } else { + data = undefined; + } + } + return data; +} + +jQuery.extend({ + hasData: function( elem ) { + return data_user.hasData( elem ) || data_priv.hasData( elem ); + }, + + data: function( elem, name, data ) { + return data_user.access( elem, name, data ); + }, + + removeData: function( elem, name ) { + data_user.remove( elem, name ); + }, + + // TODO: Now that all calls to _data and _removeData have been replaced + // with direct calls to data_priv methods, these can be deprecated. + _data: function( elem, name, data ) { + return data_priv.access( elem, name, data ); + }, + + _removeData: function( elem, name ) { + data_priv.remove( elem, name ); + } +}); + +jQuery.fn.extend({ + data: function( key, value ) { + var i, name, data, + elem = this[ 0 ], + attrs = elem && elem.attributes; + + // Gets all values + if ( key === undefined ) { + if ( this.length ) { + data = data_user.get( elem ); + + if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) { + i = attrs.length; + while ( i-- ) { + + // Support: IE11+ + // The attrs elements can be null (#14894) + if ( attrs[ i ] ) { + name = attrs[ i ].name; + if ( name.indexOf( "data-" ) === 0 ) { + name = jQuery.camelCase( name.slice(5) ); + dataAttr( elem, name, data[ name ] ); + } + } + } + data_priv.set( elem, "hasDataAttrs", true ); + } + } + + return data; + } + + // Sets multiple values + if ( typeof key === "object" ) { + return this.each(function() { + data_user.set( this, key ); + }); + } + + return access( this, function( value ) { + var data, + camelKey = jQuery.camelCase( key ); + + // The calling jQuery object (element matches) is not empty + // (and therefore has an element appears at this[ 0 ]) and the + // `value` parameter was not undefined. An empty jQuery object + // will result in `undefined` for elem = this[ 0 ] which will + // throw an exception if an attempt to read a data cache is made. + if ( elem && value === undefined ) { + // Attempt to get data from the cache + // with the key as-is + data = data_user.get( elem, key ); + if ( data !== undefined ) { + return data; + } + + // Attempt to get data from the cache + // with the key camelized + data = data_user.get( elem, camelKey ); + if ( data !== undefined ) { + return data; + } + + // Attempt to "discover" the data in + // HTML5 custom data-* attrs + data = dataAttr( elem, camelKey, undefined ); + if ( data !== undefined ) { + return data; + } + + // We tried really hard, but the data doesn't exist. + return; + } + + // Set the data... + this.each(function() { + // First, attempt to store a copy or reference of any + // data that might've been store with a camelCased key. + var data = data_user.get( this, camelKey ); + + // For HTML5 data-* attribute interop, we have to + // store property names with dashes in a camelCase form. + // This might not apply to all properties...* + data_user.set( this, camelKey, value ); + + // *... In the case of properties that might _actually_ + // have dashes, we need to also store a copy of that + // unchanged property. + if ( key.indexOf("-") !== -1 && data !== undefined ) { + data_user.set( this, key, value ); + } + }); + }, null, value, arguments.length > 1, null, true ); + }, + + removeData: function( key ) { + return this.each(function() { + data_user.remove( this, key ); + }); + } +}); + + +jQuery.extend({ + queue: function( elem, type, data ) { + var queue; + + if ( elem ) { + type = ( type || "fx" ) + "queue"; + queue = data_priv.get( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( data ) { + if ( !queue || jQuery.isArray( data ) ) { + queue = data_priv.access( elem, type, jQuery.makeArray(data) ); + } else { + queue.push( data ); + } + } + return queue || []; + } + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), + startLength = queue.length, + fn = queue.shift(), + hooks = jQuery._queueHooks( elem, type ), + next = function() { + jQuery.dequeue( elem, type ); + }; + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + startLength--; + } + + if ( fn ) { + + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift( "inprogress" ); + } + + // Clear up the last queue stop function + delete hooks.stop; + fn.call( elem, next, hooks ); + } + + if ( !startLength && hooks ) { + hooks.empty.fire(); + } + }, + + // Not public - generate a queueHooks object, or return the current one + _queueHooks: function( elem, type ) { + var key = type + "queueHooks"; + return data_priv.get( elem, key ) || data_priv.access( elem, key, { + empty: jQuery.Callbacks("once memory").add(function() { + data_priv.remove( elem, [ type + "queue", key ] ); + }) + }); + } +}); + +jQuery.fn.extend({ + queue: function( type, data ) { + var setter = 2; + + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + setter--; + } + + if ( arguments.length < setter ) { + return jQuery.queue( this[0], type ); + } + + return data === undefined ? + this : + this.each(function() { + var queue = jQuery.queue( this, type, data ); + + // Ensure a hooks for this queue + jQuery._queueHooks( this, type ); + + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + }); + }, + dequeue: function( type ) { + return this.each(function() { + jQuery.dequeue( this, type ); + }); + }, + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); + }, + // Get a promise resolved when queues of a certain type + // are emptied (fx is the type by default) + promise: function( type, obj ) { + var tmp, + count = 1, + defer = jQuery.Deferred(), + elements = this, + i = this.length, + resolve = function() { + if ( !( --count ) ) { + defer.resolveWith( elements, [ elements ] ); + } + }; + + if ( typeof type !== "string" ) { + obj = type; + type = undefined; + } + type = type || "fx"; + + while ( i-- ) { + tmp = data_priv.get( elements[ i ], type + "queueHooks" ); + if ( tmp && tmp.empty ) { + count++; + tmp.empty.add( resolve ); + } + } + resolve(); + return defer.promise( obj ); + } +}); +var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source; + +var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; + +var isHidden = function( elem, el ) { + // isHidden might be called from jQuery#filter function; + // in that case, element will be second argument + elem = el || elem; + return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); + }; + +var rcheckableType = (/^(?:checkbox|radio)$/i); + + + +(function() { + var fragment = document.createDocumentFragment(), + div = fragment.appendChild( document.createElement( "div" ) ), + input = document.createElement( "input" ); + + // Support: Safari<=5.1 + // Check state lost if the name is set (#11217) + // Support: Windows Web Apps (WWA) + // `name` and `type` must use .setAttribute for WWA (#14901) + input.setAttribute( "type", "radio" ); + input.setAttribute( "checked", "checked" ); + input.setAttribute( "name", "t" ); + + div.appendChild( input ); + + // Support: Safari<=5.1, Android<4.2 + // Older WebKit doesn't clone checked state correctly in fragments + support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; + + // Support: IE<=11+ + // Make sure textarea (and checkbox) defaultValue is properly cloned + div.innerHTML = ""; + support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; +})(); +var strundefined = typeof undefined; + + + +support.focusinBubbles = "onfocusin" in window; + + +var + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/, + rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; + +function returnTrue() { + return true; +} + +function returnFalse() { + return false; +} + +function safeActiveElement() { + try { + return document.activeElement; + } catch ( err ) { } +} + +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { + + global: {}, + + add: function( elem, types, handler, data, selector ) { + + var handleObjIn, eventHandle, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = data_priv.get( elem ); + + // Don't attach events to noData or text/comment nodes (but allow plain objects) + if ( !elemData ) { + return; + } + + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + selector = handleObjIn.selector; + } + + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure and main handler, if this is the first + if ( !(events = elemData.events) ) { + events = elemData.events = {}; + } + if ( !(eventHandle = elemData.handle) ) { + eventHandle = elemData.handle = function( e ) { + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded + return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ? + jQuery.event.dispatch.apply( elem, arguments ) : undefined; + }; + } + + // Handle multiple events separated by a space + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); + + // There *must* be a type, no attaching namespace-only handlers + if ( !type ) { + continue; + } + + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; + + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; + + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; + + // handleObj is passed to all event handlers + handleObj = jQuery.extend({ + type: type, + origType: origType, + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + needsContext: selector && jQuery.expr.match.needsContext.test( selector ), + namespace: namespaces.join(".") + }, handleObjIn ); + + // Init the event handler queue if we're the first + if ( !(handlers = events[ type ]) ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; + + // Only use addEventListener if the special events handler returns false + if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle, false ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } + + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } + + }, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + + var j, origCount, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = data_priv.hasData( elem ) && data_priv.get( elem ); + + if ( !elemData || !(events = elemData.events) ) { + return; + } + + // Once for each type.namespace in types; type may be omitted + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); + + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); + } + continue; + } + + special = jQuery.event.special[ type ] || {}; + type = ( selector ? special.delegateType : special.bindType ) || type; + handlers = events[ type ] || []; + tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); + + // Remove matching events + origCount = j = handlers.length; + while ( j-- ) { + handleObj = handlers[ j ]; + + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !tmp || tmp.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + handlers.splice( j, 1 ); + + if ( handleObj.selector ) { + handlers.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + } + + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( origCount && !handlers.length ) { + if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + jQuery.removeEvent( elem, type, elemData.handle ); + } + + delete events[ type ]; + } + } + + // Remove the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + delete elemData.handle; + data_priv.remove( elem, "events" ); + } + }, + + trigger: function( event, data, elem, onlyHandlers ) { + + var i, cur, tmp, bubbleType, ontype, handle, special, + eventPath = [ elem || document ], + type = hasOwn.call( event, "type" ) ? event.type : event, + namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; + + cur = tmp = elem = elem || document; + + // Don't do events on text and comment nodes + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + // focus/blur morphs to focusin/out; ensure we're not firing them right now + if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { + return; + } + + if ( type.indexOf(".") >= 0 ) { + // Namespaced trigger; create a regexp to match event type in handle() + namespaces = type.split("."); + type = namespaces.shift(); + namespaces.sort(); + } + ontype = type.indexOf(":") < 0 && "on" + type; + + // Caller can pass in a jQuery.Event object, Object, or just an event type string + event = event[ jQuery.expando ] ? + event : + new jQuery.Event( type, typeof event === "object" && event ); + + // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) + event.isTrigger = onlyHandlers ? 2 : 3; + event.namespace = namespaces.join("."); + event.namespace_re = event.namespace ? + new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : + null; + + // Clean up the event in case it is being reused + event.result = undefined; + if ( !event.target ) { + event.target = elem; + } + + // Clone any incoming data and prepend the event, creating the handler arg list + data = data == null ? + [ event ] : + jQuery.makeArray( data, [ event ] ); + + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } + + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { + + bubbleType = special.delegateType || type; + if ( !rfocusMorph.test( bubbleType + type ) ) { + cur = cur.parentNode; + } + for ( ; cur; cur = cur.parentNode ) { + eventPath.push( cur ); + tmp = cur; + } + + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( tmp === (elem.ownerDocument || document) ) { + eventPath.push( tmp.defaultView || tmp.parentWindow || window ); + } + } + + // Fire handlers on the event path + i = 0; + while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { + + event.type = i > 1 ? + bubbleType : + special.bindType || type; + + // jQuery handler + handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" ); + if ( handle ) { + handle.apply( cur, data ); + } + + // Native handler + handle = ontype && cur[ ontype ]; + if ( handle && handle.apply && jQuery.acceptData( cur ) ) { + event.result = handle.apply( cur, data ); + if ( event.result === false ) { + event.preventDefault(); + } + } + } + event.type = type; + + // If nobody prevented the default action, do it now + if ( !onlyHandlers && !event.isDefaultPrevented() ) { + + if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && + jQuery.acceptData( elem ) ) { + + // Call a native DOM method on the target with the same name name as the event. + // Don't do default actions on window, that's where global variables be (#6170) + if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) { + + // Don't re-trigger an onFOO event when we call its FOO() method + tmp = elem[ ontype ]; + + if ( tmp ) { + elem[ ontype ] = null; + } + + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + elem[ type ](); + jQuery.event.triggered = undefined; + + if ( tmp ) { + elem[ ontype ] = tmp; + } + } + } + } + + return event.result; + }, + + dispatch: function( event ) { + + // Make a writable jQuery.Event from the native event object + event = jQuery.event.fix( event ); + + var i, j, ret, matched, handleObj, + handlerQueue = [], + args = slice.call( arguments ), + handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [], + special = jQuery.event.special[ event.type ] || {}; + + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[0] = event; + event.delegateTarget = this; + + // Call the preDispatch hook for the mapped type, and let it bail if desired + if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { + return; + } + + // Determine handlers + handlerQueue = jQuery.event.handlers.call( this, event, handlers ); + + // Run delegates first; they may want to stop propagation beneath us + i = 0; + while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { + event.currentTarget = matched.elem; + + j = 0; + while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { + + // Triggered event must either 1) have no namespace, or 2) have namespace(s) + // a subset or equal to those in the bound event (both can have no namespace). + if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { + + event.handleObj = handleObj; + event.data = handleObj.data; + + ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) + .apply( matched.elem, args ); + + if ( ret !== undefined ) { + if ( (event.result = ret) === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + // Call the postDispatch hook for the mapped type + if ( special.postDispatch ) { + special.postDispatch.call( this, event ); + } + + return event.result; + }, + + handlers: function( event, handlers ) { + var i, matches, sel, handleObj, + handlerQueue = [], + delegateCount = handlers.delegateCount, + cur = event.target; + + // Find delegate handlers + // Black-hole SVG instance trees (#13180) + // Avoid non-left-click bubbling in Firefox (#3861) + if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { + + for ( ; cur !== this; cur = cur.parentNode || this ) { + + // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) + if ( cur.disabled !== true || event.type !== "click" ) { + matches = []; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + + // Don't conflict with Object.prototype properties (#13203) + sel = handleObj.selector + " "; + + if ( matches[ sel ] === undefined ) { + matches[ sel ] = handleObj.needsContext ? + jQuery( sel, this ).index( cur ) >= 0 : + jQuery.find( sel, this, null, [ cur ] ).length; + } + if ( matches[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push({ elem: cur, handlers: matches }); + } + } + } + } + + // Add the remaining (directly-bound) handlers + if ( delegateCount < handlers.length ) { + handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); + } + + return handlerQueue; + }, + + // Includes some event props shared by KeyEvent and MouseEvent + props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), + + fixHooks: {}, + + keyHooks: { + props: "char charCode key keyCode".split(" "), + filter: function( event, original ) { + + // Add which for key events + if ( event.which == null ) { + event.which = original.charCode != null ? original.charCode : original.keyCode; + } + + return event; + } + }, + + mouseHooks: { + props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + filter: function( event, original ) { + var eventDoc, doc, body, + button = original.button; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && original.clientX != null ) { + eventDoc = event.target.ownerDocument || document; + doc = eventDoc.documentElement; + body = eventDoc.body; + + event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } + + return event; + } + }, + + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; + } + + // Create a writable copy of the event object and normalize some properties + var i, prop, copy, + type = event.type, + originalEvent = event, + fixHook = this.fixHooks[ type ]; + + if ( !fixHook ) { + this.fixHooks[ type ] = fixHook = + rmouseEvent.test( type ) ? this.mouseHooks : + rkeyEvent.test( type ) ? this.keyHooks : + {}; + } + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; + + event = new jQuery.Event( originalEvent ); + + i = copy.length; + while ( i-- ) { + prop = copy[ i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Support: Cordova 2.5 (WebKit) (#13255) + // All events should have a target; Cordova deviceready doesn't + if ( !event.target ) { + event.target = document; + } + + // Support: Safari 6.0+, Chrome<28 + // Target should not be a text node (#504, #13143) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; + }, + + special: { + load: { + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + focus: { + // Fire native event if possible so blur/focus sequence is correct + trigger: function() { + if ( this !== safeActiveElement() && this.focus ) { + this.focus(); + return false; + } + }, + delegateType: "focusin" + }, + blur: { + trigger: function() { + if ( this === safeActiveElement() && this.blur ) { + this.blur(); + return false; + } + }, + delegateType: "focusout" + }, + click: { + // For checkbox, fire native event so checked state will be right + trigger: function() { + if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) { + this.click(); + return false; + } + }, + + // For cross-browser consistency, don't fire native .click() on links + _default: function( event ) { + return jQuery.nodeName( event.target, "a" ); + } + }, + + beforeunload: { + postDispatch: function( event ) { + + // Support: Firefox 20+ + // Firefox doesn't alert if the returnValue field is not set. + if ( event.result !== undefined && event.originalEvent ) { + event.originalEvent.returnValue = event.result; + } + } + } + }, + + simulate: function( type, elem, event, bubble ) { + // Piggyback on a donor event to simulate a different one. + // Fake originalEvent to avoid donor's stopPropagation, but if the + // simulated event prevents default then we do the same on the donor. + var e = jQuery.extend( + new jQuery.Event(), + event, + { + type: type, + isSimulated: true, + originalEvent: {} + } + ); + if ( bubble ) { + jQuery.event.trigger( e, null, elem ); + } else { + jQuery.event.dispatch.call( elem, e ); + } + if ( e.isDefaultPrevented() ) { + event.preventDefault(); + } + } +}; + +jQuery.removeEvent = function( elem, type, handle ) { + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle, false ); + } +}; + +jQuery.Event = function( src, props ) { + // Allow instantiation without the 'new' keyword + if ( !(this instanceof jQuery.Event) ) { + return new jQuery.Event( src, props ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = src.defaultPrevented || + src.defaultPrevented === undefined && + // Support: Android<4.0 + src.returnValue === false ? + returnTrue : + returnFalse; + + // Event type + } else { + this.type = src; + } + + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } + + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || jQuery.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse, + + preventDefault: function() { + var e = this.originalEvent; + + this.isDefaultPrevented = returnTrue; + + if ( e && e.preventDefault ) { + e.preventDefault(); + } + }, + stopPropagation: function() { + var e = this.originalEvent; + + this.isPropagationStopped = returnTrue; + + if ( e && e.stopPropagation ) { + e.stopPropagation(); + } + }, + stopImmediatePropagation: function() { + var e = this.originalEvent; + + this.isImmediatePropagationStopped = returnTrue; + + if ( e && e.stopImmediatePropagation ) { + e.stopImmediatePropagation(); + } + + this.stopPropagation(); + } +}; + +// Create mouseenter/leave events using mouseover/out and event-time checks +// Support: Chrome 15+ +jQuery.each({ + mouseenter: "mouseover", + mouseleave: "mouseout", + pointerenter: "pointerover", + pointerleave: "pointerout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var ret, + target = this, + related = event.relatedTarget, + handleObj = event.handleObj; + + // For mousenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || (related !== target && !jQuery.contains( target, related )) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; + } + }; +}); + +// Support: Firefox, Chrome, Safari +// Create "bubbling" focus and blur events +if ( !support.focusinBubbles ) { + jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { + + // Attach a single capturing handler on the document while someone wants focusin/focusout + var handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); + }; + + jQuery.event.special[ fix ] = { + setup: function() { + var doc = this.ownerDocument || this, + attaches = data_priv.access( doc, fix ); + + if ( !attaches ) { + doc.addEventListener( orig, handler, true ); + } + data_priv.access( doc, fix, ( attaches || 0 ) + 1 ); + }, + teardown: function() { + var doc = this.ownerDocument || this, + attaches = data_priv.access( doc, fix ) - 1; + + if ( !attaches ) { + doc.removeEventListener( orig, handler, true ); + data_priv.remove( doc, fix ); + + } else { + data_priv.access( doc, fix, attaches ); + } + } + }; + }); +} + +jQuery.fn.extend({ + + on: function( types, selector, data, fn, /*INTERNAL*/ one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + this.on( type, selector, data, types[ type ], one ); + } + return this; + } + + if ( data == null && fn == null ) { + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return this; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return this.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + }); + }, + one: function( types, selector, data, fn ) { + return this.on( types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + var handleObj, type; + if ( types && types.preventDefault && types.handleObj ) { + // ( event ) dispatched jQuery.Event + handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, + handleObj.selector, + handleObj.handler + ); + return this; + } + if ( typeof types === "object" ) { + // ( types-object [, selector] ) + for ( type in types ) { + this.off( type, selector, types[ type ] ); + } + return this; + } + if ( selector === false || typeof selector === "function" ) { + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each(function() { + jQuery.event.remove( this, types, fn, selector ); + }); + }, + + trigger: function( type, data ) { + return this.each(function() { + jQuery.event.trigger( type, data, this ); + }); + }, + triggerHandler: function( type, data ) { + var elem = this[0]; + if ( elem ) { + return jQuery.event.trigger( type, data, elem, true ); + } + } +}); + + +var + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, + rtagName = /<([\w:]+)/, + rhtml = /<|&#?\w+;/, + rnoInnerhtml = /<(?:script|style|link)/i, + // checked="checked" or checked + rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, + rscriptType = /^$|\/(?:java|ecma)script/i, + rscriptTypeMasked = /^true\/(.*)/, + rcleanScript = /^\s*\s*$/g, + + // We have to close these tags to support XHTML (#13200) + wrapMap = { + + // Support: IE9 + option: [ 1, "" ], + + thead: [ 1, "", "
    " ], + col: [ 2, "", "
    " ], + tr: [ 2, "", "
    " ], + td: [ 3, "", "
    " ], + + _default: [ 0, "", "" ] + }; + +// Support: IE9 +wrapMap.optgroup = wrapMap.option; + +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + +// Support: 1.x compatibility +// Manipulating tables requires a tbody +function manipulationTarget( elem, content ) { + return jQuery.nodeName( elem, "table" ) && + jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ? + + elem.getElementsByTagName("tbody")[0] || + elem.appendChild( elem.ownerDocument.createElement("tbody") ) : + elem; +} + +// Replace/restore the type attribute of script elements for safe DOM manipulation +function disableScript( elem ) { + elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type; + return elem; +} +function restoreScript( elem ) { + var match = rscriptTypeMasked.exec( elem.type ); + + if ( match ) { + elem.type = match[ 1 ]; + } else { + elem.removeAttribute("type"); + } + + return elem; +} + +// Mark scripts as having already been evaluated +function setGlobalEval( elems, refElements ) { + var i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + data_priv.set( + elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" ) + ); + } +} + +function cloneCopyEvent( src, dest ) { + var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events; + + if ( dest.nodeType !== 1 ) { + return; + } + + // 1. Copy private data: events, handlers, etc. + if ( data_priv.hasData( src ) ) { + pdataOld = data_priv.access( src ); + pdataCur = data_priv.set( dest, pdataOld ); + events = pdataOld.events; + + if ( events ) { + delete pdataCur.handle; + pdataCur.events = {}; + + for ( type in events ) { + for ( i = 0, l = events[ type ].length; i < l; i++ ) { + jQuery.event.add( dest, type, events[ type ][ i ] ); + } + } + } + } + + // 2. Copy user data + if ( data_user.hasData( src ) ) { + udataOld = data_user.access( src ); + udataCur = jQuery.extend( {}, udataOld ); + + data_user.set( dest, udataCur ); + } +} + +function getAll( context, tag ) { + var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) : + context.querySelectorAll ? context.querySelectorAll( tag || "*" ) : + []; + + return tag === undefined || tag && jQuery.nodeName( context, tag ) ? + jQuery.merge( [ context ], ret ) : + ret; +} + +// Fix IE bugs, see support tests +function fixInput( src, dest ) { + var nodeName = dest.nodeName.toLowerCase(); + + // Fails to persist the checked state of a cloned checkbox or radio button. + if ( nodeName === "input" && rcheckableType.test( src.type ) ) { + dest.checked = src.checked; + + // Fails to return the selected option to the default selected state when cloning options + } else if ( nodeName === "input" || nodeName === "textarea" ) { + dest.defaultValue = src.defaultValue; + } +} + +jQuery.extend({ + clone: function( elem, dataAndEvents, deepDataAndEvents ) { + var i, l, srcElements, destElements, + clone = elem.cloneNode( true ), + inPage = jQuery.contains( elem.ownerDocument, elem ); + + // Fix IE cloning issues + if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && + !jQuery.isXMLDoc( elem ) ) { + + // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 + destElements = getAll( clone ); + srcElements = getAll( elem ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + fixInput( srcElements[ i ], destElements[ i ] ); + } + } + + // Copy the events from the original to the clone + if ( dataAndEvents ) { + if ( deepDataAndEvents ) { + srcElements = srcElements || getAll( elem ); + destElements = destElements || getAll( clone ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + cloneCopyEvent( srcElements[ i ], destElements[ i ] ); + } + } else { + cloneCopyEvent( elem, clone ); + } + } + + // Preserve script evaluation history + destElements = getAll( clone, "script" ); + if ( destElements.length > 0 ) { + setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); + } + + // Return the cloned set + return clone; + }, + + buildFragment: function( elems, context, scripts, selection ) { + var elem, tmp, tag, wrap, contains, j, + fragment = context.createDocumentFragment(), + nodes = [], + i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + elem = elems[ i ]; + + if ( elem || elem === 0 ) { + + // Add nodes directly + if ( jQuery.type( elem ) === "object" ) { + // Support: QtWebKit, PhantomJS + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); + + // Convert non-html into a text node + } else if ( !rhtml.test( elem ) ) { + nodes.push( context.createTextNode( elem ) ); + + // Convert html into DOM nodes + } else { + tmp = tmp || fragment.appendChild( context.createElement("div") ); + + // Deserialize a standard representation + tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); + wrap = wrapMap[ tag ] || wrapMap._default; + tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[ 2 ]; + + // Descend through wrappers to the right content + j = wrap[ 0 ]; + while ( j-- ) { + tmp = tmp.lastChild; + } + + // Support: QtWebKit, PhantomJS + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, tmp.childNodes ); + + // Remember the top-level container + tmp = fragment.firstChild; + + // Ensure the created nodes are orphaned (#12392) + tmp.textContent = ""; + } + } + } + + // Remove wrapper from fragment + fragment.textContent = ""; + + i = 0; + while ( (elem = nodes[ i++ ]) ) { + + // #4087 - If origin and destination elements are the same, and this is + // that element, do not do anything + if ( selection && jQuery.inArray( elem, selection ) !== -1 ) { + continue; + } + + contains = jQuery.contains( elem.ownerDocument, elem ); + + // Append to fragment + tmp = getAll( fragment.appendChild( elem ), "script" ); + + // Preserve script evaluation history + if ( contains ) { + setGlobalEval( tmp ); + } + + // Capture executables + if ( scripts ) { + j = 0; + while ( (elem = tmp[ j++ ]) ) { + if ( rscriptType.test( elem.type || "" ) ) { + scripts.push( elem ); + } + } + } + } + + return fragment; + }, + + cleanData: function( elems ) { + var data, elem, type, key, + special = jQuery.event.special, + i = 0; + + for ( ; (elem = elems[ i ]) !== undefined; i++ ) { + if ( jQuery.acceptData( elem ) ) { + key = elem[ data_priv.expando ]; + + if ( key && (data = data_priv.cache[ key ]) ) { + if ( data.events ) { + for ( type in data.events ) { + if ( special[ type ] ) { + jQuery.event.remove( elem, type ); + + // This is a shortcut to avoid jQuery.event.remove's overhead + } else { + jQuery.removeEvent( elem, type, data.handle ); + } + } + } + if ( data_priv.cache[ key ] ) { + // Discard any remaining `private` data + delete data_priv.cache[ key ]; + } + } + } + // Discard any remaining `user` data + delete data_user.cache[ elem[ data_user.expando ] ]; + } + } +}); + +jQuery.fn.extend({ + text: function( value ) { + return access( this, function( value ) { + return value === undefined ? + jQuery.text( this ) : + this.empty().each(function() { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + this.textContent = value; + } + }); + }, null, value, arguments.length ); + }, + + append: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.appendChild( elem ); + } + }); + }, + + prepend: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.insertBefore( elem, target.firstChild ); + } + }); + }, + + before: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this ); + } + }); + }, + + after: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this.nextSibling ); + } + }); + }, + + remove: function( selector, keepData /* Internal Use Only */ ) { + var elem, + elems = selector ? jQuery.filter( selector, this ) : this, + i = 0; + + for ( ; (elem = elems[i]) != null; i++ ) { + if ( !keepData && elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem ) ); + } + + if ( elem.parentNode ) { + if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) { + setGlobalEval( getAll( elem, "script" ) ); + } + elem.parentNode.removeChild( elem ); + } + } + + return this; + }, + + empty: function() { + var elem, + i = 0; + + for ( ; (elem = this[i]) != null; i++ ) { + if ( elem.nodeType === 1 ) { + + // Prevent memory leaks + jQuery.cleanData( getAll( elem, false ) ); + + // Remove any remaining nodes + elem.textContent = ""; + } + } + + return this; + }, + + clone: function( dataAndEvents, deepDataAndEvents ) { + dataAndEvents = dataAndEvents == null ? false : dataAndEvents; + deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; + + return this.map(function() { + return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); + }); + }, + + html: function( value ) { + return access( this, function( value ) { + var elem = this[ 0 ] || {}, + i = 0, + l = this.length; + + if ( value === undefined && elem.nodeType === 1 ) { + return elem.innerHTML; + } + + // See if we can take a shortcut and just use innerHTML + if ( typeof value === "string" && !rnoInnerhtml.test( value ) && + !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { + + value = value.replace( rxhtmlTag, "<$1>" ); + + try { + for ( ; i < l; i++ ) { + elem = this[ i ] || {}; + + // Remove element nodes and prevent memory leaks + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + elem.innerHTML = value; + } + } + + elem = 0; + + // If using innerHTML throws an exception, use the fallback method + } catch( e ) {} + } + + if ( elem ) { + this.empty().append( value ); + } + }, null, value, arguments.length ); + }, + + replaceWith: function() { + var arg = arguments[ 0 ]; + + // Make the changes, replacing each context element with the new content + this.domManip( arguments, function( elem ) { + arg = this.parentNode; + + jQuery.cleanData( getAll( this ) ); + + if ( arg ) { + arg.replaceChild( elem, this ); + } + }); + + // Force removal if there was no new content (e.g., from empty arguments) + return arg && (arg.length || arg.nodeType) ? this : this.remove(); + }, + + detach: function( selector ) { + return this.remove( selector, true ); + }, + + domManip: function( args, callback ) { + + // Flatten any nested arrays + args = concat.apply( [], args ); + + var fragment, first, scripts, hasScripts, node, doc, + i = 0, + l = this.length, + set = this, + iNoClone = l - 1, + value = args[ 0 ], + isFunction = jQuery.isFunction( value ); + + // We can't cloneNode fragments that contain checked, in WebKit + if ( isFunction || + ( l > 1 && typeof value === "string" && + !support.checkClone && rchecked.test( value ) ) ) { + return this.each(function( index ) { + var self = set.eq( index ); + if ( isFunction ) { + args[ 0 ] = value.call( this, index, self.html() ); + } + self.domManip( args, callback ); + }); + } + + if ( l ) { + fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this ); + first = fragment.firstChild; + + if ( fragment.childNodes.length === 1 ) { + fragment = first; + } + + if ( first ) { + scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); + hasScripts = scripts.length; + + // Use the original fragment for the last item instead of the first because it can end up + // being emptied incorrectly in certain situations (#8070). + for ( ; i < l; i++ ) { + node = fragment; + + if ( i !== iNoClone ) { + node = jQuery.clone( node, true, true ); + + // Keep references to cloned scripts for later restoration + if ( hasScripts ) { + // Support: QtWebKit + // jQuery.merge because push.apply(_, arraylike) throws + jQuery.merge( scripts, getAll( node, "script" ) ); + } + } + + callback.call( this[ i ], node, i ); + } + + if ( hasScripts ) { + doc = scripts[ scripts.length - 1 ].ownerDocument; + + // Reenable scripts + jQuery.map( scripts, restoreScript ); + + // Evaluate executable scripts on first document insertion + for ( i = 0; i < hasScripts; i++ ) { + node = scripts[ i ]; + if ( rscriptType.test( node.type || "" ) && + !data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) { + + if ( node.src ) { + // Optional AJAX dependency, but won't run scripts if not present + if ( jQuery._evalUrl ) { + jQuery._evalUrl( node.src ); + } + } else { + jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); + } + } + } + } + } + } + + return this; + } +}); + +jQuery.each({ + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function( name, original ) { + jQuery.fn[ name ] = function( selector ) { + var elems, + ret = [], + insert = jQuery( selector ), + last = insert.length - 1, + i = 0; + + for ( ; i <= last; i++ ) { + elems = i === last ? this : this.clone( true ); + jQuery( insert[ i ] )[ original ]( elems ); + + // Support: QtWebKit + // .get() because push.apply(_, arraylike) throws + push.apply( ret, elems.get() ); + } + + return this.pushStack( ret ); + }; +}); + + +var iframe, + elemdisplay = {}; + +/** + * Retrieve the actual display of a element + * @param {String} name nodeName of the element + * @param {Object} doc Document object + */ +// Called only from within defaultDisplay +function actualDisplay( name, doc ) { + var style, + elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), + + // getDefaultComputedStyle might be reliably used only on attached element + display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ? + + // Use of this method is a temporary fix (more like optimization) until something better comes along, + // since it was removed from specification and supported only in FF + style.display : jQuery.css( elem[ 0 ], "display" ); + + // We don't have any data stored on the element, + // so use "detach" method as fast way to get rid of the element + elem.detach(); + + return display; +} + +/** + * Try to determine the default display value of an element + * @param {String} nodeName + */ +function defaultDisplay( nodeName ) { + var doc = document, + display = elemdisplay[ nodeName ]; + + if ( !display ) { + display = actualDisplay( nodeName, doc ); + + // If the simple way fails, read from inside an iframe + if ( display === "none" || !display ) { + + // Use the already-created iframe if possible + iframe = (iframe || jQuery( " + +
    + + +
    +
    +

    Directives

    +
    + +

    ui-draggable

    + +

    + directive in module ngDragDrop +

    + +

    The ui-draggable attribute tells Angular that the element is draggable. ui-draggable + takes an expression as the attribute value. The expression should evaluate to either true or false. + You can toggle the draggability of an element using this expression. +

    + + +

    Additional Attributes

    + +

    drag

    + +

    The drag property is used to assign the data that needs to be passed along with the dragging + element.

    +
    +

    drag-handle-class

    + +

    The class used to mark child elements of draggable object to be used as drag handle. Default class name is + drag-handle.

    +
    + NOTE: If attribute is not present drag handle feature is not active. +
    +
    +

    on-drop-success

    + +

    The on-drop-success attribute takes a function. We can consider this to be an on-drop-success + handler function. + This can be useful if you need to do some post processing after the dragged element is dropped successfully on + the drop site. + +

    + NOTE: This callback function is only called when the drop succeeds. +
    + You can request the drag-end event ( very similiar to requesting the click event in + ng-click ) + by passing $event in the event handler. +

    + +
    +

    on-drop-failure

    + +

    The on-drop-failure attribute takes a function. We can consider this to be an on-drop-failure + handler function. + This can be useful if you need to do some post processing after the dragged element is dropped unsuccessfully on + any drop site. + +

    + NOTE: This callback function is only called when the drop fails. +
    + You can request the drag-end event ( very similiar to requesting the click event in + ng-click ) + by passing $event in the event handler. +

    + + +
    +

    Usage

    + +

    + +

    + ... + +
    +

    + +

    Details

    + +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParamTypeDetails
    ui-draggableExpression that should be + evaluated. The given expression should resolve to true or false. +
    dragTakes any JSON convertable $scope variable.
    drag-handle-classClass name used to mark child elements of draggable object to be used as drag handle.
    If attribute + is not present drag handle feature is not used.
    If attribute is present but have no value + drag-handle used as default.
    on-drop-successTakes any $scope function. Can also pass $event.
    on-drop-failureTakes any $scope function. Can also pass $event.
    drag-channelTakes a string that can be used as the channel name for the dragging operation. + Default channel is "defaultchannel" +
    +

    +
    + +

    Events

    + +

    On start of dragging an Angular Event ANGULAR_DRAG_START is dispatched from the + $rootScope. The event also carries + carries the information about the channel in which the dragging has started. +

    + +

    On end of dragging an Angular Event ANGULAR_DRAG_END is dispatched from the $rootScope. + The event also carries + carries the information about the channel in which the dragging has started. +

    + +

    When hovering a draggable element on top of a drop area an Angular Event ANGULAR_HOVER + is dispatched from the $rootScope. + The event also carries the information about the channel in which the dragging has started. +

    + +
    + +

    ui-on-drop

    + +

    + directive in module ngDragDrop +

    + +

    The ui-on-drop attribute tells Angular that the element is a drop site. ui-on-drop + takes a function as the attribute value. The function will be called when a valid dragged element is dropped in + that location. + A valid dragged element is one which has the same channel as the drop location. + +

    + NOTE : This callback function is only called when the drop succeeds. +
    + The ui-on-drop callback can request additional parameters. The data that is dragged is available to the + callback as $data and its channel as $channel. Apart from this the drop event is exposed as $event. +

    +

    Additional Attributes

    + +

    drop-channel

    + +

    The channel that the drop site accepts. The dragged element should have the same channel as this drop site for it + to be droppable at this location. It is possible to provide comma separated list of channels. + +

    + NOTE: Also special value of drag-channel attribute is available to accept + dragged element with any channel value — * +
    +

    + +
    + +

    drop-validate

    + +

    Extra validation that makes sure that the drop site accepts the dragged element beyond having the same channel. If + not defined, no extra validation is made. + +

    + NOTE: This callback function is called only if the channel condition is met, when the element + starts being dragged +
    +

    + +
    + +

    drag-enter-class

    + +

    The class that will be added to the the droppable element when a dragged element ( which is droppable ) + enters the drop location. The default value for this is on-drag-enter

    + +

    drag-hover-class

    + +

    The class that will be added to the drop area element when hovering with an element. + The default value for this is on-drag-hover

    + +
    +

    Usage

    + +

    + +

    + ... +
    +

    + +

    Details

    + +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParamTypeDetails
    ui-on-dropTakes any $scope function. Can also pass $event, $data and $channel. +
    drop-channelThe channel on which the drop has to listen for drag events.
    + Single value, comma separated list or special value * are possible
    drop-validateTakes any $scope function. Can also pass $data and $channel +
    drag-enter-classA class name that will be put on the droppable element when the dragged objects enters its boundaries. +
    Default class name is on-drag-enter.
    drag-hover-classA class name that will be put on the drop area when an element is dragged onto it.
    Default class + name is on-drag-hover.
    +

    +
    +

    Demo

    + + + +
    +
    + + + + + diff --git a/public/vendor/angular-native-dragdrop/draganddrop.js b/public/vendor/angular-native-dragdrop/draganddrop.js new file mode 100644 index 00000000000..f45b47df4d9 --- /dev/null +++ b/public/vendor/angular-native-dragdrop/draganddrop.js @@ -0,0 +1,370 @@ +(function(angular) { + 'use strict'; + + function isDnDsSupported() { + return 'ondrag' in document.createElement('a'); + } + + if (!isDnDsSupported()) { + angular.module('ang-drag-drop', []); + return; + } + + if (window.jQuery && (-1 === window.jQuery.event.props.indexOf('dataTransfer'))) { + window.jQuery.event.props.push('dataTransfer'); + } + + var module = angular.module('ang-drag-drop', []); + + module.directive('uiDraggable', ['$parse', '$rootScope', '$dragImage', function($parse, $rootScope, $dragImage) { + return function(scope, element, attrs) { + var isDragHandleUsed = false, + dragHandleClass, + draggingClass = attrs.draggingClass || 'on-dragging', + dragTarget; + + element.attr('draggable', false); + + scope.$watch(attrs.uiDraggable, function(newValue) { + if (newValue) { + element.attr('draggable', newValue); + element.bind('dragend', dragendHandler); + element.bind('dragstart', dragstartHandler); + } + else { + element.removeAttr('draggable'); + element.unbind('dragend', dragendHandler); + element.unbind('dragstart', dragstartHandler); + } + + }); + + if (angular.isString(attrs.dragHandleClass)) { + isDragHandleUsed = true; + dragHandleClass = attrs.dragHandleClass.trim() || 'drag-handle'; + + element.bind('mousedown', function(e) { + dragTarget = e.target; + }); + } + + function dragendHandler(e) { + setTimeout(function() { + element.unbind('$destroy', dragendHandler); + }, 0); + var sendChannel = attrs.dragChannel || 'defaultchannel'; + $rootScope.$broadcast('ANGULAR_DRAG_END', e, sendChannel); + if (e.dataTransfer && e.dataTransfer.dropEffect !== 'none') { + if (attrs.onDropSuccess) { + var onDropSuccessFn = $parse(attrs.onDropSuccess); + scope.$evalAsync(function() { + onDropSuccessFn(scope, {$event: e}); + }); + } else { + if (attrs.onDropFailure) { + var onDropFailureFn = $parse(attrs.onDropFailure); + scope.$evalAsync(function() { + onDropFailureFn(scope, {$event: e}); + }); + } + } + } + element.removeClass(draggingClass); + } + + function dragstartHandler(e) { + var isDragAllowed = !isDragHandleUsed || dragTarget.classList.contains(dragHandleClass); + + if (isDragAllowed) { + var sendChannel = attrs.dragChannel || 'defaultchannel'; + var dragData = ''; + if (attrs.drag) { + dragData = scope.$eval(attrs.drag); + } + + var dragImage = attrs.dragImage || null; + + element.addClass(draggingClass); + element.bind('$destroy', dragendHandler); + + if (dragImage) { + var dragImageFn = $parse(attrs.dragImage); + scope.$apply(function() { + var dragImageParameters = dragImageFn(scope, {$event: e}); + if (dragImageParameters) { + if (angular.isString(dragImageParameters)) { + dragImageParameters = $dragImage.generate(dragImageParameters); + } + if (dragImageParameters.image) { + var xOffset = dragImageParameters.xOffset || 0, + yOffset = dragImageParameters.yOffset || 0; + e.dataTransfer.setDragImage(dragImageParameters.image, xOffset, yOffset); + } + } + }); + } + + var transferDataObject = {data: dragData, channel: sendChannel} + var transferDataText = angular.toJson(transferDataObject); + + e.dataTransfer.setData('text', transferDataText); + e.dataTransfer.effectAllowed = 'copyMove'; + + $rootScope.$broadcast('ANGULAR_DRAG_START', e, sendChannel, transferDataObject); + } + else { + e.preventDefault(); + } + } + }; + } + ]); + + module.directive('uiOnDrop', ['$parse', '$rootScope', function($parse, $rootScope) { + return function(scope, element, attr) { + var dragging = 0; //Ref. http://stackoverflow.com/a/10906204 + var dropChannel = attr.dropChannel || 'defaultchannel'; + var dragChannel = ''; + var dragEnterClass = attr.dragEnterClass || 'on-drag-enter'; + var dragHoverClass = attr.dragHoverClass || 'on-drag-hover'; + var customDragEnterEvent = $parse(attr.onDragEnter); + var customDragLeaveEvent = $parse(attr.onDragLeave); + + function onDragOver(e) { + if (e.preventDefault) { + e.preventDefault(); // Necessary. Allows us to drop. + } + + if (e.stopPropagation) { + e.stopPropagation(); + } + + var uiOnDragOverFn = $parse(attr.uiOnDragOver); + scope.$evalAsync(function() { + uiOnDragOverFn(scope, {$event: e, $channel: dropChannel}); + }); + + return false; + } + + function onDragLeave(e) { + if (e.preventDefault) { + e.preventDefault(); + } + + if (e.stopPropagation) { + e.stopPropagation(); + } + dragging--; + + if (dragging === 0) { + scope.$evalAsync(function() { + customDragLeaveEvent(scope, {$event: e, $channel: dropChannel}); + }); + element.addClass(dragEnterClass); + element.removeClass(dragHoverClass); + } + + var uiOnDragLeaveFn = $parse(attr.uiOnDragLeave); + scope.$evalAsync(function() { + uiOnDragLeaveFn(scope, {$event: e, $channel: dropChannel}); + }); + } + + function onDragEnter(e) { + if (e.preventDefault) { + e.preventDefault(); + } + + if (e.stopPropagation) { + e.stopPropagation(); + } + + if (dragging === 0) { + scope.$evalAsync(function() { + customDragEnterEvent(scope, {$event: e, $channel: dropChannel}); + }); + element.removeClass(dragEnterClass); + element.addClass(dragHoverClass); + } + dragging++; + + var uiOnDragEnterFn = $parse(attr.uiOnDragEnter); + scope.$evalAsync(function() { + uiOnDragEnterFn(scope, {$event: e, $channel: dropChannel}); + }); + + $rootScope.$broadcast('ANGULAR_HOVER', dragChannel); + } + + function onDrop(e) { + if (e.preventDefault) { + e.preventDefault(); // Necessary. Allows us to drop. + } + if (e.stopPropagation) { + e.stopPropagation(); // Necessary. Allows us to drop. + } + + var sendData = e.dataTransfer.getData('text'); + sendData = angular.fromJson(sendData); + + // Chrome doesn't set dropEffect, so we have to work it out ourselves + if (e.dataTransfer.dropEffect === 'none') { + if (e.dataTransfer.effectAllowed === 'copy' || + e.dataTransfer.effectAllowed === 'move') { + e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed; + } else if (e.dataTransfer.effectAllowed === 'copyMove') { + e.dataTransfer.dropEffect = e.ctrlKey ? 'copy' : 'move'; + } + } + + var uiOnDropFn = $parse(attr.uiOnDrop); + scope.$evalAsync(function() { + uiOnDropFn(scope, {$data: sendData.data, $event: e, $channel: sendData.channel}); + }); + element.removeClass(dragEnterClass); + dragging = 0; + } + + function isDragChannelAccepted(dragChannel, dropChannel) { + if (dropChannel === '*') { + return true; + } + + var channelMatchPattern = new RegExp('(\\s|[,])+(' + dragChannel + ')(\\s|[,])+', 'i'); + + return channelMatchPattern.test(',' + dropChannel + ','); + } + + function preventNativeDnD(e) { + if (e.preventDefault) { + e.preventDefault(); + } + if (e.stopPropagation) { + e.stopPropagation(); + } + e.dataTransfer.dropEffect = 'none'; + return false; + } + + var deregisterDragStart = $rootScope.$on('ANGULAR_DRAG_START', function(_, e, channel, transferDataObject) { + dragChannel = channel; + + var valid = true; + + if (!isDragChannelAccepted(channel, dropChannel)) { + valid = false; + } + + if (valid && attr.dropValidate) { + var validateFn = $parse(attr.dropValidate); + valid = validateFn(scope, {$drop: {scope: scope, element:element}, $event:e, $data: transferDataObject.data, $channel: transferDataObject.channel}); + } + + if (valid) { + element.bind('dragover', onDragOver); + element.bind('dragenter', onDragEnter); + element.bind('dragleave', onDragLeave); + element.bind('drop', onDrop); + + element.addClass(dragEnterClass); + } else { + element.bind('dragover', preventNativeDnD); + element.bind('dragenter', preventNativeDnD); + element.bind('dragleave', preventNativeDnD); + element.bind('drop', preventNativeDnD); + + element.removeClass(dragEnterClass); + } + + }); + + + var deregisterDragEnd = $rootScope.$on('ANGULAR_DRAG_END', function(_, e, channel) { + element.unbind('dragover', onDragOver); + element.unbind('dragenter', onDragEnter); + element.unbind('dragleave', onDragLeave); + + element.unbind('drop', onDrop); + element.removeClass(dragHoverClass); + element.removeClass(dragEnterClass); + + element.unbind('dragover', preventNativeDnD); + element.unbind('dragenter', preventNativeDnD); + element.unbind('dragleave', preventNativeDnD); + element.unbind('drop', preventNativeDnD); + }); + + scope.$on('$destroy', function() { + deregisterDragStart(); + deregisterDragEnd(); + }); + + + attr.$observe('dropChannel', function(value) { + if (value) { + dropChannel = value; + } + }); + + + }; + } + ]); + + module.constant('$dragImageConfig', { + height: 20, + width: 200, + padding: 10, + font: 'bold 11px Arial', + fontColor: '#eee8d5', + backgroundColor: '#93a1a1', + xOffset: 0, + yOffset: 0 + }); + + module.service('$dragImage', ['$dragImageConfig', function(defaultConfig) { + var ELLIPSIS = '…'; + + function fitString(canvas, text, config) { + var width = canvas.measureText(text).width; + if (width < config.width) { + return text; + } + while (width + config.padding > config.width) { + text = text.substring(0, text.length - 1); + width = canvas.measureText(text + ELLIPSIS).width; + } + return text + ELLIPSIS; + } + + this.generate = function(text, options) { + var config = angular.extend({}, defaultConfig, options || {}); + var el = document.createElement('canvas'); + + el.height = config.height; + el.width = config.width; + + var canvas = el.getContext('2d'); + + canvas.fillStyle = config.backgroundColor; + canvas.fillRect(0, 0, config.width, config.height); + canvas.font = config.font; + canvas.fillStyle = config.fontColor; + + var title = fitString(canvas, text, config); + canvas.fillText(title, 4, config.padding + 4); + + var image = new Image(); + image.src = el.toDataURL(); + + return { + image: image, + xOffset: config.xOffset, + yOffset: config.yOffset + }; + }; + } + ]); + +}(angular)); diff --git a/public/vendor/angular-native-dragdrop/package.json b/public/vendor/angular-native-dragdrop/package.json new file mode 100644 index 00000000000..4e9871d3ee7 --- /dev/null +++ b/public/vendor/angular-native-dragdrop/package.json @@ -0,0 +1,24 @@ +{ + "name": "angular-native-dragdrop", + "version": "1.0.8", + "description": "Angular HTML5 Drag and Drop directive written in pure with no dependency on JQuery.", + "main": "draganddrop.js", + "scripts": { + "test": "gulp" + }, + "repository": { + "type": "git", + "url": "https://github.com/angular-dragdrop/angular-dragdrop.git" + }, + "author": "ganarajpr", + "license": "MIT", + "bugs": { + "url": "https://github.com/angular-dragdrop/angular-dragdrop/issues" + }, + "homepage": "http://angular-dragdrop.github.io/angular-dragdrop", + "devDependencies": { + "gulp": "^3.8.11", + "gulp-jshint": "^1.9.2", + "jshint-stylish": "^1.0.1" + } +} diff --git a/public/vendor/angular-other/angular-dragdrop.js b/public/vendor/angular-other/angular-dragdrop.js deleted file mode 100644 index 40fb1c9e814..00000000000 --- a/public/vendor/angular-other/angular-dragdrop.js +++ /dev/null @@ -1,381 +0,0 @@ -/** - * Created with IntelliJ IDEA. - * User: Ganaraj.Pr - * Date: 11/10/13 - * Time: 11:27 - * To change this template use File | Settings | File Templates. - */ - -(function(angular){ - -function isDnDsSupported(){ - return 'ondrag' in document.createElement("a"); -} - -if(!isDnDsSupported()){ - angular.module("ang-drag-drop", []); - return; -} - -if (window.jQuery && (-1 == window.jQuery.event.props.indexOf("dataTransfer"))) { - window.jQuery.event.props.push("dataTransfer"); -} - -var currentData; - -angular.module("ang-drag-drop",[]) - .directive("uiDraggable", [ - '$parse', - '$rootScope', - '$dragImage', - function ($parse, $rootScope, $dragImage) { - return function (scope, element, attrs) { - var dragData = "", - isDragHandleUsed = false, - dragHandleClass, - draggingClass = attrs.draggingClass || "on-dragging", - dragTarget; - - element.attr("draggable", false); - - attrs.$observe("uiDraggable", function (newValue) { - if(newValue){ - element.attr("draggable", newValue); - } - else{ - element.removeAttr("draggable"); - } - - }); - - if (attrs.drag) { - scope.$watch(attrs.drag, function (newValue) { - dragData = newValue || ""; - }); - } - - if (angular.isString(attrs.dragHandleClass)) { - isDragHandleUsed = true; - dragHandleClass = attrs.dragHandleClass.trim() || "drag-handle"; - - element.bind("mousedown", function (e) { - dragTarget = e.target; - }); - } - - function dragendHandler(e) { - setTimeout(function() { - element.unbind('$destroy', dragendHandler); - }, 0); - var sendChannel = attrs.dragChannel || "defaultchannel"; - $rootScope.$broadcast("ANGULAR_DRAG_END", sendChannel); - if (e.dataTransfer && e.dataTransfer.dropEffect !== "none") { - if (attrs.onDropSuccess) { - var fn = $parse(attrs.onDropSuccess); - scope.$evalAsync(function () { - fn(scope, {$event: e}); - }); - } else { - if (attrs.onDropFailure) { - var fn = $parse(attrs.onDropFailure); - scope.$evalAsync(function () { - fn(scope, {$event: e}); - }); - } - } - } - element.removeClass(draggingClass); - } - - element.bind("dragend", dragendHandler); - - element.bind("dragstart", function (e) { - var isDragAllowed = !isDragHandleUsed || dragTarget.classList.contains(dragHandleClass); - - if (isDragAllowed) { - var sendChannel = attrs.dragChannel || "defaultchannel"; - var sendData = angular.toJson({ data: dragData, channel: sendChannel }); - var dragImage = attrs.dragImage || null; - - element.addClass(draggingClass); - element.bind('$destroy', dragendHandler); - - if (dragImage) { - var dragImageFn = $parse(attrs.dragImage); - scope.$evalAsync(function() { - var dragImageParameters = dragImageFn(scope, {$event: e}); - if (dragImageParameters) { - if (angular.isString(dragImageParameters)) { - dragImageParameters = $dragImage.generate(dragImageParameters); - } - if (dragImageParameters.image) { - var xOffset = dragImageParameters.xOffset || 0, - yOffset = dragImageParameters.yOffset || 0; - e.dataTransfer.setDragImage(dragImageParameters.image, xOffset, yOffset); - } - } - }); - } - - e.dataTransfer.setData("dataToSend", sendData); - currentData = angular.fromJson(sendData); - e.dataTransfer.effectAllowed = "copyMove"; - $rootScope.$broadcast("ANGULAR_DRAG_START", sendChannel, currentData.data); - } - else { - e.preventDefault(); - } - }); - }; - } - ]) - .directive("uiOnDrop", [ - '$parse', - '$rootScope', - function ($parse, $rootScope) { - return function (scope, element, attr) { - var dragging = 0; //Ref. http://stackoverflow.com/a/10906204 - var dropChannel = attr.dropChannel || "defaultchannel" ; - var dragChannel = ""; - var dragEnterClass = attr.dragEnterClass || "on-drag-enter"; - var dragHoverClass = attr.dragHoverClass || "on-drag-hover"; - var customDragEnterEvent = $parse(attr.onDragEnter); - var customDragLeaveEvent = $parse(attr.onDragLeave); - - function onDragOver(e) { - if (e.preventDefault) { - e.preventDefault(); // Necessary. Allows us to drop. - } - - if (e.stopPropagation) { - e.stopPropagation(); - } - - var fn = $parse(attr.uiOnDragOver); - scope.$evalAsync(function () { - fn(scope, {$event: e, $channel: dropChannel}); - }); - - e.dataTransfer.dropEffect = e.shiftKey ? 'copy' : 'move'; - return false; - } - - function onDragLeave(e) { - if (e.preventDefault) { - e.preventDefault(); - } - - if (e.stopPropagation) { - e.stopPropagation(); - } - dragging--; - - if (dragging == 0) { - scope.$evalAsync(function () { - customDragEnterEvent(scope, {$event: e}); - }); - element.removeClass(dragHoverClass); - } - - var fn = $parse(attr.uiOnDragLeave); - scope.$evalAsync(function () { - fn(scope, {$event: e, $channel: dropChannel}); - }); - } - - function onDragEnter(e) { - if (e.preventDefault) { - e.preventDefault(); - } - - if (e.stopPropagation) { - e.stopPropagation(); - } - dragging++; - - var fn = $parse(attr.uiOnDragEnter); - scope.$evalAsync(function () { - fn(scope, {$event: e, $channel: dropChannel}); - }); - - $rootScope.$broadcast("ANGULAR_HOVER", dragChannel); - scope.$evalAsync(function () { - customDragLeaveEvent(scope, {$event: e}); - }); - element.addClass(dragHoverClass); - } - - function onDrop(e) { - if (e.preventDefault) { - e.preventDefault(); // Necessary. Allows us to drop. - } - if (e.stopPropagation) { - e.stopPropagation(); // Necessary. Allows us to drop. - } - - var sendData = e.dataTransfer.getData("dataToSend"); - sendData = angular.fromJson(sendData); - - var fn = $parse(attr.uiOnDrop); - scope.$evalAsync(function () { - fn(scope, {$data: sendData.data, $event: e, $channel: sendData.channel}); - }); - element.removeClass(dragEnterClass); - dragging = 0; - } - - function isDragChannelAccepted(dragChannel, dropChannel) { - if (dropChannel === "*") { - return true; - } - - var channelMatchPattern = new RegExp("(\\s|[,])+(" + dragChannel + ")(\\s|[,])+", "i"); - - return channelMatchPattern.test("," + dropChannel + ","); - } - - function preventNativeDnD(e) { - if (e.preventDefault) { - e.preventDefault(); - } - if (e.stopPropagation) { - e.stopPropagation(); - } - e.dataTransfer.dropEffect = "none"; - return false; - } - - var deregisterDragStart = $rootScope.$on("ANGULAR_DRAG_START", function (event, channel) { - dragChannel = channel; - if (isDragChannelAccepted(channel, dropChannel)) { - if (attr.dropValidate) { - var validateFn = $parse(attr.dropValidate); - var valid = validateFn(scope, {$data: currentData.data, $channel: currentData.channel}); - if (!valid) { - element.bind("dragover", preventNativeDnD); - element.bind("dragenter", preventNativeDnD); - element.bind("dragleave", preventNativeDnD); - element.bind("drop", preventNativeDnD); - return; - } - } - - element.bind("dragover", onDragOver); - element.bind("dragenter", onDragEnter); - element.bind("dragleave", onDragLeave); - - element.bind("drop", onDrop); - element.addClass(dragEnterClass); - } - else { - element.bind("dragover", preventNativeDnD); - element.bind("dragenter", preventNativeDnD); - element.bind("dragleave", preventNativeDnD); - element.bind("drop", preventNativeDnD); - } - - }); - - - - var deregisterDragEnd = $rootScope.$on("ANGULAR_DRAG_END", function (e, channel) { - dragChannel = ""; - if (isDragChannelAccepted(channel, dropChannel)) { - - element.unbind("dragover", onDragOver); - element.unbind("dragenter", onDragEnter); - element.unbind("dragleave", onDragLeave); - - element.unbind("drop", onDrop); - element.removeClass(dragHoverClass); - element.removeClass(dragEnterClass); - } - - element.unbind("dragover", preventNativeDnD); - element.unbind("dragenter", preventNativeDnD); - element.unbind("dragleave", preventNativeDnD); - element.unbind("drop", preventNativeDnD); - }); - - - var deregisterDragHover = $rootScope.$on("ANGULAR_HOVER", function (e, channel) { - if (isDragChannelAccepted(channel, dropChannel)) { - element.removeClass(dragHoverClass); - } - }); - - - scope.$on('$destroy', function () { - deregisterDragStart(); - deregisterDragEnd(); - deregisterDragHover(); - }); - - - attr.$observe('dropChannel', function (value) { - if (value) { - dropChannel = value; - } - }); - - - }; - } - ]) - .constant("$dragImageConfig", { - height: 20, - width: 200, - padding: 10, - font: 'bold 11px Arial', - fontColor: '#eee8d5', - backgroundColor: '#93a1a1', - xOffset: 0, - yOffset: 0 - }) - .service("$dragImage", [ - '$dragImageConfig', - function (defaultConfig) { - var ELLIPSIS = '…'; - - function fitString(canvas, text, config) { - var width = canvas.measureText(text).width; - if (width < config.width) { - return text; - } - while (width + config.padding > config.width) { - text = text.substring(0, text.length - 1); - width = canvas.measureText(text + ELLIPSIS).width; - } - return text + ELLIPSIS; - }; - - this.generate = function (text, options) { - var config = angular.extend({}, defaultConfig, options || {}); - var el = document.createElement('canvas'); - - el.height = config.height; - el.width = config.width; - - var canvas = el.getContext('2d'); - - canvas.fillStyle = config.backgroundColor; - canvas.fillRect(0, 0, config.width, config.height); - canvas.font = config.font; - canvas.fillStyle = config.fontColor; - - var title = fitString(canvas, text, config); - canvas.fillText(title, 4, config.padding + 4); - - var image = new Image(); - image.src = el.toDataURL(); - - return { - image: image, - xOffset: config.xOffset, - yOffset: config.yOffset - }; - } - } - ]); - -}(angular)); From 6f982b27918eed54eafcc8163404aa8e67cfd77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 13 Jun 2015 22:20:39 +0200 Subject: [PATCH 306/398] Moved angular-bindonce to bower --- bower.json | 3 +- public/app/components/require.config.js | 2 +- public/test/test-main.js | 2 +- public/vendor/angular-bindonce/.bower.json | 37 +++++ public/vendor/angular-bindonce/CHANGELOG.md | 43 +++++ public/vendor/angular-bindonce/README.md | 154 ++++++++++++++++++ .../bindonce.js | 6 +- .../vendor/angular-bindonce/bindonce.min.js | 1 + public/vendor/angular-bindonce/bower.json | 28 ++++ public/vendor/angular-bindonce/package.json | 28 ++++ 10 files changed, 300 insertions(+), 4 deletions(-) create mode 100644 public/vendor/angular-bindonce/.bower.json create mode 100644 public/vendor/angular-bindonce/CHANGELOG.md create mode 100644 public/vendor/angular-bindonce/README.md rename public/vendor/{angular-other => angular-bindonce}/bindonce.js (98%) create mode 100644 public/vendor/angular-bindonce/bindonce.min.js create mode 100644 public/vendor/angular-bindonce/bower.json create mode 100644 public/vendor/angular-bindonce/package.json diff --git a/bower.json b/bower.json index 8646eb1d19f..43da3e5c7cd 100644 --- a/bower.json +++ b/bower.json @@ -18,6 +18,7 @@ "angular-route": "~1.4.0", "angular-mocks": "~1.4.0", "angular-sanitize": "~1.4.0", - "angular-native-dragdrop": "~1.1.0" + "angular-native-dragdrop": "~1.1.0", + "angular-bindonce": "~0.3.3" } } diff --git a/public/app/components/require.config.js b/public/app/components/require.config.js index 44dd21476e3..3bcdc031161 100644 --- a/public/app/components/require.config.js +++ b/public/app/components/require.config.js @@ -20,7 +20,7 @@ require.config({ 'angular-strap': '../vendor/angular-other/angular-strap', timepicker: '../vendor/angular-other/timepicker', datepicker: '../vendor/angular-other/datepicker', - bindonce: '../vendor/angular-other/bindonce', + bindonce: '../vendor/angular-bindonce/bindonce', crypto: '../vendor/crypto.min', spectrum: '../vendor/spectrum', diff --git a/public/test/test-main.js b/public/test/test-main.js index 59bd4cbe1ee..34672b5332a 100644 --- a/public/test/test-main.js +++ b/public/test/test-main.js @@ -25,7 +25,7 @@ require.config({ 'angular-strap': '../vendor/angular-other/angular-strap', timepicker: '../vendor/angular-other/timepicker', datepicker: '../vendor/angular-other/datepicker', - bindonce: '../vendor/angular-other/bindonce', + bindonce: '../vendor/angular-bindonce/bindonce', crypto: '../vendor/crypto.min', spectrum: '../vendor/spectrum', diff --git a/public/vendor/angular-bindonce/.bower.json b/public/vendor/angular-bindonce/.bower.json new file mode 100644 index 00000000000..313c654cc14 --- /dev/null +++ b/public/vendor/angular-bindonce/.bower.json @@ -0,0 +1,37 @@ +{ + "name": "angular-bindonce", + "version": "0.3.3", + "main": "bindonce.js", + "description": "Zero watchers binding directives for AngularJS", + "homepage": "https://github.com/Pasvaz/bindonce", + "author": "Pasquale Vazzana ", + "repository": { + "type": "git", + "url": "https://github.com/Pasvaz/bindonce.git" + }, + "license": "MIT", + "ignore": [ + "**/.*", + "node_modules", + "components" + ], + "dependencies": {}, + "keywords": [ + "angularjs", + "angular", + "directive", + "binding", + "watcher", + "bindonce" + ], + "_release": "0.3.3", + "_resolution": { + "type": "version", + "tag": "0.3.3", + "commit": "0fcf71e6effc88179893c9c06baf6c6bf9037632" + }, + "_source": "git://github.com/Pasvaz/bindonce.git", + "_target": "~0.3.3", + "_originalSource": "angular-bindonce", + "_direct": true +} \ No newline at end of file diff --git a/public/vendor/angular-bindonce/CHANGELOG.md b/public/vendor/angular-bindonce/CHANGELOG.md new file mode 100644 index 00000000000..8246d986e39 --- /dev/null +++ b/public/vendor/angular-bindonce/CHANGELOG.md @@ -0,0 +1,43 @@ +# 0.3.3 (2014-02-12) +### Features +- **bo-disabled:** + - Add support for ng-disabled/bo-disabled #110 + +
    +# 0.3.2 (2014-11-23) +### Bug Fixes +- **Angular 1.3 compatibility** + +
    +# 0.3.1 (2014-02-12) +### Features +- **bo-bind:** + - alias for bo-text + +### Bug Fixes +- **Angular Promises** + - Ensures that promises are resolved before to run binders ([b3ef1b4](https://github.com/Pasvaz/bindonce/commit/b3ef1b46edfe83f10ed455d5520027f731563f32)) + +### Minor improvements +- Updated Readme + +
    +# 0.3.0 (2014-01-21) +### Features +- **bo-switch:** + - Create new directive: bo-switch ([652d0db](https://github.com/Pasvaz/bindonce/commit/652d0db04325166a180377c738a376543b5f2357)) + +
    +# 0.2.3 (2014-01-20) +### Bug Fixes + +- **bo-if:** + - Ensures that we both process newly added binders from bo-if, and that +we only process each binder once ([d11f863](https://github.com/Pasvaz/bindonce/commit/e091c273bbd17603d410fecc363874f0d1e6f38e)) + +### Features + +- **Minification:** + - add min file ([47277ee](https://github.com/Pasvaz/bindonce/commit/47277eedd092b3210de362c725a7dadcddac8e87)) +- **Changelog:** + - Created a changelog file diff --git a/public/vendor/angular-bindonce/README.md b/public/vendor/angular-bindonce/README.md new file mode 100644 index 00000000000..c8d753fbe6b --- /dev/null +++ b/public/vendor/angular-bindonce/README.md @@ -0,0 +1,154 @@ +Bindonce +======== + +High performance binding for AngularJs + +## Usage +* download, clone or fork it or install it using [bower](http://twitter.github.com/bower/) `bower install angular-bindonce` +* Include the `bindonce.js` script provided by this component into your app. +* Add `'pasvaz.bindonce'` as a module dependency to your app: `angular.module('app', ['pasvaz.bindonce'])` + +## Demo +Here is an example of how AngularJs can [freeze your UI](http://plnkr.co/edit/jwrHVb?p=preview), try to press and hold a key inside the input field, when the table is filled with only 1 person everything is ok, you can see how the DOM is updated by the input in real time, however if you try to load 1000 person *(or even 500 if the testing device is not powerfull)* and repeat the experiment you can see how the UI is frozen. In [this other demo](http://plnkr.co/edit/0DGOrk?p=preview) BindOnce will take care of your watchers and the UI will be reactive as it should be. The code is the same for both demos, the only difference is that I replaced any `ng-*` tag inside the table with the equivalent `bo-*` tag. +* [AngularJs regular Demo](http://plnkr.co/edit/jwrHVb?p=preview) +* [Demo with Bindonce](http://plnkr.co/edit/0DGOrk?p=preview) + +## Overview +AngularJs provides a great data binding system but if you abuse of it the page can run into some performance issues, it's known that more of 2000 watchers can lag the UI and that amount can be reached easily if you don't pay attention to the data-binding. Sometime you really need to bind your data using watchers, especially for SPA because the data are updated in real time, but often you can avoid it with some efforts, most of the data presented in your page, once rendered, are immutable so you shouldn't keep watching them for changes. + +For instance, take a look to this snippet: +```html +
      +
    • + + +

      +
      • +
    +``` +Angular internally creates a `$watch` for each `ng-*` directive in order to keep the data up to date, so in this example just for displaying few info it creates 6 + 1 *(ngRepeatWatch)* watchers per `person`, even if the `person` is supposed to remain the same once shown. Iterate this amount for each person and you can have an idea about how easy is to reach 2000 watchers. Now if you need it because those data could change while you show the page or are bound to some models, it's ok. But most of the time they are static data that don't change once rendered. This is where **bindonce** can really help you. + +The above example done with **bindonce**: +```html +
      +
    • + + +

      +
      • +
    +``` +Now this example uses **0 watches** per `person` and renders exactly the same result as the above that uses ng-*. *(Angular still uses 1 watcher for ngRepeatWatch)* + +### The smart approach +OK until here nothing completely new, with a bit of efforts you could create your own directive and render the `person` inside the `link` function, or you could use [watch fighters](https://github.com/abourget/abourget-angular) that has a similar approach, but there is still one problem that you have to face and **bindonce** already handles it: *the existence of the data when the directive renders the content*. Usually the directives, unless you use watchers or bind their attributes to the scope (still a watcher), render the content when they are loaded into the markup, but if at that given time your data is not available, the directive can't render it. Bindonce can wait until the data is ready before to rendering the content. +Let's take a look at the follow snippet to better understand the concept: +```html + + +... + +``` +This basic directive works as expected, it renders the `Person` data without using any watchers. However, if `Person` is not yet available inside the $scope when the page is loaded (say we get `Person` via $http or via $resource), the directive is useless, `scope.$eval(attr.myCustomSetText)` simply renders nothing and exits. + +Here is how we can solve this issue with **bindonce**: +```html +
    + + + +

    +
    +``` +`bindonce="Person"` does the trick, any `bo-*` attribute belonging to `bindonce` waits until the parent `bindonce="{somedata}"` is validated and then renders its content. Once the scope contains the value `Person` then each bo-* child gets filled with the proper values. In order to accomplish this task, **bindonce** uses just **one** temporary watcher, no matters how many children need to be rendered. As soon as it gets `Person` the watcher is promptly removed. If the $scope already contains the data `bindonce` is looking for, then it doesn't create the temporary watcher and simply starts rendering its children. + +You may have noticed that the first example didn't assign any value to the `bindonce` attribute: +```html +
      +
    • + ... +``` +when used with `ng-repeat` `bindonce` doesn't need to check if `person` is defined because `ng-repeat` creates the directives only when `person` exists. You could be more explicit: `
    • `, however assigning a value to `bindonce` in an `ng-repeat` won't make any difference. + +### Interpolation +Some directives (ng-href, ng-src) use interpolation, ie: `ng-href="/profile/{{User.profileId}}"`. +Both `ng-href` and `ng-src` have the bo-* equivalent directives: `bo-href-i` and `bo-src-i` (pay attention to the **-i**, it stands for **interpolate**). As expected they don't use watchers however Angular creates one watcher per interpolation, for instance `bo-href-i="/profile/{{User.profileId}}"` sets the element's href **once**, as expected, but Angular keeps a watcher active on `{{User.profileId}}` even if `bo-href-i` doesn't use it. +That's why by default the `bo-href` doesn't use interpolation or watchers. The above equivalent with 0 watchers would be `bo-href="'/profile/' + User.profileId"`. Nevertheless, `bo-href-i` and `bo-src-i` are still maintained for compatibility reasons. + +### Filters +Almost every `bo-*` directive replace the equivalent `ng-*` and works in the same ways, except it is evaluated once. +Consequentially you can use any valid angular expression, including filters. This is an example how to use a filter: +```html +
      + +
      +``` + +## Attribute Usage +| Directive | Description | Example | +|------------|----------------|-----| +| `bindonce="{somedata}"`| **bindonce** is the main directive. `{somedata}` is optional, and if present, forces bindonce to wait until `somedata` is defined before rendering its children | `
      ...
      ` | +| `bo-if = "condition"` | equivalent to `ng-if` but doesn't use watchers |``| +| `bo-switch = "expression"` | equivalent to `ng-switch` but doesn't use watchers |`
      ` `public` `private` `
      `| +| `bo-show = "condition"` | equivalent to `ng-show` but doesn't use watchers |``| +| `bo-hide = "condition"` | equivalent to `ng-hide` but doesn't use watchers |``| +| `bo-disabled = "condition"` | equivalent to `ng-disabled` but doesn't use watchers |``| +| `bo-text = "text"` | evaluates "text" and print it as text inside the element | `` | +| `bo-bind = "text"` | alias for `bo-text`, equivalent to `ng-bind` but doesn't use watchers | `` | +| `bo-html = "markup"` | evaluates "markup" and render it as html inside the element |`bo-html="Person.description"`| +| `bo-href-i = "url"`
      *use `bo-href` instead* | **equivalent** to `ng-href`.
      **Heads up!** Using interpolation `{{}}` it creates one watcher:
      `bo-href-i="/p/{{Person.id}}"`.
      Use `bo-href` to avoid the watcher:
      `bo-href="'/p/' + Person.id"` |``| +| `bo-href = "url"` | **similar** to `ng-href` but doesn't allow interpolation using `{{}}` like `ng-href`.
      **Heads up!** You can't use interpolation `{{}}` inside the url, use bo-href-i for that purpose |``
      or
      ``| +| `bo-src-i = "url"`
      *use `bo-src` instead* | **equivalent** to `ng-src`.
      **Heads up!** It creates one watcher |``| +| `bo-src = "url"` | **similar** to `ng-src` but doesn't allow interpolation using `{{}}` like `ng-src`.
      **Heads up!** You can't use interpolation `{{}}`, use bo-src-i for that purpose |``| +| `bo-class = "object/string"` | equivalent to `ng-class` but doesn't use watchers |``| +| `bo-alt = "text"` | evaluates "text" and render it as `alt` for the element |``| +| `bo-title = "text"` | evaluates "text" and render it as `title` for the element |``| +| `bo-id = "#id"` | evaluates "#id" and render it as `id` for the element |``| +| `bo-style = "object"` | equivalent to `ng-style` but doesn't use watchers |``| +| `bo-value = "expression"` | evaluates "expression" and render it as `value` for the element |``| +| `bo-attr bo-attr-foo = "text"` | evaluates "text" and render it as a custom attribute for the element |`
      `| + +## Build +``` +$ npm install uglify-js -g +$ uglifyjs bindonce.js -c -m -o bindonce.min.js +``` + +## Todo +Tests + +## Copyright +BindOnce was written by **Pasquale Vazzana**, you can follow him on [google+](https://plus.google.com/101872882413388363602) or on [@twitter](https://twitter.com/PasqualeVazzana) + +Thanks to all the [contributors](https://github.com/Pasvaz/bindonce/graphs/contributors) + +## LICENSE - "MIT License" + +Copyright (c) 2013-2014 Pasquale Vazzana + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/public/vendor/angular-other/bindonce.js b/public/vendor/angular-bindonce/bindonce.js similarity index 98% rename from public/vendor/angular-other/bindonce.js rename to public/vendor/angular-bindonce/bindonce.js index 77bd81e7598..8742d891750 100644 --- a/public/vendor/angular-other/bindonce.js +++ b/public/vendor/angular-bindonce/bindonce.js @@ -2,7 +2,7 @@ "use strict"; /** * Bindonce - Zero watches binding for AngularJs - * @version v0.3.2 + * @version v0.3.3 * @link https://github.com/Pasvaz/bindonce * @author Pasquale Vazzana * @license MIT License, http://www.opensource.org/licenses/MIT @@ -185,6 +185,9 @@ case 'style': binder.element.css(value); break; + case 'disabled': + binder.element.prop('disabled', value); + break; case 'src': binder.element.attr(binder.attr, value); if (msie) binder.element.prop('src', value); @@ -251,6 +254,7 @@ { directiveName: 'boTitle', attribute: 'title' }, { directiveName: 'boId', attribute: 'id' }, { directiveName: 'boStyle', attribute: 'style' }, + { directiveName: 'boDisabled', attribute: 'disabled' }, { directiveName: 'boValue', attribute: 'value' }, { directiveName: 'boAttr', attribute: 'attr' }, diff --git a/public/vendor/angular-bindonce/bindonce.min.js b/public/vendor/angular-bindonce/bindonce.min.js new file mode 100644 index 00000000000..555ded4bffe --- /dev/null +++ b/public/vendor/angular-bindonce/bindonce.min.js @@ -0,0 +1 @@ +!function(){"use strict";var e=angular.module("pasvaz.bindonce",[]);e.directive("bindonce",function(){var e=function(e){if(e&&0!==e.length){var t=angular.lowercase(""+e);e=!("f"===t||"0"===t||"false"===t||"no"===t||"n"===t||"[]"===t)}else e=!1;return e},t=parseInt((/msie (\d+)/.exec(angular.lowercase(navigator.userAgent))||[])[1],10);isNaN(t)&&(t=parseInt((/trident\/.*; rv:(\d+)/.exec(angular.lowercase(navigator.userAgent))||[])[1],10));var r={restrict:"AM",controller:["$scope","$element","$attrs","$interpolate",function(r,a,i,n){var c=function(t,r,a){var i="show"===r?"":"none",n="hide"===r?"":"none";t.css("display",e(a)?i:n)},o=function(e,t){if(angular.isObject(t)&&!angular.isArray(t)){var r=[];angular.forEach(t,function(e,t){e&&r.push(t)}),t=r}t&&e.addClass(angular.isArray(t)?t.join(" "):t)},s=function(e,t){e.transclude(t,function(t){var r=e.element.parent(),a=e.element&&e.element[e.element.length-1],i=r&&r[0]||a&&a.parentNode,n=a&&a.nextSibling||null;angular.forEach(t,function(e){i.insertBefore(e,n)})})},l={watcherRemover:void 0,binders:[],group:i.boName,element:a,ran:!1,addBinder:function(e){this.binders.push(e),this.ran&&this.runBinders()},setupWatcher:function(e){var t=this;this.watcherRemover=r.$watch(e,function(e){void 0!==e&&(t.removeWatcher(),t.checkBindonce(e))},!0)},checkBindonce:function(e){var t=this,r=e.$promise?e.$promise.then:e.then;"function"==typeof r?r(function(){t.runBinders()}):t.runBinders()},removeWatcher:function(){void 0!==this.watcherRemover&&(this.watcherRemover(),this.watcherRemover=void 0)},runBinders:function(){for(;this.binders.length>0;){var r=this.binders.shift();if(!this.group||this.group==r.group){var a=r.scope.$eval(r.interpolate?n(r.value):r.value);switch(r.attr){case"boIf":e(a)&&s(r,r.scope.$new());break;case"boSwitch":var i,l=r.controller[0];(i=l.cases["!"+a]||l.cases["?"])&&(r.scope.$eval(r.attrs.change),angular.forEach(i,function(e){s(e,r.scope.$new())}));break;case"boSwitchWhen":var u=r.controller[0];u.cases["!"+r.attrs.boSwitchWhen]=u.cases["!"+r.attrs.boSwitchWhen]||[],u.cases["!"+r.attrs.boSwitchWhen].push({transclude:r.transclude,element:r.element});break;case"boSwitchDefault":var u=r.controller[0];u.cases["?"]=u.cases["?"]||[],u.cases["?"].push({transclude:r.transclude,element:r.element});break;case"hide":case"show":c(r.element,r.attr,a);break;case"class":o(r.element,a);break;case"text":r.element.text(a);break;case"html":r.element.html(a);break;case"style":r.element.css(a);break;case"disabled":r.element.prop("disabled",a);break;case"src":r.element.attr(r.attr,a),t&&r.element.prop("src",a);break;case"attr":angular.forEach(r.attrs,function(e,t){var a,i;t.match(/^boAttr./)&&r.attrs[t]&&(a=t.replace(/^boAttr/,"").replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase(),i=r.scope.$eval(r.attrs[t]),r.element.attr(a,i))});break;case"href":case"alt":case"title":case"id":case"value":r.element.attr(r.attr,a)}}}this.ran=!0}};angular.extend(this,l)}],link:function(e,t,r,a){var i=r.bindonce&&e.$eval(r.bindonce);void 0!==i?a.checkBindonce(i):(a.setupWatcher(r.bindonce),t.bind("$destroy",a.removeWatcher))}};return r}),angular.forEach([{directiveName:"boShow",attribute:"show"},{directiveName:"boHide",attribute:"hide"},{directiveName:"boClass",attribute:"class"},{directiveName:"boText",attribute:"text"},{directiveName:"boBind",attribute:"text"},{directiveName:"boHtml",attribute:"html"},{directiveName:"boSrcI",attribute:"src",interpolate:!0},{directiveName:"boSrc",attribute:"src"},{directiveName:"boHrefI",attribute:"href",interpolate:!0},{directiveName:"boHref",attribute:"href"},{directiveName:"boAlt",attribute:"alt"},{directiveName:"boTitle",attribute:"title"},{directiveName:"boId",attribute:"id"},{directiveName:"boStyle",attribute:"style"},{directiveName:"boDisabled",attribute:"disabled"},{directiveName:"boValue",attribute:"value"},{directiveName:"boAttr",attribute:"attr"},{directiveName:"boIf",transclude:"element",terminal:!0,priority:1e3},{directiveName:"boSwitch",require:"boSwitch",controller:function(){this.cases={}}},{directiveName:"boSwitchWhen",transclude:"element",priority:800,require:"^boSwitch"},{directiveName:"boSwitchDefault",transclude:"element",priority:800,require:"^boSwitch"}],function(t){var r=200;return e.directive(t.directiveName,function(){var e={priority:t.priority||r,transclude:t.transclude||!1,terminal:t.terminal||!1,require:["^bindonce"].concat(t.require||[]),controller:t.controller,compile:function(e,r,a){return function(e,r,i,n){var c=n[0],o=i.boParent;if(o&&c.group!==o){var s=c.element.parent();c=void 0;for(var l;9!==s[0].nodeType&&s.length;){if((l=s.data("$bindonceController"))&&l.group===o){c=l;break}s=s.parent()}if(!c)throw new Error("No bindonce controller: "+o)}c.addBinder({element:r,attr:t.attribute||t.directiveName,attrs:i,value:i[t.directiveName],interpolate:t.interpolate,group:o,transclude:a,controller:n.slice(1),scope:e})}}};return e})})}(); \ No newline at end of file diff --git a/public/vendor/angular-bindonce/bower.json b/public/vendor/angular-bindonce/bower.json new file mode 100644 index 00000000000..9242594598a --- /dev/null +++ b/public/vendor/angular-bindonce/bower.json @@ -0,0 +1,28 @@ +{ + "name": "angular-bindonce", + "version": "0.3.3", + "main": "bindonce.js", + "description": "Zero watchers binding directives for AngularJS", + "homepage": "https://github.com/Pasvaz/bindonce", + "author": "Pasquale Vazzana ", + "repository": { + "type": "git", + "url": "https://github.com/Pasvaz/bindonce.git" + }, + "license": "MIT", + "ignore": [ + "**/.*", + "node_modules", + "components" + ], + "dependencies": { + }, + "keywords": [ + "angularjs", + "angular", + "directive", + "binding", + "watcher", + "bindonce" + ] +} diff --git a/public/vendor/angular-bindonce/package.json b/public/vendor/angular-bindonce/package.json new file mode 100644 index 00000000000..9242594598a --- /dev/null +++ b/public/vendor/angular-bindonce/package.json @@ -0,0 +1,28 @@ +{ + "name": "angular-bindonce", + "version": "0.3.3", + "main": "bindonce.js", + "description": "Zero watchers binding directives for AngularJS", + "homepage": "https://github.com/Pasvaz/bindonce", + "author": "Pasquale Vazzana ", + "repository": { + "type": "git", + "url": "https://github.com/Pasvaz/bindonce.git" + }, + "license": "MIT", + "ignore": [ + "**/.*", + "node_modules", + "components" + ], + "dependencies": { + }, + "keywords": [ + "angularjs", + "angular", + "directive", + "binding", + "watcher", + "bindonce" + ] +} From fd319bd5f58be4bccaff275288e9bca9d244a737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 13 Jun 2015 23:01:54 +0200 Subject: [PATCH 307/398] Moved requirejs to bower, #677 --- bower.json | 4 +- public/app/components/require.config.js | 3 +- public/vendor/require/css-build.js | 78 --- public/vendor/require/css.js | 23 - public/vendor/require/tmpl.js | 17 - public/vendor/requirejs-text/.bower.json | 16 + public/vendor/requirejs-text/LICENSE | 58 ++ public/vendor/requirejs-text/README.md | 198 ++++++ public/vendor/requirejs-text/bower.json | 5 + public/vendor/requirejs-text/package.json | 30 + .../{require => requirejs-text}/text.js | 31 +- public/vendor/requirejs/.bower.json | 27 + public/vendor/requirejs/README.md | 4 + public/vendor/requirejs/bower.json | 17 + .../vendor/{require => requirejs}/require.js | 621 ++++++++++-------- public/views/index.html | 2 +- tasks/options/concat.js | 2 +- tasks/options/requirejs.js | 2 - tasks/options/uglify.js | 2 +- 19 files changed, 722 insertions(+), 418 deletions(-) delete mode 100644 public/vendor/require/css-build.js delete mode 100644 public/vendor/require/css.js delete mode 100644 public/vendor/require/tmpl.js create mode 100644 public/vendor/requirejs-text/.bower.json create mode 100644 public/vendor/requirejs-text/LICENSE create mode 100644 public/vendor/requirejs-text/README.md create mode 100644 public/vendor/requirejs-text/bower.json create mode 100644 public/vendor/requirejs-text/package.json rename public/vendor/{require => requirejs-text}/text.js (95%) create mode 100644 public/vendor/requirejs/.bower.json create mode 100644 public/vendor/requirejs/README.md create mode 100644 public/vendor/requirejs/bower.json rename public/vendor/{require => requirejs}/require.js (79%) diff --git a/bower.json b/bower.json index 43da3e5c7cd..3607de4d8f0 100644 --- a/bower.json +++ b/bower.json @@ -19,6 +19,8 @@ "angular-mocks": "~1.4.0", "angular-sanitize": "~1.4.0", "angular-native-dragdrop": "~1.1.0", - "angular-bindonce": "~0.3.3" + "angular-bindonce": "~0.3.3", + "requirejs": "~2.1.18", + "requirejs-text": "~2.0.14" } } diff --git a/public/app/components/require.config.js b/public/app/components/require.config.js index 3bcdc031161..12a72dd42e3 100644 --- a/public/app/components/require.config.js +++ b/public/app/components/require.config.js @@ -8,8 +8,7 @@ require.config({ kbn: 'components/kbn', store: 'components/store', - css: '../vendor/require/css', - text: '../vendor/require/text', + text: '../vendor/requirejs-text/text', moment: '../vendor/moment', filesaver: '../vendor/filesaver', ZeroClipboard: '../vendor/ZeroClipboard', diff --git a/public/vendor/require/css-build.js b/public/vendor/require/css-build.js deleted file mode 100644 index ad9403c58f3..00000000000 --- a/public/vendor/require/css-build.js +++ /dev/null @@ -1,78 +0,0 @@ -/** plugin builder for requirejs optimization - */ - -define(function() { - - var fs = require.nodeRequire('fs'); - - function loadfile (url, callback) { - var file = fs.readFileSync(url, 'utf8'); - //Remove BOM (Byte Mark Order) from utf8 files if it is there. - if (file.indexOf('\uFEFF') === 0) { - file = file.substring(1); - } - callback(file); - }; - - function strip (content) { - return content.replace(/[\r\n]+/g," ").replace(/[\t]/g," "); - } - - var buildMap = {}; - var writeonce = false; - - var loader = - { - load: function (name, require, load, config) { - //console.log('css-build: load: '+name); - load(true); - loadfile(config.baseUrl+name,function(F){ - buildMap[name]=strip(F); - }); - }, - - write: function (pluginName, moduleName, write, config) { - - if( !writeonce) - { - writeonce=true; - write( - "define('"+pluginName+"-embed', function()\n{\n"+ - "\tfunction embed_css(content)\n"+ - "\t{\n"+ - "\t\tvar head = document.getElementsByTagName('head')[0],\n"+ - "\t\tstyle = document.createElement('style'),\n"+ - "\t\trules = document.createTextNode(content);\n"+ - "\t\tstyle.type = 'text/css';\n"+ - "\t\tif(style.styleSheet)\n"+ - "\t\t\tstyle.styleSheet.cssText = rules.nodeValue;\n"+ - "\t\telse style.appendChild(rules);\n"+ - "\t\t\thead.appendChild(style);\n"+ - "\t}\n"+ - "\treturn embed_css;\n"+ - "});\n" - ); - } - - write( - "define('"+pluginName+'!'+moduleName+"', ['"+pluginName+"-embed'], \n"+ - "function(embed)\n{\n"+ - "\tembed(\n\t'"+buildMap[moduleName].replace(/'/g, "\\'")+"'\n\t);\n"+ - "\treturn true;\n"+ - "});\n" - ); - }, - - writeFile: function (pluginName, moduleName, write) - { - //console.log('css-build: writeFile'); - }, - - onLayerEnd: function (write, data) - { - //console.log('css-build: onLayerEnd'); - } - }; - - return loader; -}); diff --git a/public/vendor/require/css.js b/public/vendor/require/css.js deleted file mode 100644 index f23330d08a4..00000000000 --- a/public/vendor/require/css.js +++ /dev/null @@ -1,23 +0,0 @@ -/** `css` is a requirejs plugin - that loads a css file and inject it into a page. - note that this loader will return immediately, - regardless of whether the browser had finished parsing the stylesheet. - this css loader is implemented for file optimization and depedency managment - */ - -define({ - load: function (name, require, load, config) { - function inject(filename) - { - var head = document.getElementsByTagName('head')[0]; - var link = document.createElement('link'); - link.href = filename; - link.rel = 'stylesheet'; - link.type = 'text/css'; - head.appendChild(link); - } - inject(requirejs.toUrl(name)); - load(true); - }, - pluginBuilder: '../vendor/require/css-build' -}); diff --git a/public/vendor/require/tmpl.js b/public/vendor/require/tmpl.js deleted file mode 100644 index c5bce803fe6..00000000000 --- a/public/vendor/require/tmpl.js +++ /dev/null @@ -1,17 +0,0 @@ -/*jshint unused:false */ -define(['module'], function (module) { - 'use strict'; - - var masterConfig = (module.config && module.config()) || {}; - - return { - load: function (name, require, onLoad, config) { - var url = require.toUrl(name); - require(['text!'+name], function (text) { - masterConfig.registerTemplate && masterConfig.registerTemplate(url, text); - onLoad(text); - }); - } - }; - -}); \ No newline at end of file diff --git a/public/vendor/requirejs-text/.bower.json b/public/vendor/requirejs-text/.bower.json new file mode 100644 index 00000000000..f433899afe3 --- /dev/null +++ b/public/vendor/requirejs-text/.bower.json @@ -0,0 +1,16 @@ +{ + "name": "text", + "version": "2.0.14", + "main": "text.js", + "homepage": "https://github.com/requirejs/text", + "_release": "2.0.14", + "_resolution": { + "type": "version", + "tag": "2.0.14", + "commit": "195a482d24f1d515979ab26f29e968e99c4ab63c" + }, + "_source": "git://github.com/requirejs/text.git", + "_target": "~2.0.14", + "_originalSource": "requirejs-text", + "_direct": true +} \ No newline at end of file diff --git a/public/vendor/requirejs-text/LICENSE b/public/vendor/requirejs-text/LICENSE new file mode 100644 index 00000000000..d3b4181d59d --- /dev/null +++ b/public/vendor/requirejs-text/LICENSE @@ -0,0 +1,58 @@ +RequireJS is released under two licenses: new BSD, and MIT. You may pick the +license that best suits your development needs. The text of both licenses are +provided below. + + +The "New" BSD License: +---------------------- + +Copyright (c) 2010-2014, The Dojo Foundation +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the Dojo Foundation nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +MIT License +----------- + +Copyright (c) 2010-2014, The Dojo Foundation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/public/vendor/requirejs-text/README.md b/public/vendor/requirejs-text/README.md new file mode 100644 index 00000000000..0ee79beac23 --- /dev/null +++ b/public/vendor/requirejs-text/README.md @@ -0,0 +1,198 @@ +# text + +A [RequireJS](http://requirejs.org)/AMD loader plugin for loading text +resources. + +Known to work in RequireJS, but should work in other AMD loaders that support +the same loader plugin API. + +## Docs + +See the [RequireJS API text section](http://requirejs.org/docs/api.html#text). + +## Latest release + +The latest release is always available from [the "latest" tag](https://raw.github.com/requirejs/text/latest/text.js). + +It can also be installed using [volo](https://github.com/volojs/volo): + + volo add requirejs/text + +## Usage + +It is nice to build HTML using regular HTML tags, instead of building up DOM +structures in script. However, there is no good way to embed HTML in a +JavaScript file. The best that can be done is using a string of HTML, but that +can be hard to manage, particularly for multi-line HTML. + +The text.js AMD loader plugin can help with this issue. It will automatically be +loaded if the text! prefix is used for a dependency. Download the plugin and put +it in the app's [baseUrl](http://requirejs.org/docs/api.html#config-baseUrl) +directory (or use the [paths config](http://requirejs.org/docs/api.html#config-paths) to place it in other areas). + +You can specify a text file resource as a dependency like so: + +```javascript +require(["some/module", "text!some/module.html", "text!some/module.css"], + function(module, html, css) { + //the html variable will be the text + //of the some/module.html file + //the css variable will be the text + //of the some/module.css file. + } +); +``` + +Notice the .html and .css suffixes to specify the extension of the file. The +"some/module" part of the path will be resolved according to normal module name +resolution: it will use the **baseUrl** and **paths** [configuration +options](http://requirejs.org/docs/api.html#config) to map that name to a path. + +For HTML/XML/SVG files, there is another option. You can pass !strip, which +strips XML declarations so that external SVG and XML documents can be added to a +document without worry. Also, if the string is an HTML document, only the part +inside the body tag is returned. Example: + +```javascript +require(["text!some/module.html!strip"], + function(html) { + //the html variable will be the text of the + //some/module.html file, but only the part + //inside the body tag. + } +); +``` + +The text files are loaded via asynchronous XMLHttpRequest (XHR) calls, so you +can only fetch files from the same domain as the web page (see **XHR +restrictions** below). + +However, [the RequireJS optimizer](http://requirejs.org/docs/optimization.html) +will inline any text! references with the actual text file contents into the +modules, so after a build, the modules that have text! dependencies can be used +from other domains. + +## Configuration + +### XHR restrictions + +The text plugin works by using XMLHttpRequest (XHR) to fetch the text for the +resources it handles. + +However, XHR calls have some restrictions, due to browser/web security policies: + +1) Many browsers do not allow file:// access to just any file. You are better +off serving the application from a local web server than using local file:// +URLs. You will likely run into trouble otherwise. + +2) There are restrictions for using XHR to access files on another web domain. +While CORS can help enable the server for cross-domain access, doing so must +be done with care (in particular if you also host an API from that domain), +and not all browsers support CORS. + +So if the text plugin determines that the request for the resource is on another +domain, it will try to access a ".js" version of the resource by using a +script tag. Script tag GET requests are allowed across domains. The .js version +of the resource should just be a script with a define() call in it that returns +a string for the module value. + +Example: if the resource is 'text!example.html' and that resolves to a path +on another web domain, the text plugin will do a script tag load for +'example.html.js'. + +The [requirejs optimizer](http://requirejs.org/docs/optimization.html) will +generate these '.js' versions of the text resources if you set this in the +build profile: + + optimizeAllPluginResources: true + +In some cases, you may want the text plugin to not try the .js resource, maybe +because you have configured CORS on the other server, and you know that only +browsers that support CORS will be used. In that case you can use the +[module config](http://requirejs.org/docs/api.html#config-moduleconfig) +(requires RequireJS 2+) to override some of the basic logic the plugin uses to +determine if the .js file should be requested: + +```javascript +requirejs.config({ + config: { + text: { + useXhr: function (url, protocol, hostname, port) { + //Override function for determining if XHR should be used. + //url: the URL being requested + //protocol: protocol of page text.js is running on + //hostname: hostname of page text.js is running on + //port: port of page text.js is running on + //Use protocol, hostname, and port to compare against the url + //being requested. + //Return true or false. true means "use xhr", false means + //"fetch the .js version of this resource". + } + } + } +}); +``` + +### Custom XHR hooks + +There may be cases where you might want to provide the XHR object to use +in the request, or you may just want to add some custom headers to the +XHR object used to make the request. You can use the following hooks: + +```javascript +requirejs.config({ + config: { + text: { + onXhr: function (xhr, url) { + //Called after the XHR has been created and after the + //xhr.open() call, but before the xhr.send() call. + //Useful time to set headers. + //xhr: the xhr object + //url: the url that is being used with the xhr object. + }, + createXhr: function () { + //Overrides the creation of the XHR object. Return an XHR + //object from this function. + //Available in text.js 2.0.1 or later. + }, + onXhrComplete: function (xhr, url) { + //Called whenever an XHR has completed its work. Useful + //if browser-specific xhr cleanup needs to be done. + } + } + } +}); +``` + +### Forcing the environment implemention + +The text plugin tries to detect what environment it is available for loading +text resources, Node, XMLHttpRequest (XHR) or Rhino, but sometimes the +Node or Rhino environment may have loaded a library that introduces an XHR +implementation. You can force the environment implementation to use by passing +an "env" module config to the plugin: + +```javascript +requirejs.config({ + config: { + text: { + //Valid values are 'node', 'xhr', or 'rhino' + env: 'rhino' + } + } +}); +``` + +## License + +Dual-licensed -- new BSD or MIT. + +## Where are the tests? + +They are in the [requirejs](https://github.com/jrburke/requirejs) and +[r.js](https://github.com/jrburke/r.js) repos. + +## History + +This plugin was in the [requirejs repo](https://github.com/jrburke/requirejs) +up until the requirejs 2.0 release. diff --git a/public/vendor/requirejs-text/bower.json b/public/vendor/requirejs-text/bower.json new file mode 100644 index 00000000000..5c9772a5f95 --- /dev/null +++ b/public/vendor/requirejs-text/bower.json @@ -0,0 +1,5 @@ +{ + "name": "text", + "version": "2.0.14", + "main": "text.js" +} \ No newline at end of file diff --git a/public/vendor/requirejs-text/package.json b/public/vendor/requirejs-text/package.json new file mode 100644 index 00000000000..ad54dd3a892 --- /dev/null +++ b/public/vendor/requirejs-text/package.json @@ -0,0 +1,30 @@ +{ + "name": "text", + "version": "2.0.14", + "description": "An AMD loader plugin for loading text resources.", + "categories": [ + "Loader plugins" + ], + "main": "text.js", + "github": "https://github.com/requirejs/text", + "bugs": { + "web": "https://github.com/requirejs/text/issues" + }, + "repository": { + "type": "git", + "url": "https://github.com/requirejs/text.git" + }, + "licenses": [ + { + "type": "MIT", + "url": "http://www.opensource.org/licenses/mit-license.php" + }, + { + "type": "BSD New", + "url": "http://opensource.org/licenses/BSD-3-Clause" + } + ], + "volo": { + "url": "https://raw.github.com/requirejs/text/{version}/text.js" + } +} diff --git a/public/vendor/require/text.js b/public/vendor/requirejs-text/text.js similarity index 95% rename from public/vendor/require/text.js rename to public/vendor/requirejs-text/text.js index 3c31b6f9cc8..4c311edcebe 100644 --- a/public/vendor/require/text.js +++ b/public/vendor/requirejs-text/text.js @@ -1,5 +1,5 @@ /** - * @license RequireJS text 2.0.10 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. + * @license RequireJS text 2.0.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/requirejs/text for details */ @@ -23,7 +23,7 @@ define(['module'], function (module) { masterConfig = (module.config && module.config()) || {}; text = { - version: '2.0.10', + version: '2.0.14', strip: function (content) { //Strips declarations so that external SVG and XML @@ -85,13 +85,13 @@ define(['module'], function (module) { parseName: function (name) { var modName, ext, temp, strip = false, - index = name.indexOf("."), + index = name.lastIndexOf("."), isRelative = name.indexOf('./') === 0 || name.indexOf('../') === 0; if (index !== -1 && (!isRelative || index > 1)) { modName = name.substring(0, index); - ext = name.substring(index + 1, name.length); + ext = name.substring(index + 1); } else { modName = name; } @@ -162,12 +162,12 @@ define(['module'], function (module) { // Do not bother with the work if a build and text will // not be inlined. - if (config.isBuild && !config.inlineText) { + if (config && config.isBuild && !config.inlineText) { onLoad(); return; } - masterConfig.isBuild = config.isBuild; + masterConfig.isBuild = config && config.isBuild; var parsed = text.parseName(name), nonStripName = parsed.moduleName + @@ -244,7 +244,8 @@ define(['module'], function (module) { typeof process !== "undefined" && process.versions && !!process.versions.node && - !process.versions['node-webkit'])) { + !process.versions['node-webkit'] && + !process.versions['atom-shell'])) { //Using special require.nodeRequire, something added by r.js. fs = require.nodeRequire('fs'); @@ -252,12 +253,14 @@ define(['module'], function (module) { try { var file = fs.readFileSync(url, 'utf8'); //Remove BOM (Byte Mark Order) from utf8 files if it is there. - if (file.indexOf('\uFEFF') === 0) { + if (file[0] === '\uFEFF') { file = file.substring(1); } callback(file); } catch (e) { - errback(e); + if (errback) { + errback(e); + } } }; } else if (masterConfig.env === 'xhr' || (!masterConfig.env && @@ -285,12 +288,14 @@ define(['module'], function (module) { //Do not explicitly handle errors, those should be //visible via console output in the browser. if (xhr.readyState === 4) { - status = xhr.status; + status = xhr.status || 0; if (status > 399 && status < 600) { //An http 4xx or 5xx error. Signal an error. err = new Error(url + ' HTTP status: ' + status); err.xhr = xhr; - errback(err); + if (errback) { + errback(err); + } } else { callback(xhr.responseText); } @@ -347,7 +352,7 @@ define(['module'], function (module) { typeof Components !== 'undefined' && Components.classes && Components.interfaces)) { //Avert your gaze! - Cc = Components.classes, + Cc = Components.classes; Ci = Components.interfaces; Components.utils['import']('resource://gre/modules/FileUtils.jsm'); xpcIsWindows = ('@mozilla.org/windows-registry-key;1' in Cc); @@ -383,4 +388,4 @@ define(['module'], function (module) { }; } return text; -}); \ No newline at end of file +}); diff --git a/public/vendor/requirejs/.bower.json b/public/vendor/requirejs/.bower.json new file mode 100644 index 00000000000..5a363a0e40a --- /dev/null +++ b/public/vendor/requirejs/.bower.json @@ -0,0 +1,27 @@ +{ + "name": "requirejs", + "version": "2.1.18", + "homepage": "http://requirejs.org", + "authors": [ + "jrburke.com" + ], + "description": "A file and module loader for JavaScript", + "main": "require.js", + "keywords": [ + "AMD" + ], + "license": [ + "BSD-3-Clause", + "MIT" + ], + "_release": "2.1.18", + "_resolution": { + "type": "version", + "tag": "2.1.18", + "commit": "833b2db37b0899f7f2c8b6ada741f49c3a7bfbe9" + }, + "_source": "git://github.com/jrburke/requirejs-bower.git", + "_target": "~2.1.18", + "_originalSource": "requirejs", + "_direct": true +} \ No newline at end of file diff --git a/public/vendor/requirejs/README.md b/public/vendor/requirejs/README.md new file mode 100644 index 00000000000..1fe6a9c14ff --- /dev/null +++ b/public/vendor/requirejs/README.md @@ -0,0 +1,4 @@ +# requirejs-bower + +Bower packaging for [RequireJS](http://requirejs.org). + diff --git a/public/vendor/requirejs/bower.json b/public/vendor/requirejs/bower.json new file mode 100644 index 00000000000..d6cbb03644d --- /dev/null +++ b/public/vendor/requirejs/bower.json @@ -0,0 +1,17 @@ +{ + "name": "requirejs", + "version": "2.1.18", + "homepage": "http://requirejs.org", + "authors": [ + "jrburke.com" + ], + "description": "A file and module loader for JavaScript", + "main": "require.js", + "keywords": [ + "AMD" + ], + "license": [ + "BSD-3-Clause", + "MIT" + ] +} diff --git a/public/vendor/require/require.js b/public/vendor/requirejs/require.js similarity index 79% rename from public/vendor/require/require.js rename to public/vendor/requirejs/require.js index fabdfe5cf7d..36280477eed 100644 --- a/public/vendor/require/require.js +++ b/public/vendor/requirejs/require.js @@ -1,6 +1,5 @@ -/* jshint indent:4, maxlen: false */ /** vim: et:ts=4:sw=4:sts=4 - * @license RequireJS 2.1.8 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. + * @license RequireJS 2.1.18 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/jrburke/requirejs for details */ @@ -10,10 +9,10 @@ /*global window, navigator, document, importScripts, setTimeout, opera */ var requirejs, require, define; -(function(global) { +(function (global) { var req, s, head, baseElement, dataMain, src, - interactiveScript, currentlyAddingScript, mainScript, subPath, - version = '2.1.8', + interactiveScript, currentlyAddingScript, mainScript, subPath, + version = '2.1.18', commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, jsSuffixRegExp = /\.js$/, @@ -23,13 +22,14 @@ var requirejs, require, define; hasOwn = op.hasOwnProperty, ap = Array.prototype, apsp = ap.splice, - isBrowser = !! (typeof window !== 'undefined' && navigator && window.document), + isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.document), isWebWorker = !isBrowser && typeof importScripts !== 'undefined', //PS3 indicates loaded and complete, but need to wait for complete //specifically. Sequence is 'loading', 'loaded', execution, // then 'complete'. The UA check is unfortunate, but not sure how //to feature test w/o causing perf issues. - readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ? /^complete$/ : /^(complete|loaded)$/, + readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ? + /^complete$/ : /^(complete|loaded)$/, defContextName = '_', //Oh the tragedy, detecting opera. See the usage of isOpera for reason. isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]', @@ -106,9 +106,12 @@ var requirejs, require, define; */ function mixin(target, source, force, deepStringMixin) { if (source) { - eachProp(source, function(value, prop) { + eachProp(source, function (value, prop) { if (force || !hasProp(target, prop)) { - if (deepStringMixin && typeof value !== 'string') { + if (deepStringMixin && typeof value === 'object' && value && + !isArray(value) && !isFunction(value) && + !(value instanceof RegExp)) { + if (!target[prop]) { target[prop] = {}; } @@ -125,7 +128,7 @@ var requirejs, require, define; //Similar to Function.prototype.bind, but the 'this' object is specified //first, since it is easier to read/figure out what 'this' will be. function bind(obj, fn) { - return function() { + return function () { return fn.apply(obj, arguments); }; } @@ -138,14 +141,14 @@ var requirejs, require, define; throw err; } - //Allow getting a global that expressed in + //Allow getting a global that is expressed in //dot notation, like 'a.b.c'. function getGlobal(value) { if (!value) { return value; } var g = global; - each(value.split('.'), function(part) { + each(value.split('.'), function (part) { g = g[part]; }); return g; @@ -177,7 +180,7 @@ var requirejs, require, define; if (typeof requirejs !== 'undefined') { if (isFunction(requirejs)) { - //Do not overwrite and existing requirejs instance. + //Do not overwrite an existing requirejs instance. return; } cfg = requirejs; @@ -193,27 +196,29 @@ var requirejs, require, define; function newContext(contextName) { var inCheckLoaded, Module, context, handlers, - checkLoadedTimeoutId, - config = { - //Defaults. Do not set a default for map - //config to speed up normalize(), which - //will run faster if there is no default. - waitSeconds: 7, - baseUrl: './', - paths: {}, - pkgs: {}, - shim: {}, - config: {} - }, - registry = {}, - //registry of just enabled modules, to speed - //cycle breaking code when lots of modules - //are registered, but not activated. - enabledRegistry = {}, - undefEvents = {}, - defQueue = [], + checkLoadedTimeoutId, + config = { + //Defaults. Do not set a default for map + //config to speed up normalize(), which + //will run faster if there is no default. + waitSeconds: 7, + baseUrl: './', + paths: {}, + bundles: {}, + pkgs: {}, + shim: {}, + config: {} + }, + registry = {}, + //registry of just enabled modules, to speed + //cycle breaking code when lots of modules + //are registered, but not activated. + enabledRegistry = {}, + undefEvents = {}, + defQueue = [], defined = {}, urlFetched = {}, + bundlesMap = {}, requireCounter = 1, unnormalizedCounter = 1; @@ -228,20 +233,19 @@ var requirejs, require, define; */ function trimDots(ary) { var i, part; - for (i = 0; ary[i]; i += 1) { + for (i = 0; i < ary.length; i++) { part = ary[i]; if (part === '.') { ary.splice(i, 1); i -= 1; } else if (part === '..') { - if (i === 1 && (ary[2] === '..' || ary[0] === '..')) { - //End of the line. Keep at least one non-dot - //path segment at the front so it can be mapped - //correctly to disk. Otherwise, there is likely - //no path mapping for a path starting with '..'. - //This can still fail, but catches the most reasonable - //uses of .. - break; + // If at the start, or previous value is still .., + // keep them so that when converted to a path it may + // still work when converted to a path, even though + // as an ID it is less than ideal. In larger point + // releases, may be better to just kick out an error. + if (i === 0 || (i === 1 && ary[2] === '..') || ary[i - 1] === '..') { + continue; } else if (i > 0) { ary.splice(i - 1, 2); i -= 2; @@ -261,54 +265,45 @@ var requirejs, require, define; * @returns {String} normalized name */ function normalize(name, baseName, applyMap) { - var pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment, - foundMap, foundI, foundStarMap, starI, - baseParts = baseName && baseName.split('/'), - normalizedBaseParts = baseParts, + var pkgMain, mapValue, nameParts, i, j, nameSegment, lastIndex, + foundMap, foundI, foundStarMap, starI, normalizedBaseParts, + baseParts = (baseName && baseName.split('/')), map = config.map, starMap = map && map['*']; //Adjust any relative paths. - if (name && name.charAt(0) === '.') { - //If have a base name, try to normalize against it, - //otherwise, assume it is a top-level require that will - //be relative to baseUrl in the end. - if (baseName) { - if (getOwn(config.pkgs, baseName)) { - //If the baseName is a package name, then just treat it as one - //name to concat the name with. - normalizedBaseParts = baseParts = [baseName]; - } else { - //Convert baseName to array, and lop off the last part, - //so that . matches that 'directory' and not name of the baseName's - //module. For instance, baseName of 'one/two/three', maps to - //'one/two/three.js', but we want the directory, 'one/two' for - //this normalization. - normalizedBaseParts = baseParts.slice(0, baseParts.length - 1); - } + if (name) { + name = name.split('/'); + lastIndex = name.length - 1; - name = normalizedBaseParts.concat(name.split('/')); - trimDots(name); - - //Some use of packages may use a . path to reference the - //'main' module name, so normalize for that. - pkgConfig = getOwn(config.pkgs, (pkgName = name[0])); - name = name.join('/'); - if (pkgConfig && name === pkgName + '/' + pkgConfig.main) { - name = pkgName; - } - } else if (name.indexOf('./') === 0) { - // No baseName, so this is ID is resolved relative - // to baseUrl, pull off the leading dot. - name = name.substring(2); + // If wanting node ID compatibility, strip .js from end + // of IDs. Have to do this here, and not in nameToUrl + // because node allows either .js or non .js to map + // to same file. + if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) { + name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, ''); } + + // Starts with a '.' so need the baseName + if (name[0].charAt(0) === '.' && baseParts) { + //Convert baseName to array, and lop off the last part, + //so that . matches that 'directory' and not name of the baseName's + //module. For instance, baseName of 'one/two/three', maps to + //'one/two/three.js', but we want the directory, 'one/two' for + //this normalization. + normalizedBaseParts = baseParts.slice(0, baseParts.length - 1); + name = normalizedBaseParts.concat(name); + } + + trimDots(name); + name = name.join('/'); } //Apply map config if available. if (applyMap && map && (baseParts || starMap)) { nameParts = name.split('/'); - for (i = nameParts.length; i > 0; i -= 1) { + outerLoop: for (i = nameParts.length; i > 0; i -= 1) { nameSegment = nameParts.slice(0, i).join('/'); if (baseParts) { @@ -325,16 +320,12 @@ var requirejs, require, define; //Match, update name to the new value. foundMap = mapValue; foundI = i; - break; + break outerLoop; } } } } - if (foundMap) { - break; - } - //Check for a star map match, but just hold on to it, //if there is a shorter segment match later in a matching //config, then favor over this star map. @@ -355,13 +346,18 @@ var requirejs, require, define; } } - return name; + // If the name points to a package's name, use + // the package main instead. + pkgMain = getOwn(config.pkgs, name); + + return pkgMain ? pkgMain : name; } function removeScript(name) { if (isBrowser) { - each(scripts(), function(scriptNode) { - if (scriptNode.getAttribute('data-requiremodule') === name && scriptNode.getAttribute('data-requirecontext') === context.contextName) { + each(scripts(), function (scriptNode) { + if (scriptNode.getAttribute('data-requiremodule') === name && + scriptNode.getAttribute('data-requirecontext') === context.contextName) { scriptNode.parentNode.removeChild(scriptNode); return true; } @@ -372,12 +368,17 @@ var requirejs, require, define; function hasPathFallback(id) { var pathConfig = getOwn(config.paths, id); if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) { - removeScript(id); //Pop off the first array value, since it failed, and //retry pathConfig.shift(); context.require.undef(id); - context.require([id]); + + //Custom require that does not do map translation, since + //ID is "absolute", already mapped/resolved. + context.makeRequire(null, { + skipMap: true + })([id]); + return true; } } @@ -387,7 +388,7 @@ var requirejs, require, define; //did not have a plugin prefix. function splitPrefix(name) { var prefix, - index = name ? name.indexOf('!') : -1; + index = name ? name.indexOf('!') : -1; if (index > -1) { prefix = name.substring(0, index); name = name.substring(index + 1, name.length); @@ -412,7 +413,7 @@ var requirejs, require, define; */ function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) { var url, pluginModule, suffix, nameParts, - prefix = null, + prefix = null, parentName = parentModuleMap ? parentModuleMap.name : null, originalName = name, isDefine = true, @@ -439,11 +440,20 @@ var requirejs, require, define; if (prefix) { if (pluginModule && pluginModule.normalize) { //Plugin is loaded, use its normalize method. - normalizedName = pluginModule.normalize(name, function(name) { + normalizedName = pluginModule.normalize(name, function (name) { return normalize(name, parentName, applyMap); }); } else { - normalizedName = normalize(name, parentName, applyMap); + // If nested plugin references, then do not try to + // normalize, as it will not normalize correctly. This + // places a restriction on resourceIds, and the longer + // term solution is not to normalize until plugins are + // loaded and all normalizations to allow for async + // loading of a loader plugin. But for now, fixes the + // common uses. Details in #1131 + normalizedName = name.indexOf('!') === -1 ? + normalize(name, parentName, applyMap) : + name; } } else { //A regular module. @@ -464,17 +474,21 @@ var requirejs, require, define; //If the id is a plugin id that cannot be determined if it needs //normalization, stamp it with a unique ID so two matching relative //ids that may conflict can be separate. - suffix = prefix && !pluginModule && !isNormalized ? '_unnormalized' + (unnormalizedCounter += 1) : ''; + suffix = prefix && !pluginModule && !isNormalized ? + '_unnormalized' + (unnormalizedCounter += 1) : + ''; return { prefix: prefix, name: normalizedName, parentMap: parentModuleMap, - unnormalized: !! suffix, + unnormalized: !!suffix, url: url, originalName: originalName, isDefine: isDefine, - id: (prefix ? prefix + '!' + normalizedName : normalizedName) + suffix + id: (prefix ? + prefix + '!' + normalizedName : + normalizedName) + suffix }; } @@ -493,7 +507,8 @@ var requirejs, require, define; var id = depMap.id, mod = getOwn(registry, id); - if (hasProp(defined, id) && (!mod || mod.defineEmitComplete)) { + if (hasProp(defined, id) && + (!mod || mod.defineEmitComplete)) { if (name === 'defined') { fn(defined[id]); } @@ -514,7 +529,7 @@ var requirejs, require, define; if (errback) { errback(err); } else { - each(ids, function(id) { + each(ids, function (id) { var mod = getOwn(registry, id); if (mod) { //Set error on module, so it skips timeout checks. @@ -542,45 +557,41 @@ var requirejs, require, define; //Array splice in the values since the context code has a //local var ref to defQueue, so cannot just reassign the one //on context. - apsp.apply(defQueue, [defQueue.length - 1, 0].concat(globalDefQueue)); + apsp.apply(defQueue, + [defQueue.length, 0].concat(globalDefQueue)); globalDefQueue = []; } } handlers = { - 'require': function(mod) { + 'require': function (mod) { if (mod.require) { return mod.require; } else { return (mod.require = context.makeRequire(mod.map)); } }, - 'exports': function(mod) { + 'exports': function (mod) { mod.usingExports = true; if (mod.map.isDefine) { if (mod.exports) { - return mod.exports; + return (defined[mod.map.id] = mod.exports); } else { return (mod.exports = defined[mod.map.id] = {}); } } }, - 'module': function(mod) { + 'module': function (mod) { if (mod.module) { return mod.module; } else { return (mod.module = { id: mod.map.id, uri: mod.map.url, - config: function() { - var c, - pkg = getOwn(config.pkgs, mod.map.id); - // For packages, only support config targeted - // at the main module. - c = pkg ? getOwn(config.config, mod.map.id + '/' + pkg.main) : getOwn(config.config, mod.map.id); - return c || {}; + config: function () { + return getOwn(config.config, mod.map.id) || {}; }, - exports: defined[mod.map.id] + exports: mod.exports || (mod.exports = {}) }); } } @@ -599,7 +610,7 @@ var requirejs, require, define; mod.emit('error', mod.error); } else { traced[id] = true; - each(mod.depMaps, function(depMap, i) { + each(mod.depMaps, function (depMap, i) { var depId = depMap.id, dep = getOwn(registry, depId); @@ -621,8 +632,8 @@ var requirejs, require, define; } function checkLoaded() { - var map, modId, err, usingPathFallback, - waitInterval = config.waitSeconds * 1000, + var err, usingPathFallback, + waitInterval = config.waitSeconds * 1000, //It is possible to disable the wait interval by using waitSeconds of 0. expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(), noLoads = [], @@ -638,9 +649,9 @@ var requirejs, require, define; inCheckLoaded = true; //Figure out the state of all the modules. - eachProp(enabledRegistry, function(mod) { - map = mod.map; - modId = map.id; + eachProp(enabledRegistry, function (mod) { + var map = mod.map, + modId = map.id; //Skip things that are not enabled or in error state. if (!mod.enabled) { @@ -685,7 +696,7 @@ var requirejs, require, define; //Not expired, check for a cycle. if (needCycleCheck) { - each(reqCalls, function(mod) { + each(reqCalls, function (mod) { breakCycle(mod, {}, {}); }); } @@ -697,7 +708,7 @@ var requirejs, require, define; //Something is still waiting to load. Wait for it, but only //if a timeout is not already in effect. if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) { - checkLoadedTimeoutId = setTimeout(function() { + checkLoadedTimeoutId = setTimeout(function () { checkLoadedTimeoutId = 0; checkLoaded(); }, 50); @@ -707,7 +718,7 @@ var requirejs, require, define; inCheckLoaded = false; } - Module = function(map) { + Module = function (map) { this.events = getOwn(undefEvents, map.id) || {}; this.map = map; this.shim = getOwn(config.shim, map.id); @@ -724,7 +735,7 @@ var requirejs, require, define; }; Module.prototype = { - init: function(depMaps, factory, errback, options) { + init: function (depMaps, factory, errback, options) { options = options || {}; //Do not do more inits if already done. Can happen if there @@ -742,7 +753,7 @@ var requirejs, require, define; } else if (this.events.error) { //If no errback already, but there are error listeners //on this module, set up an errback to pass to the deps. - errback = bind(this, function(err) { + errback = bind(this, function (err) { this.emit('error', err); }); } @@ -774,7 +785,7 @@ var requirejs, require, define; } }, - defineDep: function(i, depExports) { + defineDep: function (i, depExports) { //Because of cycles, defined callback for a given //export can be called more than once. if (!this.depMatched[i]) { @@ -784,7 +795,7 @@ var requirejs, require, define; } }, - fetch: function() { + fetch: function () { if (this.fetched) { return; } @@ -799,7 +810,7 @@ var requirejs, require, define; if (this.shim) { context.makeRequire(this.map, { enableBuildCallback: true - })(this.shim.deps || [], bind(this, function() { + })(this.shim.deps || [], bind(this, function () { return map.prefix ? this.callPlugin() : this.load(); })); } else { @@ -808,7 +819,7 @@ var requirejs, require, define; } }, - load: function() { + load: function () { var url = this.map.url; //Regular dependency. @@ -822,13 +833,13 @@ var requirejs, require, define; * Checks if the module is ready to define itself, and if so, * define it. */ - check: function() { + check: function () { if (!this.enabled || this.enabling) { return; } var err, cjsModule, - id = this.map.id, + id = this.map.id, depExports = this.depExports, exports = this.exports, factory = this.factory; @@ -852,7 +863,8 @@ var requirejs, require, define; //errbacks should not be called for failures in //their callbacks (#699). However if a global //onError is set, use that. - if ((this.events.error && this.map.isDefine) || req.onError !== defaultOnError) { + if ((this.events.error && this.map.isDefine) || + req.onError !== defaultOnError) { try { exports = context.execCb(id, factory, depExports, exports); } catch (e) { @@ -862,16 +874,14 @@ var requirejs, require, define; exports = context.execCb(id, factory, depExports, exports); } - if (this.map.isDefine) { - //If setting exports via 'module' is in play, - //favor that over return value and exports. After that, - //favor a non-undefined return value over exports use. + // Favor return value over exports. If node/cjs in play, + // then will not have a return value anyway. Favor + // module.exports assignment over exports object. + if (this.map.isDefine && exports === undefined) { cjsModule = this.module; - if (cjsModule && cjsModule.exports !== undefined && - //Make sure it is not already the exports value - cjsModule.exports !== this.exports) { + if (cjsModule) { exports = cjsModule.exports; - } else if (exports === undefined && this.usingExports) { + } else if (this.usingExports) { //exports already set the defined value. exports = this.exports; } @@ -919,7 +929,7 @@ var requirejs, require, define; } }, - callPlugin: function() { + callPlugin: function () { var map = this.map, id = map.id, //Map already normalized the prefix. @@ -929,9 +939,10 @@ var requirejs, require, define; //can be traced for cycles. this.depMaps.push(pluginMap); - on(pluginMap, 'defined', bind(this, function(plugin) { + on(pluginMap, 'defined', bind(this, function (plugin) { var load, normalizedMap, normalizedMod, - name = this.map.name, + bundleId = getOwn(bundlesMap, this.map.id), + name = this.map.name, parentName = this.map.parentMap ? this.map.parentMap.name : null, localRequire = context.makeRequire(map.parentMap, { enableBuildCallback: true @@ -942,7 +953,7 @@ var requirejs, require, define; if (this.map.unnormalized) { //Normalize the ID if the plugin allows it. if (plugin.normalize) { - name = plugin.normalize(name, function(name) { + name = plugin.normalize(name, function (name) { return normalize(name, parentName, true); }) || ''; } @@ -950,15 +961,14 @@ var requirejs, require, define; //prefix and name should already be normalized, no need //for applying map config again either. normalizedMap = makeModuleMap(map.prefix + '!' + name, - this.map.parentMap); - on(normalizedMap, 'defined', bind(this, function(value) { - this.init([], function() { - return value; - }, null, { - enabled: true, - ignore: true - }); - })); + this.map.parentMap); + on(normalizedMap, + 'defined', bind(this, function (value) { + this.init([], function () { return value; }, null, { + enabled: true, + ignore: true + }); + })); normalizedMod = getOwn(registry, normalizedMap.id); if (normalizedMod) { @@ -967,7 +977,7 @@ var requirejs, require, define; this.depMaps.push(normalizedMap); if (this.events.error) { - normalizedMod.on('error', bind(this, function(err) { + normalizedMod.on('error', bind(this, function (err) { this.emit('error', err); })); } @@ -977,22 +987,28 @@ var requirejs, require, define; return; } - load = bind(this, function(value) { - this.init([], function() { - return value; - }, null, { + //If a paths config, then just load that file instead to + //resolve the plugin, as it is built into that paths layer. + if (bundleId) { + this.map.url = context.nameToUrl(bundleId); + this.load(); + return; + } + + load = bind(this, function (value) { + this.init([], function () { return value; }, null, { enabled: true }); }); - load.error = bind(this, function(err) { + load.error = bind(this, function (err) { this.inited = true; this.error = err; err.requireModules = [id]; //Remove temp unnormalized modules for this module, //since they will never be resolved otherwise now. - eachProp(registry, function(mod) { + eachProp(registry, function (mod) { if (mod.map.id.indexOf(id + '_unnormalized') === 0) { cleanRegistry(mod.map.id); } @@ -1003,7 +1019,7 @@ var requirejs, require, define; //Allow plugins to load other code without having to know the //context or how to 'complete' the load. - load.fromText = bind(this, function(text, textAlt) { + load.fromText = bind(this, function (text, textAlt) { /*jslint evil: true */ var moduleName = map.name, moduleMap = makeModuleMap(moduleName), @@ -1035,8 +1051,11 @@ var requirejs, require, define; try { req.exec(text); } catch (e) { - return onError(makeError('fromtexteval', 'fromText eval for ' + id + ' failed: ' + e, - e, [id])); + return onError(makeError('fromtexteval', + 'fromText eval for ' + id + + ' failed: ' + e, + e, + [id])); } if (hasInteractive) { @@ -1065,7 +1084,7 @@ var requirejs, require, define; this.pluginMaps[pluginMap.id] = pluginMap; }, - enable: function() { + enable: function () { enabledRegistry[this.map.id] = this; this.enabled = true; @@ -1076,14 +1095,16 @@ var requirejs, require, define; this.enabling = true; //Enable each dependency - each(this.depMaps, bind(this, function(depMap, i) { + each(this.depMaps, bind(this, function (depMap, i) { var id, mod, handler; if (typeof depMap === 'string') { //Dependency needs to be converted to a depMap //and wired up to this module. - depMap = makeModuleMap(depMap, (this.map.isDefine ? this.map : this.map.parentMap), - false, !this.skipMap); + depMap = makeModuleMap(depMap, + (this.map.isDefine ? this.map : this.map.parentMap), + false, + !this.skipMap); this.depMaps[i] = depMap; handler = getOwn(handlers, depMap.id); @@ -1095,13 +1116,23 @@ var requirejs, require, define; this.depCount += 1; - on(depMap, 'defined', bind(this, function(depExports) { + on(depMap, 'defined', bind(this, function (depExports) { + if (this.undefed) { + return; + } this.defineDep(i, depExports); this.check(); })); if (this.errback) { on(depMap, 'error', bind(this, this.errback)); + } else if (this.events.error) { + // No direct errback on this module, but something + // else is listening for errors, so be sure to + // propagate the error correctly. + on(depMap, 'error', bind(this, function(err) { + this.emit('error', err); + })); } } @@ -1118,7 +1149,7 @@ var requirejs, require, define; //Enable each plugin that is used in //a dependency - eachProp(this.pluginMaps, bind(this, function(pluginMap) { + eachProp(this.pluginMaps, bind(this, function (pluginMap) { var mod = getOwn(registry, pluginMap.id); if (mod && !mod.enabled) { context.enable(pluginMap, this); @@ -1130,7 +1161,7 @@ var requirejs, require, define; this.check(); }, - on: function(name, cb) { + on: function (name, cb) { var cbs = this.events[name]; if (!cbs) { cbs = this.events[name] = []; @@ -1138,8 +1169,8 @@ var requirejs, require, define; cbs.push(cb); }, - emit: function(name, evt) { - each(this.events[name], function(cb) { + emit: function (name, evt) { + each(this.events[name], function (cb) { cb(evt); }); if (name === 'error') { @@ -1205,7 +1236,8 @@ var requirejs, require, define; while (defQueue.length) { args = defQueue.shift(); if (args[0] === null) { - return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1])); + return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + + args[args.length - 1])); } else { //args are id, deps, factory. Should be normalized by the //define() function. @@ -1230,7 +1262,7 @@ var requirejs, require, define; * Set a configuration for the context. * @param {Object} cfg config object to integrate. */ - configure: function(cfg) { + configure: function (cfg) { //Make sure the baseUrl ends in a slash. if (cfg.baseUrl) { if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') { @@ -1238,34 +1270,41 @@ var requirejs, require, define; } } - //Save off the paths and packages since they require special processing, + //Save off the paths since they require special processing, //they are additive. - var pkgs = config.pkgs, - shim = config.shim, + var shim = config.shim, objs = { paths: true, + bundles: true, config: true, map: true }; - eachProp(cfg, function(value, prop) { + eachProp(cfg, function (value, prop) { if (objs[prop]) { - if (prop === 'map') { - if (!config.map) { - config.map = {}; - } - mixin(config[prop], value, true, true); - } else { - mixin(config[prop], value, true); + if (!config[prop]) { + config[prop] = {}; } + mixin(config[prop], value, true, true); } else { config[prop] = value; } }); + //Reverse map the bundles + if (cfg.bundles) { + eachProp(cfg.bundles, function (value, prop) { + each(value, function (v) { + if (v !== prop) { + bundlesMap[v] = prop; + } + }); + }); + } + //Merge shim if (cfg.shim) { - eachProp(cfg.shim, function(value, id) { + eachProp(cfg.shim, function (value, id) { //Normalize the structure if (isArray(value)) { value = { @@ -1282,43 +1321,37 @@ var requirejs, require, define; //Adjust packages if necessary. if (cfg.packages) { - each(cfg.packages, function(pkgObj) { - var location; + each(cfg.packages, function (pkgObj) { + var location, name; - pkgObj = typeof pkgObj === 'string' ? { - name: pkgObj - } : pkgObj; + pkgObj = typeof pkgObj === 'string' ? {name: pkgObj} : pkgObj; + + name = pkgObj.name; location = pkgObj.location; + if (location) { + config.paths[name] = pkgObj.location; + } - //Create a brand new object on pkgs, since currentPackages can - //be passed in again, and config.pkgs is the internal transformed - //state for all package configs. - pkgs[pkgObj.name] = { - name: pkgObj.name, - location: location || pkgObj.name, - //Remove leading dot in main, so main paths are normalized, - //and remove any trailing .js, since different package - //envs have different conventions: some use a module name, - //some use a file name. - main: (pkgObj.main || 'main') - .replace(currDirRegExp, '') - .replace(jsSuffixRegExp, '') - }; + //Save pointer to main module ID for pkg name. + //Remove leading dot in main, so main paths are normalized, + //and remove any trailing .js, since different package + //envs have different conventions: some use a module name, + //some use a file name. + config.pkgs[name] = pkgObj.name + '/' + (pkgObj.main || 'main') + .replace(currDirRegExp, '') + .replace(jsSuffixRegExp, ''); }); - - //Done with modifications, assing packages back to context config - config.pkgs = pkgs; } //If there are any "waiting to execute" modules in the registry, //update the maps for them, since their info, like URLs to load, //may have changed. - eachProp(registry, function(mod, id) { + eachProp(registry, function (mod, id) { //If module already has init called, since it is too //late to modify them, and ignore unnormalized ones //since they are transient. if (!mod.inited && !mod.map.unnormalized) { - mod.map = makeModuleMap(id); + mod.map = makeModuleMap(id, null, true); } }); @@ -1330,7 +1363,7 @@ var requirejs, require, define; } }, - makeShimExports: function(value) { + makeShimExports: function (value) { function fn() { var ret; if (value.init) { @@ -1341,7 +1374,7 @@ var requirejs, require, define; return fn; }, - makeRequire: function(relMap, options) { + makeRequire: function (relMap, options) { options = options || {}; function localRequire(deps, callback, errback) { @@ -1375,7 +1408,11 @@ var requirejs, require, define; id = map.id; if (!hasProp(defined, id)) { - return onError(makeError('notloaded', 'Module name "' + id + '" has not been loaded yet for context: ' + contextName + (relMap ? '' : '. Use require([])'))); + return onError(makeError('notloaded', 'Module name "' + + id + + '" has not been loaded yet for context: ' + + contextName + + (relMap ? '' : '. Use require([])'))); } return defined[id]; } @@ -1384,7 +1421,7 @@ var requirejs, require, define; intakeDefines(); //Mark all the dependencies as needing to be loaded. - context.nextTick(function() { + context.nextTick(function () { //Some defines could have been added since the //require call, collect them. intakeDefines(); @@ -1413,9 +1450,9 @@ var requirejs, require, define; * *Requires* the use of a module name. It does not support using * plain URLs like nameToUrl. */ - toUrl: function(moduleNamePlusExt) { + toUrl: function (moduleNamePlusExt) { var ext, - index = moduleNamePlusExt.lastIndexOf('.'), + index = moduleNamePlusExt.lastIndexOf('.'), segment = moduleNamePlusExt.split('/')[0], isRelative = segment === '.' || segment === '..'; @@ -1427,14 +1464,14 @@ var requirejs, require, define; } return context.nameToUrl(normalize(moduleNamePlusExt, - relMap && relMap.id, true), ext, true); + relMap && relMap.id, true), ext, true); }, - defined: function(id) { + defined: function (id) { return hasProp(defined, makeModuleMap(id, relMap, false, true).id); }, - specified: function(id) { + specified: function (id) { id = makeModuleMap(id, relMap, false, true).id; return hasProp(defined, id) || hasProp(registry, id); } @@ -1442,7 +1479,7 @@ var requirejs, require, define; //Only allow undef on top level require calls if (!relMap) { - localRequire.undef = function(id) { + localRequire.undef = function (id) { //Bind any waiting define() calls to this context, //fix for #408 takeGlobalQueue(); @@ -1450,10 +1487,22 @@ var requirejs, require, define; var map = makeModuleMap(id, relMap, true), mod = getOwn(registry, id); + mod.undefed = true; + removeScript(id); + delete defined[id]; delete urlFetched[map.url]; delete undefEvents[id]; + //Clean queued defines too. Go backwards + //in array so that the splices do not + //mess up the iteration. + eachReverse(defQueue, function(args, i) { + if (args[0] === id) { + defQueue.splice(i, 1); + } + }); + if (mod) { //Hold on to listeners in case the //module will be attempted to be reloaded @@ -1473,10 +1522,10 @@ var requirejs, require, define; /** * Called to enable a module if it is still in the registry * awaiting enablement. A second arg, parent, the parent module, - * is passed in for context, when this method is overriden by + * is passed in for context, when this method is overridden by * the optimizer. Not shown here to keep code compact. */ - enable: function(depMap) { + enable: function (depMap) { var mod = getOwn(registry, depMap.id); if (mod) { getModule(depMap).enable(); @@ -1489,10 +1538,10 @@ var requirejs, require, define; * load call. * @param {String} moduleName the name of the module to potentially complete. */ - completeLoad: function(moduleName) { + completeLoad: function (moduleName) { var found, args, mod, - shim = getOwn(config.shim, moduleName) || {}, - shExports = shim.exports; + shim = getOwn(config.shim, moduleName) || {}, + shExports = shim.exports; takeGlobalQueue(); @@ -1524,8 +1573,10 @@ var requirejs, require, define; if (hasPathFallback(moduleName)) { return; } else { - return onError(makeError('nodefine', 'No define call for ' + moduleName, - null, [moduleName])); + return onError(makeError('nodefine', + 'No define call for ' + moduleName, + null, + [moduleName])); } } else { //A script that does not call define(), so just simulate @@ -1544,9 +1595,20 @@ var requirejs, require, define; * it is assumed to have already been normalized. This is an * internal API, not a public one. Use toUrl for the public API. */ - nameToUrl: function(moduleName, ext, skipExt) { - var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url, - parentPath; + nameToUrl: function (moduleName, ext, skipExt) { + var paths, syms, i, parentModule, url, + parentPath, bundleId, + pkgMain = getOwn(config.pkgs, moduleName); + + if (pkgMain) { + moduleName = pkgMain; + } + + bundleId = getOwn(bundlesMap, moduleName); + + if (bundleId) { + return context.nameToUrl(bundleId, ext, skipExt); + } //If a colon is in the URL, it indicates a protocol is used and it is just //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?) @@ -1560,7 +1622,6 @@ var requirejs, require, define; } else { //A module that needs to be converted to a path. paths = config.paths; - pkgs = config.pkgs; syms = moduleName.split('/'); //For each module name segment, see if there is a path @@ -1568,7 +1629,7 @@ var requirejs, require, define; //and work up from it. for (i = syms.length; i > 0; i -= 1) { parentModule = syms.slice(0, i).join('/'); - pkg = getOwn(pkgs, parentModule); + parentPath = getOwn(paths, parentModule); if (parentPath) { //If an array, it means there are a few choices, @@ -1578,31 +1639,23 @@ var requirejs, require, define; } syms.splice(0, i, parentPath); break; - } else if (pkg) { - //If module name is just the package name, then looking - //for the main module. - if (moduleName === pkg.name) { - pkgPath = pkg.location + '/' + pkg.main; - } else { - pkgPath = pkg.location; - } - syms.splice(0, i, pkgPath); - break; } } //Join the path parts together, then figure out if baseUrl is needed. url = syms.join('/'); - url += (ext || (/\?/.test(url) || skipExt ? '' : '.js')); + url += (ext || (/^data\:|\?/.test(url) || skipExt ? '' : '.js')); url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url; } - return config.urlArgs ? url + ((url.indexOf('?') === -1 ? '?' : '&') + config.urlArgs) : url; + return config.urlArgs ? url + + ((url.indexOf('?') === -1 ? '?' : '&') + + config.urlArgs) : url; }, //Delegates to req.load. Broken out as a separate function to //allow overriding in the optimizer. - load: function(id, url) { + load: function (id, url) { req.load(context, id, url); }, @@ -1613,7 +1666,7 @@ var requirejs, require, define; * * @private */ - execCb: function(name, callback, args, exports) { + execCb: function (name, callback, args, exports) { return callback.apply(exports, args); }, @@ -1623,11 +1676,12 @@ var requirejs, require, define; * @param {Event} evt the event from the browser for the script * that was loaded. */ - onScriptLoad: function(evt) { + onScriptLoad: function (evt) { //Using currentTarget instead of target for Firefox 2.0's sake. Not //all old browsers will be supported, but this one was easy enough //to support and still makes sense. - if (evt.type === 'load' || (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) { + if (evt.type === 'load' || + (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) { //Reset interactive script so a script node is not held onto for //to long. interactiveScript = null; @@ -1641,7 +1695,7 @@ var requirejs, require, define; /** * Callback for script errors. */ - onScriptError: function(evt) { + onScriptError: function (evt) { var data = getScriptData(evt); if (!hasPathFallback(data.id)) { return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id])); @@ -1667,11 +1721,11 @@ var requirejs, require, define; * on a require that are not standardized), and to give a short * name for minification/local scope use. */ - req = requirejs = function(deps, callback, errback, optional) { + req = requirejs = function (deps, callback, errback, optional) { //Find the right context, use default var context, config, - contextName = defContextName; + contextName = defContextName; // Determine if have config object in the call. if (!isArray(deps) && typeof deps !== 'string') { @@ -1707,7 +1761,7 @@ var requirejs, require, define; * Support require.config() to make it easier to cooperate with other * AMD loaders on globally agreed names. */ - req.config = function(config) { + req.config = function (config) { return req(config); }; @@ -1717,11 +1771,9 @@ var requirejs, require, define; * that have a better solution than setTimeout. * @param {Function} fn function to execute later. */ - req.nextTick = typeof setTimeout !== 'undefined' ? function(fn) { + req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) { setTimeout(fn, 4); - } : function(fn) { - fn(); - }; + } : function (fn) { fn(); }; /** * Export require as a global, but only if it does not already exist. @@ -1744,11 +1796,16 @@ var requirejs, require, define; req({}); //Exports some context-sensitive methods on global require. - each(['toUrl', 'undef', 'defined', 'specified'], function(prop) { + each([ + 'toUrl', + 'undef', + 'defined', + 'specified' + ], function (prop) { //Reference from contexts instead of early binding to default context, //so that during builds, the latest instance of the default context //with its config gets used. - req[prop] = function() { + req[prop] = function () { var ctx = contexts[defContextName]; return ctx.require[prop].apply(ctx, arguments); }; @@ -1775,8 +1832,10 @@ var requirejs, require, define; /** * Creates the node for the load command. Only used in browser envs. */ - req.createNode = function(config, moduleName, url) { - var node = config.xhtml ? document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') : document.createElement('script'); + req.createNode = function (config, moduleName, url) { + var node = config.xhtml ? + document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') : + document.createElement('script'); node.type = config.scriptType || 'text/javascript'; node.charset = 'utf-8'; node.async = true; @@ -1792,9 +1851,9 @@ var requirejs, require, define; * @param {String} moduleName the name of the module. * @param {Object} url the URL to the module. */ - req.load = function(context, moduleName, url) { + req.load = function (context, moduleName, url) { var config = (context && context.config) || {}, - node; + node; if (isBrowser) { //In the browser so use a script tag node = req.createNode(config, moduleName, url); @@ -1811,14 +1870,15 @@ var requirejs, require, define; //UNFORTUNATELY Opera implements attachEvent but does not follow the script //script execution mode. if (node.attachEvent && - //Check if node.attachEvent is artificially added by custom script or - //natively supported by browser - //read https://github.com/jrburke/requirejs/issues/187 - //if we can NOT find [native code] then it must NOT natively supported. - //in IE8, node.attachEvent does not have toString() - //Note the test for "[native code" with no closing brace, see: - //https://github.com/jrburke/requirejs/issues/273 - !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) && !isOpera) { + //Check if node.attachEvent is artificially added by custom script or + //natively supported by browser + //read https://github.com/jrburke/requirejs/issues/187 + //if we can NOT find [native code] then it must NOT natively supported. + //in IE8, node.attachEvent does not have toString() + //Note the test for "[native code" with no closing brace, see: + //https://github.com/jrburke/requirejs/issues/273 + !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) && + !isOpera) { //Probably IE. IE (at least 6-8) do not fire //script onload right after executing the script, so //we cannot tie the anonymous define call to a name. @@ -1870,8 +1930,11 @@ var requirejs, require, define; //Account for anonymous modules context.completeLoad(moduleName); } catch (e) { - context.onError(makeError('importscripts', 'importScripts failed for ' + moduleName + ' at ' + url, - e, [moduleName])); + context.onError(makeError('importscripts', + 'importScripts failed for ' + + moduleName + ' at ' + url, + e, + [moduleName])); } } }; @@ -1881,7 +1944,7 @@ var requirejs, require, define; return interactiveScript; } - eachReverse(scripts(), function(script) { + eachReverse(scripts(), function (script) { if (script.readyState === 'interactive') { return (interactiveScript = script); } @@ -1890,9 +1953,9 @@ var requirejs, require, define; } //Look for a data-main script attribute, which could also adjust the baseUrl. - if (isBrowser) { + if (isBrowser && !cfg.skipDataMain) { //Figure out baseUrl. Get it from the script tag with require.js in it. - eachReverse(scripts(), function(script) { + eachReverse(scripts(), function (script) { //Set the 'head' where we can append children by //using the script's parent. if (!head) { @@ -1913,7 +1976,7 @@ var requirejs, require, define; //baseUrl. src = mainScript.split('/'); mainScript = src.pop(); - subPath = src.length ? src.join('/') + '/' : './'; + subPath = src.length ? src.join('/') + '/' : './'; cfg.baseUrl = subPath; } @@ -1942,7 +2005,7 @@ var requirejs, require, define; * return a value to define the module corresponding to the first argument's * name. */ - define = function(name, deps, callback) { + define = function (name, deps, callback) { var node, context; //Allow for anonymous modules @@ -1967,11 +2030,12 @@ var requirejs, require, define; //look for require calls, and pull them into the dependencies, //but only if there are function args. if (callback.length) { - callback.toString() + callback + .toString() .replace(commentRegExp, '') - .replace(cjsRequireRegExp, function(match, dep) { - deps.push(dep); - }); + .replace(cjsRequireRegExp, function (match, dep) { + deps.push(dep); + }); //May be a CommonJS thing even without require calls, but still //could use exports, and module. Avoid doing exports and module @@ -2007,18 +2071,17 @@ var requirejs, require, define; jQuery: true }; - /** * Executes the text. Normally just uses eval, but can be modified * to use a better, environment-specific call. Only used for transpiling * loader plugins, not for plain JS modules. * @param {String} text the text to execute/evaluate. */ - req.exec = function(text) { + req.exec = function (text) { /*jslint evil: true */ return eval(text); }; //Set up with config info. req(cfg); -}(this)); \ No newline at end of file +}(this)); diff --git a/public/views/index.html b/public/views/index.html index 4239f77aa76..47f00728eb7 100644 --- a/public/views/index.html +++ b/public/views/index.html @@ -18,7 +18,7 @@ - + diff --git a/tasks/options/concat.js b/tasks/options/concat.js index 36a69965229..c325afd7f51 100644 --- a/tasks/options/concat.js +++ b/tasks/options/concat.js @@ -27,7 +27,7 @@ module.exports = function(config) { js: { src: [ - '<%= destDir %>/vendor/require/require.js', + '<%= destDir %>/vendor/requirejs/require.js', '<%= destDir %>/app/components/require.config.js', '<%= destDir %>/app/app.js', ], diff --git a/tasks/options/requirejs.js b/tasks/options/requirejs.js index 5a785ffce7f..e9068dcbd04 100644 --- a/tasks/options/requirejs.js +++ b/tasks/options/requirejs.js @@ -40,7 +40,6 @@ module.exports = function(config,grunt) { // main/common module name: 'app', include: [ - 'css', 'kbn', 'text', 'jquery', @@ -75,7 +74,6 @@ module.exports = function(config,grunt) { // create a module for each directory in public/app/panels/ fs.readdirSync(panelPath).forEach(function (panelName) { requireModules[0].include.push('panels/'+panelName+'/module'); - requireModules[0].include.push('text!panels/'+panelName+'/module.html'); }); return { options: options }; diff --git a/tasks/options/uglify.js b/tasks/options/uglify.js index 583dbab78cb..2428331b021 100644 --- a/tasks/options/uglify.js +++ b/tasks/options/uglify.js @@ -2,7 +2,7 @@ module.exports = function(config) { return { dest: { expand: true, - src: ['**/*.js', '!dashboards/*.js'], + src: ['**/*.js', '!dashboards/*.js', '!vendor/jquery/**/*.js'], dest: '<%= destDir %>', cwd: '<%= destDir %>', options: { From 9b12350855ff1fe6c5c38b214941a6bf7e61bd95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 14 Jun 2015 06:07:36 +0200 Subject: [PATCH 308/398] Added support for templated email subjects --- pkg/services/notifications/notifications.go | 14 +++++++++++++- pkg/services/notifications/notifications_test.go | 2 +- public/emails/reset_password.html | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go index 57c84df8d63..401cd812d5e 100644 --- a/pkg/services/notifications/notifications.go +++ b/pkg/services/notifications/notifications.go @@ -68,10 +68,22 @@ func sendEmailCommandHandler(cmd *m.SendEmailCommand) error { setDefaultTemplateData(data, nil) mailTemplates.ExecuteTemplate(&buffer, cmd.Template, data) + subjectTmplText := data["Subject"].(map[string]interface{})["value"].(string) + subjectTmpl, err := template.New("subject").Parse(subjectTmplText) + if err != nil { + return err + } + + var subjectBuffer bytes.Buffer + err = subjectTmpl.ExecuteTemplate(&subjectBuffer, "subject", data) + if err != nil { + return err + } + addToMailQueue(&Message{ To: cmd.To, From: setting.Smtp.FromAddress, - Subject: data["Subject"].(map[string]interface{})["value"].(string), + Subject: subjectBuffer.String(), Body: buffer.String(), }) diff --git a/pkg/services/notifications/notifications_test.go b/pkg/services/notifications/notifications_test.go index a674d0b14c8..9b9c3ffbf8b 100644 --- a/pkg/services/notifications/notifications_test.go +++ b/pkg/services/notifications/notifications_test.go @@ -31,7 +31,7 @@ func TestNotifications(t *testing.T) { err := sendResetPasswordEmail(&m.SendResetPasswordEmailCommand{User: &m.User{Email: "asd@asd.com"}}) So(err, ShouldBeNil) So(sentMsg.Body, ShouldContainSubstring, "body") - So(sentMsg.Subject, ShouldEqual, "Reset your Grafana password") + So(sentMsg.Subject, ShouldEqual, "Reset your Grafana password asd@asd.com") So(sentMsg.Body, ShouldNotContainSubstring, "Subject") }) }) diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index 8753b441c56..970d5da6ca0 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -1,4 +1,4 @@ -{{Subject .Subject "Reset your Grafana password"}} +{{Subject .Subject "Reset your Grafana password - {{.Name}}"}} From 311946900e5456b31ce4ab751e7a8d04570f7eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 14 Jun 2015 06:08:18 +0200 Subject: [PATCH 309/398] Fixed email subject test --- pkg/services/notifications/notifications_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/notifications/notifications_test.go b/pkg/services/notifications/notifications_test.go index 9b9c3ffbf8b..110e24cb810 100644 --- a/pkg/services/notifications/notifications_test.go +++ b/pkg/services/notifications/notifications_test.go @@ -31,7 +31,7 @@ func TestNotifications(t *testing.T) { err := sendResetPasswordEmail(&m.SendResetPasswordEmailCommand{User: &m.User{Email: "asd@asd.com"}}) So(err, ShouldBeNil) So(sentMsg.Body, ShouldContainSubstring, "body") - So(sentMsg.Subject, ShouldEqual, "Reset your Grafana password asd@asd.com") + So(sentMsg.Subject, ShouldEqual, "Reset your Grafana password - asd@asd.com") So(sentMsg.Body, ShouldNotContainSubstring, "Subject") }) }) From 196b7846cc2e523fff1501b5a58829d652f1a5d9 Mon Sep 17 00:00:00 2001 From: Anthony Woods Date: Mon, 15 Jun 2015 19:02:38 -0400 Subject: [PATCH 310/398] add support for robots.txt file --- pkg/cmd/web.go | 1 + public/robots.txt | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 public/robots.txt diff --git a/pkg/cmd/web.go b/pkg/cmd/web.go index 6590c32fc93..c94661a5f9a 100644 --- a/pkg/cmd/web.go +++ b/pkg/cmd/web.go @@ -33,6 +33,7 @@ func newMacaron() *macaron.Macaron { mapStatic(m, "css", "css") mapStatic(m, "img", "img") mapStatic(m, "fonts", "fonts") + mapStatic(m, "robots.txt", "robots.txxt") m.Use(macaron.Renderer(macaron.RenderOptions{ Directory: path.Join(setting.StaticRootPath, "views"), diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 00000000000..1f53798bb4f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / From 5e6d876bd020a64c49e1a6fd6d3fb4e49be118b3 Mon Sep 17 00:00:00 2001 From: "Randy D. Wallace Jr" Date: Wed, 17 Jun 2015 02:40:40 -0400 Subject: [PATCH 311/398] Support Multiple Fields in InfluxDB 0.9+ * Update influxdb 0.9 plugin to iterate thru fields returned by InfluxDB and output ea. field metric separately * Updates default label to include Field Name * Update spec to include updated label * Add spec for multiple fields * Do not print the field in the label when the name is value --- .../datasource/influxdb/influxSeries.js | 36 ++++--- public/test/specs/influxSeries-specs.js | 94 ++++++++++++++++++- 2 files changed, 117 insertions(+), 13 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/influxSeries.js b/public/app/plugins/datasource/influxdb/influxSeries.js index a4a21b1f6f0..874cd4746d2 100644 --- a/public/app/plugins/datasource/influxdb/influxSeries.js +++ b/public/app/plugins/datasource/influxdb/influxSeries.js @@ -20,25 +20,39 @@ function (_) { return output; } + var field_datapoints = function(datapoints, column_index) { + return _.map(datapoints, function(datapoint) { + return [datapoint[column_index - 1], _.last(datapoint)]; + }); + }; + _.each(self.series, function(series) { var datapoints = []; + var columns = series.columns.length; for (var i = 0; i < series.values.length; i++) { - datapoints[i] = [series.values[i][1], new Date(series.values[i][0]).getTime()]; + datapoints[i] = series.values[i].slice(1); + datapoints[i].push(new Date(series.values[i][0]).getTime()); } - var seriesName = series.name; + for (var j = 1; j < columns; j++) { + var seriesName = series.name; + var columnName = series.columns[j]; - if (self.alias) { - seriesName = self._getSeriesName(series); - } else if (series.tags) { - var tags = _.map(series.tags, function(value, key) { - return key + ': ' + value; - }); + if (self.alias) { + seriesName = self._getSeriesName(series); + } else if (series.tags) { + var tags = _.map(series.tags, function(value, key) { + return key + ': ' + value; + }); + if (columnName === 'value') { + seriesName = seriesName + ' {' + tags.join(', ') + '}'; + } else { + seriesName = seriesName + '.' + columnName + ' {' + tags.join(', ') + '}'; + } + } - seriesName = seriesName + ' {' + tags.join(', ') + '}'; + output.push({ target: seriesName, datapoints: field_datapoints(datapoints, j)}); } - - output.push({ target: seriesName, datapoints: datapoints }); }); return output; diff --git a/public/test/specs/influxSeries-specs.js b/public/test/specs/influxSeries-specs.js index 3a767f23988..4cff47d5385 100644 --- a/public/test/specs/influxSeries-specs.js +++ b/public/test/specs/influxSeries-specs.js @@ -5,6 +5,96 @@ define([ describe('when generating timeseries from influxdb response', function() { + describe('given multiple fields for series', function() { + var options = { series: [ + { + name: 'cpu', + tags: {app: 'test', server: 'server1'}, + columns: ['time', 'mean', 'max', 'min'], + values: [["2015-05-18T10:57:05Z", 10, 11, 9], ["2015-05-18T10:57:06Z", 20, 21, 19]] + } + ]}; + describe('and no alias', function() { + it('should generate multiple datapoints for each column', function() { + var series = new InfluxSeries(options); + var result = series.getTimeSeries(); + + expect(result.length).to.be(3); + expect(result[0].target).to.be('cpu.mean {app: test, server: server1}'); + expect(result[0].datapoints[0][0]).to.be(10); + expect(result[0].datapoints[0][1]).to.be(1431946625000); + expect(result[0].datapoints[1][0]).to.be(20); + expect(result[0].datapoints[1][1]).to.be(1431946626000); + + expect(result[1].target).to.be('cpu.max {app: test, server: server1}'); + expect(result[1].datapoints[0][0]).to.be(11); + expect(result[1].datapoints[0][1]).to.be(1431946625000); + expect(result[1].datapoints[1][0]).to.be(21); + expect(result[1].datapoints[1][1]).to.be(1431946626000); + + expect(result[2].target).to.be('cpu.min {app: test, server: server1}'); + expect(result[2].datapoints[0][0]).to.be(9); + expect(result[2].datapoints[0][1]).to.be(1431946625000); + expect(result[2].datapoints[1][0]).to.be(19); + expect(result[2].datapoints[1][1]).to.be(1431946626000); + + }); + }); + + describe('and simple alias', function() { + it('should use alias', function() { + options.alias = 'new series'; + var series = new InfluxSeries(options); + var result = series.getTimeSeries(); + + expect(result[0].target).to.be('new series'); + expect(result[1].target).to.be('new series'); + expect(result[2].target).to.be('new series'); + }); + + }); + + describe('and alias patterns', function() { + it('should replace patterns', function() { + options.alias = 'alias: $m -> $tag_server ([[measurement]])'; + var series = new InfluxSeries(options); + var result = series.getTimeSeries(); + + expect(result[0].target).to.be('alias: cpu -> server1 (cpu)'); + expect(result[1].target).to.be('alias: cpu -> server1 (cpu)'); + expect(result[2].target).to.be('alias: cpu -> server1 (cpu)'); + }); + + }); + }); + describe('given measurement with default fieldname', function() { + var options = { series: [ + { + name: 'cpu', + tags: {app: 'test', server: 'server1'}, + columns: ['time', 'value'], + values: [["2015-05-18T10:57:05Z", 10], ["2015-05-18T10:57:06Z", 12]] + }, + { + name: 'cpu', + tags: {app: 'test2', server: 'server2'}, + columns: ['time', 'value'], + values: [["2015-05-18T10:57:05Z", 15], ["2015-05-18T10:57:06Z", 16]] + } + ]}; + + describe('and no alias', function() { + + it('should generate label with no field', function() { + var series = new InfluxSeries(options); + var result = series.getTimeSeries(); + + expect(result[0].target).to.be('cpu {app: test, server: server1}'); + expect(result[1].target).to.be('cpu {app: test2, server: server2}'); + }); + }); + + }); describe('given two series', function() { var options = { series: [ { @@ -28,13 +118,13 @@ define([ var result = series.getTimeSeries(); expect(result.length).to.be(2); - expect(result[0].target).to.be('cpu {app: test, server: server1}'); + expect(result[0].target).to.be('cpu.mean {app: test, server: server1}'); expect(result[0].datapoints[0][0]).to.be(10); expect(result[0].datapoints[0][1]).to.be(1431946625000); expect(result[0].datapoints[1][0]).to.be(12); expect(result[0].datapoints[1][1]).to.be(1431946626000); - expect(result[1].target).to.be('cpu {app: test2, server: server2}'); + expect(result[1].target).to.be('cpu.mean {app: test2, server: server2}'); expect(result[1].datapoints[0][0]).to.be(15); expect(result[1].datapoints[0][1]).to.be(1431946625000); expect(result[1].datapoints[1][0]).to.be(16); From d23762e06b9022a174d9bcec4dda243537176b18 Mon Sep 17 00:00:00 2001 From: Shaoxuan Zhang Date: Wed, 17 Jun 2015 17:57:23 -1000 Subject: [PATCH 312/398] Update configuration.md Mention replacing `.` with `_` with environment variable override. --- docs/sources/installation/configuration.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 28af21ebf89..add1999f714 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -28,14 +28,19 @@ using environment variables using the syntax: GF__ Where the section name is the text within the brackets. Everything -should be upper case. For example, given this configuration setting: +should be upper case, `.` should be replaced by `_`. For example, given these configuration settings: [security] admin_user = admin + + [auth.google] + client_secret = 0ldS3cretKey + Then you can override that using: export GF_SECURITY_ADMIN_USER=true + export GF_AUTH_GOOGLE_CLIENT_SECRET=newS3cretKey
      From 5da656e5597cf58d6bd15c4e2f628ef59786fa9e Mon Sep 17 00:00:00 2001 From: Mikhail Menshenin Date: Thu, 18 Jun 2015 10:05:29 +0500 Subject: [PATCH 313/398] Missed double quote fix --- docs/sources/installation/docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md index bc0cba71732..c11de0faa7b 100644 --- a/docs/sources/installation/docker.md +++ b/docs/sources/installation/docker.md @@ -24,7 +24,7 @@ container: $ docker run -d -p 3000:3000 \ -v /var/lib/grafana:/var/lib/grafana \ - -e "GF_SECURITY_ADMIN_PASSWORD=secret \ + -e "GF_SECURITY_ADMIN_PASSWORD=secret" \ grafana/grafana:develop In the above example I map the data folder and sets a configuration option via From 261e5ebbd4ea63574a381ffefd6f7d14c4b77157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 19 Jun 2015 11:51:46 -0400 Subject: [PATCH 314/398] Fixed bug in singlestat panel and null value handling, #2189 --- public/app/components/kbn.js | 1 + public/test/specs/kbn-format-specs.js | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/public/app/components/kbn.js b/public/app/components/kbn.js index c9d2900f53b..aa5146c1538 100644 --- a/public/app/components/kbn.js +++ b/public/app/components/kbn.js @@ -406,6 +406,7 @@ function($, _, moment) { kbn.valueFormats.velocityknot = function(value, decimals) { return kbn.toFixed(value, decimals) + ' kn'; }; kbn.roundValue = function (num, decimals) { + if (num === null) { return null; } var n = Math.pow(10, decimals); return Math.round((n * num).toFixed(decimals)) / n; }; diff --git a/public/test/specs/kbn-format-specs.js b/public/test/specs/kbn-format-specs.js index d8a11c5a43c..1a5f60975c0 100644 --- a/public/test/specs/kbn-format-specs.js +++ b/public/test/specs/kbn-format-specs.js @@ -51,7 +51,12 @@ define([ }); }); - + describe('kbn roundValue', function() { + it('should should handle null value', function() { + var str = kbn.roundValue(null, 2); + expect(str).to.be(null); + }); + }); describe('calculateInterval', function() { it('1h 100 resultion', function() { From 021c6ac1cb57a2c33c29a7e7828752d6777488ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 19 Jun 2015 12:42:10 -0400 Subject: [PATCH 315/398] fixed panel menu while in fullscreen mode --- public/app/features/panel/panelMenu.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/app/features/panel/panelMenu.js b/public/app/features/panel/panelMenu.js index 5a701084ff3..c7711d99925 100644 --- a/public/app/features/panel/panelMenu.js +++ b/public/app/features/panel/panelMenu.js @@ -155,6 +155,9 @@ function (angular, $, _) { if (panelLeftPos + menuLeftPos < 0) { menuLeftPos = 0; } + if ($scope.fullscreen) { + menuHeight = -(menuHeight/2); + } $menu.css({'left': menuLeftPos, top: -menuHeight}); }); From c0b4f7b6d2db209b853f60ae020469acf55d8173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 19 Jun 2015 13:03:09 -0400 Subject: [PATCH 316/398] updated graphite docs, Closes #2165 --- docs/sources/datasources/graphite.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/sources/datasources/graphite.md b/docs/sources/datasources/graphite.md index 9074a2010a4..368feeda8c3 100644 --- a/docs/sources/datasources/graphite.md +++ b/docs/sources/datasources/graphite.md @@ -6,9 +6,9 @@ page_keywords: grafana, graphite, metrics, query, documentation # Graphite -Grafana has an advanced graphite query editor that lets you quickly navigate the metric space, add functions. -Change function parameters and much more. The editor cannot handle all types of queries yet. -To switch to a regular text box click the pen icon to the right. +Grafana has an advanced graphite query editor that lets you quickly navigate the metric space, add functions, +change function parameters and much more. The editor can handle all types of graphite queries. It can even handle complex nested +queries through the use of query references. ## Adding the data source to Grafana Open the side menu by clicking the the Grafana icon in the top header. In the side menu under the `Dashboards` link you From 26e5d7a3deeecf3929f6ef1e62a77e097da1c782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 19 Jun 2015 14:13:25 -0400 Subject: [PATCH 317/398] Graph: fixed PNG rendering of panels with legend table to the right, #2185 --- CHANGELOG.md | 3 +++ pkg/components/renderer/renderer.go | 2 +- public/app/features/dashboard/dashboardCtrl.js | 1 + public/app/features/dashboard/dynamicDashboardSrv.js | 1 + public/app/features/panel/panelSrv.js | 4 ++++ public/app/panels/dashlist/module.js | 1 + public/app/panels/graph/graph.js | 12 ++++++++---- public/app/panels/singlestat/singleStatPanel.js | 1 + public/app/panels/text/module.js | 1 + public/test/specs/graph-specs.js | 1 + vendor/phantomjs/render.js | 6 ++++-- 11 files changed, 26 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f89aa88b9b..2d3c9387972 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,9 @@ - Search HTTP API response has changed (simplified), tags list moved to seperate HTTP resource URI - Datasource HTTP api breaking change, ADD datasource is now POST /api/datasources/, update is now PUT /api/datasources/:id +**Fixes** +- [Issue #2185](https://github.com/grafana/grafana/issues/2185). Graph: fixed PNG rendering of panels with legend table to the right + # 2.0.3 (unreleased - 2.0.x branch) **Fixes** diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go index 9d5ddd00d73..ec11a9ac36f 100644 --- a/pkg/components/renderer/renderer.go +++ b/pkg/components/renderer/renderer.go @@ -54,7 +54,7 @@ func RenderToPng(params *RenderOpts) (string, error) { }() select { - case <-time.After(10 * time.Second): + case <-time.After(15 * time.Second): if err := cmd.Process.Kill(); err != nil { log.Error(4, "failed to kill: %v", err) } diff --git a/public/app/features/dashboard/dashboardCtrl.js b/public/app/features/dashboard/dashboardCtrl.js index ffead046211..f25fea26afe 100644 --- a/public/app/features/dashboard/dashboardCtrl.js +++ b/public/app/features/dashboard/dashboardCtrl.js @@ -84,6 +84,7 @@ function (angular, $, config) { }; $scope.broadcastRefresh = function() { + $rootScope.performance.panelsRendered = 0; $rootScope.$broadcast('refresh'); }; diff --git a/public/app/features/dashboard/dynamicDashboardSrv.js b/public/app/features/dashboard/dynamicDashboardSrv.js index 8e10619aec8..fe0ffe47e51 100644 --- a/public/app/features/dashboard/dynamicDashboardSrv.js +++ b/public/app/features/dashboard/dynamicDashboardSrv.js @@ -164,6 +164,7 @@ function (angular, _) { _.each(selected, function(option, index) { var copy = self.getPanelClone(panel, row, index); + copy.span = 12 / selected.length; copy.scopedVars = copy.scopedVars || {}; copy.scopedVars[variable.name] = option; }); diff --git a/public/app/features/panel/panelSrv.js b/public/app/features/panel/panelSrv.js index b863518ff72..037125b4aad 100644 --- a/public/app/features/panel/panelSrv.js +++ b/public/app/features/panel/panelSrv.js @@ -86,6 +86,10 @@ function (angular, _, config) { return datasourceSrv.get($scope.panel.datasource); }; + $scope.panelRenderingComplete = function() { + $rootScope.performance.panelsRendered++; + }; + $scope.get_data = function() { if ($scope.otherPanelInFullscreenMode()) { return; } diff --git a/public/app/panels/dashlist/module.js b/public/app/panels/dashlist/module.js index 9b4e1ebc045..647199d6538 100644 --- a/public/app/panels/dashlist/module.js +++ b/public/app/panels/dashlist/module.js @@ -66,6 +66,7 @@ function (angular, app, _, config, PanelMeta) { return backendSrv.search(params).then(function(result) { $scope.dashList = result; + $scope.panelRenderingComplete(); }); }; diff --git a/public/app/panels/graph/graph.js b/public/app/panels/graph/graph.js index c6ca8ec7227..0f6ae7baeeb 100755 --- a/public/app/panels/graph/graph.js +++ b/public/app/panels/graph/graph.js @@ -247,22 +247,26 @@ function (angular, $, kbn, moment, _, GraphTooltip) { sortedSeries = _.sortBy(data, function(series) { return series.zindex; }); - function callPlot() { + function callPlot(incrementRenderCounter) { try { $.plot(elem, sortedSeries, options); } catch (e) { console.log('flotcharts error', e); } + + if (incrementRenderCounter) { + scope.panelRenderingComplete(); + } } if (shouldDelayDraw(panel)) { // temp fix for legends on the side, need to render twice to get dimensions right - callPlot(); - setTimeout(callPlot, 50); + callPlot(false); + setTimeout(function() { callPlot(true); }, 50); legendSideLastValue = panel.legend.rightSide; } else { - callPlot(); + callPlot(true); } } diff --git a/public/app/panels/singlestat/singleStatPanel.js b/public/app/panels/singlestat/singleStatPanel.js index 27a0167f05b..4bb1fc658f0 100644 --- a/public/app/panels/singlestat/singleStatPanel.js +++ b/public/app/panels/singlestat/singleStatPanel.js @@ -20,6 +20,7 @@ function (angular, app, _, $) { scope.$on('render', function() { render(); + scope.panelRenderingComplete(); }); function setElementHeight() { diff --git a/public/app/panels/text/module.js b/public/app/panels/text/module.js index c5e82cd4199..436a9982b41 100644 --- a/public/app/panels/text/module.js +++ b/public/app/panels/text/module.js @@ -61,6 +61,7 @@ function (angular, app, _, require, PanelMeta) { else if ($scope.panel.mode === 'text') { $scope.renderText($scope.panel.content); } + $scope.panelRenderingComplete(); }; $scope.renderText = function(content) { diff --git a/public/test/specs/graph-specs.js b/public/test/specs/graph-specs.js index a234323ee01..b29076db9a6 100644 --- a/public/test/specs/graph-specs.js +++ b/public/test/specs/graph-specs.js @@ -36,6 +36,7 @@ define([ } }; + scope.panelRenderingComplete = sinon.spy(); scope.appEvent = sinon.spy(); scope.onAppEvent = sinon.spy(); scope.hiddenSeries = {}; diff --git a/vendor/phantomjs/render.js b/vendor/phantomjs/render.js index 58afcd44eba..33fda200cba 100644 --- a/vendor/phantomjs/render.js +++ b/vendor/phantomjs/render.js @@ -34,10 +34,12 @@ page.open(params.url, function (status) { function checkIsReady() { var canvas = page.evaluate(function() { - return $('canvas').length > 0; + var body = angular.element(document.body); // 1 + var rootScope = body.scope().$root; + return rootScope.performance.panelsRendered > 0; }); - if (canvas || tries === 100) { + if (canvas || tries === 1000) { page.render(params.png); phantom.exit(); } From fb7b47545743e8d0aed6362d6c666c17433bf3f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 19 Jun 2015 14:42:55 -0400 Subject: [PATCH 318/398] Backend: Load dashboards with capital letters in the dashboard url slug (url id), Fixes #2163 --- CHANGELOG.md | 1 + pkg/api/dashboard.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d3c9387972..6f9b6d48f0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ **Fixes** - [Issue #2185](https://github.com/grafana/grafana/issues/2185). Graph: fixed PNG rendering of panels with legend table to the right +- [Issue #2163](https://github.com/grafana/grafana/issues/2163). Backend: Load dashboards with capital letters in the dashboard url slug (url id) # 2.0.3 (unreleased - 2.0.x branch) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 60139fd3b84..a10c3c92f96 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -4,6 +4,7 @@ import ( "encoding/json" "os" "path" + "strings" "github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/bus" @@ -31,7 +32,7 @@ func isDasboardStarredByUser(c *middleware.Context, dashId int64) (bool, error) func GetDashboard(c *middleware.Context) { metrics.M_Api_Dashboard_Get.Inc(1) - slug := c.Params(":slug") + slug := strings.ToLower(c.Params(":slug")) query := m.GetDashboardQuery{Slug: slug, OrgId: c.OrgId} err := bus.Dispatch(&query) From 2a693f7f08eefbcc0932790498dfcb806d4d1e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 19 Jun 2015 15:10:34 -0400 Subject: [PATCH 319/398] Fixed issue with multi select template variable and restoring state from url, #2196 --- public/app/features/templating/templateValuesSrv.js | 10 ++++++---- public/css/less/submenu.less | 2 ++ public/test/specs/templateValuesSrv-specs.js | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index ac2f5bb5975..b2bed74a4ce 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -57,10 +57,6 @@ function (angular, _, kbn) { var option = _.findWhere(variable.options, { text: urlValue }); option = option || { text: urlValue, value: urlValue }; - if (_.isArray(urlValue)) { - option.text = urlValue.join(', '); - } - this.updateAutoInterval(variable); return this.setVariableValue(variable, option); }; @@ -79,6 +75,11 @@ function (angular, _, kbn) { this.setVariableValue = function(variable, option) { variable.current = angular.copy(option); + + if (_.isArray(variable.current.value)) { + variable.current.text = variable.current.value.join(' + '); + } + templateSrv.updateTemplateData(); return this.updateOptionsInChildVariables(variable); }; @@ -127,6 +128,7 @@ function (angular, _, kbn) { this.validateVariableSelectionState = function(variable) { if (!variable.current) { + if (!variable.options.length) { return; } return self.setVariableValue(variable, variable.options[0]); } diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less index 9f4653600bc..7cd15d183f2 100644 --- a/public/css/less/submenu.less +++ b/public/css/less/submenu.less @@ -132,5 +132,7 @@ } .dash-nav-link { + padding: 8px 7px; + display: inline-block; color: @textColor; } diff --git a/public/test/specs/templateValuesSrv-specs.js b/public/test/specs/templateValuesSrv-specs.js index 2ff287b8b6d..359ccc98540 100644 --- a/public/test/specs/templateValuesSrv-specs.js +++ b/public/test/specs/templateValuesSrv-specs.js @@ -68,7 +68,7 @@ define([ expect(variable.current.value.length).to.be(2); expect(variable.current.value[0]).to.be("new"); expect(variable.current.value[1]).to.be("other"); - expect(variable.current.text).to.be("new, other"); + expect(variable.current.text).to.be("new + other"); }); }); From d3c6db1ba8eecb55b85373fa11539fe3da768331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 19 Jun 2015 16:42:45 -0400 Subject: [PATCH 320/398] Fixed tabindex for organization dropdown, Fixes #2150 --- public/app/partials/sidemenu.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/partials/sidemenu.html b/public/app/partials/sidemenu.html index be2311273cd..f73ef658fba 100644 --- a/public/app/partials/sidemenu.html +++ b/public/app/partials/sidemenu.html @@ -36,7 +36,7 @@
    • - + {{contextSrv.user.orgName}} From 3f917b0af5b9238786c964b4333dc17280d4a5fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 22 Jun 2015 08:13:21 +0200 Subject: [PATCH 321/398] Updated org creation view, after creating new org user is switched to that org and redirect to org details view, Closes #2198 --- pkg/api/org.go | 6 +++++- public/app/features/org/newOrgCtrl.js | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkg/api/org.go b/pkg/api/org.go index 75499f33f61..b38eb537ae9 100644 --- a/pkg/api/org.go +++ b/pkg/api/org.go @@ -6,6 +6,7 @@ import ( "github.com/grafana/grafana/pkg/middleware" m "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/setting" + "github.com/grafana/grafana/pkg/util" ) // GET /api/org @@ -50,7 +51,10 @@ func CreateOrg(c *middleware.Context, cmd m.CreateOrgCommand) Response { metrics.M_Api_Org_Create.Inc(1) - return ApiSuccess("Organization created") + return Json(200, &util.DynMap{ + "orgId": cmd.Result.Id, + "message": "Organization created", + }) } // PUT /api/org diff --git a/public/app/features/org/newOrgCtrl.js b/public/app/features/org/newOrgCtrl.js index 9d81e226dce..220192a46ac 100644 --- a/public/app/features/org/newOrgCtrl.js +++ b/public/app/features/org/newOrgCtrl.js @@ -1,7 +1,8 @@ define([ 'angular', + 'config', ], -function (angular) { +function (angular, config) { 'use strict'; var module = angular.module('grafana.controllers'); @@ -11,7 +12,11 @@ function (angular) { $scope.newOrg = {name: ''}; $scope.createOrg = function() { - backendSrv.post('/api/orgs/', $scope.newOrg).then($scope.getUserOrgs); + backendSrv.post('/api/orgs/', $scope.newOrg).then(function(result) { + backendSrv.post('/api/user/using/' + result.orgId).then(function() { + window.location.href = config.appSubUrl + '/org'; + }); + }); }; }); From 98a07eff8117495ee219f5d7c9ae3362bbdc776f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 22 Jun 2015 17:44:42 +0200 Subject: [PATCH 322/398] Worked on enhancing panel links to support dash link features, like auto variable to url params includes, Closes #2200 --- public/app/features/dashlinks/module.js | 8 +-- public/app/features/panellinks/linkSrv.js | 21 ++++-- public/app/features/panellinks/module.html | 66 +++++++++++++------ public/app/features/panellinks/module.js | 17 +++-- .../app/panels/singlestat/singleStatPanel.js | 10 ++- 5 files changed, 85 insertions(+), 37 deletions(-) diff --git a/public/app/features/dashlinks/module.js b/public/app/features/dashlinks/module.js index 7be8ffbd87b..9fc1bc4d4b5 100644 --- a/public/app/features/dashlinks/module.js +++ b/public/app/features/dashlinks/module.js @@ -105,7 +105,7 @@ function (angular, _) { }]); } - return $scope.searchDashboards(linkDef); + return $scope.searchDashboards(linkDef, 7); } if (linkDef.type === 'link') { @@ -131,8 +131,8 @@ function (angular, _) { }); } - $scope.searchDashboards = function(link) { - return backendSrv.search({tag: link.tags}).then(function(results) { + $scope.searchDashboards = function(link, limit) { + return backendSrv.search({tag: link.tags, limit: limit}).then(function(results) { return _.reduce(results, function(memo, dash) { // do not add current dashboard if (dash.id !== currentDashId) { @@ -150,7 +150,7 @@ function (angular, _) { }; $scope.fillDropdown = function(link) { - $scope.searchDashboards(link).then(function(results) { + $scope.searchDashboards(link, 100).then(function(results) { _.each(results, function(hit) { hit.url = linkSrv.getLinkUrl(hit); }); diff --git a/public/app/features/panellinks/linkSrv.js b/public/app/features/panellinks/linkSrv.js index 2f943b13f08..c11cdb40b52 100644 --- a/public/app/features/panellinks/linkSrv.js +++ b/public/app/features/panellinks/linkSrv.js @@ -62,21 +62,34 @@ function (angular, kbn, _) { this.getPanelLinkAnchorInfo = function(link) { var info = {}; if (link.type === 'absolute') { - info.target = '_blank'; + info.target = link.targetBlank ? '_blank' : ''; info.href = templateSrv.replace(link.url || ''); info.title = templateSrv.replace(link.title || ''); info.href += '?'; } + else if (link.dashUri) { + info.href = 'dashboard/' + link.dashUri + '?'; + info.title = templateSrv.replace(link.title || ''); + } else { info.title = templateSrv.replace(link.title || ''); var slug = kbn.slugifyForUrl(link.dashboard || ''); info.href = 'dashboard/db/' + slug + '?'; } - var range = timeSrv.timeRangeForUrl(); - info.href += 'from=' + range.from; - info.href += '&to=' + range.to; + var params = {}; + if (link.keepTime) { + var range = timeSrv.timeRangeForUrl(); + params['from'] = range.from; + params['to'] = range.to; + } + + if (link.includeVars) { + templateSrv.fillVariableValuesForUrl(params); + } + + info.href = this.addParamsToUrl(info.href, params); if (link.params) { info.href += "&" + templateSrv.replace(link.params); } diff --git a/public/app/features/panellinks/module.html b/public/app/features/panellinks/module.html index 7b3020e587e..99f93d21eda 100644 --- a/public/app/features/panellinks/module.html +++ b/public/app/features/panellinks/module.html @@ -2,49 +2,73 @@
      Drilldown / detail linkThese links appear in the dropdown menu in the panel menu.
      -
      -
      -
        +
        +
        +
        • + + +
          • +
          • +
        -
      • Link title
        • -
      • - +
          +
        • +
        • Type
        • - +
          • -
        • Dashboard
          • +
        • Dashboard
        • - +
          • -
        • Url
          • +
        • Url
        • - + +
          • + +
        +
        +
        • + +
        +
          +
        • + +
          • +
        • Title
          • +
        • + +
          • +
        • + Url params +
          • +
        • +
        - - +
        -
        -
          +
          +
            • From ec98f9181bfa38be570b4771481dd18e86092638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 23 Jun 2015 20:09:17 +0200 Subject: [PATCH 327/398] Fixed issue with new variable value select dropdown and parent -> child updates, Fixes #2215 --- public/app/directives/valueSelectDropdown.js | 10 ++++++- public/app/features/dashboard/submenuCtrl.js | 9 ++----- .../features/templating/templateValuesSrv.js | 3 +++ public/test/specs/templateValuesSrv-specs.js | 27 ++++++++++++++++++- 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/public/app/directives/valueSelectDropdown.js b/public/app/directives/valueSelectDropdown.js index db62b6684f6..8c963bcf1eb 100644 --- a/public/app/directives/valueSelectDropdown.js +++ b/public/app/directives/valueSelectDropdown.js @@ -215,7 +215,7 @@ function (angular, app, _) { angular .module('grafana.directives') - .directive('valueSelectDropdown', function($compile, $window, $timeout) { + .directive('valueSelectDropdown', function($compile, $window, $timeout, $rootScope) { return { scope: { variable: "=", onUpdated: "&", getValuesForTag: "&" }, @@ -260,6 +260,14 @@ function (angular, app, _) { } }); + var cleanUp = $rootScope.$on('template-variable-value-updated', function() { + scope.vm.updateLinkText(); + }); + + scope.$on("$destroy", function() { + cleanUp(); + }); + scope.vm.init(); }, }; diff --git a/public/app/features/dashboard/submenuCtrl.js b/public/app/features/dashboard/submenuCtrl.js index b8e609c061e..b1d0dc3ae32 100644 --- a/public/app/features/dashboard/submenuCtrl.js +++ b/public/app/features/dashboard/submenuCtrl.js @@ -1,18 +1,12 @@ define([ 'angular', - 'lodash' ], -function (angular, _) { +function (angular) { 'use strict'; var module = angular.module('grafana.controllers'); module.controller('SubmenuCtrl', function($scope, $q, $rootScope, templateValuesSrv, dynamicDashboardSrv) { - var _d = { - enable: true - }; - - _.defaults($scope.pulldown,_d); $scope.init = function() { $scope.panel = $scope.pulldown; @@ -33,6 +27,7 @@ function (angular, _) { $scope.variableUpdated = function(variable) { templateValuesSrv.variableUpdated(variable).then(function() { dynamicDashboardSrv.update($scope.dashboard); + $rootScope.$emit('template-variable-value-updated'); $rootScope.$broadcast('refresh'); }); }; diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index b2bed74a4ce..4192279d74a 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -146,6 +146,9 @@ function (angular, _, kbn) { var currentOption = _.findWhere(variable.options, { text: variable.current.text }); if (currentOption) { return self.setVariableValue(variable, currentOption); + } else { + if (!variable.options.length) { return; } + return self.setVariableValue(variable, variable.options[0]); } } }; diff --git a/public/test/specs/templateValuesSrv-specs.js b/public/test/specs/templateValuesSrv-specs.js index 359ccc98540..3c75d91bbb1 100644 --- a/public/test/specs/templateValuesSrv-specs.js +++ b/public/test/specs/templateValuesSrv-specs.js @@ -106,6 +106,31 @@ define([ }); }); + describeUpdateVariable('query variable with empty current object and refresh', function(scenario) { + scenario.setup(function() { + scenario.variable = { type: 'query', query: '', name: 'test', current: {} }; + scenario.queryResult = [{text: 'backend1'}, {text: 'backend2'}]; + }); + + it('should set current value to first option', function() { + expect(scenario.variable.options.length).to.be(2); + expect(scenario.variable.current.value).to.be('backend1'); + }); + }); + + describeUpdateVariable('interval variable without auto', function(scenario) { + scenario.setup(function() { + scenario.variable = { type: 'interval', query: '1s,2h,5h,1d', name: 'test' }; + }); + + it('should update options array', function() { + expect(scenario.variable.options.length).to.be(4); + expect(scenario.variable.options[0].text).to.be('1s'); + expect(scenario.variable.options[0].value).to.be('1s'); + }); + }); + + describeUpdateVariable('interval variable with auto', function(scenario) { scenario.setup(function() { scenario.variable = { type: 'interval', query: '1s,2h,5h,1d', name: 'test', auto: true, auto_count: 10 }; @@ -171,7 +196,7 @@ define([ describeUpdateVariable('and existing value still exists in options', function(scenario) { scenario.setup(function() { scenario.variable = { type: 'query', query: 'apps.*', name: 'test' }; - scenario.variable.current = { text: 'backend2'}; + scenario.variable.current = { value: 'backend2', text: 'backend2'}; scenario.queryResult = [{text: 'backend1'}, {text: 'backend2'}]; }); From 7806da11e65fdd220119c0d33eb672b2888a564a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 24 Jun 2015 21:31:16 +0200 Subject: [PATCH 328/398] Fixed issue with test data source connection and direct access, Fixes #2219 --- public/app/features/org/datasourceEditCtrl.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/public/app/features/org/datasourceEditCtrl.js b/public/app/features/org/datasourceEditCtrl.js index f2af6325a20..9bb49edff42 100644 --- a/public/app/features/org/datasourceEditCtrl.js +++ b/public/app/features/org/datasourceEditCtrl.js @@ -58,7 +58,7 @@ function (angular, config) { }; $scope.updateFrontendSettings = function() { - backendSrv.get('/api/frontend/settings').then(function(settings) { + return backendSrv.get('/api/frontend/settings').then(function(settings) { config.datasources = settings.datasources; config.defaultDatasource = settings.defaultDatasource; datasourceSrv.init(); @@ -101,12 +101,13 @@ function (angular, config) { if ($scope.current.id) { return backendSrv.put('/api/datasources/' + $scope.current.id, $scope.current).then(function() { - $scope.updateFrontendSettings(); - if (test) { - $scope.testDatasource(); - } else { - $location.path('datasources'); - } + $scope.updateFrontendSettings().then(function() { + if (test) { + $scope.testDatasource(); + } else { + $location.path('datasources'); + } + }); }); } else { return backendSrv.post('/api/datasources', $scope.current).then(function(result) { From 74b8e8244a37a4eecdec865b3d45c88d9ed631ef Mon Sep 17 00:00:00 2001 From: Masaori Koshiba Date: Wed, 24 Jun 2015 06:54:36 +0900 Subject: [PATCH 329/398] Add docs of KairosDB Datasource Plugin --- docs/mkdocs.yml | 1 + docs/sources/datasources/kairosdb.md | 47 ++++++++++++++++++++++++++++ docs/sources/index.md | 2 +- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 docs/sources/datasources/kairosdb.md diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 2ff90577f07..082fb22d5ba 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -60,6 +60,7 @@ pages: - ['datasources/graphite.md', 'Data Sources', 'Graphite'] - ['datasources/influxdb.md', 'Data Sources', 'InfluxDB'] - ['datasources/opentsdb.md', 'Data Sources', 'OpenTSDB'] +- ['datasources/kairosdb.md', 'Data Sources', 'KairosDB'] - ['project/building_from_source.md', 'Project', 'Building from souce'] - ['project/cla.md', 'Project', 'Contributor License Agreement'] diff --git a/docs/sources/datasources/kairosdb.md b/docs/sources/datasources/kairosdb.md new file mode 100644 index 00000000000..f0d52b91548 --- /dev/null +++ b/docs/sources/datasources/kairosdb.md @@ -0,0 +1,47 @@ +--- +page_title: KairosDB Guide +page_description: KairosDB guide for Grafana +page_keywords: grafana, kairosdb, documentation +--- + +# KairosDB Guide + +## Adding the data source to Grafana +Open the side menu by clicking the the Grafana icon in the top header. In the side menu under the `Dashboards` link you +should find a link named `Data Sources`. If this link is missing in the side menu it means that your current +user does not have the `Admin` role for the current organization. + + + +Now click the `Add new` link in the top header. + +Name | Description +------------ | ------------- +Name | The data source name, important that this is the same as in Grafana v1.x if you plan to import old dashboards. +Default | Default data source means that it will be pre-selected for new panels. +Url | The http protocol, ip and port of your kairosdb server (default port is usually 8080) +Access | Proxy = access via Grafana backend, Direct = access directory from browser. + +## Query editor +Open a graph in edit mode by click the title. + + + +For details on KairosDB metric queries checkout the offical. + +- [Query Metrics - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/QueryMetrics.html). + +## Templated queries +KairosDB Datasource Plugin provides following functions in `Variables values query` field in Templating Editor to query `metric names`, `tag names`, and `tag values` to kairosdb server. + +Name | Description +---- | ---- +`metrics(query)` | Returns a list of metric names. If nothing is given, returns a list of all metric names. +`tag_names(query)` | Returns a list of tag names. If nothing is given, returns a list of all tag names. +`tag_values(query)` | Returns a list of tag values. If nothing is given, returns a list of all tag values. + +For details of `metric names`, `tag names`, and `tag values`, please refer to the KairosDB documentations. + +- [List Metric Names - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/ListMetricNames.html) +- [List Tag Names - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/ListTagNames.html) +- [List Tag Values - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/ListTagValues.html) diff --git a/docs/sources/index.md b/docs/sources/index.md index 24ba087575e..5acd3815c1c 100644 --- a/docs/sources/index.md +++ b/docs/sources/index.md @@ -10,7 +10,7 @@ It provides a powerful and elegant way to create, share, and explore data and da Grafana is most commonly used for Internet infrastructure and application analytics, but many use it in other domains including industrial sensors, home automation, weather, and process control. -Grafana features pluggable panels and data sources allowing easy extensibility. There is currently rich support for [Graphite](http://graphite.readthedocs.org/en/latest/), [InfluxDB](http://influxdb.org) and [OpenTSDB](http://opentsdb.net). There is also experimental support for KairosDB, and SQL is on the roadmap. Grafana has a variety of panels, including a fully featured graph panel with rich visualization options. +Grafana features pluggable panels and data sources allowing easy extensibility. There is currently rich support for [Graphite](http://graphite.readthedocs.org/en/latest/), [InfluxDB](http://influxdb.org) and [OpenTSDB](http://opentsdb.net). There is also experimental support for [KairosDB](https://github.com/kairosdb/kairosdb), and SQL is on the roadmap. Grafana has a variety of panels, including a fully featured graph panel with rich visualization options. Version 2.0 was released in April 2015: Grafana now ships with its own backend server that brings [many changes and features](../guides/whats-new-in-v2/). From 24bab47f14c0e6efb1674d26767ee24064581495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 25 Jun 2015 17:06:43 +0200 Subject: [PATCH 330/398] fix(create org): Anonymous user can no longer create org, Fixes #2227 --- pkg/api/frontendsettings.go | 2 +- pkg/api/org.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index 37a28077175..7851f1d8f0d 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -99,7 +99,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro "defaultDatasource": defaultDatasource, "datasources": datasources, "appSubUrl": setting.AppSubUrl, - "allowOrgCreate": setting.AllowUserOrgCreate || c.IsGrafanaAdmin, + "allowOrgCreate": (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin, "buildInfo": map[string]interface{}{ "version": setting.BuildVersion, "commit": setting.BuildCommit, diff --git a/pkg/api/org.go b/pkg/api/org.go index b38eb537ae9..746281c5138 100644 --- a/pkg/api/org.go +++ b/pkg/api/org.go @@ -40,7 +40,7 @@ func getOrgHelper(orgId int64) Response { // POST /api/orgs func CreateOrg(c *middleware.Context, cmd m.CreateOrgCommand) Response { - if !setting.AllowUserOrgCreate && !c.IsGrafanaAdmin { + if !c.IsSignedIn || (!setting.AllowUserOrgCreate && !c.IsGrafanaAdmin) { return ApiError(401, "Access denied", nil) } From 43afd7dff979af3fffefd0b67014db66be8f3c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 26 Jun 2015 07:54:55 +0200 Subject: [PATCH 331/398] Fixed on blur event for influxdb 0.9 raw query editor, #1525 --- .../app/plugins/datasource/influxdb/partials/query.editor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html index 6ab34475344..89571c06022 100644 --- a/public/app/plugins/datasource/influxdb/partials/query.editor.html +++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html @@ -59,7 +59,7 @@
          - +
          From 3c86c9908cc00e655c0eac0bbee329f0d2976f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 6 Jul 2015 12:24:11 +0200 Subject: [PATCH 368/398] Added docs for dashboard list panel, #2276 --- docs/mkdocs.yml | 2 +- docs/sources/reference/dashlist.md | 18 ++++++++++++++++++ public/app/panels/dashlist/editor.html | 4 ++-- public/app/panels/dashlist/module.js | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 7d84dba5f0d..13eaf757c94 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -45,7 +45,7 @@ pages: - ['reference/graph.md', 'Reference', 'Graph Panel'] - ['reference/singlestat.md', 'Reference', 'Singlestat Panel'] -- ['reference/dashlist.md', 'Reference', 'Dashlist Panel'] +- ['reference/dashlist.md', 'Reference', 'Dashboard list Panel'] - ['reference/sharing.md', 'Reference', 'Sharing'] - ['reference/annotations.md', 'Reference', 'Annotations'] - ['reference/timerange.md', 'Reference', 'Time range controls'] diff --git a/docs/sources/reference/dashlist.md b/docs/sources/reference/dashlist.md index 6f591169f2c..9a54a18e288 100644 --- a/docs/sources/reference/dashlist.md +++ b/docs/sources/reference/dashlist.md @@ -6,4 +6,22 @@ page_keywords: grafana, dashlist, panel, documentation # Dashlist Panel +## Overview +![](/img/v2/dashboard_list_panel.png) + +The dashboard list panel allows you to show a list of links to other dashboards. The list +can be based on a search query or dashboard tag query. You can also configure it to show your starred +dashboards. + +## Options +![](/img/v2/dashboard_list_panel_options.png) + +Name | Description +------------ | ------------- +Mode | Set search or starred mode +Query | If in search mode specify the search query +Tags | if in search mode specify dashboard tags to search for +Limit number to | Specify the maximum number of dashboards + + diff --git a/public/app/panels/dashlist/editor.html b/public/app/panels/dashlist/editor.html index ff2e75fd95c..7b176b74317 100644 --- a/public/app/panels/dashlist/editor.html +++ b/public/app/panels/dashlist/editor.html @@ -7,7 +7,7 @@ Mode
        • - +
        @@ -47,7 +47,7 @@ Limit number to
      • - +
      diff --git a/public/app/panels/dashlist/module.js b/public/app/panels/dashlist/module.js index 647199d6538..3e7c8c5587c 100644 --- a/public/app/panels/dashlist/module.js +++ b/public/app/panels/dashlist/module.js @@ -21,7 +21,7 @@ function (angular, app, _, config, PanelMeta) { module.controller('DashListPanelCtrl', function($scope, panelSrv, backendSrv) { $scope.panelMeta = new PanelMeta({ - panelName: 'Dash list', + panelName: 'Dashboard list', editIcon: "fa fa-star", fullscreen: true, }); From dbd46a523fe1023f56614fd665cfbf7b2cfcace0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 6 Jul 2015 13:43:08 +0200 Subject: [PATCH 369/398] Work arround for slower template variable dropdown when variable has many thousand values, now only top 1000 values are rendered to html, you can still search all values, Closes #2246 --- public/app/directives/valueSelectDropdown.js | 8 +++++++- public/app/features/templating/templateValuesSrv.js | 1 + public/app/partials/valueSelectDropdown.html | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/public/app/directives/valueSelectDropdown.js b/public/app/directives/valueSelectDropdown.js index 8c963bcf1eb..65b45135fd5 100644 --- a/public/app/directives/valueSelectDropdown.js +++ b/public/app/directives/valueSelectDropdown.js @@ -29,7 +29,11 @@ function (angular, app, _) { return tag; }); - vm.search = {query: '', options: vm.options}; + vm.search = { + query: '', + options: vm.options.slice(0, Math.min(vm.options.length, 1000)) + }; + vm.dropdownVisible = true; }; @@ -204,6 +208,8 @@ function (angular, app, _) { vm.search.options = _.filter(vm.options, function(option) { return option.text.toLowerCase().indexOf(vm.search.query.toLowerCase()) !== -1; }); + + vm.search.options = vm.search.options.slice(0, Math.min(vm.search.options.length, 1000)); }; vm.init = function() { diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 8e91403c1e4..a5767ffa312 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -10,6 +10,7 @@ function (angular, _, kbn) { module.service('templateValuesSrv', function($q, $rootScope, datasourceSrv, $location, templateSrv, timeSrv) { var self = this; + function getNoneOption() { return { text: 'None', value: '', isNone: true }; } $rootScope.onAppEvent('time-range-changed', function() { diff --git a/public/app/partials/valueSelectDropdown.html b/public/app/partials/valueSelectDropdown.html index 4ecb46db14b..a75b7e8a6a9 100644 --- a/public/app/partials/valueSelectDropdown.html +++ b/public/app/partials/valueSelectDropdown.html @@ -19,7 +19,7 @@ Selected ({{vm.selectedValues.length}})       - + {{option.text}} From a4b8a88ae59d980e00970a5eec5d4676b25a12cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 6 Jul 2015 15:01:37 +0200 Subject: [PATCH 370/398] Worked on templating docs, Closes #2274 --- docs/sources/reference/templating.md | 41 ++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/docs/sources/reference/templating.md b/docs/sources/reference/templating.md index f66a8838441..397aaddec91 100644 --- a/docs/sources/reference/templating.md +++ b/docs/sources/reference/templating.md @@ -5,14 +5,43 @@ page_keywords: grafana, templating, variables, guide, documentation --- # Templated Dashboards +![](/img/v2/templating_var_list.png) -Templating feature can be enabled under dashboard settings, in the Features tab. The templating feature allows -you to create variables that can be used in your metric queries, series names and panel titles. Use this feature to -create generic dashboards that can quickly be changed to show graphs for different servers or metrics. +## Overview +Templating allows you to create dashboard variables that can be used in your metric queries, series +names and panel titles. Use this feature to create generic dashboards that can quickly be +changed to show graphs for different servers or metrics. + +You find this feature in the dashboard cog dropdown menu. + +## Variable types +There are three different types of template variables. They can all be used in the +same way but they differ in how the list variables values is created. + +### Query +This is the most common type of variable. It allows you to create a variable +with values fetched directly from a data source via a metric exploration query. + +For example a query like `prod.servers.*` will fill the variable with all possible +values that exists in the wildcard position (Graphite example). + +You can also create nested variables that use other variables in their definition. For example +`apps.$app.servers.*` uses the variable `$app` in its query definition. + +> For examples of template queries appropriate for your data source checkout the documentation +> page for your data source. + +### Interval +This variable type is useful for time ranges like `1m`,`1h`, `1d`. There is also an auto +option that will change depending on the current time range, you can specify how many times +the current time range should be divided to calculate the current `auto` range. + +![](/img/v2/templated_variable_parameter.png) + +### Custom +This variable type allow you to manually specify all the different values as a comma seperated +string. ## Screencast - Templated Graphite Queries -
      -## Screencast - Templated InfluxDB Queries -Coming soon From 572d35506b3ca1e02f908aaac0b9483f802acee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 6 Jul 2015 15:58:16 +0200 Subject: [PATCH 371/398] Removed some editor srv properites from data sources, they are not needed there anymore, they are in plugin.json, Closes #2283 --- public/app/plugins/datasource/influxdb/datasource.js | 2 -- public/app/plugins/datasource/kairosdb/datasource.js | 1 - public/app/plugins/datasource/opentsdb/datasource.js | 1 - 3 files changed, 4 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/datasource.js b/public/app/plugins/datasource/influxdb/datasource.js index cc2e798f70b..f5b01fad79f 100644 --- a/public/app/plugins/datasource/influxdb/datasource.js +++ b/public/app/plugins/datasource/influxdb/datasource.js @@ -28,8 +28,6 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { this.supportAnnotations = true; this.supportMetrics = true; - this.editorSrc = 'app/features/influxdb/partials/query.editor.html'; - this.annotationEditorSrc = 'app/features/influxdb/partials/annotations.editor.html'; } InfluxDatasource.prototype.query = function(options) { diff --git a/public/app/plugins/datasource/kairosdb/datasource.js b/public/app/plugins/datasource/kairosdb/datasource.js index 09864e0548a..d0cddca3bec 100644 --- a/public/app/plugins/datasource/kairosdb/datasource.js +++ b/public/app/plugins/datasource/kairosdb/datasource.js @@ -13,7 +13,6 @@ function (angular, _, kbn) { function KairosDBDatasource(datasource) { this.type = datasource.type; - this.editorSrc = 'plugins/datasources/kairosdb/kairosdb.editor.html'; this.url = datasource.url; this.name = datasource.name; this.supportMetrics = true; diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js index 43b595371e3..324d42e48a7 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.js +++ b/public/app/plugins/datasource/opentsdb/datasource.js @@ -14,7 +14,6 @@ function (angular, _, kbn) { function OpenTSDBDatasource(datasource) { this.type = 'opentsdb'; - this.editorSrc = 'app/features/opentsdb/partials/query.editor.html'; this.url = datasource.url; this.name = datasource.name; this.supportMetrics = true; From af50188a60ff4921ab3b4acc9e32fac88a30cdbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 6 Jul 2015 17:16:17 +0200 Subject: [PATCH 372/398] Removed alpha notice for influxdb 0.9 data source config --- .../app/plugins/datasource/influxdb/partials/config.html | 8 -------- 1 file changed, 8 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/partials/config.html b/public/app/plugins/datasource/influxdb/partials/config.html index 1f7bf27a2a1..66c39fe7b69 100644 --- a/public/app/plugins/datasource/influxdb/partials/config.html +++ b/public/app/plugins/datasource/influxdb/partials/config.html @@ -1,11 +1,3 @@ -
      -
      Data source implementation: Alpha stage
      -
        -
      • This data source implementation is not complete, a lot is not working and implemented yet
        • -
      • Updates can be tracked, and feedback directed here #1525.
        • -
      -
      -

      From 8d7ac3862c3f12df3ee3abea46bc858fd67a11c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 7 Jul 2015 14:28:49 +0200 Subject: [PATCH 373/398] Fixed issue with dashlinks/panellinks and sending template variable value 'All', Fixes #2297 --- public/app/features/templating/templateSrv.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/public/app/features/templating/templateSrv.js b/public/app/features/templating/templateSrv.js index 4c9d47ae2e2..40b661b0cbc 100644 --- a/public/app/features/templating/templateSrv.js +++ b/public/app/features/templating/templateSrv.js @@ -116,8 +116,16 @@ function (angular, _) { }; this.fillVariableValuesForUrl = function(params) { + var toUrlVal = function(current) { + if (current.text === 'All') { + return 'All'; + } else { + return current.value; + } + }; + _.each(this.variables, function(variable) { - params['var-' + variable.name] = variable.current.value; + params['var-' + variable.name] = toUrlVal(variable.current); }); }; From 24e527ae0264e1f6bee34c749c8644f8bc313450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 7 Jul 2015 14:50:23 +0200 Subject: [PATCH 374/398] Updated Graphite docs, Closes #2271 --- docs/sources/datasources/graphite.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/sources/datasources/graphite.md b/docs/sources/datasources/graphite.md index 368feeda8c3..05a4891c581 100644 --- a/docs/sources/datasources/graphite.md +++ b/docs/sources/datasources/graphite.md @@ -57,3 +57,16 @@ this consolidation is done using `avg` function. You can how graphite consolidat > *Notice* This means that legend summary values (max, min, total) cannot be all correct at the same time. They are calculated > client side by Grafana. And depending on your consolidation function only one or two can be correct at the same time. + +## Templating +You can create a template variable in Grafana and have that variable filled with values from any Graphite metric exploration query. +You can then use this variable in your Graphite queries, either as part of a metric path or as arguments to functions. + +For example a query like `prod.servers.*` will fill the variable with all possible +values that exists in the wildcard position. + +You can also create nested variables that use other variables in their definition. For example +`apps.$app.servers.*` uses the variable `$app` in its query definition. + +![](/img/v2/templated_variable_parameter.png) + From f6ad386ba7de521de0461841c84d20f3a434cf4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 7 Jul 2015 17:14:57 +0200 Subject: [PATCH 375/398] Fixed capital G in Graphite in docs, reviewed annotation docs, Closes #2275 --- docs/sources/datasources/graphite.md | 6 +++--- docs/sources/reference/annotations.md | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/sources/datasources/graphite.md b/docs/sources/datasources/graphite.md index 05a4891c581..d41a987514c 100644 --- a/docs/sources/datasources/graphite.md +++ b/docs/sources/datasources/graphite.md @@ -6,7 +6,7 @@ page_keywords: grafana, graphite, metrics, query, documentation # Graphite -Grafana has an advanced graphite query editor that lets you quickly navigate the metric space, add functions, +Grafana has an advanced Graphite query editor that lets you quickly navigate the metric space, add functions, change function parameters and much more. The editor can handle all types of graphite queries. It can even handle complex nested queries through the use of query references. @@ -52,8 +52,8 @@ Some functions like aliasByNode support an optional second argument. To add this ## Point consolidation -All graphite metrics are consolidated so that graphite doesn't return more data points than there are pixels in the graph. By default -this consolidation is done using `avg` function. You can how graphite consolidates metrics by adding the Graphite consolidateBy function. +All Graphite metrics are consolidated so that Graphite doesn't return more data points than there are pixels in the graph. By default +this consolidation is done using `avg` function. You can how Graphite consolidates metrics by adding the Graphite consolidateBy function. > *Notice* This means that legend summary values (max, min, total) cannot be all correct at the same time. They are calculated > client side by Grafana. And depending on your consolidation function only one or two can be correct at the same time. diff --git a/docs/sources/reference/annotations.md b/docs/sources/reference/annotations.md index 51c9ac1ba32..b0e84ef762b 100644 --- a/docs/sources/reference/annotations.md +++ b/docs/sources/reference/annotations.md @@ -13,7 +13,7 @@ you can get title, tags, and text information for the event. To add an annotation query click dashboard settings icon in top menu and select `Annotations` from the dropdown. This will open the `Annotations` edit view. Click the `Add` tab to add a new annotation query. -### Graphite annotations +## Graphite annotations Graphite supports two ways to query annotations. @@ -36,5 +36,4 @@ as the name for the fields that should be used for the annotation title, tags an For InfluxDB you need to enter a query like in the above screenshot. You need to have the ```where $timeFilter``` part. If you only select one column you will not need to enter anything in the column mapping fields. -If you have multiple columns you need to specify which column should be treated as title, tags and text column. From f237cac074f916557d07cb022995635bcbc7375b Mon Sep 17 00:00:00 2001 From: "Haneysmith, Nathan" Date: Tue, 7 Jul 2015 11:56:36 -0700 Subject: [PATCH 376/398] add double quotes around tags --- public/app/plugins/datasource/influxdb/queryBuilder.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/queryBuilder.js b/public/app/plugins/datasource/influxdb/queryBuilder.js index ce76e545743..a167abb81d6 100644 --- a/public/app/plugins/datasource/influxdb/queryBuilder.js +++ b/public/app/plugins/datasource/influxdb/queryBuilder.js @@ -15,9 +15,9 @@ function (_) { } if (tag.value && tag.value[0] === '/' && tag.value[tag.value.length - 1] === '/') { - return str + tag.key + ' =~ ' + tag.value; + return str + '"' +tag.key + '"' + ' =~ ' + tag.value; } - return str + tag.key + " = '" + tag.value + "'"; + return str + '"' + tag.key + '"' + " = '" + tag.value + "'"; } var p = InfluxQueryBuilder.prototype; @@ -92,7 +92,7 @@ function (_) { query += ' GROUP BY time($interval)'; if (target.groupByTags && target.groupByTags.length > 0) { - query += ', ' + target.groupByTags.join(); + query += ', "' + target.groupByTags.join('", "') + '"'; } if (target.fill) { From cd53c78449938b3ff401c8b09e2f7e181ba41283 Mon Sep 17 00:00:00 2001 From: "Haneysmith, Nathan" Date: Tue, 7 Jul 2015 13:15:51 -0700 Subject: [PATCH 377/398] updating tests for influxdb quoting --- public/test/specs/influx09-querybuilder-specs.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/public/test/specs/influx09-querybuilder-specs.js b/public/test/specs/influx09-querybuilder-specs.js index 93f1cef155a..611b384d24e 100644 --- a/public/test/specs/influx09-querybuilder-specs.js +++ b/public/test/specs/influx09-querybuilder-specs.js @@ -27,14 +27,14 @@ define([ var query = builder.build(); it('should generate correct query', function() { - expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE hostname = \'server1\' AND $timeFilter' + expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE "hostname" = \'server1\' AND $timeFilter' + ' GROUP BY time($interval) ORDER BY asc'); }); it('should switch regex operator with tag value is regex', function() { var builder = new InfluxQueryBuilder({measurement: 'cpu', tags: [{key: 'app', value: '/e.*/'}]}); var query = builder.build(); - expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE app =~ /e.*/ AND $timeFilter GROUP BY time($interval) ORDER BY asc'); + expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE "app" =~ /e.*/ AND $timeFilter GROUP BY time($interval) ORDER BY asc'); }); }); @@ -47,7 +47,7 @@ define([ var query = builder.build(); it('should generate correct query', function() { - expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE hostname = \'server1\' AND app = \'email\' AND ' + + expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE "hostname" = \'server1\' AND "app" = \'email\' AND ' + '$timeFilter GROUP BY time($interval) ORDER BY asc'); }); }); @@ -61,7 +61,7 @@ define([ var query = builder.build(); it('should generate correct query', function() { - expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE hostname = \'server1\' OR hostname = \'server2\' AND ' + + expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE "hostname" = \'server1\' OR "hostname" = \'server2\' AND ' + '$timeFilter GROUP BY time($interval) ORDER BY asc'); }); }); @@ -76,7 +76,7 @@ define([ var query = builder.build(); expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE $timeFilter ' + - 'GROUP BY time($interval), host ORDER BY asc'); + 'GROUP BY time($interval), "host" ORDER BY asc'); }); }); @@ -121,13 +121,13 @@ define([ it('should have measurement tag condition and tag name IN filter in tag values query', function() { var builder = new InfluxQueryBuilder({measurement: 'cpu', tags: [{key: 'app', value: 'email'}, {key: 'host', value: 'server1'}]}); var query = builder.buildExploreQuery('TAG_VALUES', 'app'); - expect(query).to.be('SHOW TAG VALUES FROM "cpu" WITH KEY = "app" WHERE host = \'server1\''); + expect(query).to.be('SHOW TAG VALUES FROM "cpu" WITH KEY = "app" WHERE "host" = \'server1\''); }); it('should switch to regex operator in tag condition', function() { var builder = new InfluxQueryBuilder({measurement: 'cpu', tags: [{key: 'host', value: '/server.*/'}]}); var query = builder.buildExploreQuery('TAG_VALUES', 'app'); - expect(query).to.be('SHOW TAG VALUES FROM "cpu" WITH KEY = "app" WHERE host =~ /server.*/'); + expect(query).to.be('SHOW TAG VALUES FROM "cpu" WITH KEY = "app" WHERE "host" =~ /server.*/'); }); }); From 56c332a3dddde48bde40e873cceffc904d14f095 Mon Sep 17 00:00:00 2001 From: "Haneysmith, Nathan" Date: Tue, 7 Jul 2015 13:19:15 -0700 Subject: [PATCH 378/398] more test updates for influxdb quoting --- public/test/specs/influx09-querybuilder-specs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/test/specs/influx09-querybuilder-specs.js b/public/test/specs/influx09-querybuilder-specs.js index 611b384d24e..838e1950072 100644 --- a/public/test/specs/influx09-querybuilder-specs.js +++ b/public/test/specs/influx09-querybuilder-specs.js @@ -97,7 +97,7 @@ define([ it('should have where condition in tag keys query with tags', function() { var builder = new InfluxQueryBuilder({ measurement: '', tags: [{key: 'host', value: 'se1'}] }); var query = builder.buildExploreQuery('TAG_KEYS'); - expect(query).to.be("SHOW TAG KEYS WHERE host = 'se1'"); + expect(query).to.be("SHOW TAG KEYS WHERE \"host\" = 'se1'"); }); it('should have no conditions in measurement query for query with no tags', function() { @@ -109,7 +109,7 @@ define([ it('should have where condition in measurement query for query with tags', function() { var builder = new InfluxQueryBuilder({measurement: '', tags: [{key: 'app', value: 'email'}]}); var query = builder.buildExploreQuery('MEASUREMENTS'); - expect(query).to.be("SHOW MEASUREMENTS WHERE app = 'email'"); + expect(query).to.be("SHOW MEASUREMENTS WHERE \"app\" = 'email'"); }); it('should have where tag name IN filter in tag values query for query with one tag', function() { From ac37b54ddb3c2c9d7eb18c572fe033418d9913f4 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Tue, 7 Jul 2015 16:07:19 -0700 Subject: [PATCH 379/398] fix datasource api docs reflects change in e2f6633d57624664654463578e8d2502bfd7ffef --- docs/sources/reference/http_api.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/sources/reference/http_api.md b/docs/sources/reference/http_api.md index 9e24ccb39d7..90b7274cce6 100644 --- a/docs/sources/reference/http_api.md +++ b/docs/sources/reference/http_api.md @@ -183,7 +183,7 @@ Status Codes: ### Create data source -`PUT /api/datasources` +`POST /api/datasources` **Example Response**: @@ -192,9 +192,9 @@ Status Codes: {"message":"Datasource added"} -### Edit an existing data source +### Update an existing data source -`POST /api/datasources` +`PUT /api/datasources/:datasourceId` ### Delete an existing data source @@ -269,7 +269,7 @@ Adds a global user to the actual organisation. ### Delete User in Organisation -`DELETE /api/orgs/:orgId/users/:userId` +`DELETE /api/orgs/:orgId/users/:userId` ## Users From 66ba19b7ba3d9a3e27dd76b9a46be41c56e0009d Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Tue, 7 Jul 2015 12:51:38 -0700 Subject: [PATCH 380/398] clearer errors "Not found" should only be for http path/method not found (404) if it's about specific resources, we should be explicit for clarity --- pkg/api/dashboard_snapshot.go | 2 +- pkg/models/dashboards.go | 1 + pkg/models/models.go | 4 ---- pkg/services/sqlstore/dashboard_snapshot.go | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go index 0061a2eba19..be044cc25eb 100644 --- a/pkg/api/dashboard_snapshot.go +++ b/pkg/api/dashboard_snapshot.go @@ -59,7 +59,7 @@ func GetDashboardSnapshot(c *middleware.Context) { // expired snapshots should also be removed from db if snapshot.Expires.Before(time.Now()) { - c.JsonApiErr(404, "Snapshot not found", err) + c.JsonApiErr(404, "Dashboard snapshot not found", err) return } diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go index cdcc4d52364..7d4a2690556 100644 --- a/pkg/models/dashboards.go +++ b/pkg/models/dashboards.go @@ -11,6 +11,7 @@ import ( // Typed errors var ( ErrDashboardNotFound = errors.New("Dashboard not found") + ErrDashboardSnapshotNotFound = errors.New("Dashboard snapshot not found") ErrDashboardWithSameNameExists = errors.New("A dashboard with the same name already exists") ErrDashboardVersionMismatch = errors.New("The dashboard has been changed by someone else") ) diff --git a/pkg/models/models.go b/pkg/models/models.go index c38f0c5a391..189e594576b 100644 --- a/pkg/models/models.go +++ b/pkg/models/models.go @@ -1,7 +1,5 @@ package models -import "errors" - type OAuthType int const ( @@ -9,5 +7,3 @@ const ( GOOGLE TWITTER ) - -var ErrNotFound = errors.New("Not found") diff --git a/pkg/services/sqlstore/dashboard_snapshot.go b/pkg/services/sqlstore/dashboard_snapshot.go index 0bbb01ed6bd..f4611050a77 100644 --- a/pkg/services/sqlstore/dashboard_snapshot.go +++ b/pkg/services/sqlstore/dashboard_snapshot.go @@ -57,7 +57,7 @@ func GetDashboardSnapshot(query *m.GetDashboardSnapshotQuery) error { if err != nil { return err } else if has == false { - return m.ErrNotFound + return m.ErrDashboardSnapshotNotFound } query.Result = &snapshot From b746b63036046b95702c5681db35b18f6a895f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 8 Jul 2015 10:52:50 +0200 Subject: [PATCH 381/398] Updated config docs with info about [dashboards.json] section , #2302 --- docs/sources/installation/configuration.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index cd4b4d20276..69142d57eb8 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -32,10 +32,10 @@ should be upper case, `.` should be replaced by `_`. For example, given these co [security] admin_user = admin - + [auth.google] client_secret = 0ldS3cretKey - + Then you can override that using: @@ -367,3 +367,14 @@ enabled. Counters are sent every 24 hours. Default value is `true`. If you want to track Grafana usage via Google analytics specify *your* Universal Analytics ID here. By default this feature is disabled. + +## [dashboards.json] + +If you have a system that automatically builds dashboards as json files you can enable this feature to have the +Grafana backend index those json dashboards which will make them appear in regular dashboard search. + +### enabled +`true` or `false`. Is disabled by default. + +### path +The full path to a directory containing your json dashboards. From 3b39c43193ad56030968ee0d441ad6d8b495660a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 8 Jul 2015 11:06:11 +0200 Subject: [PATCH 382/398] Updated docs version and version fragment --- docs/VERSION | 2 +- docs/sources/versions.html_fragment | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/VERSION b/docs/VERSION index edb49bc725f..7ec1d6db408 100644 --- a/docs/VERSION +++ b/docs/VERSION @@ -1 +1 @@ -2.0.0-beta +2.1.0 diff --git a/docs/sources/versions.html_fragment b/docs/sources/versions.html_fragment index 00ee000a0f0..0ad0144831e 100644 --- a/docs/sources/versions.html_fragment +++ b/docs/sources/versions.html_fragment @@ -1,2 +1,3 @@ +
    • Version v2.1
    • Version v2.0
    • Version v1.9
      • From 5d7c485991f34e90e1c5398785e93d6ac71ee82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 8 Jul 2015 13:44:36 +0200 Subject: [PATCH 383/398] fix(templating): can now use template vars in collapsed row title, Fixes #2305 --- docs/sources/versions.html_fragment | 2 +- public/app/partials/dashboard.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sources/versions.html_fragment b/docs/sources/versions.html_fragment index 0ad0144831e..55190af8b37 100644 --- a/docs/sources/versions.html_fragment +++ b/docs/sources/versions.html_fragment @@ -1,3 +1,3 @@ -
    • Version v2.1
      • +
    • Version v2.1
    • Version v2.0
    • Version v1.9
      • diff --git a/public/app/partials/dashboard.html b/public/app/partials/dashboard.html index 3ea34d0db0a..57c9cb74521 100644 --- a/public/app/partials/dashboard.html +++ b/public/app/partials/dashboard.html @@ -21,7 +21,7 @@
    -
    +
    From a958965e642a56ad278baf1f5c4270944f2201eb Mon Sep 17 00:00:00 2001 From: David Gillies Date: Wed, 8 Jul 2015 22:13:38 +1000 Subject: [PATCH 384/398] set mode 0640 and group grafana on /etc/grafana/grafana.ini --- packaging/deb/control/postinst | 4 ++-- packaging/rpm/control/postinst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/deb/control/postinst b/packaging/deb/control/postinst index edb163ba7fb..7585d3f879d 100755 --- a/packaging/deb/control/postinst +++ b/packaging/deb/control/postinst @@ -43,9 +43,9 @@ case "$1" in chmod 755 /var/log/grafana /var/lib/grafana # configuration files should not be modifiable by grafana user, as this can be a security issue - chown -Rh root:root /etc/grafana/* + chown -Rh root:$GRAFANA_GROUP /etc/grafana/* chmod 755 /etc/grafana - find /etc/grafana -type f -exec chmod 644 {} ';' + find /etc/grafana -type f -exec chmod 640 {} ';' find /etc/grafana -type d -exec chmod 755 {} ';' # if $2 is set, this is an upgrade diff --git a/packaging/rpm/control/postinst b/packaging/rpm/control/postinst index 9e5e9accf79..fce80719115 100644 --- a/packaging/rpm/control/postinst +++ b/packaging/rpm/control/postinst @@ -43,9 +43,9 @@ if [ $1 -eq 1 ] ; then chmod 755 /var/log/grafana /var/lib/grafana # configuration files should not be modifiable by grafana user, as this can be a security issue - chown -Rh root:root /etc/grafana/* + chown -Rh root:$GRAFANA_GROUP /etc/grafana/* chmod 755 /etc/grafana - find /etc/grafana -type f -exec chmod 644 {} ';' + find /etc/grafana -type f -exec chmod 640 {} ';' find /etc/grafana -type d -exec chmod 755 {} ';' if [ -x /bin/systemctl ] ; then From 63f8800007e5740bb6f2a0db701fc54d96f89379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 8 Jul 2015 14:17:53 +0200 Subject: [PATCH 385/398] fix(docs): Updated getting started docs, Closes #2273, Closes #1978 --- docs/sources/guides/gettingstarted.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/sources/guides/gettingstarted.md b/docs/sources/guides/gettingstarted.md index 641dc9516f5..a2939b3724a 100644 --- a/docs/sources/guides/gettingstarted.md +++ b/docs/sources/guides/gettingstarted.md @@ -40,6 +40,15 @@ in the main Time Picker in the upper right, but they can also have relative time 5. Dashboard panel. You edit panels by clicking the panel title. 6. Graph legend. You can change series colors, y-axis and series visibility directly from the legend. +## Adding & Editing Graphs and Panels + +![](/img/v2/graph_metrics_tab_graphite.png) + +1. You add panels via row menu. The row menu is the green icon to the left of each row. +2. To edit the graph you click on the graph title to open the panel menu, then `Edit`. +3. This should take you to the `Metrics` tab. In this tab you should see the editor for your default data source. + + ## Drag-and-Drop panels You can Drag-and-Drop Panels within and between Rows. Click and hold the Panel title, and drag it to its new location. From 5cd1c5c522f4cc68aeb1b8aab07089231a668b25 Mon Sep 17 00:00:00 2001 From: David Gillies Date: Wed, 8 Jul 2015 22:40:43 +1000 Subject: [PATCH 386/398] Minor update to documentation for MySQL sessions --- docs/sources/installation/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 69142d57eb8..6310ccb7973 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -327,7 +327,7 @@ This option should be configured differently depending on what type of session provider you have configured. - **file:** session file path, e.g. `data/sessions` -- **mysql:** go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name` +- **mysql:** go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name` - **postgres:** ex: user=a password=b host=localhost port=5432 dbname=c sslmode=disable If you use MySQL or Postgres as the session store you need to create the From 597c1f6a411f9ae867035aad7d2aa0f400f353e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 8 Jul 2015 17:41:36 +0200 Subject: [PATCH 387/398] feat(influxdb): began work on some influxdb enhancements, #2311 --- docs/sources/guides/gettingstarted.md | 1 - .../plugins/datasource/influxdb/funcEditor.js | 18 +++++++----------- .../influxdb/partials/query.editor.html | 11 +++++------ .../datasource/influxdb/queryBuilder.js | 7 +++++-- .../plugins/datasource/influxdb/queryCtrl.js | 14 +++++++++++++- .../test/specs/influx09-querybuilder-specs.js | 6 ++++++ 6 files changed, 36 insertions(+), 21 deletions(-) diff --git a/docs/sources/guides/gettingstarted.md b/docs/sources/guides/gettingstarted.md index a2939b3724a..4bb250ef55c 100644 --- a/docs/sources/guides/gettingstarted.md +++ b/docs/sources/guides/gettingstarted.md @@ -48,7 +48,6 @@ in the main Time Picker in the upper right, but they can also have relative time 2. To edit the graph you click on the graph title to open the panel menu, then `Edit`. 3. This should take you to the `Metrics` tab. In this tab you should see the editor for your default data source. - ## Drag-and-Drop panels You can Drag-and-Drop Panels within and between Rows. Click and hold the Panel title, and drag it to its new location. diff --git a/public/app/plugins/datasource/influxdb/funcEditor.js b/public/app/plugins/datasource/influxdb/funcEditor.js index 12731c0859d..05bcae6835b 100644 --- a/public/app/plugins/datasource/influxdb/funcEditor.js +++ b/public/app/plugins/datasource/influxdb/funcEditor.js @@ -11,30 +11,26 @@ function (angular, _, $) { .directive('influxdbFuncEditor', function($compile) { var funcSpanTemplate = '{{target.function}}('; + 'data-toggle="dropdown">{{field.func}}('; var paramTemplate = ''; return { restrict: 'A', + scope: { + field: "=", + }, link: function postLink($scope, elem) { var $funcLink = $(funcSpanTemplate); - $scope.functionMenu = _.map($scope.functions, function(func) { - return { - text: func, - click: "changeFunction('" + func + "');" - }; - }); - function clickFuncParam() { /*jshint validthis:true */ var $link = $(this); var $input = $link.next(); - $input.val($scope.target.column); + $input.val($scope.field.name); $input.css('width', ($link.width() + 16) + 'px'); $link.hide(); @@ -58,7 +54,7 @@ function (angular, _, $) { if ($input.val() !== '') { $link.text($input.val()); - $scope.target.column = $input.val(); + $scope.field.name = $input.val(); $scope.$apply($scope.get_data); } @@ -84,7 +80,7 @@ function (angular, _, $) { $input.typeahead({ source: function () { - return $scope.listColumns.apply(null, arguments); + return $scope.getFields.apply(null, arguments); }, minLength: 0, items: 20, diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html index 89571c06022..81e0b07cbd9 100644 --- a/public/app/plugins/datasource/influxdb/partials/query.editor.html +++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html @@ -65,10 +65,9 @@
  • SELECT
    • -
  • - - {{target.function}}(value) - +
  • + +
    • @@ -114,8 +113,8 @@ -
  • - GROUP BY +
  • + GROUP BY
  • diff --git a/public/app/plugins/datasource/influxdb/queryBuilder.js b/public/app/plugins/datasource/influxdb/queryBuilder.js index a167abb81d6..ca7bb02496d 100644 --- a/public/app/plugins/datasource/influxdb/queryBuilder.js +++ b/public/app/plugins/datasource/influxdb/queryBuilder.js @@ -32,12 +32,15 @@ function (_) { if (type === 'TAG_KEYS') { query = 'SHOW TAG KEYS'; - measurement= this.target.measurement; + measurement = this.target.measurement; } else if (type === 'TAG_VALUES') { query = 'SHOW TAG VALUES'; - measurement= this.target.measurement; + measurement = this.target.measurement; } else if (type === 'MEASUREMENTS') { query = 'SHOW MEASUREMENTS'; + } else if (type === 'FIELDS') { + query = 'SHOW FIELD KEYS FROM "' + this.target.measurement + '"'; + return query; } if (measurement) { diff --git a/public/app/plugins/datasource/influxdb/queryCtrl.js b/public/app/plugins/datasource/influxdb/queryCtrl.js index d1a524d2277..16e74c8e6bf 100644 --- a/public/app/plugins/datasource/influxdb/queryCtrl.js +++ b/public/app/plugins/datasource/influxdb/queryCtrl.js @@ -21,9 +21,12 @@ function (angular, _, InfluxQueryBuilder) { $scope.init = function() { var target = $scope.target; - target.function = target.function || 'mean'; target.tags = target.tags || []; target.groupByTags = target.groupByTags || []; + target.fields = target.fields || [{ + name: 'value', + func: target.function || 'mean' + }]; $scope.queryBuilder = new InfluxQueryBuilder(target); @@ -94,6 +97,15 @@ function (angular, _, InfluxQueryBuilder) { $scope.$parent.get_data(); }; + $scope.getFields = function(query, callback) { + var fieldsQuery = $scope.queryBuilder.buildExploreQuery('FIELDS'); + return $scope.datasource.metricFindQuery(fieldsQuery) + .then(function(results) { + var fields = _.pluck(results, 'text'); + callback(fields); + }); + }; + $scope.toggleQueryMode = function () { $scope.target.rawQuery = !$scope.target.rawQuery; }; diff --git a/public/test/specs/influx09-querybuilder-specs.js b/public/test/specs/influx09-querybuilder-specs.js index 838e1950072..6a18f0013bd 100644 --- a/public/test/specs/influx09-querybuilder-specs.js +++ b/public/test/specs/influx09-querybuilder-specs.js @@ -130,6 +130,12 @@ define([ expect(query).to.be('SHOW TAG VALUES FROM "cpu" WITH KEY = "app" WHERE "host" =~ /server.*/'); }); + it('should build show field query', function() { + var builder = new InfluxQueryBuilder({measurement: 'cpu', tags: [{key: 'app', value: 'email'}]}); + var query = builder.buildExploreQuery('FIELDS'); + expect(query).to.be('SHOW FIELD KEYS FROM "cpu"'); + }); + }); }); From dca45f177fa50843800dfc40bf89b140e6288acd Mon Sep 17 00:00:00 2001 From: Alex Laverty Date: Thu, 9 Jul 2015 11:50:29 +1000 Subject: [PATCH 388/398] Fixed invalid json example, added missing comma --- docs/sources/reference/http_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/reference/http_api.md b/docs/sources/reference/http_api.md index 90b7274cce6..fb9e7600ecf 100644 --- a/docs/sources/reference/http_api.md +++ b/docs/sources/reference/http_api.md @@ -53,7 +53,7 @@ Creates a new dashboard or updates an existing dashboard. "rows": [ { } - ] + ], "schemaVersion": 6, "version": 0 }, From 3f2c1de28d406f45f387da3f9960967b9a76580e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 9 Jul 2015 08:59:58 +0200 Subject: [PATCH 389/398] fix(OpenTSDB): fixed issue with OpenTSDB and query to result matching, Fixes #2315 --- public/app/plugins/datasource/opentsdb/datasource.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js index 324d42e48a7..d35c88fc45d 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.js +++ b/public/app/plugins/datasource/opentsdb/datasource.js @@ -50,6 +50,9 @@ function (angular, _, kbn) { var metricToTargetMapping = mapMetricsToTargets(response.data, options); var result = _.map(response.data, function(metricData, index) { index = metricToTargetMapping[index]; + if (index === -1) { + index = 0; + } return transformMetricData(metricData, groupByTags, options.targets[index], options); }); return { data: result }; From 50795adcf0acf21b14b1eabf890f1945cd919972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 9 Jul 2015 16:36:47 +0200 Subject: [PATCH 390/398] feat(influxdb 0.9): field lookup and other enhancements, #2311 --- .../plugins/datasource/influxdb/funcEditor.js | 26 ++++++++++++++++--- .../influxdb/partials/query.editor.html | 2 +- .../datasource/influxdb/queryBuilder.js | 18 ++++++++++--- .../plugins/datasource/influxdb/queryCtrl.js | 14 ++-------- .../test/specs/influx09-querybuilder-specs.js | 14 ++++++++++ 5 files changed, 54 insertions(+), 20 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/funcEditor.js b/public/app/plugins/datasource/influxdb/funcEditor.js index 05bcae6835b..7631363fa12 100644 --- a/public/app/plugins/datasource/influxdb/funcEditor.js +++ b/public/app/plugins/datasource/influxdb/funcEditor.js @@ -16,14 +16,32 @@ function (angular, _, $) { var paramTemplate = ''; + var functionList = [ + 'count', 'mean', 'sum', 'min', 'max', 'mode', 'distinct', 'median', + 'derivative', 'stddev', 'first', 'last', 'difference' + ]; + + var functionMenu = _.map(functionList, function(func) { + return { text: func, click: "changeFunction('" + func + "');" }; + }); + return { restrict: 'A', scope: { field: "=", + getFields: "&", + onChange: "&", }, link: function postLink($scope, elem) { var $funcLink = $(funcSpanTemplate); + $scope.functionMenu = functionMenu; + + $scope.changeFunction = function(func) { + $scope.field.func = func; + $scope.onChange(); + }; + function clickFuncParam() { /*jshint validthis:true */ @@ -55,7 +73,7 @@ function (angular, _, $) { $link.text($input.val()); $scope.field.name = $input.val(); - $scope.$apply($scope.get_data); + $scope.$apply($scope.onChange()); } $input.hide(); @@ -79,8 +97,10 @@ function (angular, _, $) { $input.attr('data-provide', 'typeahead'); $input.typeahead({ - source: function () { - return $scope.getFields.apply(null, arguments); + source: function (query, callback) { + return $scope.getFields().then(function(results) { + callback(results); + }); }, minLength: 0, items: 20, diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html index 81e0b07cbd9..216f099d125 100644 --- a/public/app/plugins/datasource/influxdb/partials/query.editor.html +++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html @@ -66,7 +66,7 @@ SELECT
  • - +
    • diff --git a/public/app/plugins/datasource/influxdb/queryBuilder.js b/public/app/plugins/datasource/influxdb/queryBuilder.js index ca7bb02496d..717ae22847f 100644 --- a/public/app/plugins/datasource/influxdb/queryBuilder.js +++ b/public/app/plugins/datasource/influxdb/queryBuilder.js @@ -76,15 +76,25 @@ function (_) { throw "Metric measurement is missing"; } - var query = 'SELECT '; - var measurement = target.measurement; - var aggregationFunc = target.function || 'mean'; + if (!target.fields) { + target.fields = [{name: 'value', func: target.function || 'mean'}]; + } + var query = 'SELECT '; + var i; + for (i = 0; i < target.fields.length; i++) { + var field = target.fields[i]; + if (i > 0) { + query += ', '; + } + query += field.func + '(' + field.name + ')'; + } + + var measurement = target.measurement; if (!measurement.match('^/.*/') && !measurement.match(/^merge\(.*\)/)) { measurement = '"' + measurement+ '"'; } - query += aggregationFunc + '(value)'; query += ' FROM ' + measurement + ' WHERE '; var conditions = _.map(target.tags, function(tag, index) { return renderTagCondition(tag, index); diff --git a/public/app/plugins/datasource/influxdb/queryCtrl.js b/public/app/plugins/datasource/influxdb/queryCtrl.js index 16e74c8e6bf..e28c6bc034d 100644 --- a/public/app/plugins/datasource/influxdb/queryCtrl.js +++ b/public/app/plugins/datasource/influxdb/queryCtrl.js @@ -10,15 +10,6 @@ function (angular, _, InfluxQueryBuilder) { module.controller('InfluxQueryCtrl', function($scope, $timeout, $sce, templateSrv, $q) { - $scope.functionList = [ - 'count', 'mean', 'sum', 'min', 'max', 'mode', 'distinct', 'median', - 'derivative', 'stddev', 'first', 'last', 'difference' - ]; - - $scope.functionMenu = _.map($scope.functionList, function(func) { - return { text: func, click: "changeFunction('" + func + "');" }; - }); - $scope.init = function() { var target = $scope.target; target.tags = target.tags || []; @@ -97,12 +88,11 @@ function (angular, _, InfluxQueryBuilder) { $scope.$parent.get_data(); }; - $scope.getFields = function(query, callback) { + $scope.getFields = function() { var fieldsQuery = $scope.queryBuilder.buildExploreQuery('FIELDS'); return $scope.datasource.metricFindQuery(fieldsQuery) .then(function(results) { - var fields = _.pluck(results, 'text'); - callback(fields); + return _.pluck(results, 'text'); }); }; diff --git a/public/test/specs/influx09-querybuilder-specs.js b/public/test/specs/influx09-querybuilder-specs.js index 6a18f0013bd..b515cfab6fb 100644 --- a/public/test/specs/influx09-querybuilder-specs.js +++ b/public/test/specs/influx09-querybuilder-specs.js @@ -38,6 +38,20 @@ define([ }); }); + describe('series with multiple fields', function() { + var builder = new InfluxQueryBuilder({ + measurement: 'cpu', + tags: [], + fields: [{ name: 'tx_in', func: 'sum' }, { name: 'tx_out', func: 'mean' }] + }); + + var query = builder.build(); + + it('should generate correct query', function() { + expect(query).to.be('SELECT sum(tx_in), mean(tx_out) FROM "cpu" WHERE $timeFilter GROUP BY time($interval) ORDER BY asc'); + }); + }); + describe('series with multiple tags only', function() { var builder = new InfluxQueryBuilder({ measurement: 'cpu', From 150fd869a01c70a26432fe57dab6f814c4994a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 9 Jul 2015 17:17:17 +0200 Subject: [PATCH 391/398] Finalized work on influxdb field and func selection, #2311 --- .../plugins/datasource/influxdb/funcEditor.js | 2 +- .../influxdb/partials/query.editor.html | 5 +++- .../plugins/datasource/influxdb/queryCtrl.js | 27 ++++++++++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/datasource/influxdb/funcEditor.js b/public/app/plugins/datasource/influxdb/funcEditor.js index 7631363fa12..ae4248cf2a6 100644 --- a/public/app/plugins/datasource/influxdb/funcEditor.js +++ b/public/app/plugins/datasource/influxdb/funcEditor.js @@ -124,7 +124,7 @@ function (angular, _, $) { function addElementsAndCompile() { $funcLink.appendTo(elem); - var $paramLink = $('value'); + var $paramLink = $('' + $scope.field.name + ''); var $input = $(paramTemplate); $paramLink.appendTo(elem); diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html index 216f099d125..d63e6853831 100644 --- a/public/app/plugins/datasource/influxdb/partials/query.editor.html +++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html @@ -66,9 +66,12 @@ SELECT
  • - +
    • +
  • + +
    • diff --git a/public/app/plugins/datasource/influxdb/queryCtrl.js b/public/app/plugins/datasource/influxdb/queryCtrl.js index e28c6bc034d..a57737cba93 100644 --- a/public/app/plugins/datasource/influxdb/queryCtrl.js +++ b/public/app/plugins/datasource/influxdb/queryCtrl.js @@ -27,6 +27,8 @@ function (angular, _, InfluxQueryBuilder) { $scope.measurementSegment = new MetricSegment(target.measurement); } + $scope.addFieldSegment = MetricSegment.newPlusButton(); + $scope.tagSegments = []; _.each(target.tags, function(tag) { if (tag.condition) { @@ -92,7 +94,11 @@ function (angular, _, InfluxQueryBuilder) { var fieldsQuery = $scope.queryBuilder.buildExploreQuery('FIELDS'); return $scope.datasource.metricFindQuery(fieldsQuery) .then(function(results) { - return _.pluck(results, 'text'); + var values = _.pluck(results, 'text'); + if ($scope.target.fields.length > 1) { + values.splice(0, 0, "-- remove from select --"); + } + return values; }); }; @@ -161,6 +167,25 @@ function (angular, _, InfluxQueryBuilder) { .then(null, $scope.handleQueryError); }; + $scope.getFieldSegments = function() { + var fieldsQuery = $scope.queryBuilder.buildExploreQuery('FIELDS'); + return $scope.datasource.metricFindQuery(fieldsQuery) + .then($scope.transformToSegments) + .then(null, $scope.handleQueryError); + }; + + $scope.addField = function() { + $scope.target.fields.push({name: $scope.addFieldSegment.value, func: 'mean'}); + _.extend($scope.addFieldSegment, MetricSegment.newPlusButton()); + }; + + $scope.fieldChanged = function(field) { + if (field.name === '-- remove from select --') { + $scope.target.fields = _.without($scope.target.fields, field); + } + $scope.get_data(); + }; + $scope.getGroupByTagSegments = function(segment) { var query = $scope.queryBuilder.buildExploreQuery('TAG_KEYS'); From 14e25100d4066caaa366ffed9aa0f9d87fa30c78 Mon Sep 17 00:00:00 2001 From: gmembre Date: Thu, 9 Jul 2015 22:17:12 +0200 Subject: [PATCH 392/398] Adding GOPATH --- docs/sources/project/building_from_source.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md index dc08f5a261a..b59d067eec4 100644 --- a/docs/sources/project/building_from_source.md +++ b/docs/sources/project/building_from_source.md @@ -17,6 +17,7 @@ dev environment. ## Get Code ``` +export GOPATH=``pwd` go get github.com/grafana/grafana ``` @@ -24,11 +25,11 @@ go get github.com/grafana/grafana ``` cd $GOPATH/src/github.com/grafana/grafana go run build.go setup (only needed once to install godep) -godep restore (will pull down all golang lib dependecies in your current GOPATH) +$GOPATH/bin/godep restore (will pull down all golang lib dependecies in your current GOPATH) go build . ``` -# Building on Windows +## Building on Windows The Grafana backend includes Sqlite3 which requires GCC to compile. So in order to compile Grafana on windows you need to install GCC. We recommend [TDM-GCC](http://tdm-gcc.tdragon.net/download). From 3fa228dcbba4d0440ea2d4a4c8644bdec4ddc3d0 Mon Sep 17 00:00:00 2001 From: gmembre Date: Thu, 9 Jul 2015 22:49:27 +0200 Subject: [PATCH 393/398] Correcting typo --- docs/sources/project/building_from_source.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md index b59d067eec4..b0ae5cec724 100644 --- a/docs/sources/project/building_from_source.md +++ b/docs/sources/project/building_from_source.md @@ -17,7 +17,7 @@ dev environment. ## Get Code ``` -export GOPATH=``pwd` +export GOPATH=`pwd` go get github.com/grafana/grafana ``` From 244e682c2ba1cbdccc6cb1ee15c5785adbed5e8e Mon Sep 17 00:00:00 2001 From: Johannes Wienke Date: Fri, 10 Jul 2015 12:16:41 +0200 Subject: [PATCH 394/398] Series override option to hide legend entries Adds a series override option to hide certain series from the legend. * public/app/components/timeSeries.js: boolean flag to decide display in legend and application of override option for this flag * public/app/panels/graph/legend.js: exclude hidden series * public/app/panels/graph/seriesOverridesCtrl.js: add legend override option This fixes #2324 --- public/app/components/timeSeries.js | 2 ++ public/app/panels/graph/legend.js | 4 ++++ public/app/panels/graph/seriesOverridesCtrl.js | 1 + 3 files changed, 7 insertions(+) diff --git a/public/app/components/timeSeries.js b/public/app/components/timeSeries.js index 3c41378947e..74194e68ff9 100644 --- a/public/app/components/timeSeries.js +++ b/public/app/components/timeSeries.js @@ -13,6 +13,7 @@ function (_, kbn) { this.color = opts.color; this.valueFormater = kbn.valueFormats.none; this.stats = {}; + this.legend = true; } function matchSeriesOverride(aliasOrRegex, seriesAlias) { @@ -55,6 +56,7 @@ function (_, kbn) { if (override.fillBelowTo !== void 0) { this.fillBelowTo = override.fillBelowTo; } if (override.color !== void 0) { this.color = override.color; } if (override.transform !== void 0) { this.transform = override.transform; } + if (override.legend !== void 0) { this.legend = override.legend; } if (override.yaxis !== void 0) { this.yaxis = override.yaxis; diff --git a/public/app/panels/graph/legend.js b/public/app/panels/graph/legend.js index 1f016f2c3a3..beea27ec8b7 100644 --- a/public/app/panels/graph/legend.js +++ b/public/app/panels/graph/legend.js @@ -130,6 +130,10 @@ function (angular, app, _, kbn, $) { if (panel.legend.hideEmpty && series.allIsNull) { continue; } + // ignore series excluded via override + if (!series.legend) { + continue; + } var html = '
    ) will become Red, Orange, Green (). + + +### Spark Lines + +Spark lines are a great way of seeing the historical data associated with a single stat value, providing valuable context at a glance. Spark lines act differently than traditional graph panels and do not include x or y axis, coordinates, a legend, or ability to interact with the graph. + +![](/img/v1/Singlestat-Sparklines.png) + +1. `Show`: The show checkbox will toggle whether the spark line is shown in the panel. When unselected, only the value will appear. +2. `Background`: **ASK TORKEL.** +3. `Line Color`: This color selection applies to the color of the sparkline itself. +4. `Fill Color`: This color selection applies to the area below the sparkline.

    ***Pro-tip:*** Reduce the opacity on fill colors for nice looking panels. + + +### Value to text mapping + +Value to text mapping allows you to translate values into explcit text. The text will respect all styling, thresholds and customization defined for the value. + +![](/img/v1/Singlestat-ValueMapping.png) + +***Does this support regexes or anything other than a single value?*** + From 9f8eae908d86e6432ae284791245d4aa647ed382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 10 Jul 2015 15:34:54 +0200 Subject: [PATCH 397/398] Updated singlestat docs --- docs/sources/reference/singlestat.md | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/sources/reference/singlestat.md b/docs/sources/reference/singlestat.md index 67c5fb4d4a2..13e680c6e5c 100644 --- a/docs/sources/reference/singlestat.md +++ b/docs/sources/reference/singlestat.md @@ -13,47 +13,47 @@ provides thresholds to color that singlestat metric or the panel background. ### Big Value Configuration -The big value configuration allows you to both customize the look of your singlestat metric, as well as add additional labels to contexualize the metric. +The big value configuration allows you to both customize the look of your singlestat metric, as well as add additional labels to contexualize the metric. -![](/img/v1/Singlestat-BaseSettings.png) + -1. `Big Value`: Big Value refers to the collection of values displayed in the singlestat panel. -2. `Prefixes`: The Prefix fields let you define a custom label and font-size (as a %) to appear *before* the singlestat metric. -3. `Values`: The Value fields let you set the (min, max, average, current, total) and font-size (as a %) of the singlestat metric. -4. `Potsfixes`: The Postfix fields let you define a custom label and font-size (as a %) to appear *after* the singlestat metric. -5. `Units`: Units are appended to the the singlestat metric within the panel, and will respect the color and threshold settings for the Value. -6. `Decimals`: The Decimal field allows you to override automatic decimal precision, inceasing the digits displayed for your singlestat metric. +1. `Big Value`: Big Value refers to the collection of values displayed in the singlestat panel. +2. `Prefixes`: The Prefix fields let you define a custom label and font-size (as a %) to appear *before* the singlestat metric. +3. `Values`: The Value fields let you set the (min, max, average, current, total) and font-size (as a %) of the singlestat metric. +4. `Potsfixes`: The Postfix fields let you define a custom label and font-size (as a %) to appear *after* the singlestat metric. +5. `Units`: Units are appended to the the singlestat metric within the panel, and will respect the color and threshold settings for the Value. +6. `Decimals`: The Decimal field allows you to override automatic decimal precision, inceasing the digits displayed for your singlestat metric. ### Coloring -The coloring options of the singlestat config allow you to dynamically change the colors based on the displayed data. +The coloring options of the singlestat config allow you to dynamically change the colors based on the displayed data. -![](/img/v1/Singlestat-Coloring.png) + -1. `Background`: The Background checkbox applies the configured thresholds and colors to the entirity of the singlestat panel background. +1. `Background`: The Background checkbox applies the configured thresholds and colors to the entirity of the singlestat panel background. 2. `Value`: The Value checkbox applies the configured thresholds and colors to the value within the singlestat panel. 3. `Thresholds`: Thresholds allow you to change the background and value colors dyanmically within the panel. The threshold field accepts **3 comma-separated** values, corresponding to the three colors directly to the right. -4. `Colors`: The color picker allows you to select a color and opacity +4. `Colors`: The color picker allows you to select a color and opacity 5. `Invert order`: This link toggles the threshold color order.
    For example: Green, Orange, Red () will become Red, Orange, Green (). ### Spark Lines -Spark lines are a great way of seeing the historical data associated with a single stat value, providing valuable context at a glance. Spark lines act differently than traditional graph panels and do not include x or y axis, coordinates, a legend, or ability to interact with the graph. +Spark lines are a great way of seeing the historical data associated with a single stat value, providing valuable context at a glance. Spark lines act differently than traditional graph panels and do not include x or y axis, coordinates, a legend, or ability to interact with the graph. -![](/img/v1/Singlestat-Sparklines.png) + 1. `Show`: The show checkbox will toggle whether the spark line is shown in the panel. When unselected, only the value will appear. 2. `Background`: **ASK TORKEL.** 3. `Line Color`: This color selection applies to the color of the sparkline itself. -4. `Fill Color`: This color selection applies to the area below the sparkline.

    ***Pro-tip:*** Reduce the opacity on fill colors for nice looking panels. +4. `Fill Color`: This color selection applies to the area below the sparkline. +> ***Pro-tip:*** Reduce the opacity on fill colors for nice looking panels. ### Value to text mapping -Value to text mapping allows you to translate values into explcit text. The text will respect all styling, thresholds and customization defined for the value. +Value to text mapping allows you to translate values into explcit text. The text will respect all styling, thresholds and customization defined for the value. -![](/img/v1/Singlestat-ValueMapping.png) + -***Does this support regexes or anything other than a single value?*** From ca1cd8919073794ebeb665276cf20ada6716c0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 10 Jul 2015 15:53:39 +0200 Subject: [PATCH 398/398] Updated singlestat docs again --- docs/sources/reference/singlestat.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/sources/reference/singlestat.md b/docs/sources/reference/singlestat.md index 13e680c6e5c..4e5a38544c5 100644 --- a/docs/sources/reference/singlestat.md +++ b/docs/sources/reference/singlestat.md @@ -34,8 +34,7 @@ The coloring options of the singlestat config allow you to dynamically change th 2. `Value`: The Value checkbox applies the configured thresholds and colors to the value within the singlestat panel. 3. `Thresholds`: Thresholds allow you to change the background and value colors dyanmically within the panel. The threshold field accepts **3 comma-separated** values, corresponding to the three colors directly to the right. 4. `Colors`: The color picker allows you to select a color and opacity -5. `Invert order`: This link toggles the threshold color order.
    For example: Green, Orange, Red () will become Red, Orange, Green (). - +5. `Invert order`: This link toggles the threshold color order.
    For example: Green, Orange, Red () will become Red, Orange, Green (). ### Spark Lines @@ -44,7 +43,7 @@ Spark lines are a great way of seeing the historical data associated with a sing 1. `Show`: The show checkbox will toggle whether the spark line is shown in the panel. When unselected, only the value will appear. -2. `Background`: **ASK TORKEL.** +2. `Background`: Check if you want the sparklines to take up the full panel width or uncheck if they should only be at the bottom. 3. `Line Color`: This color selection applies to the color of the sparkline itself. 4. `Fill Color`: This color selection applies to the area below the sparkline.