Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove jquery include - now handled by asset pipeline | Jamie Winsor | 2011-09-16 | 1 | -1/+0 |
| | |||||
* | Merge pull request #135 from enmasse-entertainment/fix-devise-user | Jamie Winsor | 2011-09-14 | 1 | -1/+1 |
|\ | | | | | Change current_user to current_refinery_user | ||||
| * | Change current_user to current_refinery_user | Jamie Winsor | 2011-09-14 | 1 | -1/+1 |
|/ | | | | Fixes for https://github.com/resolve/refinerycms/commit/8294a86c13943fcd9bb966341ecfa250ae4aeaf0 | ||||
* | Merge pull request #131 from wakeless/rails-3-1 | Philip Arndt | 2011-09-05 | 4 | -4/+4 |
|\ | | | | | Fix for ::Refinery::AdminController | ||||
| * | Second commit for ::Refinery::AdminController | Michael Gall | 2011-09-05 | 4 | -4/+4 |
|/ | |||||
* | Merge pull request #128 from enmasse-entertainment/rails-3-1 | Philip Arndt | 2011-09-04 | 1 | -2/+3 |
|\ | | | | | Revert sweeper's expiration parameter to strings for now | ||||
| * | Revert sweeper's expiration parameter to strings for now | Jamie Winsor | 2011-09-04 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #127 from enmasse-entertainment/more-comment-fixes | Philip Arndt | 2011-09-04 | 17 | -46/+125 |
|\ | | | | | More comment fixes | ||||
| * | use let instead of let! when we can lazily load these fixtures | Jamie Winsor | 2011-09-04 | 1 | -4/+4 |
| | | |||||
| * | accidentally had refinerycms pointing to my local filesystem... | Jamie Winsor | 2011-09-04 | 1 | -1/+1 |
| | | |||||
| * | convert expire_page parameters in blog sweeper from strings to url helpers | Jamie Winsor | 2011-09-04 | 1 | -2/+2 |
| | | |||||
| * | remove useless comment | Jamie Winsor | 2011-09-04 | 1 | -1/+0 |
| | | |||||
| * | fix localization string for submit button on comment | Jamie Winsor | 2011-09-04 | 1 | -1/+1 |
| | | |||||
| * | accidentally had left perform_caching set to true | Jamie Winsor | 2011-09-04 | 1 | -1/+1 |
| | | |||||
| * | refactor factories and add #show tests for posts controller | Jamie Winsor | 2011-09-04 | 14 | -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-comments | Philip Arndt | 2011-09-03 | 20 | -266/+420 |
|\ | | | | | Fix comments | ||||
| * | index action of blog post controller now caches and sweeps on changes | Jamie Winsor | 2011-09-03 | 20 | -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 Arndt | 2011-09-03 | 1 | -4/+4 |
| | |||||
* | Using edge awesome_nested_set until 2.0.2 gem is released to fix deprecation ↵ | Philip Arndt | 2011-09-03 | 1 | -0/+1 |
| | | | | warnings. | ||||
* | Converted Factory to FactoryGirl to fix deprecation warnings. | Philip Arndt | 2011-09-03 | 7 | -40/+39 |
| | |||||
* | Merge pull request #125 from enmasse-entertainment/green-tests | Philip Arndt | 2011-09-02 | 11 | -38/+50 |
|\ | | | | | Green tests | ||||
| * | remove accidental inclusion of future feature | Jamie Winsor | 2011-09-02 | 1 | -2/+0 |
| | | |||||
| * | update and import refinerycms migrations and seeds | Jamie Winsor | 2011-09-02 | 11 | -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 Arndt | 2011-09-02 | 3 | -4/+9 |
| | | | | notifications list for TRavis. | ||||
* | Merge pull request #124 from enmasse-entertainment/travis-ci | Philip Arndt | 2011-09-01 | 1 | -16/+20 |
|\ | | | | | Travis ci | ||||
| * | Disable libnotifications for travis | Jamie Winsor | 2011-09-01 | 1 | -16/+20 |
|/ | |||||
* | Merge pull request #122 from enmasse-entertainment/revise-gemfile | Uģis Ozols | 2011-08-31 | 1 | -3/+0 |
|\ | | | | | Revise gemfile for Rails 3.1 | ||||
| * | Devise edge no longer required for Rails 3-1 branch | Jamie Winsor | 2011-08-31 | 1 | -3/+0 |
|/ | |||||
* | Merge pull request #121 from wakeless/attr_accessible | Philip Arndt | 2011-08-30 | 1 | -0/+2 |
|\ | | | | | Attr accessible | ||||
| * | Add attr_accessible to blog posts to interact better with page_images | Michael Gall | 2011-08-31 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #120 from enmasse-entertainment/revise-gemfile | Philip Arndt | 2011-08-29 | 2 | -10/+10 |
|\ | | | | | Revise gemfile to support latest master branch of refinerycms | ||||
| * | gemspec revision to support latest master branch of refinerycms | Jamie Winsor | 2011-08-29 | 2 | -10/+10 |
|/ | |||||
* | will_paginate is back. | Uģis Ozols | 2011-08-25 | 10 | -16/+19 |
| | |||||
* | Merge pull request #117 from enmasse-entertainment/rails-3-1-rc6-support | Philip Arndt | 2011-08-18 | 3 | -6/+5 |
|\ | | | | | Rails 3 1 rc6 support | ||||
| * | Update gemspec to require newest version of seo_meta | Jamie Winsor | 2011-08-18 | 3 | -6/+5 |
|/ | |||||
* | Merge pull request #116 from enmasse-entertainment/use-fuubar-formatting | Philip Arndt | 2011-08-15 | 1 | -0/+1 |
|\ | | | | | Use fuubar formatting | ||||
| * | Use fuubar formatting for rspec | Jamie Winsor | 2011-08-15 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #115 from enmasse-entertainment/fix-testing-not-loaded | Philip Arndt | 2011-08-15 | 1 | -2/+33 |
|\ \ | |/ |/| | Fix testing not loaded | ||||
| * | Update Gemfile to what would be generated by Refinerycms | Jamie Winsor | 2011-08-15 | 1 | -4/+33 |
| | | |||||
| * | This will fix the build when runing rspec spec/. If you do not specify ↵ | Jamie Winsor | 2011-08-15 | 1 | -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-support | Philip Arndt | 2011-08-14 | 7 | -23/+15 |
|\ | | | | | Ruby 187 support | ||||
| * | Move gemspec method to top of file | Jamie Winsor | 2011-08-14 | 1 | -2/+2 |
| | | | | | | | | http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/ | ||||
| * | Syntax fixes for Ruby 1.8.7 | Jamie Winsor | 2011-08-14 | 7 | -25/+17 |
|/ | |||||
* | HI 2 U TRAVIS; This is how to run specs in this engine | Philip Arndt | 2011-08-15 | 1 | -0/+18 |
| | |||||
* | Merge remote-tracking branch 'enmasse-entertainment/fix-gemspec-filelist' ↵ | Philip Arndt | 2011-08-15 | 2 | -3/+2 |
|\ | | | | | | | into rails-3-1 | ||||
| * | remove empty directory from gemspec file list | Jamie Winsor | 2011-08-14 | 1 | -2/+1 |
| | | |||||
| * | Ignore .lock files in Gemspec | Jamie Winsor | 2011-08-12 | 2 | -2/+2 |
| | | |||||
* | | Update readme. | Uģis Ozols | 2011-08-14 | 1 | -4/+4 |
| | | |||||
* | | Move factories under spec dir so that they get picked up by spec_helper. | Uģis Ozols | 2011-08-13 | 4 | -4/+5 |
|/ | |||||
* | There's no test directory. | Uģis Ozols | 2011-08-12 | 2 | -4/+1 |
| |