Commit graph

915 commits

Author SHA1 Message Date
Spencer Alger
22fb1e5a96 Merge branch 'feature/3270/statusPage' of github.com:panda01/kibana into apps/home 2015-07-13 16:55:12 -07:00
Spencer Alger
0d4ebcb072 license has updated, but the licenses are the same 2015-07-12 20:37:40 -07:00
Khalah Jones-Golden
23a22d5aae [Merge] Merged with latest master 2015-07-10 11:26:07 -04:00
Khalah Jones-Golden
0936b0340c [Status] Fixed some bugs, moved some things around generally improved code, Also fixed watch task for status plugin css 2015-07-10 11:14:09 -04:00
Spencer Alger
382598fada split dev server in two, preventing server source file from forcing webpack rebuilds 2015-07-10 06:20:03 -07:00
Spencer Alger
e809f4b718 Merge branch 'master' of github.com:elastic/kibana into apps/home 2015-07-09 20:18:26 -07:00
Spencer Alger
5a5e6fae55 Merge branch 'master' of github.com:elastic/kibana into feature/3270/statusPage 2015-07-09 19:24:04 -07:00
Spencer Alger
f621a42368 fix styles, time to begin finding bugs 2015-07-07 19:32:48 -07:00
Spencer Alger
522a00ec5d building is mostly stable, less is improving, initial cached building added 2015-07-06 20:49:41 -07:00
Spencer Alger
40536fe053 Merge branch 'master' of github.com:elastic/kibana into apps/home 2015-06-30 05:13:28 -07:00
Spencer Alger
844b95c932 initial webpack implementation 2015-06-30 05:12:56 -07:00
Spencer Alger
1ed3cbbfcb Update license-checker, override amdefine
The amdefine module was updated to use a newish license syntax that license-checker doesn't seem to support yet. In order to prevent invalid failures I've added an override that will keep things functioning for now.

