aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update gemspecJamie Winsor2011-09-191-2/+4
| | | | [ci skip]
* Merge pull request #139 from resolve/abstract-filters-into-controller-helperPhilip Arndt2011-09-195-41/+49
|\ | | | | Abstract filters into controller helper
| * setting indentation to 'rails way' for protected and private classesJamie Winsor2011-09-192-21/+21
| |
| * Fix indent on protected methodsJamie Winsor2011-09-191-18/+18
| |
| * Namespace BlogController into Blog::BaseControllerJamie Winsor2011-09-194-17/+19
| |
| * Namespace BlogControllerHelper to Blog::ControllerHelperJamie Winsor2011-09-193-29/+31
| |
| * remove duplicate BlogControllerHelper includeJamie Winsor2011-09-191-2/+0
| |
| * Abstract filter methods into controller helpersJamie Winsor2011-09-193-26/+32
|/ | | | | | 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.
* Merge pull request #136 from ↵Jamie Winsor2011-09-161-1/+0
|\ | | | | | | | | enmasse-entertainment/remove-unnecessary-js-includes Remove jquery include - now handled by asset pipeline
| * Remove jquery include - now handled by asset pipelineJamie Winsor2011-09-161-1/+0
|/
* Merge pull request #135 from enmasse-entertainment/fix-devise-userJamie Winsor2011-09-141-1/+1
|\ | | | | Change current_user to current_refinery_user
| * Change current_user to current_refinery_userJamie Winsor2011-09-141-1/+1
|/ | | | Fixes for https://github.com/resolve/refinerycms/commit/8294a86c13943fcd9bb966341ecfa250ae4aeaf0
* Merge pull request #131 from wakeless/rails-3-1Philip Arndt2011-09-054-4/+4
|\ | | | | Fix for ::Refinery::AdminController
| * Second commit for ::Refinery::AdminControllerMichael Gall2011-09-054-4/+4
|/
* Merge pull request #128 from enmasse-entertainment/rails-3-1Philip Arndt2011-09-041-2/+3
|\ | | | | Revert sweeper's expiration parameter to strings for now
| * Revert sweeper's expiration parameter to strings for nowJamie Winsor2011-09-041-2/+3
|/
* Merge pull request #127 from enmasse-entertainment/more-comment-fixesPhilip Arndt2011-09-0417-46/+125
|\ | | | | More comment fixes
| * use let instead of let! when we can lazily load these fixturesJamie Winsor2011-09-041-4/+4
| |
| * accidentally had refinerycms pointing to my local filesystem...Jamie Winsor2011-09-041-1/+1
| |
| * convert expire_page parameters in blog sweeper from strings to url helpersJamie Winsor2011-09-041-2/+2
| |
| * remove useless commentJamie Winsor2011-09-041-1/+0
| |
| * fix localization string for submit button on commentJamie Winsor2011-09-041-1/+1
| |
| * accidentally had left perform_caching set to trueJamie Winsor2011-09-041-1/+1
| |
| * refactor factories and add #show tests for posts controllerJamie Winsor2011-09-0414-42/+122
|/ | | | | | | | | | | 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
* Merge pull request #126 from enmasse-entertainment/fix-commentsPhilip Arndt2011-09-0320-266/+420
|\ | | | | Fix comments
| * index action of blog post controller now caches and sweeps on changesJamie Winsor2011-09-0320-266/+420
|/ | | | | | | | | | | | | | | 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
* Config is deprecated, using RbConfig instread.Philip Arndt2011-09-031-4/+4
|
* Using edge awesome_nested_set until 2.0.2 gem is released to fix deprecation ↵Philip Arndt2011-09-031-0/+1
| | | | warnings.
* Converted Factory to FactoryGirl to fix deprecation warnings.Philip Arndt2011-09-037-40/+39
|
* Merge pull request #125 from enmasse-entertainment/green-testsPhilip Arndt2011-09-0211-38/+50
|\ | | | | Green tests
| * remove accidental inclusion of future featureJamie Winsor2011-09-021-2/+0
| |
| * update and import refinerycms migrations and seedsJamie Winsor2011-09-0211-38/+52
|/ | | | update Guardfile, spec_helper, and support files to match those generated by refinerycms-testing
* Added sqlite3, pg, mysql2 to the Gemfile and added Jamie to the ↵Philip Arndt2011-09-023-4/+9
| | | | notifications list for TRavis.
* Merge pull request #124 from enmasse-entertainment/travis-ciPhilip Arndt2011-09-011-16/+20
|\ | | | | Travis ci
| * Disable libnotifications for travisJamie Winsor2011-09-011-16/+20
|/
* Merge pull request #122 from enmasse-entertainment/revise-gemfileUģis Ozols2011-08-311-3/+0
|\ | | | | Revise gemfile for Rails 3.1
| * Devise edge no longer required for Rails 3-1 branchJamie Winsor2011-08-311-3/+0
|/
* Merge pull request #121 from wakeless/attr_accessiblePhilip Arndt2011-08-301-0/+2
|\ | | | | Attr accessible
| * Add attr_accessible to blog posts to interact better with page_imagesMichael Gall2011-08-311-0/+2
|/
* Merge pull request #120 from enmasse-entertainment/revise-gemfilePhilip Arndt2011-08-292-10/+10
|\ | | | | Revise gemfile to support latest master branch of refinerycms
| * gemspec revision to support latest master branch of refinerycmsJamie Winsor2011-08-292-10/+10
|/
* will_paginate is back.Uģis Ozols2011-08-2510-16/+19
|
* Merge pull request #117 from enmasse-entertainment/rails-3-1-rc6-supportPhilip Arndt2011-08-183-6/+5
|\ | | | | Rails 3 1 rc6 support
| * Update gemspec to require newest version of seo_metaJamie Winsor2011-08-183-6/+5
|/
* Merge pull request #116 from enmasse-entertainment/use-fuubar-formattingPhilip Arndt2011-08-151-0/+1
|\ | | | | Use fuubar formatting
| * Use fuubar formatting for rspecJamie Winsor2011-08-151-0/+1
| |
* | Merge pull request #115 from enmasse-entertainment/fix-testing-not-loadedPhilip Arndt2011-08-151-2/+33
|\ \ | |/ |/| Fix testing not loaded
| * Update Gemfile to what would be generated by RefinerycmsJamie Winsor2011-08-151-4/+33
| |
| * This will fix the build when runing rspec spec/. If you do not specify ↵Jamie Winsor2011-08-151-1/+3
|/ | | | refinerycms-testing in the development group of the Gemfile it will not be properly loaded.
* Merge pull request #113 from enmasse-entertainment/ruby-187-supportPhilip Arndt2011-08-147-23/+15
|\ | | | | Ruby 187 support
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 09:11:52 +0000