Jonathan Budzenski
f836516c45
Merge branch 'master' into issues/1726
2015-08-28 09:54:35 -04:00
Joe Fleming
30222f275d
Merge pull request #4787 from lukasolson/issues/4782
...
Fix broken link to specific document (issues/4782)
2015-08-27 17:17:12 -07:00
Spencer
d7003871e1
Merge pull request #4788 from w33ble/server-ssl
...
Enable TLS if cert and key in config
2015-08-27 17:03:24 -07:00
Joe Fleming
7304e83e48
don't use merge if you don't need merge, silly
2015-08-27 17:02:15 -07:00
Lukas Olson
0c662d7218
Fix broken link to specific document (issues/4782)
2015-08-27 16:16:14 -07:00
Joe Fleming
b6e2d95481
enable tls if cert and key in config
...
see http://hapijs.com/api/8.6.1#serverconnectionoptions
2015-08-27 16:15:34 -07:00
Spencer
4263bca30d
Merge pull request #4786 from spalger/chore/bumpNodeVersion
...
Bump node version to 2.5
2015-08-27 15:56:12 -07:00
spalger
6e95347c07
Bump node version to 2.5
2015-08-27 15:50:37 -07:00
Spencer
5b0e3bdbbc
Merge pull request #4778 from w33ble/silent-shrinkwrap
...
Use exec.silent so npm errors are not swallowed
2015-08-27 09:47:02 -07:00
Joe Fleming
3b18afee8f
use exec.silent so npm errors are not swallowed
2015-08-27 09:32:51 -07:00
Spencer
f06d0b276f
Merge pull request #4770 from w33ble/release-shrinkwrap
...
Build relies on shrinkwrap, release requires it
2015-08-26 19:46:37 -07:00
Joe Fleming
d2bd7e3130
Merge branch 'master' into release-shrinkwrap
2015-08-26 19:07:35 -07:00
Joe Fleming
7170877855
Merge pull request #4771 from spalger/npm/useNamespacedModules
...
[npm] remove github deps, they conflict with shrinkwrap goals
2015-08-26 19:07:19 -07:00
spalger
323c879f07
[npm] remove github deps, since they conflict with shrinkwrap goals
2015-08-26 18:52:32 -07:00
Joe Fleming
62df5a19c6
proper shrinkwrap in build and release
...
build will create it if it's missing, copy it to the build and also create a version without dev deps
release requires it and fatals if it doesn't exist
Conflicts:
tasks/build/index.js
2015-08-26 18:41:37 -07:00
Joe Fleming
8918f26e21
clearer task naming
2015-08-26 18:41:03 -07:00
spalger
4239f6cae6
[qa] checking in shrinkwrap.json
2015-08-26 17:33:27 -07:00
Joe Fleming
e00e5b8d68
Merge pull request #4768 from spalger/implement/npm3
...
Switch to npm3
2015-08-26 17:25:18 -07:00
spalger
3830d35fed
[deps] update deps to match proper npm and node versions
2015-08-26 17:20:21 -07:00
spalger
83235dd14c
[travis] install npm 3.2 on travis
2015-08-26 17:19:55 -07:00
spalger
694ab70cbe
Merge branch 'master' of github.com:elastic/kibana into implement/npm3
2015-08-26 17:12:19 -07:00
Joe Fleming
6712329790
Merge pull request #4769 from spalger/fix/buildNeedsWebpackShims
...
include webpackShims in build
2015-08-26 17:11:56 -07:00
spalger
af3387442d
[build] ☝️ include webpackShims in build
2015-08-26 17:05:54 -07:00
spalger
edc1734b3c
added note to CONTRIBUTING.md about switch
2015-08-26 16:40:00 -07:00
spalger
faa1011bbd
upgrade to npm 3.0
2015-08-26 16:36:19 -07:00
Spencer
b694025399
Merge pull request #4734 from lukasolson/issues/4697
...
Fix issues with elasticsearch and ssl
2015-08-26 15:04:00 -07:00
spalger
556e79dc2f
Merge branch 'pr/4724'
2015-08-26 14:59:20 -07:00
spalger
f1c794c13d
[status/tab] make carot match the background
2015-08-26 14:57:55 -07:00
Jim Unger
d467ac951b
Changed sample set to one minute's worth, changed requests to requests Per Second
2015-08-26 16:30:22 -05:00
Lukas Olson
b1a59ae701
Finish comment
2015-08-26 14:16:30 -07:00
Lukas Olson
15f0cd0e7d
Change memoized function to use Map for cache
2015-08-26 14:12:45 -07:00
Jim Unger
6bc097ed3d
Changes sample set from 60 to 1
2015-08-26 15:03:34 -05:00
Jim Unger
35d06d8792
Merge pull request #4712 from spalger/fix/disablePlugin
...
[plugin] check if a plugin is enabled before tracking it
2015-08-26 14:35:20 -05:00
Jim Unger
85e3579105
Merge pull request #4742 from w33ble/test-coverage
...
Return of the test coverage
2015-08-26 11:51:02 -05:00
Joe Fleming
a395853f34
fix test server command for windows machines
2015-08-26 09:39:01 -07:00
Lukas Olson
65e2ad4d81
Merge pull request #4689 from spalger/implement/moduleShims
...
[webpackShims] contextually override webpack modules
2015-08-26 08:05:46 -07:00
Lukas Olson
6e2f193601
Merge pull request #4750 from spalger/fix/aceDepricationErrors
...
[ui-ace] prevent ace editor deprecation warnings
2015-08-25 16:47:58 -07:00
spalger
de4ea544c6
[ui-ace] prevent ace editor deprecation warnings
2015-08-25 13:08:19 -07:00
Rashid Khan
e4bc46a2bf
Merge pull request #4732 from w33ble/percentage-count
...
Add 'Percentage of' to y-axis when using percentage mode
2015-08-25 12:51:14 -07:00
Rashid Khan
9528350436
Merge pull request #4741 from elastic/revert-4598-readme/snapshotUpdates
...
Revert "remove snapshot build links"
2015-08-25 12:48:00 -07:00
Jonathan Budzenski
f71275c792
Merge pull request #4744 from spalger/fix/restartCleanly
...
Immediately kill workers to prevent straglers
2015-08-25 15:47:22 -04:00
Jim Unger
feecd26f42
Simplified the status page style
2015-08-25 13:31:07 -05:00
Spencer
2d58242924
Merge pull request #4747 from aboks/patch-1
...
Fixed typo in kibana.yml
2015-08-25 11:20:26 -07:00
Spencer
2f780507bf
Merge pull request #4665 from spalger/chore/packageJsonUpkeep
...
[package.json] clear out old packages and move dev packages into place
2015-08-25 08:58:20 -07:00
Arnout Boks
434bf025aa
Fixed typo in kibana.yml
2015-08-25 13:21:07 +02:00
spalger
3edbd20ac0
[plugins/initialize] rely on enabled handling in plugin/load
2015-08-24 20:54:59 -07:00
spalger
b148a5b801
[config] add tests to prove 8e3595f
2015-08-24 20:53:58 -07:00
spalger
1feb471525
Merge branch 'master' of github.com:elastic/kibana into fix/disablePlugin
2015-08-24 20:35:40 -07:00
spalger
8e3595f7f7
[config] ensure that Config#removeSchema() completely deletes
2015-08-24 20:24:20 -07:00
spalger
41fdc232d4
[plugins] move "enabled" check into Plugin#readConfig
...
Previously, the configs pendingSets were checked for enabled=false
which was assumed to be the only way to disable a plugin, but technically
a plugin can be disabled by default and therefore we need to load the plugin
before checking if it's enabled.
When a disabled plugin is loaded it's config schema is set to "forbidden", which
effectively removes it from the config and prevents reads or writes to those
config values.
2015-08-24 19:40:17 -07:00