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 Jan 12, 2010
@parndt parndt switch to alias_attribute which does the same thing as before but in …
…the proper way.
Steven Heidel Tried to make it easier to implement refinery on Heroku, unfortunatel…
…y it still fails to work remotely
Steven Heidel Changed Heroku setting to Use_S3_Backend.
Fixed problem with acts_as_indexed by defaulting to tmp/index.
Commits on Jan 13, 2010
@parndt parndt make s3 backend setting work without putting it into environment.rb b…
…y putting it into the preinitializer.
Steven Heidel Changed model generator so that it is consistent with the changes to …
…the other models
Commits on Jan 14, 2010
@djones djones Building UI for themes 6825932
@djones djones Merge branch 'master' of into them…
Commits on Jan 15, 2010
@parndt parndt Fix truncate for Hpricot 0.8.2 and allow this to be used (or 0.8.1) 1ed1d13
Steven Heidel Added amazon_s3.yml and rackspace_cloudfiles.yml to the git ignore li…
…st, changed all config files to end with .example, updated refinery generator to customize all 3 config files.
Hernan Fernandez convert main menu functionality to jquery a700c71
Hernan Fernandez page dialogs to jquery 9cfb6d8
Hernan Fernandez fix jquery version from google load 8c3e733
Hernan Fernandez migrate page parts, fix dialogs 0dffca5
Hernan Fernandez migrate image dialog 04bfb73
Hernan Fernandez add default flash fade 8dc3b04
Hernan Fernandez migrate part of sortable page 9d00891
Hernan Fernandez replace image picker on page custom title bca6ea6
Hernan Fernandez fix per_page image count e596b07
@parndt parndt updated jQuery version and migrated some more admin functionality to …
@parndt parndt use hernan's shortcut for jQuery 64c3a84
@parndt parndt move .noConflict to the admin _head.html.erb and include tooltips aga…
…in and fix path to admin javascript
@parndt parndt get rid of more errors and introduce jqueryui to google load 3574daf
@parndt parndt this can actually be a rails tag 2789c5a
Commits on Jan 16, 2010
@djones djones front end nearly done for themes 4299e1f
Commits on Jan 17, 2010
@parndt parndt Explicitly call all of the scriptaculous dependencies when using cach…
…ing because rails ignores them otherwise. Fixes issue #32
@parndt parndt no more tooltips until we get a jQuery solution, preferably one that …
…uses jQuery UI.
Commits on Jan 19, 2010
@djones djones better theme UI. Now shows preview image, allows you to select the th…
…eme you want to apply right now and also checks to make sure the theme directory is writable for Heroku. If it's not then disable adding and editing themes.
@parndt parndt ensure that the content page doesn't display the submenu if the page …
…is being displayed in an admin layout e.g. 404
Commits on Jan 20, 2010
@djones djones added documentation for theme 6ea0746
@djones djones added documentation for themes e7d6e39
@djones djones Merge branch 'master' of into them…
@djones djones permissions change on demolicious d6d1d3f
@parndt parndt add the zip gem back in. 06a3254
@djones djones trying to make yardoc play nice 83359ac
@djones djones hmm that breaks it e0c3494
@parndt parndt unfortunate d512c45
@parndt parndt Make themes support play nice with rake and the boot process and chan…
…ge theme_directory_is_writable to a class method as it doesn't really require an instance to work.
@parndt parndt remove some old assets 57b01e4
@parndt parndt remove some more unused assets 9a2698b
@parndt parndt Thanks, Maarten. 8628bdb
@parndt parndt Merge branch 'jQuery' of into jQuery
Commits on Jan 21, 2010
@djones djones Fixing up rdoc support c00db5b
@djones djones remove old generated doc files. also ignore yardoc ea3a9aa
@djones djones Ported the hemingway theme from Wordpress to Refinery 52f4743
@djones djones dont need these files in the theme e54cdd3
Commits on Jan 22, 2010
@parndt parndt ensure that rake tasks are only fetched into the project one time (th…
…ere were cases where tasks were running more than once when using the gem)
@djones djones ignore generated docs and attempt to make yardoc work this time now I…
… have the .yardopts file in place
@djones djones yardopt file is now easier to read what to document dedc59f
@parndt parndt Bugfixes around the dialogs and the save and continue functionality. …
…Removed libraries that won't be useful anymore. Things aren't perfect yet.
Commits on Jan 23, 2010
@djones djones Added link to developer documentation ad62207
Commits on Jan 24, 2010
@djones djones better subdomain setup for API docs f87f50a
@djones djones fixed up yardocs options (thanks to Loren Segal) 259ac80
@djones djones a bit tidier with the yardopts file 84e0ad4
Commits on Jan 25, 2010
Steven Heidel Fixed problem in rakefile when running from a plugin e6cf54e
@parndt parndt fix for README.rdoc and update version 6d9d551
@parndt parndt Add more information to routing file to say where engine routes are l…
Commits on Jan 26, 2010
@djones djones add documentation about how to extend Refinery with plugins b45632f
@djones djones Merge branch 'master' of 1a19da4
@djones djones adding empty help file for crud 38c9678
@djones djones converting our docs to fully use rdoc and it's formatting 3ffe8e3
@djones djones fix javascript support in themes c99151a
@djones djones Fixed themes so that you can use subdirectors inside your images, jav…
…ascripts and stylesheets directory (thanks csessions)
Commits on Jan 27, 2010
@djones djones added forgot my password support, removed unused code generated by re…
…stful authentication and tidied up what is left
@djones djones dont need this table 3ac7a12
@parndt parndt gem friendly full_filename 84fd4b3
@djones djones Added documentation about how Crudify works addeaae
@djones djones small doc improvement ddbe8d2
@parndt parndt be more helpful to our lovely users and contributors :) 9e6f213
@djones djones show everyone they need Rmagick as a requirement and also disable sil…
…m scoorge for Windows users because it contains c extensions
@parndt parndt turned the bundled themes into zip files which are installed automati…
…cally when rake db:setup is run when the application is originally installed (or they can be manually uploaded if upgrading to this version).
@parndt parndt fixed references to the rdoc files and now we're upgrading the refine…
…ry preinitializer on a refinery-update-core too.
@djones djones helping out our Heroku users with a bit of documentation 32f2397
@djones djones show everyone they need Rmagick as a requirement and also disable sil…
…m scoorge for Windows users because it contains c extensions
@djones djones helping out our Heroku users with a bit of documentation 8f77642
@djones djones Merge branch 'master' of ffd78fa
@djones djones better readme that tries to answer the question of Why Refinery? 9769d53
@djones djones outline what Refinery comes with and mention how to extend it a40274e
@djones djones ops gotta remember this is not markdown 59b415f
@djones djones link everyone to the demo of course 117d7e6
@djones djones trailing slash not needed bd601e7
@djones djones trailing slash not needed 1dec35f
@djones djones documenting each plugin within Refinery fb42387
@avit avit Use presenter object for templates
The @page object is used in layouts to render various page parts such as
the title, meta tags, etc. A presenter object stands in for when this
isn't an instance of Page, so that it answers to the same methods
required by the template.

