Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

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
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on May 20, 2011
@ugisozols ugisozols Use latest version of seo_meta. acbdcf8
@ugisozols ugisozols Use seo form partial from seo_meta plugin directly instead of duplica…
…ting it.
@ugisozols ugisozols Bump up rspec version to 2.6. 4c4a122
@ugisozols ugisozols Use form_advanced_options_seo partial as before. #689. 5e59cf6
@veeti veeti Small fix in Finnish translation 1e0af65
@veeti veeti Added missing Finnish translation 4850f53
@parndt parndt Merge pull request #691 from rojekti/i18n_fi
Finnish addition & fix
@parndt parndt Merge pull request #693 from keram/master
Show scope of refinery setting in settings administration
Commits on May 21, 2011
@parndt parndt This is not anymore. 3d25ec5
@parndt parndt Ensure any index directory doesn't appear in the gemspec a9c534a
Commits on May 22, 2011
@parndt parndt Merged remote branch 'ugisozols/master' d3fbc47
@parndt parndt Help out those applications that have just auto-updated to rake 0.9.0…
… which fixes #690 :-)
@parndt parndt We need a version to address a number of issues before we mo…
…ve to 1.0.0
@parndt parndt Back to being 1.0.0 prerelease. 8a7bec0
@parndt parndt Allow updates to point releases of 1.0.x and changed version to 1.0.0…
… instead of 1.0.0.pre so that engine gems can specify this version as a dependency easily.
@misterbojangles misterbojangles selected_page? fixed for default locale when path does not include lo…
@parndt parndt Fixes #695 skip to first child feature and added cucumber scenario to…
… ensure working now and in future. (ht: keram)
Commits on May 23, 2011
@misterbojangles misterbojangles revised fix a0cf44b
@parndt parndt Merge remote-tracking branch 'misterbojangles/master' a80739a
@rorra rorra Adding rcov, so we can check the code coverage for refinerycms. e71386f
@rorra rorra Some cucumber step global definitions to test if a view contains a cs…
…s content, and to output the page body (when building cucumber tests).
@rorra rorra Cucumber test for Admin::DialogsController 01e78ef
@rorra rorra Due to last test, I figure out it's impossible to execute the 'show' …
…action of the Admin::DialogsController with params[:id] being anything else than a String, so there is not reason to check if params[:id] supports (or not) the method downcase.

