github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:elastic/kibana into feature/design

Browse source
This commit is contained in:
spalger 2016-03-10 12:48:51 -07:00
commit 1935400c21
12 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -89,7 +89,7 @@
"boom": "2.8.0",
"bootstrap": "3.3.5",
"brace": "0.5.1",
"bunyan": "1.4.0",
"bunyan": "1.7.1",
"clipboard": "1.5.5",
"commander": "2.8.1",
"css-loader": "0.17.0",

4
src/plugins/elasticsearch/index.js
View file

@ -54,7 +54,7 @@ module.exports = function ({ Plugin }) {
return reply.continue();
}
function noCreateIndex({ path }, reply) {
function noDirectIndex({ path }, reply) {
const requestPath = trimRight(trim(path), '/');
const matchPath = createPath(kibanaIndex);
@ -75,7 +75,7 @@ module.exports = function ({ Plugin }) {
['PUT', 'POST', 'DELETE'],
`/${kibanaIndex}/{paths*}`,
{
pre: [ noCreateIndex, noBulkCheck ]
pre: [ noDirectIndex, noBulkCheck ]
}
);

2
src/ui/public/stringify/__tests__/_ip.js
View file

@ -9,7 +9,7 @@ describe('IP Address Format', function () {
fieldFormats = Private(RegistryFieldFormatsProvider);
}));
it('convers a value from a decimal to a string', function () {
it('converts a value from a decimal to a string', function () {
var ip = fieldFormats.getInstance('ip');
expect(ip.convert(1186489492)).to.be('70.184.100.148');
});

6
src/ui/public/stringify/types/Color.js
View file

@ -1,10 +1,10 @@
import 'ui/stringify/editors/color.less';
import _ from 'lodash';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
import colorTemplate from 'ui/stringify/editors/color.html';
export default function _StringProvider(Private) {
export default function ColorFormatProvider(Private) {
const FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
const FieldFormat = Private(IndexPatternsFieldFormatProvider);
const DEFAULT_COLOR = {
range: `${Number.NEGATIVE_INFINITY}:${Number.POSITIVE_INFINITY}`,
text: '#000000',

4
src/ui/public/stringify/types/Date.js
View file

@ -1,11 +1,11 @@
import _ from 'lodash';
import moment from 'moment';
import 'ui/field_format_editor/pattern/pattern';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
import dateTemplate from 'ui/stringify/editors/date.html';
export default function DateTimeFormatProvider(Private) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
var FieldFormat = Private(IndexPatternsFieldFormatProvider);
var BoundToConfigObj = Private(BoundToConfigObjProvider);

4
src/ui/public/stringify/types/Ip.js
View file

@ -1,7 +1,7 @@
import _ from 'lodash';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
export default function IpFormatProvider(Private) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
var FieldFormat = Private(IndexPatternsFieldFormatProvider);
_.class(Ip).inherits(FieldFormat);
function Ip(params) {

2
src/ui/public/stringify/types/Percent.js
View file

@ -1,7 +1,7 @@
import _ from 'lodash';
import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
import StringifyTypesNumeralProvider from 'ui/stringify/types/_Numeral';
export default function NumberFormatProvider(Private) {
export default function PercentFormatProvider(Private) {
var BoundToConfigObj = Private(BoundToConfigObjProvider);
var Numeral = Private(StringifyTypesNumeralProvider);

6
src/ui/public/stringify/types/Source.js
View file

@ -1,9 +1,9 @@
import _ from 'lodash';
import noWhiteSpace from 'ui/utils/no_white_space';
import angular from 'angular';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
export default function _SourceProvider(Private, shortDotsFilter) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
export default function _SourceFormatProvider(Private, shortDotsFilter) {
var FieldFormat = Private(IndexPatternsFieldFormatProvider);
var template = _.template(noWhiteSpace(require('ui/stringify/types/_source.html')));
_.class(Source).inherits(FieldFormat);

6
src/ui/public/stringify/types/String.js
View file

@ -1,8 +1,8 @@
import _ from 'lodash';
import 'ui/field_format_editor/samples/samples';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
export default function _StringProvider(Private) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
export default function StringFormatProvider(Private) {
var FieldFormat = Private(IndexPatternsFieldFormatProvider);
_.class(_String).inherits(FieldFormat);

4
src/ui/public/stringify/types/Url.js
View file

@ -1,11 +1,11 @@
import _ from 'lodash';
import 'ui/field_format_editor/pattern/pattern';
import 'ui/stringify/icons';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
import urlTemplate from 'ui/stringify/editors/url.html';
export default function UrlFormatProvider(Private, highlightFilter) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
var FieldFormat = Private(IndexPatternsFieldFormatProvider);
_.class(Url).inherits(FieldFormat);

4
src/ui/public/stringify/types/_Numeral.js
View file

@ -1,9 +1,9 @@
import _ from 'lodash';
import 'ui/field_format_editor/numeral/numeral';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
export default function AbstractNumeralFormatProvider(Private) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
var FieldFormat = Private(IndexPatternsFieldFormatProvider);
var BoundToConfigObj = Private(BoundToConfigObjProvider);
var numeral = require('numeral')();

6
src/ui/public/stringify/types/truncate.js
View file

@ -1,7 +1,7 @@
import _ from 'lodash';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
export default function TruncateFormatProvider(Private) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
var FieldFormat = Private(IndexPatternsFieldFormatProvider);
var omission = '...';
_.class(Truncate).inherits(FieldFormat);
@ -31,4 +31,4 @@ export default function TruncateFormatProvider(Private) {
Truncate.sampleInput = [ require('ui/stringify/samples/large.html') ];
return Truncate;
};
};