Skip to content

HTTPS clone URL

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: refinery/refinerycms
...
head fork: refinery/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 Aug 24, 2010
@parndt 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.
4d8ef54
@parndt parndt new version beta2. d9fe84c
@semaperepelitsa semaperepelitsa translating dashboard to Russian 0b8fdc8
@semaperepelitsa semaperepelitsa load meta description option title from locale 7fe1213
@semaperepelitsa semaperepelitsa correct misspelling a581340
@semaperepelitsa semaperepelitsa translating pages to Russian b1458e5
@semaperepelitsa semaperepelitsa improving Russian translation eb92d1b
@semaperepelitsa semaperepelitsa correcting typo in Russian locale fa48fae
@semaperepelitsa semaperepelitsa removing unnecessary quotes in Russian locale 51ceb63
@semaperepelitsa semaperepelitsa correcting error in Russian locale dedf737
@semaperepelitsa semaperepelitsa removing unnecessary quotes in Russian locale f7c0035
@semaperepelitsa semaperepelitsa translating images plugin to Russian 5964c1b
@semaperepelitsa semaperepelitsa typography improvements in resources plugin's Russian locale a1420b7
@semaperepelitsa semaperepelitsa improvements in resources plugin's Russian locale 8531ed8
@semaperepelitsa semaperepelitsa improving Russian locales 67c2c81
@semaperepelitsa semaperepelitsa improving refinery_settings plugin's Russian locale dc11f8a
@semaperepelitsa semaperepelitsa improving auth plugin's Russian locale f44a6d0
@semaperepelitsa semaperepelitsa improving inquiries plugin's Russian locale bd2cdd2
@semaperepelitsa semaperepelitsa updating quotes to standard russian quotes f8c137b
@semaperepelitsa semaperepelitsa correcting typo in Russian locale 8b851df
@semaperepelitsa semaperepelitsa improving refinery_setting plugin's Russian locale 355fdd5
@ugisozols ugisozols Added first draft of Latvian translations for Settings. 5a10aee
@peterz peterz Merge remote branch 'upstream/master' 7ba83fd
@ruprict ruprict Add view= to a couple of refinery:override example texts e887e5b
@parndt parndt Merge remote branch 'ruprict/master' 0579c02
Commits on Aug 25, 2010
@parndt 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.
0834906
@parndt 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.
ac9b8ec
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.
ba18efe
Steven Heidel Everything else about this new setup seems to be working, except for …
…public folders in engines.
a4bded7
@parndt parndt split assets into core.js and admin.js so that we can load them separ…
…ately as required.
5f45de8
Steven Heidel Remove files needed for packaging separate gems. The only exception i…
…s inquiries, which should be extracted eventually.
b4f31fc
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-0.9.7.13
9d4111e
@parndt 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
@parndt parndt Extracted the inquiries engine out to its own repository. 76e9ee2
@parndt parndt goodbye core inquiries from Gemfile too. a733bd9
Steven Heidel Merge with master, only problem was Gemfile as this has changed. 6aada1a
@parndt parndt Move public back to core where it belongs. f8f91c6
@parndt parndt use require refinerycms instead which will load in all of the default…
… engines (even though previously I said 'yeah, use refinery/defaults').
0a13146
@parndt parndt Reshuffle to enable gems to build again. 51c996e
@parndt parndt All things gems. bda5081
@parndt parndt close with trailing slash db74975
@parndt parndt Clean up what is / isn't required. d0ab21c
@parndt parndt lib and vendored 097e78e
@peterz peterz Merge remote branch 'upstream/master' ee72aba
@peterz peterz Add missing sl translations 9d665d6
@raul raul Spanish translations updated 0bf101d
@djones djones temporarily fix asset caching bug in Ruby 1.9.2 until we've got a pro…
…per fix
32b4ede
@parndt parndt Merge remote branch 'peterz/master' bff72e1
@parndt parndt Merge remote branch 'raul/master' 9a0c222
@parndt parndt We can check against the ruby version so that it works normally in 1.…
…8.7 still.
46deeb4
@djones djones Fix the differences between Ruby 1.9.2 and the others. Closes GH-154 9831ef3
@djones djones merge 661381f
@raul raul Vendored translation files added to the I18n.load_path in an initiali…
…zer. Fixes fail in manage_images.feature:23
950cea9
@parndt parndt Fixes dashboard_feature:35 a3753a3
@parndt parndt oh, look, beta3 ba35805
@parndt parndt Add in missing initializer to install script. Would be nice to just c…
…opy them all..
0657b67
Steven Heidel Refactoring, bugfixes, and todos for bin/refinerycms. a40c638
Steven Heidel Merge branch 'master' of git://github.com/resolve/refinerycms 550c913
Steven Heidel RMagick is in the Gemfile as it is more difficult to install, and add…
… note to gemspec to avoid errors.
f6493db
Steven Heidel Changes to gemspecs mean changes to Gemfile.lock. a433049
@djones 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
d5ee1e0
@parndt parndt Merge remote branch 'stevenheidel/master' dad9d24
@parndt parndt Sort files, regenerate 05524df
@parndt parndt Avoids conflicts with unique ids 8c0d56a
Commits on Aug 26, 2010
@parndt 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.
5f57318
@parndt parndt Update to beta4. 72435c1
@parndt parndt relock to new version. 839b14e
@parndt parndt remove hackety hack 4f4fba5
@parndt parndt Added more precise logic, now we only append a locale string when app…
…ropriate (when not in the default locale). Closes GH-143
b939578
@parndt parndt follow the same pattern of naming 53286ca
Steven Heidel Fix encoding errors that were causing problems in rack-test. Thanks to
…http://github.com/alan for his branch.