Cleaning the method.
@rorra rorra Moving rcov dependency to refinerycms-testing 57e1998
Commits on May 24, 2011
@jeffsebring jeffsebring updated gemfile default new engine to latest version 3995a96
@jeffsebring jeffsebring hai bd094a2
@parndt parndt Merge remote-tracking branch 'jeffsebring/master' 14dd59d
@rorra rorra Moving rcov task to the refinerycms-testing gem 91f880c
@parndt parndt Merge remote-tracking branch 'rorra/master' db1ad8a
@parndt parndt No more .pre, rebuilt with new rcov. And rake 0.9.0. 0be0246
@ugisozols ugisozols Use latest version in guides. ea9e189
@ugisozols ugisozols Update rails for zombies link in guides. 23a8ac5
Commits on May 25, 2011
@parndt parndt Started on new Refinery Menu API which should scale properly and be f…
…ar easier to work with. Work in progress.
@parndt parndt More of the menu implemented, using existing partials. f60564c
@parndt parndt Deprecate anything that was called in a partial previously (incase yo…
…u overrode it).
@parndt parndt Ensure that every selected set returns a ::Refinery::Menu instance so…
… that all the same methods work as before you queried (could be improved).
@parndt parndt Update some syntax for content_for vs [] on Page 3c3a68b
@parndt parndt Menu no longer needs all this crazy caching stuff, it's just naturall…
…y fast..
@parndt parndt Make the menu HTML look less awkward. 4637d9f
@parndt parndt Refactored entire menu again so that we retain a collection of all of…
… the menus and made menu items more intelligent about how they implement basic nested sets.
@parndt parndt Finally added a proper deprecation API. 695e8ab
@parndt parndt Well, I *was* debugging. c167b29
@parndt parndt Confusing lines are confusing, made it less confusing. bd3129a
@parndt parndt Maintain backward compatibility with shown_siblings. 8f4d34a
@parndt parndt has_parent? seems nicer than writing !parent_id.nil? 320dd35
@parndt parndt Newlines make the deprecations readable. 626a210
@parndt parndt Fixed by_title according to rspec and now capture_stdout works well. 1681eaa
@parndt parndt Implied readonly was affecting the by_title query. f9a065e
@parndt parndt We can always determine last position based on sibling count. 4669753
@parndt parndt Cleaned up menu partial a bit more. 4f0411e
@parndt parndt "child is memoized, rename it" - ugisozols, fixed spec. bbe8589
@parndt parndt Move children inline and mark dom_id for destruction (deprecated). 94ca9b4
@parndt parndt Creating a new menu instance ruined the way that it was supposed to w…
…ork and I don't think we even need to do it (should be faster).
@parndt parndt Trying to do the same job with less overhead. 7f6aae6
@parndt parndt Added .ancestors to menu items. 22c8363
@parndt parndt Improved readability of menu_helper matching, renamed invalidate_chil…
…d_cached_url to invalidate_cached_urls but aliased it so the former still exists.
@parndt parndt Added ::Refinery.i18n_enabled? which wraps up the functionality of ch…
…ecking whether ::Refinery::I18n is defined and enabled.
@parndt parndt By clearing the page's cached URL on save as well as that of its chil…
…dren all tests pass once more. No longer highlighting a menu item if it has a child that's hidden.
Steven Heidel Changed some logic so that it makes more sense when read. 34bd301
@parndt parndt Whoa what were all those commits about? (Documented changelog) 0d8bb22
@parndt parndt If the Gemfile is set to ~> 1.0.0 then refinery will autoupdate anywa…
…y so these can be strict dependencies. If the Gemfile is set to = 1.0.0 then we will definitely want to respect that. Hence, changed ~> to = for intergem dependencies inside this package.
@parndt parndt Added depth to MenuItem to avoid backward incompatibility and because…
… it's pretty useful.
@parndt parndt Seems like it would be a great idea to order the menu by lft ASC. 8d2e9c7
@leemcalilly leemcalilly without fog, if you're using heroku you could not upgrade to the late…
…st version of refinery without fog. Suggesting it in the gemfile.
@parndt parndt Merge pull request #706 from leemcalilly/master
Suggest in the gemfile that you should use Fog if you want Heroku and AWS.
@parndt parndt We want to <3 PostgreSQL so have removed the unfriendly backticks whi…
…ch coincidentally fixes #708
Commits on May 26, 2011
@sbeam sbeam remove unnecessary group() in Page translations arel chain, which was…
… disturbing PostrgreSQL.

