Skip to content


Subversion checkout URL

You can clone with
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: resolve/refinerycms
head fork: resolve/refinerycms
This comparison is big! We’re only showing the most recent 250 commits
Commits on Mar 01, 2012
@parndt parndt Revert "Add refinerycms-settings gem to templates."
Rationale: The extension does not do anything that merits adding it. If another extension uses it, it should depend on it.

This reverts commit 8b75183.
@parndt parndt Merge branch 'issue_1382' into 2-0-stable bf4c68e
@parndt parndt We can rely on the released version of refinerycms-i18n now. 5f9d93f
Commits on Mar 04, 2012
@parndt parndt When link dialogues were being initialised they were triggering a cli…
…ck on the cancel button which was closing the dialogue. Moved to the appropriate location which fixes #1392.
@parndt parndt Fixes #1383 by not using url hashes for routes but using routing help…
…ers once the :after_routes_reloader_hook has fired.
@parndt parndt Even if you're not planning to use ruby a lot, RVM is still a good idea. 77662bf
@parndt parndt 1.9.2 and 1.9.3 are acceptable cddb58b
Rob Yurkowski Adds new screenshot location for Getting Started. 5a79f50
@parndt parndt Merge pull request #1394 from robyurkowski/2-0-stable
Update Screenshot.
@robyurkowski robyurkowski Fix textile error with nested plus operator. dcd4681
@parndt parndt Merge pull request #1395 from robyurkowski/2-0-stable
Fix textile error.
Commits on Mar 05, 2012
@robyurkowski robyurkowski Update for 2.0. ea21867
@robyurkowski robyurkowski Missed a segment. d7d0d52
@robyurkowski robyurkowski Update for 2.0. 9f718f4
@robyurkowski robyurkowski Fixes the errors @ugisozol caught and I missed. 1fe8bd1
@parndt parndt Remove html_safe from already escaped flash message. b622988
@parndt parndt More fun with extension routing. Problems still persist but less of t…
@ugisozols ugisozols Merge pull request #1401 from robyurkowski/2-0-stable
Update guide for 2-0-stable.
@quicksnap quicksnap Broken link: How To Test Your Engine. 1d6a266
@parndt parndt Merge branch '2-0-stable' into issue_1383 28ff4bc
@parndt parndt Merge pull request #1403 from quicksnap/patch-1
Broken link in Getting Started guide.
@nodabs nodabs Rails includes the application.js file by default in new applications…
…. This enables the asset pipeline to work correctly. I think this feature should be included by the refinery front end as well.
@parndt parndt Merge branch '2-0-stable' into issue_1383 35cd164
@parndt parndt Name all routes and reload the application's routes after appending m…
…arketable URLs which fixes #1383.
@parndt parndt Fixes password specs after previously breaking them. 7eef36a
@parndt parndt Merge pull request #1405 from resolve/issue_1383
Fixed problems with Rails 3.2.2 re: Issue #1383
@parndt parndt Updated changelog for 2.0.1 release. a6c04b0
Commits on Mar 06, 2012
@parndt parndt Moved --format Fuubar and --drb out of the .rspec for everyone, I hav…
…e it in my ~/.rspec now.
Rob Yurkowski Escapes email but keeps string escaped for multi-line output. 8f494dc
@ugisozols ugisozols Use ERB::Util.html_escape because h() is not directly available in co…
@ugisozols ugisozols No need to instantiate new user object when email param is blank or e…
…mail is not associated with any user account.
Commits on Mar 07, 2012
@parndt parndt Formatted the code more nicely and consistently with the rest of the …
@parndt parndt Just because we can squish lines doesn't mean we should. fc45607
@parndt parndt I guess that the {} serves a useful purpose. 0c99022
@parndt parndt Format TitleSectionPresenter consistently. 4dd71f2
@parndt parndt Consistent formatting on SectionPresenter aaf4103
@parndt parndt Consistent formatting on PagePartSectionPresenter 38471ca
@parndt parndt Merge branch '2-0-stable' into code_formatting 4933a68
Commits on Mar 08, 2012
@parndt parndt Fixed calls to super without passing arguments that I broke earlier. …
…(ht: phiggins)
@parndt parndt Allow hide_sections to accept one or many ids to hide using splat. 0edb641
Commits on Mar 09, 2012
@ugisozols ugisozols Merge pull request #1419 from resolve/code_formatting
Code formatting changes
@christeredvartsen christeredvartsen Use NOTICE instead of PRIVMSG 000a4ef
@ugisozols ugisozols Load engine rake tasks because there are no extension tasks in Rails. 5d10aad
@christeredvartsen christeredvartsen Added configuration option so that the bot does not join/part the cha…
@ugisozols ugisozols There are no bin folders in extensions. b32a28c
@ugisozols ugisozols require 'will_paginate/view_helpers/action_view' to avoid 'uninitiali…
…zed constant WillPaginate::ActionView::ViewHelpers' in some cases.
@phiggins phiggins Remove some optional dependencies from testing engine. 397aab9
@phiggins phiggins Bump factory_girl_rails dep.

