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 Apr 01, 2011
@parndt parndt We are no longer specifying loose dependencies on refinerycms 'core' …
…gems, now it's like '=' not '~>'
@parndt parndt Remove one more place where core knows about pages and move it to pag…
…es instead.
Commits on Apr 02, 2011
@zenchicken zenchicken Improve robustness of Page#expire_page_caching for both ActiveSupport…
…::Cache::FileStore and ActiveSupport::Cache::MemoryStore
@zenchicken zenchicken helps to fill in todos, even when tired. Ensure user is notified of u…
…nsupportive cache store on failed Rails.cache.delete_matched
Commits on Apr 03, 2011
@itgod itgod optimizing locale index size 880f1dd
@itgod itgod allow locales like zh-CN 599edef
Commits on Apr 04, 2011
@parndt parndt Merge remote branch 'willrjmarshall/resource_picker_patch' 9855200
@parndt parndt Use faster seo_meta 1.0.3 e9d9002
Commits on Apr 05, 2011
@rocksolidwebdesign rocksolidwebdesign Added proper calls to reset_column_information in the migrations c2957c5
@rocksolidwebdesign rocksolidwebdesign Added reset_column_information calls to appropriate self.down methods…
… in the migrations, small namespace fix for a missing :: prefix
@rocksolidwebdesign rocksolidwebdesign Updated so rollback STEP=18 works, better at least d0b41f7
@rocksolidwebdesign rocksolidwebdesign Fixed all rollback migrations d1cd5c2
@parndt parndt Document what has changed. 17e5999
@rocksolidwebdesign rocksolidwebdesign Fixed some locale related stuff in the page model/controller. Closes 563 7db3cc4
@parndt parndt Merge remote branch 'rocksolidwebdesign/master' 4773626
@rocksolidwebdesign rocksolidwebdesign Added all locale pages to sitemap except hidden pages and drafts. Clo…
…ses GH-585. Closes GH-586.
@parndt parndt Merge remote branch 'rocksolidwebdesign/master' 2684e8c
scambra Fix overriding cache_menu, if cache_menu was enabled globally you cou…
…ldn't disable it in a render :partial call

