Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 3,251 commits
  • 1,451 files changed
  • 0 comments
  • 35 contributors
This comparison is big! We're only showing the most recent 250 commits
Apr 18, 2012
Philip Arndt parndt Fixed formatting of ruby blocks 672df2b
Philip Arndt parndt Remove stray @ fb9300d
Philip Arndt parndt Removed another stray @ aaddd78
Philip Arndt parndt place the spec contents under module Refinery so that BasePresenter e…
…xists.
207fc80
Apr 19, 2012
Philip Arndt parndt don't just guess the id, actually use the created object's id. a12337d
Philip Arndt parndt Create child directly against parent_page using FactoryGirl.attribute…
…s_for(:page)
53b5d3a
Apr 21, 2012
Philip Arndt parndt Fixes #1452 by forcing SSL when not in SSL already and when new setti…
…ng Refinery::Core.force_ssl is set true.

Conflicts:

	core/lib/refinery/application_controller.rb
91c96ee
Philip Arndt parndt Added specs to fix faulty logic with force_ssl.
Conflicts:

	core/spec/controllers/refinery/admin/refinery_core_controller_spec.rb
	core/spec/lib/refinery/application_controller_spec.rb
c920251
Philip Arndt parndt Added coverage for when admin? is false and force_ssl is true. 1f41de9
Apr 22, 2012
Uģis Ozols ugisozols Remove :if => admin? from refinery_user_required? filter. f1b4852
Uģis Ozols ugisozols Remove one of the application controller specs because the functional…
…ity won't be in 2.0.x.
760f62d
Uģis Ozols ugisozols Add note about Refinery::Core.force_ssl to changelog. 133499d
thedarkone Make sure the precompile asset paths are properly set up when running…
… `rake assets:precompile`.
bc947be
Philip Arndt parndt Merge pull request #1610 from thedarkone/precompile-path-fix
Precompile path fix
110ea1a
Philip Arndt parndt Merge pull request #1608 from resolve/force_ssl
Backport force_ssl setting to 2-0-stable.
93e5397
Apr 23, 2012
Philip Arndt parndt Until I can reproduce rbx failures locally it makes no sense to fail …
…the build because of them.
e229766
Apr 24, 2012
Philip Arndt parndt Added support for @canonical in pages_controller.
Fixes #1472
408fd16
Frederik Fenger f3ng3r Fixed bugs with page sweeper.
In particular:
  * Fixed bug where `page_cache_directory = Pathname.new(page_cache_directory.to_s)` returns an empty path.
  * Changed `cache_root.rmdir` to `FileUtils.rm_rf cache_root` in order to delete an non-empty directory.
  * Remove the `pages.html` file that is outside the `../pages/` directory and any file like it (for example pages.html.gz)
6cef03a
Uģis Ozols ugisozols Update changelog. 332b512
Vít Krchov vita Invalidate cached urls for all frontend locales 8167451
Rob Yurkowski robyurkowski Check for Refinery::I18n's presence to fix #1533. 032a9be
Philip Arndt parndt Use code suggested by @ugisozols and switch to Refinery.i18n_enabled?…
… over defined?(::Refinery::I18n)

Conflicts:

	pages/app/models/refinery/page.rb
