i've done a bunch of merging, please combine into master #15

Merged
merged 23 commits into from Apr 6, 2012

Projects

None yet

9 participants

@lookfirst
Contributor

I've merged most of the changes people have made into a single branch (and fixed one small issue in a regex). Please pull my branch back into master.

watsonian and others added some commits Dec 7, 2009
@watsonian watsonian Added zcat / gzcat detection. 36d8a89
@pc pc Fix --include CLI flag ae6f5bf
@pc pc allow tailing of files that don't match /\.log$/ 444a191
@edouard edouard Makes Auto-scroll button easier to click by adding a label 46df7ed
@josiahivey @edouard josiahivey Show hostname in header and browser window title. Helpful when runnin…
…g in a multi-server environment.
c230343
@edouard edouard Add missing file to manifest 664da8d
@coosh coosh Expanded on the log renderer 40b0914
@coosh coosh Style sheets for updated renderer 7dcbdf4
chris.boulton Fix security issue allowing directory traversal for any request serve…
…d from the public directory
b98eeb4
chris.boulton When json encoding params, ensure that < and > are also encoded to pr…
…event possible security issues
7ec3c51
John Williams change discovery of file type to use file command instead of file ext…
…ension
111f50d
Jon Stevens Merge branch 'master' of https://github.com/chrisboulton/clarity 45af278
Jon Stevens Merge branch 'master' of https://github.com/pc/clarity
Conflicts:
	views/_toolbar.html.erb
2ee3667
Jon Stevens Merge branch 'master' of https://github.com/edouard/clarity
Conflicts:
	lib/clarity.rb
	views/_toolbar.html.erb
98c390d
Jon Stevens Merge branch 'master' of https://github.com/johnwilliams/clarity ebc2aaf
Jon Stevens fix for warning: lib/clarity/renderers/log_renderer.rb:17: warning: r…
…egexp has `}' without escape
ce993e5
Jon Stevens Merge branch 'master' of git://github.com/watsonian/clarity b4bbda7
@lookfirst lookfirst added another example usage to make the --include functionality more …
…clear
9bb62ea
@fcanache fcanache adding fix to avoid clearing the current log file selected when the a…
…ction is changed.
068ec9b
@fcanache fcanache adding fix to avoid clearing the current log file selected when the a…
…ction is changed.
b23170b
@lookfirst lookfirst Merge pull request #2 from fcanache/master
Fix for the issue on the log file dropdown.
0ff2194
@incase incase Fix gzcat/zcat test 77c8718
@lookfirst lookfirst Merge pull request #3 from incase/master
As suggested per eMail, I'm sending you a pull request.
74f93db
@tobi tobi merged commit 7ad9a19 into tobi:master Apr 6, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment