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.
Commits on Aug 31, 2011
@parndt parndt *****SIGH***** e48db26
Commits on Sep 01, 2011
@mattmate mattmate Updated version number and added a tip on upgrading to major, minor a…
…nd bugfix releases.
8dee976
@parndt parndt Merge pull request #923 from mattmate/patch-1
Updated upgrade guide
8ef69a9
@parndt parndt Fixes #915 by specifically specifying rails as a dependency of refine…
…rycms-core
2613b22
@parndt parndt Not specifying autotest as a dependency of refinerycms-testing, if yo…
…u want it just add it to your app's Gemfile.
21c6818
@parndt parndt Improved 'wrong rails version' error message. 1723076
@mirosr mirosr Added bg locales in 1-0-stable 5e870ed
@parndt parndt Merge pull request #925 from mirosr/1-0-stable
Added bg locales in 1-0-stable
353f6c8
Commits on Sep 02, 2011
@parndt parndt Updated syntax from @page[:something] to @page.content_for(:something…
…) as the former is deprecated.
d4741be
Commits on Sep 03, 2011
@parndt parndt This guide may as well be based on 1.0.8 now. 934b49b
@parndt parndt Fixed typo which was breaking the URL for testing. (ht: tdelam) 245e9d9
@parndt parndt Sentences should end with a fullstop. 4ad6cc0
@gogogarrett gogogarrett fixes #932 - allows for easy deployment to heroku 547dcee
@parndt parndt Merge pull request #935 from gogogarrett/patch-10
Patch 10
afe69ba
@parndt parndt This spec really is supposed to test forceful destroy! 84aea17
Commits on Sep 06, 2011
@parndt parndt bundle updated 50cab35
Commits on Sep 07, 2011
@mirosr mirosr Added Bulgarian translation for wymeditor. 1afa8c2
@ugisozols ugisozols Regenerate gemspec [ci skip] f907508
Lake Denman The header 'Changing Part Parts for a single page' should be 'Changin…
…g Page Parts for a single page'
a7c1194
@mirosr mirosr Added Bulgarian translation for wymeditor. 78c6667
@parndt parndt Merge pull request #958 from mirosr/1-0-stable
Added Bulgarian translation for wymeditor
bafaa54
@gogogarrett gogogarrett Fixed typeo to Getting Started ReadMe 47e097f
@ugisozols ugisozols Merge pull request #960 from gogogarrett/1-0-stable
Fixed typeo to Getting Started ReadMe
b61235c
Commits on Sep 09, 2011
scambra fix seeds for ruby 1.8, instance_methods return array of strings, in …
…ruby 1.9 it returns array of symbols
ae95bff
scambra validate html 95ad7d3
scambra remove help for non-existing settings a7c98c1
scambra Translate settings into spanish and put them in a scope 031a135
Commits on Sep 12, 2011
scambra convert methods to sym instead of checking RUBY_VERSION 9142052
Commits on Sep 13, 2011
@parndt parndt Merge pull request #966 from scambra/1-0-stable
fix seeds for ruby 1.8, instance_methods return array of strings, in ruby
e338460
@linjunpop linjunpop Edited doc/guides/8 - Tips and Tricks/3 - How to test Refinery.textil…
…e via GitHub
09c7140
Nic Haynes Fixed a bug in the editor dropdown. Something like a 5px gap prevente…
…d easy access to the dropdown menu.
d8ffbec
@parndt parndt Merge pull request #986 from nicinabox/1-0-stable
Fixed a bug in the editor dropdown.
2237eee
Commits on Sep 14, 2011
Justin Edwards updated sass documentation bd42bb6
Commits on Sep 15, 2011
@parndt parndt Merge pull request #996 from vertjustin/1-0-stable
1 0 stable
a83e5e6
@joemsak joemsak Closes GH-824. Just update the core plugin to include pages_dialogs i…
…n menu match
ebe34ef
Commits on Sep 16, 2011
@rilla rilla Use modern factory_girl syntax. Closes GH-975. fb2b901
@parndt parndt Merge pull request #1004 from rilla/1-0-stable
Use modern factory_girl syntax. Closes GH-975.
d222b73
Commits on Sep 18, 2011
@ugisozols ugisozols When using refnerycms app generator wrap db password in quotes becaus…
…e if the password consists only of numbers the installation will fail with an error "can't convert Fixnum into String".
cb131a6
@ugisozols ugisozols Instruct user to add gem "fog" in Gemfile because it isn't there when…
… we generate app.
bd1b211
Commits on Sep 20, 2011
@ugisozols ugisozols Merge pull request #1001 from neotericdesign/1-0-stable
Closes GH-824. Just update the core plugin to include pages_dialogs in me
10bb873
Commits on Sep 22, 2011
@linjunpop linjunpop Add example for using find_or_set in controller 58a477c
@gogogarrett gogogarrett Added how to override javascript guide e3cedf5
@gogogarrett gogogarrett Updated custom javascript guide 8af0bfc
@gogogarrett gogogarrett Updated javascript guide fda84f3
@gogogarrett gogogarrett removed unneeded .swp and .org files 6d966cd
@gogogarrett gogogarrett changed filetype to .textile fc07fb3
@gogogarrett gogogarrett Improved guide with proper information 2c8c1de
@parndt parndt Ignore Rubinius' .rbx directory. 3668d2e
@robyurkowski robyurkowski Added section on configuring Pow. 499a6a5
@parndt parndt Merge pull request #1024 from robyurkowski/documentation/add-pow-doc-…
…to-s3-guide

