1
0
mirror of https://github.com/danbee/danbarberphoto synced 2025-03-04 08:49:07 +00:00
Commit Graph

7 Commits

Author SHA1 Message Date
Dan Barber
b617b690cc Convert javascript to coffeescript. 2013-02-02 17:12:59 +00:00
Dan Barber
2c45495f9f Update Rails, fix S3 and update Fancybox. 2013-01-31 22:21:13 +00:00
Dan Barber
3162853285 Finished up admin interface. Tweaks to site stylesheets. 2011-10-31 17:34:48 +00:00
Dan Barber
08170ec5e0 Merge ../template into 3.1_upgrade
Conflicts:
	.gitignore
	.rvmrc
	Gemfile
	Gemfile.lock
	README
	Rakefile
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/controllers/admin/admin_users_controller.rb
	app/controllers/application_controller.rb
	app/models/admin_user.rb
	config.ru
	config/application.rb
	config/config.yml
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	db/schema.rb
	db/seeds.rb
2011-10-30 12:15:13 +00:00
Dan Barber
90b95d81ea Moved project over to rails 3.1.1. Removed Typus and now need to add new
custom admin interface.
2011-10-30 11:40:57 +00:00
Dan Barber
5ea9ff0f75 Fixed up Change Password screens. Restyles flash messages and added the
ability to close them.
2011-10-10 18:10:24 +01:00
Dan Barber
52ceb30cf8 First commit. 2011-10-10 15:39:52 +01:00