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: resolve/refinerycms
...
head fork: resolve/refinerycms
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Mar 31, 2011
@willrjmarshall willrjmarshall Patching the resource_picker d93b148
@willrjmarshall willrjmarshall Second bug fix, upping the patch # by one so bundler will actually work 7da74a3
Commits on Apr 01, 2011
@parndt parndt Remove one more place where core knows about pages and move it to pag…
…es instead.
4562f4d
Commits on Apr 02, 2011
@zenchicken zenchicken Improve robustness of Page#expire_page_caching for both ActiveSupport…
…::Cache::FileStore and ActiveSupport::Cache::MemoryStore
d1f56ae
@zenchicken zenchicken helps to fill in todos, even when tired. Ensure user is notified of u…
…nsupportive cache store on failed Rails.cache.delete_matched
0a5e09f
Commits on Apr 03, 2011
@itgod itgod optimizing locale index size 880f1dd
@itgod itgod allow locales like zh-CN 599edef
Commits on Apr 04, 2011
@parndt parndt Merge remote branch 'willrjmarshall/resource_picker_patch' 9855200
@parndt parndt Use faster seo_meta 1.0.3 e9d9002
Commits on Apr 05, 2011
@rocksolidwebdesign rocksolidwebdesign Added proper calls to reset_column_information in the migrations c2957c5
@rocksolidwebdesign rocksolidwebdesign Added reset_column_information calls to appropriate self.down methods…
… in the migrations, small namespace fix for a missing :: prefix
598f85c
@rocksolidwebdesign rocksolidwebdesign Updated so rollback STEP=18 works, better at least d0b41f7
@rocksolidwebdesign rocksolidwebdesign Fixed all rollback migrations d1cd5c2
@parndt parndt Document what has changed. 17e5999
@rocksolidwebdesign rocksolidwebdesign Fixed some locale related stuff in the page model/controller. Closes 563 7db3cc4
@parndt parndt Merge remote branch 'rocksolidwebdesign/master' 4773626
@rocksolidwebdesign rocksolidwebdesign Added all locale pages to sitemap except hidden pages and drafts. Clo…
…ses GH-585. Closes GH-586.
60501e3
@parndt parndt Merge remote branch 'rocksolidwebdesign/master' 2684e8c
scambra Fix overriding cache_menu, if cache_menu was enabled globally you cou…
…ldn't disable it in a render :partial call

