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 Sep 01, 2010
@dc5ala dc5ala Updates i18n_de locales to match current i18n_en 651cbc2
Commits on Sep 02, 2010
@moretea moretea Merge remote branch 'resolve/master' 89b0b52
Commits on Sep 08, 2010
@moretea moretea Merge remote branch 'resolve/master' a0d219b
Commits on Sep 09, 2010
@moretea moretea Merge remote branch 'resolve/sweepers' ecc5bd4
Commits on Sep 12, 2010
@djones djones fixed broken links in readme dbf9fe2
Commits on Sep 13, 2010
@djones djones updated readme a bit more. If anyone has any sites live on Refinery p…
…lease add them to the wiki page
@moretea moretea Updated menu rendering to use the nested set efficiently
Instead of doing a query for each recursion, it shares the common set of pages,
and does the selection of which pages should be displayed in which branch in ruby.
@moretea moretea Merge remote branch 'resolve/master' 0b6cbc5
@moretea moretea Merge remote branch 'resolve/master' 5329527
@parndt parndt Support another edge case where the app's name may be app - this also…
… makes the whole thing more robust by only changing exactly what we need to change. Closes GH-188
@parndt parndt Merge remote branch 'moretea/sweepers' ea58c03
@parndt parndt Now runs less queries when rendering the menu using .includes on all …
…of the associations used.
@parndt parndt Added cached_slug column instead which provides greater performance a…
…nd works with marketable urls.
Commits on Sep 14, 2010
@parndt parndt Now that we've sped it up, restore the conditions on the query. (ht: …
@parndt parndt Typo meant you got a sylesheets directory :( (ht: brainproxy) f2c95ff
Steven Heidel -h should display the help, not deploy to heroku. 547fa9d
@parndt parndt DRY up flash messages in crudify 42925b3
@parndt parndt Wrap directories in quotes before using cd to them. Especially import…
…ant for Windows (ht: mrstocks)
@dc5ala dc5ala Merge branch 'i18n_de' f7ce010
@dc5ala dc5ala Adds 3 missing translations for i18n_de 889b6b7
@parndt parndt Update use of Dragonfly's API (ht: mattmate) 151ffef
@parndt parndt Log the exception as a warning too. aff5f2e
@parndt parndt Merge remote branch 'dc5ala/i18n_de' 1612d2e
@parndt parndt Rewrote crudify to use ARel. All tests are passing but we will need t…
…o ensure that other engines are functioning properly.
@parndt parndt Lest we forget to do this later. b19749a
Commits on Sep 15, 2010
@primerano primerano delete page parts when page is deleted 3d6b3f1
@parndt parndt Fix deprecation warning 8e624bd
@parndt parndt Found out that selections greater than one in length weren't being wr…
…apped properly with the replaceable so this addresses that. (ht: dsapala and dkennedy). Closes GH-183.
@parndt parndt Adds fixes for installing refinerycms on Windows. RMagick is still a …
@primerano primerano add test case to ensure page part is deleted when page is destroyed f603c1a
@parndt parndt Allow rmagick to be installed on Windows thus making the whole refine…
…rycms installer work on windows.
@parndt parndt Tidy up how children are generated and how the css & dom_id are combi…
…ned. Stopped removing pages from the collection as it is too likely to come back to bite us later.
@parndt parndt Prepare next version of RefineryCMS 1a19027
@parndt parndt Remove lib directory from require_paths because it doesn't exist and …
…Windows complains.
@parndt parndt Merge remote branch 'primerano/master' 091c401
@parndt parndt Privacy policy page should live under contact page and page not found…
… page should live under home page by default.
@parndt parndt Add another partial as an override point to avoid having to override …
…the entire _form.html.erb partial inside pages when all I want to do is add another text field below the page title.
Commits on Sep 16, 2010
@parndt parndt Update to of refinerycms-i18n. Closes GH-143. Again. 228811a
Steven Heidel Extracted windows check to reusable Refinery::WINDOWS ebea868
Steven Heidel is_a_gem is never used, like ever. c7dc7d8
Steven Heidel Template for previous 3 versions. 4b63c70
Steven Heidel Changelog for bd0a0ef
Steven Heidel Changelog for a530efb
Steven Heidel Changelog for f4aa1fc
Steven Heidel Changelog for (so far, make sure to add things here\!) eac344b
Steven Heidel Give credit where credit is due. (hopefully I got everyone with major…
… contributions in a suitable order, let me know if I missed something)
@parndt parndt add more flexibility so that the menu could be used as a submenu or a…
… footer menu or anywhere you want, just add in an extra suffix and specify the roots as locals
@parndt parndt You'll also need to override the collection used otherwise the childr…
…en will be completely wrong.
@parndt parndt Pass collection through recursively again. fcb24d0
@parndt parndt Ensure that the HTML is up to date before scanning it as new text may…
… have been entered and jQuery may not know about it yet. (ht: markoh)
@invalidusrname invalidusrname add searching to Refinery Settings b37d039
@parndt parndt Fix pagination's use of per_page.
Added search feature to test the new search functionality of Refinery Settings (thanks Matt!) and used crudify more now that it works properly.
@parndt parndt Search feature implemented for Refinery Settings by the wonderful Mat…
…t McMahand. Closes GH-204
@parndt parndt Add new fields to the gemspec b33c351
Commits on Sep 17, 2010
@parndt parndt Cut down on what we respond to thus eliminating heaps of routes. 78c1195
@parndt parndt Set the :id of a *path route to pages#show to nil to prevent URLs lik…
…e /news/test?path[]=about-us when on a page where some other object is using params[:id]
@parndt parndt Another day, another release with some pretty significant improvements. 4f03b4d
@parndt parndt Properly attribute Karmen Blake with link love. 3cf71bc
@parndt parndt relock to and update dependencies. 064b6c3
@ugisozols ugisozols Fixed failing cucumber page test. 2ca40e2
@ugisozols ugisozols Changed cucumber steps regexp for settings so we just match the strin…
…g but don't return it. Added settings entry when searching nonexisting itmes.
Commits on Sep 19, 2010
@ugisozols ugisozols Standardized remove message. Closes GH-199. 59e8330
@moretea moretea Fixes issue #213: The comma should be at the end of the previous line 8265131
@parndt parndt Merge remote branch 'moretea/master' 00f2170
@parndt parndt Merge remote branch 'ugisozols/master' d4c8dea
@parndt parndt Update changelog 4c191d7
@parndt parndt Split the calls to separate lines so that we can better figure out pe…
…rformance problems
Commits on Sep 20, 2010
@parndt parndt Fixes: DEPRECATION WARNING: Using #request_uri is deprecated. Use ful…
…lpath instead.
@parndt parndt Added initializer to take care of IOError Closed Stream closed when u… 63ac3be
@parndt parndt zh-CN was overrding the core en locale translations so features were …
…failing and the new 'removed' translation wasn't being picked up. Also we were seeing old messages like 'Cancelling will lose all changes you've made to this %{object_name}'. Closes GH-194
@parndt parndt Changed verbiage from created to added, create to add. Closes GH-195 abdfe9f
@parndt parndt Steven would be so proud. 5786539
@parndt parndt image_fu can no longer figure out the width and height because it add…
…s a big performance issue. Closes GH-208. (ht: djones pair programming)
@parndt parndt If the geometry string is not passed then no thumbnail was requested …
…so we can optimise that situation. (ht: djones pair programming)
@djones djones first go at the new engine api. will do more testing before pushing t…
…his in
@djones djones added a readme c74a2a0
@djones djones update changelog and todo list to reflect the new engine api a946612
@djones djones getting closer to the install generator working 2803c53
@djones djones install generator works better now but needs to be done smarter a85ddef
@djones djones fix up syntax errors in generated front end views 5d5a1e0
@djones djones shifted the core engine installer into the core 5feca3c
@djones djones made the engine installer work from core. (ht: parndt pair programming) 8d72c75
@djones djones improved the way seeding is done. (ht: parndt - pair programming)
@djones djones updated docs to reflect engines better 6604e38
Commits on Sep 21, 2010
@djones djones provide an even better helping hand when installing an engine 16c862a
@djones djones server static /public files from engines generated by the engine gene…
@djones djones generate directories with .gitkeep in them too. This is so that the p…
…ublic directory is created when an engine gets generated
@parndt parndt Tracking the issue of adding a link. 4a7e8ea
@parndt parndt Fixes adding a link and pasting at cursor for me in Gecko (Firefox), …
…Webkit (Chrome) and Trident (IE) on wymeditor. Closes GH-201.
@parndt parndt Through IE testing I realised we weren't removing the title properly. 77f6dde
@parndt parndt lots of changes usually require new gemspecs. 40c892c
@parndt parndt Joe is also keen to help with RSpec. ec1bff7
@parndt parndt New release (aka the 'happy birthday parndt' release) ;) 243622a
@parndt parndt Note the release date in the changelog. 6d35afa
Commits on Dec 01, 2010
@parndt parndt Well, all the specs and features pass, so maybe we have a viable 0.9.…
…8.6 version.
@parndt parndt Of course, regenerate the gemspec. b3866c3
@parndt parndt fix reordering for non-trees. 0aaf239
Commits on Dec 02, 2010
@parndt parndt This is a bad seed. c71813f
@parndt parndt remove bad seed from gemspec 3be3afc
@parndt parndt Dependencies updated. 95ae14d
@parndt parndt Fully qualify 24cdcb7
@parndt parndt Inquiries need their own seeds. 604b546
@djones djones add helper methods to expose some of the options in crud. This allows…
… the admin views to dynamically hide or show the search box or reorder link depending on what options you set with crud
@djones djones backport generator change to hide and show search and sorting 3e9e9c1
Commits on Dec 03, 2010
@parndt parndt Also run rake db:create cb16669
@parndt parndt Merge branch '0986' of into 0986 fce1044
@parndt parndt We stopped using ChildLabor a long time ago. a240633
@parndt parndt I've made the refinerycms command aware of the fact that it may be a …
….pre and so to use the git repository as a source instead.
@parndt parndt How about we actually tell it to run.... 636b4ce
@parndt parndt Fixes installing a new application and then not having the database s…
…et up, all it is required is to :cd => true
@parndt parndt Fixes the seeds being run in the wrong order. 7ccd634
@parndt parndt Added in rails.js, fixed the reordering for non-tree lists. eeca523
@parndt parndt Modernise the menu. bcb75bd
@parndt parndt Renew gemspec ff7e3be
@parndt parndt Fix reorder key. 58f02a6
@parndt parndt Lots of fixes for the likes of IE7/8 7acd839
@parndt parndt Last minute whitespace cleanup e8de3a3
@parndt parndt Documented changes for dae36fd
@parndt parndt Be safer with the rspec version requirement 818a9bb
Commits on Dec 07, 2010
@parndt parndt Make update task delete a particular migration that causes issue. Clo…
…ses GH-314
Commits on Dec 11, 2010
@wjbuys wjbuys Fixed problems with db:migrate for a new app on Postgres by moving Ro…
…lesUsers migration before Roles migration.

