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
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on May 12, 2012
@parndt parndt Fixes #1568 by removing errant documentation. 7a92318
@parndt parndt Allows the help command to access the CMS generator when running as a…
… gem or running in development mode and included option aliases.
099febc
@ugisozols ugisozols Merge pull request #1655 from resolve/issue_1538_1539
Implements refinerycms --help
d3d5d10
@bobbus bobbus Extract list_reorder from admin.js in sortable_list.js
Modify sortable list to make it able to have many sortable lists on one page

Conflicts:

	core/app/views/refinery/admin/_make_sortable.html.erb
b6d85c7
Commits on May 14, 2012
jipiboily title needs to be in quotes
Conflicts:

	core/lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_singular_name.html.erb
ebf283e
@parndt parndt Fixes resolve/refinerycms-search#16
This works by allowing refinery.url_for(Refinery.route_for_model(result.class, :admin => false)) to be used in place of refinery.url_for(result)
bd870f4
@ugisozols ugisozols Remove deprecation message from route_for_model method. 1ef9ff7
@parndt parndt Updated changelog for recent changes. b639c1d
@ugisozols ugisozols Add issue/pr ids to changelog. c131fd4
@ugisozols ugisozols I somehow screwed up and deleted release date.
Conflicts:

	changelog.md
b18cade
@parndt parndt And then the header level. 47da215
@ugisozols ugisozols We need * for list item. e5991e4
@nashby nashby add ru translation for wymeditor 46865b9
@ugisozols ugisozols Merge pull request #1662 from nashby/patch-1
add ru translation for wymeditor
df163ac
Commits on May 15, 2012
@wenzowski wenzowski update rubygems per #1647 to avoid `bundle exec` failure on jruby in …
…1.9 mode
b300fbc
@wenzowski wenzowski only update rubygems on jruby thanks to @mpapis 19e434c
@wenzowski wenzowski add mandatory "language" key per travis-lint 8721fc2
@parndt parndt Merge pull request #1658 from wenzowski/jruby-19mode
update rubygems per #1647 to avoid `bundle exec` failure on jruby in 1.9 mode
1b0daab
Commits on May 16, 2012
@nashby nashby fix url in ajax request for dialog_success callback 8b881cb
@ugisozols ugisozols Run db:test:prepare rake task from spec/dummy in init_test_database t…
…ask.
b237835
@ugisozols ugisozols Fix typo in readme. a1777c0
@ugisozols ugisozols Add inquiries extension to popular extensions list. 181a485
@parndt parndt Fixes issue #1651 b6f6a99
Commits on May 17, 2012
@ugisozols ugisozols I lied. #1613 wasn't added until 2.0.5. d3d0482
@ugisozols ugisozols Add note to chanhelog about #1651. 69d176c
@ugisozols ugisozols Merge pull request #1666 from nashby/modal-window-path
fix url in ajax request for dialog_success callback
72d5fb4
@ugisozols ugisozols Don't load seeds from migration in generated form extension. d054630
@ugisozols ugisozols Use proper syntax when evaluating code in form generator's spam view …
…file.
4458a08
@ugisozols ugisozols In generated form extension gemspec remove testing dependency and set…
… refinerycms-settings version to current Refinery version.
7f66247
@ugisozols ugisozols Remove extra space in form generated gemspec. 4668258
@parndt parndt Merge pull request #1668 from resolve/init_test_database_workaround
Run db:test:prepare rake task from spec/dummy in init_test_database task.
c92ff5b
Commits on May 18, 2012
@ugisozols ugisozols Use content_for :body and content_for :side_body in extension generat…
…ors.
647e722
@ugisozols ugisozols Add note to changelog about new page part name usage. 7431abb
Commits on May 19, 2012
@parndt parndt Update rspec c743eb0
@GeekOnCoffee GeekOnCoffee Rearranging Rubies to get Travis to run critical rubies before allowe…
…d failure rubies
f459375
@GeekOnCoffee GeekOnCoffee Simplifying Method 55b4249
Commits on May 20, 2012
@parndt parndt Merge pull request #1676 from GeekOnCoffee/page_header_2
Simplifying Method
41a7139
@GeekOnCoffee GeekOnCoffee Putting 1.9 before 1.8 9a58eab
@parndt parndt Merge pull request #1675 from GeekOnCoffee/travis_ruby_reorg
Rearranging Rubies to get Travis to run critical rubies
9705301
Commits on May 21, 2012
@ugisozols ugisozols Don't include extra lines for generated seeds file. 9a2ec07
Commits on May 22, 2012
@parndt parndt Introduce Refinery::I18n with enabled? returning false so that we don…
…'t have to check defined?(Refinery::I18n)
b5f1c30
Commits on May 23, 2012
@robyurkowski robyurkowski Merge pull request #1681 from resolve/i18n_shim
Introduce Refinery::I18n shim and Refinery.i18n_enabled? syntax.
800867d
@robyurkowski robyurkowski Add FAQ doc, just so we can get something up for feedback. 4f30d8e
@robyurkowski robyurkowski Textual corrections to reflect 2.0 paradigms. 1505db4
@robyurkowski robyurkowski Edits based on parndt's suggestions, and fix how to hide titles. [ci …
…skip]
7bc5c2e
@ugisozols ugisozols Add specs for #1532. dc50f40
@ugisozols ugisozols Merge branch 'issue_1532' c5f3301
@ugisozols ugisozols Add note to changelog about #1532. f8f7ad3
@bartocc bartocc implement Refinery::Images#s3_region and Refinery::Resources#s3_region 5ef0821
@ugisozols ugisozols Merge pull request #1687 from bartocc/issue_1686
implement Refinery::Images#s3_region and Refinery::Resources#s3_region
a566dab
@parndt parndt Implemented some of my own feedback. d9640da
@parndt parndt Correct API usage of gem unpack. 0dec099
@parndt parndt Merge branch 'doc' 6a0f88f
Commits on May 24, 2012
@ugisozols ugisozols Allow to match js files with more than one extension like js.coffee o…
…r js.coffee.erb in refinery:override rake task.
9e50e36
@parndt parndt Merge pull request #1689 from resolve/issue_1685
Allow to match js files with more than one extension like js.coffee or j...
1f41be2
@ugisozols ugisozols Add note to changelog about #1685. 2ce1fc0
@ugisozols ugisozols To be fair Philip was the one who suggested better fix. 559f932
@ugisozols ugisozols Add some Refinery::CLI specs. d0514ac
@bartocc bartocc add changelog entry
Conflicts:

	changelog.md