Enable to override request.path in cache name, so cache can be shared for all requests. I use a top menu with hidden children and selected item is not relevant, so that menu can be shared for all requests.
4dcc674
@parndt parndt Now that we've sorted out our issues with memory_store default to tha…
…t for caching. Removed File.writable? test for caching (if you implement file caching you already know it's writable).
60acdda
@parndt parndt Updated the update tutorial with a clearer warning. Closes GH-589 59fb7b6
@parndt parndt Refinery on Rails 3.0.6 (upped requirement to Rails 3.0.6 - see http:… c8bc1c6
Commits on Apr 06, 2011
@parndt parndt Ensure file creation specs clean up after themselves. ed89dc4
@parndt parndt Cucumber now cleans up files and images and destroys them rather than…
… just a SQL delete which allows hooks to run (like the ones that clear out the uploaded files).
d740d90
@mhaylock mhaylock Re-enable cache when logged in, this avoids slowdown of site when adm…
…in logged in.
f265fad
@parndt parndt master should be one version ahead. dcace7c
Commits on Apr 07, 2011
@rweng rweng fix for https://github.com/resolve/refinerycms-blog/issues/#issue/58
…and others who use nested scopes in routes.rb
bcc2100
@parndt parndt Updated changelog for the impending release of 0.9.9.16 0a3bc84
Commits on Apr 08, 2011
@adamico adamico ignoring vendor/ruby 2556094
@adamico adamico Closes GH-591, adding say and say_with_time to migrations 1c5c0c8
@parndt parndt tmp wasn't ignored properly. 6c55f82
@parndt parndt When we load parts we should load their translations too. 191d8d5
@parndt parndt Rather than mapping in memory we can use ARel to select the Page::Tra…
…nslation#page_id column and make Page think it's the Page#id (which it is).
f0b67a8
scambra fix will_paginate params, changing page in link_to dialog keeps your …
…resource option selected
e89c434
@parndt parndt No reason to specify on separate lines. 7bec685
@parndt parndt Git sourcing globalize3 for now. 5e1f8da
Commits on Apr 09, 2011
@parndt parndt We can just call the method rather than putting the call inside a mod…
…ule_eval
a679a53
@parndt parndt Merge remote branch 'scambra/fix_paginating' 1ea89f9
@parndt parndt Merge remote branch 'adamico/master' 44dfef0
Commits on Apr 10, 2011
@parndt parndt Incremented version to 0.9.9.17 50b1f78
@parndt parndt Don't need logger.warn, just warn. b648570
@parndt parndt Sped the menu up somewhat. Around 33% in my tests. It's still slow. db26d74
@parndt parndt Using basic Fiber concurrency I'm seeing faster render time (as repor…
…ted by web browser + rails server). Includes wee shim for < 1.9
68003b3
Commits on Apr 11, 2011
@koa koa mass-assignment-protection implemented da1fb97
@koa koa fixed mass assignment protection for initializing with a seed 6ed1a07
@koa koa Merge branch 'master' of git://github.com/resolve/refinerycms
Conflicts:
	pages/app/models/page.rb
4369d56
@ringods ringods Extended S3 guide to explain setting the environment variables 0b8740f
scambra validate html link tag for home css, theme attribute is not valid 0a7cefc
@koa koa Fixes in mass assignment protection dc7d268
@koa koa comment improved 4499d44
@koa koa Included seo_meta with mass assignment protection e6e5d0b
Commits on Apr 12, 2011
Pascal Van Hecke first little modification to Getting started guide as test dcfcf72
Pascal Van Hecke Inserted links in the Getting Started Guide to the 8 orphan docs at h… 77a5c7b
Pascal Van Hecke Corrected a mistake in the footnote syntax f23e724
Pascal Van Hecke Github doesn't seem to render footnotes with an anchor - trying to co…
…rrect by adding an extra ID
db6f3bb
Pascal Van Hecke Github doesn't seem to render footnotes with an anchor - trying to co…
…rrect by adding an extra ID
d7452c4
Pascal Van Hecke Github doesn't implement footnotes correctly according to the Textile…
… markup definition... giving up, will try to submit a bug request with them
7fc2b5a
@parndt parndt Merge remote branch 'scambra/validate_html' 5a0d7c5
Commits on Apr 13, 2011
@parndt parndt Merge remote branch 'koa/master' a8258be
@parndt parndt Fixed faults with pages and their titles in the admin listing. Also f…
…ixed inconsistent i18n locale application by updating to refinerycms-i18n 1.0.0 which closes #592
bb01341
@parndt parndt Cleaned up diff whitespace. a5b9e06
@ugisozols ugisozols There's no need for page crud in pages dialog controller. c523e6b
@ugisozols ugisozols Remove some deprecation warnings and code related to them. f2970ed
@ugisozols ugisozols Remove /admin catch all route. 0fb6690
@lurcio lurcio Added Strip Non Ascii preference to has_friendly_id 059f47a
Josef Šimánek Support for models in modules for crudify 12a0977
Josef Šimánek Support for models in modules for uncrudify 04a96a2
@parndt parndt Merge remote branch 'SmartMedia/master' 55a1b46
@parndt parndt Merge remote branch 'ugisozols/master' d2427cf
@parndt parndt Re-deprecate css_for_menu_branch so that people know there's a better…
… alternative until 1.1 when it becomes the only option.
14460d3
Commits on Apr 14, 2011
@parndt parndt Update version in guide and hint that it may not be the latest. de61265
@minikomi minikomi Add new page parts dialog should remain in the dom to allow multiple …
…new parts per save
24294eb
@parndt parndt Working fine on Rails 3.0.7.rc1 - all specs/features pass. 29a2063
@parndt parndt Merge remote branch 'minikomi/master' which closes #615 0358c12
@keram keram Edited core/public/javascripts/wymeditor/jquery.refinery.wymeditor.js…
… via GitHub
e897531
Commits on Apr 15, 2011
@parndt parndt Updated changelog for 0.9.9.17. Should be the last one before 1.0.0. 210f1e1