It looks like the ActiveRecord postgres adapter automagically sets up relations between your tables. However, it looks like the "many" side of the association (the table with the foreign key) has to be created first, or postgres gives an error like this in the log:

PGError: ERROR:  relation "roles_users" does not exist
LINE 14: AND dep.refobjid      = '"roles_users"'::regclas...
Commits on Dec 12, 2010
@parndt parndt Use the newer, faster image dialogue introduced in master branch. 8af2e5f
Phil Spitler Sort file names so attribute types don't get changed before _form gen…
Commits on Dec 15, 2010
@ugisozols ugisozols Add :approximate_ascii RefinerySetting and add that setting in page m…
…odel for has_friendly_id.
@parndt parndt Document new version - Closes GH-320 ade7bec
@parndt parndt Increased version number to to address an issue where Refiner…
…ySetting would try to access its table when the table didn't exist which wreaks havoc on any settings loaded during the initialisation process. Also incremented rspec version to ~> 2.3
@parndt parndt Documented changelog fd25e28
@parndt parndt Added options to specify database username and password in the refine…
…rycms installer task.
Commits on Dec 19, 2010
@parndt parndt Make this the same as the inquiries engine by ensuring that we get an…
… integer here of atleast 0. Closes GH-336
@ugisozols ugisozols Seperate each error message in it's own <li>. 297d719
Commits on Dec 20, 2010
@parndt parndt Don't need the + 1 because the seed code handles this when it creates…
… contact_us_page.
@parndt parndt Prepare for upcoming 01216c2
Commits on Dec 21, 2010
@radar radar Add rescue_not_found option to turn on/off 404 rendering. 55e3c76
@eclubb eclubb Add :from key to UserMailer for password reset. 074f900
@parndt parndt Use Ryan's new setting, enabled by default only in production which i…
…s the way this should have always been.
@parndt parndt Relocked fc6e808
@parndt parndt Updated changelog for 8e65eb9