@ugisozols ugisozols Add guard-rspec to Gemfile. 98a23ca
Commits on Mar 10, 2012
@parndt parndt Use 'bundle exec rake' in place of just 'rake' 3b731e9
Commits on Mar 12, 2012
@parndt parndt Bundler 1.1 is out 08d2592
@keithpitty keithpitty Fix broken link in readme. 7d450af
@parndt parndt Update guide is a bit out of date so removed the link. Unbolded contr…
…ibute and removed donate option because it's covered under contribute. Removed link from "Extend with custom extensions" because it 404s. Fixed other 404ing links and made GitHub links https
@keithpitty keithpitty Correct instructions for changing page parts in Refinery 2. 5426abc
@freels freels Properly emit an html opening tag for non-IE browsers. e577ed3
@parndt parndt Added fuubar to the Gemfile. e2b3cbf
@parndt parndt Added options --skip-db and --skip-migrations to the CMS generator ma…
…inly so that we can disable them during test runtime and so that people who need custom databases can run the generator.
@parndt parndt Don't seed when --skip-migrations is requested. 8ec5227
@jrissler jrissler Locally this was fine, on an nginx based system like heroku - it will…
… look for these 4 stylesheets in a folder called refinery in the folder this stylesheet is located in. (so move these 4 stylesheets into a folder or leave like this)
@ugisozols ugisozols Add mising config options to pages initializer. Fixes #1438. c403b66
Commits on Mar 13, 2012
@eneagoe eneagoe Replaced overriden protected render call with alias_method_chain whic…
…h closes #1447
@parndt parndt Merge pull request #1449 from eneagoe/2-0-stable
Fix for #1447 for 2-0-stable branch
@parndt parndt Email the owners and the changers aea5a48
@parndt parndt Fixed edge template - String interpolation requires double quotes. 51dfd8e
@awagener awagener Link to extension list on website rather than AWOL wiki page. da95104
@awagener awagener Remove link to testing guide, as the link is broken. bd3879d
@ugisozols ugisozols Add failing spec for #1440. 89f05c9
@ugisozols ugisozols Explicitly set dataType to be html. #1440. 2efcb2b
Commits on Mar 14, 2012
@ugisozols ugisozols Add missing authentication initializer. #1450. 0996160
Commits on Mar 15, 2012
@markstuart markstuart Set page part positions on engine generation. 415674a
@parndt parndt Merge pull request #1458 from markstuart/2-0-stable
Set page parts positions in order to ensure ordering is always correct.
@gwagener gwagener Geometry has already been converted to a string. def64da
@parndt parndt Merge pull request #1459 from yogh/2-0-stable
Geometry has already been converted to a string
@parndt parndt Documented changes for version 2.0.2 23c7bee
@parndt parndt Added a forgotten but important changelog entry. 0a4237d
@parndt parndt @ugisozols reminded me of one more change. 6ff3b55
@ugisozols ugisozols Run AuthenticationGenerator too. 6a2917f
Commits on Mar 16, 2012
@parndt parndt gsub the sqlite3 gem into group :development, :test which fixes #1465 c60cffe
@robyurkowski robyurkowski Merge pull request #1468 from resolve/sqlite_in_generated_gemfile
Fixes #1465 - sqlite3 should never be production.
Commits on Mar 17, 2012
@parndt parndt Fixes #1470 by only appending to a Gemfile that exists (dummy doesn't…
… have one).
Commits on Mar 18, 2012
@jede jede Replaced label_tag:s with f.label since the labels got wrong for attr…
Commits on Mar 19, 2012
@parndt parndt Fixes #1470 by only appending to a Gemfile that exists (dummy doesn't…
… have one).
Commits on Mar 21, 2012
@parndt parndt Fixes #1485 by requiring refinerycms-settings in new form extensions. 6e84ebe
Commits on Mar 22, 2012
@parndt parndt I do not believe that a bug fix is considered advanced. 13285b3
@parndt parndt Combined approaches from #1445

