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: 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 Apr 01, 2012
@michaelmichael michaelmichael Escape plus sign, fix formatting typo. 53d772f
Commits on Apr 02, 2012
@phiggins phiggins Reformat regexp that broke vim's syntax highlighting. 4ac888a
@parndt parndt Merge pull request #1546 from phiggins/fix_vim_syntax_highlighting
Reformat regexp that broke vim's syntax highlighting.
9d93cba
@phiggins phiggins Fix presenter finding logic. d8f9059
@parndt parndt Merge pull request #1547 from phiggins/fix_presenter_finding_logic
Fix presenter finding logic.
b99e60b
@parndt parndt Corrected changelog entries and dated the 2.0.3 release. 6ade9bb
Commits on Apr 03, 2012
@ugisozols ugisozols Multi-kill! #1552, #1553, #1554.
* Update generated engine Gemfile
* Remove --format Fuubar from Guardfile
* Fix failing specs for newly generated engine
5ef8e0a
@ugisozols ugisozols Bump gem versions. 708a0f4
@parndt parndt Flattr's not really that useful to put here. 9d66f24
Commits on Apr 04, 2012
@ugisozols ugisozols Use the same :cli guard setup that we're using in Refinery's rGuardfile. 86eaa35
@parndt parndt Merge remote-tracking branch 'origin/issues_1552_1553_1554' 268cfd7
@parndt parndt Support the spec/dummy application primarily and fall back to the ven…
…dored app or else raise an exception.
a14a949
@jkovar jkovar translated what into the actual name c81cd76
@ugisozols ugisozols Merge pull request #1563 from SmartMedia/czech_image_text_localization
translated what into the actual name
c4313b2
@ugisozols ugisozols Add changelog entry about stack level too deep in Refinery::Menu fix. c578981
@ugisozols ugisozols Update changelog. aee1e99
@ugisozols ugisozols Fix for #1555. a8da756
Commits on Apr 05, 2012
@parndt parndt Wrap :js examples and set DatabaseCleaner strategy to :truncation bef…
…ore the spec and back to :transaction afterward.
efcc935
@ugisozols ugisozols Merge pull request #1566 from resolve/database_cleaner
Faster specs when running all together.
951cc47
@jkovar jkovar Czech translation for subpage addition db40bc3
@ugisozols ugisozols Merge pull request #1567 from SmartMedia/czech_subpage_translation
Czech translation for subpage addition
2a8a5e2
@mcelaney mcelaney Added instructions for deploying to Heroku assuming a local Refinery …
…implementation on SQLite
66d28fb
@rounders rounders fix spelling mistake and update version number of rails template 7526d20
@ugisozols ugisozols Merge pull request #1571 from rounders/minor-fixes-to-guide
fix spelling mistake and update version number of rails template
e8a5b00
Commits on Apr 06, 2012
@mcelaney mcelaney Update doc/guides/7 - Hosting and Deployment/1 - Heroku.textile 9d1bb23
@mcelaney mcelaney Update doc/guides/7 - Hosting and Deployment/1 - Heroku.textile 725cf9f
@ugisozols ugisozols Add admin_dialogs_path and use that in wym setup. 0dd7afd
@parndt parndt Merge pull request #1565 from resolve/issue_1555
Fix for #1555.
4714f68
@ugisozols ugisozols Add changelog entry about dialog opening fix. 624cdb7
David Kovacs Extensions were not watched properly by guard
The extension file path was absolute instead of relative
c8b3d50
@robyurkowski robyurkowski Bugfix: correct remnant route from 1-0-stable. 91c3224
@parndt parndt Merge pull request #1570 from mcelaney/master
Deploy to Heroku if you've already implemented on SQLite
ad424bb
@ugisozols ugisozols Merge pull request #1574 from resolve/b/correct-admin-users-controlle…
…r-route