fdba0dc
Philip Arndt parndt Fix bug introduced by @parndt 3c53e56
Uģis Ozols ugisozols Don't check if Refinery.i18n_enabled? in path_cache_key and url_cache…
…_key methods.
f8f5350
Vít Krchov vita Fix adding link to page when switch locale in administration c0f9a7c
Uģis Ozols ugisozols Add failing spec for #1583 4494ffc
Nicholas Schultz-Møller nicholassm Ensures correct page is found when two pages have same slug.
The first page found (with a non-blank slug) in find_by_path should be a root page.
1177914
Nicholas Schultz-Møller nicholassm Replaces reverse_merge with merge. eaf403b
Uģis Ozols ugisozols Don't assume page links will be absolute - check only for locale + pa…
…ge slug. (10 points goes to @parndt).
e7bff2e
Apr 25, 2012
Uģis Ozols ugisozols Update changelog and add associated ticket/pr ids to the entries. 365dc33
Jean-Philippe Boily jipiboily fixed engine generation view that had hardcoded "title" attribute 8a46207
Uģis Ozols ugisozols If generated extension uses translations add attr_accessible :locale …
…to Translation class.
5f81959
Philip Arndt parndt Merge pull request #1617 from resolve/cherry_picks_from_master
Cherry picks from master
b420f54
Philip Arndt parndt Merge pull request #1620 from thedarkone/event-delegation
Modal links, event delegation
53651f3
Apr 26, 2012
thedarkone ApplicationHelper is an autoloadable constant, there is no need for a…
…n explicit require.
923e7e5
thedarkone Use event delegation for detecting modal dialog links. 8a457dd
Philip Arndt parndt Merge remote-tracking branch 'thedarkone/require_dependency' into 2-0…
…-stable
0377684
Uģis Ozols ugisozols Experiment on Travis CI. 2ff2aa1
Uģis Ozols ugisozols Brink back Rubinius testing on Travis and allow it to fail :) #1603. 8e560b2
Apr 27, 2012
thedarkone Add missing files for precompiling. df71b09
thedarkone Remove ApplicationHelper's file to prevent it from getting cached in …
…Refinery::Core::Engine.helpers and thus stop picking any changes made to the application_helper.rb located in the main app.
c33cf56
Apr 28, 2012
Uģis Ozols ugisozols Merge pull request #1627 from thedarkone/appl-helper
Remove application_helper.rb from refinery/core
b4b5342
Apr 29, 2012
Uģis Ozols ugisozols Merge pull request #1625 from thedarkone/asset-precompiles
Add missing assets.precompile declarations
8ad57a1
Apr 30, 2012
jtmkrueger jtmkrueger extra a in the sentence 6f5ca0e
May 02, 2012
Uģis Ozols ugisozols Add admin_dialogs_path and use that in wym setup.
Conflicts:

	core/app/assets/javascripts/refinery/boot_wym.js.erb
21ab29b
May 04, 2012
Natalí Bug fixed in Firefox 11. In the image picker popup, the content is bl…
…ank until you move the popup.
7b5589b
Uģis Ozols ugisozols Add changelog entry about #1637. c3d357a
May 07, 2012
Vasiliy Ermolovich nashby add ru locales for preview button 4c7abda
Uģis Ozols ugisozols Add temp fix for #1595.
Conflicts:

	core/app/assets/javascripts/refinery/submit_continue.js.coffee.erb
999ba82
Rob Yurkowski robyurkowski Use proper template location for admin error_404. ea01b96
Rob Yurkowski robyurkowski Re-enable controller back-end access checking. b076e2b
Uģis Ozols ugisozols Fix failing specs. b786383
May 10, 2012
Uģis Ozols ugisozols Fhere are no 'refinery_login_with' and 'logged_in_user' methods avail…
…able in 2-0-stable.
ef2393f
May 12, 2012
thedarkone Manually preload the :translations to avoid the N+1 queries.
Combined patches and linked to a PR in awesome_nested_set where passing a relation *will* work.
Implement feedback from @ugisozols.
19bdac3
Philip Arndt parndt Merge remote-tracking branch 'jipiboily/engine_generator_fix' into 2-…
…0-stable
47cca18
Philip Arndt parndt Fixes #1628 by updating Dragonfly API usage. 20c0169
Philip Arndt parndt Fixes #1568 by removing errant documentation. c5a88f8
Uģis Ozols ugisozols Merge pull request #1654 from resolve/issue_1628
Fixes #1628
f4d7026
Uģis Ozols ugisozols Merge pull request #1653 from resolve/pull_1633
Replaces #1633
b013343
May 13, 2012
Uģis Ozols ugisozols Merge pull request #1661 from resolve/fix_route_for_model
Fixes resolve/refinerycms-search#16
b1bc5c1
May 14, 2012
Philip Arndt 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)
59970c6
Philip Arndt parndt Increment version to 2.0.4 3ef0a2c
Philip Arndt parndt Updated changelog for recent changes. 7c56871
Philip Arndt parndt I plan to release this soon. 24c5e44
Uģis Ozols ugisozols Add issue/pr ids to changelog. c4f14df
Philip Arndt parndt Terminate <shell> section with </shell> not <shell> ;-) 1bd98ee
Philip Arndt parndt Added Rob Yurkowski 2beb6c0
Uģis Ozols ugisozols I somehow screwed up and deleted release date. 09a9f1e
Philip Arndt parndt And then the header level. cd719e8
Uģis Ozols ugisozols We need * for list item. 432f273
Vasiliy Ermolovich nashby add ru translation for wymeditor 84851fa
May 16, 2012
Philip Arndt parndt Fixes issue #1651 d0b146a
Uģis Ozols ugisozols Merge pull request #1669 from resolve/cherry-pick-2-0
Cherry pick for #1613
4a7f9f8
May 17, 2012
Uģis Ozols ugisozols Add all generated attributes to attr_accessible whitelist. #1578.
Conflicts:

	core/lib/generators/refinery/engine/templates/app/models/refinery/namespace/singular_name.rb
93c510c
Uģis Ozols ugisozols I lied. #1613 wasn't added until 2.0.5. 1505f83
Uģis Ozols ugisozols Add note to chanhelog about #1651. 2655a49
May 18, 2012
Adrien Coquio bobbus Updated getting started guide to add link to Using Refinery with an E…
…xisting Rails App Guide
c21f2a1
Uģis Ozols ugisozols Use content_for :body and content_for :side_body in extension generat…
…ors.
e775063
Uģis Ozols ugisozols Add note to changelog about new page part name usage. 260464c
Philip Arndt parndt Merge pull request #1671 from bobbus/patch-1
Updated getting started guide to add link to Using Refinery with an Existant Rails App
fe9ad87
May 23, 2012
Uģis Ozols ugisozols Add ability for extension/form generators to append to existing seeds…
….rb file instead of overwriting it. #1532.
b7555e1
Uģis Ozols ugisozols Add specs for #1532. 6c9ef07
Uģis Ozols ugisozols Add note to changelog about #1532. 47f8299
May 24, 2012
Uģis Ozols ugisozols Allow to match js files with more than one extension like js.coffee o…
…r js.coffee.erb in refinery:override rake task.
94bd676
Uģis Ozols ugisozols Add note to changelog about #1685. 9b8c16d
Uģis Ozols ugisozols To be fair Philip was the one who suggested better fix. 5dcd091
Julien Palmas bartocc add changelog entry
Conflicts:

	changelog.md
0ad916b
Joe Sak joemsak Convert tabs to soft tabs w/ spaces 5a3e8e5
Joe Sak joemsak Correct the private method indentation 29d81a3
Joe Sak joemsak Use the page ID in admin to eliminate re-sort edit link bug b66bb6a
Philip Arndt parndt Merge pull request #1692 from neotericdesign/fix-page-resort-bug
Fixes #1390 Fix page resort bug
a941cf1
Joe Sak joemsak Fix pages specs for new id in edit link e43fb8b
Philip Arndt parndt Merge pull request #1693 from neotericdesign/2-0-stable
Fix pages specs for new id in edit link
dec88ae
May 25, 2012
Ole Reifschneider Tranquility multiple languages for pageseeds 969b793
Philip Arndt parndt Refinery::I18n isn't necessarily available until 2.1 be6ff4a
Philip Arndt parndt Merge branch '2-0-stable' into canonical 26fd31e
Philip Arndt 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.
4fa540e
Uģis Ozols ugisozols Add failing spec for #1673. ab1b4f1
Uģis Ozols ugisozols Simplify failing dashboard spec. 5aad5d3
Philip Arndt parndt Fixes seeding bug introduced by me in be6ff4a d3dcb33
Philip Arndt parndt Merge branch '2-0-stable' into issue_1673 c09d107
Uģis Ozols ugisozols Fix failing mysql spec by increasing nested page updated_at timestamp. 806601b
Uģis Ozols ugisozols Merge pull request #1696 from resolve/issue_1673
Fixes #1673
cef6aa9
Uģis Ozols ugisozols Add note to changelog about #1673. 14aa588
Philip Arndt parndt Match only &dialog, ?dialog, &width, ?width, &height, ?height which f…
…ixes #1397
64dcb29
Uģis Ozols ugisozols Add note to changelog about #1397. ed84d68
Uģis Ozols ugisozols Add note to changelog about #1694. ae07be4
Uģis Ozols ugisozols Support multiple languages for seed data in extension and form genera…
…ted seeds file.
f8b113e
Rob Yurkowski robyurkowski Merge pull request #1698 from resolve/canonical
Added canonical support which helps for #1457
4c3202f
Joe Sak joemsak Implement Page.rebuild! so that invalid url cache is cleared on re-sort 174545f
May 26, 2012
Philip Arndt parndt Merge branch '2-0-stable' into canonical 6e5bf50
Philip Arndt parndt Revert "Fix pages specs for new id in edit link"
This reverts commit e43fb8b.
cec07e4
Philip Arndt parndt Added tests, found bugs, finished canonical support. c642439
Philip Arndt parndt Documented Refinery::Page#canonical in changelog e32ba57
Philip Arndt parndt Fixes #1703 by downcasing usernames before saving them.
Note: This has the implication that all usernames will now be stored downcased.
05d0d1d
Philip Arndt parndt Call invalidate_cached_urls on all (via find_each) and make sure to c…
…all super on rebuild!
2a7f4a3
Uģis Ozols ugisozols Merge pull request #1704 from resolve/username_uniqueness_case_insens…
…itivity