Simplifies the query, and wasn't needed because the WHERE condition already restricts to the selected locale. Solves #709
@parndt parndt Merge pull request #710 from sbeam/patch-1
remove unnecessary group() in Page translations arel chain
@parndt parndt Globalize official non beta version. 86de3d1
@leemcalilly leemcalilly We have fog listed twice. It's redundant now. cc89d3d
@ugisozols ugisozols Merge pull request #713 from leemcalilly/patch-2
We have fog listed twice. It's redundant now.
@parndt parndt No more menu_match for the homepage, it already matches on link_url. …
…Fixes #694
Commits on May 27, 2011
@banderso banderso Jruby only populates the first block variable 91f7251
Steven Heidel Use ~> and not = for the main refinerycms gem in generated applications. 2046f4e
@rorra rorra Adding factories to rspec, setting up default controllers helper in o…
…rder to test logged in users, adding a test example for the controller refinery_core inside core/admin
@rorra rorra Factory girl integrated into spec, working fine :) 704cb1b
Steven Heidel Added a new guide to instruct users on installing Refinery from absol…
…utely no background.
Steven Heidel Removed extraneous line from prerequisite guide. ae4029d
@parndt parndt Merge pull request #714 from banderso/master
Fix marketable_routes to run on JRuby
@rorra rorra Fixing the test of the controller Admin::RefineryCore so it tests the…
… right thing
Steven Heidel Feel free to improve the instructions relating to databases on a mac. 4dfa9bd
@rorra rorra Some easy tests added to the core engine 3008c6f
@rorra rorra Removing old code that I commited by mistake a05bdc2
@rorra rorra Fixing the issue where I was trying to include a file inside the test…
…ing engine on the refinerycms application
@parndt parndt Merge remote-tracking branch 'rorra/master' 9e9ca0b
@parndt parndt Added refinery methods added by rorra to a support file that gets gen…
…erated in instead.
@djones djones Added instructions on how to run the tests after installing the refin…
…erycms_testing gem.
@djones djones Don't advertise these gems as much anymore. e973d1f
@parndt parndt jruby / 1.8.7 compatibility fix. 82dba2f
@djones djones refinerycms-portfolio doesn't work smooth enough yet to advertise it …
…in the gemfile.
@parndt parndt Make seo_meta migration consistent and prevent bugs with 'title' fiel…
…d on other engines' migrations.
@parndt parndt Unbelievably, file permissions caused this test to fail in 1.8.7 e7dbdca
@parndt parndt Support a features directory in the Rails root on 1.8.7 9d2210d
@parndt parndt New files added, regenerated core gemspec. 0b5ec7b
@parndt parndt Starting with 3.0.8, Rails will do this too, so we have to be more ca…
…reful with our gsub.
@parndt parndt ZOMG 1.0.0 6de1752
Commits on May 30, 2011
@ysiadf ysiadf Clarified presence of the @import statement in application.css
(Without this clarification, users might think that importing 'refinery/application.css'
is necessary to enable some sort of magic.)
@parndt parndt Added -t / --testing option to bin/refinerycms which adds refinerycms…
…-testing support to new applications. Also added option to run commands with 'bundle exec' which pretty much all commands now use.
Commits on Jun 03, 2011
@parndt parndt New refinerycms-generators, updated lock file. e80661c
Commits on Jun 04, 2011
@parndt parndt Updated guide to warn people that they may lose tables - related to #736
@banderso banderso Update how plugins get their pathname set to not depend on execution …
…stack trace
@parndt parndt Allow tests to run on travis. f51848e
@banderso banderso Merge branch '1-0-stable' of i…
…nto 1-0-stable
Commits on Jun 05, 2011
@parndt parndt Ensure that pathnames have a default as well as being able to be over…
…ridden for #737.
Commits on Jun 07, 2011
@parndt parndt Relating to #740 Somehow we lost where it defaults to using s3 if the…
… ENV has been set. Fixed.
@earnold earnold I was a little confused about turning s3 on. So I updated the instruc…
…tions. I hope this version is more instructive.
@parndt parndt Reduced width of guide and removed suggestion about config/environmen…
…t.rb and replaced it with config/environments/production.rb.

Also fixed a few line spacing issues on environment files.
@parndt parndt Updated doc for truthiness. 21c435f
@parndt parndt How to get better help with Heroku. 4b3a571
@parndt parndt Turns out this isn't markdown so my linking method was incorrect. b232cb8
Steven Heidel Remove duplicate information by linking to the S3 guide in the Heroku…
… guide.
Steven Heidel Always use the oxford comma, always. f019325
Steven Heidel Change "people" to "core team", aka the top 4 contributors who can he…
…lp you on the IRC.
Steven Heidel Remove duplicate information by linking to the S3 guide in the Heroku…
… guide.
Steven Heidel Always use the oxford comma, always. 91c1b81
Steven Heidel Change "people" to "core team", aka the top 4 contributors who can he…
…lp you on the IRC.
@inbeom inbeom removed duplicate call of link_dialog.init()
from Resources#insert view
@inbeom inbeom Call link_dialog.init() if upload is not permitted 0bc08b9
@joemsak joemsak the deprecation warning wasn't clear that this is an instance method

Steven Heidel Merge pull request #745 from neotericdesign/master
Deprecation message wasn't 100% clear

Steven Heidel Change @page to page because the first one didn't use @