Enable to override request.path in cache name, so cache can be shared for all requests. I use a top menu with hidden children and selected item is not relevant, so that menu can be shared for all requests.
@parndt parndt Now that we've sorted out our issues with memory_store default to tha…
…t for caching. Removed File.writable? test for caching (if you implement file caching you already know it's writable).
@parndt parndt Updated the update tutorial with a clearer warning. Closes GH-589 59fb7b6
@parndt parndt Refinery on Rails 3.0.6 (upped requirement to Rails 3.0.6 - see http:… c8bc1c6
Commits on Apr 06, 2011
@parndt parndt Ensure file creation specs clean up after themselves. ed89dc4
@parndt parndt Cucumber now cleans up files and images and destroys them rather than…
… just a SQL delete which allows hooks to run (like the ones that clear out the uploaded files).
@mhaylock mhaylock Re-enable cache when logged in, this avoids slowdown of site when adm…
…in logged in.
@parndt parndt master should be one version ahead. dcace7c
Commits on Apr 07, 2011
@rweng rweng fix for
…and others who use nested scopes in routes.rb
@parndt parndt Updated changelog for the impending release of 0a3bc84
Commits on Apr 08, 2011
@adamico adamico ignoring vendor/ruby 2556094
@adamico adamico Closes GH-591, adding say and say_with_time to migrations 1c5c0c8
@parndt parndt tmp wasn't ignored properly. 6c55f82
@parndt parndt When we load parts we should load their translations too. 191d8d5
@parndt parndt Rather than mapping in memory we can use ARel to select the Page::Tra…
…nslation#page_id column and make Page think it's the Page#id (which it is).
scambra fix will_paginate params, changing page in link_to dialog keeps your …
…resource option selected
@parndt parndt No reason to specify on separate lines. 7bec685
@parndt parndt Git sourcing globalize3 for now. 5e1f8da
Commits on Apr 09, 2011
@parndt parndt We can just call the method rather than putting the call inside a mod…
@parndt parndt Merge remote branch 'scambra/fix_paginating' 1ea89f9
@parndt parndt Merge remote branch 'adamico/master' 44dfef0
Commits on Apr 10, 2011
@parndt parndt Incremented version to 50b1f78
@parndt parndt Don't need logger.warn, just warn. b648570
@parndt parndt Sped the menu up somewhat. Around 33% in my tests. It's still slow. db26d74
@parndt parndt Using basic Fiber concurrency I'm seeing faster render time (as repor…
…ted by web browser + rails server). Includes wee shim for < 1.9
Commits on Apr 11, 2011
@koa koa mass-assignment-protection implemented da1fb97
@koa koa fixed mass assignment protection for initializing with a seed 6ed1a07
@koa koa Merge branch 'master' of git://
@ringods ringods Extended S3 guide to explain setting the environment variables 0b8740f
scambra validate html link tag for home css, theme attribute is not valid 0a7cefc
@koa koa Fixes in mass assignment protection dc7d268
@koa koa comment improved 4499d44
@koa koa Included seo_meta with mass assignment protection e6e5d0b
Commits on Apr 12, 2011
Pascal Van Hecke first little modification to Getting started guide as test dcfcf72
Pascal Van Hecke Inserted links in the Getting Started Guide to the 8 orphan docs at h… 77a5c7b
Pascal Van Hecke Corrected a mistake in the footnote syntax f23e724
Pascal Van Hecke Github doesn't seem to render footnotes with an anchor - trying to co…
…rrect by adding an extra ID
Pascal Van Hecke Github doesn't seem to render footnotes with an anchor - trying to co…
…rrect by adding an extra ID
Pascal Van Hecke Github doesn't implement footnotes correctly according to the Textile…
… markup definition... giving up, will try to submit a bug request with them
@parndt parndt Merge remote branch 'scambra/validate_html' 5a0d7c5
Commits on Apr 13, 2011
@parndt parndt Merge remote branch 'koa/master' a8258be
@parndt parndt Fixed faults with pages and their titles in the admin listing. Also f…
…ixed inconsistent i18n locale application by updating to refinerycms-i18n 1.0.0 which closes #592
@parndt parndt Cleaned up diff whitespace. a5b9e06
@ugisozols ugisozols There's no need for page crud in pages dialog controller. c523e6b
@ugisozols ugisozols Remove some deprecation warnings and code related to them. f2970ed
@ugisozols ugisozols Remove /admin catch all route. 0fb6690
@lurcio lurcio Added Strip Non Ascii preference to has_friendly_id 059f47a
Josef Šimánek Support for models in modules for crudify 12a0977
Josef Šimánek Support for models in modules for uncrudify 04a96a2
@parndt parndt Merge remote branch 'SmartMedia/master' 55a1b46
@parndt parndt Merge remote branch 'ugisozols/master' d2427cf
@parndt parndt Re-deprecate css_for_menu_branch so that people know there's a better…
… alternative until 1.1 when it becomes the only option.
Commits on Apr 14, 2011
@parndt parndt Update version in guide and hint that it may not be the latest. de61265
@minikomi minikomi Add new page parts dialog should remain in the dom to allow multiple …
…new parts per save
@parndt parndt Working fine on Rails 3.0.7.rc1 - all specs/features pass. 29a2063
@parndt parndt Merge remote branch 'minikomi/master' which closes #615 0358c12
@keram keram Edited core/public/javascripts/wymeditor/jquery.refinery.wymeditor.js…
… via GitHub
Commits on Apr 15, 2011
@parndt parndt Updated changelog for Should be the last one before 1.0.0. 210f1e1
@parndt parndt I get a 12-15% speed improvement by managing our own each_with_index …
…rather than using render partial with :collection
@parndt parndt Gets rid of a large amount of SHOW TABLES commands. 6eb6c2e
@mhaylock mhaylock Fixed Refinery.root, Fixed generator templates, Added refinerycms-i18…
…n generator to refinerycms generator if i18n is included.
@kranthicu kranthicu Add page part was not funtional after a page part is added. Added the…
… ability to add mulitple page parts
Josef Šimánek DRY'ed and improved (un)crudify 7b50ffe
Josef Šimánek stick back to Rails3 behaviour f9a778d
Josef Šimánek crudify documentation improved 3204a86
@parndt parndt Merge remote branch 'kranthicu/master' f774a71
Commits on Apr 16, 2011
@parndt parndt Updated changelog, bumped version to and changed Rails depen…
…dency to ~> 3.0.7.rc2
Commits on Apr 17, 2011
@parndt parndt Fix bad intentation 564006f
Commits on Apr 18, 2011
@keram keram fix f4ad700
@keram keram fix 2 fced2ca
@keram keram fix 2 f9f179b
@parndt parndt We don't really need the rdoc dependency. bc57afc
@keram keram Fix image dialog pagination when is uploaded new image. see https://g… 83432b9
Commits on Apr 19, 2011
@parndt parndt Merge remote branch 'keram/master' and manually applied a patch. Closes 8e5cc14
Josef Šimánek Migrate to stable Rails 3.0.7 9cb46e4
Commits on Apr 20, 2011
@parndt parndt WIP, failing tests 92b4f3c
@parndt parndt Double up on caching and remove selected_item because it is slow. Als…
…o using page.children rather than {|p| p.parent_id ==} because (surprise) it's way faster. Fixes #604
@parndt parndt Fixed one failing test by performing the conditions on the translatio…
…ns table.
Commits on Apr 21, 2011
@ugisozols ugisozols Use let() in rspec specs. fcdb18a
@parndt parndt Updated to 0a93079
@parndt parndt Ensure pages are created in the correct locale if one wasn't supplied…
…. Fixes #593
@parndt parndt Merge branch 'master' into performance 630848b
@ugisozols ugisozols Incomplete specs for core/lib/refinery/plugin.rb. a299be4
@parndt parndt Fiber doesn't like locale switching so disabled that, also ensured th…
…at we are displaying children that are .in_menu
Commits on Apr 22, 2011
@parndt parndt Updated to a0b44d1
Josef Šimánek Slovak WYMeditor c00ab84
@ugisozols ugisozols Merge branch 'master' of git:// 3d95fb2
@ugisozols ugisozols Second stab at plugin specs. 93e5792
Commits on Apr 26, 2011
@ugisozols ugisozols Store i18n translations for specs in memory. d530a38
@ugisozols ugisozols Another stab at plugin specs. efff352
@bitflut bitflut Allow multi-line on body.login header h1 to be displayed correctly 21125ee
@bitflut bitflut Update wymeditor's german translation so it needs only one row to ren…
…der (like the english locale)
@bitflut bitflut Reject public/javascripts/cache in lib/gemspec.rb and rebuild refiner…
@bitflut bitflut Show username in plugin activities of refinery_users on dashboard 5103787
@parndt parndt Only link when the object can respond to the url method. 75aef92
@samsonasu samsonasu Create db/seeds.rb if it doesn't already exist when generator is run ad3a14c
@parndt parndt Merged pull request #641 from samsonasu/master.
Generator crashes in an existing app when no db/seeds.rb exists
Commits on Apr 27, 2011
@zenchicken zenchicken Use a slightly more sensible approach - clear entire cache if Rails.c…
…ache#delete_matched isn't supported (say in Memcache)
@zenchicken zenchicken Merge branch 'master' of git:// f6c3b81
@parndt parndt Let's have mysql2 available for RefineryCMS development, I haven't he…
…ard of anyone having issues installing this gem.
@parndt parndt No more fibers. Fixes #634 8df47a1
@parndt parndt Merged branch 'master' into 'performance'. 83db298
@ugisozols ugisozols Merge branch 'master' of git:// d471f02
@parndt parndt The minimum requirement for Dragonfly is now version 0.8.4 - in futur…
…e we'll update to 0.9.x too
Commits on Apr 28, 2011
@parndt parndt Updated jQuery to 1.5.2. Fixes #638 3065220
@parndt parndt Updated rails.js to the latest HEAD 6b6d15b
@parndt parndt Rebundled with Dragonfly 0.8.4 c8ef97e
@parndt parndt Fixed indentation 7f051ff
@parndt parndt Also reject public/stylesheets/cache (or public/anything/cache) 16c95a5
@parndt parndt fixed indentation 41c54dc
@parndt parndt Clean up whitespace diff fe19c54
@parndt parndt Fixed the menu highlighting tests once more 6bc0432
@parndt parndt Merge branch 'performance'. Fixes #637 a39b7af
@parndt parndt Any version of mysql2 greater than 0.2.x (e.g. 0.3.x) will break unti…
…l Rails 3.1
@parndt parndt Updated to latest seo_meta and added support code to make it save pro…
…perly. Fixes #623
@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