@ugisozols ugisozols Update version used in installer template and add JS runtime fix frrom 4d754b9
@ugisozols ugisozols Remove rails-3-1 branch for each extension in edge template. d0ba483
@robyurkowski robyurkowski Update 'How to get help' doc.
- Add section about patience
- Minor textual corrections and a few elaborations
- Update core team
@parndt parndt Using :transaction strategy which certainly appears to speed things u…
…p but fails tests.
@parndt parndt Only use transaction method when using JS=false because Selenium does…
…n't like it so much (at least with sqlite)
@ugisozols ugisozols GAdd comment in extension template when appending seeds file. 564e7c0
@ugisozols ugisozols Fix #1450 by not allowing roles params to get through when creating n…
…ew user instance.


@parndt parndt Instead of instance variables for the various users, switched to let() 02ea0e5
@parndt parndt Updated changelog with changes from 2-0-stable.
@parndt parndt Spotted indentation inconsistency when I was scanning the code for ma…
…gic tricks.
@robyurkowski robyurkowski Allow whitelisting of mime types inside images validator. cc02f1d
@parndt parndt Tidied up quoted array into a %w[] array. 26af735
@parndt parndt Minor code style change - outdenting. 85f9a04
@phiggins phiggins Fix a spec. ed761ca
@parndt parndt Merge pull request #1495 from phiggins/fix_spec
Fix spec
@phiggins phiggins Remove global hash of Menu instances. b9291bc
@phiggins phiggins Merge branch '2-0-stable' of i…
…nto 2-0-stable
Commits on Mar 23, 2012
@parndt parndt Merge pull request #1496 from phiggins/backport_menu_fix
Backport menu fix
@parndt parndt Explicitly require dataType html for save and continue function which…
… fixes #1497
@parndt parndt Fixes #1359 by defaulting --heroku to a blank string instead of a nil…
… which on some systems was putting 'heroku' instead.
@parndt parndt Ensure that the Gemfile exists before trying to read it. fdfba8a
@parndt parndt For #1359 refactored the Heroku code as an empty string was previousl…
…y being interpreted as wanting Heroku.
@parndt parndt config.assets.initialize_on_precompile = false must go inside config/…

Fixes #1498
@parndt parndt We don't want to wrap sqlite3 in :development, :test twice. 1bea393
@parndt parndt Modified refinery.css.scss into refinery.css which is now a manifest …

Instead of using @import to pull in the other stylesheets it acts like a proper manifest by requiring these files.

This fixes errors like 'ActionView::Template::Error (File to import not found or unreadable: site_bar.' when running in production mode.
@ugisozols ugisozols Add changelog for 2.0.3. 685e569
Commits on Mar 24, 2012
@parndt parndt Used ActiveSupport.on_load(:active_record) and refactored code locati…
…ons to not invoke the database before it's needed which helps with asset precompilation
@parndt parndt We want to initialize on precompile once this work is complete. 6c9bfc5
@parndt parndt Enable AuthenticatedSystem again because it shouldn't realistically c…
…ause any problems with asset compilation
Commits on Mar 25, 2012
@parndt parndt Fixed asset precompilation out of the box but requires git source on …
…orm_adapter until my pull request is merged.

