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 Jan 28, 2012
@joshnuss joshnuss update icons when reordering pages 26bbf1f
@joshnuss joshnuss fixed route for accessing a page's children when there is multiple le…
…vels of nesting
@parndt parndt Merge pull request #1261 from DynamoMTL/update-icons-when-sorting
update icons when reordering pages
@parndt parndt Merge remote-tracking branch 'DynamoMTL/bugfix-subpage-nesting' 79dd0a6
@parndt parndt Merge branch 'master' into namespace
Commits on Jan 29, 2012
@parndt parndt Test with 1.8.7 and not ree or 1.9.2 fd3f5d9
@parndt parndt Now I remember why I switched to ree, no random segfaults. f2908b4
@parndt parndt Get rid of warnings by updating to the new generator_spec version con…
…taining my patch.
@parndt parndt Using edge of globalize3 for better Rails 3.2 support and letting ref…
…inerycms-core.gemspec handle sass-rails and coffee-rails versions.
@ugisozols ugisozols Merge branch 'master' into namespace 1a86ed2
@ugisozols ugisozols Fix failing specs. 5e65c35
@ugisozols ugisozols Devise 2.0 has been released. 7ee1370
@parndt parndt Correct some inconsistencies in the wymeditor file. 86f9ee7
@parndt parndt use inArray where we were using multiple || 8e9198f
@parndt parndt replace set_table_name with self.table_name = c91cd16
@harley harley fix js syntax error in jquery.refinery.wymeditor.js introduced earlie…
…r at 86f9ee7
@parndt parndt Merge pull request #1263 from harleyttd/master
fix js syntax error in jquery.refinery.wymeditor.js introduced earlier at 86f9ee7
Commits on Jan 30, 2012
@parndt parndt Completely clear table cache after messing with meta information. 568ea3f
@parndt parndt Converted wymeditor to erb for #1202 ab34249
@parndt parndt Added configurable whitelist tags to WYMeditor which fixes #1202 f44241e
@parndt parndt Fix the case where normal trees don't have icons and look awkward. 47e1033
@simi simi Generated refinery initializers are all stored in config/initializers…
…/refinery directory

