Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
This comparison is big! We’re only showing the most recent 250 commits
Commits on Mar 14, 2012
@phiggins phiggins Restore accidentally deleted comment. 6e76ec2
@parndt parndt Merge pull request #1454 from phiggins/refactor_fast_menu
Refactor fast menu
931dc7d
@ugisozols ugisozols Add missing authentication initializer. #1450. cbc30ad
@parndt parndt Using :transaction strategy which certainly appears to speed things u…
…p but fails tests.
1f13203
@parndt parndt Only use transaction method when using JS=false because Selenium does…
…n't like it so much (at least with sqlite)
8ff28fa
Commits on Mar 15, 2012
@markstuart markstuart Set page part positions on engine generation. 8d9e0ab
@gwagener gwagener Geometry has already been converted to a string. 2a280e2
@ugisozols ugisozols GAdd comment in extension template when appending seeds file. d64ad32
@ugisozols ugisozols Run AuthenticationGenerator too. 19982a3
@ugisozols ugisozols Fix #1450 by not allowing roles params to get through when creating n…
…ew user instance.
4cef1a7
@parndt parndt Merge pull request #1462 from resolve/issue_1450
Fix #1450 by not allowing roles params to get through when creating new ...
2ae6fc0
@parndt parndt refinerycms-core no longer requires 'rails' but 'railties', 'activere…
…cord', 'actionpack' which are the only packages we use.
9d81218
Commits on Mar 16, 2012
@parndt parndt Merge remote-tracking branch 'simi/auto-js-runtime' 0b99789
@parndt parndt Combined approaches from #1445 02e53fe
@parndt parndt Instead of instance variables for the various users, switched to let() eb9733b
@parndt parndt Made all authentication macros consistent. Now you just use refinery_…
…login_with :factory_name

This means we no longer need to add a new macro every time we add a new type of user.
You just supply the reference to the factory name and the currently logged in
user is available as logged_in_user.

Happy days!
4cb87cf
@parndt parndt Merge branch 'refactor_authentication_macros' into database_cleaner_t…
…ransaction

Conflicts:
	testing/lib/refinery/testing/controller_macros/authentication.rb
99aa6a9
@parndt parndt requiring action_pack does nothing, we need action_controller.
So weird.
67cef1d
@ugisozols ugisozols Merge pull request #1466 from resolve/refactor_authentication_macros
Refactored authentication macros for consistency. See full commit message.
d754ff7
@parndt parndt Use forks of generator_spec and paper_trail which do not use the full…
… rails stack.
412d0e0
@parndt parndt explicitly require actionmailer in refinerycms-authentication and fac…
…tor around its lack of presence in case authentication is not always using it.
eddd7bd
@parndt parndt gsub the sqlite3 gem into group :development, :test which fixes #1465 614ae73
@robyurkowski robyurkowski Merge pull request #1469 from resolve/sqlite_in_generated_gemfile_master
Fixes #1465 - sqlite3 should never be production. (in master)
89fd637
Commits on Mar 17, 2012
@parndt parndt Fixes #1470 by only appending to a Gemfile that exists (dummy doesn't…
… have one).
b7ad001
@parndt parndt Updated changelog with changes from 2-0-stable. 5061179
@jede jede Replaced label_tag:s with f.label since the labels got wrong for attr…
…ibutes.
89b3728
Commits on Mar 18, 2012
@parndt parndt Minor code style change - outdenting. 152f94c
@parndt parndt Removed hardcoded references to formatting and theme and home CSS fil…
…es and moved formatting and theme to asset pipeline and home to home.html.erb using content_for.