Pull Request: ianwhite/orm_adapter#10
@parndt parndt Merge branch '2-0-stable' into asset_compilation_without_database 3d0bf80
@parndt parndt Activate WillPaginate.per_page again as this was a red herring. 27bc759
@parndt parndt Fixed where I messed up line endings. 4b472d5
@parndt parndt Specify orm_adapter requirement in gemspec now that a gem is released. b5477ec
@parndt parndt Specifically require friendly_id 73ef4ed
@parndt parndt Routes no longer need to be loaded inside an ActiveSupport.on_load(:a…
…ctive_record) hook if we manage devise ourselves.
@parndt parndt renamed RefineryCoreController to CoreController as it was already in…
…side Refinery namespace.
@parndt parndt Now defining image_accessor and resource_accessor macros on Refinery:…
…:Resource and Refinery::Image which means that Refinery::Core::BaseModel can be autoloaded again.
@parndt parndt Corrected module name of PagePresenter to be Refinery::PagePresenter …
…(bugfix). Now we check better for whether a presenter class exists before creating a constant which reduces warnings greatly.
Commits on Mar 26, 2012
@parndt parndt Require seo_meta ~> 1.3.0 which allows us to have Refinery::Page::Tra…
…nslation monkey patched more intelligently.
@parndt parndt module ::Refinery -> module Refinery (cleanup) 57c0141
@parndt parndt Added helpers that were missing because Rails expects these to be pre…
…sent. This removes many warnings when Refinery is executed.
@parndt parndt Cleanup line endings. c2ed25d
@ugisozols ugisozols Merge pull request #1511 from resolve/asset_compilation_without_database
Asset precompilation has been solved for 2.0.x
@parndt parndt Set VERSION_BAND back to 2.0.0 otherwise install fails because e.g. r…
…efinerycms-i18n has no version 2.0.2 available.
@parndt parndt Ensure that an ExecJS runtime is available for realsies.
Fixes #1512
@ugisozols ugisozols Merge pull request #1514 from resolve/ensure_execjs_runtime
Ensure that ExecJS runtime is always available if the Gemfile didn't contain therubyracer already. For #1512
@parndt parndt Version should be 2.0.3 as this is the next release. e4c3c33
Commits on Mar 27, 2012
@robyurkowski robyurkowski Re-orders documentation into more logical categories. f55f4f5
@robyurkowski robyurkowski Rename all guides. 88ce641
@robyurkowski robyurkowski Update links to new guides. 969b6db
@robyurkowski robyurkowski Fixes #1516. 9ed1fd5
@robyurkowski robyurkowski Add spec for receiving hide_sections => nil. 59fa0c9
@robyurkowski robyurkowski Removes useless quotes. 73179e2
@robyurkowski robyurkowski Fix #1393. 4ccebdf
@robyurkowski robyurkowski Deprecate body_content_right and body_content_left 5a5bebd
@ugisozols ugisozols Merge pull request #1520 from resolve/fix/1393-stable
Deprecate body_content_left and body_content_right (Partially fixes #1393)
Commits on Mar 28, 2012
Denis Kabistan Updated URL for RefineryCMS installation on Heroku. 9c5d2cf
@jeremyw jeremyw Fix incorrect information about Guard, added text about Spork. ce51b89
Commits on Mar 29, 2012
@parndt parndt In the generated extension we should not use git when created by vers…
…ion ~> 2.0.0 - we should instead use ~> 2.0.0
@parndt parndt Ruby file type declaration was appearing twice, fixed. 8dadf60
@parndt parndt Added a script/rails to engine and form extensions' templates to allo…
…w rails commands to work inside extensions.
@parndt parndt Added vendor/extensions/**/spec/dummy to the application's gitignore …
@parndt parndt Added .gitignore files for the vendored extensions by default contain…
…ing ignore rule for spec/dummy
Commits on Apr 01, 2012
@parndt parndt Fixes #1492 by rewriting in correct conditional logic. Also fixed bro…
…ken translation.
@parndt parndt Ignore .gemfile from future Refinery versions. 0091818
@michaelmichael michaelmichael Escape plus sign, fix formatting typo. 528fe3d
Commits on Apr 02, 2012
@phiggins phiggins Fix presenter finding logic. ee6b135
@ugisozols ugisozols Merge pull request #1541 from resolve/issue_1492
Fixes #1492
@parndt parndt Corrected changelog entries and dated the 2.0.3 release. 40fcf21
@ugisozols ugisozols Add specs for Refinery::Menu and fix stack level too deep error comin…
…g from Refinery::Menu#inspect.
@ugisozols ugisozols Add changelog entry about stack level too deep in Refinery::Menu fix. d21aee7
Commits on Apr 04, 2012
@ugisozols ugisozols We decided to not override inspect at all. 329fdfe
@parndt parndt Merge pull request #1551 from resolve/refinery_menu_specs_and_error_fix
Add specs for Refinery::Menu and fix stack level too deep error coming from #inspect
@jkovar jkovar translated what into the actual name 2a2d846
@ugisozols ugisozols Multi-kill! #1552, #1553, #1554.
* Update generated engine Gemfile
* Remove --format Fuubar from Guardfile
* Fix failing specs for newly generated engine
@ugisozols ugisozols Bump gem versions.

@parndt parndt Flattr's not really that useful to put here. 5574927
@ugisozols ugisozols Use the same :cli guard setup that we're using in Refinery's rGuardfile. 4d694d1
@parndt parndt Support the spec/dummy application primarily and fall back to the ven…
…dored app or else raise an exception.
@ugisozols ugisozols Update changelog. 098b0d8
Commits on Apr 06, 2012
@ugisozols ugisozols Add changelog entry about dialog opening fix. 46f35c7
Commits on Apr 07, 2012
@ugisozols ugisozols Update links to guides in Closes #1575. 6a8e5f2
Commits on Apr 10, 2012
@ugisozols ugisozols Add missing en translations for layout_template and layout_template_h…
@ugisozols ugisozols Fix spelling. 2d91347
@nicholassm nicholassm Ensures correct page is found when two pages have same slug.
The first page found (with a non-blank slug) in find_by_path should be a root page.

@nicholassm nicholassm Adds spec that shows bug in Refinery::Page.find_by_path. 23e825c
@nicholassm nicholassm Replaces reverse_merge with merge. beb3f85
@ugisozols ugisozols Merge pull request #1586 from Subsis/2-0-stable
Fixes page ambiguity for different pages with the same slug in find_by_path.
@parndt parndt Introduced my patch for site_name being configurable in i18n as well …
…but defaulting to the config.
@ugisozols ugisozols Add specs for #1576. 7f98772
@xyz xyz Update pages/app/views/refinery/admin/pages/…
@xyz xyz Update pages/app/views/refinery/admin/pages/…
@ugisozols ugisozols Add specs for #1581. 09becb0
@parndt parndt Capitalise Devise. a54c730
@ugisozols ugisozols Add missing changelog entries. ff5e620
@ugisozols ugisozols Use full name in changelog. a1d453d
@ugisozols ugisozols I don't know how I managed to delete this in previous commit... 0b404ea
Commits on Apr 11, 2012
@parndt parndt Require at least awesome_nested_set 2.1.3 which fixes #1399 a8030d2
Commits on Apr 18, 2012
@parndt parndt Fixed formatting of ruby blocks 672df2b
@parndt parndt Remove stray @ fb9300d
@parndt parndt Removed another stray @ aaddd78
@parndt parndt place the spec contents under module Refinery so that BasePresenter e…
@parndt parndt don't just guess the id, actually use the created object's id. a12337d
@parndt parndt Create child directly against parent_page using FactoryGirl.attribute…
Commits on Apr 21, 2012
@parndt parndt Fixes #1452 by forcing SSL when not in SSL already and when new setti…
…ng Refinery::Core.force_ssl is set true.


@parndt parndt Added specs to fix faulty logic with force_ssl.

@parndt parndt Added coverage for when admin? is false and force_ssl is true. 1f41de9
@ugisozols ugisozols Remove :if => admin? from refinery_user_required? filter. f1b4852
Commits on Apr 22, 2012
@ugisozols ugisozols Remove one of the application controller specs because the functional…
…ity won't be in 2.0.x.
@ugisozols ugisozols Add note about Refinery::Core.force_ssl to changelog. 133499d
@thedarkone thedarkone Make sure the precompile asset paths are properly set up when running…
… `rake assets:precompile`.
@parndt parndt Merge pull request #1610 from thedarkone/precompile-path-fix
Precompile path fix
@parndt parndt Merge pull request #1608 from resolve/force_ssl
Backport force_ssl setting to 2-0-stable.
@parndt parndt Until I can reproduce rbx failures locally it makes no sense to fail …
…the build because of them.
Commits on Apr 23, 2012
@f3ng3r f3ng3r Fixed bugs with page sweeper.
In particular:
  * Fixed bug where `page_cache_directory =` returns an empty path.
  * Changed `cache_root.rmdir` to `FileUtils.rm_rf cache_root` in order to delete an non-empty directory.
  * Remove the `pages.html` file that is outside the `../pages/` directory and any file like it (for example pages.html.gz)
Commits on Apr 24, 2012
@ugisozols ugisozols Update changelog. 332b512
@vita vita Invalidate cached urls for all frontend locales 8167451
@robyurkowski robyurkowski Check for Refinery::I18n's presence to fix #1533. 032a9be
@parndt parndt Use code suggested by @ugisozols and switch to Refinery.i18n_enabled?…
… over defined?(::Refinery::I18n)


@parndt parndt Fix bug introduced by @parndt 3c53e56
@ugisozols ugisozols Don't check if Refinery.i18n_enabled? in path_cache_key and url_cache…
…_key methods.
@vita vita Fix adding link to page when switch locale in administration c0f9a7c
@ugisozols ugisozols Add failing spec for #1583 4494ffc
@nicholassm nicholassm Ensures correct page is found when two pages have same slug.
The first page found (with a non-blank slug) in find_by_path should be a root page.
@nicholassm nicholassm Replaces reverse_merge with merge. eaf403b
@ugisozols ugisozols Don't assume page links will be absolute - check only for locale + pa…
…ge slug. (10 points goes to @parndt).
Commits on Apr 25, 2012
@ugisozols ugisozols Update changelog and add associated ticket/pr ids to the entries. 365dc33
Jean-Philippe Boily fixed engine generation view that had hardcoded "title" attribute 8a46207
@ugisozols ugisozols If generated extension uses translations add attr_accessible :locale …
…to Translation class.
@parndt parndt Merge pull request #1617 from resolve/cherry_picks_from_master
Cherry picks from master
@thedarkone thedarkone ApplicationHelper is an autoloadable constant, there is no need for a…
…n explicit require.
@thedarkone thedarkone Use event delegation for detecting modal dialog links. 8a457dd
@parndt parndt Merge pull request #1620 from thedarkone/event-delegation
Modal links, event delegation
Commits on Apr 26, 2012
@parndt parndt Merge remote-tracking branch 'thedarkone/require_dependency' into 2-0…
@ugisozols ugisozols Experiment on Travis CI. 2ff2aa1
@ugisozols ugisozols Brink back Rubinius testing on Travis and allow it to fail :) #1603. 8e560b2
@thedarkone thedarkone Add missing files for precompiling. df71b09
Commits on Apr 27, 2012
@thedarkone thedarkone Remove ApplicationHelper's file to prevent it from getting cached in …
…Refinery::Core::Engine.helpers and thus stop picking any changes made to the application_helper.rb located in the main app.
Commits on Apr 28, 2012
@ugisozols ugisozols Merge pull request #1627 from thedarkone/appl-helper
Remove application_helper.rb from refinery/core
Commits on Apr 29, 2012
@ugisozols ugisozols Merge pull request #1625 from thedarkone/asset-precompiles
Add missing assets.precompile declarations
Commits on Apr 30, 2012
@jtmkrueger jtmkrueger extra a in the sentence 6f5ca0e
Commits on May 02, 2012
@ugisozols ugisozols Add admin_dialogs_path and use that in wym setup.

