Commit graph

413 commits

Author SHA1 Message Date
Nicolás Bevacqua 7bf698acc9 Merge branch 'master' into feature/sort-dimensions-dragging 2016-05-10 16:29:44 +02:00
spalger fe260e0ec6 Merge branch 'master' of github.com:elastic/kibana into implement/babelForFunctionalTests 2016-04-27 23:26:42 -05:00
Nicolas Bevacqua 79f08d34e9 [merge] Merged master into feature/sort-dimensions-dragging. 2016-04-18 19:35:44 -03:00
Joe Fleming e634320c35 bump the datemath module to a working version 2016-04-18 14:15:44 -07:00
Court Ewing 78b8e0b58f [internal] Use datemath dependency rather than hardcoding
Datemath was already pulled out into an npm module so it could be reused
in the reporting plugin, so this should essentially be a noop on the
resulting source.
2016-04-18 14:15:44 -07:00
Court Ewing 310b812b0b [internal] Use rison dependency rather than hardcoding
Rison was already pulled out into an npm module so it could be reused in
the reporting plugin, so this should essentially be a noop on the
resulting source.

The rison file was originally copied and pasted directly into the Kibana
project, so it doesn't match our styleguide and is unlintable. This
means we basically have to keep our hands off of it. The node module
also has the benefit of including some tests.
2016-04-18 09:41:04 -04:00
spalger b63bfd2e0a [test] setup babel for the functional tests 2016-04-17 16:58:34 -07:00
Nicolas Bevacqua 01c3a43f19 [pkg] Remove unused "main" field. 2016-04-14 20:24:59 -03:00
Nicolás Bevacqua 9ecaa4373c Merge branch 'master' into feature/sort-dimensions-dragging 2016-04-07 16:53:30 +02:00
Court Ewing 8a14f45fae Merge pull request #6745 from epixa/bumpeslint
[internal] Bump eslint-config-kibana to 0.0.3
2016-04-06 10:04:01 -04:00
Timothy Sullivan f219b3bfd1 [server] generate and manage uuid 2016-04-05 11:31:28 -07:00
Court Ewing e79b785eb5 [internal] Bump eslint-config-kibana to 0.0.3
Two new rules here:

