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: refinery/refinerycms
...
head fork: refinery/refinerycms
Commits on May 30, 2011
@ysiadf ysiadf Clarified presence of the @import statement in application.css
(Without this clarification, users might think that importing 'refinery/application.css'
is necessary to enable some sort of magic.)
4545b83
@parndt parndt Added -t / --testing option to bin/refinerycms which adds refinerycms…
…-testing support to new applications. Also added option to run commands with 'bundle exec' which pretty much all commands now use.
8c80bb6
Commits on Jun 03, 2011
@parndt parndt New refinerycms-generators, updated lock file. e80661c
Commits on Jun 04, 2011
@parndt parndt Updated guide to warn people that they may lose tables - related to #736
6fd6c12
@banderso banderso Update how plugins get their pathname set to not depend on execution …
…stack trace
c53ec84
@parndt parndt Allow tests to run on travis. f51848e
@banderso banderso Merge branch '1-0-stable' of https://github.com/resolve/refinerycms i…
…nto 1-0-stable
5dc64b1
Commits on Jun 05, 2011
@parndt parndt Ensure that pathnames have a default as well as being able to be over…
…ridden for #737.
c6dfd2c
Commits on Jun 07, 2011
@parndt parndt Relating to #740 Somehow we lost where it defaults to using s3 if the…
… ENV has been set. Fixed.
bbcec91
@earnold earnold I was a little confused about turning s3 on. So I updated the instruc…
…tions. I hope this version is more instructive.
eb0f492
@parndt parndt Reduced width of guide and removed suggestion about config/environmen…
…t.rb and replaced it with config/environments/production.rb.

Also fixed a few line spacing issues on environment files.
6ad9771
@parndt parndt Updated doc for truthiness. 21c435f
@parndt parndt How to get better help with Heroku. 4b3a571
@parndt parndt Turns out this isn't markdown so my linking method was incorrect. b232cb8
Steven Heidel Remove duplicate information by linking to the S3 guide in the Heroku…
… guide.
80b86c0
Steven Heidel Always use the oxford comma, always. f019325
Steven Heidel Change "people" to "core team", aka the top 4 contributors who can he…
…lp you on the IRC.
16c5619
Steven Heidel Remove duplicate information by linking to the S3 guide in the Heroku…
… guide.
d048b3a
Steven Heidel Always use the oxford comma, always. 91c1b81
Steven Heidel Change "people" to "core team", aka the top 4 contributors who can he…
…lp you on the IRC.
d37336a
@inbeom inbeom removed duplicate call of link_dialog.init()
from Resources#insert view
a7f1411
@inbeom inbeom Call link_dialog.init() if upload is not permitted 0bc08b9
@joemsak joemsak the deprecation warning wasn't clear that this is an instance method
Conflicts:

	pages/app/models/refinery/page.rb
c93eb00
Steven Heidel Merge pull request #745 from neotericdesign/master
Deprecation message wasn't 100% clear
Conflicts:

	pages/app/models/refinery/page.rb
29213c0
Steven Heidel Change @page to page because the first one didn't use @
Conflicts:

	pages/app/models/refinery/page.rb
2e879ae
@parndt parndt Always 'and return' after a redirect_to. 018e32c
Commits on Jun 08, 2011
@parndt parndt Use rails 3.0.8 at a minimum which hopefully helps with #730. 59eeff1
@haikalhussein haikalhussein create a guide on how to create multiple data-tables in a single engine b9b0128
@haikalhussein haikalhussein edit some lines in the doc guide 4aac6b6
Commits on Jun 17, 2011
@parndt parndt Fixes #732 and #762 by running 'rails new' with 'bundle exec' and spe…
…cifying the built in Gemfile.
e8ff18a
@parndt parndt Update to Rails 3.0.9 and Uģis Ozols 4653ce2
@parndt parndt Ensure Encoding is set properly to allow for Uģis Ozols a3c0673
@parndt parndt Regenerated gemspecs. fed0423
Steven Heidel This guide had the old paths of vendor/refinerycms, updated to new ro…
…ot level paths
dccd78f
Commits on Jun 21, 2011
@parndt parndt Don't put space before parenthesis ab42666
@joemsak joemsak specs can run in ruby 1.9.x 706210d
@joemsak joemsak string to string f04bcb7
@parndt parndt Merge remote-tracking branch 'neotericdesign/1-0-stable' into 1-0-stable 5b6ba06
@parndt parndt Looks like cucumber 1.0.0 is out. fd46480
@parndt parndt refinerycms-blog is up to 1.6.0 08b2c8d
@parndt parndt cleared whitespace, regenerated gemspecs. 1b7481b
@parndt parndt We actually need to bundle install first, otherwise some gems are mis…
…sing.
d047141
@parndt parndt The databases specified here are for development.
TODO: remove block when building the gem so they don't become a dependency
4e94daa
Steven Heidel Fix merge conflict in Gemfile. b1569c8
@wikyd wikyd Make the catch-all pages route for marketable URLs be controlled by t…
…he configuration switch.
12fc352
@parndt parndt Re-enable building gems, added ability to move them to current direct…
…ory.
c1c16f6
@parndt parndt Specifying version 1.0.1 in the Gemfile and fix issue with installer …
…where the BUNDLE_GEMFILE wasn't being set back for the app to use it.
7f71203
Steven Heidel Phil, Y U NO add encoding to .gemspecs as well? Added encoding to gem…
…spec generators and regenerated all gemspecs.

Conflicts:

	testing/refinerycms-testing.gemspec
0801afe
@parndt parndt Documented changes in the changelog 5a7f88d