Merge branch 'search_display_refactor' into apache-blur-0.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/398b3e69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/398b3e69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/398b3e69 Branch: refs/heads/master Commit: 398b3e69c7ed52e1a821858da0fd64922f329787 Parents: fc0e03f 044baea Author: Chris Rohr <[email protected]> Authored: Thu Jul 10 12:50:39 2014 -0400 Committer: Chris Rohr <[email protected]> Committed: Thu Jul 10 12:50:39 2014 -0400 ---------------------------------------------------------------------- .../apache/blur/console/util/SearchUtil.java | 4 - .../src/main/webapp/js/blurconsole.fake.js | 13 +- .../src/main/webapp/js/blurconsole.model.js | 5 + .../src/main/webapp/js/blurconsole.search.js | 72 +- .../main/webapp/less/blurconsole.search.less | 6 + blur-console/src/main/webapp/less/colors.less | 2 +- ...console.043021c43a8a2b7528ad189b100feae0.css | 6476 +++++++++++++++++ ...console.61acc2e50a17def66e4d21f44aeb5c7f.css | 6481 ++++++++++++++++++ ...console.bfe9062c877a3904cde5eaa94c865433.css | 6476 ----------------- .../src/main/webapp/public/css/blurconsole.css | 2 +- ...ole.css.85b4970e6cc85ff19b38ea3992343cc9.map | 1 - ...ole.css.db643f2fc2dc56a029b94937c9325b71.map | 1 + .../main/webapp/public/css/blurconsole.css.map | 2 +- blur-console/src/main/webapp/public/index.html | 4 +- ...rconsole.2386c8f423ff1369e4d7b407401ca2b4.js | 27 - ...rconsole.274d4197822ef71e4cc7823715431b37.js | 27 + ...rconsole.4078a9938820234bb792ad296a41fec0.js | 27 + .../src/main/webapp/public/js/blurconsole.js | 6 +- ...sole.js.9763f3ccfd44712f79634ab4a7cc7e0a.map | 1 + ...sole.js.b069b48c3b15e9eeff1eac4a1c490fdc.map | 1 + ...sole.js.d5898caf0c8a8e22f30591d3c774457f.map | 1 - .../main/webapp/public/js/blurconsole.js.map | 2 +- 22 files changed, 13111 insertions(+), 6526 deletions(-) ----------------------------------------------------------------------