d1e742c
@ugisozols ugisozols Ignore message order and just check if the text is there. 950f934
@sdownie sdownie Ensure each engine is included for each generator. 3b5264a
@ugisozols ugisozols Merge pull request #1691 from sdownie/engine_generators
Ensure each engine is included for each generator.
7570926
Commits on May 25, 2012
@Tranquility Tranquility multiple languages for pageseeds 2a74125
@parndt parndt Merge pull request #1694 from Tranquility/master
Set the locale correctly for seed data

Fixes #1665
0322e9f
@GeekOnCoffee GeekOnCoffee Sorting Cleanup and Performance Improvement 1df2fae
@parndt parndt Fixes #1673 by adding support for not including the record itself in …
…the nesting and passing :uncached_nested_url as the attribute to access on the record for its nesting. Sneaky.
3fd63fa
@ugisozols ugisozols Add failing spec for #1673. 9747dea
@ugisozols ugisozols Simplify failing dashboard spec. 62d560d
@ugisozols ugisozols Fix failing mysql spec by increasing nested page updated_at timestamp. 4b34625
@ugisozols ugisozols Add note to changelog about #1673. cd62032
@parndt parndt Match only &dialog, ?dialog, &width, ?width, &height, ?height which f…
…ixes #1397
4d3488b
@ugisozols ugisozols Add note to changelog about #1397. e123f62
@ugisozols ugisozols Add note to changelog about #1694. 0179860
@ugisozols ugisozols Support multiple languages for seed data in extension and form genera…
…ted seeds file.
33878c5
@parndt parndt Added support for @canonical in pages_controller.
Fixes #1472

Conflicts:

	pages/app/models/refinery/page.rb
bcec0bb
@parndt parndt Added tests, found bugs, finished canonical support. 67b949c
@parndt parndt Added Refinery::Page#canonical_slug to allow us to have the same slug…
… for multiple translations of a page.

