|
|
e2c4ebf0e9
|
Use Kaminari instead of WillPaginate
This is to avoid any conflict with Kaminari in Administrate. We also add
some specs for pagination in the front end.
|
2015-10-26 14:26:32 +00:00 |
|
|
|
5d15bfaf5f
|
Administrate dashboards live!
|
2015-10-26 14:26:32 +00:00 |
|
|
|
d9f47c3553
|
Remove custom admin and authentication
This is in preparation for adding in thoughtbot/administrate and custom
authentication/authorisation.
|
2015-10-26 14:26:32 +00:00 |
|
|
|
41de7e736c
|
Refactor contact and contact controller
|
2015-10-26 12:48:22 +00:00 |
|
|
|
80b46f1e65
|
More Rubocop
|
2015-10-14 12:30:00 +01:00 |
|
|
|
609b14c360
|
Fix up method names
|
2015-10-14 12:30:00 +01:00 |
|
Dan Barber
|
6dac063751
|
WIP: Rubocop compliance
|
2015-10-14 12:30:00 +01:00 |
|
|
|
0866d71eff
|
Redirect back rather than to the index
This fixes the issue where it returns to page 1 if you destroy a photo
on a subsequent page.
|
2015-08-20 15:42:06 +01:00 |
|
|
|
09026aa2e3
|
Fix photos admin page to 16 per page.
|
2015-04-20 10:09:13 +01:00 |
|
Dan Barber
|
ebecb060d8
|
Add pages show page.
|
2014-12-13 18:25:15 +00:00 |
|
Dan Barber
|
dd79d781fe
|
View focused code refactor.
|
2014-12-10 11:32:38 +00:00 |
|
Dan Barber
|
03043af843
|
Fix issue with saving category ids.
|
2014-07-10 15:20:29 +01:00 |
|
Dan Barber
|
34baa4bb48
|
Add warning if not on an SSL connection.
|
2014-03-07 10:53:09 +00:00 |
|
Dan Barber
|
b272153bb8
|
Refactor all the things!
|
2014-03-06 17:58:38 +00:00 |
|
Dan Barber
|
0888020044
|
WIP: Refactor all the controller.
|
2014-03-06 11:07:47 +00:00 |
|
Dan Barber
|
489edd2d2c
|
Fix home page error with no photos.
|
2014-03-06 10:44:24 +00:00 |
|
Dan Barber
|
be93b79024
|
Add redcarpet for Markdown. Specs pass!
|
2014-03-05 17:56:23 +00:00 |
|
Dan Barber
|
4759cb4f43
|
Remove permitted params on contact controller.
|
2014-03-05 17:45:46 +00:00 |
|
Dan Barber
|
f1ab0be78f
|
WIP: Upgrade to Rails 4. Permitted params and env.
|
2014-03-05 17:38:57 +00:00 |
|
Dan Barber
|
1c44d54b51
|
Move flash messages to locale.
|
2013-06-02 22:18:52 +01:00 |
|
Dan Barber
|
c47c7e4d3c
|
Refactor log_views and fix spec.
|
2013-05-31 10:07:52 +01:00 |
|
Dan Barber
|
91351c7775
|
Add photo factory andn photo controller spec.
|
2013-05-31 08:37:31 +01:00 |
|
Dan Barber
|
f4a02ad379
|
Add 404 page.
|
2013-05-30 09:06:08 +01:00 |
|
Dan Barber
|
88be4180a4
|
Remove trailing spaces.
|
2013-05-21 21:24:09 +01:00 |
|
Dan Barber
|
3dd213e140
|
Refactor controllers to make more sense.
|
2013-05-21 21:09:22 +01:00 |
|
Dan Barber
|
c82b7bd58b
|
Force SSL for admin and redirect to configured host.
|
2013-04-08 17:17:41 +01: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
|
5597dae348
|
Moved menu structure into admin controller.
|
2011-10-13 10:30:08 +01: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 |
|
Dan Barber
|
d6b2143348
|
Updated jQuery. Added page title to layout and specified it in
controller actions.
|
2010-12-21 06:04:47 -05:00 |
|
Dan Barber
|
67e7f0eb12
|
Now reliably logging photo views with an onComplete function on the
fancybox plugin.
|
2010-12-18 11:17:05 -05:00 |
|
Dan Barber
|
54ea0d9c33
|
Changed back to linking directly to images as performance was crap going
through a rails controller!
|
2010-12-18 09:31:48 -05:00 |
|
Dan Barber
|
3379f36b61
|
Moved view logging to after the image is sent to improve performance.
|
2010-12-18 08:59:58 -05:00 |
|
Dan Barber
|
16f9895048
|
Fixed problem where views could be null. Moved view increment to model.
|
2010-12-18 08:55:17 -05:00 |
|
Dan Barber
|
3c8ddc1923
|
Added view count to photos. Used acts_as_markdown for pages.
|
2010-12-18 08:31:12 -05:00 |
|
Dan Barber
|
57418726ca
|
Added taken_at to photos and sorted on it.
|
2010-12-15 13:02:04 -05:00 |
|
Dan Barber
|
85cf2fb4b8
|
Updated photos model to use named scopes. Cleaned up some code. Added
meta_where as a gem, although I'm not using it yet.
|
2010-12-14 12:51:34 -05:00 |
|
Dan Barber
|
60f00e33be
|
Altered page title and adjusted categories so they sort on "sort"
column.
|
2010-12-14 10:38:57 -05:00 |
|
Dan Barber
|
6b26a58497
|
Added "enabled" for photos so I can disable them without deleting.
|
2010-12-02 12:33:44 -05:00 |
|
Dan Barber
|
e9df965498
|
Added 'featured' boolean to photo model. Home and portfolio pages will only pull in random photos that are marked 'featured'.
|
2010-10-14 05:00:19 -04: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
|
a626d355b6
|
Deleted all photo files, some plugins.
|
2010-10-11 04:09:56 -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
|
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 |
|
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
|
0c61aaf604
|
Another nameless commit.
|
2010-10-08 05:51:47 -04:00 |
|
