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
|
52ceb30cf8
|
First commit.
|
2011-10-10 15:39:52 +01:00 |
|
Dan Barber
|
8621da4d3b
|
Removed localised paperclip plugin and added the gem. Added :preview
image size to photo attachment for admin interface.
|
2010-12-20 12:11:07 -05: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
|
e66e75c808
|
Transitioned to Rails 3 and Ruby 1.9.2. All working!
|
2010-10-11 07:40:17 -04:00 |
|
Dan Barber
|
023a119160
|
Photos are now paginated. Admin is handled by Typus, including file uploads. Exif reading isn't working when uploading via Typus though.
|
2010-10-09 08:28:42 -04:00 |
|