Cucumber is now all green on Ruby 1.9.2. Closes GH-156.
bef87db
@parndt parndt Merge remote branch 'stevenheidel/master' 7ee76a8
Steven Heidel Fixed deprecation warnings from old mailer API. Closes GH-157. 743187c
@parndt parndt Merge remote branch 'stevenheidel/master' 6e7abfd
@parndt parndt Always use the latest rspec 2.0 beta 5c4d924
@djones djones fix broken links in readme now Rails 3 support is on the master branch. b9d6108
@djones djones tidy up the wording in the readme 67a4bea
@parndt parndt carlhuda owns the bundler repository. eafcde3
@djones djones make the X stand out a little less 40db974
@djones 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
@parndt parndt Load in the engines that we're using dynamically rather than writing …
…out each one.
ac61ce1
@parndt 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.
14ee18c
@parndt parndt Use the gems man, the gems! 44723c2
@parndt parndt Merge remote branch 'stevenheidel/master' 4cb3818
@parndt parndt Get the new migration in the gemspec too. 73dc885
@parndt 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).
9e63254
@parndt parndt Tag features specific to InquirySetting stuff. d1f13d4
@parndt parndt Inquiries functionality updated. 40ef1ba
@ugisozols ugisozols Finished Latvian translations for Settings. 57a07fd
@moretea moretea Updated Image&Resource to new Dragonfly API 29d5669
@moretea moretea Fixed mime type validator b2b0eb2
@parndt parndt Don't need nested navs. (ht: kplawver - thanks! Semantics *are* fun) b863bdd
@moretea moretea Added url method to controller, which returns a url for a given image…
…, and size
8ff570f
@parndt parndt We'll need the clearfix back though incase you want to do floats in y…
…our submenu (which you probably do).
ef0b294
@moretea moretea Image insert dialog now uses images_controller#url to determine where…
… it should link to.
30579d0
@parndt parndt Merge remote branch 'moretea/dragonfly_fix' 51fdbe1
Commits on Aug 28, 2010
@parndt parndt IE is special.... so use jQuery to insert the image instead. fc8a54f
@parndt parndt well, we know the rest weren't true. e363c30
@parndt parndt DRY up 9776138
@parndt parndt Bring webkit on par with the other browsers with the replaceable magic. 547c0a5
@parndt parndt Thanks to Maarten for pointing out our need for html_safe on IE (ht: …
…MoreTea)
56eee89
@parndt 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.
69a124f
@parndt 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.
b3f4395
@parndt parndt aaaand relock 533b3c4
@parndt parndt state our requirement on action_controller 3ec1010
@parndt parndt fix install bug where it couldn't find a file we didn't bundle with t…
…he gem (oops). (ht: mchung)
1f0f21d
Commits on Aug 29, 2010
@parndt parndt Specify bundler version to use in Gemfile. ee2aeec
@parndt parndt Let's not confuse people with things that no longer exist :) 72a4973
@parndt parndt Update references to the master branch to the rails2-stable branch in…
…stead.
1b8e0bb
Commits on Aug 30, 2010
@parndt parndt Update the changelog from 0.9.7.12 -> 0.9.7.13 (we forgot, oops) ad1a00c
@parndt parndt merged in the changelog from rails2-stable branch to get the 0.9.7.13…
… entry.
4059c25
@parndt parndt This is how rails gets the app constant 671b3b6
@parndt parndt De-couples Refinery::I18n from the main app and Closes GH-163 58cb6db
@parndt parndt We can't use the ActionController::Base method in our models. Closes G… 8ba3330
@parndt parndt CSS now allows for bigger sentences and other languages. Closes GH-152 8944049
@djones djones update wording on gemspec 4ce9b57
@parndt 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.
aba36e8
@parndt parndt use specific versions. 699e7d3
@parndt parndt Shhhh... don't tell 0c44d97
@parndt parndt Qualify bdc767e
@parndt parndt Make final output safe. 120a4f1
@parndt parndt Only once the database is setup. 915babf
@parndt parndt implement new image_fu, good for now. Adds image name to the crazy ne…
…w urls.
c4d486d
@parndt parndt Sometimes we don't need to change the translation, like when the key …
…exists.
56ba163
@parndt parndt This can fail when the controller is 'not ready' for one reason or an…
…other. Closes GH-164.
c310b1d
@parndt parndt can't rely on this error for some strange reason the translations don…
…'t load, check the opposite.
96de427
@parndt parndt Ensure we see the proper message. 0de8679
@parndt 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.
bdbb6b5
@parndt parndt Clean up dependencies, move as many plugins to gems as possible. c7d72dd
@parndt parndt Check whether a string exists and it's not called title. bd19061
@parndt parndt new lock for future rc2 (which is current master) db9844d
Commits on Aug 31, 2010
@parndt parndt We can hack dragonfly waaaay more cleverly. 6112f95
@parndt parndt Added thumbnail method to image to encapsulate what was happening in …
…image_fu that is useful for other features too.
1f4bbeb
@parndt parndt Merged in plugin API changes from Maarten's work (ht: MoreTea - thanks!) c5bde6e
@parndt parndt Update inquiries dependency to latest. 1082b34
@parndt parndt Make task smarter by not trying to copy files that don't exist. dc4cd34
@parndt 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)
aae9bb2
@moretea moretea Move from acts_as_tree to awesome_nested_set 42d5876
@parndt parndt new versions 0f9399f
@djones djones fixed yardopts to look at where all our code is now located. This mea…
…ns the automated documentation should be up and running again.
2e20899
Commits on Sep 01, 2010
@parndt parndt Added indexing and removed ambiguity in lookup. 36d9e6d
Tomás Senart - # TODO: Check output to see whether or not it worked ef8c734
Tomás Senart # TODO: Allow adding extra gems in the generator 50dcf62
@parndt parndt Just exclude the main gem and rmagick 1c60c26
@parndt parndt Suppress cases where recent items break into two or more lines as is …
…frequently the case with spams.
72caad1
@parndt parndt Only apply max-height to the correct set of items, not records trees …
…like pages lists.
0826788
@djones djones Now we've got Rails 3 ready, time to recheck the list of todos for th…
…e 1.0 release
4ff298e
@djones djones engine not plugin api a477460
@djones djones rework the todo list a little more d53ccc3
@djones djones break goals into 0.9.9 and 1.0.0 release 8d067f2
@djones djones added extra notes (thanks StevenHeidel) about how the engine api will…
… work. Also added people responsible for various todos.
2f2afd2
@djones djones fix typo 35f6ab6
@djones djones oh sorry Steven, your last name got a little jumbled c4d4222
Steven Heidel Don't rely on Child Labour if using the rubyinstaller on Windows. 67a3373
@parndt parndt Merge remote branch 'stevenheidel/master' Closes GH-171 0ab2b33
@dc5ala dc5ala Updates i18n_de locales to match current i18n_en. Closes GH-172 0eee175
Commits on Sep 02, 2010
Steven Heidel Don't use Rails default README in Refinery applications. 7bfa969
Steven Heidel Add all documentation to the gem.
license.md is particularly important because if you don't distribute software with a license, then it isn't licensed.
11a9110
Steven Heidel Copy over the readme.md to new apps so that users know where to acces…
…s refinerycms resources.
63b14ee
@parndt parndt * selector and we may as well regenerate the gemspec now? Closes GH-173 6013df9
@parndt parndt Better say something. d683dcb
@parndt parndt Reordered, seemed backwards. 5c7d5d3
@parndt parndt Core needs to be its own module 817becb
@parndt parndt Merge branch 'development' da8bc80
@parndt parndt Prevent looking up login? over and over and over again because this i…
…nformation can be supplied by the layout.
afdb407
@parndt parndt Update image handling to be more like dragonfly intended. Fixed issue…
…s with the image inserter where it'd create several physical images and open alert boxes (fixed using new image.thumbnail(geometry) method)
71bb6ef
@parndt parndt Make better use of nested sets. 7b88635
@parndt parndt stop rel tag looking like rubbish 0dd42e8
@ugisozols ugisozols First draft of Latvian translations for Users. d55d9bb
@ugisozols ugisozols Merge branch 'master' of git://github.com/resolve/refinerycms 56f0615
@moretea moretea Moved from inheriting, to including Refinery::ApplicationController 8d8d60b
@parndt parndt Serious hacks require serious documentation. 806a9eb
Commits on Sep 03, 2010
@parndt parndt Merge remote branch 'moretea/application_controller' Closes GH-174 7df7d4e
@ugisozols ugisozols Merge branch 'master' of git://github.com/resolve/refinerycms f7820fb
@ugisozols ugisozols Remove .no_users_yet translation because if there are no users we aut…
…omatically get redirected to create new user page.
c319109
@parndt parndt New version of i18n out, use that. 458c158
@parndt parndt Wee performance gains b1f2330
@parndt parndt Controllers must be namespaced properly to /admin otherwise resources…
… nested deeply link wrongly in the menu.
8139106
@parndt parndt Refactored refinery settings to finally have some sanity. ebfa28c
@kivanio kivanio translations' review for portuguese pt-BR 3cad959
Commits on Sep 04, 2010
@kivanio kivanio this word make more sense - Closes GH-175 and Closes GH-176 3679a02
Commits on Sep 06, 2010
@parndt parndt Use data-method delete and data-confirm for new delete confirmation d…
…ialogues and RESTful routes (ht: kblake) Closes GH-177
5589b9f
@parndt parndt Ensure that generates can generate and destroy (and remove any change…
…s introduced in destroy). Better handle the first string attribute as the first attribute may not be usable for many features.
91fd3ee
@parndt parndt Better URLs for resources too 2aaeb5d
@parndt parndt Get rid of anything between <em></em> tags in the delete confirmation…
… prompt.
d3d392d
@parndt parndt Use dragonfly geometry strings not symbols and make html_safe. 9ef2c70
@parndt parndt Add translation support to the resource picker and make it work prope…
…rly under Dragonfly.
605e2f6
Karmen Blake Add delete method to resource link to call correct restful route for …
…deletion.
67c9281
Karmen Blake Show wysiwyg formatted html not escaped text a87d484
@parndt parndt Applied a bit of formatting to code sections. 263256a
@parndt parndt Quieten down the headings, capitalise. 3b1372f
@parndt parndt Highlight responsible parties' names. fe1d029
@parndt parndt Not sure why it wants depth here. 5dba0a5
@parndt parndt The Ruby Way (tm) 0c7096d
@parndt parndt Ternary was returning nil on the else, refactored. d24ff1d
@parndt parndt Allow css to be disabled on the menu for those who don't need it and …
…want the increased speed without all the lookups.
69cd6f0
@parndt parndt use defined?() to avoid double checking and/or potentially overriding…
… the user when false is specified.
ad4088a
@parndt parndt we can remove another ternary that was nil in the else. 4fe73df
@parndt parndt Turn the application helper into lots of modules that are particular …
…to what's happening.
f1ba5f8
@parndt parndt Store helpers under helpers directory to reduce clutter. 7b6ea1a
Commits on Sep 07, 2010
@parndt parndt Move crud under refinery/ as it is rather specific to Refinery. 40ba89a
@parndt parndt Helpers are now Refinery::Helpers 92be187
@parndt parndt Move field focus code to core so that login screens get it too. cfb551c
@parndt parndt Load presenters better, dependencies now handled by autoload a697f28
@parndt parndt Sweepers seem to basically work but the cache isn't being expired. b56e319
@parndt parndt Make easier to translate and at the same time remove largely unused a…
…bility to change description to something else.
abc075d
@ugisozols ugisozols Added missing Latvian translations for resource picker. 4906c2b
@parndt parndt hoping this fixes the heroku issue of having to restart due to missin…
…g authlogic.
0632f03
@parndt parndt This engine requires nested sets 8a5fa02
@parndt parndt No longer require the use of child labour. ;) Closes GH-179 bf4c2cb
@parndt parndt See if we can't fix the dragonfly restart issue too. 560c151
@parndt parndt First step toward cucumber being modular. Added paths to config/cucum…
…ber.yml to achieve this, still working on getting the path_to stuff working. Don't want to have to use strings.
cba91b8
@parndt parndt regenerate gemspec etc and prepare for the next version later on. 49e5359
Commits on Sep 08, 2010
@parndt parndt Get all features running from all registered engines and have them re…
…turn correct paths using a slightly modified path_to. All behind the scenes and cucumber knows not the difference.
010cdff
@parndt parndt Specify the absolute location of autoload files. ca0e5c8
@parndt parndt RSpec now knows how to load specs from all engines using rake spec 4775855
@parndt parndt New inquiries gem that uses the new Cucumber modularisation 839fe73
@parndt parndt Merge branch 'master' into refinery_settings 1db7d6c
@parndt parndt Use new versions to mitigate API change 144d3a6
@parndt parndt Restore true and false values to working status after fixing the logi…
…cal fail.
9805132
@parndt parndt Closer but not there yet. Caches atleast expire now on save, but not …
…update_positions which bypasses AR.
e53507b
Commits on Sep 09, 2010
@parndt parndt Don't need to pass authenticity token anymore. caa13fb
@parndt parndt Attempt one at reordering nested lists. Some inconsistencies remain, …
…mostly with children. Likely this will get thrown out
c474cc4
@parndt parndt Check for Windows properly. 4ec015b
@parndt parndt You can now reorder but can't change parent. a8334e7
@parndt parndt Reordering now working with nested set, it seems. Removed debugging s…
…tatement for cache sweeper.
4ee7833
@parndt parndt use 0.9.9 instead seeing as we went to all that trouble. 16a126b
@parndt parndt Portfolio will have to be 0.9.8 when it's released too. 6731f78
@johanb johanb Best contribution ever e6f7f58
@parndt parndt The plan is to drop them all now dbacecc
@moretea moretea Updated the page reorder mechanism to work with awesome_nested_set.
And it even looks pretty.
2a898c4
@parndt parndt yeah.. ac3dad9
@parndt parndt Remove alert 44268e2
@parndt parndt Make readable. Also I've noticed that things are being placed in rand…
…om order in production mode atleast.
6744b43
@parndt parndt We don't need 'class' kthx 5e26510
@parndt parndt Assume the data is our enemy and hasn't come in with the correct orde…
…r. This could be the first use of a while loop in ruby that RefineryCMS has.
0e30796
@parndt parndt Merge branch 'sweepers' 19c8621
@parndt parndt relock for new inquiries version. 769eed6
@parndt parndt Copy the default stylesheets into the app so that they're ready to use. 31493f9
@parndt parndt new gemspec d5fb5bc
@parndt parndt to_s != to.s 0d5236a
@parndt parndt This works much better without the stylesheet.split.last.to_s part 4c70b98