Fixes #1703
629b03e
May 28, 2012
Philip Arndt parndt .each is superfluous on a find_each and invalidate_cached_urls is a p…
…rivate method.
843346d
ghoppe fix default template selected aec30b8
ghoppe @page is the variable name 11b0f1f
May 29, 2012
Uģis Ozols ugisozols Add smoke test for #1706. 9adbd71
Uģis Ozols ugisozols Reimplement #1711 based on @parndt's suggestions and add specs. b1a0b6b
Julien Palmas bartocc implement Refinery::Images#s3_region and Refinery::Resources#s3_region b77b0b5
Jeremy Weiskotten 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
84c6cb7
Uģis Ozols ugisozols Merge pull request #1712 from resolve/issue_1710
Reimplement #1711
45a1e2d
May 30, 2012
Philip Arndt parndt Renames view_template_options to template_options c234393
Philip Arndt parndt Added ruby tags for ruby codes instead of shell tags. b159923
Philip Arndt parndt Unfortunately spec/spec/config/environment.rb did not exist.. 8185ff6
Philip Arndt parndt Added note about running the steps inside your extension and not from…
… your project's root and warning about rake.
a34aece
Uģis Ozols ugisozols Add note to changelog about #1710. a06786b
Uģis Ozols ugisozols Use shorter syntax of render. a9571a8
May 31, 2012
Uģis Ozols ugisozols Merge pull request #1721 from terriblelabs/2-0-stable
Use Page#url to view page live from pages admin
a9ae83a
Jun 02, 2012
Uģis Ozols ugisozols Merge pull request #1706 from resolve/override-page-rebuild
Replaces #1702
ecfbfe8
Jun 05, 2012
Alexander 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.
0b3b7a2
Alexander Wenzowski wenzowski Added session key check for unscoped `return_to` variable #1724 3e95485
Jun 08, 2012
Uģis Ozols ugisozols Merge pull request #1737 from Tranquility/2-0-stable
page seeds translations into 2-0-stable
e697d90
Jun 09, 2012
Ole Reifschneider Tranquility update pages to create translations a9ee9e6
Jun 11, 2012
Uģis Ozols ugisozols Move flag links outside of title span.
Until now these links were disabled by expand/collapse stuff.
ba9c567
Uģis Ozols ugisozols Wrap flag icons in span. f3e199e
Philip Arndt parndt Fixed page locale-flag edit link. 273e4b8
Uģis Ozols ugisozols Add note to changelog about #1741. 20e80ef
Uģis Ozols ugisozols Add missing word in changelog. 5d71233
Philip Arndt parndt All my one tests were passing. 6d850c9
Philip Arndt parndt Let's release 2.0.5, shall we? f6b9599
Jun 12, 2012
Uģis Ozols ugisozols Add tmp/pids folder. 58bb214
Jun 13, 2012
Uģis Ozols ugisozols Allow 404 page to have custom view/layout templates. 5cb2b93
Uģis Ozols ugisozols Add note to changelog about #1746.
Conflicts:

	changelog.md
