Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
698 commits
Select commit Hold shift + click to select a range
92f9cd1
Compile query validation tooltip once. Closes #2985
jbudz Jul 7, 2015
382598f
split dev server in two, preventing server source file from forcing w…
Jul 10, 2015
9449f18
Merge pull request #4408 from w33ble/event-args
jbudz Jul 10, 2015
0936b03
[Status] Fixed some bugs, moved some things around generally improved…
panda01 Jul 10, 2015
23a22d5
[Merge] Merged with latest master
panda01 Jul 10, 2015
73beac9
consolidate around --config arg, use js to resolve
Jul 10, 2015
86453f6
dont log server starting twice, move status info to api
Jul 10, 2015
c4fbf5b
treat the ui directory as static assets
Jul 10, 2015
dfe1687
[chrome] don't check for an app.id, let app set switcher presence
Jul 10, 2015
473f0a3
[statusPage] provide a rendering helper on the reply
Jul 10, 2015
6a59781
Fixed bug in npmInstall so that it returns on error.
BigFunger Jul 10, 2015
226d414
lock down nvd3 and angular-nvd3 versions which are known to work toge…
Jul 10, 2015
998681e
add tests for multiple event args
w33ble Jul 10, 2015
ee16989
Merge pull request #4418 from w33ble/event-tests
jbudz Jul 10, 2015
0d4ebcb
license has updated, but the licenses are the same
Jul 13, 2015
6064f67
Merge branch 'master' into fix/empty_field
stormpython Jul 13, 2015
6a63f54
Merge branch 'master' into clickable-legends
stormpython Jul 13, 2015
7a37dcf
Applied changes requested in pull review
BigFunger Jul 13, 2015
75db706
[bin/kibana] support --no-watch arg
Jul 13, 2015
163dd14
Merge pull request #4376 from jbudz/issues/4358
w33ble Jul 13, 2015
3de3f98
Use a constant for retrieving max integer
jbudz Jul 13, 2015
932eba0
Merge pull request #4413 from jbudz/issues/2985
w33ble Jul 13, 2015
847852b
Merge branch 'master' into object-finder-keyboard-nav
BigFunger Jul 13, 2015
f5ea2e1
[dashboard] Use flex-basis auto instead of 0% on panel titles, add co…
jbudz Jul 13, 2015
dd58bdd
optimize process now communicates with server process so server statu…
Jul 13, 2015
3c9f179
enhance tab settings
Jul 13, 2015
665bfbb
update serverStatus css
Jul 13, 2015
22fb1e5
Merge branch 'feature/3270/statusPage' of github.com:panda01/kibana i…
Jul 13, 2015
2c879b6
match the body color in the app-switchers tabs
Jul 14, 2015
77a9e0f
split up the statusPage a bit more
Jul 14, 2015
407da03
remove sense stub app
Jul 14, 2015
b15d6f2
[chrome] only show the apps link when there is more than one app inst…
Jul 14, 2015
c1efcc7
Added caching for consistent color of values across visualization
gauravsinghania Jul 2, 2015
db969df
adding null tests provided by @w33ble
stormpython Jul 14, 2015
df3e6a7
refactoring tests file
stormpython Jul 14, 2015
20102c9
refactoring
stormpython Jul 14, 2015
985e66f
fixing error with tests
stormpython Jul 14, 2015
8041769
Merge branch 'master' into fix/empty_field
stormpython Jul 14, 2015
c335800
Update the raw property when removing items from an indexed array. C…
jbudz Jul 14, 2015
06487ad
Update remaining remove references
jbudz Jul 14, 2015
19a66e9
Fixed issues with page posting and use of
BigFunger Jul 14, 2015
4b5c464
Merge pull request #4431 from jbudz/issues/4381
spalger Jul 14, 2015
d92459d
[licenses] update overrides, drop unused module
Jul 14, 2015
3820832
Mapped colors for line and area graph type visualization
gauravsinghania Jul 15, 2015
2892aa2
Docs: Fixed bad Shield links
clintongormley Jul 15, 2015
365ab3c
Docs: Another bad Shield link
clintongormley Jul 15, 2015
184dceb
Docs: Another bad Shield link
clintongormley Jul 15, 2015
7239d9c
Merge pull request #4401 from jbudz/issues/2995
BigFunger Jul 15, 2015
69524a5
Merge branch 'master' into clickable-legends
stormpython Jul 15, 2015
2e593a5
Modified to only call focus once depending on whether they have shift…
BigFunger Jul 15, 2015
1060a41
refactoring according to @jbudz 's comments.
stormpython Jul 15, 2015
153a60a
fixing bug with clicking on a legend that is not associated with any …
stormpython Jul 15, 2015
49d1e5a
Added a quiet cli option to the plugin installer, reworked settingPar…
BigFunger Jul 15, 2015
bed48ee
Use pre-wrap on discover table fields. Closes #4300
jbudz Jul 15, 2015
ec5a8f7
hoist requires in AMD modules and modularize some webpack stuff
Jul 15, 2015
25b775c
allow getters for the tab active color, load css in proper order
Jul 15, 2015
93c8ab9
Merge branch 'master' of github.com:elastic/kibana into apps/home
Jul 15, 2015
2093bf4
added new node-libs-browser dep to license config
Jul 15, 2015
5031196
Merge pull request #4222 from BigFunger/object-finder-keyboard-nav
spalger Jul 15, 2015
c8e16fa
Merge pull request #4359 from jbudz/issues/3687
spalger Jul 15, 2015
9d69b97
Merge pull request #4406 from BigFunger/install-plugin
spalger Jul 15, 2015
bb77b8a
Merge branch 'master' of github.com:elastic/kibana into apps/home
Jul 15, 2015
0de0ac4
unwrap the command files a bit, support multiple --plugin-path and --…
Jul 15, 2015
a1b7aab
default to pretty string formatting if outputting to stdout and it's …
Jul 16, 2015
bf11b06
remove lesshat usage
Jul 16, 2015
2563f6d
Merge pull request #4438 from jbudz/issues/4300
stormpython Jul 16, 2015
ffb5e8c
unwrap watch directory
Jul 16, 2015
5eb9bed
clean up the log output a bit
Jul 16, 2015
eb31780
make devmode support --silent and --quiet
Jul 16, 2015
9001265
clean up old grunt tasks
Jul 16, 2015
a3e93ee
remove plan doc
Jul 16, 2015
d21490c
allow customizing the directory plugins are installed to, move defaul…
Jul 16, 2015
1609968
move commands again
Jul 16, 2015
ffc4f3d
flatten the ui directory a bit, shorten module ids
Jul 16, 2015
5beb79d
Merge branch 'master' of github.com:elastic/kibana into apps/home
Jul 16, 2015
abfe919
move debug spy to devMode, and move basic spyModes to a plugin
Jul 16, 2015
844f2d6
moved tests next to related source files
Jul 16, 2015
4782bd6
Assigning label to the element, thus avoiding need to get the data-la…
gauravsinghania Jul 16, 2015
d1c3b14
Merge branch 'master' into clickable-legends
stormpython Jul 16, 2015
c243f8d
removing pointer from legend when value === Count
stormpython Jul 16, 2015
7dbba6b
reverting previous change
stormpython Jul 16, 2015
2ce474f
Merge pull request #3641 from stormpython/clickable-legends
stormpython Jul 16, 2015
4ca74b3
Fixed small typo in test description
BigFunger Jul 16, 2015
8ae3b8b
make unkown option collection opt-in
Jul 16, 2015
9258452
support removing events
Jul 16, 2015
ce8996d
Merge pull request #4444 from BigFunger/test-typo
BigFunger Jul 16, 2015
c7b441f
fix request logging by setting it up after server.connection()
Jul 16, 2015
5c4a8ea
[doc viewer] Remove display flex. Closes #2990
jbudz Jul 16, 2015
f863b30
close workers on process exit
Jul 16, 2015
a8b486b
don't require angular-bootstrap in the app-switcher
Jul 16, 2015
f0df913
Merge branch 'master' of github.com:elastic/kibana into apps/home
Jul 16, 2015
2aa1204
cast read entry file to string so comparrison works properly
Jul 16, 2015
d7a1749
[appSwitcher] fix alignment of the app cards
Jul 16, 2015
1c01589
fix directive name
Jul 17, 2015
7f8b1de
re-add ui component styles
Jul 17, 2015
c6a045a
Updating label in case of split charts for rows & columns
gauravsinghania Jul 17, 2015
a215bf6
[doc viewer] Use less parent selector shortcut
jbudz Jul 17, 2015
28f9045
Merge pull request #4445 from jbudz/issues/2990
BigFunger Jul 20, 2015
1586436
It has been a while.. sorry
Jul 20, 2015
75d0b07
move to ngMock module
Jul 21, 2015
9719145
Merge pull request #4345 from stevenbeeckman/patch-1
rashidkpc Jul 21, 2015
450cf58
update licenses
Jul 21, 2015
9e02c78
if a plugin resolves to a file, assume it is valid and error out if i…
Jul 22, 2015
a228174
commit to the ui/ module prefix
Jul 22, 2015
dd2b562
semicolon checking is a style thing
Jul 22, 2015
176b606
redirect to valid test url (with trailing slash)
Jul 22, 2015
eef8bb5
the elasticsearch plugin can't run without knowing the kibana configu…
Jul 22, 2015
1dfa46d
move meta-modules into special embedded plugin, simplify dependency p…
Jul 22, 2015
e46dabd
don't write invalid bundle files, or the optimizer will think they ar…
Jul 22, 2015
68247c9
lean on metaLibs using ui/modules for angular-module injection
Jul 22, 2015
8c580f9
fix references to file-saver
Jul 22, 2015
3f48493
ensure that bundles are synced before starting an optimizer
Jul 22, 2015
c342be8
allow specifying noParse rules in uiExports spec
Jul 22, 2015
9f17f06
cleanup LiveOptimizer active check
Jul 22, 2015
769e4af
move plugin status assignment into Plugin#init()
Jul 22, 2015
da9603a
fixed incompatibilities with angular, ace, and gridster
Jul 22, 2015
89044bc
added autoprefixer, make css sourcemaps optional
Jul 22, 2015
2377381
re-enable sourcemaps
Jul 22, 2015
2881da7
double down on ui/ prefix
Jul 22, 2015
af305c7
use ui-bootstrap with bundled templates
Jul 22, 2015
b168382
increase the url limit back to 10000, the recommended value
Jul 22, 2015
0978c50
Merge pull request #4400 from jbudz/upgrade-config
simianhacker Jul 22, 2015
8618cb3
Prevent visual editor from scrolling in IE10/11. Closes #3990
jbudz Jul 20, 2015
20bdb65
remove debug statements
Jul 22, 2015
835694b
update WatchingOptimizer to use latest conventions
Jul 22, 2015
69f8700
Merge pull request #4429. Closes #485
Jul 22, 2015
ec45b26
added better filters for which change events should restart the optim…
Jul 22, 2015
d265126
better track worker processes in watch mode
Jul 23, 2015
608be74
Merge branch 'master' of github.com:elastic/kibana into apps/home
Jul 23, 2015
ab686ee
listen to the proper rebuild event in optimizer
Jul 23, 2015
aace498
lastPath => lastUrl, drop _g the lastUrl
Jul 23, 2015
28de689
only log responses, by default, when logging json
Jul 23, 2015
64828d8
make the test bootstrap filename a bit more unique
Jul 23, 2015
48c4ed4
[chrome] split up api, added mucho docs, fixed _g moving
Jul 23, 2015
6bbcdea
[upgrade config] Use descriptive conditions
jbudz Jul 23, 2015
4b64e5a
Merge pull request #4481 from jbudz/issues/3990
BigFunger Jul 23, 2015
a68b201
small tweak to make anchors with hrefs work in saved object finder
BigFunger Jul 23, 2015
18f550e
Fixes pluralization on saved object finder
BigFunger Jul 23, 2015
632a019
Merge pull request #4487 from BigFunger/pluralization-fix
jbudz Jul 23, 2015
f0c3687
saved object finder selects single item on enter
BigFunger Jul 23, 2015
e11faa5
Merge pull request #4485 from BigFunger/saved-object-browser-anchor-c…
w33ble Jul 23, 2015
402dfe9
publicDir is no longer configurable, unless set to false it is assume…
Jul 23, 2015
77f70c1
rather than watching specific subdirectories, just ignore all public/…
Jul 24, 2015
2671579
case-sensitivity is good
Jul 24, 2015
cb9c5c9
fix the definition of the table_vis tests
Jul 24, 2015
33ede71
simplify test harness for now, focus on 'all tests' solution
Jul 24, 2015
94e120f
prevent accidentally clobbering config in kibana.yml
Jul 24, 2015
a3656e0
Merge pull request #4353 from stormpython/fix/empty_field
w33ble Jul 24, 2015
5511cf1
Add hit count tooltip to quick count in discover
jimmyjones2 Jul 25, 2015
3afb80a
Better docs on how the count is calculated
jimmyjones2 Jul 25, 2015
b2246da
fixed lots of dep issues in tests
Jul 26, 2015
136532f
Merge branch 'master' of github.com:elastic/kibana into apps/home
Jul 26, 2015
7d8e72c
loosen font regexp to capture all loaded variants
Jul 26, 2015
39192e6
handle hasty loops in the search looper more gracefully
Jul 26, 2015
2dff117
specified css support desired
Jul 26, 2015
2bcf846
get the server tests passing again
Jul 26, 2015
2905b79
relocated some tests, fixed others, moved more modules to CamelCase n…
Jul 27, 2015
d2048d7
split up StackTraceMapper
Jul 27, 2015
9a63665
Flipped a conditional for brevity
BigFunger Jul 27, 2015
5bd342a
Update STYLEGUIDE.md
BigFunger Jul 27, 2015
81a34a5
Merge pull request #4488 from BigFunger/auto-select-when-only-one-option
jbudz Jul 27, 2015
689d65d
Merge pull request #4484 from jbudz/upgrade-config
stormpython Jul 27, 2015
0a7c2d1
Merge pull request #4497 from jimmyjones2/quickcount
rashidkpc Jul 27, 2015
1e555c5
switch to Karma, now the tests pass with Grunt
Jul 27, 2015
f9f4b0e
Merge branch 'master' of github.com:elastic/kibana into apps/home
Jul 27, 2015
cfc8a9c
Merge pull request #4496 from jimmyjones2/hit_tooltip
rashidkpc Jul 27, 2015
cfc398b
remove bower, nice people matter
Jul 28, 2015
78348d1
Merge branch 'master' of github.com:elastic/kibana into apps/home
Jul 28, 2015
7fe7ff5
mocha => karma
Jul 28, 2015
0f6d59e
remove license checking from test script
Jul 28, 2015
992e396
karma config for travis
Jul 28, 2015
29fdd03
fix case-sensitivity issue
Jul 28, 2015
7454e36
add firefox plugin for karma
Jul 28, 2015
5705f1a
update auto-release-sinon
Jul 28, 2015
6e03b58
switch to dots reporter in grunt
Jul 28, 2015
f9897a3
added grunt tasks for jenkins and travis
Jul 28, 2015
95eb992
updated CONTRIBUTING.md to talk about avn and use the new --dev flag …
Jul 28, 2015
24b7060
Change importer to use saved object class, fix broken select all
lukasolson Jul 28, 2015
0e6e02e
update the doc title service to use chrome to get active app/tab
Jul 28, 2015
b82f5b5
Use Promise.map instead of Promise.all
lukasolson Jul 28, 2015
e4de84b
fixed windows issue in kibana.bat for spaces in path
BigFunger Jul 28, 2015
e2d6053
Merge pull request #5 from BigFunger/apps/home
spalger Jul 28, 2015
796e64b
Reset file upload on click so that onchange fires if same file is upl…
lukasolson Jul 28, 2015
67fdb33
ensure that entry files are created before the watching optimizer runs
Jul 28, 2015
8029a23
move tar to prod deps, and remove unused http-proxy
Jul 28, 2015
062ab01
skip clipboard tests that sometimes fail, opened #4511
Jul 28, 2015
2152bf0
disable the plugin tests since they fail on jenkins
Jul 29, 2015
d05d6a7
stretch out the browser-start timeout, Jenkins seems to be really slo…
Jul 29, 2015
05ca74b
Merge pull request #4509 from lukasolson/import-saved-objects
jbudz Jul 29, 2015
a442577
Fix field highlighting (#4494)
lukasolson Jul 29, 2015
09875a0
move default buildNum and version into config
Jul 29, 2015
9ec0636
Merge branch 'master' of github.com:elastic/kibana into apps/home
Jul 29, 2015
bbef901
close the elasticsearch client when the server closes
Jul 29, 2015
bce10f8
report errors from any mixin, and close the server when any occur
Jul 29, 2015
ba9e366
Merge pull request #4335 from spalger/apps/home
spalger Jul 30, 2015
8494a49
added babel/es6/jsx support to build system
Jul 30, 2015
c108b66
update auto-preload-rjscommon-deps-loader
Jul 30, 2015
86e3dcd
strict mode causes read only properties to throw when assigned
Jul 30, 2015
700736b
Merge branch 'master' of github.com:elastic/kibana into pr/4519
Jul 30, 2015
db42ce0
Merge pull request #6 from spalger/pr/4519
lukasolson Jul 30, 2015
7d85728
Update minimum ES version
Jul 30, 2015
ddfb3b0
Merge pull request #4526 from spalger/es6
jbudz Jul 30, 2015
83c395c
remove "use strict" directives
Jul 30, 2015
8070436
Fixes paths in the BaseOptimizer to work in windows
BigFunger Jul 31, 2015
3fb42c4
use babel/register hook from CLI
Jul 30, 2015
e70987a
destructuring assignment ftw
Jul 31, 2015
c4b7951
Fixed broken xrefs to Shield docs.
debadair Jul 31, 2015
1620728
fix navbar color customization
w33ble Jul 31, 2015
e0d78a8
switch to eslint
Jul 31, 2015
a86a40a
Merge pull request #4552 from spalger/eslint
w33ble Aug 1, 2015
54ad495
Delete .jscsrc
spalger Aug 1, 2015
cfde0e5
add jscs rules to eslint
Aug 1, 2015
9d4de5e
Revert "add jscs rules to eslint"
Aug 1, 2015
ac24ce9
Revert "Delete .jscsrc"
Aug 1, 2015
2c4ee3b
Delete .jscsrc
Aug 1, 2015
79dcc9a
add jscs rules to eslint
Aug 1, 2015
c779345
bable does not fully support subclassing Array like iojs does
Aug 3, 2015
1c31228
update grunt-esvm to support master output changes
Aug 3, 2015
ed330d8
Merge pull request #4557 from rashidkpc/linting/jscs-to-eslint
rashidkpc Aug 3, 2015
b89da25
Merge branch 'master' of github.com:elastic/kibana into fix/4561
Aug 3, 2015
e977e64
switch from eslint cli to gruntify-eslint
Aug 3, 2015
68ba543
Merge pull request #4572 from spalger/grunt/gruntify-eslint
rashidkpc Aug 3, 2015
a0b24d4
[StackTraceMapper] assign the stack, not the transformer function
Aug 3, 2015
1a8fc84
[TileMap/Map] fix export and test references
Aug 3, 2015
e63800e
wait for optimization to complete before considering the dev server r…
Aug 3, 2015
6d05807
move logo stuff to brand, make brand a settable object
w33ble Aug 3, 2015
cd6f825
use brand getter/setter
w33ble Aug 3, 2015
c36cd71
Merge pull request #4573 from spalger/fix/TileMapMap
w33ble Aug 3, 2015
5128c52
Merge branch 'master' of github.com:elastic/kibana into grunt/runDevS…
Aug 3, 2015
990a9e0
Merge pull request #4575 from spalger/grunt/runDevServer
w33ble Aug 3, 2015
6b1fb1c
allow karma to be run without path modification or global karma
w33ble Aug 3, 2015
7cdd4f5
Merge pull request #4577 from w33ble/easy-karma
spalger Aug 3, 2015
44a9f70
Merge pull request #4519 from lukasolson/field-highlight
w33ble Aug 4, 2015
850f08f
Merge pull request #4541 from BigFunger/baseOptimizer-path-fix
spalger Aug 4, 2015
da161a5
Merge branch 'master' of github.com:elastic/kibana into fix/4561
Aug 4, 2015
435cea4
Merge pull request #4571 from spalger/fix/4561
colings86 Aug 4, 2015
fdf057c
[linting] add support for async/await with babel-eslint
Aug 4, 2015
f647650
add visibility controls to chrome
w33ble Aug 4, 2015
3580d9a
Merge pull request #4548 from w33ble/custom-navbar
spalger Aug 5, 2015
bd269ed
set server babel options to match browser ones
Aug 5, 2015
bea5aa4
Fixing the ignore path for installedPlugins
simianhacker Aug 5, 2015
be713a9
Merge branch 'master' of github.com:elastic/kibana
simianhacker Aug 5, 2015
230daaf
only set notStandard:true for jsx loader
Aug 5, 2015
c2b297b
override the default nonStandard value
Aug 5, 2015
389ef2a
Merge pull request #4580 from spalger/lint/es7Support
jbudz Aug 5, 2015
5d37d62
we have seen this hook timeout every once and a while
Aug 5, 2015
02dc062
Merge pull request #4590 from spalger/fix/serverBabelOpts
jbudz Aug 5, 2015
fe9a878
Merge pull request #4592 from spalger/tests/addTimeoutToKbnServerStart
jbudz Aug 5, 2015
5c15b8c
Merge branch 'master' of github.com:elastic/kibana into pr/4434
Aug 5, 2015
f792150
convert range formatting to match date formatter
Aug 5, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
src/fixtures
optimize
69 changes: 69 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
---
parser: babel-eslint

env:
es6: true
amd: true
node: true
mocha: true
browser: true


rules:
block-scoped-var: 2
camelcase: [ 2, { properties: never } ]
comma-dangle: 0
comma-style: [ 2, last ]
consistent-return: 0
curly: [ 2, multi-line ]
dot-location: [ 2, property ]
dot-notation: [ 2, { allowKeywords: true } ]
eqeqeq: [ 2, allow-null ]
guard-for-in: 2
indent: [ 2, 2, { SwitchCase: 1 } ]
key-spacing: [ 0, { align: value } ]
max-len: [ 2, 140, 2, { ignoreComments: true, ignoreUrls: true } ]
new-cap: [ 2, { capIsNewExceptions: [ Private ] } ]
no-bitwise: 0
no-caller: 2
no-cond-assign: 0
no-debugger: 2
no-empty: 2
no-eval: 2
no-extend-native: 2
no-extra-parens: 0
no-irregular-whitespace: 2
no-iterator: 2
no-loop-func: 2
no-multi-spaces: 0
no-multi-str: 2
no-nested-ternary: 2
no-new: 0
no-path-concat: 0
no-proto: 2
no-return-assign: 0
no-script-url: 2
no-sequences: 2
no-shadow: 0
no-trailing-spaces: 2
no-undef: 2
no-underscore-dangle: 0
no-unused-expressions: 0
no-unused-vars: 0
no-use-before-define: [ 2, nofunc ]
no-with: 2
one-var: [ 2, never ]
quotes: [ 2, single ]
semi-spacing: [ 2, { before: false, after: true } ]
semi: [ 2, always ]
space-after-keywords: [ 2, always ]
space-before-blocks: [ 2, always ]
space-before-function-paren: [ 2, { anonymous: always, named: never } ]
space-in-parens: [ 2, never ]
space-infix-ops: [ 2, { int32Hint: false } ]
space-return-throw-case: [ 2 ]
space-unary-ops: [ 2 ]
strict: [ 2, never ]
valid-typeof: 2
wrap-iife: [ 2, outside ]
yoda: 0
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
.DS_Store
.node_binaries
node_modules
bower_components
**/*.css
trash
build
bundles
target
.jruby
.idea
*.iml
*.log
esvm
.htpasswd
installedPlugins
58 changes: 0 additions & 58 deletions .jscsrc

This file was deleted.

27 changes: 0 additions & 27 deletions .jshintrc

This file was deleted.

14 changes: 0 additions & 14 deletions .jshintrc.browser

This file was deleted.

8 changes: 0 additions & 8 deletions .jshintrc.node

This file was deleted.

2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.x
iojs-v2.4
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
language: node_js
node_js: '0.12'
node_js: 'iojs-v2.4'
install: npm install
script: npm test
script: ./node_modules/.bin/grunt travis
sudo: false
cache:
directories:
- esvm
- node_modules
- src/kibana/bower_components
before_cache:
- rm -rf esvm/*/logs esvm/data_dir
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
notifications:
email:
- rashid.khan@elastic.co
Expand Down
37 changes: 18 additions & 19 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,50 +10,49 @@ Please make sure you have signed the [Contributor License Agreement](http://www.

### Development Environment Setup

- Install node.js (we recommend using [nvm](https://github.com/creationix/nvm))
- Clone the kibana repo and move into it

```sh
## follow directions at https://github.com/creationix/nvm, then
nvm install 0.10
git clone https://github.com/elastic/kibana.git kibana
cd kibana
```

- Install grunt and bower globally (as root if not using nvm)
- Install the version of node.js listed in the `.node-version` file (this is made easy with tools like [nvm](https://github.com/creationix/nvm) and [avn](https://github.com/wbyoung/avn))

```sh
npm install -g grunt-cli bower
nvm install "$(cat .node-version)"
```

- Clone the kibana repo and move into it
- Install dependencies

```sh
git clone https://github.com/elastic/kibana.git kibana
cd kibana
npm install
```

- Install node and bower dependencies
- Start elasticsearch, you can use [esvm](https://github.com/simianhacker/esvm) to make that easier.

```sh
npm install && bower install
grunt esvm:dev:keepalive
```

- Start the development server.

```sh
grunt dev # use the "--with-es" flag to install & start elasticsearch too
./bin/kibana --dev
```

#### Linting

A note about linting: We use both [jshint](http://jshint.com/) and [jscs](http://jscs.info/) to check that the [styleguide](STYLEGUIDE.md) is being followed. They run in a pre-commit hook and as a part of the tests, but most contributors integrate these linters with their code editors for real-time feedback.
A note about linting: We use [eslint](http://eslint.org) to check that the [styleguide](STYLEGUIDE.md) is being followed. It runs in a pre-commit hook and as a part of the tests, but most contributors integrate it with their code editors for real-time feedback.

Here are some hints for setting up the linters in your favorite editor:
Here are some hints for getting eslint setup in your favorite editor:

| Editor | JSHint | JSCS |
| Editor | Plugin |
| --- | --- | --- |
| Sublime | [SublimeLinter-jshint](https://github.com/SublimeLinter/SublimeLinter-jshint#installation) | [SublimeLinter-jscs](https://github.com/SublimeLinter/SublimeLinter-jscs#installation) |
| Atom | [linter-jshint](https://github.com/AtomLinter/linter-jshint#installation) | [linter-jscs](https://github.com/AtomLinter/linter-jscs#installation) |
| IntelliJ | Settings » Languages & Frameworks » JavaScript » Code Quality Tools » JSHint (be sure to check "Use config files") | « |
| vi | ask @simianhacker | « |
| Sublime | [SublimeLinter-eslint](https://github.com/SublimeLinter/SublimeLinter-eslint#installation) |
| Atom | [linter-eslint](https://github.com/AtomLinter/linter-eslint#installation) |
| IntelliJ | Settings » Languages & Frameworks » JavaScript » Code Quality Tools » ESLint |
| vi | [scrooloose/syntastic](https://github.com/scrooloose/syntastic) |


### Testing and building
Expand All @@ -65,7 +64,7 @@ Before running the tests you will need to install the projects dependencies as d
Once that is complete just run:

```sh
grunt test build
./node_modules/.bin/grunt test build
```

Distributable, built packages can be found in `target/` after the build completes.
Expand Down
Loading