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: refinery/refinerycms
head fork: refinery/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 Apr 28, 2011
@parndt parndt Merge remote-tracking branch 'ugisozols/master' dcc9571
@parndt parndt Fixed for Ruby 1.8.7's lack of cool syntax. 5dffe7f
@parndt parndt Made IRC link not protocol specific but rather link to our guides page. a014de8
@parndt parndt Go the extra mile and anchor to the right heading! ff41d7e
@parndt parndt Documented changes. 2742536
@parndt parndt Updated and regenerated gemspecs for d7a1ebf
@parndt parndt Fixed spelling mistake skiped -> skipped and allowed all of the core …
…attributes on all of the new 'HTML5 tags' which fixes #635
Commits on Apr 29, 2011
@parndt parndt whitespace 50fd11a
@parndt parndt Allowed data- attributes in WYMeditor tags using HTML view e.g. data-…
…validator='string' or data-tooltip='Here is a nice description of my element for use with some javascript'.
@joeellis joeellis Small code change to update the find_all_events code sample to the ne…
…w Rails 3.0 arel syntax
@parndt parndt Merged pull request #642 from joeellis/patch-2.
Small code change to update the find_all_events code sample to the new Ra
@parndt parndt If using mysql then restrict mysql2 to 0.2.x range when generating a …
…refinerycms based application. This is because MySQL 0.3.x is for >= Rails 3.1
@parndt parndt Prepare next version of Refinery for a likely new release today to fi…
…x MySQL2 issues on generate.
Commits on Apr 30, 2011
@srawlins srawlins Fixing issue 645. This change wraps the Ruby executable (and its abso…
…lute path) in quotes, as well as the entire command passed to Windows's CMD, if we're using Windows. `cmd /?` explains why those quotes are needed (it's lengthy).
@jpablobr jpablobr Raw html strings in shared partials should use 83146bd
@parndt parndt Merged pull request #647 from jpablobr/master.
Raw html strings in shared partials should use #html_save.
@parndt parndt Merge pull request #646 from srawlins/patch-1.
Fixing issue 645
Commits on May 01, 2011
@parndt parndt Specified future RefineryCMS versions in Gemfile. db483cc
@parndt parndt /registrations is now /users because it's far more appropriate. Devis…
…e safely upgraded to 1.3.x
Commits on May 02, 2011
@parndt parndt Replaced double quotes with single quotes where double quotes weren't…
… required.
@parndt parndt Ensure that everything added to before_inclusion and after_inclusion …
…exists and is callable.
@parndt parndt Make better use of refinery.before_inclusion in the authentication en…
@parndt parndt We don't need to manually require base, core or settings engines. The…
…y are required by the modules that require them that we already load.
@bitflut bitflut Refactor devise authentication_keys overwrite from devise initializer…
… to user model for better compatibility with devise standard configurations
@parndt parndt Merge pull request #649 from bitflut/master.
Fix for issue #648
@parndt parndt Remove old commented out code that we won't implement. b00e46f
@parndt parndt Minor speed improvements. 1c614d9
@parndt parndt Only need to require refinerycms-base when we're not requiring the en…
…tire stack already.
@veeti veeti Added Finnish translation files bcaf7d9
@veeti veeti Added Finnish translation for WYMEditor 7805178
Commits on May 03, 2011
@mhaylock mhaylock Fix image/resource picker redirect. Should fix GH-652. 04b9dfb
@parndt parndt Merge pull request #650 from rojekti/i18n_fi.
Added a Finnish translation
@parndt parndt Oops I did more and forgot to release earlier. 349189b
@parndt parndt Give the default frontend locale precendence in the list of locale fl…
…ags next to a page's title.
@parndt parndt Regenerated javascript translations with new Finnish one. cbe5dca
@parndt parndt New gemspecs for and for Finnish support files. db8cd71
@parndt parndt Changed example refinerycms-inquiries version to '~> 1.0' 1757cca
@veeti veeti Finnish translations for dashboard activity feed c37d63f
@veeti veeti Some changes in Finnish translations 31814a4
@veeti veeti Fixes and other changes in Finnish translation for authentication plugin 67707ed
@parndt parndt Merge pull request #655 from rojekti/i18n_fi.
Additions to Finnish translation
Commits on May 04, 2011
@veeti veeti Removed titleize from dashboard page titles
The reason for this change is localization: in many languages, the output of titleize is grammatically incorrect.

(In addition, edited the English locale so that the titles appear the same as before.)
@parndt parndt Attempt to maintain consistency now that we're not using .titleize - …
…Please check your locales.
Josef Šimánek Czech translation minor change 6102159
Commits on May 05, 2011
@parndt parndt Fix highlighting when page is requested using its id. 75a0d8a
@parndt parndt Refactored much of the internals of how menus and collections of page…
…s are generated and rendered. Menu is 3x faster for us when rendering a set of 600 pages. (ht: mhaylock)
@parndt parndt Merge remote-tracking branch 'zenchicken/master' 41a88c1
@rounders rounders Closes GH-658 0dac805
@parndt parndt Merge remote-tracking branch 'rounders/master' 094f877
@djones djones support the new Google Analytics site speed feature 5507ae4
@parndt parndt Make page_title not link when there is no url method to respond to. 7ed88db
@nruth nruth Adding a Gotchas section to the attaching to existing Rails app guide 5dc6fe1
@parndt parndt Using seo_meta 1.0.6 as a minimum for improved consistency. 95d8b6f
@parndt parndt Merged from master branch. f085e3d
Commits on May 06, 2011
@parndt parndt Merge pull request #663 from nruth/note_on_integrating_w_existing_app
Adding a Gotchas section to the attaching to existing Rails app guide
@parndt parndt Updated jquery.html5-placeholder-shim.js to latest from https://githu… d9e850a
@rounders rounders fix errors for heroku and duostack. closes GH-664 3306410
Commits on May 08, 2011
@rounders rounders added a section on caching on heroku 58acda4
@parndt parndt Merge pull request #665 from rounders/master
fix for heroku deployments (issue 664) and added section on caching to heroku guide
Commits on May 09, 2011
@parndt parndt Bundle updated. a1206e4
@leemcalilly leemcalilly Edited doc/guides/8 - Tips and Tricks/4 - How to setup Google Analyti…
…cs.textile via GitHub
@srawlins srawlins Fixing issue #662 by making the to_run string not be altered through …
…a "|", which removed the last character.
@bitflut bitflut Unclutter resource picker. Update german translation as we are not us…
…ing %{what} for the resource picker. Fix double style attributes on image picker tag by inserting into existing attribute.
@parndt parndt Merge pull request #666 from leemcalilly/patch-1
Edited doc/guides/8 - Tips and Tricks/4 - How to setup Google Analytics.t
@parndt parndt Merge pull request #667 from srawlins/patch-2
Fixing issue #662; the to_run string should not be altered through a '|'
@parndt parndt Merge pull request #668 from bitflut/master
Clean resource picker
Commits on May 10, 2011
@parndt parndt Implemented :translator role whereby a user is allowed access only to…
… update pages that not the default frontend locale.
@parndt parndt Strange, this should be executable. c56724b
@parndt parndt Merge branch 'master' into performance 3241473
@keram keram Fixed some loved typos ;-) e4e9c18
Commits on May 11, 2011
@parndt parndt awesome_nested_set is now a gem again, woohoo. 6286e41
@hvirring hvirring Upgraded to Dragonfly v0.9.0 and replaced aws-s3 with fog gem (requir…
…ed by latest Dragonfly)
Commits on May 12, 2011
@senior senior Fix for absolute URL links in refinery not working for SSL enabled sites 83d769d
@parndt parndt Whitespace apparently dd7d4fa
@parndt parndt Fixed grammatical error (it's -> its) 140eda3
@mchung mchung Updated docs 0a32bc7
@parndt parndt Merge pull request #675 from mchung/patch-1
Updated docs
Commits on May 13, 2011
@parndt parndt Merge branch 'master' into performance 29dd76c
Commits on May 14, 2011
@ugisozols ugisozols Merge branch 'master' of git:// 9c5c3ac
@ugisozols ugisozols Use arel style instead of dynamic finder. 77fbc07
@parndt parndt Merge pull request #679 from ugisozols/77fbc07e
Use arel style instead of dynamic finder.
Commits on May 15, 2011
@mhaylock mhaylock Change all objects with init functions to acknowledge 'initialised' s…
@parndt parndt Merge pull request #680 from mhaylock/master
admin.js init fix
@mhaylock mhaylock Loosened dependency on seo_meta and regenerated gemspec. 1b7cefe
@ugisozols ugisozols Use arel style instead of dynamic finder. a9b00c5
Commits on May 16, 2011
@endor endor area tags cannot be handled as block tags 5884097
@parndt parndt Merge pull request #681 from endor/master
area tags cannot be handled as block tags
@keram keram revert changes in ie7 hack 7ca536b
Commits on May 18, 2011
Hamish Evans awesome_nested_set documentation reference df45a8d
@parndt parndt Merge pull request #683 from ruby-fu-ninja/master
acts_as_nested_set documentation link
scambra allow to set conditions for image and resource pickers d725cdd
@keram keram Settings administration show scope of setting 7c4d087
@joeellis joeellis Edited doc/guides/6 - Updating Refinery/1 - How to update Refinery to…
… the latest stable version.textile via GitHub
@parndt parndt Merge pull request #685 from joeellis/patch-3
Edited doc/guides/6 - Updating Refinery/1 - How to update Refinery to the
@parndt parndt Merge pull request #684 from scambra/master
allow to set conditions for image and resource pickers
@keram keram settings title small refactoring 9450df9
Commits on May 19, 2011
@parndt parndt State of my mind for getting performance branch tests working. ea4b0cf
@parndt parndt Merge pull request #669 from keram/master
fixed typos
@parndt parndt Finally figured out that scope :in_menu was caching and not with_glob…
…alize. (ht: sbeam)
@parndt parndt Eager load :children and :slugs associations. 169748a
@parndt parndt Merge branch 'master' into performance 22d70db
@parndt parndt Merged master branch in, requiring next version of seo_meta. 755ee27
@parndt parndt seo_meta updated to 1.1.0 35862d6
@parndt parndt Merge remote-tracking branch 'origin/performance' 6552ebf
@parndt parndt Updated globalize3 dependency to >= 0.1.0.beta2 58cf58d
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.
@borisruf borisruf 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
@borisruf borisruf 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