Changeset [0c21d495f0319e2167dd4696889d959d7f6c92a1] by Kalin Harvey
Revision 0c21d495f0319e2167dd4696889d959d7f6c92a1,
committed by Kalin Harvey
· May 2nd, 2009 @ 08:56 PM
Merge branch 'master' into buildingscreator
- master: (22 commits) tidied up some of the version text and partialized the version info box removed compass gem which isn't being used anymore added specifications to stop getting specification warnings on rspec added a security check on stars added some basic navigation controls, prev and next to show versions got the stars to at least thumbsup thumbsdown login had no button on firefox added stars and svgs stying fatter model, some awesome shortcuts to getting the data all formatted. Merge commit 'origin'; branch 'items' Changed Resource into Item and added scaffolding for items another minor fix in the show view for pages cleaned up some stuff in pages view cleaned up some stuff in pages view cleaned up some stuff in pages view added extra google api keys added extra google api keys added extra google api keys that's the last time you break my heart rtomyako ...
Conflicts:
app/controllers/buildings_controller.rb
96 changed files
-
M
app/controllers/application_controller.rb -
M
app/controllers/buildings_controller.rb -
M
app/controllers/dashboard_controller.rb -
M
app/controllers/items_controller.rb -
M
app/controllers/pages_controller.rb -
M
app/controllers/versions_controller.rb -
M
app/helpers/application_helper.rb -
M
app/helpers/items_helper.rb -
M
app/helpers/pages_helper.rb -
M
app/models/building.rb -
M
app/models/item.rb -
M
app/models/page.rb -
M
app/models/rating.rb -
M
app/models/resource.rb -
M
app/models/user.rb -
M
app/views/homepage/index.html.erb -
M
app/views/items/edit.html.erb -
M
app/views/items/index.html.erb -
M
app/views/items/new.html.erb -
M
app/views/items/show.html.erb -
M
app/views/layouts/items.html.erb -
M
app/views/layouts/map.html.erb -
M
app/views/pages/_version_info.html.erb -
M
app/views/pages/show.html.erb -
M
app/views/sessions/new.html.erb -
M
app/views/versions/index.html.erb -
M
config/environment.rb -
M
config/gmaps_api_key.yml -
M
config/routes.rb -
M
db/development_structure.sql -
M
db/migrate/20090501072000_rename_resources_to_items.rb -
M
db/schema.rb -
M
public/images/green-building-brain-svgs/gray-star.png -
M
public/images/green-building-brain-svgs/green-star.png -
M
public/images/green-building-brain-svgs/heart.svg -
M
public/images/green-building-brain-svgs/todo.png -
M
public/images/green-building-brain-svgs/todo.svg -
M
public/images/green-building-brain-svgs/yellow-star.png -
M
public/images/icon -
M
public/images/icons/greenbuildingmap.jpg -
M
public/images/icons/todo.png -
M
public/stylesheets/greenbuildingmap.css -
M
spec/controllers/buildings_controller_spec.rb -
M
spec/controllers/items_controller_spec.rb -
M
spec/controllers/pages_controller_spec.rb -
M
spec/controllers/versions_controller_spec.rb -
M
spec/fixtures/items.yml -
M
spec/helpers/items_helper_spec.rb -
M
spec/models/item_spec.rb -
M
spec/models/rating_spec.rb -
M
spec/models/resource_spec.rb -
M
spec/routing/items_routing_spec.rb -
M
spec/views/items/edit.html.erb_spec.rb -
M
spec/views/items/index.html.erb_spec.rb -
M
spec/views/items/new.html.erb_spec.rb -
M
spec/views/items/show.html.erb_spec.rb -
M
vendor/gems/haml-2.0.9/.specification -
M
vendor/gems/rtomayko-rdiscount-1.3.4/.specification -
M
vendor/gems/rtomayko-rdiscount-1.3.4/COPYING -
M
vendor/gems/rtomayko-rdiscount-1.3.4/README.markdown -
M
vendor/gems/rtomayko-rdiscount-1.3.4/Rakefile -
M
vendor/gems/rtomayko-rdiscount-1.3.4/bin/rdiscount -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/Csio.c -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/Csio.o -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/Makefile -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/amalloc.h -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/config.h -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/cstring.h -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/docheader.c -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/docheader.o -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/dumptree.c -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/dumptree.o -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/extconf.rb -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/generate.c -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/generate.o -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/markdown.c -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/markdown.h -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/markdown.o -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/mkdio.c -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/mkdio.h -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/mkdio.o -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/rdiscount.bundle -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/rdiscount.c -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/rdiscount.o -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/resource.c -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/resource.o -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/toc.c -
M
vendor/gems/rtomayko-rdiscount-1.3.4/ext/toc.o -
M
vendor/gems/rtomayko-rdiscount-1.3.4/lib/markdown.rb -
M
vendor/gems/rtomayko-rdiscount-1.3.4/lib/rdiscount.bundle -
M
vendor/gems/rtomayko-rdiscount-1.3.4/lib/rdiscount.rb -
M
vendor/gems/rtomayko-rdiscount-1.3.4/rdiscount.gemspec -
M
vendor/gems/rtomayko-rdiscount-1.3.4/test/benchmark.rb -
M
vendor/gems/rtomayko-rdiscount-1.3.4/test/benchmark.txt -
M
vendor/gems/rtomayko-rdiscount-1.3.4/test/markdown_test.rb -
M
vendor/gems/rtomayko-rdiscount-1.3.4/test/rdiscount_test.rb