Changeset [abb1396a4875943ce87ff75d06dec8d0ca45e463] by Joao Carlos
Revision abb1396a4875943ce87ff75d06dec8d0ca45e463,
committed by Joao Carlos
· May 25th, 2010 @ 09:44 PM
Merge branch 'master' of http://github.com/k33l0r/eish
Conflicts:
app/views/users/_userlinks.html.erb
http://github.com/jcxplorer/eish/commit/abb1396a4875943ce87ff75d06d...
137 changed files
-
A
Gemfile -
A
config/initializers/backtrace_silencers.rb -
A
config/initializers/cookie_verification_secret.rb -
A
config/initializers/session_store.rb -
A
config/preinitializer.rb -
A
db/seeds.rb -
A
lib/tasks/paperclip_tasks.rake -
A
public/images/jquery-fancybox/blank.gif -
A
public/images/jquery-fancybox/fancy_close.png -
A
public/images/jquery-fancybox/fancy_loading.png -
A
public/images/jquery-fancybox/fancy_nav_left.png -
A
public/images/jquery-fancybox/fancy_nav_right.png -
A
public/images/jquery-fancybox/fancy_title_over.png -
A
public/images/jquery-fancybox/fancybox-x.png -
A
public/images/jquery-fancybox/fancybox-y.png -
A
public/images/jquery-fancybox/fancybox.png -
R
.gitmodules -
R
app/controllers/search_controller.rb -
R
app/helpers/search_helper.rb -
R
app/views/search/articles.html.erb -
R
app/views/search/events.html.erb -
R
app/views/search/galleries.html.erb -
R
app/views/search/index.html.erb -
R
app/views/search/news.html.erb -
R
app/views/search/opensearch.rxml -
R
app/views/search/results.html.erb -
R
config/initializers/setup_xapit.rb -
R
lib/tasks/diagrams.rake -
R
lib/tasks/xapit.rake -
R
public/images/jquery-fancybox/fancy_closebox.png -
R
public/images/jquery-fancybox/fancy_left.png -
R
public/images/jquery-fancybox/fancy_progress.png -
R
public/images/jquery-fancybox/fancy_right.png -
R
test/functional/search_controller_test.rb -
R
test/unit/helpers/search_helper_test.rb -
M
.gitignore -
M
ChangeLog -
M
README.textile -
M
app/controllers/about_controller.rb -
M
app/controllers/admin/about_controller.rb -
M
app/controllers/admin/articles_controller.rb -
M
app/controllers/admin/events_controller.rb -
M
app/controllers/admin/galleries_controller.rb -
M
app/controllers/admin/news_controller.rb -
M
app/controllers/admin/settings_controller.rb -
M
app/controllers/admin/users_controller.rb -
M
app/controllers/application_controller.rb -
M
app/controllers/articles_controller.rb -
M
app/controllers/contact_controller.rb -
M
app/controllers/events_controller.rb -
M
app/controllers/galleries_controller.rb -
M
app/controllers/home_controller.rb -
M
app/controllers/news_controller.rb -
M
app/controllers/profiles_controller.rb -
M
app/controllers/sessions_controller.rb -
M
app/controllers/sitemap_controller.rb -
M
app/controllers/users_controller.rb -
M
app/helpers/application_helper.rb -
M
app/models/article.rb -
M
app/models/event.rb -
M
app/models/gallery.rb -
M
app/models/news.rb -
M
app/views/about/index.html.erb -
M
app/views/admin/about/index.html.erb -
M
app/views/admin/articles/compare.html.erb -
M
app/views/admin/articles/edit.html.erb -
M
app/views/admin/articles/index.html.erb -
M
app/views/admin/articles/new.html.erb -
M
app/views/admin/events/edit.html.erb -
M
app/views/admin/events/index.html.erb -
M
app/views/admin/events/new.html.erb -
M
app/views/admin/galleries/edit.html.erb -
M
app/views/admin/galleries/index.html.erb -
M
app/views/admin/galleries/new.html.erb -
M
app/views/admin/news/edit.html.erb -
M
app/views/admin/news/index.html.erb -
M
app/views/admin/news/new.html.erb -
M
app/views/admin/settings/index.html.erb -
M
app/views/admin/users/edit.html.erb -
M
app/views/admin/users/index.html.erb -
M
app/views/admin/users/new.html.erb -
M
app/views/articles/index.html.erb -
M
app/views/articles/show.html.erb -
M
app/views/contact/index.html.erb -
M
app/views/events/index.html.erb -
M
app/views/events/past.html.erb -
M
app/views/events/show.html.erb -
M
app/views/galleries/index.html.erb -
M
app/views/galleries/show.html.erb -
M
app/views/layouts/admin.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/news/index.html.erb -
M
app/views/news/show.html.erb -
M
app/views/profiles/show.html.erb -
M
app/views/sitemap/index.rxml -
M
app/views/users/_userlinks.html.erb -
M
app/views/users/edit.html.erb -
M
app/views/users/new.html.erb -
M
app/views/users/password_reset.html.erb -
M
app/views/users/remove.html.erb -
M
app/views/users/request_credentials.html.erb -
M
config/boot.rb -
M
config/environment.rb -
M
config/environments/development.rb -
M
config/environments/production.rb -
M
config/environments/test.rb -
M
config/initializers/new_rails_defaults.rb -
M
config/initializers/settings.rb -
M
doc/README_FOR_APP -
M
lib/authorization.rb -
M
public/images/jquery-fancybox/fancy_shadow_e.png -
M
public/images/jquery-fancybox/fancy_shadow_n.png -
M
public/images/jquery-fancybox/fancy_shadow_ne.png -
M
public/images/jquery-fancybox/fancy_shadow_nw.png -
M
public/images/jquery-fancybox/fancy_shadow_s.png -
M
public/images/jquery-fancybox/fancy_shadow_se.png -
M
public/images/jquery-fancybox/fancy_shadow_sw.png -
M
public/images/jquery-fancybox/fancy_shadow_w.png -
M
public/images/jquery-fancybox/fancy_title_left.png -
M
public/images/jquery-fancybox/fancy_title_main.png -
M
public/images/jquery-fancybox/fancy_title_right.png -
M
public/javascripts/chroma-hash.js -
M
public/javascripts/jquery.easing.js -
M
public/javascripts/jquery.fancybox.js -
M
public/javascripts/jquery.js -
M
public/stylesheets/jquery.fancybox.css -
M
script/about -
M
script/console -
M
script/dbconsole -
M
script/destroy -
M
script/generate -
M
script/performance/benchmarker -
M
script/performance/profiler -
M
script/plugin -
M
script/runner -
M
script/server -
M
test/test_helper.rb