Toks c51c3e800a Merge branch 'testing' ...

Conflicts:
	app/views/artists/_quick_search.html.erb
	app/views/pools/_quick_search.html.erb
	app/views/tags/_quick_search.html.erb
	app/views/wiki_pages/_quick_search.html.erb

2013-03-30 15:50:31 -04:00

..

_quick_search.html.erb

Merge branch 'testing'

2013-03-30 15:50:31 -04:00

_secondary_links.html.erb

remove links that are not usable by anon users, fixes #977

2013-03-22 10:18:05 -07:00

destroy.js.erb

tweaks

2012-04-18 12:20:49 -04:00

edit.html.erb

fixes

2012-03-12 17:50:45 -04:00

index.html.erb

adds support for user level-dependent classes

2013-03-30 12:04:58 -04:00

new.html.erb

fixed titles

2011-10-23 16:55:57 -04:00

search.html.erb

Kill trailing whitespace in erb files

2013-03-19 23:11:58 +11:00

show.html.erb

fixes #874

2013-03-19 22:48:13 -07:00

undelete.js.erb

tweaks

2012-04-18 12:20:49 -04:00

update.js.erb

pool views

2011-02-25 17:41:00 -05:00