Fixes #1456
6017ce4
@robyurkowski robyurkowski Merge pull request #1473 from resolve/fix_issue_1456_asset_pipeline
Fixes issue #1456
e88e8bb
@robyurkowski robyurkowski Merge pull request #1455 from resolve/database_cleaner_transaction
Speed up specs by 33% when in JS=false mode (use transaction instead of truncation).
671dc0a
@parndt parndt Merge pull request #1442 from jede/remove_label_tag
Replaced label_tag:s with f.label since the labels got wrong for attributes
914826e
@parndt parndt The generator_spec patch was merged in stevehodgkiss/generator_spec#9
…so we can use the master repository now.
c6b769e
Commits on Mar 19, 2012
@ugisozols ugisozols Remove application stylesheet because it's not used. Move other style…
…sheets to refinery folder.
e5f7e63
@ugisozols ugisozols Merge pull request #1463 from resolve/less_rails
Reduced dependencies on the full rails stack.
ee693c8
@parndt parndt Merge pull request #1475 from resolve/organize_stylesheets
Remove application stylesheet because it's not used. Move other styleshe...
2d341ae
@parndt parndt We don't need to depend on uglifier. debe575
Commits on Mar 20, 2012
@parndt parndt Spotted indentation inconsistency when I was scanning the code for ma…
…gic tricks.
0e34bd0
@vita vita Invalidate cached urls for all frontend locales a0069f4
@robyurkowski robyurkowski Allow whitelisting of mime types inside images validator. a3af3dd
@ugisozols ugisozols Merge pull request #1480 from robyurkowski/f/images/white-list-mime-t…
…ypes

Images: Allow configurable whitelisted mime types
709c839
@parndt parndt Tidied up quoted array into a %w[] array. 3a74fd3
@phiggins phiggins Make page factory produce unique titles. 088806e
@parndt parndt Merge remote-tracking branch 'SmartMedia/cached_urls' b2f2637
@parndt parndt Merge remote-tracking branch 'phiggins/unique_title_for_page_factory' 6e51e1f
Commits on Mar 21, 2012
@nicinabox nicinabox Add admin label classes 7c999b3
@ugisozols ugisozols Remove rails-3-1 branch for each extension in edge template. 8488b39
@csmrmn csmrmn updated Dutch translations c68a79c
@parndt parndt Fixes #1485 by requiring refinerycms-settings in new form extensions. 1cb0aad
Commits on Mar 22, 2012
@nicinabox nicinabox Update draft & hidden label style in Page tree b65c120
@nicinabox nicinabox Merge remote-tracking branch 'upstream/master' afbc9f9
@phiggins phiggins Failing test for custom_slug uniqueness. ba3f731
@phiggins phiggins Add uniqueness constraint on custom_slug with fork of globalize3. a7e5d1d
@robyurkowski robyurkowski Update 'How to get help' doc.
- Add section about patience
- Minor textual corrections and a few elaborations
- Update core team
e2b31fa
@parndt parndt Merge pull request #1489 from resolve/doc
Update 'How to get Help' doc
bee4103
@robyurkowski robyurkowski Updates Translation guide to reflect new rake tasks, clarify language. d651985
@robyurkowski robyurkowski Use code blocks when denoting locale. 0ec48d5
@robyurkowski robyurkowski Must create dummy app before you can run lost in translation tasks. 6c9b3dd
@ugisozols ugisozols Merge pull request #1490 from resolve/doc
Update Translation guide
1e39c75
@ugisozols ugisozols Update version used in installer template and add JS runtime fix frrom 2057ce1
@ugisozols ugisozols Merge pull request #1476 from resolve/less_dependencies
Work in progress for reducing dependencies.
06c33b6
@kaleworsley kaleworsley Exclude #menu_reorder and #menu_reorder_done from the sortable items …
…when reordering the menu menu.
c2ad6c4
@parndt parndt Merge pull request #1493 from kaleworsley/menu_reorder_changes
Disable sorting for the menu reorder buttons
7c11da7
@parndt parndt Merge pull request #1482 from nicinabox/master
Add admin label classes from the 1.0-stable branch
b63751b
Commits on Mar 23, 2012
@parndt parndt WYMeditor was not pulling in the updated asset paths. de42eb6
@parndt parndt Explicitly require dataType html for save and continue function which…
… fixes #1497
ef118af
@parndt parndt Fixes #1359 by defaulting --heroku to a blank string instead of a nil…
… which on some systems was putting 'heroku' instead.
358676c
@parndt parndt Ensure that the Gemfile exists before trying to read it. f7921b6
@parndt parndt For #1359 refactored the Heroku code as an empty string was previousl…
…y being interpreted as wanting Heroku.
db08246
@parndt parndt We don't want to wrap sqlite3 in :development, :test twice. c385b7a
@ugisozols ugisozols Add changelog for 2.0.3. b9270b9
@jls jls Added Page#content_for? helper to test that a part exists and is not …
…empty.
0746afd
@jls jls Modified Page#content_for? to use .present? 3f3c9f3
@nicinabox nicinabox Add to changelog 477b2a0
@parndt parndt Merge pull request #1505 from nicinabox/master
Update changelog (as requested)
4db5777
Commits on Mar 24, 2012
@phiggins phiggins Remove references to Thread[:globalize_locale]. 0574563
@parndt parndt Merge pull request #1506 from phiggins/remove_references_to_thread_gl…
…obalize_locale