Bugfix: correct remnant route from 1-0-stable.
5aa0222
@parndt parndt Merge pull request #1573 from davidkovaccs/master
Extensions were not watched properly by guard
5c2fc5c
Commits on Apr 07, 2012
@ugisozols ugisozols Update links to guides in readme.md. Closes #1575. 39dc918
Commits on Apr 08, 2012
@parndt parndt Capitalise Devise. a18ba59
@parndt parndt Introduced my patch for site_name being configurable in i18n as well …
…but defaulting to the config.
64a4537
@ugisozols ugisozols Add specs for #1576. 94e5474
Commits on Apr 10, 2012
@xyz xyz Update pages/app/views/refinery/admin/pages/_form_advanced_options.ht…
…ml.erb
8f8983d
@ugisozols ugisozols Add missing en translations for layout_template and layout_template_h…
…elp.
5834331
@vita vita Fix adding link to page when switch locale in administration 7865cc5
@xyz xyz Update pages/app/views/refinery/admin/pages/_form_advanced_options.ht…
…ml.erb
3cf5b21
@nicholassm 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.
3d186b7
@xyz xyz Merge remote-tracking branch 'upstream/master' 2c825c4
@ugisozols ugisozols Fix spelling. 0ed0f45
@nicholassm nicholassm Adds spec that shows bug in Refinery::Page.find_by_path. 4b8fe6b
@parndt parndt Merge pull request #1576 from resolve/site_name_i18n
Introduced my patch for site_name being configurable in i18n as well but...
6bc0c98
@nicholassm nicholassm Replaces reverse_merge with merge. 970f9fc
@ugisozols ugisozols Merge pull request #1584 from Subsis/master
Fixes page ambiguity for different pages with the same slug in find_by_path.
1056d6c
@ugisozols ugisozols Merge pull request #1581 from xyz/master
Inherit parent page layout & view templates
d5703c0
@ugisozols ugisozols Add specs for #1581. 9804c0f
@ugisozols ugisozols Add missing changelog entries. 6fe0ac2
@ugisozols ugisozols Use full name in changelog. 148c372
Commits on Apr 11, 2012
@parndt parndt Require at least awesome_nested_set 2.1.3 which fixes #1399 eb370cf
@jokklan jokklan danish translation for pages 5b066bc
Commits on Apr 12, 2012
@jokklan jokklan Updated pages/config/locales/da.yml with hvirring's comments 9018087
@josiahivey josiahivey Add a header for the engine section 01a6f9d
@robyurkowski robyurkowski Merge pull request #1590 from josiahivey/add-header-to-readme
Add a header for the engine section
8e64fbf
@ugisozols ugisozols Merge pull request #1589 from pylonweb/i18n_da
danish translation for pages
ca3c922
@parndt parndt Engines -> Extensions f8dc7a3
@parndt parndt Popular Engines -> Popular Extensions b4c550b
@parndt parndt Removed waffle, even though I love waffles. ad109b4
Commits on Apr 15, 2012
@vormwald vormwald Added a missing quote 79be5f6
@ugisozols ugisozols Merge pull request #1596 from mvormwald/patch-1
Added a missing quote
ec35c66
Commits on Apr 16, 2012
@vormwald vormwald Update images/lib/generators/refinery/images/templates/config/initial…
…izers/refinery/images.rb.erb
2b7ac21
@parndt parndt Merge pull request #1597 from mvormwald/master
Added a missing quote
95f1bb4
@robyurkowski robyurkowski Fixes #1592. 1c6f99b
@parndt parndt Merge pull request #1598 from resolve/doc
Fixes #1592.
1ced7a9
@ugisozols ugisozols Fix image toggler show/hide function. #1587. c1aff06
@parndt parndt Merge pull request #1601 from resolve/issue_1587
Fix image toggler show/hide function. #1587.
c05289b
@parndt parndt Bundler is now up to date. b2b9afb
@parndt parndt Quiet assets in development mode please. 496db45
Commits on Apr 18, 2012
@robyurkowski robyurkowski Ensure plugin params are set before checking exclusion, and remove un…
…used variable.
f7a1de0
@robyurkowski robyurkowski Fix this up to be prettier. 11c1ad5
@parndt parndt Fixed formatting of ruby blocks
Conflicts:

	doc/guides/2 - Refinery Basics/1 - Changing Page Parts.textile