@parndt parndt Always 'and return' after a redirect_to. 018e32c
Commits on Jun 08, 2011
@parndt parndt Use rails 3.0.8 at a minimum which hopefully helps with #730. 59eeff1
@haikalhussein haikalhussein create a guide on how to create multiple data-tables in a single engine b9b0128
@haikalhussein haikalhussein edit some lines in the doc guide 4aac6b6
Commits on Jun 17, 2011
@parndt parndt Fixes #732 and #762 by running 'rails new' with 'bundle exec' and spe…
…cifying the built in Gemfile.
@parndt parndt Update to Rails 3.0.9 and Uģis Ozols 4653ce2
@parndt parndt Ensure Encoding is set properly to allow for Uģis Ozols a3c0673
@parndt parndt Regenerated gemspecs. fed0423
Steven Heidel This guide had the old paths of vendor/refinerycms, updated to new ro…
…ot level paths
Commits on Jun 21, 2011
@parndt parndt Don't put space before parenthesis ab42666
@joemsak joemsak specs can run in ruby 1.9.x 706210d
@joemsak joemsak string to string f04bcb7
@parndt parndt Merge remote-tracking branch 'neotericdesign/1-0-stable' into 1-0-stable 5b6ba06
@parndt parndt Looks like cucumber 1.0.0 is out. fd46480
@parndt parndt refinerycms-blog is up to 1.6.0 08b2c8d
@parndt parndt cleared whitespace, regenerated gemspecs. 1b7481b
@parndt parndt We actually need to bundle install first, otherwise some gems are mis…
@parndt parndt The databases specified here are for development.
TODO: remove block when building the gem so they don't become a dependency
Steven Heidel Fix merge conflict in Gemfile. b1569c8
@wikyd wikyd Make the catch-all pages route for marketable URLs be controlled by t…
…he configuration switch.
@parndt parndt Re-enable building gems, added ability to move them to current direct…
@parndt parndt Specifying version 1.0.1 in the Gemfile and fix issue with installer …
…where the BUNDLE_GEMFILE wasn't being set back for the app to use it.
Steven Heidel Phil, Y U NO add encoding to .gemspecs as well? Added encoding to gem…
…spec generators and regenerated all gemspecs.


@parndt parndt Documented changes in the changelog 5a7f88d
Commits on Jun 22, 2011
@parndt parndt Now prepares the gem without testing enabled so that bundle install d…
…oesn't install it thus wasting resources when the user didn't want it. Using --testing while installing enables it again.
@parndt parndt TODO was done d112c59
@parndt parndt Downcase the input (this was already fixed in master) 07a803b
Commits on Jun 23, 2011
@parndt parndt Documented why we're now at version 1.0.2 80fe84d
@parndt parndt 1.0.3 due to corruption in 1.0.2 bf4f5df
@parndt parndt Changelog entry was incomplete. 7f1a91e
Commits on Jun 24, 2011
@parndt parndt Updated lock to get new friendly_id_globalize3 version which fixes #755 8c56ebe
Commits on Jun 25, 2011
@hechacker1 hechacker1 Move and reuse initialization code from older version to fix plugin p…


@ovargas27 ovargas27 How to enable testing in your application 85eb675
@ovargas27 ovargas27 typo fixed b190f85
@ovargas27 ovargas27 updated with parndt's feedback d46ee22
@parndt parndt Fixed typo with guide not closing shell tag. e4203f2
@parndt parndt Ignore coverage dir 612792f
@parndt parndt fixed typo - environment 8d49d29
Commits on Jun 29, 2011
@parndt parndt Fixed typo - affect instead of effect c29f57e
scambra Use asset_host for url returned from image picker dialog. Now it will…
… return a url with host when asset_host is defined, and it will continue returning a path when asset_host is not defined
@parndt parndt Merge pull request #790 from scambra/1-0-stable
Use asset_host for url returned from image picker dialog
Commits on Jul 05, 2011
@djones djones We don't use /admin anymore so no need to include it in robots.txt 6129bde
Commits on Jul 09, 2011
@parndt parndt Ensure that pages reset column information when seeding just incase. af537ed
@mhaylock mhaylock Changed 'User-agent' casing to maximise crawler compatibility. fe46db2
Commits on Jul 11, 2011
@joemsak joemsak this little line is malformed, produces an error in console, shows as…
… raw code in IE
@ugisozols ugisozols Merge pull request #813 from neotericdesign/1-0-stable
this little line is malformed, produces an error in console, shows as raw
Commits on Jul 12, 2011
@joemsak joemsak reorder icon was getting effed when used in a multilist 51a0de3
Commits on Jul 17, 2011
@parndt parndt Ignoring public/refinery