Commits on May 04, 2012
Natalí Bug fixed in Firefox 11. In the image picker popup, the content is bl…
…ank until you move the popup.
@ugisozols ugisozols Add changelog entry about #1637. c3d357a
Commits on May 07, 2012
@nashby nashby add ru locales for preview button 4c7abda
@ugisozols ugisozols Add temp fix for #1595.

@robyurkowski robyurkowski Use proper template location for admin error_404. ea01b96
@robyurkowski robyurkowski Re-enable controller back-end access checking. b076e2b
@ugisozols ugisozols Fix failing specs. b786383
Commits on May 10, 2012
@ugisozols ugisozols Fhere are no 'refinery_login_with' and 'logged_in_user' methods avail…
…able in 2-0-stable.
Commits on May 12, 2012
@thedarkone thedarkone Manually preload the :translations to avoid the N+1 queries.
Combined patches and linked to a PR in awesome_nested_set where passing a relation *will* work.
Implement feedback from @ugisozols.
@parndt parndt Merge remote-tracking branch 'jipiboily/engine_generator_fix' into 2-…
@parndt parndt Fixes #1628 by updating Dragonfly API usage. 20c0169
@parndt parndt Fixes #1568 by removing errant documentation. c5a88f8
@ugisozols ugisozols Merge pull request #1654 from resolve/issue_1628
Fixes #1628
@ugisozols ugisozols Merge pull request #1653 from resolve/pull_1633
Replaces #1633
Commits on May 14, 2012
@parndt parndt Fixes resolve/refinerycms-search#16
This works by allowing refinery.url_for(Refinery.route_for_model(result.class, :admin => false)) to be used in place of refinery.url_for(result)
@parndt parndt Increment version to 2.0.4 3ef0a2c
@ugisozols ugisozols Merge pull request #1661 from resolve/fix_route_for_model
Fixes resolve/refinerycms-search#16
@parndt parndt Updated changelog for recent changes. 7c56871
@parndt parndt I plan to release this soon. 24c5e44
@ugisozols ugisozols Add issue/pr ids to changelog. c4f14df
@parndt parndt Terminate <shell> section with </shell> not <shell> ;-) 1bd98ee
@parndt parndt Added Rob Yurkowski 2beb6c0