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 Jun 24, 2011
@parndt parndt Updated lock to get new friendly_id_globalize3 version which fixes #755 8c56ebe
Commits on Jun 25, 2011
@hechacker1 hechacker1 Move and reuse initialization code from older version to fix plugin p…
…aths

Conflicts:

	core/lib/refinery/plugin.rb
fe07ee9
@ovargas27 ovargas27 How to enable testing in your application 85eb675
@ovargas27 ovargas27 typo fixed b190f85
@ovargas27 ovargas27 updated with parndt's feedback d46ee22
@parndt parndt Fixed typo with guide not closing shell tag. e4203f2
@parndt parndt Ignore coverage dir 612792f
@parndt parndt fixed typo - environment 8d49d29
Commits on Jun 29, 2011
@parndt parndt Fixed typo - affect instead of effect c29f57e
scambra Use asset_host for url returned from image picker dialog. Now it will…
… return a url with host when asset_host is defined, and it will continue returning a path when asset_host is not defined
ec22824
@parndt parndt Merge pull request #790 from scambra/1-0-stable
Use asset_host for url returned from image picker dialog
c932f55
Commits on Jul 05, 2011
@djones djones We don't use /admin anymore so no need to include it in robots.txt 6129bde
Commits on Jul 09, 2011
@parndt parndt Ensure that pages reset column information when seeding just incase. af537ed
@mhaylock mhaylock Changed 'User-agent' casing to maximise crawler compatibility. fe46db2
Commits on Jul 11, 2011
@joemsak joemsak this little line is malformed, produces an error in console, shows as…
… raw code in IE
16951a1
@ugisozols ugisozols Merge pull request #813 from neotericdesign/1-0-stable
this little line is malformed, produces an error in console, shows as raw
f718a5c
Commits on Jul 12, 2011
@joemsak joemsak reorder icon was getting effed when used in a multilist 51a0de3
Commits on Jul 17, 2011
@parndt parndt Ignoring public/refinery
Conflicts:

	.gitignore
a69f803
@parndt parndt Regenerated gemspecs. 5684e9a
@joemsak joemsak reorder icon was getting effed when used in a multilist 6d3bcc8
@parndt parndt Fixes #806 by adding pages_list class back to resource picker. (thanks 6d25043
@parndt parndt Experimenting with the load path analyzer by Xavier Shay. 95871da
@parndt parndt Backport b02a7e0 from master for #807 ffc2ca9
Commits on Jul 20, 2011
@joemsak joemsak Merge branch '1-0-stable' of https://github.com/resolve/refinerycms i…
…nto 1-0-stable
58042d2
Commits on Jul 21, 2011
@parndt parndt Duostack is not accepting new apps anymore. 0f63245
@joemsak joemsak Image fu: get the height and width in any case da31382
@joemsak joemsak Merge branch '1-0-stable' of https://github.com/resolve/refinerycms i…
…nto 1-0-stable
2cab556
@ugisozols ugisozols Merge pull request #827 from neotericdesign/1-0-stable
image_fu should get image.height and image.width with any geometry string
6314668
@joemsak joemsak Closes GH-828. Removing this code fixed this issue. Tested on zebra a…
…nd tree
eee0a85
@joemsak joemsak Merge branch '1-0-stable' of https://github.com/resolve/refinerycms i…
…nto 1-0-stable
4d6c597
@joemsak joemsak WIP: image_fu changes d492c5c
Commits on Jul 25, 2011
@parndt parndt page[:something] is no longer recommended. ebbd0fe
@parndt parndt Figure out what the image size is going to be based on geometry string. 3fbdc34
@parndt parndt Instead of returning an array returning an OpenStruct makes more sense. e16eea5
@parndt parndt Moved image_dimensions_for_geometry to an instance method on the Imag…
…e model called thumbnail_dimensions.
646a377
@parndt parndt Added basic specs for thumbnail_dimensions which show a failure. 35fc767
@parndt parndt Removed old variable c0ad693
@parndt parndt Changed the return type to a hash so that we can inline it to the ima…
…ge_tag options.
5c8be96
@lancecarlson lancecarlson Edited doc/guides/7 - Hosting/2 - How to use Amazon S3 for storage.te…
…xtile via GitHub
adcafd6
Commits on Jul 26, 2011
@parndt parndt fixed whitespace be511fa
@parndt parndt Fixes Issue #816 where new page parts don't get added with a fully fu…
…nctional WYMeditor.
33a2415
Commits on Jul 28, 2011
@parndt parndt Let's see if we can get this thing running on lots of rubies. 5d35d10
Commits on Jul 30, 2011
@parndt parndt ::Refinery.i18n_enabled? when not enabled now returns false, not nil. a833d3e
@parndt parndt Updated getting started to mention 1.0.3 0a44287
@ugisozols ugisozols Cucumber requires database_cleaner if it's available so we don't need…
… to do it ourselves.

Conflicts:

	Gemfile.lock
	testing/lib/gemspec.rb
	testing/refinerycms-testing.gemspec
fe51509
@parndt parndt Reimplemented the image geometry size guess algorithm. 10e1c9e
Commits on Jul 31, 2011
@krisf krisf locked will_paginate at pre2 due to issues with pre4 5e982d0
@parndt parndt Regenerated core gemspec aa372e0
Commits on Aug 02, 2011
@ugisozols ugisozols Patch required_label helper so it would pick up I18n model attribute …
…translations.
d9bf6e0
Commits on Aug 04, 2011
@parndt parndt Ensure that we're really locking to will_paginate pre2. 607b46e
@ugisozols ugisozols Lock will_paginate to 3.0.pre2 in core gemspec. #850 5c13361
@ugisozols ugisozols Refactor require_label form helper in order to use it with namespaced…
… classes.
8c9b76a
@parndt parndt Revert "Refactor require_label form helper in order to use it with na…
…mespaced classes." We can't change APIs in 1.0.x

This reverts commit 8c9b76a.
c5f70ed
Commits on Aug 07, 2011
@krisf krisf Fixed search & add image for page-images and portfolio engines 16bc45f
@parndt parndt Merge pull request #856 from krisf/1-0-stable
Fixed search & add image for page-images and portfolio engines
06fff88
Commits on Aug 09, 2011
@parndt parndt Regenerated gemspecs. bbe0be0
@parndt parndt Added ability to specify a different database host per http://groups.… 85c455a
@parndt parndt No longer need to force mysql2 0.2.x 447f0e9
Commits on Aug 10, 2011
@parndt parndt Not using bundler anymore to install Rails and instead allowing the u…
…ser to override which version we're using and failing when the version is too-future which fixes #798.
24ccc26
@parndt parndt Fixed the -h --database-host option 8965b07
@ugisozols ugisozols I was approaching problem from the wrong side. We don't need an order…
…ed hash… just change the specs.

Conflicts:

	images/app/models/refinery/image.rb
	images/spec/models/refinery/image_spec.rb
4e51a81
@parndt parndt It's antisocial to require rcov when platforms like rbx and jruby don…
…'t like it.

Conflicts:

	Gemfile
	Gemfile.lock
	testing/refinerycms-testing.gemspec
216ba82
@parndt parndt Documented changes since 1.0.3 and regenerated the gemspecs. 69f0725
@parndt parndt Turns out rails generates a different database.yml than I was expecting. 8441edd
Commits on Aug 11, 2011
@parndt parndt Oh hey as it turns out not everyone will be using mysql2. c891a61
@parndt parndt Regenerated gemspecs for release of 1.0.4 f3dbf4e