Changeset [8b756515a58d9345bef98a63042a899894f340bc] by Graeme Worthy
Revision 8b756515a58d9345bef98a63042a899894f340bc,
committed by Graeme Worthy
· May 6th, 2009 @ 04:27 PM
Merge branch 'krh-merge'
- krh-merge: homepage controller redirect cleaned up toc code a bit and got toc into buildings add hpricot added map to front page, and stopped posting 'edit' links automatically, they are in individual partials now changed the way that invites work so that it's less confusing and people can actually create accounts fixed post method problem on facebox ajax requests, and made tests pass for it http://github.com/graemeworthy/g...
75 changed files
-
M
app/controllers/items_controller.rb -
M
app/controllers/sessions_controller.rb -
M
app/controllers/users_controller.rb -
M
app/helpers/items_helper.rb -
M
app/models/building.rb -
M
app/models/item.rb -
M
app/models/user.rb -
M
app/views/dashboard/index.html.erb -
M
app/views/items/_description.html.erb -
M
app/views/items/_edit_smallmap.html.erb -
M
app/views/items/_edit_tags.html.erb -
M
app/views/items/_map.html.erb -
M
app/views/items/_picture.html.erb -
M
app/views/items/_smallmap.html.erb -
M
app/views/items/_summary.html.erb -
M
app/views/items/_tags.html.erb -
M
app/views/items/show.html.erb -
M
app/views/layouts/_header.html.erb -
M
app/views/layouts/application.html.erb -
M
app/views/pages/show.html.erb -
M
app/views/users/new.html.erb -
M
config/environment.rb -
M
config/routes.rb -
M
public/stylesheets/greenbuildingmap.css -
M
spec/controllers/homepage_controller_spec.rb -
M
spec/controllers/sessions_controller_spec.rb -
M
vendor/gems/hpricot-0.8.1/.specification -
M
vendor/gems/hpricot-0.8.1/CHANGELOG -
M
vendor/gems/hpricot-0.8.1/COPYING -
M
vendor/gems/hpricot-0.8.1/README -
M
vendor/gems/hpricot-0.8.1/Rakefile -
M
vendor/gems/hpricot-0.8.1/ext/fast_xs/FastXsService.java -
M
vendor/gems/hpricot-0.8.1/ext/fast_xs/extconf.rb -
M
vendor/gems/hpricot-0.8.1/ext/fast_xs/fast_xs.c -
M
vendor/gems/hpricot-0.8.1/ext/hpricot_scan/HpricotScanService.java -
M
vendor/gems/hpricot-0.8.1/ext/hpricot_scan/extconf.rb -
M
vendor/gems/hpricot-0.8.1/ext/hpricot_scan/hpricot_common.rl -
M
vendor/gems/hpricot-0.8.1/ext/hpricot_scan/hpricot_css.c -
M
vendor/gems/hpricot-0.8.1/ext/hpricot_scan/hpricot_css.rl -
M
vendor/gems/hpricot-0.8.1/ext/hpricot_scan/hpricot_scan.c -
M
vendor/gems/hpricot-0.8.1/ext/hpricot_scan/hpricot_scan.h -
M
vendor/gems/hpricot-0.8.1/ext/hpricot_scan/hpricot_scan.java.rl -
M
vendor/gems/hpricot-0.8.1/ext/hpricot_scan/hpricot_scan.rl -
M
vendor/gems/hpricot-0.8.1/ext/hpricot_scan/test.rb -
M
vendor/gems/hpricot-0.8.1/extras/mingw-rbconfig.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot/blankslate.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot/builder.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot/elements.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot/htmlinfo.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot/inspect.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot/modules.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot/parse.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot/tag.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot/tags.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot/traverse.rb -
M
vendor/gems/hpricot-0.8.1/lib/hpricot/xchar.rb -
M
vendor/gems/hpricot-0.8.1/test/files/basic.xhtml -
M
vendor/gems/hpricot-0.8.1/test/files/boingboing.html -
M
vendor/gems/hpricot-0.8.1/test/files/cy0.html -
M
vendor/gems/hpricot-0.8.1/test/files/immob.html -
M
vendor/gems/hpricot-0.8.1/test/files/pace_application.html -
M
vendor/gems/hpricot-0.8.1/test/files/tenderlove.html -
M
vendor/gems/hpricot-0.8.1/test/files/uswebgen.html -
M
vendor/gems/hpricot-0.8.1/test/files/utf8.html -
M
vendor/gems/hpricot-0.8.1/test/files/week9.html -
M
vendor/gems/hpricot-0.8.1/test/files/why.xml -
M
vendor/gems/hpricot-0.8.1/test/load_files.rb -
M
vendor/gems/hpricot-0.8.1/test/nokogiri-bench.rb -
M
vendor/gems/hpricot-0.8.1/test/test_alter.rb -
M
vendor/gems/hpricot-0.8.1/test/test_builder.rb -
M
vendor/gems/hpricot-0.8.1/test/test_parser.rb -
M
vendor/gems/hpricot-0.8.1/test/test_paths.rb -
M
vendor/gems/hpricot-0.8.1/test/test_preserved.rb -
M
vendor/gems/hpricot-0.8.1/test/test_xml.rb