Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but 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 Aug 17, 2010
Uģis Ozols ugisozols Moved edit and delete translations from Core to plugin translation file. 9665223
Uģis Ozols ugisozols Added missing :max_image_size for translation. Removed not needed tra…
Uģis Ozols ugisozols Oops... Removed needed validation. b7bb74d
Steven Heidel Upgrade to use OptionParser library. de7ffd2
Steven Heidel Made additional tweaks to the improvement of the refinerycms generator. 497bb56
Steven Heidel Finish fleshing out class, better error checking, and ready to add th…
…e generate! method.
Steven Heidel Copied over remainder of the old task.
This still doesn't work because gems haven't been released. Also, a lot of the code that looks into the files is not DRY and could use refactoring.
Philip Arndt parndt Merge remote branch 'ugisozols/rails3' into rails3 906105e
Commits on Aug 18, 2010
Uģis Ozols ugisozols Removed dynamic_form plugin and refactored code to use error_messages…
… partial.
Philip Arndt parndt Merge remote branch 'ugisozols/rails3' into rails3 106976c
Philip Arndt parndt Merged with master branch. We load in the acts_as_indexed config in a…
…n initializer on this branch.. may need to look at that for Heroku later.
Uģis Ozols ugisozols Added Latvian translation for Resources. 195e007
Philip Arndt parndt Merged with master's html5 changes, now rails3 can be better friends …
…too <3
Uģis Ozols ugisozols Added Latvian translation for Images. e5f5377
Uģis Ozols ugisozols Merge branch 'rails3' of git:// into ra…
Philip Arndt parndt Remove hackety hack and remove large sections of the update task that…
… won't be needed under rails3. Closes GH-140
Philip Arndt parndt Merge remote branch 'ugisozols/rails3' into rails3 9fbe254
Uģis Ozols ugisozols Removed model_translations plugin. Changed spelling of the Latvian la…
Philip Arndt parndt Merge branch 'master' into rails3 b876214
Uģis Ozols ugisozols Removed model_translations plugin (no, really). c9b7eb6
Philip Arndt parndt Merge remote branch 'ugisozols/rails3' into rails3 653ac30
Philip Arndt parndt These are a few of my favourite removals 8381b49
Commits on Aug 19, 2010
Philip Arndt parndt performed awagener's change to the new generator template. 7311d35
Uģis Ozols ugisozols Use shared search translation entries. 3a73874
Philip Arndt parndt Merge branch 'master' into rails3 f543cf3
Uģis Ozols ugisozols Added Latvian translation for Inqueries and edited some other entries…
… in Latvian and English translations.
Philip Arndt parndt Merge remote branch 'ugisozols/rails3' into rails3 e4237bc
Philip Arndt parndt Merge branch 'master' into rails3 bcced6d
Commits on Aug 20, 2010
Philip Arndt parndt Merges changes from master branch. c1979cd
Philip Arndt parndt Moved plugins to external repositories and worked toward getting a Re…
…fineryCMS client gem installation working. Not working yet.
Victor Goff kotp Added autotest.example for those that use ZenTest autotest
It uses the .gitignore file as the master for exceptions to the autotest heuristic search.
I also added the .autotest file to .gitignore to account for individual tastes.
Victor Goff kotp Refactored to remove unless nil check. 85bc12d
Commits on Aug 21, 2010
Philip Arndt parndt merged master. a2b5ddc
Philip Arndt parndt Merge branch 'rails3' into gem_installation 3087173
Victor Goff kotp Merge branch 'rails3' of git:// into ra…
Philip Arndt parndt Don't need the plugin inside the app anymore, it's from another repos…
Philip Arndt parndt Remove hackety hack that used to load refinery tasks. Now rails loads…
… them.
Philip Arndt parndt remove deprecated initializers. 2f35c57
Philip Arndt parndt Remove very deprecated head_before_javascript_libraries. Just use con…
…tent_for :head_before_javascript_libraries instead.
Philip Arndt parndt Rails wants these files, so we'd best obey. 1f451f4
Philip Arndt parndt Include link to if the user has <noscrip…
…t> (ht: paulirish)
Philip Arndt parndt Spruced up the CSS to allow for more chatty translations and noscript…
… tag inside flash messages.
Philip Arndt parndt Use the new rails3 coolness (generated a new rails3 app and moved Ref…
…inery on top of it).
Philip Arndt parndt Updated lock file d4ae127
Philip Arndt parndt Git, please be keeping these directories, thanks! 6c0c363
Philip Arndt parndt version == pre1, try to get the app name out of the rakefile etc, not…
… working yet. :(
Victor Goff kotp Merge branch 'rails3' of git:// into ra…
Steven Heidel Clean up and comment bin/refinerycms. 6125b9e
Steven Heidel Refactor using much needed find_and_replace method.
A lot of the logic that was removed should be replaced with the defaults that Rails generates for you.
Steven Heidel Proper way to do prerelease gems. 9493967
Steven Heidel Many additional changes to make bin/refinerycms work. Also, upgraded …
…some of the Refinery default files to the new default generated rails files.

At this point, gem installations now work. :D
Steven Heidel Dragonfly does not configure cloud storage this way, research will ne…
…ed to be done into the proper way of doing this.
Steven Heidel Remove said files from the gemspec. dfdc26d
Steven Heidel As an experiment, none of these files actually need be in the gemspec…
… unless they're getting copied over on lines 130-136 of bin/refinerycms.

At some point lib/gemspec.rb should probably be rewritten to take this into account.
Steven Heidel config/settings.rb should be copied over as well. 09220af
Steven Heidel No need to load rails just for one method when you can copy and paste…
… instead.
Commits on Aug 22, 2010
Philip Arndt parndt Rename function to 'refine!' 5101b2d
Maarten Hoogendoorn moretea Fixded missing translation for EN 5d394ef
Maarten Hoogendoorn moretea Fixed wrong key that was provided to the I18n.translate 852ed11
Maarten Hoogendoorn moretea Updated Dutch translations to match the English ones. 6ce05e6
Maarten Hoogendoorn moretea Fixed dashboard not working with I18n
This caused errors, because the image plugin generated a unknown url, based on the title of the plugin, which gets translated.
Victor Goff kotp Merge branch 'rails3' of git:// into ra…
Philip Arndt parndt Generate a new rails app better, reject user when they want to overwr…
…ite an existing directory and didn't --force
Victor Goff kotp Merge branch 'rails3' of git:// into ra…
Commits on Aug 23, 2010
Philip Arndt parndt Refactored refinerycms install task to provide live output (ht: carll…
Philip Arndt parndt Cut out every file we don't explicitly require to run as a gem from t…
…he gemspec generator and regenerated the gemspec.
Philip Arndt parndt Update dependencies as required. d3beb6c
Philip Arndt parndt This is a very important commit. It ensures that the whole repository…
… is kept consistent.
Steven Heidel Running rake now runs both spec and cucumber, eliminating the need fo…
…r rake test:refinery.
Philip Arndt parndt Merge remote branch 'stevenheidel/rails3' into rails3 d963590
Steven Heidel No longer need friendly_id.rake as it is loaded from the gem. 367dd43
Philip Arndt parndt Strip out most of the rest of the update task, now it just copies mig…
…rations and seeds in. Closes GH-147
Steven Heidel Keep all the engines together. 0ef01ac
Philip Arndt parndt Correctly cache assets from the Rails engines that are not part of th…
…e standard path.
Victor Goff kotp Merge branch 'rails3' of git:// into ra…
Philip Arndt parndt wee refactor for sorting fa23068
Philip Arndt parndt Merge remote branch 'stevenheidel/rails3' into rails3 007c58f
Victor Goff kotp Gemfile additions, now autotest with rspec is working. Refactored aut…
Philip Arndt parndt Merge remote branch 'aavalam/rails3' into rails3 659728f
Philip Arndt parndt Merged in the autotest example to be the actual autotest file, added …
…dependencies to Gemfile. These won't install in production unless you specify group :test as well. (ht: kotp - thanks Victor!)
Steven Heidel Recomment out optional libraries, and beautify the test group of the …
Philip Arndt parndt exclude anything under the app's public directory from the gemspec be…
…cause there shouldn't be anything there.
Philip Arndt parndt Change version to and ensure that refinery looks li…
…ke refinery once installed from a gem by removing the defualt layout. Improved gemspec generation and regenerated gemspec.
Steven Heidel Better manage crucial gem dependencies (childlabour is needed for bin…
Philip Arndt parndt Merge remote branch 'stevenheidel/rails3' into rails3 e082154
Philip Arndt parndt Added --drb fbbf3af
Philip Arndt parndt Don't create a default themes directory 465345c
Philip Arndt parndt Use the routes better, no more /inquiries when you submit the form (h…
…t: gidogeek)
Philip Arndt parndt remove error_404 hack for now 8697853
Uģis Ozols ugisozols Completed Latvian translation for Images. 97d27dc
Uģis Ozols ugisozols Added missing keys for Latvian translation. 585aa9b
Philip Arndt parndt smart defaults, i'm all about the smart defaults. 7fc3e79
Maarten Hoogendoorn moretea Not used by refinery (It points to github) 9b13b87
Maarten Hoogendoorn moretea The latest commit breaks page deletion. For now, use the previous ver…
Maarten Hoogendoorn moretea Removed duplication: The delete confirmations are handled by rails.js. f0b8b63
Uģis Ozols ugisozols Added Latvian translation for Core. 4298e38
Maarten Hoogendoorn moretea Refactored the plugin system to use plugin.title instead of ff2522e
Maarten Hoogendoorn moretea Updated the plugins to conform to the new plugin requests 4e6b6eb
Maarten Hoogendoorn moretea Added title= and description= for nice depreciation error messages. U…
…pdated docs to new specification
Maarten Hoogendoorn moretea Updated validations to rail3 format be4b244
Uģis Ozols ugisozols Half way done with Latvian Pages translations. 9d23b3a
Uģis Ozols ugisozols Merge branch 'rails3' of into rails3 efdf971
Uģis Ozols ugisozols Completed Latvian translations for Pages (to be honest - I'm not sati…
…sfied with outcome).
Philip Arndt parndt Merge remote branch 'moretea/rails3' into rails3 173c55a
Commits on Aug 24, 2010
Philip Arndt parndt Update to support rc2 of rails3. 70157bf
Philip Arndt parndt Refactor, move all self. methods under class << self and cache the en…
…tire collection of RefinerySetting records until one changes and then re-cache. Records only load one time on production for the life of the application until one changes. Happy days.
Philip Arndt parndt new version beta2. d9fe84c
Semyon Perepelitsa semaperepelitsa translating dashboard to Russian 0b8fdc8
Semyon Perepelitsa semaperepelitsa load meta description option title from locale 7fe1213
Semyon Perepelitsa semaperepelitsa correct misspelling a581340
Semyon Perepelitsa semaperepelitsa translating pages to Russian b1458e5
Semyon Perepelitsa semaperepelitsa improving Russian translation eb92d1b
Semyon Perepelitsa semaperepelitsa correcting typo in Russian locale fa48fae
Semyon Perepelitsa semaperepelitsa removing unnecessary quotes in Russian locale 51ceb63
Semyon Perepelitsa semaperepelitsa correcting error in Russian locale dedf737
Semyon Perepelitsa semaperepelitsa removing unnecessary quotes in Russian locale f7c0035
Semyon Perepelitsa semaperepelitsa translating images plugin to Russian 5964c1b
Semyon Perepelitsa semaperepelitsa typography improvements in resources plugin's Russian locale a1420b7
Semyon Perepelitsa semaperepelitsa improvements in resources plugin's Russian locale 8531ed8
Semyon Perepelitsa semaperepelitsa improving Russian locales 67c2c81
Semyon Perepelitsa semaperepelitsa improving refinery_settings plugin's Russian locale dc11f8a
Semyon Perepelitsa semaperepelitsa improving auth plugin's Russian locale f44a6d0
Semyon Perepelitsa semaperepelitsa improving inquiries plugin's Russian locale bd2cdd2
Semyon Perepelitsa semaperepelitsa updating quotes to standard russian quotes f8c137b
Semyon Perepelitsa semaperepelitsa correcting typo in Russian locale 8b851df
Semyon Perepelitsa semaperepelitsa improving refinery_setting plugin's Russian locale 355fdd5
Uģis Ozols ugisozols Added first draft of Latvian translations for Settings. 5a10aee
Peter Zlatnar peterz Merge remote branch 'upstream/master' 7ba83fd
Glenn Goodrich ruprict Add view= to a couple of refinery:override example texts e887e5b
Philip Arndt parndt Merge remote branch 'ruprict/master' 0579c02
Commits on Aug 25, 2010
Philip Arndt parndt Merged with master, nl changes from master could not be brought throu…
…gh as they conflicted heavily with work that was done at the same time on the rails3 branch.
Philip Arndt parndt Do important stuff first, always use the latest version of IE / chrom…
…e frame and don't need all the jquery libraries on the login layout. Speeds things up quite a bit the first time through.
Steven Heidel Refactor refinerycms such that multiple engines can fit into 1 gem.
The key here is Gem::Specification.require_paths, which is set to vendor/refinerycms. Then, when Bundler loads refinerycms it calls vendor/refinerycms/refinerycms.rb, which in turn requires each of the engines.
Steven Heidel Everything else about this new setup seems to be working, except for …
…public folders in engines.
Philip Arndt parndt split assets into core.js and admin.js so that we can load them separ…
…ately as required.
Steven Heidel Remove files needed for packaging separate gems. The only exception i…
…s inquiries, which should be extracted eventually.
Steven Heidel Update the gemspecs.
Eventually the bottom 8 dependencies should be moved back to the Gemfile as we don't want them installing on Successfully installed refinerycms-
Philip Arndt parndt Honestly, I meant to change that before committing. 0619837
Steven Heidel Fix several problems with bin/refinerycms.rb and lib/gemspec.rb 452a057
Steven Heidel Bumping version to first release candidate (almost caught up to rails). 5a5fc9b
Steven Heidel This may be a better way to load defaults. 525c7a1
Philip Arndt parndt Extracted the inquiries engine out to its own repository. 76e9ee2
Philip Arndt parndt goodbye core inquiries from Gemfile too. a733bd9
Steven Heidel Merge with master, only problem was Gemfile as this has changed. 6aada1a
Philip Arndt parndt Move public back to core where it belongs. f8f91c6
Philip Arndt parndt use require refinerycms instead which will load in all of the default…
… engines (even though previously I said 'yeah, use refinery/defaults').
Philip Arndt parndt Reshuffle to enable gems to build again. 51c996e
Philip Arndt parndt All things gems. bda5081
Philip Arndt parndt close with trailing slash db74975
Philip Arndt parndt Clean up what is / isn't required. d0ab21c
Philip Arndt parndt lib and vendored 097e78e
Peter Zlatnar peterz Merge remote branch 'upstream/master' ee72aba
Peter Zlatnar peterz Add missing sl translations 9d665d6
raul murciano raul Spanish translations updated 0bf101d
David Jones djones temporarily fix asset caching bug in Ruby 1.9.2 until we've got a pro…
…per fix
Philip Arndt parndt Merge remote branch 'peterz/master' bff72e1
Philip Arndt parndt Merge remote branch 'raul/master' 9a0c222
Philip Arndt parndt We can check against the ruby version so that it works normally in 1.…
…8.7 still.
David Jones djones Fix the differences between Ruby 1.9.2 and the others. Closes GH-154 9831ef3
David Jones djones merge 661381f
raul murciano raul Vendored translation files added to the I18n.load_path in an initiali…
…zer. Fixes fail in manage_images.feature:23
Philip Arndt parndt Fixes dashboard_feature:35 a3753a3
Philip Arndt parndt oh, look, beta3 ba35805
Philip Arndt parndt Add in missing initializer to install script. Would be nice to just c…
…opy them all..
Steven Heidel Refactoring, bugfixes, and todos for bin/refinerycms. a40c638
Steven Heidel Merge branch 'master' of git:// 550c913
Steven Heidel RMagick is in the Gemfile as it is more difficult to install, and add…
… note to gemspec to avoid errors.
Steven Heidel Changes to gemspecs mean changes to Gemfile.lock. a433049
David Jones djones when creating a new refinerycms app, copy over the production.rb envi…
…ronment too. One critical thing is to have serve_static_assets set to true. This is usually set to false on a normally generated rails app
Philip Arndt parndt Merge remote branch 'stevenheidel/master' dad9d24
Philip Arndt parndt Sort files, regenerate 05524df
Philip Arndt parndt Avoids conflicts with unique ids 8c0d56a
Commits on Aug 26, 2010
Philip Arndt parndt The default layout now puts the site bar assets in the right place, t…
…he <head>. Provided locals override to allow any layout to do the same thing but by default it can't use it because it gets included too late.
Philip Arndt parndt Update to beta4. 72435c1
Philip Arndt parndt relock to new version. 839b14e
Philip Arndt parndt remove hackety hack 4f4fba5
Philip Arndt parndt Added more precise logic, now we only append a locale string when app…
…ropriate (when not in the default locale). Closes GH-143
Philip Arndt parndt follow the same pattern of naming 53286ca
Steven Heidel Fix encoding errors that were causing problems in rack-test. Thanks to
… for his branch.

Cucumber is now all green on Ruby 1.9.2. Closes GH-156.
Philip Arndt parndt Merge remote branch 'stevenheidel/master' 7ee76a8
Steven Heidel Fixed deprecation warnings from old mailer API. Closes GH-157. 743187c
Philip Arndt parndt Merge remote branch 'stevenheidel/master' 6e7abfd
Philip Arndt parndt Always use the latest rspec 2.0 beta 5c4d924
David Jones djones fix broken links in readme now Rails 3 support is on the master branch. b9d6108
David Jones djones tidy up the wording in the readme 67a4bea
Philip Arndt parndt carlhuda owns the bundler repository. eafcde3
David Jones djones make the X stand out a little less 40db974
David Jones djones lets pimp the fact we support Rails 3 a little more 7d77101
Commits on Aug 27, 2010
Steven Heidel Use dragonfly configuration for Heroku. f93a581
Steven Heidel Automate installation of app on heroku in the generator. 4b2c0f0
Steven Heidel Regenerate the gemspec. 0fef16f
Philip Arndt parndt Load in the engines that we're using dynamically rather than writing …
…out each one.
Philip Arndt parndt Migrate the inquiry settings backend to take advantage of the new str…
…ucture in the inquiries engine. Added destroyable as an option on find_or_set for RefinerySetting.
Philip Arndt parndt Use the gems man, the gems! 44723c2
Philip Arndt parndt Merge remote branch 'stevenheidel/master' 4cb3818
Philip Arndt parndt Get the new migration in the gemspec too. 73dc885
Philip Arndt parndt Crud can be a bit sweeter by not loading in objects twice on the edit…
… action and by prepending the object's find before all other filters (thus ensuring it's always available).
Philip Arndt parndt Tag features specific to InquirySetting stuff. d1f13d4
Philip Arndt parndt Inquiries functionality updated. 40ef1ba
Uģis Ozols ugisozols Finished Latvian translations for Settings. 57a07fd
Maarten Hoogendoorn moretea Updated Image&Resource to new Dragonfly API 29d5669
Maarten Hoogendoorn moretea Fixed mime type validator b2b0eb2
Philip Arndt parndt Don't need nested navs. (ht: kplawver - thanks! Semantics *are* fun) b863bdd
Maarten Hoogendoorn moretea Added url method to controller, which returns a url for a given image…
…, and size
Philip Arndt parndt We'll need the clearfix back though incase you want to do floats in y…
…our submenu (which you probably do).
Maarten Hoogendoorn moretea Image insert dialog now uses images_controller#url to determine where…
… it should link to.
Philip Arndt parndt Merge remote branch 'moretea/dragonfly_fix' 51fdbe1
Commits on Aug 28, 2010
Philip Arndt parndt IE is special.... so use jQuery to insert the image instead. fc8a54f
Philip Arndt parndt well, we know the rest weren't true. e363c30
Philip Arndt parndt DRY up 9776138
Philip Arndt parndt Bring webkit on par with the other browsers with the replaceable magic. 547c0a5
Philip Arndt parndt Thanks to Maarten for pointing out our need for html_safe on IE (ht: …
Philip Arndt parndt You may now paste at your cursor position in Webkit browsers (Safari,…
… Chrome). Closes GH-135 (finally). It's worth noting that if you paste multiple paragraphs we still have problems with you doing that inline to a paragraph in any browser.
Philip Arndt parndt mongrel should be in the development gem group. a4eff83
Steven Heidel Whoops, don't want to make users install this with all its dependency…
… problems.
Philip Arndt parndt aaaand relock 533b3c4
Philip Arndt parndt state our requirement on action_controller 3ec1010
Philip Arndt parndt fix install bug where it couldn't find a file we didn't bundle with t…
…he gem (oops). (ht: mchung)
Commits on Aug 29, 2010
Philip Arndt parndt Specify bundler version to use in Gemfile. ee2aeec
Philip Arndt parndt Let's not confuse people with things that no longer exist :) 72a4973
Philip Arndt parndt Update references to the master branch to the rails2-stable branch in…
Commits on Aug 30, 2010
Philip Arndt parndt Update the changelog from -> (we forgot, oops) ad1a00c
Philip Arndt parndt merged in the changelog from rails2-stable branch to get the…
… entry.
Philip Arndt parndt This is how rails gets the app constant 671b3b6
Philip Arndt parndt De-couples Refinery::I18n from the main app and Closes GH-163 58cb6db
Philip Arndt parndt We can't use the ActionController::Base method in our models. Closes G… 8ba3330
Philip Arndt parndt CSS now allows for bigger sentences and other languages. Closes GH-152 8944049
David Jones djones update wording on gemspec 4ce9b57
Philip Arndt parndt Make it so that the translate functionality does not result in a span…
… when there is a missing translation but instead returns a simple string.

Now the UI is usable on languages with incomplete translations in development mode.
Philip Arndt parndt use specific versions. 699e7d3
Philip Arndt parndt Shhhh... don't tell 0c44d97
Philip Arndt parndt Qualify bdc767e
Philip Arndt parndt Make final output safe. 120a4f1
Philip Arndt parndt Only once the database is setup. 915babf
Philip Arndt parndt implement new image_fu, good for now. Adds image name to the crazy ne…
…w urls.
Philip Arndt parndt Sometimes we don't need to change the translation, like when the key …
Philip Arndt parndt This can fail when the controller is 'not ready' for one reason or an…
…other. Closes GH-164.
Philip Arndt parndt can't rely on this error for some strange reason the translations don…
…'t load, check the opposite.
Philip Arndt parndt Ensure we see the proper message. 0de8679
Philip Arndt parndt Prepare gemspec. d2da3b6
frederico frederico when i generate an plugin without attributes with string type this in…
…it file is gettiing fail. the change is check if atributes is an empty array.
Philip Arndt parndt Clean up dependencies, move as many plugins to gems as possible. c7d72dd
Philip Arndt parndt Check whether a string exists and it's not called title. bd19061
Philip Arndt parndt new lock for future rc2 (which is current master) db9844d
Commits on Aug 31, 2010
Philip Arndt parndt We can hack dragonfly waaaay more cleverly. 6112f95
Philip Arndt parndt Added thumbnail method to image to encapsulate what was happening in …
…image_fu that is useful for other features too.
Philip Arndt parndt Merged in plugin API changes from Maarten's work (ht: MoreTea - thanks!) c5bde6e
Philip Arndt parndt Update inquiries dependency to latest. 1082b34
Philip Arndt parndt Make task smarter by not trying to copy files that don't exist. dc4cd34
Philip Arndt parndt Hmm, wonder what happens when I set build = nil in the version number…
…... oh! Looks like it removes the 'beta' and 'rc' stuff from the version number... Well in that case; game on! (Closes GH-167)