Changeset [e28c12b93c080eee0c13ddce07589f72f14b1587] by Kalin Harvey
Revision e28c12b93c080eee0c13ddce07589f72f14b1587,
committed by Kalin Harvey
· January 4th, 2010 @ 04:02 PM
Merge branch 'master' into authlogic
- master: (78 commits) added minor pause with a period added additional pause added pause after welcome message tighten up audio tour patter added vancouver convention centre to audio tours updated the urls for twilio fixed case statement that didn't like working with erb fixed typo on audio tour index modified to make sure that convention centre tour demo continues to work modified audio tour files for CoV tours deleted audio files in preparation for serving them from S3 fixed failing specs from s3, added audiofile model, bumped softprops version_fu over jmcbikles to fix revert_to! syntax error fixing exception on tags sounds like... syntax error don't display an empty address s3 migration with environment variables for heroku temporarily disabling pagination moved texticle tasks to the canonical place, cleaned up Zion lock on dashboard modified search actions to use texticle on production ...
Conflicts:
app/controllers/audiofiles_controller.rb
app/views/audiofiles/index.xml.erb
app/views/audiofiles/listen.xml.erb
config/environment.rb
db/schema.rb
http://github.com/graemeworthy/greenbuildingbrain/commit/e28c12b93c...
12 changed files
-
R
vendor/plugins/version_fu/RUNNING_UNIT_TESTS -
R
vendor/plugins/version_fu/test/database.yml -
R
vendor/plugins/version_fu/test/fixtures/author.rb -
R
vendor/plugins/version_fu/test/fixtures/page.rb -
R
vendor/plugins/version_fu/test/schema.rb -
M
app/controllers/application_controller.rb -
M
app/controllers/audiofiles_controller.rb -
M
app/views/audiofiles/index.xml.erb -
M
app/views/audiofiles/listen.xml.erb -
M
config/environment.rb -
M
db/migrate/20100103071100_add_users_password_reset_fields.rb -
M
db/schema.rb