Spencer Alger
f2d87ad5a4
Merge branch 'master' into build-tweaks
...
Conflicts:
dist/app/components/require.config.js
src/app/components/require.config.js
2013-09-15 12:45:27 -07:00
Spencer Alger
7b28483102
Fixed path to extend-jquery.js in require config
2013-09-15 07:12:42 -07:00
spenceralger
fd0b1986e8
Merge pull request #498 from spenceralger/extended-jquery-fix
...
Fix for jQuery extensions
2013-09-14 18:03:12 -07:00
Spencer Alger
a0bd73f27c
Previous fix did not work when jQuery was inlined into app.js because RequireJS was under the impression that it had already init-ed jQuery and didn't call the init function. This new strategy just allows jQuery to be jQuery and has app.js include the extensions (components/extend-jquery.js) before the app boots.
2013-09-14 17:59:09 -07:00
spenceralger
0325f781e3
Merge pull request #497 from spenceralger/extended-jquery-fix
...
Fixes the way that jQuery is loaded with RequireJS, closes #496
2013-09-14 17:37:15 -07:00
Spencer Alger
2a1c67ffdb
Somehow missed that tooltips were broken, caused by jquery defining itself using the 'jquery' name, which prevented our custom module from being included and extending jquery.
2013-09-14 17:21:25 -07:00
Spencer Alger
ab93bcecb2
Added a cache busting config option to RequireJS that will add the latest commit sha to urls (only in dist build).
2013-09-13 19:14:14 -07:00
spenceralger
8f67381c79
Merge pull request #494 from spenceralger/build-tweaks
...
Build tweaks
2013-09-13 16:29:51 -07:00
Spencer Alger
6c07338782
- Moved the config.js file into the root of the src and dist.
...
- prevented the config file from being minified.
- offloaded the js minification to a dedicated uglify task, which accepts more options than the require-js wrapper does.
- Addded the banner to the top of the minified files.
2013-09-13 16:02:08 -07:00
Rashid Khan
ebdbb8c6c2
Merge pull request #493 from rashidkpc/master
...
Fix for logstash.js, updated install instructions
2013-09-13 15:12:45 -07:00
Rashid Khan
82673b7b2b
Updated install instructions
2013-09-13 15:11:36 -07:00
Rashid Khan
c673b5ec67
Updated install instructions
2013-09-13 15:10:33 -07:00
Rashid Khan
04caf67a0d
Merge remote-tracking branch 'upstream/master'
2013-09-13 14:32:30 -07:00
Rashid Khan
78bfa53d63
Merge pull request #492 from spenceralger/master
...
Merged Pull Request #484
2013-09-13 14:29:55 -07:00
Spencer Alger
861d74ce0d
removed the patch logs
2013-09-13 13:57:26 -07:00
Spencer Alger
5d9cb85ccf
Merged Pull Request #484
2013-09-13 13:52:13 -07:00
Rashid Khan
8e9d3f7d14
Fixed typo that kept query panel from loading
2013-09-12 07:15:23 -07:00
Rashid Khan
0f551acc76
Merge pull request #483 from rashidkpc/master
...
Removed default @message from logstash dashboards
2013-09-11 16:46:47 -07:00
Rashid Khan
4b0678542c
Removed default @message from logstash dashboards
2013-09-11 16:46:15 -07:00
Rashid Khan
5f1b6984ed
Merge pull request #482 from rashidkpc/master
...
Pointer, timepicker cleanup and show _source by default in table
2013-09-11 16:43:15 -07:00
Rashid Khan
8b5ac5e56e
Show _source by default, sort by _score by default
2013-09-11 16:41:53 -07:00
Rashid Khan
14d525da34
added JSONifying of objects
2013-09-11 16:39:17 -07:00
Rashid Khan
b7441309fd
Merge branch 'histogramHighlight'
2013-09-11 15:59:25 -07:00
Rashid Khan
b63af822c7
Cleaned up timepicker layout
2013-09-11 15:58:53 -07:00
Rashid Khan
ea62d4aea3
Added pointer to chart hovers
2013-09-11 15:42:03 -07:00
Rashid Khan
f7c0e4280e
Merge pull request #479 from rashidkpc/master
...
Fix array value delimiting in table, improve nginx config, fix indenting
2013-09-11 11:17:48 -07:00
Rashid Khan
7ab2a5349a
Closes #477 , closes #464 . Also fixes urlLink and noXml filters on array fields
2013-09-11 11:14:05 -07:00
Rashid Khan
130402926e
Merge remote-tracking branch 'upstream/master'
2013-09-11 09:04:22 -07:00
Spencer Alger
d72c72b3df
fixing indent issue
2013-09-10 23:25:09 -07:00
Rashid Khan
e071366bbf
fixed unlinted line
2013-09-10 14:34:45 -07:00
Rashid Khan
cad7784d03
Merge remote-tracking branch 'upstream/master'
2013-09-09 07:20:47 -07:00
spenceralger
58ccc2985b
Merge pull request #469 from stephendotexe/update-404-error-message
...
Clarify error message.
2013-09-07 14:58:24 -07:00
Stephen Wood
6a9a2b95b1
Clarify error message.
...
Elasticsearch will throw a 404 if there is no indexes added yet, resulting in
this unclear message -- even for people that are not using any sort of proxy.
This message update should make it easier to quickly troubleshoot why the
the dialogue is popping up.
2013-09-06 16:30:08 -07:00
Rashid Khan
a428f9e5de
Fix nginx.conf after switching dashboard load to GET
2013-09-06 14:38:01 -07:00
Rashid Khan
c6d8ea2356
Merge pull request #467 from rashidkpc/navbar-control
...
Moved dash controller to navbar. Settings for it to dashboard settings.
2013-09-06 13:21:40 -07:00
Rashid Khan
eb25ce5f7e
Moved dashboard controller to nav bar
2013-09-06 13:20:12 -07:00
Rashid Khan
8c6511d30a
Moved dashUpload, added icon attribute to tip directive
2013-09-06 13:02:33 -07:00
Rashid Khan
9798f8be30
Merge pull request #463 from rashidkpc/templated_json
...
Templated and scriptable dashboard options
2013-09-04 10:59:02 -07:00
Rashid Khan
859c399646
Namespace kibana url parameters
2013-09-04 10:56:31 -07:00
Rashid Khan
0280626a1e
Lint dashboard scripts
2013-09-04 10:55:48 -07:00
Rashid Khan
7e5c36e9aa
Made logstash.js look more like logstash.json. Added info notice for lack of failover and time filter
2013-09-04 09:40:11 -07:00
Rashid Khan
968c575408
templated and scripted dashboards
2013-09-03 16:46:12 -07:00
Rashid Khan
dfb9388f7e
Merge remote-tracking branch 'spencer/filter-by-undefined' into undefined
2013-09-03 09:27:28 -07:00
Rashid Khan
9440fcfd2c
Merge pull request #459 from Topface/typos
...
Removed extra ">" in tooltip
2013-09-03 07:00:01 -07:00
bobrik
a2deecd134
Removed extra ">" in tooltip
2013-09-02 13:02:59 +04:00
Spencer Alger
c9eccf99c8
added logic to the micropanel filters in the table panel to handle undefined values better
2013-08-30 16:41:59 -07:00
Rashid Khan
723a18656f
Merge pull request #454 from rashidkpc/master
...
Switched settings panels to use tip directive
2013-08-30 15:45:03 -07:00
Rashid Khan
6c972e82f7
Fixed conflict
2013-08-30 15:44:01 -07:00
Rashid Khan
91a5192a0a
Switched settings panels to use tip directive
2013-08-30 15:40:12 -07:00
spenceralger
df91300bab
Merge pull request #452 from spenceralger/tooltip-header
...
Tooltip series identifier
2013-08-30 15:37:51 -07:00