Remove references to Thread[:globalize_locale].
18244c0
Commits on Mar 25, 2012
@parndt parndt Only enforce refinery user when accessing the backend. This means the…
…re is no longer a prompt for creating a user when visiting *any* page which also helps for testing per #1507.
711e55f
@ugisozols ugisozols Merge pull request #1509 from resolve/less_invasive_refinery
Made Refinery less invasive from 2.1.0 onward.
cfeb560
@jls jls Moved content_for? specs into a new context d20a308
Commits on Mar 26, 2012
@parndt parndt Merge pull request #1504 from jls/page_content_for_helper
Added Page#content_for? helper to test that a part exists and is not emp...
5ed6be0
@parndt parndt Merge remote-tracking branch 'phiggins/custom_slugs_should_be_unique' 1c5ecc0
@parndt parndt uniqueness was merged to globalize3 master 4dd3ec7
@parndt parndt Users can no longer be created unless you visit /refinery da0b838
@ugisozols ugisozols Update getting started guide. bb9c847
Cees Moerman Corrections to Dutch translations, based on excellent feedback from @… ac76883
@parndt parndt config.assets.initialize_on_precompile = false must go inside config/…
…application.rb

Fixes #1498
4d34b39
@parndt parndt Modified refinery.css.scss into refinery.css which is now a manifest …
…file.

Instead of using @import to pull in the other stylesheets it acts like a proper manifest by requiring these files.

This fixes errors like 'ActionView::Template::Error (File to import not found or unreadable: site_bar.' when running in production mode.
f7c7bd5
@parndt parndt Used ActiveSupport.on_load(:active_record) and refactored code locati…
…ons to not invoke the database before it's needed which helps with asset precompilation
d3bbacd
@parndt parndt We want to initialize on precompile once this work is complete. 0d86213
@parndt parndt Enable AuthenticatedSystem again because it shouldn't realistically c…
…ause any problems with asset compilation
06c142f
@parndt parndt Fixed asset precompilation out of the box but requires git source on …
…orm_adapter until my pull request is merged.

Pull Request: ianwhite/orm_adapter#10
456d2c4
@parndt parndt Activate WillPaginate.per_page again as this was a red herring. 1e8c477
@parndt parndt Fixed where I messed up line endings. db19d3c
@parndt parndt Specify orm_adapter requirement in gemspec now that a gem is released. f2ab01d
@parndt parndt Specifically require friendly_id 0c1cd25
@parndt parndt Routes no longer need to be loaded inside an ActiveSupport.on_load(:a…
…ctive_record) hook if we manage devise ourselves.
556b743
@parndt parndt renamed RefineryCoreController to CoreController as it was already in…
…side Refinery namespace.

Conflicts:

	core/spec/controllers/refinery/admin/refinery_core_controller_spec.rb