3cdbd9d
Jun 14, 2012
Uģis Ozols 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.

Conflicts:

	core/spec/support/refinery.rb
fd814f4
Uģis Ozols ugisozols Fix deprecation warnings. 28ea0ed
Jun 20, 2012
Uģis Ozols ugisozols Add anonymous controller route in spec.
Conflicts:

	core/spec/lib/refinery/application_controller_spec.rb
5acafb1
Jun 21, 2012
Uģis Ozols ugisozols Need to check if Refinery::I18n is defined before calling methods on it. 2dee86a
Jun 22, 2012
Uģis Ozols ugisozols Rename all .rb templates which contain erb to .rb.erb. d0393d5
Uģis Ozols ugisozols Add note to changelog about #1750. 0a5e13b
Jun 25, 2012
Philip Arndt parndt Merge pull request #1769 from markstuart/patch-2
Typo fix in Getting Started guide
5c20984
Jun 26, 2012
Mark Stuart markstuart Fix typo: Refienery -> Refinery 4505780
Jun 28, 2012
Antoine Proulx magicienap Translate some keys in French. ea85b47
Wieger Hofstra Added .nl language strings for wymeditor. Closes GH-1760 9f91b3a
Graham Wagener gwagener Fixed plurality in documentation of Page by_title and by_slug. 6be15d3
Zoltan Varady drifteaur avoid charset errors when precompiling assets with translated strings 5bcff3a
Rory O’Kane 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”
ff0222f
Uģis Ozols ugisozols Fix page reorder issue on Ruby 1.8.x. #1585. 309a6c1
Uģis Ozols ugisozols Merge pull request #1784 from gwagener/2-0-stable
Updated changelog now that Refinery::Page#canonical_slug is in 2-0-stable
ccf8e0d
Jun 29, 2012
Philip Arndt parndt Allow rspec-rails 2.10.x fb3ea90
Philip Arndt parndt Mock refinery_user_required? so that the crud spec can actually execute. a5428e2
Philip Arndt parndt Fixed update_child_positions with spec for #1585. 406c961
Philip Arndt parndt Cleaned whitespace d68d6ba
Graham Wagener gwagener Backported canonical_slug from master.
This is a partial cherry pick from bf0c7b0.
2efeb2e
Graham Wagener gwagener Updated changelog now that Refinery::Page#canonical_slug is in 2-0-st…
…able.
c70f694
Jun 30, 2012
Rob Yurkowski robyurkowski Added Custom View / Layout Template guide.
[ci skip]
1ed59ca
Jul 03, 2012
Kevin Bullock Factor copypasta out of Refinery::CLI#override ecb63ce
Kevin Bullock Allow overriding presenters 9b96ee6
Philip Arndt parndt Refactor CLI code.
* Hash keys to symbols
* Avoided using OVERRIDES[kind] over and over using a variable.
e59938f
Jul 07, 2012
Va-alexander Va-alexander Update 2-0-stable af533e6
Jul 10, 2012
Graham Wagener gwagener Removed created_at and updated_at from mass assignment. ec81f96
Jul 11, 2012
Uģis Ozols ugisozols Correctly add all attribute names to attr_accessible list + make some
other refactorings to engine/form generator and templates. #1657.

Conflicts:

	Gemfile
	core/lib/generators/refinery/engine/templates/app/models/refinery/namespace/singular_name.rb.erb
f1c7c3d
Grzegorz Brzezinka matfiz Added missing Polish translations for pages. f8eea4d
Grzegorz Brzezinka matfiz added missing i18n PL translations for wymeditor ab53f53
Philip Arndt parndt Tidy up invalid YML. a78b68a
Uģis Ozols ugisozols Add spec to ensure proper attributes gets added to attr_accessible list. c822fff
Uģis Ozols ugisozols Bump rspec-rails version and drop rack-test from testing dependencies…
… because we aren't tied to it directly.
ad1c5b3
Samuel Cochran sj26 Use absolute require for version in gemspec cfdb52e
Rob Yurkowski robyurkowski Merge pull request #1815 from resolve/cfdb52e58032
Cherry picks from master
f9f03e3
Jul 13, 2012
Rob Yurkowski 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.