@parndt parndt Regenerated gemspecs. 5684e9a
@joemsak joemsak reorder icon was getting effed when used in a multilist 6d3bcc8
@parndt parndt Fixes #806 by adding pages_list class back to resource picker. (thanks 6d25043
@parndt parndt Experimenting with the load path analyzer by Xavier Shay. 95871da
@parndt parndt Backport b02a7e0 from master for #807 ffc2ca9
Commits on Jul 20, 2011
@joemsak joemsak Merge branch '1-0-stable' of i…
…nto 1-0-stable
Commits on Jul 21, 2011
@parndt parndt Duostack is not accepting new apps anymore. 0f63245
@joemsak joemsak Image fu: get the height and width in any case da31382
@joemsak joemsak Merge branch '1-0-stable' of i…
…nto 1-0-stable
@ugisozols ugisozols Merge pull request #827 from neotericdesign/1-0-stable
image_fu should get image.height and image.width with any geometry string
@joemsak joemsak Closes GH-828. Removing this code fixed this issue. Tested on zebra a…
…nd tree
@joemsak joemsak Merge branch '1-0-stable' of i…
…nto 1-0-stable
@joemsak joemsak WIP: image_fu changes d492c5c
Commits on Jul 25, 2011
@parndt parndt page[:something] is no longer recommended. ebbd0fe
@parndt parndt Figure out what the image size is going to be based on geometry string. 3fbdc34
@parndt parndt Instead of returning an array returning an OpenStruct makes more sense. e16eea5
@parndt parndt Moved image_dimensions_for_geometry to an instance method on the Imag…
…e model called thumbnail_dimensions.
@parndt parndt Added basic specs for thumbnail_dimensions which show a failure. 35fc767
@parndt parndt Removed old variable c0ad693
@parndt parndt Changed the return type to a hash so that we can inline it to the ima…
…ge_tag options.
@lancecarlson lancecarlson Edited doc/guides/7 - Hosting/2 - How to use Amazon S3 for storage.te…
…xtile via GitHub
Commits on Jul 26, 2011
@parndt parndt fixed whitespace be511fa
@parndt parndt Fixes Issue #816 where new page parts don't get added with a fully fu…
…nctional WYMeditor.
Commits on Jul 28, 2011
@parndt parndt Let's see if we can get this thing running on lots of rubies. 5d35d10
Commits on Jul 30, 2011
@parndt parndt ::Refinery.i18n_enabled? when not enabled now returns false, not nil. a833d3e
@parndt parndt Updated getting started to mention 1.0.3 0a44287
@ugisozols ugisozols Cucumber requires database_cleaner if it's available so we don't need…
… to do it ourselves.


@parndt parndt Reimplemented the image geometry size guess algorithm. 10e1c9e
Commits on Jul 31, 2011
@krisf krisf locked will_paginate at pre2 due to issues with pre4 5e982d0
@parndt parndt Regenerated core gemspec aa372e0
Commits on Aug 02, 2011
@ugisozols ugisozols Patch required_label helper so it would pick up I18n model attribute …
Commits on Aug 04, 2011
@parndt parndt Ensure that we're really locking to will_paginate pre2. 607b46e
@ugisozols ugisozols Lock will_paginate to 3.0.pre2 in core gemspec. #850 5c13361
@ugisozols ugisozols Refactor require_label form helper in order to use it with namespaced…
… classes.
@parndt parndt Revert "Refactor require_label form helper in order to use it with na…
…mespaced classes." We can't change APIs in 1.0.x

This reverts commit 8c9b76a.
Commits on Aug 07, 2011
@krisf krisf Fixed search & add image for page-images and portfolio engines 16bc45f
@parndt parndt Merge pull request #856 from krisf/1-0-stable
Fixed search & add image for page-images and portfolio engines
Commits on Aug 09, 2011
@parndt parndt Regenerated gemspecs. bbe0be0
@parndt parndt Added ability to specify a different database host per http://groups.… 85c455a
@parndt parndt No longer need to force mysql2 0.2.x 447f0e9
Commits on Aug 10, 2011
@parndt parndt Not using bundler anymore to install Rails and instead allowing the u…
…ser to override which version we're using and failing when the version is too-future which fixes #798.
@parndt parndt Fixed the -h --database-host option 8965b07
@ugisozols ugisozols I was approaching problem from the wrong side. We don't need an order…
…ed hash… just change the specs.