- config/initializers/refinery/core.rb
- config/initializers/refinery/images.rb
- config/initializers/refinery/pages.rb
- config/initializers/refinery/resources.rb
@ugisozols ugisozols Merge pull request #1265 from simi/initializer_dir
Generated refinery initializers are stored in config/initializers/refinery directory
Commits on Jan 31, 2012
@simi simi Methods for adding custom backend assets inside core.rb initializer
register_javascript and register_stylesheet macros are used for this
heavy inspired by Greg Bell's awesome active_admin
@simi simi Don't render array 524d42a
@simi simi Fixing initializer asset macros 97d64d8
@simi simi We need two javascripts yields back dca29e5
@supairish supairish Added ability to preview new or existing Pages 867ad8d
@supairish supairish only allow previewing on Refinery::Pages 36f7ccd
@supairish supairish Preview request specs 64ea670
@parndt parndt Fixed 'DEPRECATION WARNING: Passing the format in the template name i…
…s deprecated. Please pass render with :formats => [:html] instead.'
Commits on Feb 01, 2012
@parndt parndt Merge branch 'master' into namespace 7b26d21
@parndt parndt Updated routes for custom assets 073214f
@parndt parndt Specs are now passing for me with new changes. a94f9ba
@ugisozols ugisozols Bump factory_girl_rails and guard-rspec versions. 0cbfc82
@simi simi Fixed refinery edge template 3f7d929
@ugisozols ugisozols Merge pull request #1272 from simi/template
Fixed refinery edge template
@simi simi New line after mounting engine in routes.rb a5ac485
@parndt parndt Merge pull request #1273 from simi/template
New line after mounting engine in routes.rb
@parndt parndt Update new engines' routes. 9ff25e4
@parndt parndt Attempt to update the form generator's routes. 3ce2fd0
@parndt parndt 1.8.7 not ree edee47d
Commits on Feb 02, 2012
@parndt parndt Remove wrongly merged templates. be1a023
@parndt parndt Enforce globalize3 atleast beta7 a232c83
@parndt parndt Remove wrongly merged spec file. 890e45d
@parndt parndt engine_plural_name should short circuit back to engine_name if the us…
…er wants to override it.
@parndt parndt Fix case where --engine simi would create --engine simis f2ad1ea
@parndt parndt Fix generator where it shouldn't have been plural. 079b9ca
@simi simi New --skip-frontend option for refinery:engine generator
It will skip all frontend stuff (views, controller, routes, adding a new
page and also it skips some links in admin views)
@simi simi fixing merge mistake :( fdf7eac
@simi simi routes.rb typo (not sure who made it) e1aa8bd
@simi simi Fixed simple engine generator 6c490e4
@simi simi Fixing namespacing issues for generated engine eec3fbf
@simi simi Plugin name is generated from refinerycms and namespace d9f985b
@simi simi Fixing db:rollback for generated engine migration 41d9f61
@simi simi Add generated engine namespace into admin url cc1d90d
@parndt parndt Insert the namespace into the admin path if it's different to the plu…
@parndt parndt Use thor for inserting the gem line into the application's Gemfile. N…
…ow uses Bundler.default_gemfile to accurately find that Gemfile.
@simi simi Fixed generated tests for new routing f28f947
@parndt parndt Merge pull request #1275 from simi/generated-tests
Fixed generated tests for new routing
@simi simi More descriptive generated engine migration name 96264de
@parndt parndt Delete the vendor/engines/<engine> directory when it's completely emp…
…ty after destroying the extension.
@parndt parndt Merge pull request #1277 from simi/generated_migration
More descriptive generated engine migration name
@parndt parndt Require at least globalize3 beta8 with the hope that it fixes rbx+mys…
…ql compatibility.
@ugisozols ugisozols Don't load seed when running engine migration instead append seed exe…
…cution line to main app seeds file.
@ugisozols ugisozols Cleanup migrations. 1afe8a2
@parndt parndt Allow s3 properties to be set in core then allow overriding in either…
… images or resources separately.
@ugisozols ugisozols We won't copy any seeds to db/seeds/ so we don't need the code which …
…would load those seeds.
@parndt parndt Run non JS tests first so that we're not holding open a web browser. fc73bf1
@parndt parndt Fix for 1ecf80c a8abbd0
@radar radar Add a description for mounting Refinery's routes 225a8dd
Commits on Feb 03, 2012
@parndt parndt Added a setup hook for extensions to use to launch custom generators …
…or copy support files needed for their extensions to test properly.
@parndt parndt Generate support files required for creating a dummy app and testing …
…with it for isolated extensions.
@supairish supairish Merge remote-tracking branch 'upstream/master'
@supairish supairish refactored against upstream namespace changes, removed exception catc…
…hing in preview action, fixed so nested page routes work, and added request spec for nested page previewing
@ugisozols ugisozols require 'devise/orm/active_record' is happening in devise initializer…
… so it shouldn't be added to config/applicaiton.rb.
@ugisozols ugisozols Prefix url_for with refinery. only when request comes from refinery c…
…ontroller so that will_paginate can be used outside of refinery too.
@ugisozols ugisozols Add PaginationHelper specs. 46ca33d
Commits on Feb 04, 2012
@parndt parndt rcov/coverage makes the specs take a) 2x as long to boot and b) slows…
… down actual specs by about 25%
@parndt parndt Sped up page model specs by approx 31.86528497% by not saving each an…
…d every page. Saving is only necessary when checking slugs or nested set code (anything with a save callback that needs to fire).
@parndt parndt I've renamed ONLY_NON_JS=true to JS=false and ONLY_JS=true to JS=true…
… because seriously.
@parndt parndt Specs should only fail for one reason. a15a5e7
@parndt parndt DRYed up the section of specs that all want an image created first. 0e1abcb
@parndt parndt No more need for SKIP_COV=true
[ci skip]
@parndt parndt Run only some engines with guard using ENV['ENGINES'] e.g. ENGINES=im…
…ages,pages bundle exec guard
@parndt parndt Sped up images specs by up to 11.19592875% 6792eeb
@gonzedge gonzedge Fixed routes for model names with two or more words. 0ea1260
@parndt parndt Used translation keys and path helpers in dashboard specs. 94f6521
@parndt parndt Merge remote-tracking branch 'egonzalez0787/route_for_model' 5261612
@parndt parndt Switched to locale keys over hardcoded strings in images_spec.rb
[ci skip]
@ugisozols ugisozols Add specs for 0ea1260. 224fddf
@ugisozols ugisozols Remove rcov.rake task. 3981f54
@ugisozols ugisozols No need to rescue from FriendlyId::ReservedError because Refinery man…
…ages slug generation and it takes care of reserved slug names.
@ugisozols ugisozols I believe this was deleted by mistake. 3231482
@phiggins phiggins Since :hide_cancel is true, this isn't needed. a652f4f
@ugisozols ugisozols Copy/paste fail. 3344e2e
@ugisozols ugisozols Merge pull request #1283 from phiggins/remove_unneeded_cancel_url
Remove unneeded call to url helper
Commits on Feb 05, 2012
@parndt parndt Merge remote-tracking branch 'supairish/master' 6bf412a
@parndt parndt Moved page specific code out of _form_actions and into the _form. Add…
…ed hooks in _form_actions to make this possible.
@parndt parndt Switched to let!() over @variables. 5002500
Commits on Feb 06, 2012
@ugisozols ugisozols Drop ENV['RAILS_ASSETS_PRECOMPILE'] hack because the same thing can n…
…ow achieved using Rails config - config.assets.initialize_on_precompile = false.
@parndt parndt Append config.assets.initialize_on_precompile = false to the applicat…
…ion's config/environments/production.rb by default.

