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
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 Mar 14, 2011
@parndt parndt We shouldn't still be storing the translated fields from pages on the…
… pages table.
@parndt parndt Made the Page#in_menu query less ugly while achieving the same result. da7fff5
Commits on Mar 15, 2011
@nurbs999 nurbs999 updated update-guide to refinerycms- 0b25410
@nurbs999 nurbs999 updated update-guide to refinerycms- 7c2e3e8
@parndt parndt Merge remote branch 'BanzaiMan/japanese' 530ef0d
@parndt parndt Added caching back to pages and the menu (DISABLED BY DEFAULT). Also …
…changed the backend pages rendering to operate more like the frontend with a collection that gets passed around. Closes GH-524
@parndt parndt Added Page#by_title scope to handle the tricky process of finding a p…
…age based on its translated title and mapping it as an actual page.
@parndt parndt Updated to use Page#by_title instead of Page.where(:title => title) b…
…ecause the former actually works.
@parndt parndt Ensure the site bar uses the backend locale. a771c0a
@parndt parndt Modified japanese keys to fix with new structure, cleaned up to suppo…
…rt Psych better.
@parndt parndt Updated changelog. d85c01a
@parndt parndt Prepared support files for a release. a24437a
@BanzaiMan BanzaiMan The last two Japanese messages fefd34b
@parndt parndt Merged remote branch 'BanzaiMan/japanese' into 'master' 3d1562d
@parndt parndt not, added see full list to changelog. 8fe6637
@BanzaiMan BanzaiMan Add missing critical single quotes 5d0da04
@BanzaiMan BanzaiMan No need for this patch 26d1c91
@parndt parndt Merge remote branch 'BanzaiMan/japanese' 8cac9b4
@parndt parndt Don't cache when logged in. 1cb139c
scambra fix typo in sortable list view a395740
Commits on Mar 16, 2011
@atj atj Check Refinery::I18n is defined in site bar helper and partial 57ef8bc
@parndt parndt wrapped up site bar translation locale logic into a method. c686251
@parndt parndt On initial database creation we don't need to remove the custom title…
… as it's removed by the very next migration (and AR doesn't reload in between different migrations so it would break it)
@parndt parndt Removed join to translations table which should a) run faster and b) …
…not display duplicate entries in the results and c) Closes GH-532
@parndt parndt Prevented index action on pages backend from inheriting the locale fr…
…om the 'just-saved' @page variable but instead use the locale that was intended.
@parndt parndt Removed config/settings.rb file so that we don't overwrite other peop…
…les'. Plus now we have config.after_initialize to handle this stuff gracefully through Rails. Closes GH-534.
@parndt parndt Avoid potential conflicts with 'refine' in Ruby 2.0 13ea3d7
@parndt parndt Create a default features/support/paths.rb file in the Rails.root for…
… the developer to write their own paths specific to the application and not any engine. Closes GH-531
@parndt parndt Preparing for a soon. 57db6aa
Commits on Mar 17, 2011
@BanzaiMan BanzaiMan better translation for "hidden" for this context 2d3c08d
@parndt parndt Merged remote branch 'BanzaiMan/japanese' 17636c7
Commits on Mar 18, 2011
@BanzaiMan BanzaiMan First pass at Japanese translation for wymeditor text cc31c05
@BanzaiMan BanzaiMan "Emphasis" is really "Italics" c9d5031
Commits on Mar 19, 2011
@ugisozols ugisozols Fix links in readme. 5a87894
Commits on Mar 20, 2011
Steven Heidel Merge branch 'japanese' of 73e9b95
Steven Heidel Merge branch 'master' of 701066b
@adwinsky adwinsky Fixed typo in polish translation bcf1d26
Steven Heidel Edited doc/guides/1 - Getting Started/1 - Getting Started with Refine…
…ry.textile via GitHub
Commits on Mar 21, 2011
@parndt parndt Cast the split result as a string to ensure it is. 497d96b
@parndt parndt Merge remote branch 'boooz/master' 12215a1
@parndt parndt Replaced overriden render call with alias_method_chain which Closes G…
…H-527. (ht: breccan)
Commits on Mar 22, 2011
@parndt parndt Added support for cucumber-rails 0.4.0 (up from 0.3.2) c4ccc8f
@djones djones we made it to 2011. Update the license and readme dc8ae89
@parndt parndt We're all updated now to cucumber-rails 0.4 so we'd better enforce it…
… in the testing gem.
@parndt parndt Re-bundled, updated example gem versions. ccd508f
@parndt parndt Allow Rails 3.1 to function better. 6ad4dfa
scambra Add respond_to? because Presenter responds to more methods with metho…
scambra Add an option to link to object and ancestors in page_title 99a56ad
@parndt parndt Make the logic simpler to read. c4facc3
@parndt parndt Specify latest version in guide. 4be1115
@parndt parndt The features should be tagged @authentication after the name of the e…
@parndt parndt Instead of monkey patching asset_file_path I've moved to an alias_met…
…hod_chain that uses it. Also refactored asset_file_path_with_refinery to use pathnames.
Commits on Mar 23, 2011
@parndt parndt Updated the changelog with and information. f5fa19f
@parndt parndt Updated version to for whenever the next release is. ef2395d
@parndt parndt Differentiate between backend and frontend site_bar features using @s…
…ite_bar_frontend and @site_bar_backend
@parndt parndt Added support for translating javascript strings. Added the confirm c…
…hanges string. Closes GH-541
@parndt parndt The alias_method_chain is giving me issues in development mode, comme…
…nting it out until I can find a permanent solution.
scambra Translate styles in wymeditor 15d7a09
@parndt parndt Merge remote branch 'scambra/master' 323b8f7
@parndt parndt Whitespaaaaaaaace! WHITESPAAAAAAAACE! 76abe06
Commits on Mar 24, 2011
@parndt parndt There is no such thing as cucumer-rails. cucumber-rails exists, however. a7384ee
@parndt parndt Ensure Refinery.root is always accessible. (ht: jamesfid) ad34534
@parndt parndt Don't serve up non-existant translations.js file (ht: rbriank) 5fa4bd8
@parndt parndt Pages now defines how it finds the menu so that if pages is gone ever…
…ything doesn't blow up. We'll move to a NotImplementedError pattern in more places, too.
@parndt parndt Shorten line. b1ad83f
scambra fix applying styles in wymeditor, was breaking on adding title to rules 3a75b2d
Commits on Mar 25, 2011
@parndt parndt Hide the flash completely when the animation is completed. Closes GH-539
@parndt parndt Fix site bar switch link. e735270
@parndt parndt New architecture around how pages functions get into the application …
…controller. I've added hooks that you can use by calling refinery.on_attach do inside your Rails::Engine subclass. Fixed stack level too deep errors.
@parndt parndt regenerated gemspecs b602d17
@parndt parndt The Refinery.root must be a pathname. d0d61d9
@parndt parndt Updated changelog e6060ed
@ugisozols ugisozols Remove password_salt field from users table and comment out config.en…
…cryptor. Closes GH-558
Commits on Mar 26, 2011
@parndt parndt Modified to support Devise 1.2, no more pepper required and no longer…
… have to specify bcrypt. Updated authentication gemspec to require atleast devise 1.2 because on 1.1 these changes will be incompatible.
@parndt parndt Lock devise to 1.2.x to ensure that we don't get 1.3 causing 1.2-like…
… issues.
@parndt parndt Updated to to handle devise issues. 9adc53d
Commits on Mar 27, 2011
@parndt parndt Automatic relock file. 0355f50
@parndt parndt logged_in? -> user_signed_in? (ht: keram), Closes GH-562 09c4c66
@mhaylock mhaylock Fixed grammatical error "managers -> manages". 3d567c3
@parndt parndt Please update to refinerycms-i18n and run 'rails generate re…
…finerycms_i18n' overwriting 'config/i18n-js.yml' when prompted. Closes GH-551
@parndt parndt Preparing for next version cd09433
@parndt parndt Relocked to 12f25d6
@parndt parndt Intentionally break the user's password to invoke the invalid hash er…
…ror so that the password can be reset (thanks to Devise changing password_salt)
@parndt parndt Specifying the current versions ( 11b9d52
Commits on Mar 28, 2011
@parndt parndt How do I use refinerycms-testing? Now you know. b681be5
Tony Collen fix links to crudify docs 73b7ff4
@parndt parndt Seeing as 'bin/refinerycms' is only used for new applications now we …
…don't really need to backup the Gemfile.
@parndt parndt We don't pass a different command to generate! anymore. a82a32d
@parndt parndt Define login as login? only if login is not defined. Makes more sense…
… than a ternary here.
@parndt parndt State true plugin version in register block. 0e27777
@parndt parndt Preliminary support for HTML5 elements in WYMeditor. Currently 'comma…
…nd' is being removed and 'wbr' loses its closing tag.
@parndt parndt Sample adapter should default to mysql2. 02c20a6
@parndt parndt Added 'refinery.before_inclusion' and 'refinery.after_inclusion' (ren…
…amed from 'refinery.on_attach') to hook into Refinery or Rails before or after Refinery's inclusion into Rails (fires inside the Refinery::Application.refinery! method).
Commits on Mar 30, 2011
@nickhammond nickhammond append the port to the path on the welcome page 9cb21d9
@parndt parndt Update guide to f80522b
@nickhammond nickhammond wbr is an inline tag, fix typo in css 2eb5576
@nickhammond nickhammond make labels for all html5 entities, add in styles to the editor e2becfc
@parndt parndt Merge remote branch 'nickhammond/master' 41fec6d
@parndt parndt Not sure why this changed. b51798f
@parndt parndt Looked into it and we can use a few methods on request to handle prot…
@parndt parndt Discourage sudo, show latest version. bfe7dce
Angelo Grossini Fix javascript error when closing the link window 5f76c00
@parndt parndt Added plugin 'seo_meta' to project, replacing our handling of meta ta…
…gs. Sooo meta.
@parndt parndt Document introduction of seo_meta cb74c8c
@parndt parndt 1.8.7 does not accept arguments after a splat (ht: radar) d31d2e7
@parndt parndt Lock to latest versions d889fa1
@parndt parndt wrap up for release. a12c8c0
@parndt parndt Improve the description of refinerycms-base. 61d7143
@mhaylock mhaylock Fixed 'setings' spelling mistake. 2095d48
Commits on Mar 31, 2011
@willrjmarshall willrjmarshall Patching the resource_picker d93b148
@willrjmarshall willrjmarshall Second bug fix, upping the patch # by one so bundler will actually work 7da74a3
scambra fix spanish translation of wymeditor 3aa29d7
scambra fix asset_file_path, it was ignoring application assets which existed…
… in refinery too, like application.css
scambra set lang attribute in html tag using I18n.locale for IE 85c3df3
@parndt parndt acts_as_indexed updated. d99f052
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
@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
@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