Commit graph

1662 commits

Author SHA1 Message Date
Spencer Alger
d95b99b514 Merge branch 'master' of github.com:elastic/kibana into bindconfigvars 2015-04-28 09:17:24 -07:00
Rashid Khan
87299c5582 Merge pull request #3681 from stormpython/fix/3676
Fixes highlighting of numeric labels in the legend
2015-04-28 08:16:47 -07:00
Shelby Sturgis
70396e10f8 Merge branch 'master' into fix/3604 2015-04-27 18:08:36 -04:00
Spencer
07ecb1b1ee Merge pull request #3515 from stormpython/time-marker
Time marker
2015-04-27 14:32:14 -07:00
Spencer Alger
3874abab4d [config] added tests! 2015-04-27 14:05:56 -07:00
Spencer Alger
9a1dc07942 Merge branch 'fix/multiWatchRaceCondition' into fieldFormatting 2015-04-27 13:43:27 -07:00
Spencer Alger
d57f41e00c [$scope.$watchMulti] added unwatch return function 2015-04-27 13:39:57 -07:00
Spencer Alger
a3bf70a85c [fieldEditor] added some tests
also fixed a bug here and bug there. No biggy
2015-04-24 18:40:37 -07:00
Spencer Alger
0977e26e82 Merge branch 'fix/multiWatchRaceCondition' into fieldFormatting 2015-04-24 17:41:29 -07:00
Spencer Alger
0759c97dc0 [$multiWatch] simplified the code and fixed a race condition 2015-04-24 17:39:53 -07:00
Joe Fleming
e06c401c65 fix bug in filter manager, update test 2015-04-24 17:39:15 -07:00
Joe Fleming
4f945d690c turn the globalState service fixture into a MockState class, update url tests 2015-04-24 17:28:57 -07:00
Joe Fleming
7936f8482d Merge branch 'master' into pinned-filters
Conflicts:
	src/kibana/components/courier/saved_object/saved_object.js
	src/kibana/plugins/dashboard/index.js
2015-04-24 17:02:12 -07:00
Joe Fleming
7b8cdf7fca initial query filter tests 2015-04-24 15:20:47 -07:00
Joe Fleming
51eea3d083 remove old tests 2015-04-24 15:16:00 -07:00
Juan Thomassie
459bab4d1c removed pinMarkers method and mapType for Pins from tests 2015-04-24 17:13:07 -05:00
Juan Thomassie
69c1e2803c Merge branch 'master' into tilemap-heatmap 2015-04-24 16:53:50 -05:00
Juan Thomassie
b008449624 added many tests, fixed a couple of methods related to heatmap due to prelim test failures 2015-04-24 16:42:07 -05:00
Shelby Sturgis
5311b12b35 adding tests, fixing pinMarker test failure 2015-04-24 15:55:36 -04:00
Shelby Sturgis
fba3f34c2d Closes #3676. Fixes issue with legend not properly highlighting chart with numeric labels 2015-04-24 14:20:07 -04:00
Spencer Alger
433629c65b [$scope.$bind] mimic isolate binding better, mas tests
While working to move the fieldFormatEditor into a more isolated directive
I needed the ability to change which scope was being bound to, and get a
carried away. In the end, fixed bind to more closely mimic the [angular
code](b041b66475/src/ng/compile.js (L1490-L1520))
that does this for isolate directives.