@parndt parndt It's antisocial to require rcov when platforms like rbx and jruby don…
…'t like it.


@parndt parndt Documented changes since 1.0.3 and regenerated the gemspecs. 69f0725
@parndt parndt Turns out rails generates a different database.yml than I was expecting. 8441edd
Commits on Aug 11, 2011
@parndt parndt Oh hey as it turns out not everyone will be using mysql2. c891a61
@parndt parndt Regenerated gemspecs for release of 1.0.4 f3dbf4e
@ugisozols ugisozols Update jQuery UI. a5f70fc
@ugisozols ugisozols Remove html code when we close dialog either with cancel button or x …
…icon at the top of dialog. Closes #860.
@ugisozols ugisozols will_paginate 3.0.0 is out and everything is working nice and smooth. #… 645f845
Commits on Aug 12, 2011
@ugisozols ugisozols Swap words. 346ca19
Commits on Aug 13, 2011
@Anatortoise Anatortoise Adding new guide for attaching refinery to existing devise app a318f08
@parndt parndt Merge pull request #867 from Anatortoise/1-0-stable
1 0 stable
@Anatortoise Anatortoise fixed a bad textile tag in guide bf375ed
@parndt parndt Merge pull request #868 from Anatortoise/1-0-stable
1 0 stable
@Anatortoise Anatortoise adding missing textile tag e4685c8
@parndt parndt Merge pull request #869 from Anatortoise/1-0-stable
1 0 stable
Commits on Aug 15, 2011
@qevodude qevodude Fixed incorrect path on config/initializers. It is not under the "app…
…" tree.
Commits on Aug 18, 2011
@parndt parndt Removed duostack hosting option because duostack doesn't seem to work…
… anymore.
Commits on Aug 22, 2011
@gogogarrett gogogarrett Added a quick tip to show how to generate refinery running on a speci…
…fic version of rails.
@gogogarrett gogogarrett Added more specific details about how to view a list of possible comm…
…ands with "rake refinery:override"
Commits on Aug 23, 2011
@ugisozols ugisozols Fix link and email insertion. Closes #901. 0421b86
@ugisozols ugisozols Merge branch '1-0-stable' of i…
…nto 1-0-stable
@parndt parndt Instead of listing out a huge WYMeditor explanation inside I…
…'m moving it out to its own guide and linking to it.
@parndt parndt I'm so used to File.expand_path style linking that I forgot temporari…
…ly how the web works.
@parndt parndt My usage of English grammar is usually better than this. ad2f25e
Commits on Aug 29, 2011
@parndt parndt Ensure that we see the raw output of the javascript disabled flash me…
…ssage by using _html convention. [ci skip]
Commits on Aug 30, 2011
@JohnSmall JohnSmall Edited doc/guides/8 - Tips and Tricks/3 - How to test Refinery.textil…
…e via GitHub
@parndt parndt Updated gemspecs, changelog etc for a 1.0.5 release. f249acd
Commits on Aug 31, 2011
@parndt parndt Json updated it seems 524bf0f
@parndt parndt Added support for devise 1.4.3 7068745
@parndt parndt We don't actually need to depend on all of Rails..... 5387456
@parndt parndt It seems that gems are far happier when we depend on activerecord in …
…all the right places (the ones that use it).
@parndt parndt Updated changelog f5f60a3
@parndt parndt *****SIGH***** e48db26
Commits on Sep 01, 2011
@mattmate mattmate Updated version number and added a tip on upgrading to major, minor a…
…nd bugfix releases.
@parndt parndt Merge pull request #923 from mattmate/patch-1
Updated upgrade guide
@parndt parndt Fixes #915 by specifically specifying rails as a dependency of refine…
@parndt parndt Not specifying autotest as a dependency of refinerycms-testing, if yo…
…u want it just add it to your app's Gemfile.
@parndt parndt Improved 'wrong rails version' error message. 1723076