Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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
Commits on Apr 27, 2011
@zenchicken zenchicken Use a slightly more sensible approach - clear entire cache if Rails.c…
…ache#delete_matched isn't supported (say in Memcache)
a83432d
@zenchicken zenchicken Merge branch 'master' of git://github.com/resolve/refinerycms f6c3b81
@ugisozols ugisozols Merge branch 'master' of git://github.com/resolve/refinerycms d471f02
Commits on May 03, 2011
@parndt parndt Changed example refinerycms-inquiries version to '~> 1.0' 1757cca
@veeti veeti Finnish translations for dashboard activity feed c37d63f
@veeti veeti Some changes in Finnish translations 31814a4
@veeti veeti Fixes and other changes in Finnish translation for authentication plugin 67707ed
@parndt parndt Merge pull request #655 from rojekti/i18n_fi.
Additions to Finnish translation
b073eba
Commits on May 04, 2011
@veeti veeti Removed titleize from dashboard page titles
The reason for this change is localization: in many languages, the output of titleize is grammatically incorrect.

(In addition, edited the English locale so that the titles appear the same as before.)
429b4b2
@parndt parndt Attempt to maintain consistency now that we're not using .titleize - …
…Please check your locales.
b2e9ba3
Josef Šimánek Czech translation minor change 6102159
Commits on May 05, 2011
@parndt parndt Fix highlighting when page is requested using its id. 75a0d8a
@parndt parndt Refactored much of the internals of how menus and collections of page…
…s are generated and rendered. Menu is 3x faster for us when rendering a set of 600 pages. (ht: mhaylock)
c7ce22e
@parndt parndt Merge remote-tracking branch 'zenchicken/master' 41a88c1
@rounders rounders Closes GH-658 0dac805
@parndt parndt Merge remote-tracking branch 'rounders/master' 094f877
@djones djones support the new Google Analytics site speed feature 5507ae4
@parndt parndt Make page_title not link when there is no url method to respond to. 7ed88db
@nruth nruth Adding a Gotchas section to the attaching to existing Rails app guide 5dc6fe1
@parndt parndt Using seo_meta 1.0.6 as a minimum for improved consistency. 95d8b6f
@parndt parndt Merged from master branch. f085e3d
Commits on May 06, 2011
@parndt parndt Merge pull request #663 from nruth/note_on_integrating_w_existing_app
Adding a Gotchas section to the attaching to existing Rails app guide
bee470e
@parndt parndt Updated jquery.html5-placeholder-shim.js to latest from https://githu… d9e850a
@rounders rounders fix errors for heroku and duostack. closes GH-664 3306410
Commits on May 08, 2011
@rounders rounders added a section on caching on heroku 58acda4
@parndt parndt Merge pull request #665 from rounders/master
fix for heroku deployments (issue 664) and added section on caching to heroku guide
a8e8c22
Commits on May 09, 2011
@parndt parndt Bundle updated. a1206e4
@leemcalilly leemcalilly Edited doc/guides/8 - Tips and Tricks/4 - How to setup Google Analyti…
…cs.textile via GitHub
133c54d
@srawlins srawlins Fixing issue #662 by making the to_run string not be altered through …
…a "|", which removed the last character.
9610852
@bitflut bitflut Unclutter resource picker. Update german translation as we are not us…
…ing %{what} for the resource picker. Fix double style attributes on image picker tag by inserting into existing attribute.
0b849ee
@parndt parndt Merge pull request #666 from leemcalilly/patch-1
Edited doc/guides/8 - Tips and Tricks/4 - How to setup Google Analytics.t
56c13be
@parndt parndt Merge pull request #667 from srawlins/patch-2
Fixing issue #662; the to_run string should not be altered through a '|'
2e38a8c
@parndt parndt Merge pull request #668 from bitflut/master
Clean resource picker
8da92bc
Commits on May 10, 2011
@parndt parndt Implemented :translator role whereby a user is allowed access only to…
… update pages that not the default frontend locale.
4beff8e
@parndt parndt Strange, this should be executable. c56724b
@parndt parndt Merge branch 'master' into performance 3241473
@keram keram Fixed some loved typos ;-) e4e9c18
Commits on May 11, 2011
@parndt parndt awesome_nested_set is now a gem again, woohoo. 6286e41
@hvirring hvirring Upgraded to Dragonfly v0.9.0 and replaced aws-s3 with fog gem (requir…
…ed by latest Dragonfly)
12b780b
Commits on May 12, 2011
@senior senior Fix for absolute URL links in refinery not working for SSL enabled sites 83d769d
@parndt parndt Whitespace apparently dd7d4fa
@parndt parndt Fixed grammatical error (it's -> its) 140eda3
@mchung mchung Updated docs 0a32bc7
@parndt parndt Merge pull request #675 from mchung/patch-1
Updated docs
49575d5
Commits on May 13, 2011
@parndt parndt Merge branch 'master' into performance 29dd76c
Commits on May 14, 2011
@ugisozols ugisozols Merge branch 'master' of git://github.com/resolve/refinerycms 9c5c3ac
@ugisozols ugisozols Use arel style instead of dynamic finder. 77fbc07
@parndt parndt Merge pull request #679 from ugisozols/77fbc07e
Use arel style instead of dynamic finder.
a47ab39
Commits on May 15, 2011
@mhaylock mhaylock Change all objects with init functions to acknowledge 'initialised' s…
…tate.
e0bcffd
@parndt parndt Merge pull request #680 from mhaylock/master
admin.js init fix
ca0b153
@mhaylock mhaylock Loosened dependency on seo_meta and regenerated gemspec. 1b7cefe
@ugisozols ugisozols Use arel style instead of dynamic finder. a9b00c5
Commits on May 16, 2011
@endor endor area tags cannot be handled as block tags 5884097
@parndt parndt Merge pull request #681 from endor/master
area tags cannot be handled as block tags
fdf5ced
@keram keram revert changes in ie7 hack 7ca536b
Commits on May 18, 2011
Hamish Evans awesome_nested_set documentation reference df45a8d
@parndt parndt Merge pull request #683 from ruby-fu-ninja/master
acts_as_nested_set documentation link
c9a4704
scambra allow to set conditions for image and resource pickers d725cdd
@keram keram Settings administration show scope of setting 7c4d087
@joeellis joeellis Edited doc/guides/6 - Updating Refinery/1 - How to update Refinery to…
… the latest stable version.textile via GitHub
41b8d7d
@parndt parndt Merge pull request #685 from joeellis/patch-3
Edited doc/guides/6 - Updating Refinery/1 - How to update Refinery to the
6ec44ed
@parndt parndt Merge pull request #684 from scambra/master
allow to set conditions for image and resource pickers
0dab972
@keram keram settings title small refactoring 9450df9
Commits on May 19, 2011
@parndt parndt State of my mind for getting performance branch tests working. ea4b0cf
@parndt parndt Merge pull request #669 from keram/master
fixed typos
019cd15
@parndt parndt Finally figured out that scope :in_menu was caching and not with_glob…
…alize. (ht: sbeam)
80a3b63
@parndt parndt Eager load :children and :slugs associations. 169748a
@parndt parndt Merge branch 'master' into performance 22d70db
@parndt parndt Merged master branch in, requiring next version of seo_meta. 755ee27
@parndt parndt seo_meta updated to 1.1.0 35862d6
@parndt parndt Merge remote-tracking branch 'origin/performance' 6552ebf
@parndt parndt Updated globalize3 dependency to >= 0.1.0.beta2 58cf58d
Commits on May 20, 2011
@ugisozols ugisozols Use latest version of seo_meta. acbdcf8
@ugisozols ugisozols Use seo form partial from seo_meta plugin directly instead of duplica…
…ting it.
6068971
@ugisozols ugisozols Bump up rspec version to 2.6. 4c4a122
@ugisozols ugisozols Use form_advanced_options_seo partial as before. #689. 5e59cf6
@veeti veeti Small fix in Finnish translation 1e0af65
@veeti veeti Added missing Finnish translation 4850f53
@parndt parndt Merge pull request #691 from rojekti/i18n_fi
Finnish addition & fix
c7a0c3f
@parndt parndt Merge pull request #693 from keram/master
Show scope of refinery setting in settings administration
76ecc0f
Commits on May 21, 2011
@parndt parndt This is not 0.9.9.21 anymore. 3d25ec5
@parndt parndt Ensure any index directory doesn't appear in the gemspec a9c534a
Commits on May 22, 2011
@parndt parndt Merged remote branch 'ugisozols/master' d3fbc47
@parndt parndt Help out those applications that have just auto-updated to rake 0.9.0…
… which fixes #690 :-)
a0c0d6e
@parndt parndt We need a 0.9.9.22 version to address a number of issues before we mo…
…ve to 1.0.0
8f12450