no-const-assign
no-redeclare
2016-04-01 16:27:22 -04:00
Nicolas Bevacqua 64c642d42f Merge branch 'master' into feature/sort-dimensions-dragging 2016-03-30 16:56:14 -03:00
Nicolás Bevacqua 6fa397e790 [contrib] The cake is a lie 🍰 Sort alphabetically. 2016-03-30 16:16:01 -03:00
Nicolás Bevacqua b1f79b69e4 [contrib] Rank myself higher as a contributor 🚀 Profit. 2016-03-30 16:14:27 -03:00
Nicolás Bevacqua ab40e4271d [contrib] Adding myself as a contributor! 🎉 2016-03-30 16:05:32 -03:00
Nicolas Bevacqua bdf321b3f3 [ui] Replace up/down buttons with a drag handle that allows user to sort aggregations. #5563 2016-03-29 13:21:59 -03:00
spalger a7a9b0bb00 [npm] upgrade grunt-esvm 2016-03-28 12:12:24 -07:00
Jim Unger c649b49ef8 Merge pull request #6402 from BigFunger/plugin-pack-installer
Plugin pack installer
2016-03-24 09:22:48 -05:00
Rashid Khan 8bc49597f4 Remove growl dependency 2016-03-23 16:25:07 -07:00
Court Ewing 62316aab1d Remove -reskin from 5.0 snapshot version
This was a leftover artifact from the large design feature branch
effort, and it shouldn't have been pushed to master.
2016-03-23 10:10:03 -04:00
Jim Unger 52f653a47d Merge branch 'master' into plugin-pack-installer 2016-03-22 21:22:15 -05:00
spalger 08e9202e20 [npm] update babel 2016-03-22 16:03:37 -07:00
Jim Unger c0b1b9ac26 Merge branch 'master' into plugin-pack-installer 2016-03-22 11:01:16 -05:00
Rashid Khan cf838fff96 Merge branch 'master' into feature/design 2016-03-21 12:03:06 -07:00
spalger 75c124c0d1 [npm] bump grunt-esvm for master compat 2016-03-18 14:03:23 -07:00
Shelby Sturgis aae8583455 Merge branch 'master' into feature/design 2016-03-18 12:48:55 -07:00
Nicolás Bevacqua 3491565e7c Merge pull request #6547 from bevacqua/feature/release-distro-ignore-extraneous-files
Ignore OS-specific files in other operating systems
2016-03-18 13:35:16 -03:00
Nicolas Bevacqua 79739ab5ce Ignore OS-specific files in other operating systems. Fixes #4460 2016-03-17 21:05:15 -03:00
Jim Unger 659a437195 [pack installer] various tweaks from PR review 2016-03-17 13:21:27 -05:00
Nicolas Bevacqua 8fce2d2e5c [cli] Cross-platform CLI execution of "npm start". Fixes #4962 2016-03-17 14:19:36 -03:00
spalger 3c0d12a50d Merge branch 'master' of github.com:elastic/kibana into feature/designMergeSnakeCase 2016-03-16 10:08:53 -07:00
spalger d77de4e1ca Merge branch 'master' of github.com:elastic/kibana into renameAllFiles 2016-03-15 00:35:01 -04:00
spalger 7969c8da2b [npm] update grunt-esvm, remove libesvm 2016-03-14 14:20:22 -04:00
spalger c8dfe25051 [npm] update libesvm 2016-03-14 11:34:55 -04:00
spalger 5e3ee15270 [npm] update grunt-esvm 2016-03-14 11:34:51 -04:00
spalger f724032dc7 Merge branch 'master' of github.com:elastic/kibana into renameAllFiles 2016-03-11 16:27:11 -07:00
Spencer ab47d27bc5 Merge pull request #6294 from kkirsche/updateBootstrap
Update Bootstrap to 3.3.6
2016-03-11 14:05:21 -07:00
spalger 7dda3709ca Merge branch 'renameAllFiles' into feature/design 2016-03-10 12:51:39 -07:00
spalger 1935400c21 Merge branch 'master' of github.com:elastic/kibana into feature/design 2016-03-10 12:48:51 -07:00
spalger 7a1e0554db Merge branch 'master' of github.com:elastic/kibana into renameAllFiles 2016-03-10 12:16:57 -07:00
Court Ewing 5f5fd9ab4d Bump bunyan version to 1.7.1
Unfortunately, the old version of bunyan we were depending on has a
compilation failure during npm install, so we need to upgrade it in
order to get more builds.
2016-03-09 13:40:43 -05:00
Tyler Smalley 9502adedc1 Merge remote-tracking branch 'origin/master' into feature/design 2016-03-09 10:08:35 -08:00
Spencer 1ea3bc1ef9 Merge pull request #6446 from spalger/pr/6395
Updates to #6395
2016-03-07 15:08:59 -07:00
spalger 07e20936b5 [grunt/config] rename config for snake_cased tasks 2016-03-07 14:38:49 -07:00
Court Ewing 9d825ef57b Bump npm to 2.14.22 2016-03-04 11:08:32 -05:00
Court Ewing e1eafc5567 Bump node to 4.3.2 2016-03-04 11:08:15 -05:00
David Vega Fontelos 414ba105c4 Update chokidar to version 1.4.3 2016-03-03 22:11:20 +01:00
Spencer 4d3d11954b Merge pull request #6358 from epixa/makelogs
Makelogs as a dev dependency
2016-02-29 14:28:20 -07:00
Court Ewing 7bd76bef6b Makelogs as a dev dependency
Different versions of makelogs are required based on the current Kibana
branch/version, so we now include it as a dev dependency that we can
version accordingly.

There is also an npm script for makelogs so you do not need to traverse
the node_modules bin directory.
2016-02-29 14:12:58 -05:00