diff --git a/build.go b/build.go index 202caa1837b..a457a49a2c8 100644 --- a/build.go +++ b/build.go @@ -5,6 +5,7 @@ package main import ( "bytes" "crypto/md5" + "crypto/sha1" "encoding/json" "flag" "fmt" @@ -85,17 +86,21 @@ func main() { case "package": grunt(gruntBuildArg("release")...) createLinuxPackages() + sha1FilesInDist() case "pkg-rpm": grunt(gruntBuildArg("release")...) createRpmPackages() + sha1FilesInDist() case "pkg-deb": grunt(gruntBuildArg("release")...) createDebPackages() + sha1FilesInDist() case "latest": makeLatestDistCopies() + sha1FilesInDist() case "clean": clean() @@ -501,3 +506,38 @@ func md5File(file string) error { return out.Close() } + +func sha1FilesInDist() { + filepath.Walk("./dist", func(path string, f os.FileInfo, err error) error { + if strings.Contains(path, ".sha1") == false { + sha1File(path) + } + return nil + }) +} + +func sha1File(file string) error { + fd, err := os.Open(file) + if err != nil { + return err + } + defer fd.Close() + + h := sha1.New() + _, err = io.Copy(h, fd) + if err != nil { + return err + } + + out, err := os.Create(file + ".sha1") + if err != nil { + return err + } + + _, err = fmt.Fprintf(out, "%x\n", h.Sum(nil)) + if err != nil { + return err + } + + return out.Close() +} diff --git a/conf/defaults.ini b/conf/defaults.ini index 39e10280645..d47cefd6bf6 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -267,6 +267,7 @@ auto_sign_up = true [auth.ldap] enabled = false config_file = /etc/grafana/ldap.toml +allow_sign_up = true #################################### SMTP / Emailing ##################### [smtp] @@ -292,6 +293,9 @@ mode = console, file # Either "debug", "info", "warn", "error", "critical", default is "info" level = info +# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug +filters = + # For "console" mode only [log.console] level = @@ -421,7 +425,7 @@ url = https://grafana.net #################################### External Image Storage ############## [external_image_storage] # You can choose between (s3, webdav) -provider = s3 +provider = [external_image_storage.s3] bucket_url = diff --git a/conf/sample.ini b/conf/sample.ini index bb575a596b0..dee40c6f2e9 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -252,6 +252,7 @@ [auth.ldap] ;enabled = false ;config_file = /etc/grafana/ldap.toml +;allow_sign_up = true #################################### SMTP / Emailing ########################## [smtp] @@ -276,6 +277,10 @@ # Either "trace", "debug", "info", "warn", "error", "critical", default is "info" ;level = info +# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug +;filters = + + # For "console" mode only [log.console] ;level = @@ -375,8 +380,8 @@ #################################### External image storage ########################## [external_image_storage] # Used for uploading images to public servers so they can be included in slack/email messages. -# you can choose between (s3, webdav or internal) -;provider = s3 +# you can choose between (s3, webdav) +;provider = [external_image_storage.s3] ;bucket_url = diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 9a7a480f482..e3e435d1194 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -30,6 +30,9 @@ using environment variables using the syntax: Where the section name is the text within the brackets. Everything should be upper case, `.` should be replaced by `_`. For example, given these configuration settings: + # default section + instance_name = ${HOSTNAME} + [security] admin_user = admin @@ -39,6 +42,7 @@ should be upper case, `.` should be replaced by `_`. For example, given these co Then you can override them using: + export GF_DEFAULT_INSTANCE_NAME=my-instance export GF_SECURITY_ADMIN_USER=true export GF_AUTH_GOOGLE_CLIENT_SECRET=newS3cretKey @@ -528,7 +532,7 @@ Use space to separate multiple modes, e.g. "console file" ### level Either "debug", "info", "warn", "error", "critical", default is "info" -### filter +### filters optional settings to set different levels for specific loggers. Ex `filters = sqlstore:debug` diff --git a/pkg/components/imguploader/imguploader.go b/pkg/components/imguploader/imguploader.go index 1de46e7fd1d..1cbe55c8572 100644 --- a/pkg/components/imguploader/imguploader.go +++ b/pkg/components/imguploader/imguploader.go @@ -10,6 +10,13 @@ type ImageUploader interface { Upload(path string) (string, error) } +type NopImageUploader struct { +} + +func (NopImageUploader) Upload(path string) (string, error) { + return "", nil +} + func NewImageUploader() (ImageUploader, error) { switch setting.ImageUploadProvider { @@ -53,5 +60,5 @@ func NewImageUploader() (ImageUploader, error) { return NewWebdavImageUploader(url, username, password) } - return nil, fmt.Errorf("could not find specified provider") + return NopImageUploader{}, nil } diff --git a/pkg/login/ldap.go b/pkg/login/ldap.go index d8c916bb765..cee7096dc45 100644 --- a/pkg/login/ldap.go +++ b/pkg/login/ldap.go @@ -13,6 +13,7 @@ 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/setting" ) type ldapAuther struct { @@ -132,8 +133,10 @@ func (a *ldapAuther) getGrafanaUserFor(ldapUser *ldapUserInfo) (*m.User, error) // get user from grafana db userQuery := m.GetUserByLoginQuery{LoginOrEmail: ldapUser.Username} if err := bus.Dispatch(&userQuery); err != nil { - if err == m.ErrUserNotFound { + if err == m.ErrUserNotFound && setting.LdapAllowSignup { return a.createGrafanaUser(ldapUser) + } else if err == m.ErrUserNotFound { + return nil, ErrInvalidCredentials } else { return nil, err } diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 46f70215c1f..3086e7b9239 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -134,8 +134,9 @@ var ( GoogleTagManagerId string // LDAP - LdapEnabled bool - LdapConfigFile string + LdapEnabled bool + LdapConfigFile string + LdapAllowSignup bool = true // SMTP email settings Smtp SmtpSettings @@ -551,6 +552,7 @@ func NewConfigContext(args *CommandLineArgs) error { ldapSec := Cfg.Section("auth.ldap") LdapEnabled = ldapSec.Key("enabled").MustBool(false) LdapConfigFile = ldapSec.Key("config_file").String() + LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true) alerting := Cfg.Section("alerting") AlertingEnabled = alerting.Key("enabled").MustBool(false) diff --git a/pkg/tsdb/testdata/scenarios.go b/pkg/tsdb/testdata/scenarios.go index 29a0b5a2ada..73963fc9844 100644 --- a/pkg/tsdb/testdata/scenarios.go +++ b/pkg/tsdb/testdata/scenarios.go @@ -90,10 +90,13 @@ func init() { queryRes := tsdb.NewQueryResult() stringInput := query.Model.Get("stringInput").MustString() - values := []float64{} + values := []null.Float{} for _, strVal := range strings.Split(stringInput, ",") { + if strVal == "null" { + values = append(values, null.FloatFromPtr(nil)) + } if val, err := strconv.ParseFloat(strVal, 64); err == nil { - values = append(values, val) + values = append(values, null.FloatFrom(val)) } } @@ -107,7 +110,7 @@ func init() { step := (endTime - startTime) / int64(len(values)-1) for _, val := range values { - series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(val), float64(startTime))) + series.Points = append(series.Points, tsdb.TimePoint{val, null.FloatFrom(float64(startTime))}) startTime += step } diff --git a/public/app/core/directives/metric_segment.js b/public/app/core/directives/metric_segment.js index cc662aa67ca..2001073ed80 100644 --- a/public/app/core/directives/metric_segment.js +++ b/public/app/core/directives/metric_segment.js @@ -186,25 +186,27 @@ function (_, $, coreModule) { $scope.getOptionsInternal = function() { if ($scope.options) { - var optionSegments = _.map($scope.options, function(option) { + cachedOptions = _.map($scope.options, function(option) { return uiSegmentSrv.newSegment({value: option.text}); }); - return $q.when(optionSegments); + return $q.when(cachedOptions); } else { return $scope.getOptions().then(function(options) { - cachedOptions = options; - return _.map(options, function(option) { + cachedOptions =_.map(options, function(option) { + if (option.html) { + return option; + } return uiSegmentSrv.newSegment({value: option.text}); }); + return cachedOptions; }); } }; $scope.onSegmentChange = function() { - var options = $scope.options || cachedOptions; - if (options) { - var option = _.find(options, {text: $scope.segment.value}); + if (cachedOptions) { + var option = _.find(cachedOptions, {value: $scope.segment.value}); if (option && option.value !== $scope.property) { $scope.property = option.value; } else if (attrs.custom !== 'false') { diff --git a/public/app/plugins/app/testdata/dashboards/graph_last_1h.json b/public/app/plugins/app/testdata/dashboards/graph_last_1h.json index 757dd48e50f..c64ab84f338 100644 --- a/public/app/plugins/app/testdata/dashboards/graph_last_1h.json +++ b/public/app/plugins/app/testdata/dashboards/graph_last_1h.json @@ -1,5 +1,5 @@ { - "revision": 4, + "revision": 5, "title": "TestData - Graph Panel Last 1h", "tags": [ "grafana-test" @@ -320,124 +320,376 @@ ] }, { - "title": "", - "error": false, - "span": 4, - "editable": true, - "type": "text", - "isNew": true, - "id": 6, - "mode": "markdown", "content": "Just verify that the tooltip time has millisecond resolution ", - "links": [] + "editable": true, + "error": false, + "id": 6, + "isNew": true, + "links": [], + "mode": "markdown", + "span": 4, + "title": "", + "type": "text" } ], "title": "New row" }, { - "title": "New row", - "height": 336, - "editable": true, "collapse": false, + "editable": true, + "height": 336, "panels": [ { - "title": "2 yaxis and axis lables", - "error": false, - "span": 7.99561403508772, - "editable": true, - "type": "graph", - "isNew": true, - "id": 5, - "targets": [ - { - "target": "", - "refId": "A", - "scenarioId": "csv_metric_values", - "stringInput": "1,20,90,30,5,0" - }, - { - "target": "", - "refId": "B", - "scenarioId": "csv_metric_values", - "stringInput": "2000,3000,4000,1000,3000,10000" - } - ], + "aliasColors": {}, + "bars": false, "datasource": "Grafana TestData", - "renderer": "flot", - "yaxes": [ - { - "label": "Perecent", - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "percent" - }, - { - "label": "Pressure", - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short" - } - ], - "xaxis": { + "editable": true, + "error": false, + "fill": 1, + "id": 5, + "isNew": true, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, "show": true, - "mode": "time", - "name": null, - "values": [] + "total": false, + "values": false }, "lines": true, - "fill": 1, "linewidth": 2, - "points": false, - "pointradius": 5, - "bars": false, - "stack": false, - "percentage": false, - "legend": { - "show": true, - "values": false, - "min": false, - "max": false, - "current": false, - "total": false, - "avg": false - }, + "links": [], "nullPointMode": "connected", - "steppedLine": false, - "tooltip": { - "value_type": "cumulative", - "shared": true, - "sort": 0, - "msResolution": false - }, - "timeFrom": null, - "timeShift": null, - "aliasColors": {}, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", "seriesOverrides": [ { "alias": "B-series", "yaxis": 2 } ], + "span": 7.99561403508772, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,90,30,5,0", + "target": "" + }, + { + "refId": "B", + "scenarioId": "csv_metric_values", + "stringInput": "2000,3000,4000,1000,3000,10000", + "target": "" + } + ], "thresholds": [], - "links": [] + "timeFrom": null, + "timeShift": null, + "title": "2 yaxis and axis lables", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "percent", + "label": "Perecent", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": "Pressure", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] }, { - "title": "", - "error": false, - "span": 4.00438596491228, - "editable": true, - "type": "text", - "isNew": true, - "id": 7, - "mode": "markdown", "content": "Verify that axis labels look ok", - "links": [] + "editable": true, + "error": false, + "id": 7, + "isNew": true, + "links": [], + "mode": "markdown", + "span": 4.00438596491228, + "title": "", + "type": "text" } - ] + ], + "title": "New row" + }, + { + "collapse": false, + "editable": true, + "height": "250px", + "panels": [ + { + "aliasColors": {}, + "bars": false, + "datasource": "Grafana TestData", + "editable": true, + "error": false, + "fill": 1, + "id": 8, + "isNew": true, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 4, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "B", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,null,null,null,null,null,null,100,10,10,20,30,40,10", + "target": "" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "null value connected", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": "Grafana TestData", + "editable": true, + "error": false, + "fill": 1, + "id": 10, + "isNew": true, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 3, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "B", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,null,null,null,null,null,null,100,10,10,20,30,40,10", + "target": "" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "null value null as zero", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": "Grafana TestData", + "editable": true, + "error": false, + "fill": 1, + "id": 9, + "isNew": true, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "alias": "B-series", + "zindex": -3 + } + ], + "span": 5, + "stack": true, + "steppedLine": false, + "targets": [ + { + "hide": false, + "refId": "B", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,null,null,null,null,null,null,100,10,10,20,30,40,10", + "target": "" + }, + { + "alias": "", + "hide": false, + "refId": "A", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,90,30,5,10,20,30,40,40,40,100,10,20,20", + "target": "" + }, + { + "alias": "", + "hide": false, + "refId": "C", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,90,30,5,10,20,30,40,40,40,100,10,20,20", + "target": "" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Stacking value ontop of nulls", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + } + ], + "title": "New row" } ], "time": { @@ -477,7 +729,7 @@ }, "refresh": false, "schemaVersion": 13, - "version": 3, + "version": 13, "links": [], "gnetId": null } diff --git a/public/app/plugins/app/testdata/plugin.json b/public/app/plugins/app/testdata/plugin.json index 6742ad04ecb..63f88df8140 100644 --- a/public/app/plugins/app/testdata/plugin.json +++ b/public/app/plugins/app/testdata/plugin.json @@ -9,7 +9,7 @@ "name": "Grafana Project", "url": "http://grafana.org" }, - "version": "1.0.13", + "version": "1.0.14", "updated": "2016-09-26" }, diff --git a/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png b/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png index f11f4034751..7f9687e839c 100644 Binary files a/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png and b/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png differ diff --git a/public/app/plugins/datasource/elasticsearch/img/logo_large.png b/public/app/plugins/datasource/elasticsearch/img/logo_large.png index b76d01e5d74..5ded1d8f438 100644 Binary files a/public/app/plugins/datasource/elasticsearch/img/logo_large.png and b/public/app/plugins/datasource/elasticsearch/img/logo_large.png differ diff --git a/public/app/plugins/datasource/graphite/img/graphite_logo.png b/public/app/plugins/datasource/graphite/img/graphite_logo.png index e70b40720c4..7b6b85d2eb5 100644 Binary files a/public/app/plugins/datasource/graphite/img/graphite_logo.png and b/public/app/plugins/datasource/graphite/img/graphite_logo.png differ diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js index 54605a4f7e2..93a1158b6e0 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.js +++ b/public/app/plugins/datasource/opentsdb/datasource.js @@ -419,7 +419,7 @@ function (angular, _, dateMath) { return target.metric === metricData.metric; } else { return target.metric === metricData.metric && - _.all(target.tags, function(tagV, tagK) { + _.every(target.tags, function(tagV, tagK) { interpolatedTagValue = templateSrv.replace(tagV, options.scopedVars, 'pipe'); return metricData.tags[tagK] === interpolatedTagValue || interpolatedTagValue === "*"; }); diff --git a/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png b/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png index 519d56a476c..081459abe0c 100644 Binary files a/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png and b/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png differ diff --git a/public/app/plugins/panel/graph/tab_display.html b/public/app/plugins/panel/graph/tab_display.html index 14c8c4cf6fc..6845181b8b2 100644 --- a/public/app/plugins/panel/graph/tab_display.html +++ b/public/app/plugins/panel/graph/tab_display.html @@ -71,13 +71,9 @@
Stacking & Null value
- + - +
diff --git a/public/img/CopyQuery.png b/public/img/CopyQuery.png index b9829c23b2f..a923bf43603 100644 Binary files a/public/img/CopyQuery.png and b/public/img/CopyQuery.png differ diff --git a/public/img/alert_howto_new.png b/public/img/alert_howto_new.png index b7663588656..efbf87c3ce8 100644 Binary files a/public/img/alert_howto_new.png and b/public/img/alert_howto_new.png differ diff --git a/public/img/angle_gradient_light_rev.png b/public/img/angle_gradient_light_rev.png index cc4558b0cf2..973f52fbad8 100644 Binary files a/public/img/angle_gradient_light_rev.png and b/public/img/angle_gradient_light_rev.png differ diff --git a/public/img/angle_gradient_rev.png b/public/img/angle_gradient_rev.png index 6b45f4d1990..501ecfdf75a 100644 Binary files a/public/img/angle_gradient_rev.png and b/public/img/angle_gradient_rev.png differ diff --git a/public/img/check_radio_sheet.png b/public/img/check_radio_sheet.png index de6549fa2cc..e5c7eaaa071 100644 Binary files a/public/img/check_radio_sheet.png and b/public/img/check_radio_sheet.png differ diff --git a/public/img/checkbox.png b/public/img/checkbox.png index a1256ec8b95..52547547161 100644 Binary files a/public/img/checkbox.png and b/public/img/checkbox.png differ diff --git a/public/img/checkbox_white.png b/public/img/checkbox_white.png index dbff6d5ab64..fc2dc61d4ab 100644 Binary files a/public/img/checkbox_white.png and b/public/img/checkbox_white.png differ diff --git a/public/img/cubes.png b/public/img/cubes.png index 30712ea558d..dfdcc12894a 100644 Binary files a/public/img/cubes.png and b/public/img/cubes.png differ diff --git a/public/img/fav16.png b/public/img/fav16.png index 827cd972e4b..6f5f809d9cb 100644 Binary files a/public/img/fav16.png and b/public/img/fav16.png differ diff --git a/public/img/fav32.png b/public/img/fav32.png index 827cd972e4b..6f5f809d9cb 100644 Binary files a/public/img/fav32.png and b/public/img/fav32.png differ diff --git a/public/img/fav_dark_16.png b/public/img/fav_dark_16.png index 2f66c42db40..f22fb86de1f 100644 Binary files a/public/img/fav_dark_16.png and b/public/img/fav_dark_16.png differ diff --git a/public/img/fav_dark_32.png b/public/img/fav_dark_32.png index 9248832f671..a3b300ad683 100644 Binary files a/public/img/fav_dark_32.png and b/public/img/fav_dark_32.png differ diff --git a/public/img/glyphicons-halflings-white.png b/public/img/glyphicons-halflings-white.png index 3bf6484a29d..a779107ecec 100644 Binary files a/public/img/glyphicons-halflings-white.png and b/public/img/glyphicons-halflings-white.png differ diff --git a/public/img/glyphicons-halflings.png b/public/img/glyphicons-halflings.png index a9969993201..df8120a1a01 100644 Binary files a/public/img/glyphicons-halflings.png and b/public/img/glyphicons-halflings.png differ diff --git a/public/img/kibana.png b/public/img/kibana.png index 17b719eed07..85220e33226 100644 Binary files a/public/img/kibana.png and b/public/img/kibana.png differ diff --git a/public/img/light.png b/public/img/light.png index cc65dbaad99..eb2dd2b5af5 100644 Binary files a/public/img/light.png and b/public/img/light.png differ diff --git a/public/img/logo_transparent_200x.png b/public/img/logo_transparent_200x.png index 18a431e478e..d73ad2126a8 100644 Binary files a/public/img/logo_transparent_200x.png and b/public/img/logo_transparent_200x.png differ diff --git a/public/img/logo_transparent_200x75.png b/public/img/logo_transparent_200x75.png index 18a431e478e..d73ad2126a8 100644 Binary files a/public/img/logo_transparent_200x75.png and b/public/img/logo_transparent_200x75.png differ diff --git a/public/img/logo_transparent_400x.png b/public/img/logo_transparent_400x.png index 7f2bf357178..a1e36dcae40 100644 Binary files a/public/img/logo_transparent_400x.png and b/public/img/logo_transparent_400x.png differ diff --git a/public/img/page_header_line.png b/public/img/page_header_line.png index ec98becd093..5455a8eff36 100644 Binary files a/public/img/page_header_line.png and b/public/img/page_header_line.png differ diff --git a/public/img/small.png b/public/img/small.png index 8c5222bad41..e355b6efc7e 100644 Binary files a/public/img/small.png and b/public/img/small.png differ diff --git a/public/img/transparent.png b/public/img/transparent.png index e4e8dcaa3b3..b4256beb829 100644 Binary files a/public/img/transparent.png and b/public/img/transparent.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBg.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBg.png index f367b427e60..961cd73976a 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBg.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBg.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBgHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBgHover.png index cd37a0d52de..58a3b54c789 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBgHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBgHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/detach.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/detach.png index 0ddb9a1764a..a05767a255e 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/detach.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/detach.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/detachHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/detachHover.png index e419272912b..e075b43f7d9 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/detachHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/detachHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/disable.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/disable.png index c28bcdf24a8..516cb716c20 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/disable.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/disable.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/disableHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/disableHover.png index 26fe37542f8..42bbc13f612 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/disableHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/disableHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/down.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/down.png index acbbd30c065..d90fdc77537 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/down.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/down.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/downActive.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/downActive.png index f4312b2ffbc..62e4ac2228f 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/downActive.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/downActive.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/downHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/downHover.png index 8144e63787d..d8aab29be63 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/downHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/downHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon-sm.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon-sm.png index 0c377e307e5..d73fdde20b6 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon-sm.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon-sm.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon.png index 2d75261bb67..345843067fc 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/firebug.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/firebug.png index e10affebb48..8651749f9de 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/firebug.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/firebug.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/infoIcon.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/infoIcon.png index da1e5334c19..00ba1e54b6c 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/infoIcon.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/infoIcon.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/min.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/min.png index 1034d66fb44..08b7a0f3e62 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/min.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/min.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/minHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/minHover.png index b0d1e1afdcc..55f9b8e850a 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/minHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/minHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/off.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/off.png index b70b1d24d88..9775dfe348a 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/off.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/off.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/offHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/offHover.png index f3670f19ff3..43c67d1d59b 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/offHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/offHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/search.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/search.png index fba33b8a57d..2ee9cbccab4 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/search.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/search.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/shadowAlpha.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/shadowAlpha.png index a2561df9717..f33985adf58 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/shadowAlpha.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/shadowAlpha.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/sprite.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/sprite.png index 33d2c4d4649..06ba3ca3172 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/sprite.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/sprite.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverLeft.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverLeft.png index 0fb24d0c855..da5aa00fc80 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverLeft.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverLeft.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverMid.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverMid.png index fbccab54d05..6db85faddfd 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverMid.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverMid.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverRight.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverRight.png index 3db0f361799..4e812f0f332 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverRight.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverRight.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabLeft.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabLeft.png index a6cc9e94a9b..7cddcbee832 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabLeft.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabLeft.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png index 4726e62208e..c98d1129bed 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuPin.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuPin.png index eb4b11efe5e..4a0c65a1e61 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuPin.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuPin.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuRadio.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuRadio.png index 55b982d7c8e..290a7820597 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuRadio.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuRadio.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTarget.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTarget.png index 957bd9f2ada..437007a8127 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTarget.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTarget.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png index 200a37083d6..f67477c9821 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMid.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMid.png index 68986c3b0bd..e747db52049 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMid.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMid.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabRight.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabRight.png index 501130796a5..0d0f2cb74b7 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabRight.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabRight.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorBorders.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorBorders.png index 21682c3dcaf..a275c764e71 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorBorders.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorBorders.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorCorners.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorCorners.png index a0f839dc598..378a11d6f92 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorCorners.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorCorners.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/titlebarMid.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/titlebarMid.png index 10998ae7b37..fc8e837b1ab 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/titlebarMid.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/titlebarMid.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/toolbarMid.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/toolbarMid.png index aa21dee6a77..bed6218fa59 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/toolbarMid.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/toolbarMid.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyClosed.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyClosed.png index f80319b0a4e..ea662abcb4f 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyClosed.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyClosed.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyOpen.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyOpen.png index 86801243459..a48d4520ec1 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyOpen.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyOpen.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/up.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/up.png index 2174d03a9c9..0788f47baea 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/up.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/up.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/upActive.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/upActive.png index 236cf6768e3..497454631af 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/upActive.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/upActive.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/upHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/upHover.png index cd8131707e2..23769f8b671 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/upHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/upHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/warningIcon.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/warningIcon.png index de51084e848..3500987cc12 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/warningIcon.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/warningIcon.png differ diff --git a/vendor/github.com/go-xorm/xorm/docs/images/cache_design.png b/vendor/github.com/go-xorm/xorm/docs/images/cache_design.png index 11ce817663c..78796b56833 100644 Binary files a/vendor/github.com/go-xorm/xorm/docs/images/cache_design.png and b/vendor/github.com/go-xorm/xorm/docs/images/cache_design.png differ diff --git a/vendor/gopkg.in/macaron.v1/macaronlogo.png b/vendor/gopkg.in/macaron.v1/macaronlogo.png index 399759769a8..a2ab537b6d8 100644 Binary files a/vendor/gopkg.in/macaron.v1/macaronlogo.png and b/vendor/gopkg.in/macaron.v1/macaronlogo.png differ