Per 9f8f8ef
@parndt parndt Use existing logic which checks for existence of the environment file…
…s first before trying to insert_into_file on a nonexistent file.
@parndt parndt Increase default password length to max out at 128 characters because…
… 20 is shorter than most of my passwords.
@parndt parndt Document the config.router_name for Devise. 2edc3b3
@parndt parndt Added --fresh-installation flag for refinery:cms generator to avoid c…
…omplaining about things that are of course not there yet. Also the refinery:cms generator now mounts the engine and the edge template uses this. Fixes #1271 and Fixes #1286
@parndt parndt On a fresh installation all generators should run automatically. 23e1d70
@parndt parndt Start the i18n generator on cms generator launch if it's defined. 7e42ffb
@parndt parndt Using %Q is easier than manually inserting \n\n 28e2db8
@parndt parndt Removed pesky quotation marks. 290a28f
@parndt parndt Consistent whitespace. 5e637b2
Commits on Feb 07, 2012
@parndt parndt Supply all params to will_paginate call in dialogs, otherwise it 'for…
…gets' them on POST.
@parndt parndt allow customisable thumbnail size in the image picker.
[ci skip]
@parndt parndt Revert "allow customisable thumbnail size in the image picker."
I totally forgot that this was already customisable with the Refinery::Images.user_image_sizes setting!

