Skip to content

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.
This comparison is big! We’re only showing the most recent 250 commits
Commits on Feb 17, 2011
@parndt parndt Chrome (atleast) got more strict about this and if you have a / in th…
…e selector then you need quotation marks.
@parndt parndt Fix support for -u and -p for specifying database username and passwo…
…rd. Added note about the installer ceasing to function if the username or password is incorrect. Closes GH-469
@parndt parndt Upped version to, added changelog entries and regenerated gem…
@parndt parndt Remove dependency on rack-cache because dragonfly already has one. Re…
@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
@BanzaiMan BanzaiMan Continuing work on Japanese l10n d21a47e
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.
@parndt parndt We don't want to play with the 'roadblock' files in a generator updat…
…e. Also we no longer worry about config/cucumber.yml because refinerycms-testing does that for us.
@parndt parndt Moved to a convention of _records and _actions to make up the index t…
…emplate. Completely backwards compatible but we'll make better use of these partials in future releases.
@parndt parndt Attempted to translate a missing zh-CN key. 4f5c5f2
@parndt parndt New gemspecs incorporating the files that were added. 66f7c62
Commits on Mar 10, 2011
@mdesantis mdesantis corrected ajax-loader.gif path 937bf3c
@parndt parndt Merged remote branch 'ProGNOMmers/master' 3909c00
@parndt parndt Ensure every engine has an initializer, rebundled. 29495b5
Jason Sypolt Added missing quotes to Gemfile fc8dc83
@parndt parndt Minor alignment change. 8d6ab85
@parndt parndt Now depending on refinerycms-generators ~> 1.0 50dbca9
Commits on Mar 11, 2011
@parndt parndt Don't offer to link to files when there are no files present. Made pa…
…ges_list id unique again and moved the CSS selector to a class name instead.
@parndt parndt Made the locale logic in page urls smarter using new logic available …
…in refinerycms-i18n
@parndt parndt Made the link tester fire with less delay but only on paste or blur e…
@parndt parndt Refactored the test_url method to use get_response which should be qu…
…icker and with less conditional code.
@parndt parndt Now the upgrade message actually does get disabled and when IE fails …
…to use the 'visibility' property we catch it and just hide the element instead without animation.
@parndt parndt We may someday want to update the moretea-awesome_nested_set dependen…
…cy to a higher version.
@parndt parndt The all important changelog. 8a40eed
@atj atj Ensure Refinery::I18n is defined in link_url_localised? 2b28909
Commits on Mar 14, 2011
@BanzaiMan BanzaiMan Most (if not all) of the rest of Japanese localization f73b4ca
@parndt parndt Improved performance in menu rendering when there are very many pages…
… by first querying the translations table and then using those results in the pages table rather than the other way around. There are still too many queries in the logfile for my liking so this has a way to come.
@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