Changeset [3b0ba54a49efaac7678704b5be002071fb8ee22e] by Brian M
April 3rd, 2011 @ 04:51 PM
Merge branch '3-dev'
Conflicts:
db/schema.rb
https://github.com/wtg/shuttle_tracking/commit/3b0ba54a49efaac76787...
Committed by Brian M
- A app/controllers/pages_controller.rb
- A app/helpers/pages_helper.rb
- A app/models/page.rb
- A app/views/pages/_form.html.erb
- A app/views/pages/edit.html.erb
- A app/views/pages/index.html.erb
- A app/views/pages/new.html.erb
- A app/views/pages/show.html.erb
- A db/migrate/20110223042641_create_pages.rb
- A db/migrate/20110223072211_add_permalink_to_page.rb
- A db/migrate/20110308060631_add_frontpage_flag_to_pages.rb
- A public/images/close.png
- A public/images/white.png
- A public/javascripts/overlay.js
- A test/fixtures/pages.yml
- A test/functional/pages_controller_test.rb
- A test/unit/helpers/pages_helper_test.rb
- A test/unit/page_test.rb
- M app/controllers/displays_controller.rb
- M app/views/displays/index.html.erb
- M config/assets.yml
- M config/routes.rb
- M db/schema.rb
- M public/stylesheets/new.css
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
https://github.com/wtg/shuttle_tracking