* We won't be needing home.css.scss anymore; Use #home-page
bf0c7b0
@parndt parndt Documented canonical_slug b2a9a84
@parndt parndt Clarified changelog to reduce Rob's confusion. 7c2d0a7
@robyurkowski robyurkowski Merge pull request #1699 from resolve/canonical_master
#1698 for master branch
c763641
@robyurkowski robyurkowski Merge pull request #1700 from resolve/issue_1457
Fixes #1457
6fcbef7
Commits on May 26, 2012
@parndt parndt Fixes #1703 by downcasing usernames before saving them.
Note: This has the implication that all usernames will now be stored downcased.

Conflicts:

	authentication/app/models/refinery/user.rb
	changelog.md
30c4ef4
@jokklan jokklan dragonfly content_disposition configuration for resources 18a5241
@parndt parndt Merge pull request #1708 from TheMaster/master
Content disposition for dragonfly
741e775
Commits on May 28, 2012
@ugisozols ugisozols Add specs for Refinery::Page.find_by_path_or_id. c3a494d
@ugisozols ugisozols Remove all_on_start and all_after_pass options from Guardfile. 968c5c7
@ugisozols ugisozols I can use id directly. 5f37501
@ugisozols ugisozols Add specs for Refinery::Page.deletable? and Refinery::Page.destroy. fe4bf6b
@ugisozols ugisozols Use shorter syntax of render where possible. 7f0ce02
@ugisozols ugisozols Instance methods should be prefixed with #. 92a162f
@parndt parndt Revert "Use shorter syntax of render where possible."
This shouldn't be possible as the default for render in controllers is not partial.

This reverts commit 7f0ce02.
5a7dd99
Commits on May 29, 2012
@robyurkowski robyurkowski Add a few clarifications about installation. 609f47a
@jeremyw jeremyw "View this page live" links to Page#url, which
is more reflective of how pages will be referenced
and fixes issue with pages with the same slug
under different parent nodes.

Closes GH-1714
b5cf7be
@parndt parndt Merge pull request #1713 from resolve/doc-updates
Add a few clarifications about installation.
50d204b
Commits on May 30, 2012
@parndt parndt Updated testing guide.
* Added ruby tags for ruby codes instead of shell tags.
* Unfortunately spec/spec/config/environment.rb did not exist..
* Added note about running the steps inside your extension and not from your project's root and warning about rake.
8c0fa1c
@ugisozols ugisozols Merge pull request #1715 from terriblelabs/master
Use Page#url to view page live from pages admin
1aa4065
@ghoppe ghoppe fix default template selected 807c44b
@ghoppe ghoppe @page is the variable name f189fbf
@ugisozols ugisozols Reimplement #1711 based on @parndt's suggestions and add specs. ed60e07
@parndt parndt Renames view_template_options to template_options 08f9e7a
@ugisozols ugisozols Add note to changelog about #1710. b2e4615
@ugisozols ugisozols Use shorter syntax of render.
Conflicts:

	core/app/views/refinery/_content_page.html.erb
c3e1680
@Tranquility Tranquility only create translations not full pages 16aa0a0
@tdelam tdelam added encoding: utf-8 in core.rb.erb to allow i18n characters in conf…
…ig.site_name
26392ca
@parndt parndt Merge pull request #1717 from tdelam/master
Encoding in core.erb.rb
80416c8
@gogogarrett gogogarrett Referencing Heroku guides 67cb9bd
Commits on May 31, 2012
@radar radar Shorten all authentication routing helpers f928ab1
@gogogarrett gogogarrett updating to reflect note 151c48a
@gogogarrett gogogarrett Update doc/guides/7 - Hosting and Deployment/2 - Amazon S3 for Upload…
…s.textile
18e1a46
@ugisozols ugisozols Merge pull request #1718 from gogogarrett/master
Updating guides to reference heroku guide
5fee418
Commits on Jun 03, 2012
@robyurkowski robyurkowski Added Custom View / Layout Template guide. 27b4fc6
@parndt parndt Text -> Reformat Selection
[ci skip]
e4f7481
@parndt parndt Micro optimisation with regexp 9647bc2
@parndt parndt Merge pull request #1727 from Tranquility/master
Seeds for different languages
3b16006
@robyurkowski robyurkowski Merge pull request #1722 from resolve/doc-updates
Add Custom View / Layout Template guide.
dc43c50
Commits on Jun 04, 2012
@wenzowski wenzowski ruby-debug19 appears to be broken on 1.9.3
`debugger` is a fork by @cldwalker that works on both 1.9.2 and 1.9.3
3881596
@wenzowski wenzowski remove rails-inserted comments c8d8fd5
@ugisozols ugisozols Merge pull request #1730 from wenzowski/patch-2
ruby-debug19 appears to be broken on 1.9.3
b296658
Commits on Jun 05, 2012
@wenzowski wenzowski Authentication redirection bug-fix which fixes #1561
* Fixed post-authentication redirect bug where users would
  always be redirected to the admin root after successful auth.