Adds Pow section to Hosting / S3 guide
bf11565
@robyurkowski robyurkowski Fixed omission that would have led to querying a menu item's children…
… for siblings.
94cda1d
@parndt parndt Merge pull request #1025 from robyurkowski/fix-menu-item-typo
Fix Refinery::MenuItem typo
30d1970
Commits on Sep 25, 2011
@ugisozols ugisozols Update dependencies. a40775b
Commits on Sep 28, 2011
@ugisozols ugisozols Fix merge conflicts. d4c1a15
@awagener awagener Remove unnecessary references to 'self' 7aa820c
@awagener awagener Cast array results back to class Plugins. 453f750
@awagener awagener Select, rather than reject not. ab7059b
@awagener awagener Remove unused instance variable and initialize method. 413e571
@awagener awagener Swap unless ... .nil? to if ... 676a0e5
@awagener awagener Remove unused method Refinery::Plugins#find_activity_by_model 3267b29
@ugisozols ugisozols Use ruby 1.9.3 for stable branch on Travis too. 1f68e84
@parndt parndt Now with 100% less quotes. 14170eb
Commits on Oct 14, 2011
@ugisozols ugisozols Remove Gemfile.lock. 0e8656b
Commits on Oct 15, 2011
@ugisozols ugisozols Ignore tmp dirs and regenerate gemspecs. fb87c33
Commits on Oct 21, 2011
@joemsak joemsak guard working in refinerycms 1-0-stable a18d0bc
@joemsak joemsak allow focus 951c08b
@joemsak joemsak require auth and image factories in spec helper with possibility of f…
…uture engine factories
1437015
@joemsak joemsak these plugin examples need urls or else tests fail 06543d6
@parndt parndt Merge pull request #1090 from neotericdesign/1-0-testing
Took resetexistence's master branch work and applied it to 1-0-stable
6857b28
Commits on Oct 22, 2011
@joemsak joemsak turns out, capybara-webkit has issues on Lion c9eb6f9
@joemsak joemsak and grab growl 06e9fa4
@joemsak joemsak use railscasts way of allowing focus 7ed8f80
Commits on Oct 24, 2011
@joemsak joemsak growl in OS X df7a1fe
Commits on Oct 25, 2011
@parndt parndt Added mention of Heroku keys for S3. Converted pre. blocks to <shell> 21d024e
Commits on Oct 26, 2011
@joemsak joemsak Merge branch '1-0-stable' of git://github.com/resolve/refinerycms int…
…o 1-0-stable
d893566
@parndt parndt Ensure that plugins created by specs aren't getting into the menu (th…
…ey break it).

Conflicts:

	core/spec/lib/refinery/plugin_spec.rb
	core/spec/lib/refinery/plugins_spec.rb
e7f0a7c
@parndt parndt Ensure that plugins aren't added to the list of registered plugins if…
… they're invalid.

Conflicts:

	core/lib/refinery/plugin.rb
c086151
@joemsak joemsak use railscasts way of allowing focus e8bb4f1
Commits on Oct 27, 2011
@gogogarrett gogogarrett updated css for fix an erorr that people were having 4cfe774
@gogogarrett gogogarrett updated verbage 09f6eed
@parndt parndt Merge pull request #1097 from gogogarrett/1-0-stable
Fixed minor changes to css to fix issues people were having. Fixes #1085
5a0ed70
@parndt parndt added mention of core team. 36770cd
@gogogarrett gogogarrett updated to use fully qualified constant name 011c12c
@parndt parndt Merge pull request #1098 from gogogarrett/fix_for_1092
Fix for 1092 - fixes #1092
b113854
@gogogarrett gogogarrett Ensure that users who don't have access can't see recent inquiries wh…
…ich fixes #1088
008aca6
@parndt parndt Merge pull request #1099 from gogogarrett/1-0-stable
1 0 stable
4b6c1dc
@parndt parndt Use a regular expression instead of comparing the string twice. #794
Conflicts:

	core/lib/refinery/application_controller.rb
767003a
@joemsak joemsak Merge branch '1-0-stable' of git://github.com/resolve/refinerycms int…
…o 1-0-stable
fc4c4a0
Commits on Nov 02, 2011
@joemsak joemsak use capybara-webkit 3625056
@parndt parndt Merge pull request #1123 from neotericdesign/1-0-stable
I decided capybara-webkit is just fine. My system needed Qt installed.
41472d0
@parndt parndt Ignore spec/dummy from future Refinery (that's so meta) a1cd91f
@parndt parndt Ignore spec/dummy in gemspecs and regenerated gemspecs as 1.0.9 38f6442
@joemsak joemsak changelog for 1.0.9 started 9c3e8b1
@parndt parndt Merge pull request #1124 from neotericdesign/1-0-stable
Changelog for 1.0.9 started
f603c1a
@parndt parndt JRuby always fails because it can't install the testing gems. 25b2229
Commits on Nov 03, 2011
@parndt parndt Inform Gemfile that this is 1.0.9 6016b62
Commits on Nov 05, 2011
@parndt parndt Support commenting out the entire testing block in the Gemfile now th…
…at there's more of it.
c93e0bb
@parndt parndt Removed capybara as a forced dependency being that cucumber-rails tak…
…es care of it.
2f1e138
@parndt parndt Changelog up to date for 1.0.9 40d0363