Also, added tests to prove that it works.
2015-04-24 11:19:13 -07:00
Spencer Alger
4e080604ff [routes] fix test that used #addResolves 2015-04-23 17:02:47 -07:00
Spencer Alger
c55c959ecd [stringify] added unit tests for default field types 2015-04-23 16:39:55 -07:00
Spencer Alger
b2f71f7017 [registry/fieldFormats] clean up api to make Type/instance line clearer 2015-04-23 16:08:22 -07:00
Chris Cowan
c12e80c615 Merge branch 'master' of github.com:elastic/kibana into feature/hapi-server 2015-04-23 15:52:39 -07:00
Joe Fleming
d7460f6bdf update onlyDisabled tests to match expectations 2015-04-23 15:10:59 -07:00
Joe Fleming
aee8daaba8 Merge pull request #3626 from lukasolson/issues/3539
Fix issue with adding word breaks inside html characters
2015-04-22 17:15:11 -07:00
Chris Cowan
3aa5ba2ec6 Merge branch 'master' of github.com:elastic/kibana into feature/hapi-server 2015-04-22 08:41:00 -07:00
Spencer Alger
631eb95f7a [settings/indices] merged the scripted field editor and the normal field editor 2015-04-21 14:30:49 -07:00
Spencer Alger
12cd11ec08 Merge branch 'master' of github.com:elastic/kibana into percentileAndValueUiCombo 2015-04-21 13:29:13 -07:00
Spencer Alger
2d2fdee0c2 Merge branch 'master' of github.com:elastic/kibana into fieldFormatting 2015-04-20 14:15:24 -07:00
lukasolson
5c772d8c14 Fix issue with adding word breaks inside html characters 2015-04-17 17:04:22 -07:00
Shelby Sturgis
ea9129775e Merge branch 'master' into fix/3604 2015-04-17 15:42:57 -04:00
Shelby Sturgis
36d34aefc8 Merge branch 'master' into fixed_scales 2015-04-17 15:41:30 -04:00
Shelby Sturgis
4f0cf423e5 Merge branch 'master' into time-marker 2015-04-17 15:41:06 -04:00
Shelby Sturgis
43a7f2bae2 Merge branch 'master' into fix/3560
Conflicts:
	src/kibana/components/vislib/visualizations/_chart.js
2015-04-17 15:40:35 -04:00
Shelby Sturgis
35e0f86e3a adding tests 2015-04-17 15:34:58 -04:00
Rashid Khan
e319a4b578 Merge pull request #3564 from stormpython/destroy_charts_properly
Destroy charts properly
2015-04-16 14:02:00 -07:00
Spencer
2367a8b3cd Merge pull request #3570 from spalger/fix/3231
Fix/3231
2015-04-16 11:06:53 -07:00
Shelby Sturgis
40dd93cacb fixing issue with defaultYExtents not working, added tests to ensure there are no regressions 2015-04-16 10:38:47 -04:00
Shelby Sturgis
297754d8ca correcting test: 2015-04-15 22:21:41 -04:00
Joe Fleming
706fac455f update pinned tests, fix dupe/de-dupe functionality and verify via tests 2015-04-15 15:20:50 -07:00
Shelby Sturgis
43955b2d8e Merge branch 'master' into destroy_charts_properly 2015-04-15 17:23:34 -04:00
Shelby Sturgis
54ca084475 fixed the over selection issue and added tests to make sure when a visualization is destroyed, it only destroys the charts in its own div 2015-04-15 17:13:20 -04:00
Joe Fleming
ea1cd766f4 add fix and test for passing nothing into processGlobalFilters 2015-04-15 13:53:45 -07:00
Joe Fleming
10ff03d54d remove duplicate filter toggle tests 2015-04-15 13:39:04 -07:00
Shelby Sturgis
d0a41f447e fixed error with vis.hasSchemaAgg, removed styling from less file, only instantiate time marker when addTimeMarker is true, times array now encodes time, color, class, opacity, and width options, refined tests 2015-04-15 15:41:16 -04:00
Joe Fleming
0554d7a531 Merge branch 'master' into pinned-filters
Conflicts:
	src/kibana/plugins/discover/controllers/discover.js
	src/kibana/plugins/visualize/editor/editor.js
	test/unit/fixtures/logstash_fields.js
	test/unit/specs/apps/discover/directives/field_chooser.js
	test/unit/specs/components/filter_bar/filterAppliedAndUnwrap.js
	test/unit/specs/components/filter_bar/toggleAll.js
	test/unit/specs/components/filter_bar/toggleFilter.js
2015-04-15 11:29:52 -07:00
Shelby Sturgis
661dea1e77 Merge branch 'master' into time-marker 2015-04-15 10:50:42 -04:00
Spencer
621511c795 Merge pull request #3584 from jdve/fix-conflicted-object-flattening
[indexPattern/flattenSearchResponse] flatten conflicting objects
2015-04-14 18:43:43 -07:00