277c5e7
@parndt parndt Now defining image_accessor and resource_accessor macros on Refinery:…
…:Resource and Refinery::Image which means that Refinery::Core::BaseModel can be autoloaded again.
6caddd1
@parndt parndt Corrected module name of PagePresenter to be Refinery::PagePresenter …
…(bugfix). Now we check better for whether a presenter class exists before creating a constant which reduces warnings greatly.
34bd357
@parndt parndt Require seo_meta ~> 1.3.0 which allows us to have Refinery::Page::Tra…
…nslation monkey patched more intelligently.
5f51d70
@parndt parndt module ::Refinery -> module Refinery (cleanup)
Conflicts:

	doc/guides/1 - Getting Started/2 - Getting Started with Refinery.textile
8f7d3df
@parndt parndt Added helpers that were missing because Rails expects these to be pre…
…sent. This removes many warnings when Refinery is executed.
f7b7a83
@parndt parndt Cleanup line endings. ea9d7cb
@parndt parndt Set VERSION_BAND back to 2.0.0 otherwise install fails because e.g. r…
…efinerycms-i18n has no version 2.0.2 available.
5345d11
@parndt parndt Ensure that an ExecJS runtime is available for realsies.
Fixes #1512
eab9377
@parndt parndt There is no 'refinery_user' in this spec. 577b0a7
@parndt parndt Moved dependencies out of refinerycms-core and specifically into the …
…projects that actually use them.
1aa992c
@parndt parndt Merge pull request #1483 from csmrmn/master
updated Dutch translations
b202c8f
Commits on Mar 27, 2012
@robyurkowski robyurkowski Re-orders documentation into more logical categories. 84a4f9c
@robyurkowski robyurkowski Rename all guides. 5ccbd95
@robyurkowski robyurkowski Update links to new guides. aa643bd
@parndt parndt Merge pull request #1518 from resolve/doc
Reorganize Documentation
771603c
@robyurkowski robyurkowski Fixes #1516. d08bba7
@robyurkowski robyurkowski Add spec for receiving hide_sections => nil. a22274a
@robyurkowski robyurkowski Removes useless quotes. 7527ae9
@parndt parndt Merge pull request #1519 from resolve/fix/1516
Fixes #1516.
cac2921
@robyurkowski robyurkowski Fix #1393. e6f3b46
@robyurkowski robyurkowski Fixes #1393. 15693ce
@robyurkowski robyurkowski Completely remove support for body_content_left and body_content_right adbbdf4
@ugisozols ugisozols Merge pull request #1521 from resolve/fix/1393
Fix #1393
128829c
@ugisozols ugisozols Merge pull request #1517 from resolve/logical_dependencies
Made dependencies more logical.
5dfb482
Commits on Mar 28, 2012
@phiggins phiggins Upstream has incorporated @parndt's changes, so use that. 1ace1c5
@parndt parndt Merge pull request #1522 from phiggins/bump_paper_trail_dep
Bump paper_trail dep to released version
003e5ea
@parndt parndt We don't really need the paper trail specified in our Gemfile at all …
…because by default the requirement is ~> 2 which matches 2.6.3
0facb7a
@robyurkowski robyurkowski Clean up image_dialog and better encapsulate it. 3b46cca
@robyurkowski robyurkowski Remove console.log stuff. e584c77
@parndt parndt Merge pull request #1523 from resolve/f/multi-image
Clean up image_dialog and better encapsulate it.
1c52b2e
@phiggins phiggins Remove unnecessary auth from specs. 1902c3a
@phiggins phiggins Move search spec to admin. c4622a4
@phiggins phiggins Fix consistently failing spec on linux. 71b5169
@parndt parndt Merge pull request #1524 from phiggins/spec_cleanup
Spec cleanup
680f7dc
Denis Kabistan Updated URL for RefineryCMS installation on Heroku. df03634
@parndt parndt Merge pull request #1525 from dkabistan/master
Updated URL for installing RefineryCMS on Heroku.
15a2b0a
@phiggins phiggins Remove temp files from form_generator_spec. e944053
@parndt parndt Merge pull request #1526 from phiggins/cleanup_after_form_generator_spec
Remove temp files from form_generator_spec.
9b1c60c
@jeremyw jeremyw Fix incorrect information about Guard, added text about Spork. 3678561
@parndt parndt Merge pull request #1527 from jeremyw/patch-1
Fix incorrect information about Guard, added text about Spork.
e026565
@robyurkowski robyurkowski Enhance support for multiple image selection e539215
@jkovar jkovar Czech extension localisation e97716b
@parndt parndt Merge pull request #1529 from resolve/f/multi-image
Enhance support for multiple image selection
2f8c1aa
Commits on Mar 29, 2012
@robyurkowski robyurkowski Actually allow multiple to be set via url param. 7c9fe45
@robyurkowski robyurkowski Don't accidentally open a huge security hole. 1cc6fde
@robyurkowski robyurkowski Also, y'know, we should probably sanitize that callback. 778bf86
@parndt parndt Merge pull request #1530 from resolve/f/multi-image
Actually allow multiple to be set via url param.
fb0bf98
@ugisozols ugisozols Merge pull request #1528 from SmartMedia/czech-extension-localisation
Czech extension localisation
381a8c0
@parndt parndt If the default Gemfile contains a git dependency then we shouldn't ne…
…ed to specify a version.
6e168e7
@parndt parndt Ruby file type declaration was appearing twice, fixed. 368053f
@parndt parndt Added a script/rails to engine and form extensions' templates to allo…
…w rails commands to work inside extensions.
530bf40
@parndt parndt Added vendor/extensions/**/spec/dummy to the application's gitignore …
…file.
b5e1c38
@parndt parndt Added .gitignore files for the vendored extensions by default contain…
…ing ignore rule for spec/dummy
59e410c
@robyurkowski robyurkowski Remove the to_param from user now that we have a slug, because they'l…
…l conflict.
d513cd4
@ugisozols ugisozols Merge pull request #1531 from resolve/b/remove-param-conflict-in-user
Remove the to_param from user now that we have a slug, because they'll conflict
fd5c735
@robyurkowski robyurkowski Quote Multiple parameter as it is a string, and direct comparison to …
…TrueClass will always fail otherwise
ded1abd
@ugisozols ugisozols Don't wrap hidden and draft labels in (). fa8127a
@robyurkowski robyurkowski Allow settings to be customized with options c367b13
@ugisozols ugisozols Merge pull request #1535 from resolve/f/multi-image
Quote Multiple parameter
c160b56
@robyurkowski robyurkowski Check for Refinery::I18n's presence to fix #1533. 288ea25
@parndt parndt Use code suggested by @ugisozols and switch to Refinery.i18n_enabled?…
… over defined?(::Refinery::I18n)
f450f56
@parndt parndt Fix bug introduced by @parndt 48e3d6f
@parndt parndt Allow use of puma.io webserver cb2e72c
@parndt parndt Added ability to use a .gemfile to specify dependencies that only I/y…
…ou want to use.
036b50e
Commits on Mar 30, 2012
@ugisozols ugisozols Don't check if Refinery.i18n_enabled? in path_cache_key and url_cache…
…_key methods.
a6910f1
@phiggins phiggins Make running specs easier. 032e96d
@phiggins phiggins Simplify a bit. 0b2b943
@parndt parndt Merge pull request #1537 from phiggins/fixup_rakefile
Make running specs easier.
5b6d019
Commits on Mar 31, 2012
@parndt parndt Fixes #1452 by forcing SSL when not in SSL already and when new setti…
…ng Refinery::Core.force_ssl is set true.
c4339c0
@robyurkowski robyurkowski Merge pull request #1540 from resolve/issue_1452
Fixes #1452 by adding Refinery::Core.force_ssl (default false)
55245f6
@parndt parndt Added specs to fix faulty logic with force_ssl. 1dc8f5e
@parndt parndt Added coverage for when admin? is false and force_ssl is true. b27d16f
@parndt parndt Merge branch 'issue_1452' 42e47f7
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
@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