* Added tests for proper functionality.
7b5d27b
@wenzowski wenzowski Added session key check for unscoped `return_to` variable #1724 10337cb
Commits on Jun 10, 2012
@ugisozols ugisozols Move flag links outside of title span.
Until now these links were disabled by expand/collapse stuff.
42d41e0
Commits on Jun 11, 2012
@ugisozols ugisozols Wrap flag icons in span. a7a69b2
@parndt parndt Fixed page locale-flag edit link. 6cf254d
@parndt parndt Merge remote-tracking branch 'radar/master'
Conflicts:
	authentication/spec/requests/refinery/sessions_spec.rb
121633a
@ugisozols ugisozols Add note to changelog about #1741. a869a6c
@ugisozols ugisozols Add missing word in changelog. 7eabbbd
@ugisozols ugisozols Add note to changelog about #1719. 290fd4e
Commits on Jun 12, 2012
@ugisozols ugisozols Add tmp/pids folder. 0d8df75
@parndt parndt Merge pull request #1744 from resolve/symlink_tmp
Fixes #1743
57e47eb
@ugisozols ugisozols Allow 404 page to have custom view/layout templates. 7a257f3
@parndt parndt Merge pull request #1746 from resolve/custom_view_and_layout_404
Allow 404 page to have custom view/layout templates.
e14cb83
@jamesalmond jamesalmond Only seeds the about page on the creation of the homepage fdc395f
Commits on Jun 13, 2012
@robyurkowski robyurkowski Merge pull request #1748 from jamesalmond/about_page_seed
Only seed the about page on the creation of the homepage
4f1c75f
@gwagener gwagener Decrease coupling by using available methods. a3d4f17
@ugisozols ugisozols Rename all .rb templates which contain erb to .rb.erb. a0581c2
@ugisozols ugisozols Fix deprecation warnings. f0ffb62
@ugisozols ugisozols Bring back warning about not being able to load config/environment.rb…
… in spec_helper.
0a8a2a5
@ugisozols ugisozols Add note to changelog about #1746. 3386fcd
@parndt parndt Merge pull request #1755 from gwagener/decrease_coupling
Decrease coupling by using available methods
9bce4de
Commits on Jun 14, 2012
@ugisozols ugisozols Rails 3.2.6 automatically include url helpers from mounted engines in…
…to integration tests so there is no more need to include them manually.
7f4561e
Commits on Jun 16, 2012
@magicienap magicienap Translate some keys in French. 629d444
Commits on Jun 17, 2012
@ugisozols ugisozols Merge pull request #1757 from magicienap/i18n_fr
Translate some keys in French.
dc14e1a
Commits on Jun 18, 2012
@ugisozols ugisozols New version of journey gem was released so we can finally drop sub("/…
…/", "/") workaround.
4a819eb
@ugisozols ugisozols Stub force_ssl config instead of using begin/ensure 97b8932
Commits on Jun 20, 2012
@parndt parndt Merge pull request #1750 from resolve/issue_1749
Rename all .rb templates which contain erb to .rb.erb.
f3366ac
@ugisozols ugisozols Add anonymous controller route in spec. c32e9ea
Commits on Jun 22, 2012
@parndt parndt Revert "Use event delegation for detecting modal dialog links."
This reverts commit d0cef21.

This broke existing functionality where dialog information would be stripped
from the anchor's href. Also caused issues where the querystring would start
with & instead of ?.

Please re-submit when the code does not have these problems.

Conflicts:

	core/app/assets/javascripts/refinery/admin.js.erb
8d0c1a7
@ugisozols ugisozols Merge pull request #1758 from resolve/revert_d0cef214a301e4fa4f0b9fca…
…a9f9fa9a338d10b4

Revert d0cef21
537dde9
@ugisozols ugisozols Add note to changelog about #1750. d5f35ae
Wieger Hofstra Added .nl language strings for wymeditor. Closes GH-1760 7b45373
@ugisozols ugisozols Merge pull request #1761 from wiegerhofstra/master
Added .nl language strings for wymeditor.
940a474
Commits on Jun 25, 2012
@johanb johanb Remove unused column d712bb6
Commits on Jun 26, 2012
@gwagener gwagener Fixed plurality in documentation of Page by_title and by_slug. def4cc3
@parndt parndt Merge pull request #1770 from gwagener/master
Documentation fixes
a346d21
Commits on Jun 27, 2012
@gwagener gwagener Removed path caching and cache invalidation.
This brings paths in line with urls, which are no longer cached, and removes the invalidation artifacts of both path and url caching.
0fa8770
@parndt parndt Merge pull request #1771 from gwagener/master
Removed path caching and cache invalidation
9cecb5d
@drifteaur drifteaur avoid charset errors when precompiling assets with translated strings 8d9df93
@ugisozols ugisozols Merge pull request #1773 from drifteaur/master
avoid charset errors when precompiling assets with translated strings
ffeadb4
@roryokane roryokane added missing i18n key reorder_content_section_done
I modeled the key contents after the contents of the key en:refinery:admin:menu:reorder_menu_done, “I'm done reordering the menu”
c4a5669
@ugisozols ugisozols Merge pull request #1774 from roryokane/add-i18n-key
added missing i18n key reorder_content_section_done
463ad24
@roryokane roryokane added period to end of sentence in guide 8-2
testing on http://textile.thresholdstate.com/ indicates that the period won’t break the link
bf10edb
@roryokane roryokane guide 7-2: revised Heroku config vars note
now the Heroku article link has its own link text
4c5df58
Commits on Jun 28, 2012
@roryokane roryokane revised much of Heroku hosting guide
based on my personal experience, uploading an existing app to Heroku while attempting to follow the guide

I deleted the part about adding the Heroku gem because you should have already installed the tool using the quickstart, and the app itself doesn’t rely on the gem. I know that because my app works on Heroku without 'heroku' in the Gemfile.
31594fa
@roryokane roryokane in Heroku guide, updated Heroku install instructions
I replaced the first set of instructions with a link, so the instructions are less brittle. They currently say “gem install heroku”, but Heroku now recommends that you install the Heroku Toolbelt and makes no mention of the gem. The instructions could change again, so I now only summarize the steps. I thought “installing the Heroku client” was slightly better than “installing the Heroku Toolbelt” because it was less brittle, even though it’s a little less accurate.

I copied my added description of the Heroku quick start steps to the similar link in “Step 0” of the following section “Deploying an existing local Refinery application”.
7ea8cab
@roryokane roryokane removed accidentally-left-in note to self
The Issue described is now Issue #1777, at https://github.com/resolve/refinerycms/issues/1777.
0715677
@ugisozols ugisozols Fix page reorder issue on Ruby 1.8.x. #1585. f97957d
Bart van Zon added failing spec ae0b294
Commits on Jun 29, 2012
@parndt parndt Fixed update_child_positions with spec for #1585.
Conflicts:

	core/spec/lib/refinery/crud_spec.rb
a55d6a6
@parndt parndt Merge remote-tracking branch 'Bartj3/fix-image-fu' 8f37161
@gwagener gwagener Updated changelog now that Refinery::Page#canonical_slug is in 2-0-st…
…able.
609eabb
@parndt parndt Fixes #1778 by rounding dimensions instead of ceiling them. abdaa15
@gwagener gwagener Updated changelog now that Refinery::Page#canonical_slug is in 2-0-st…
…able.
61741a5
@ugisozols ugisozols Merge pull request #1785 from gwagener/master
Updated changelog now that Refinery::Page#canonical_slug is in 2-0-stable
b3b7a41
Bart van Zon replaced the kitten image with a cropped version of the beach photo e274357
Bart van Zon fixed incorrect image file extension bcd4333
@ugisozols ugisozols Merge pull request #1787 from Bartj3/fix-image-fu
fixed incorrect image file extension
e4dde1d
Commits on Jun 30, 2012
@ugisozols ugisozols Correctly add all attribute names to attr_accessible list + make some
other refactorings to engine/form generator and templates. #1657.
6fc56e4
Commits on Jul 02, 2012
@parndt parndt If Refinery::Core::BaseModel uses ActiveRecord::Base it should requir…
…e it.
39ee2b5
Commits on Jul 03, 2012
Kevin Bullock Factor copypasta out of Refinery::CLI#override a7cd9c1
Kevin Bullock Allow overriding presenters 0313f02
@parndt parndt Refactor CLI code.
* Hash keys to symbols
* Avoided using OVERRIDES[kind] over and over using a variable.
a3440b7
@parndt parndt Refactor: Removed many unneeded parentheses. 3bcc451
@parndt parndt Refactored DashboardHelper#activity_message_for to remove complexity. 9989ead
@parndt parndt Fixed the expectation for override failure message as it has changed. 13321ee
@ugisozols ugisozols Update changelog. 227b180
@matfiz matfiz Added missing Polish translations for pages. 0334143
@matfiz matfiz added missing i18n PL translations for wymeditor 50f4788
@parndt parndt Tidy up invalid YML. f44f4c6
Commits on Jul 05, 2012
@robyurkowski robyurkowski Move wysiwyg fields into a partial for easier maintainability. 894774a
@robyurkowski robyurkowski Update changelog. c3c3dd7
Commits on Jul 07, 2012
@parndt parndt Added mocking to controller specs.
Also converted requests/controller_restriction_spec.rb to controllers/dummy_controller_spec.rb
84104e6
@parndt parndt Allow transactional database strategy with Selenium. 0572d3a
Commits on Jul 09, 2012
@ugisozols ugisozols Add spec to ensure proper attributes gets added to attr_accessible list. 73cc884
@parndt parndt Merge remote-tracking branch 'origin/issue_1657' 30042b8
Commits on Jul 10, 2012
@gwagener gwagener Removed created_at and updated_at from mass assignment. 710b1c8
@ugisozols ugisozols Bump rspec-rails version and drop rack-test from testing dependencies…
… because we aren't tied to it directly.
ccb2e8a
Commits on Jul 11, 2012
@sj26 sj26 Use absolute require for version in gemspec fbdb079
Commits on Jul 12, 2012
@robyurkowski robyurkowski Check to ensure render_with_templates? is defined when executing 404 …
…page

Fixes #1795. When the error_404 method is called outside of the scope of the
PagesController, as it can be, since extensions also are extended, too, the
render_with_templates? call will throw a NoMethodError.
This might also be rewritten as a redirect to the 404 page,
which I think might be a better choice in the long run, but needs to be discussed.
9e80c5f
@parndt parndt Merge remote-tracking branch 'origin/fix-error-404'
Conflicts:
	testing/refinerycms-testing.gemspec
442796e
Commits on Jul 13, 2012
@gwagener gwagener Fixes .../edit&switch_locale=en... bug with copywriting. 0d87d1b
@ugisozols ugisozols Merge pull request #1803 from resolve/tests
Tests
8dd122c
@ugisozols ugisozols We don't need all crudify stuff for form generated settings controlle…
…r so write edit and update actions ourselves.
b5c231a
Commits on Jul 16, 2012
@robyurkowski robyurkowski Update heroku docs to account for #1751. acf4836
Commits on Jul 18, 2012
@parndt parndt Merge remote-tracking branch 'origin/issue_1817' 14aa6e8
@gwagener gwagener Added canonical id to body tag so that it encompasses header, page, a…
…nd footer.
1a865f7
@ugisozols ugisozols Add note to changelog about #1817. a311ee5
@kandadaboggu kandadaboggu Initialized the @page variable in the before filter for preview action 27fde37
@ugisozols ugisozols Merge pull request #1829 from kandadaboggu/patch-1
Initialized the @page variable in the before filter for preview action
ea3e889
Commits on Jul 20, 2012
@gwagener gwagener Rearranged paragraphs for a more logical flow. cdf43aa
@manuelmeurer manuelmeurer Convert locale from symbol to string before using in condition ccd9cbe
@parndt parndt Merge pull request #1831 from krautcomputing/page_with_globalize_cond…
…ition_fix

Fix condition in Refinery::Page#with_globalize
b5858bc
Commits on Jul 22, 2012
@manuelmeurer manuelmeurer Convert locale from symbol to string before using it in condition 9bf70a6
@parndt parndt Merge pull request #1832 from krautcomputing/page_by_slug_condition_fix
Fix condition in Refinery::Page#with_globalize
f5b9166
Commits on Jul 23, 2012
@robyurkowski robyurkowski made suggested edits to Heroku guide 862ff7a
Commits on Jul 24, 2012
@parndt parndt Merge remote-tracking branch 'roryokane/guide-fixes'
Conflicts:
	doc/guides/7 - Hosting and Deployment/1 - Heroku.textile
32d8c96
@parndt parndt Fix p'arndt style fail c2e0196
@manuelmeurer manuelmeurer Convert locale to string before using in condition 2f60785
@ugisozols ugisozols Merge pull request #1834 from krautcomputing/another_i18n_locale_fix
Convert locale to string before using in condition (fixed)
b1c3156
@ugisozols ugisozols Use let! to create pages right away so that we don't have to create t…
…hem manually in before block. Stub config instead of setting it directly.
bdb544b
@parndt parndt Get rid of Factories in pages request specs.
In nearly all cases this makes the code more concise and removes an un-required
dependency on FactoryGirl.
4f485a7
@parndt parndt Swapped from before(:each) to before.
These are equivalent and the resulting code is more concise.
0771d1f
Commits on Jul 25, 2012
@ugisozols ugisozols Revert "Allow transactional database strategy with Selenium."
This reverts commit 0572d3a.
44a552d
@parndt parndt Fix Refinery#route_for_model by not calling singularize on an already…
… singular route.
08f39d1
@parndt parndt Removed things from class_eval that didn't need to be there c42732b
@parndt parndt Removed mocking from extension generation specs.
This was buggy at best and didn't work in rbx or jruby.
This also revealed the reason why we mocked in the first place
which was that the code was overzealous with removing /tmp/
from anywhere inside the destination_path which could be a bad
thing if someone's project resided under, say, /code/projects/tmp/
which was the case with refinery/core/tmp/.

Conflicts:
	core/lib/refinery/extension_generation.rb
	core/spec/lib/generators/refinery/engine/engine_generator_spec.rb
460d946
@jkovar jkovar Fixes a typo in czech tooltip localisation 839f552
@ugisozols ugisozols Merge pull request #1838 from jkovar/czech-localisation
Fixes a typo in czech tooltip localisation
a9c6e02
@parndt parndt Provide defaults for Refinery::I18n 58e24df
Commits on Jul 29, 2012
@robyurkowski robyurkowski Update javascript guide for later versions of Refinery. fe75bf2
@keram keram fix missing template error and simplify code 706bf69
@parndt parndt Tidy code out of case statement into single conditional. f99f6de
Commits on Jul 30, 2012
@parndt parndt Updated to new APIs
update_attribute -> update_attributes
f98dc3d
@parndt parndt 404 on unknown dialog instead of rendering a blank iframe. 1d3bee2
@ugisozols ugisozols Merge pull request #1846 from resolve/dialog_404s_on_unknown_actions
404 on unknown dialog actions.
aec35de
@parndt parndt Moved view method Page#title_with_meta into the view.
New Helpers:
* page_title_with_translations(page)
* page_meta_information(page)

These helpers apply to the Refinery backend when conventionally invoked.
7dca437
@parndt parndt Refactored code from Dialogs#show into utility methods. 51b2cb1
@parndt parndt Fixed some whitespace and unrequired parentheses. f1b6717
@ugisozols ugisozols Add specs for page_meta_information and page_title_with_translations …
…helper methods.
576545c
@ugisozols ugisozols Merge pull request #1847 from resolve/backend_separate_meta_informati…
…on_from_page_title

Placed view logic in the view.
97f897d
Commits on Aug 01, 2012
@parndt parndt Provide a utility helper view_context#sanitize_hash
Primary use case: to sanitize Pages#preview input.
207299c
@ugisozols ugisozols Add specs for sanitize_hash helper. 7079ad1
@parndt parndt Allow failures in jruby because it is so unreliable.
Make sure to check them though.
765174c
@keram keram sk translation for refinery:form 52e5e89
@ugisozols ugisozols Merge pull request #1851 from keram/sk-cs-translations
sk translation for refinery:form
5bd7710
@ugisozols ugisozols Move changelog entry about #1847 to 2.0.6 section. 4e90bc7
Commits on Aug 02, 2012
@keram keram czech translation and bugfixes in slovak fa2b098
@simi simi Update core/lib/generators/refinery/form/templates/config/locales/cs.yml
Czech form translation review
8fdd31b
@keram keram Merge pull request #1 from simi/sk-cs-translations
Update core/lib/generators/refinery/form/templates/config/locales/cs.yml
1d4d99a
@ugisozols ugisozols Merge pull request #1855 from keram/sk-cs-translations
czech translation and bugfixes in slovak
47584ae
@robyurkowski robyurkowski Remove extra javascript content blocks. 7501df3