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.
Commits on Jan 09, 2011
@bryanmtl bryanmtl gemlock ee40b0c
Commits on Jan 12, 2011
@bryanmtl bryanmtl Merge branch 'master' of git:// 1597354
Commits on Jan 26, 2011
@bryanmtl bryanmtl Merge branch 'master' of git:// 18bc6d1
@bryanmtl bryanmtl updates gemlock 596c260
Commits on Feb 16, 2011
@bryanmtl bryanmtl Merge branch 'master' of git:// 87ccfa8
Steven Heidel Restructured docs. f8cf31a
Steven Heidel Added some sample guides to help test things out. d8d6f43
Steven Heidel Merge conflict. d5a3ac8
Commits on Feb 17, 2011
@parndt parndt Well that's going to require a new version. 9ef927e
@parndt parndt So while dragonfly has a dependency of rack-cache it doesn't require …
…it so we should do it according to the docs.
@parndt parndt This note won't show in the next version. 1a70fe0
@parndt parndt Reduce line sizes for fixed width editors. aba071c
Steven Heidel Transfer over guides. 01603ff
@parndt parndt Moved some guides to different sections, updated verbiage 193add9
Steven Heidel Made some corrections for the new guides system. 9ce9035
@parndt parndt Merge remote branch 'stevenheidel/master' b93a9e0
@parndt parndt Licenses are important. b37047e
Commits on Feb 18, 2011
@parndt parndt Updated version number of Refinery CMS. b71ff2f
@parndt parndt Remove to attempt to fix git index e698e7d
@parndt parndt Really delete them, they'll come back. 38e36e1
@parndt parndt Told you they'd come back. c22edb1
Steven Heidel Now how did that happen? b91cd32
Steven Heidel Oops, missed a word that was causing some broken links. 51c8e6c
Commits on Feb 19, 2011
Phil Spitler added 'field' to some of the selectors and javascript to support mult…
…iple resources in a single engine
Steven Heidel Fairly obvious typo there. 25b2533
Commits on Feb 20, 2011
@parndt parndt Merge remote branch 'philspitler/master' 7c8fbfa
@parndt parndt Added _<%= field %> to current resource link, too. This fixes the iss…
…ue of the download link always being applied to the first resource picker on the form.
@parndt parndt Update for bugfixes. 04ca47c
Commits on Feb 21, 2011
@parndt parndt null doesn't always remove the background image. 22bb131
@parndt parndt Don't always use ruby executable when running commands. Closes GH-474. 5d62279
Steven Heidel New version of things. 5921457
Commits on Feb 22, 2011
@emptyflask emptyflask upgraded modernizr to 1.7, fixes a chrome issue 00b0c0d
@bryanmtl bryanmtl ability to customize wym editor on a page by page basis e0c68f1
@bryanmtl bryanmtl Merge branch 'master' of git:// 42a77b6
@bryanmtl bryanmtl ability to customize wym editor on a page by page basis ea84cf0
@bryanmtl bryanmtl Uses localized cache key if frontend translations are enabled aa1c49b
@bryanmtl bryanmtl uses after_javascript_libraries block to allow wym editor to be custo…
…mized on a page by page basis
@parndt parndt Merge remote branch 'emptyflask/modernizr' a91709f
@parndt parndt Updated acts_as_indexed. 6afbb7b
Commits on Feb 23, 2011
@tenderlove tenderlove correcting yaml problems 3cd6cdc
Commits on Feb 24, 2011
@parndt parndt Updated changelog, gemspecs. 026660c
@parndt parndt relocked 57f222c
@parndt parndt Ensure that page parts get appended inside the correct element and cl…
…ean up the dialog after closing it. Closes GH-477
@parndt parndt And document the last commit. 9451d7c
Steven Heidel New i18n please. bf0981b
@parndt parndt Please do use the gems. e3edae2
Commits on Feb 25, 2011
@caplod caplod body_content columns have padding with nested additional div layer 086abfc
Commits on Feb 27, 2011
@mdesantis mdesantis Improved italian translations 14d83ae
@parndt parndt More succinctly check the presence of a user's role inside has_role? 7c88ed7
Commits on Feb 28, 2011
@whatcould whatcould Menu performance fix: Do not cycle through all pages to find children…
… when current page has no children.

