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
|
52ceb30cf8
|
First commit.
|
2011-10-10 15:39:52 +01:00 |
|
Dan Barber
|
2e83970fa9
|
All done! Contact form works, about page now pulls content from database, opening up the possibility of having more pages.
|
2010-10-12 10:04:13 -04:00 |
|
Dan Barber
|
f49870b61b
|
Mostly finished, still got the contact for to do. Switched to mini_exiftool for exif reading and fixed problem with setting title and description on upload! Finished portfolio page.
|
2010-10-10 11:45:23 -04:00 |
|
Dan Barber
|
b35354a764
|
Everything is working well, categories and photos are a 1 to many right now though and they need to be many to many.
|
2010-10-08 13:15:18 -04:00 |
|
Dan Barber
|
48cc5d8de8
|
Initial commit.
|
2010-10-07 11:02:13 -04:00 |
|