438fc6b
@parndt parndt Create child directly against parent_page using FactoryGirl.attribute…
…s_for(:page)
9ede8b8
@parndt parndt Made the check for image more reliable by just checking for image_nam…
…e instead of the full URL.

What was happening was the url was changing because the search was thumbnailing so it wasn't an exact match.
Checking for image_name means we're just checking for beach.jpeg at the end of the href which works every time.
d7e5de2
Commits on Apr 19, 2012
@ugisozols ugisozols Rename @selected_plugins back to @selected_plugin_names. fb7be10
@ugisozols ugisozols Add spec for #1602. d7fb8a1
@robyurkowski robyurkowski Let's use pluck instead of collect since it's more efficient. 19da3b5
@parndt parndt Merge branch 'master' into rob 48485bb
@parndt parndt Exclude particular database gems from Travis CI. 1fb46fe
@parndt parndt Rails already generates the right database.yml, no need to replace it? 9279610
@parndt parndt Turns out we want to match like mysql because jruby reports jdbcmysql 4926765
@parndt parndt When using JDBC we want to use mysql and not mysql2. 436cc09
Commits on Apr 20, 2012
@parndt parndt Added a testing task which clears the database before generating the …
…application for DBs such as s mysql or postgres where the tables may already exist and therefore fail at life.
1945d81
@parndt parndt Until I can reproduce rbx failures locally it makes no sense to fail …
…the build because of them.
755f94b
Commits on Apr 22, 2012
@jokklan jokklan Disable page caching when logged in to prevent caching the sitebar. 707128f
@parndt parndt Merge pull request #1609 from TheMaster/patch-1
Disable page caching when logged in to prevent caching the sitebar.
29d4b03
@parndt parndt Merge branch 'rob' d098c4b
Commits on Apr 23, 2012
@ugisozols ugisozols Add note about Refinery::Core.force_ssl to changelog. ef9f440
@ugisozols ugisozols Add all generated attributes to attr_accessible whitelist. #1578. b36bc05
@parndt parndt Merge pull request #1613 from resolve/issue_1578
Add all generated attributes to attr_accessible whitelist. #1578.
7b3a41e
@f3ng3r 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)
b00695c
Commits on Apr 24, 2012
@ugisozols ugisozols Add ability for extension/form generators to append to existing seeds…
….rb file instead of overwriting it. #1532.
60027d2
@ugisozols ugisozols Update changelog. 7a2451a
@ugisozols ugisozols Add failing spec for #1583 52218e9
@ugisozols ugisozols Merge pull request #1583 from SmartMedia/nested_path
Fix adding link to page when switch locale in administration
a0513cf
@ugisozols ugisozols Don't assume page links will be absolute - check only for locale + pa…
…ge slug. (10 points goes to @parndt).
90baceb
@ugisozols ugisozols Use http verbs in route definitions instead of 'match'. 8938ac5
Commits on Apr 25, 2012
@ugisozols ugisozols Update changelog and add associated ticket/pr ids to the entries. 90be299
@thedarkone thedarkone Refinery::AuthSys module can be injected directly into ::ApplicationC…
…ontroller.
38b2ed8
@thedarkone thedarkone Avoid double module inclusion. bf2301e
@ugisozols ugisozols If generated extension uses translations add attr_accessible :locale …
…to Translation class.
df3be43
@thedarkone thedarkone Use event delegation for detecting modal dialog links. d0cef21
Commits on Apr 26, 2012
@thedarkone thedarkone ApplicationHelper is an autoloadable constant, there is no need for a…
…n explicit require.
0511133
@ugisozols ugisozols Pretty up code. a753e7b
@ugisozols ugisozols Match text attributes too in generated crudify code. 99fe741
@ugisozols ugisozols Experiment on Travis CI. 21c34af
@ugisozols ugisozols Brink back Rubinius testing on Travis and allow it to fail :) #1603. 27286d2
@regismesquita regismesquita Fix a bug when default_url_options[:host] is not setted at action con…
…troller in production mode.
26f609b
@parndt parndt Merge pull request #1624 from regismesquita/master
Ajax reordering crashs when default_url_options[:host] is not setted at action controller in production mode.
153d9b4
Commits on Apr 28, 2012
@thedarkone 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.
0f16e53
Commits on Apr 30, 2012
@jtmkrueger jtmkrueger extra a in the sentence 8c69f2c
Commits on May 03, 2012
@ugisozols ugisozols Try rbx-19mode on Travis. 8d2e5e3
@ugisozols ugisozols Add rbx-18mode to travis.yml. 3f60600
Commits on May 04, 2012
@robyurkowski robyurkowski Use proper template location for admin error_404. 42f1887
@robyurkowski robyurkowski Re-enable controller back-end access checking. ba98e45
Natalí Bug fixed in Firefox 11. In the image picker popup, the content is bl…
…ank until you move the popup.
b846ca0
@ugisozols ugisozols Merge pull request #1637 from nnatali/master
Bug fixed in Firefox 11.
907a3dd
@ugisozols ugisozols Add changelog entry about #1637. 231f71f
Commits on May 06, 2012
@keram keram added verbose rack cache config to core 9643a90
@keram keram set config verbose rack cache to false by default d517fe4
Commits on May 07, 2012
@ugisozols ugisozols Fix failing specs. cfc44b5
@nashby nashby add ru locales for preview button ee8355f
@ugisozols ugisozols Merge pull request #1641 from nashby/preview-button-locale
add ru locales for preview button
33f86c0
@ugisozols ugisozols Add help to refinerycms command. #1538, #1539. 5202779
@ugisozols ugisozols Add temp fix for #1595. 50e0b7e
@ugisozols ugisozols Merge pull request #1636 from resolve/fix-permission-error
Fix permission error
7378cbe
@keram keram improve comment for verbose rack cache option b81887f
@ugisozols ugisozols Merge pull request #1640 from keram/master
added configuration verbose_rack_cache
e55c09e
Commits on May 08, 2012
@ugisozols ugisozols Update page parts guide. 72172d4
Commits on May 10, 2012
@wenzowski wenzowski travis should test against jruby in 1.8 and 1.9 modes fe50afd
@parndt parndt JRuby 1.9 mode is allowed to fail (currently) 2846e2f
Commits on May 11, 2012
@ugisozols ugisozols Stop route reloading madness. #1599. 8d94901
@parndt parndt Merge pull request #1649 from resolve/issue_1599
Stop route reloading madness. #1599.
283f023
Commits on May 12, 2012
@parndt parndt Only run one test task on Travis without the JS switch. db2c481
@parndt parndt Merge remote-tracking branch 'thedarkone/no-double-inclusion' df97108
@parndt parndt Renamed include_unless_included to include_once 76168b1
@thedarkone thedarkone Manually preload the :translations to avoid the N+1 queries. 21d0adc
@parndt parndt Combined patches and linked to a PR in awesome_nested_set where passi…
…ng a relation *will* work.
e4c0aae
@parndt parndt Implement feedback from @ugisozols. c8dabae
@jipiboily jipiboily fixed engine generation view that had hardcoded "title" attribute 3854d37
@parndt parndt Use || not or d86a25f
@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 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
@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
Commits on Jun 03, 2012
@robyurkowski robyurkowski Added Custom View / Layout Template guide. 27b4fc6
@parndt parndt Text -> Reformat Selection
[ci skip]
e4f7481