Uses nested_set's #has_descendents?, which uses left/right attributes on Page.
@whatcould whatcould No need to check whether child pages are #in_menu? because the entire…
… collection is only pages in the menu.

By default we fetch: @menu_pages ='lft ASC'). So we don't need to re-check later. I think we can rely on users to apply the same checks if they manually fetch a different set of menu pages.
@parndt parndt Merge remote branch 'ProGNOMmers/master' 644ad8e
@whatcould whatcould Page#[] method first checks to see if we'd like an attribute; if not,…
… it tries to fetch a page_part.

Previously any calls to nil attributes (eg page['parent_id']) would force loading of all the page_parts.
@whatcould whatcould Do not include :page_parts in default @menu_pages fetch.
It had previously been included as a performance crutch because page#[] inadvertently fetched all page_parts; after previous commit, this becomes unnecessary.
@parndt parndt Merge remote branch 'caplod/general_css_layout' 0c15f38
@parndt parndt Updated the changelog to document the changes we've had recently. b96948f
@whatcould whatcould Page#[] checks to see if argument passed is an AR attribute, but firs…
…t calling to_s on the argument.

Apparently the attributes hash has string keys. Previous commit was failing on some tests.
@parndt parndt Merge remote branch 'whatcould/master' f350c4a
@parndt parndt Ensure that rails.js is the correct one that we want. Closes GH-489 a5ccf42
Commits on Mar 01, 2011
@parndt parndt Added spec assertions to ensure that child page urls don't regress ei…
@parndt parndt Removed message from core controller about adding to this file, it di…
…dn't make sense anymore because it's wrapped up in our gem.
@simi simi Spork is working on Windows now 54bb622
mrstocks Edited doc/guides/7 - Hosting/1 - How to Install Refinery on Heroku.t…
…extile via GitHub
mrstocks Edited doc/guides/7 - Hosting/1 - How to Install Refinery on Heroku.t…
…extile via GitHub
@parndt parndt Merge remote branch 'mrstocks/master' 785d75e
Commits on Mar 02, 2011
scambra Fix menu_hide_children setting e0026aa
@simi simi Spork is working on Windows now b578b1a
@simi simi Czech Apply_Style wym translation 01d421a
@simi simi Czech translation WYMeditor - Insert 213c67e
@simi simi .gitignore - my favourite E-texteditor c1e436c
@peterz peterz Update sl locales for dashboard. 2c34152
@parndt parndt Merge remote branch 'simi/master' 8c46bcc
@parndt parndt Merge remote branch 'scambra/master' dd14920
@parndt parndt Based on latest version e857372
Commits on Mar 03, 2011
@parndt parndt Removed --update command from bin/refinerycms installer.
This is because we don't mess around with the project's files anymore so we no longer need to automate anything.
Updating happens just like many other gem based projects.
@parndt parndt Added specs to page which ensure that reserved words are working prop…
@parndt parndt Reserved words can't have underscores in them because these are dashe…
…rized. Improved specs. Closes GH-428
@simi simi Another WINDOWS and DRY stuff 0246a6b
@simi simi Yoda conditions like matcher in web step. Patch sent to cucumber-rail…
…s also.
@parndt parndt Merge remote branch 'simi/master' 14aed40
Commits on Mar 04, 2011
@djones djones fix 1px line seen below selected menu item in Safari on iOS ad8faa7
@parndt parndt If there is a link_url assigned to a page and someone visits that pag…
…e they should get redirected to the link_url instead. E.g. /contact-page redirects to /contact which will know better how to present itself.
scambra update spanish translation 2208021
@parndt parndt Clean up English YAML for core engine. 7473d66
@parndt parndt Merge remote branch 'scambra/master' cb86424
Commits on Mar 05, 2011
root Slovak translation 9d8b999
@parndt parndt Added guide on how to attach Refinery CMS to an existing Rails applic…
@parndt parndt Made bundle install more obvious, converted first shell to ruby code. 19c1509
@parndt parndt Pushed rails dependency up to 3.0.5. Closes GH-505 b2cc5a7
Steven Heidel Fix broken links caused by document move. Closes GH-507 9135da1
Commits on Mar 06, 2011
@parndt parndt Merge remote branch 'keram/i18n_sk' 4c407f3
@parndt parndt Fixes so many issues on IE with WYMeditor for example no more resize …
…controls on paragraph tags and also Closes GH-433. (ht: mrlundis)
@parndt parndt Refactored the installer slightly to avoid calling the entire refiner…
…ycms stack on an installation (which usually results in version mismatch for some dependency), regenerated gemspecs to include new files.
@parndt parndt The config/database.yml.mysql template should contain mysql2 adapter. 8eebdc2
Commits on Mar 07, 2011
@parndt parndt Added support for --ident in the installation task which uses ident a…
…uthentication at the database level by commenting out the username and password credentials. Closes GH-506 (ht: radar)
@parndt parndt Added custom_title as a field that gets translated. Closes GH-504 326010c
@parndt parndt Fixed the styles dialogue for WYMEditor in IE and made it function mo…
…re consistently in all browsers.
@parndt parndt Increased friendly_id_globalize3 requirement to 3.2.1 which Closes GH… 092e18d
Commits on Mar 08, 2011
@parndt parndt Switch to the website under the context of the default frontend local…
…e if supported.
@parndt parndt Strip out the locale from the path properly so that pages match prope…
…rly in other locales, if supported.
@parndt parndt Fix small doc typo 9ca153f
@parndt parndt Switch to file_store as cache store for syncronisation purposes with …
…passenger. Closes GH-462
@parndt parndt Ensure that the migration doesn't fail if the field already exists. 0d323bb
@parndt parndt Call super and then change behaviours if we need to rather than reimp…
…lementing the method completely and changing it slightly.
@parndt parndt add :multithread => true to the Rails.cache calls. e4ec0f5
@parndt parndt Update version to and update dependencies. 9820f40
@parndt parndt Updated changelog per changes. 04902f6
@parndt parndt We also added --ident support. 6fc94ec
@parndt parndt Added release date 3dee550
@parndt parndt Fixes an issue that caused installation to fail on some systems that …
…can't require a Pathname. Only refinerycms and refinerycms-base are at, the others are at
@parndt parndt Updated changelog for 56ac725
@simi simi Added option per_page to crudify used in administration only b1fa9fc
@parndt parndt Merged + whitespaced. e2524ef
@parndt parndt Deprecated the rake refinery:update task in favour of rails generate …
…refinerycms --update which handles migrations correctly.
@parndt parndt Added options[:database][:skip] which relates to --skip-db to cause t…
…he installer not to run any database tasks (or subsequently rails generate refinerycms task). Defaults to false to maintain current functionality. Closes GH-512
@parndt parndt Documented the recent changes in the changelog. 6c7d61b
@parndt parndt Exchanged (help) links for the information.png 'refinery icon'. This …
…will happen automatically if you used refinery_help_tag.
Commits on Mar 09, 2011
@hone hone looser bundler dependency like rails3
bundler 1.x promises to be backwards compatible with 1.0.
@hone hone update the bundler dependency for gemspec.rb as well 5ace097
@parndt parndt Ensure :per_page has a default value and that it will either evaluate…
… to true or false not, say, 20.
@parndt parndt Ordered the default attributes in crudify alphabetically. edc21fe
@parndt parndt Apparently I fail at alphabet. I comes before O. fb5827b
@parndt parndt Added xhr_paging as an option in crudify which handles the server-sid…
…e usage of the HTML5 History API (or some other thing that's requesting the index page via xhr request).
@parndt parndt Updated refinerycms-i18n to - Closes GH-515 769752f
@parndt parndt Implemented non-cached html5 pagination which doesn't have the browse…
…r bugs we used to have. Closes GH-425
@parndt parndt may be identical to 1.0.0 - Can everybody PLEASE test this ve…
…rsion in all platforms and all browsers that they can to track down any lingering bugs since releasing a buggy 1.0.0 is embarrassing ;-) If we think of anything else that should go into 1.0.0 then we'll just keep pushing new versions until everybody agrees.