To present any generic model, just call present(@model) in your controller.

You can create custom presenters for your own models by inheriting from
@avit avit Cleanup: method not needed in generator template, and whitespace acf1d31
@djones djones Finishes off documentation 2ac9d96
@djones djones fix links ff02307
Commits on Jan 28, 2010
@djones djones Much better documentation formatting with markdown 181a1e1
@djones djones improving readme file e9ca9ba
@djones djones more refinements to the readme file 923f9f3
@djones djones major documentation review. changed format to markdown to support scr…
…eenshots and better formatting
@djones djones link to each of the docs from the main doc e984b72
@parndt parndt overhauled a bit of the core to provide the functionality for present…
…ers that were submitted by avit (thanks) which gives the ability to use a different model than Page for the meta information such as browser title. Added a public/javascripts/admin.js file which allows the developer to hook into wymeditor for example and is included just after the js frameworks but just before the js libraries. Updated themes to use new architecture. ApplicationHelper::setup is now deprecated and tells you so in your log file.
@parndt parndt merge 6c69e92
@djones djones ops fix up a bit where i missed the rdoc to markdown conversion 9b40d1b
@djones djones removed docs about the dashboard in the image docs 1d480b1
Commits on Jan 29, 2010
@parndt parndt migrated some more code over to jQuery but still more to go 8e32dd0
Commits on Jan 31, 2010
@djones djones improved readme 983d44f
@djones djones Improved documentation, especially around authentication and settings c52052d
@djones djones ops fix markdown syntax 8158c8d
@djones djones ops fix markdown syntax 975e0b3
@djones djones slim scrooge is not required for Windows and JRuby users 1a0301f
@djones djones italics instead of bold f6dab92
@djones djones add inline documentation into the page model and move any magic numbe…
…rs or strings out to constants
@djones djones adding the basic folders for tests d878c0c
Commits on Feb 01, 2010
@djones djones added page unit tests and basic fixtures to test deletability, and pa…
…ge paths
@parndt parndt use the theme.folder_title (renamed from theme.theme_folder_title due…
… to redundancy in method name) when switching theme and add a title to the activate theme button (Fixes GH Issue #33)
@parndt parndt Merge branch 'master' of 0bc0b9d
@djones djones 99% done with unit tests for page model. 3 tests failing right now cb5212a
@parndt parndt remove now useless libraries, update jquery version. a9a151d
@parndt parndt moved some more code to jQuery. Getting reordering working, still a w…
…ork in progress, this code is not stable.
@parndt parndt Changed to $ as prototype and scriptaculous are now gone. Reordering …
…appears to work now but limited functionality (new lists can't be created under other lists and it's jumpy with the CSS).
@djones djones fixed links in docs dd9ce4c
@djones djones add in themes and plugins as stuff included with Refinery eb1546e
@parndt parndt reorder finishes on click of the done button now b103396
@parndt parndt fix dialogs for resources and images and make reordering work only sl…
…ightly better
Commits on Feb 02, 2010
@parndt parndt Made :method => :delete into a class that hooks into some unobtrusive…
… javascript to open the confirm dialogue and submit the destroy request. Reduces the amount of HTML in the backend.
@parndt parndt Don't need the files for this 95a9883
@djones djones remove the relationship between pages and images. Now we have page pa…
…rts you use that mechanism to display custom content like images. We don't need to rely on pages having a direct link with images anymore.
@djones djones Added tests for page parts bc2d391
@djones djones Adding image tests and documenting each method on the image model inline 9bb0452
@parndt parndt make more stable, still testing to come 8893fb7
@parndt parndt Apply CSS class now works as with prototype 10d3dbe
@parndt parndt mark a CSS class from the dropdown when that class is selected on the…
… container that is being applied to
@parndt parndt ensure class names remain when the tag changes a3ec77a
@parndt parndt ensure style and class attributes are copied to links that replace ot…
…her links
Commits on Feb 03, 2010
@parndt parndt document IE paste feature and give image form friendlier errors 1a87376
@parndt parndt Wee fix for IE b337c66
@parndt parndt make the header display consistently across browsers 67cc973
@rubylibre rubylibre ignore theme directory 135c1a9
@rubylibre rubylibre major improvent of the flash message (flash shows and will not be ava…
…ilable next action.. like forgot password)
Luke Brown Added another test to prove the child page is still shown when set to…
… hidden
Luke Brown Changed the ruby operator as *and* has a lower precedence resulting in
is_in_menu being set to the return of not the whole line as expected
@djones djones Thanks to these new contributors 680e240
@parndt parndt Switch to using jQuery draggable 5482c60
@parndt parndt ensure header is consistent on the login screen too 0d14279
@parndt parndt implement some code for safari from the release candidate version of …
…wymeditor that does setFocusToNode properly. Fixed whitespace on this file which was strangely incorrect.
@parndt parndt Merge in jQuery branch 60c1005
@djones djones now running on jQuery, good by prototype c4006ef
@djones djones test was right, I was wrong so test passes now c2a8c9e
Commits on Feb 04, 2010
@parndt parndt add in possiblity to hack the development environment when you get th…
…e A copy of XX has been removed from the module tree but is still active error
@parndt parndt Merge branch 'master' of 6771dcd
@parndt parndt modified page parts so that they use the actual title that the user s…
…upplied as their title and then we transform it into something dom usable afterward. This makes the tests pass. Supplied migration to change existing page parts to the new format. So either page[:side_body] will work as well as page['SiDE BoDy'] or page['Side Body'] - case is not important neither are spaces vs underscores.
@djones djones use built in attachment_fu validation. removed old last_page method f…
…rom Image. Skeleton unit tests.
@djones djones Merge branch 'master' of 13ac918
@parndt parndt reordering works differently, now you select the parent page when edi…
…ting a page and limited reordering is supported. Also some dialogues are now using jquery UI not thickbox. We'll move completely away from thickbox soon.
@parndt parndt Merge branch 'master' of abcc84b
@parndt parndt we're now at version 0.9.6 (much fanfare) 9575c6a
@parndt parndt this may as well say the new version 88c423b
@parndt parndt don't copy the themes in on a gem install, these can be installed fro…
…m the gem itself.
Steven Heidel Added RSS feed ef96a6f
Commits on Feb 05, 2010
@parndt parndt add the body of the news post to the description field of the rss e6554bb
@parndt parndt fix wymeditor bug introduced in the change to jQuery where it parses …
…out closing tags because the jQuery replace function (or rather, the javascript one) functioned differently to prototype's gsub
@parndt parndt update version to add RSS support and bugfix wymeditor fbb4af3
@parndt parndt fix reference to file typo 8e8cd61
@parndt parndt create theme directory if it doesn't exist on site init 303c8a1
@parndt parndt updated generators to accomodate new best practice refinery architect…
…ure and updated docs likewise. db/seeds updated to use new syntax for page parts.
@parndt parndt Update the code that reloads plugin app directories to more robust code f07fe02
@parndt parndt fix a few issues identified in the resources dialog 915c60d
@parndt parndt almost there with supporting a resource picker f4346bf
Commits on Feb 07, 2010
@parndt parndt new version which addresses the new friendly_id plugin and ch…
…anges the way that theme urls work (sorry to anyone affected) because the previous version simply didn't work with webservers like nginx which assume that they can skip rails with i.e. /stylesheets/theme/foo.css so now it is /theme/stylesheets/foo.css which also wraps everything consistently i.e. /theme/(stylesheets|javascripts|images)/file.extension - also updated a few references from RAILS_ROOT to the new Rails.root but couldn't convert all because Rails.root is not available in files like bin/* or config/preinitializer.rb for example which seems strange and could be a bug in Rails.
Commits on Feb 08, 2010
@parndt parndt fix some javascript inconsistencies where we were still using jQuery …
…instead of $ and the resource picker now works.
@parndt parndt it shuold be body_content_title not body_content_page_title for the <…
…h1> title. Moved some CSS to the stylesheet.
@parndt parndt bump version to f8a8e77
Commits on Feb 09, 2010
@parndt parndt add new Rails.root syntax to seeds and change 500 html a bit ed56a23
@parndt parndt Added the ability to use nested routes into the Dashboard Activity. R…
…emoved the use of eval from dashboard_helper and cleaned up the init files so that they are not all scrunched up.
@parndt parndt unless empty makes more sense 58e39bd
@parndt parndt update rails_indexes to the latest version (thanks eladmeidar) 292c48b
@parndt parndt someone has been adding tab characters and diff cruft, this removes a…
…ll of it.
@parndt parndt update link to portfolio engine which has been renamed 90878af
Commits on Feb 10, 2010
@djones djones get better titles from filenames. also added tests e85c280
@djones djones whitespace 917bb82
@djones djones merged 699431a
@parndt parndt one last whitespace c7a5c04
@djones djones better titles from filenames af46212
@djones djones revert some changes ops 67a0ea1
@djones djones use rack middleware to serve static theme files from now on to make i…
…t much faster.
@parndt parndt Image picker wasn't working if you place two on one page. I suspect t…
…hat the resources picker will be the same. And the same for every var something = {} type thing that we're doing in admin.js because it's not object oriented so you can't create separate instances to use. This will have to be rewritten in future to use some sort of Class.create pattern.
@parndt parndt Merge branch 'master' of 20ce26b
@parndt parndt new version 89b0847
Commits on Feb 11, 2010
@parndt parndt Improve the syntax so that this is easier to follow. Fixed a couple o…
…f bugs in the process which is a clear case for having easy to understand syntax.
@parndt parndt clean up some more code, fix bugs with validation on images + resourc…
…es and also ensure that the toggler works on the image picker.
@parndt parndt fix id 1cf6dd5
@parndt parndt fix non-tree collections weren't being reordered properly in some cases a3b3dde
@parndt parndt Refinery core doesn't need to know about themes at all, actually. Mod…
…ularity win.
Commits on Feb 12, 2010
@djones djones change class methods to named scopes with default_scope sorting cdac74b
@djones djones Merge branch 'master' of e78d1f1
@djones djones make opened scope work properly ef9c8dd
@parndt parndt This prevents tampering with the view_paths if we don't have a theme …
…set and makes the tests pass again for Refinery core
@djones djones Added unit tests to inquiries and name Inquiry.opened become Inquiry.…
…open - just better wording
@djones djones tidy up the way new items work with much nicer named_scopes and remov…
…ing alias content field. Not sure why that was there...
@djones djones unit tests for news added 6d50972
@djones djones added tests and inline documentation for Refinery Settings 6826f1c
@parndt parndt Added support for a relative_url_root that is different to / to all o…
…f the ruby code based functions. Any javascripts or stylesheets that tie into the application root or have a specified path for any reason have not had this support added. Feel free to cleanly patch that support in.
@parndt parndt use controller_name instead e748ca2
@djones djones added unit tests to resources and refacted some image settings to be …
…a constant
@djones djones Merge branch 'master' of c6b8e69
@djones djones test type of content on resources 3600ef7
@djones djones added unit tests to themes fc138fd
@djones djones added known todos for tests ed3a982
@djones djones format with markdown b0fdfb9
@djones djones format with markdown f965879
@parndt parndt some preparation for Rails 3 06704f1
@parndt parndt Merge branch 'master' of 786e726
@parndt parndt tests don't pass without these apparently ccffcb6
@parndt parndt Prepare for Rails 3 some more. Things are all conditional and still w…
…ork in Rails 2.3.5
Commits on Feb 13, 2010
Luke Brown BUGFIX: attachment_fu should now work correctly on windows 2b74cfb
Commits on Feb 15, 2010
@parndt parndt Added ETag caching to the Rack ThemeServer and refactored code to mak…
…e it easier to understand. Allowed controllers to be used inside theme directories as themes may need to change what happens in a particular controller e.g. PagesController. Added new :head_libraries for use with content_for :head_libraries which appears always before content_for :head - this change was important because if you were using content_for :head inside a layout file and then inside a template file, the template file would win and render first which may ruin your javascript/css dependencies. Version
@parndt parndt Merge branch 'master' of 96499dc
Scott Harvey Ensuring that page urls don't point to the admin namespace 0898d63
@parndt parndt Fix logic errors on content_page template and fix the refinery and re…
…finery-update-core commands to more correctly use config/environment.rb and config/application.rb
@parndt parndt copy in the new environment file if there's an application file which…
… will hold all of the important settings from now on
@parndt parndt fix updating the core and put the attachment fu patch in a more logic…
…al place and include it from the initializer not environment.rb
@parndt parndt you must enable etags to use them as they're causing bugs for some 8d78b38
@djones djones use markdown format 803cd59
@parndt parndt By default we want to show logs 61de701
@djones djones add more todos 36bb58a
@parndt parndt This little change reduces the number of database queries quite drama…
@parndt parndt Merge branch 'master' of 5d63b4f
@parndt parndt This logic wins fe9a6da
@parndt parndt update test to reflect new code 3707c15
Commits on Feb 16, 2010
@parndt parndt Use Pathname for Refinery.root (was REFINERY_ROOT) wherever possible.…
… Some occurances still remain where 'refinery' doesn't exist e.g. in the bin tasks. Specified the load order of plugins so that we don't have to hack friendly_id, aasm and will_paginate in. Version
@parndt parndt put a .to_s on the end of this to ensure that the comparison works pr…
@parndt parndt Fixes javascript problems, notably that jqueryui 1.8 is no longer in …
…the google apis and also fixes the call to the apis (rails is supposed to not put .js on an absolute url but it has been)
Commits on Feb 17, 2010
@parndt parndt fix a bug when having two editors on one page 0fdd64c
@parndt parndt Send a blank response with 304 4bc77f0
@parndt parndt Got the etags under control and now using a Rack::Static like impleme…
…ntation using Rack::File (thanks to wycats for prodding in the right direction)
Commits on Feb 18, 2010
@parndt parndt get rid of some code smells and complexities 7ea0b63
@djones djones first functional test in. login_as test helper setup to make it easy …
…to log a user in and start testing Refinery itself
@djones djones added instructions explaining how to run the tests 0a435b5
Commits on Feb 22, 2010
Luke Brown Removed double confirmation, just let jQuery handle it 017c441
Steven Heidel =~ method for path names is deprecated in Ruby >1.9 2d8c3b2
@parndt parndt do more to ensure that paths are unique before saving them to global …
…variable or adding them to the load path.
@parndt parndt Refinery.root wasn't being set properly because while the pathname wa…
…s blank it was still a pathname.. Now we check for length.
Commits on Feb 23, 2010
@parndt parndt Refactor the way that Refinery figures our paths and add messages and…
… documentation for these processes.
@parndt parndt cleanpath 81329cb
@parndt parndt decouple themes from the main application some more 266c848
@parndt parndt Fix bug that was introduced that threw out page ordering in the menu f297010
Scott Harvey Perform .to_s on title before trying to truncate to prevent error fd98bd2
@parndt parndt Fix password reset code c928865
@parndt parndt forcibly reject user from plugins that they can't access because they…
… don't have permission.
@parndt parndt Support slim_scrooge version 1.0.5 and above as sdsykes has made this…
… work cross-platform now so we don't have to exclude Windows (thanks to sdsykes)
@parndt parndt Fix problems that people were having installing/updating gems. Please…
… update to version 1.3.6 of rubygems by typing: gem update --system
Commits on Feb 24, 2010
@parndt parndt Remove Theme support UI but leave in Theme support. Now it's set by t…
…he developer specifying the theme name in Refinery Settings (We've had a lot of requests to get rid of the UI for this which we do tend to agree with as clients don't really need it). Themes are now hot-swappable EXCEPT for any controllers you have inside there won't be reloaded which may give you some grief unless you restart your webserver after swapping the active theme. This was a necessary caveat unless anyone can figure out how to swap out controllers at runtime?
@parndt parndt We don't need to load in the controller paths unless a theme is speci…
@parndt parndt Just a different description for the version bump task fa9a8a3
@parndt parndt Seems like time for a new version 0664576
@magpieuk magpieuk [GitHub#43] BugFix for pageparts d412104
@parndt parndt copy themes directory when installing from gem 0e6de5d
@parndt parndt copy version file too f2d2836
Commits on Feb 25, 2010
@parndt parndt Rewired how Refinery gets access to its core components when installe…
…d as a gem vs as a clone. This solves some problems that people were having with friendly_id (among other plugins installed via gems) being included by plugins that complained before it was possible to run rake gems:install to fix it.