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 Jul 07, 2010
@kivanio kivanio missing portuguese translation added 6ac1baa
Commits on Jul 08, 2010
@djones djones news isn't a core feature anymore so move it out to a popular plugins…
… section with the portfolio plugin
a87c8dd
@kivanio kivanio Merge branch 'master' of git://github.com/resolve/refinerycms
* 'master' of git://github.com/resolve/refinerycms:
  news isn't a core feature anymore so move it out to a popular plugins section with the portfolio plugin
  Add migration to absolutely ensure that everyone is up to date with the new column name for user plugins
  We can migrate your database, too
  Upgrade task now handles new routing too.
  Small correction to refinery-upgrade help messages.
  incremented version to 0.9.7.5 and released a new changelog
  Add task to ease upgrade between 0.9.6 and 0.9.7 - just run refinery-upgrade-096-to-097 from a gem based application.
  Improved code used to include gem rake tasks and script/generate tasks into the Refinery application to fix issue with these tasks not being found
  missing portuguese translation added
  Update thank_you page attributes correctly
5ee352a
@djones djones lock the gems in 3453ecc
@parndt parndt Update dependencies and relock, made sure schema.rb reflected latest …
…version. All tests passing.
0a037a0
Commits on Jul 09, 2010
@parndt parndt provide find_or_set because the site name may not be set here yet. c0ca9fc
@parndt parndt Ensure that we have a RefinerySetting to use, fixes failing Scenario:…
… When there are no users, you can create a user in features/refinery/manage_users.feature
ea321d7
@parndt parndt Removing this else clause because it makes zero sense. Why would we w…
…ant to be rendering the :new action again here?
83349da
@parndt parndt Add ability to specify that a page is the home page to fix failing Sc…
…enario: Not logged in in features/refinery/site_bar.feature
ef212a2
@kivanio kivanio missing portuguese translation added 9c4759a
@kivanio kivanio missing english translation added 297a9e0
@kivanio kivanio Merge branch 'master' of git://github.com/resolve/refinerycms
* 'master' of git://github.com/resolve/refinerycms:
  Add ability to specify that a page is the home page to fix failing Scenario: Not logged in in features/refinery/site_bar.feature
  Removing this else clause because it makes zero sense. Why would we want to be rendering the :new action again here?
  Ensure that we have a RefinerySetting to use, fixes failing Scenario: When there are no users, you can create a user in features/refinery/manage_users.feature
  provide find_or_set because the site name may not be set here yet.
  Update dependencies and relock, made sure schema.rb reflected latest version. All tests passing.
  lock the gems in
11236b8
@parndt parndt put upgrade logic that is specific to the main routes file into a con…
…ditional block
bcc3451
@kivanio kivanio Merge branch 'master' of git://github.com/resolve/refinerycms
* 'master' of git://github.com/resolve/refinerycms:
  put upgrade logic that is specific to the main routes file into a conditional block
9ec5635
@parndt parndt Got a bit over eager removing this before. 8dae994
@parndt parndt Gemfile relocked to mirror extra require to acts_as_indexed gem depen…
…dency.
6e7f5fa
@kivanio kivanio missing portuguese translation added a71f2c0
@kivanio kivanio missing english translation added 5ec723f
@parndt parndt mark as html_safe 187ba16
@kivanio kivanio Merge branch 'master' of git://github.com/resolve/refinerycms
* 'master' of git://github.com/resolve/refinerycms:
  mark as html_safe
  missing english translation added
  missing portuguese translation added
  Gemfile relocked to mirror extra require to acts_as_indexed gem dependency.
  Got a bit over eager removing this before.
d773e98
@kivanio kivanio small changes to make more meaning in portuguese 8938cc5
@kivanio kivanio new keys and translations for en and pr-BT dadb764
@kivanio kivanio missing portuguese translations for wymeditor 620332f
@kivanio kivanio missing portuguese translation for dashboard fe7f4e7
@kivanio kivanio adjusted portuguese translation for images e4d8ad2
@kivanio kivanio adjusted portuguese translation for authentication 3d4f5ec
Commits on Jul 11, 2010
@parndt parndt Ensure that pressing cancel on form actions doesn't redirect back to …
…the current form after a create or update action, round entire wym_box and red border it on error. Update example gem versions.
c35deff
Commits on Jul 12, 2010
stevenheidel Switched main install task to 'refinerycms' instead of 'refinery' to …
…avoid conflicts with a gem of the same name.\n\nThe task 'refinery' is still available and simply calls 'refinerycms' to do the work.
699627c
@parndt parndt These are not helpful. 0f481a7
@parndt parndt Refactor rake test:refinery to allow loading tests from registered pl…
…ugins for greater modularity.
4e6906b
@parndt parndt Prepare for a future version release. 3ed74e8
@parndt parndt apparently we need a relock now. d22ed32
@parndt parndt Regenerate gemspec 57dc7e6
stevenheidel Switched main install task to 'refinerycms' instead of 'refinery' to …
…avoid conflicts with a gem of the same name.\n\nThe task 'refinery' is still available and simply calls 'refinerycms' to do the work.
bacaa25
@parndt parndt First, educate users. 9945267
@parndt parndt Document Steven's change 3ab9013
@parndt parndt We'll need the new task in the gemspec, then. 7b31a02
@parndt parndt Automate the generation of bin tasks so that they don't get forgotten. 9601605
@parndt parndt Ensure we update lib/refinery too ddadddf
@parndt parndt only round top left corner when we're not inside tabs. 028a4de
@parndt parndt use more valid CSS. 160041e
stevenheidel Merge conflict resolved. f8c6b22
stevenheidel Fixed a bug preventing new refinery settings from being shown to regu…
…lar users.
377d18d
Commits on Jul 14, 2010
@parndt parndt This should be happening in the Gemfile... a131ae8
@parndt parndt This is the only way that this command will work in Ruby 1.9.2 - by e…
…ntering the directory using 'cd' instead of Dir.chdir

Also ensure that bundler is available before the command runs by telling the user to install it.
ba2e9e9
@parndt parndt We don't need to raise, we can just puts and exit. f02841b
Commits on Jul 15, 2010
@parndt parndt Tightened up security around inserting images and resources (you can …
…no longer upload an image or resource inside the dialogues if you can't access the plugin itself). Also allows users to insert an image or resource that was previously uploaded even if they can't access the rest of the plugin. Fixed pagination on resource dialogues. Closes GH-110
c277395
@parndt parndt Fixes typo introduced with last commit that set pages per dialog to 1…
… not 12.
8427844
@parndt parndt No longer allow users to run this task if their apps already contain …
…a Gemfile as the results could be explosive.
81c654c
@parndt parndt Update changelog and gemspec. 5928049
@parndt parndt Don't run the refinerycms task for the user, make them run it. Copy .…
…gitignore in a rake refinery:update
dd77a75
@parndt parndt Wonder why that wasn't html.erb 1e254f2
@parndt parndt Add support for an extra per page setting for dialogs with sizing opt…
…ions like that used in the wymeditor.
1568ce2
@parndt parndt Bit easier to read, really. Dialog can be a bit smaller. 4315d12
@parndt parndt slight CSS redux a529b85
@parndt parndt Regenerated gemspec to encompass all the changes of late. 16d5b95
@parndt parndt document final change 4cafe27