This reverts commit fc23691.
@parndt parndt Extend the image_picker properly so that it's a deep copy. Helps to r… 878eb8b
@parndt parndt Trigger the change event whenever we change the value of the current …
…image so that people can subscribe.
@parndt parndt If position is passed as a parameter, don't be overriding it. f734be1
@parndt parndt Ensure all params keys are symbols before comparing to a symbol. 7f57fad
@simi simi Update core/lib/tasks/refinery.rake 6436832
@parndt parndt Merge pull request #1288 from simi/patch-1
Update core/lib/tasks/refinery.rake
Rob Yurkowski Removes to_sym mapping since params is a HashWithIndifferentAccess (see 221c9d0
Rob Yurkowski HWIA.keys will change the hash to an array without indifferent access…
…, so just check if nil instead.
@parndt parndt Merge pull request #1289 from robyurkowski/master
Removes to_sym mapping since params is a HashWithIndifferentAccess and concatenates it with initial condition.
@parndt parndt Devise hack is no longer required. 7a70564
@parndt parndt Generating with a --fresh-installation flag negates the need to run t…
…he other generators.
@simi simi Legacy condition removed in form generator show template a77d613
@parndt parndt Merge pull request #1290 from simi/patch-2
Legacy condition removed in form generator show template
Commits on Feb 09, 2012
@parndt parndt Whitespace commits are my favourite commits.. 6d5e48d
@tsdbrown tsdbrown Closes GH-864: Hex encode the recipient in mailto links. Helps to kee…
…p spam bots from lifting email addreses.
Commits on Feb 10, 2012
@ugisozols ugisozols No need to set config.router_name = :refinery anymore. 23a815a
@ugisozols ugisozols Add plugins for first user in create_first method instead of passing …
…them through hidden fields in form.
Commits on Feb 12, 2012
@prakashsejwani prakashsejwani fixed string syntax error 0c577d1
@ugisozols ugisozols Merge pull request #1296 from prakashsejwani/master
string syntax error
Commits on Feb 13, 2012
@parndt parndt Changed Refinery::Core::Base to Refinery::Core::BaseModel to avoid co…
…nflicts with base_controller in any other application.
@parndt parndt Switched growl to ruby_gntp 9298574
@parndt parndt Added support file to background Firefox when running Selenium tests.…
… (ht: terrcin)
@craigambrose craigambrose error 404 methods return false so that they can be used in before_fil…
…ters and halt execution without needing an extra return call
@craigambrose craigambrose refactored hard-to-read conditional logic into local methods in Pages…
@craigambrose craigambrose requested_friendly_id needed to split on hash be44ae2
@parndt parndt Remove double comment. 2bcac05
@parndt parndt Append *path route to Rails.application and not Refinery::Core::Engin…
…e so that it's a true fallback when Refinery is mounted before other routes.
@parndt parndt So, at Railscamp NZ we had a local mirror and https:// w…
…as causing problems. Reverting that.
@parndt parndt Merge pull request #1293 from tsdbrown/master
Hex encode recipient into mailto links
@parndt parndt Fixed line spacing.
[ci skip]
@parndt parndt remove favicon.ico route b1ef5d5
@parndt parndt Revert "Append *path route to Rails.application and not Refinery::Cor…
…e::Engine so that it's a true fallback when Refinery is mounted before other routes."

This reverts commit 017a52f.
@ugisozols ugisozols Changes:
* Remove :meta_keywords, :meta_description, :browser_title from page
  model translates method
* Remove :meta_keywords, :meta_description, :browser_title from page
* Run dummy app create process in two steps so that seeds don't fail
* Move engine requirements down in order to register seo_meta and other
  required engines after Refinery::Pages
@ugisozols ugisozols Merge branch 'master' into clean_migrations 08b49ac
Jamal El Milahi & Ryan Dy render method should be public to avoid test issues f8dc092
Commits on Feb 14, 2012
@parndt parndt Moved badges downwards in the readme. Replaced Travis badge with http…
…s version.
@ugisozols ugisozols Remove unnecessary comment. 054736d
@ugisozols ugisozols Remove Devise.stretches and change to selenium Capybara.javascript_dr…
…iver in spec_helper template.
@ugisozols ugisozols No need to specify class_name for page association. e2772a8
@ugisozols ugisozols Remove comment and use :refinery_roles_users symbol to specify join t…
…able name.
@ugisozols ugisozols I've heard the pros use {} instead of do..end. d054103
Commits on Feb 15, 2012
@parndt parndt Revert "No need to set config.router_name = :refinery anymore."
This reverts commit 23a815a.

PA: Yes, we do. Visiting /refinery rejected with 401 Unauthorized.
@xeromorph xeromorph add first|last class to list item in menu_helper 75890a1
Commits on Feb 16, 2012
@parndt parndt Merge remote-tracking branch 'origin/clean_migrations' 2ca3b15
@parndt parndt fixed up whitespace 3f86c13
@parndt parndt Merge remote-tracking branch 'xeromorph/master' 2054822
@parndt parndt first and last are not mutually exclusive. 45a3f6e
Commits on Feb 17, 2012
@ugisozols ugisozols Access menu_branch_counter through options hash instead of calling it…
… directlyy.
@simi simi Temporary fixing #1197 in template engine b8ec2b6
@ugisozols ugisozols Merge pull request #1303 from simi/patch-3
Temporary fixing #1197 in template engine
@ugisozols ugisozols Seed db after running db:migrate. 44ce5f5
Commits on Feb 18, 2012
@parndt parndt Conditionally compile i18n into refinery.js and use it only when it i…
…s present.
@parndt parndt wrapped jquery.refinery.wymeditor.js into an asset manifest with sepa…
…rate files for each part of the editor.
@parndt parndt Merge @url into :only_path => true for relative links by default when @…
…url is a Hash.
@parndt parndt Update tests to just check the controller part of the hash. 67be0f0
@parndt parndt It's not RefineryCMS it's Refinery CMS 060f394
@parndt parndt Allowed the pattern of rake refinery:override view=pages/home which a…
…utomatically prepends a refinery/ prefix (still works if you specify refinery/ manually)
@parndt parndt Moved override command to the new Refinery::CLI class. 88e6473
@parndt parndt Moved rake refinery:uncrudify to Refinery::CLI 1932dcf
@parndt parndt LoadPathAnalyzer doesn't improve the situation anymore with 1.9.3-falcon bb6773d
@parndt parndt Remove js requirement for uploading resources and redirect properly a…
…fter success rather than relying on javascript to do it.
Commits on Feb 19, 2012
@parndt parndt Refactored usages of .collect to .map and .collect{}.compact to .select 6619ef3
@parndt parndt substituted render :partial => '' with render '' in as many places as…
… I could quickly.
@parndt parndt Using dialogs for simple 'add' actions was making testing hard and un…
…clear so I'm removing the dialogs.
@parndt parndt Outdent
[ci skip]
@parndt parndt Refactored code in view to helper thumbnail_urls(image) 110a019
@parndt parndt Changed render :partial => '' calls that don't use :collection => '' …
…to just render '' (found more of them).
@parndt parndt Using page (which calls find_page) and not @page in the controller. 1b6e8ec
@parndt parndt Using let and stub reduces testing time by about 33% 52a3a98
Commits on Feb 20, 2012
@parndt parndt Use let for no performance difference this time. 684afa1
@parndt parndt it 'should' is such an ugly pattern. 154be06
@parndt parndt About a 20% decrease in test time by not filling out the form for eve…
…ry test but only the first (which makes more sense anyway).
@simi simi New --i18n option to engine generator lets you specify translated
columns via globalize3

It automatically:
- add translates methods to model with correct parameters
- create translation table in migration
- add locale picker to admin engine resource list and form
- generate request specs for translated stuff in admin
@simi simi Engine generator request spec cosmetic change e8ec423
@ugisozols ugisozols Add passing spec for #1302. 0a77041
@ugisozols ugisozols Stub config values instead of setting them directly. 2146fba
@ugisozols ugisozols Remove merge(:only_path => true) from pages spec. 3052abf
@parndt parndt Still need render :partial inside controllers 60d7cd3
@parndt parndt Controllers still need render :partial so I've put it back into crudify. 71f9121
@parndt parndt Merge pull request #1292 from simi/i18n-for-engine-generator
New --i18n option to engine generator
Commits on Feb 21, 2012
@robyurkowski robyurkowski Adds missing </div>. 8a4e67e
@robyurkowski robyurkowski Oops. Moved it below #page_part_editors. e9a78ba
Commits on Feb 22, 2012
Brian Butz Revert "render method should be public to avoid test issues"
This reverts commit f8dc092.
Brian Butz Merge branch 'master' of git:// f57666c
@gogogarrett gogogarrett Update output to terminal for install instructions c67480f
@parndt parndt Merge pull request #1308 from gogogarrett/patch-1
Update output to terminal for install instructions
Brian Butz & Phan Le Load resources before pages because it breaks when mounted as with named
@parndt parndt Merge pull request #1307 from robyurkowski/patch-1
Adds missing </div>.
@parndt parndt Merge pull request #1309 from sharespost/master
Bug with resources when mounting refinery engine using namespace
@parndt parndt Fixed #1301 by specifically including Refinery::Core::Helpers inside …
…controllers that inherit from Devise. For more info, see the issue comments.
@gogogarrett gogogarrett Update to include instructions to seed db 711be16
@ugisozols ugisozols Merge pull request #1311 from gogogarrett/patch-2
Update to include instructions to seed db
@radar radar Set min_messages: warning in database.yml
This stops messages such as this from appearing when database setup
tasks are run:

NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index
"refinery_resources_pkey" for table "refinery_resources"
@ugisozols ugisozols Merge pull request #1313 from phry/master
Stop notices from PostgreSQL appearing when DB setup tasks are run
@parndt parndt call .name on string_attributes.first (ht: ghoppe) 389391d
@parndt parndt Use a symbol, not a string, for the validates call. 862fd66
@vita vita Model Page - fix duplicate cache_key 06bf7ff
@parndt parndt Merge pull request #1315 from SmartMedia/cache_key
Model Page - fix duplicate cache_key
Josef Šimánek Unique cache_key for Refinery::Page f2b6566
@parndt parndt Merge pull request #1316 from simi/patch-4
Unique cache_key for Refinery::Page
Rob Yurkowski Removes i18n-js in favour of erb includes. 2135154
@parndt parndt Merge pull request #1317 from robyurkowski/remove-i18n-js
Removes i18n-js in favour of erb includes.
Josef Šimánek No i18n-js in edge template thanks to @robyurkowski and #1317. 73f67c8
Rob Yurkowski Removes non-existent view helper (p'arndt!) 58de1e2
@parndt parndt Merge pull request #1318 from simi/patch-5
No i18n-js in edge template thanks to @robyurkowski and #1317.
@parndt parndt Merge pull request #1319 from robyurkowski/remove-i18n-js
Removes non-existent view helper (p'arndt!)
@ghoppe ghoppe make menu css classes configurable b59f0a3
@ghoppe ghoppe add accessor for menu_css 961a33b
@ghoppe ghoppe allow .first and .last css menu selectors to change, make defaults th…
…e same as refinerycms has been working
Commits on Feb 23, 2012
@parndt parndt Updated modernizr to 2.5.3 from 1.7 a43134d
@parndt parndt Merge remote-tracking branch 'ghoppe/menu_css' 4b2233a
@parndt parndt The position attribute on pages was useless, I've removed it. 58bf9e7
@parndt parndt :parent is inferred by .children.create (#1312) af0777f
@parndt parndt Missed a position call. 9ef3c6c
@parndt parndt Fixes #1312 by generating seed data when a form extension's generator…
… is run.
@parndt parndt Always render a partial response to request.xhr? 8008c5a
@parndt parndt Implemented a more ajax callback approach to the dialogs. Still a WIP 38edc9f
@ugisozols ugisozols refinery_form -> refinery:form. [ci skip] 0e2847a
@ugisozols ugisozols Use YAML.load_file instead of YAML.load. [ci skip] 0784b3a
@ugisozols ugisozols Remove Refinery::Setting engine. a3dc1a9
@ugisozols ugisozols In case Refinery::Setting engine is available copy migrations from it…
… too.
@ugisozols ugisozols git 'git'? 2009d34
Rob Yurkowski Adds spec_helper to generator. e50658e
Rob Yurkowski Adds check for spec_helper to engine generator. ffd74d9
Rob Yurkowski Adds check for spec_helper to non-frontend engine generator. 9cdda07
Rob Yurkowski Adds check for spec_helper to i18n engine generator spec. 7f6f78d
@ugisozols ugisozols Merge pull request #1324 from robyurkowski/engine-generator
Engine generator
@parndt parndt Merge branch 'master' into ajax_dialog_callbacks
@parndt parndt Using layout refinery/flash to render the flash message in a partial …
@parndt parndt Added js to the dialog tests again. d7cda1e
@parndt parndt Revert "In case Refinery::Setting engine is available copy migrations…
… from it too."

Engines can do this themselves in a refinery:testing:setup_extension task

This reverts commit abf9c1c.
@parndt parndt Merge branch 'master' into ajax_dialog_callbacks fe7aefb
@parndt parndt Updated generator templates to match new conventions. c721932
@parndt parndt Stripped trailing whitespace. d95a24e
Commits on Feb 24, 2012
@parndt parndt Basic prototype extracting refinerycms-wymeditor. Still some work to …
…do and it doesn't currently work.
@parndt parndt Probably I shouldn't commit my local paths 6e01538