(cherry picked from commit 6dd8aae1c5)
2015-06-29 11:20:47 -07:00
Rashid Khan
7efd5dbaa6 Use --debug instead of --verbose 2015-06-26 12:16:58 -07:00
Spencer Alger
3ceaf12216 unwrap ui source 2015-06-25 16:00:20 -07:00
Spencer Alger
0edf82145c defaultRoute implemented, redirect when missing a slash 2015-06-25 15:44:06 -07:00
Rashid Khan
81b5197bee Make licenses task take --verbose 2015-06-25 14:24:52 -07:00
Spencer Alger
91f0e125e8 fix status and devServer grunt tasks 2015-06-25 13:40:15 -07:00
Spencer Alger
2181f32a3b fix less building 2015-06-25 10:31:50 -07:00
Khalah Jones-Golden
4595f4b267 [Status] Fixed a bug with the time on tooltip, changed watch config 2015-06-25 11:50:46 -04:00
Khalah Jones-Golden
da2287bdf6 [Licenses] Updated licenses for the weird variation for angular-nvd3 2015-06-25 11:23:09 -04:00
Khalah Jones-Golden
61193f893c [Status] Some code cleanup, added server less to watch adnd less, adjsted some css for proper display, updated code to work again 2015-06-25 11:12:18 -04:00
Khalah Jones-Golden
270cd5c659 Merge remote-tracking branch 'upstream/master' into feature/3270/statusPage 2015-06-25 08:47:44 -04:00
Spencer Alger
8d2e8816dc [server] work out plugin organization, and app declaration 2015-06-24 23:47:19 -07:00
Spencer
9ae53c3715 Disable marvel and refresh master on restart
Since marvel doesn't currently work with es 2.0 I'm disabling the plugin and adding `fresh: true` so that every time the esvm task is run it will refresh our master build.
2015-06-23 11:44:49 -07:00
Chris Cowan
c6b98b3714 Moving esvm to branch:master to pickup ES 2.0 2015-06-23 10:01:44 -07:00
Khalah Jones-Golden
ee53512d83 [bower] Put the proper packages for nvd3 and the like, also disabled licenses, for now. 2015-06-21 11:05:01 -04:00
Spencer Alger
dddfb802c2 Merge branch 'master' of github.com:elastic/kibana into update/lodash 2015-06-19 10:54:22 -07:00
Spencer
9c3784ef03 Merge pull request #4245 from spalger/fix/server-debug-mode
Fix/server debug mode
2015-06-18 07:27:20 -07:00
Spencer Alger
701d2dedfb Merge branch 'master' of github.com:elastic/kibana into update/lodash 2015-06-16 18:02:30 -07:00
Spencer Alger
8da87d75f0 Merge branch 'master' of github.com:elastic/kibana into testing/seeds 2015-06-16 17:32:04 -07:00
Spencer Alger
4c744b9e5c [grunt] fix maybe_start_kibana 2015-06-15 16:40:14 -07:00
Spencer Alger
1cdcb644c7 [server] move dev server to isolated script for nodemon compat 2015-06-15 16:07:37 -07:00
Spencer Alger
1b308bf86b Merge branch 'master' of github.com:elastic/kibana into update/lodash 2015-06-15 15:12:00 -07:00
Spencer
bcc9a7bd60 Merge pull request #4210 from spalger/update/grunt-plugins
[grunt] update plugins
2015-06-15 14:44:52 -07:00
Chris Cowan
1e6f904530 Fix tasks so the server builds correctly
- Fix logging to use json output when using kibana.js to start server
- Closes #4241
- Support process.env.CONFIG_PATH
- add bundled_plugin_ids support back into server
2015-06-15 13:56:47 -07:00
Spencer Alger
a6f938866c [lodash] switch flatten() and flattenDeep() 2015-06-15 10:10:59 -07:00
Chris Cowan
90d4f862a7 Merge branch 'master' of github.com:elastic/kibana into feature/hapi-server 2015-06-15 08:09:34 -07:00
Spencer Alger
2c230f7cd4 [grunt] update plugins 2015-06-11 19:10:16 -07:00
Spencer Alger
a5ffd91277 [lodash] audit _() usage to ensure compatibility with lodash 3.0
Starting in lodash 3.0 _() chains are lazily evaluated and therefor usage of the pattern had to be checked for side effects. Where it made more sense to just use Array methods, the code was updated. In other places the code was already calling .value() on the chain, so no changes were needed. Finally, there were places where the chain was not designed to produce a value, but to modify a value that was already in scope (like this/self), in those senarios .commit() was added to force evaluation of the chain.
2015-06-11 18:27:18 -07:00
Spencer Alger
d8313082ab [simple-git] udpate 2015-06-11 15:27:42 -07:00
Chris Cowan
a7f424eec5 Merge branch 'master' of github.com:elastic/kibana into feature/hapi-server 2015-06-08 17:04:48 -07:00
Spencer Alger
dc07a456cd removed unused deps and prevent license failure 2015-06-08 14:17:22 -07:00
Chris Cowan
cf8bfd0f10 Merge branch 'master' of github.com:elastic/kibana into feature/hapi-server 2015-06-05 17:06:48 -07:00
Rashid Khan
1494ce2b44 Fix license check of assert-plus and commander 2015-06-05 12:08:04 -07:00
Spencer Alger
dc0f6bb2b6 Merge branch 'master' of github.com:elastic/kibana into pr/4114 2015-06-05 11:06:11 -07:00
Spencer Alger
ec9ddb7232 [testing] remove saucelabs runner and utils 2015-06-04 16:22:30 -07:00
Rashid Khan
20b261d9d6 Add to grunt test 2015-06-04 14:15:10 -07:00
Rashid Khan
fc28784e4d Add 'licenses' task to grunt to check for incompatible licenses 2015-06-04 13:47:57 -07:00
Chris Cowan
ff5b369d42 Merge branch 'master' of github.com:elastic/kibana into feature/hapi-server 2015-06-03 16:53:14 -07:00
Shaunak Kashyap
6f401c12e3 Parameterize Kibana port 2015-06-03 15:16:30 -07:00