Jamie Winsor
1b51e2343d
setting indentation to 'rails way' for protected and private classes
2011-09-19 18:58:31 -07:00
Jamie Winsor
362088d027
Fix indent on protected methods
2011-09-19 18:50:38 -07:00
Jamie Winsor
be7d341532
Namespace BlogController into Blog::BaseController
2011-09-19 18:48:29 -07:00
Jamie Winsor
de4cc6b9ef
Namespace BlogControllerHelper to Blog::ControllerHelper
2011-09-19 18:43:09 -07:00
Jamie Winsor
c40eb83af3
remove duplicate BlogControllerHelper include
2011-09-19 18:35:58 -07:00
Jamie Winsor
d37ef11f63
Abstract filter methods into controller helpers
...
This will enable users to include the controller helper into their
own controllers to perform common functions - such as finding a blog
post or listing all blog posts.
2011-09-19 15:35:47 -07:00
Jamie Winsor
7fe5fe5de6
Merge pull request #136 from enmasse-entertainment/remove-unnecessary-js-includes
...
Remove jquery include - now handled by asset pipeline
2011-09-16 18:25:44 -07:00
Jamie Winsor
66b445ad5c
Remove jquery include - now handled by asset pipeline
2011-09-16 18:24:34 -07:00
Jamie Winsor
76be452faf
Merge pull request #135 from enmasse-entertainment/fix-devise-user
...
Change current_user to current_refinery_user
2011-09-14 16:28:42 -07:00
Jamie Winsor
65cb81b4c0
Change current_user to current_refinery_user
...
Fixes for 8294a86c13
2011-09-14 16:25:50 -07:00
Philip Arndt
cc3be37a41
Merge pull request #131 from wakeless/rails-3-1
...
Fix for ::Refinery::AdminController
2011-09-05 01:37:17 -07:00
Michael Gall
6be013e0c0
Second commit for ::Refinery::AdminController
2011-09-05 15:54:57 +10:00
Philip Arndt
d8f36a4196
Merge pull request #128 from enmasse-entertainment/rails-3-1
...
Revert sweeper's expiration parameter to strings for now
2011-09-04 15:56:27 -07:00
Jamie Winsor
88556fe709
Revert sweeper's expiration parameter to strings for now
2011-09-04 15:54:51 -07:00
Philip Arndt
f584651b58
Merge pull request #127 from enmasse-entertainment/more-comment-fixes
...
More comment fixes
2011-09-04 15:28:07 -07:00
Jamie Winsor
b9c44d851e
use let instead of let! when we can lazily load these fixtures
2011-09-04 15:10:00 -07:00
Jamie Winsor
4d4ae4e682
accidentally had refinerycms pointing to my local filesystem...
2011-09-04 14:57:38 -07:00
Jamie Winsor
e35e3994d5
convert expire_page parameters in blog sweeper from strings to url helpers
2011-09-04 14:48:35 -07:00
Jamie Winsor
ba38b63370
remove useless comment
2011-09-04 14:47:24 -07:00
Jamie Winsor
3431b15ef3
fix localization string for submit button on comment
2011-09-04 14:46:45 -07:00
Jamie Winsor
ec6ed3f951
accidentally had left perform_caching set to true
2011-09-04 14:40:12 -07:00
Jamie Winsor
7903bdfed2
refactor factories and add #show tests for posts controller
...
Do not want to cache classes, but do want to reload models after factory girl:
http://groups.google.com/group/factory_girl/browse_thread/thread/daa24556d90c31fc
http://stackoverflow.com/questions/5145165/associationtypemismatch-and-factorygirl
rails_autolink was removed from Rails 3.1 and abstracted to an external gem
fix display author name and post time on comment show
fix namespace for thanking and moderated flash notices
2011-09-04 14:35:03 -07:00
Philip Arndt
40be4f71ee
Merge pull request #126 from enmasse-entertainment/fix-comments
...
Fix comments
2011-09-03 22:09:51 -07:00
Jamie Winsor
6212e60f9e
index action of blog post controller now caches and sweeps on changes
...
fix various views which were broken and untested with rails-3-1 upgrade
add request spec tests for admin blog comments
Factory is now FactoryGirl
Fix multiple issues around listing unmoderated comments
use cleaner definitions to set per_page willpaginate attribute on models
update all paginate calls to use new arel representation
reorganize filter sections to be located at top of controller
modify uncategorized class method to activerecord scope and perform a left outer join instead of iterate through an array to find uncategorized posts
move request specs into their proper places
update guardfile to ensure that request specs get run when their respective controllers are modified
Fix show action for AdminBlogComments and added test
Fix redirection link after approving or rejecting a comment
2011-09-03 21:55:30 -07:00
Philip Arndt
80ca7c1bf9
Config is deprecated, using RbConfig instread.
2011-09-03 16:40:25 +12:00
Philip Arndt
4439f6afda
Using edge awesome_nested_set until 2.0.2 gem is released to fix deprecation warnings.
2011-09-03 11:44:35 +12:00
Philip Arndt
0497261f39
Converted Factory to FactoryGirl to fix deprecation warnings.
2011-09-03 11:44:21 +12:00
Philip Arndt
67cc6b4512
Merge pull request #125 from enmasse-entertainment/green-tests
...
Green tests
2011-09-02 16:05:50 -07:00
Jamie Winsor
2053a022a2
remove accidental inclusion of future feature
2011-09-02 14:21:19 -07:00
Jamie Winsor
fc68f22858
update and import refinerycms migrations and seeds
...
update Guardfile, spec_helper, and support files to match those generated by refinerycms-testing
2011-09-02 13:35:25 -07:00
Philip Arndt
1779274971
Added sqlite3, pg, mysql2 to the Gemfile and added Jamie to the notifications list for TRavis.
2011-09-02 13:06:38 +12:00
Philip Arndt
05bc8bc962
Merge pull request #124 from enmasse-entertainment/travis-ci
...
Travis ci
2011-09-01 17:40:22 -07:00
Jamie Winsor
34e5da1347
Disable libnotifications for travis
2011-09-01 16:18:07 -07:00
Uģis Ozols
5e5c6a78af
Merge pull request #122 from enmasse-entertainment/revise-gemfile
...
Revise gemfile for Rails 3.1
2011-08-31 12:02:36 -07:00
Jamie Winsor
2bd8df5d4f
Devise edge no longer required for Rails 3-1 branch
2011-08-31 11:59:46 -07:00
Philip Arndt
372235b963
Merge pull request #121 from wakeless/attr_accessible
...
Attr accessible
2011-08-30 19:22:26 -07:00
Michael Gall
0791d3a2e5
Add attr_accessible to blog posts to interact better with page_images
2011-08-31 12:16:40 +10:00
Philip Arndt
2f695519da
Merge pull request #120 from enmasse-entertainment/revise-gemfile
...
Revise gemfile to support latest master branch of refinerycms
2011-08-29 18:17:11 -07:00
Jamie Winsor
9df6580d9c
gemspec revision to support latest master branch of refinerycms
2011-08-29 15:09:53 -07:00
Uģis Ozols
36affef45e
will_paginate is back.
2011-08-25 13:57:59 +03:00
Philip Arndt
6b73469c1a
Merge pull request #117 from enmasse-entertainment/rails-3-1-rc6-support
...
Rails 3 1 rc6 support
2011-08-18 15:03:23 -07:00
Jamie Winsor
d0681c273c
Update gemspec to require newest version of seo_meta
2011-08-18 14:51:51 -07:00
Philip Arndt
d8f82439eb
Merge pull request #116 from enmasse-entertainment/use-fuubar-formatting
...
Use fuubar formatting
2011-08-15 00:50:56 -07:00
Philip Arndt
5e6f9bc270
Merge pull request #115 from enmasse-entertainment/fix-testing-not-loaded
...
Fix testing not loaded
2011-08-15 00:49:37 -07:00
Jamie Winsor
9363e8d8c5
Update Gemfile to what would be generated by Refinerycms
2011-08-15 00:37:43 -07:00
Jamie Winsor
8434790df7
Use fuubar formatting for rspec
2011-08-15 00:15:36 -07:00
Jamie Winsor
028489bf15
This will fix the build when runing rspec spec/. If you do not specify refinerycms-testing in the development group of the Gemfile it will not be properly loaded.
2011-08-15 00:13:54 -07:00
Philip Arndt
eaaa351f3a
Merge pull request #113 from enmasse-entertainment/ruby-187-support
...
Ruby 187 support
2011-08-14 23:31:15 -07:00
Jamie Winsor
aed0b8f173
Move gemspec method to top of file
...
http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
2011-08-14 23:14:46 -07:00
Jamie Winsor
13cafc0947
Syntax fixes for Ruby 1.8.7
2011-08-14 19:32:25 -07:00
