Merge branch 'blur-366'
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/838fb26b Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/838fb26b Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/838fb26b Branch: refs/heads/master Commit: 838fb26bc94d5975955cc7731bd1f46cc23fa1d3 Parents: 0fb15df 3055e51 Author: Chris Rohr <[email protected]> Authored: Sun Oct 26 22:42:46 2014 -0400 Committer: Chris Rohr <[email protected]> Committed: Sun Oct 26 22:42:46 2014 -0400 ---------------------------------------------------------------------- LICENSE | 4 + blur-console/src/main/webapp/Gruntfile.js | 1 + .../src/main/webapp/js/blurconsole.search.js | 68 +- .../src/main/webapp/libs/moment/moment.js | 2861 ++++++++++++++++++ blur-console/src/main/webapp/public/index.html | 2 +- ...rconsole.500ad524370515c9a3aadcdb7e2f6d17.js | 28 + ...rconsole.598dd9e6ddb733121e7b9b14ad7c4272.js | 28 + ...rconsole.f74c82c84f27229f0c9bc37b2c57ea82.js | 27 - .../src/main/webapp/public/js/blurconsole.js | 9 +- ...sole.js.48bca05a3a37b5604a6f955c6c799f26.map | 1 - ...sole.js.6783a7cbcbda8b7b5ff3483c841cd343.map | 1 + .../main/webapp/public/js/blurconsole.js.map | 2 +- .../main/webapp/public/views/search.tpl.html | 5 +- .../src/main/webapp/views/search.tpl.html | 5 +- 14 files changed, 3004 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