Conflicts:

	testing/refinerycms-testing.gemspec
634eadb
Graham Wagener gwagener Revert "Use event delegation for detecting modal dialog links."
This reverts commit 8a457dd.

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
01cf674
Graham Wagener gwagener Fixes .../edit&switch_locale=en... bug with copywriting. 637be40
Jul 18, 2012
Uģis Ozols ugisozols We don't need all crudify stuff for form generated settings controlle…
…r so write edit and update actions ourselves.
9b93797
Uģis Ozols ugisozols Add note to changelog about #1817.
Conflicts:

	changelog.md
ecb0480
Jul 19, 2012
Harish Shetty kandadaboggu Initialized the @page variable in the before filter for preview action ac22a5c
Jul 24, 2012
Philip Arndt parndt update_attribute is deprecated in favour of update_attributes / updat…
…e_column
c170993
Rory O’Kane 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
0b4d17d
Rory O’Kane roryokane guide 7-2: revised Heroku config vars note
now the Heroku article link has its own link text
b5a8f9a
Rory O’Kane 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.
* 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”.
14268ad
Philip Arndt parndt Fix p'arndt style fail 3b2ed1c
Jul 25, 2012
Philip Arndt parndt Quiet assets in development mode please. edbd50a
Philip Arndt parndt Fix Refinery#route_for_model by not calling singularize on an already…
… singular route.
b5d5183
jkovar jkovar Fixes a typo in czech tooltip localisation 433e818
Jul 26, 2012
Philip Arndt 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/.
fe16c36
Philip Arndt parndt Only run one test task on Travis without the JS switch. c9c6bda
Philip Arndt parndt Wrap :js examples and set DatabaseCleaner strategy to :truncation bef…
…ore the spec and back to :transaction afterward.
a2fdc5f
Jul 29, 2012
Uģis Ozols ugisozols Cherry-pick bb9c847, which updates getting started guide (fixes #1791). da82cd8
Jul 30, 2012
Manuel Meurer manuelmeurer Convert locale from symbol to string before using in condition 5ea8f3b
Manuel Meurer manuelmeurer Convert locale from symbol to string before using it in condition 426efe3
Manuel Meurer manuelmeurer Convert locale to string before using in condition e7bb7f0
Uģis Ozols 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.
67f26c7
Philip Arndt 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.

Conflicts:

	pages/spec/requests/refinery/admin/pages_spec.rb
1796e6f
Philip Arndt parndt Swapped from before(:each) to before.
These are equivalent and the resulting code is more concise.

Conflicts:

	core/spec/lib/refinery/application_controller_spec.rb
	dashboard/spec/requests/refinery/admin/dashboard_spec.rb
	pages/spec/requests/refinery/pages_spec.rb
a31b2e4
Marek keram fix missing template error and simplify code c6149b6
Philip Arndt parndt Tidy code out of case statement into single conditional. 92b2e78
Aug 01, 2012
Marek keram sk translation for refinery:form 6b2a7c8
Philip Arndt parndt 404 on unknown dialog instead of rendering a blank iframe. 49257e5
Philip Arndt 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.

Conflicts:

	changelog.md
	pages/app/models/refinery/page.rb
1aac1b2
Philip Arndt parndt Refactored code from Dialogs#show into utility methods. 2b94065
Philip Arndt parndt Fixed some whitespace and unrequired parentheses. 4d0f73b
Uģis Ozols ugisozols Add specs for page_meta_information and page_title_with_translations …
…helper methods.
28ea833
Philip Arndt parndt Provide a utility helper view_context#sanitize_hash
Primary use case: to sanitize Pages#preview input.
665f0ea
Uģis Ozols ugisozols Add specs for sanitize_hash helper. 6253962
Uģis Ozols ugisozols Move changelog entry about #1847 to 2.0.6 section.
Conflicts:

	changelog.md
65f0858
Alexander Wenzowski wenzowski update rubygems per #1647 to avoid `bundle exec` failure on jruby in …
…1.9 mode

Conflicts:

	.travis.yml
1844a8b
Alexander Wenzowski wenzowski only update rubygems on jruby thanks to @mpapis 97c2533
Alexander Wenzowski wenzowski add mandatory "language" key per travis-lint cfcc16b
Andrew Hooker GeekOnCoffee Rearranging Rubies to get Travis to run critical rubies before allowe…
…d failure rubies

Conflicts:

	.travis.yml
a2da959
Andrew Hooker GeekOnCoffee Putting 1.9 before 1.8
Conflicts:

	.travis.yml
d44f3d0
Philip Arndt parndt Allow failures in jruby because it is so unreliable.
Make sure to check them though.

Conflicts:

	.travis.yml
6d30a5d
Uģis Ozols ugisozols Before trying to merge tmp locales check if the tmp file is actually …
…there because engine and form extension have different locale files.
1aa9254
Philip Arndt parndt Merge remote-tracking branch 'origin/cherry_picks_from_master' into 2…
…-0-stable
34a0871
Aug 02, 2012
Rob Yurkowski robyurkowski Merge pull request #1853 from resolve/issue_1816
Before trying to merge tmp locales check if the tmp file is actually there
1aeaacf
Aug 03, 2012
Marek keram czech translation and bugfixes in slovak 5d92e35
Josef Šimánek simi Update core/lib/generators/refinery/form/templates/config/locales/cs.yml
Czech form translation review
433f741
Marek keram sk translation for engine generator 153f587
Aug 07, 2012
Uģis Ozols ugisozols Sanitize form message before stripping tags and truncating it. 46cc2f2
Philip Arndt parndt Clean up whitespace 9908305
Philip Arndt parndt Update version to 2.0.6 609b490
Sir Bertly sirBertly Update doc/guides/2 - Refinery Basics/1 - Changing Page Parts.textile
Fixed reference to new_page_parts setting
8eb211b
Philip Arndt parndt Made changing page parts documentation consistent with master. 5866ccc
Aug 09, 2012
Uģis Ozols ugisozols Sanitize part.body in page_part_field partial. dea0e35
Aug 10, 2012
Uģis Ozols ugisozols Remove unnecessary require in ImageHelper. 4ecff01
Aug 11, 2012
Sir Bertly sirBertly Update doc/guides/1 - Getting Started/2 - Getting Started.textile 3838b04
Aug 14, 2012
Rob Yurkowski robyurkowski Add failing spec for #1585. 1c5d0b7
Rob Yurkowski robyurkowski Fix reordering shuffle that causes 11th+ items to be moved upward in …
…chain.
a504bfe
Philip Arndt parndt Lock to sass 3.1.12 so that tests pass.
They fail on 3.2.0 because of sass/sass#482
e714809
Aug 15, 2012
Rob Yurkowski robyurkowski Add changelog to respect #1882. a930dd8
Philip Arndt parndt Revert "Lock to sass 3.1.12 so that tests pass."
This reverts commit e714809.
Sass 3.2.1 is out and fixes the issue
402dc7c
Philip Arndt parndt Documented changelog for 2.0.7 8aee326
Aug 16, 2012
Rob Yurkowski robyurkowski Merge pull request #1873 from sirBertly/patch-5
Adds additional instructions for using an alternate db system.
9959448
Aug 17, 2012
Rob Yurkowski robyurkowski Suggest version 2.0 of jquery-rails to prevent bundle install issues. 2505d48
Rob Yurkowski robyurkowski Don't preserve local path for Refinerycms (oops). 3e7d215
Rob Yurkowski robyurkowski Update jquery-rails before initial bundle install. e3e4325
Philip Arndt parndt Clarify which version we're specifying. 48e0a0c
Philip Arndt parndt Version 2.0.8 6f826f2
Philip Arndt parndt Port list reordering fix to update_child_positions too so that nested…
… items are ordered correctly too.
0c78451