Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: resolve/refinerycms
...
head fork: resolve/refinerycms
This comparison is big! We're only showing the most recent 250 commits
Commits on Feb 29, 2012
Philip Arndt parndt Ensure that there is always a 'name' field of SOME type. 363edb5
Philip Arndt parndt Fix foibles in the models that get generated. e8209c2
Uģis Ozols ugisozols Remove extra path => ''. 2651d0c
Philip Arndt parndt Fix more edge cases with the forms generator. e470ead
Philip Arndt parndt remove stubbed out things from the repo's Gemfile. 8f572d6
Philip Arndt parndt Fix locale problems and routing problems in generated form admin. f5496cb
Philip Arndt parndt Alias target_engine_path -> target_extension_path 61c821a
Philip Arndt parndt fixed generator spec for new mailer path 9cc2e01
Amanda Wagener awagener Close dialog when the cancel button is clicked. 8049a7e
Philip Arndt parndt Merge pull request #1369 from awagener/master
Close dialog when cancel button is clicked
ac3b23b
Uģis Ozols ugisozols We're interested only in form dialog. f13bb4c
Víctor Martín eltercero Changing table_name from Symbol to String 999daaa
Philip Arndt parndt Merge pull request #1371 from eltercero/master
Fixing issue with table_name
df2c721
Philip Arndt parndt remove the image key don't only return it. 04ed63a
Philip Arndt parndt Fixes #1372 by triggering the little x in the top right corner to do …
…its thing. It is also a cancel button but it doesn't lose its events on an iframe POST.
85dd57e
Philip Arndt parndt Refactor refinery:cms installer for readability. b654ee0
Philip Arndt parndt Added --heroku and --stack options to refinery:cms which fixes #1359 54d6e2a
Philip Arndt parndt We don't need Refinery::AppGenerator anymore in favour of installing …
…via Rails templates.
7646790
Philip Arndt parndt Added missing space between --stack and app name (#1359) 7638656
Uģis Ozols ugisozols Remove AppGenerator leftovers. f18cd4c
Philip Arndt parndt Streamlined the installation process by making refinery:cms migrate a…
…nd seed and deploy nicely to Heroku. bin/refinerycms now outputs instructions once it thinks the Rails installation succeeded.
c26c8cd
Philip Arndt parndt Remove cruft from edge installer and update it with new options. 1dc412b
Philip Arndt parndt Clean up trailing whitespace. b3781bf
Uģis Ozols ugisozols DB migration and seed gets managed by CMS generator so we need to jus…
…t prepare test db.
9f59416
Uģis Ozols ugisozols Remove --trace. 20632f7
Josef Šimánek Update testing/lib/refinery/tasks/testing.rake 9fb104e
Uģis Ozols ugisozols Merge pull request #1373 from simi/patch-6
Update testing/lib/refinery/tasks/testing.rake
7e9542b
Uģis Ozols ugisozols Some updates to Getting Started with Refinery guide. fc3f05d
Uģis Ozols ugisozols Use proper translation in generated form. Closes #1375. bb2f080
Uģis Ozols ugisozols Remove commented lines. [ci skip] cf00cce
Uģis Ozols ugisozols Selenium is the default Capybara.javascript_driver. 5e2e70c
Philip Arndt parndt Switch to proper friendly_id gem releases thanks to @norman dcb84c9
Rob Yurkowski robyurkowski Remove reference to settings. 6e8dc82
Uģis Ozols ugisozols Merge pull request #1377 from robyurkowski/patch-2
Remove reference to settings.
ad4175f
Philip Arndt parndt Added support for :date, :datetime and :time fields in the forms gene…
…rator which fixes #1376
62bb6dd
Philip Arndt parndt Form confirmations don't work when there is no email field. 7ac545b
Philip Arndt parndt The forms mailers now actually send email, so that's a plus. e431b88
Philip Arndt parndt --skip-layout is not a thing, unfortunately. 16886bd
Philip Arndt parndt Mailer name was wrong in the spec. 9924934
Philip Arndt parndt Settings is no longer a core extension. 768c28f
Philip Arndt parndt Only people should realistically be here. 3555b87
Philip Arndt parndt For safety, run railties:install:migrations before db:migrate 0035c19
Philip Arndt parndt Use released version of globalize3. 2b4d805
Philip Arndt parndt Use seo_meta released. 25cbcad
Philip Arndt parndt It supports Rails 3.2 now.
[ci skip]
904cb15
Philip Arndt parndt Always db:create before running db:migrate when generating a CMS. 0839ea8
Commits on Mar 01, 2012
Philip Arndt parndt We also need the installer templates, duh. 91494fd
Philip Arndt parndt Pass any other arguments into Rails so that, for example, -d postgres…
…ql works.
eb2bd62
Philip Arndt parndt Used Thor's 'say_status' for Heroku output instead of 'puts'. Added p…
…g gem to the Gemfile when Heroku is in use and the database chosen was not postgresql.
85fd4e7
Philip Arndt parndt whitespace....... 606b7f7
Philip Arndt parndt Get started on the changelog. fd15d06
Philip Arndt parndt Added vague warning. 55d7018
Philip Arndt parndt MOAR (and less) changes in 2.0.0 f92aca1
David Jones djones We made it to 2012 fd646d0
Uģis Ozols ugisozols Add refinerycms-settings gem to templates. 8b75183
pete higgins phiggins Fix typo and clean code a little. 62594c6
Philip Arndt parndt Merge pull request #1380 from phiggins/fix_error_message
Fix typo and clean code a little.
feb40f5
Joe Sak joemsak Add guard-spork '0.5.2' dependency to RefineryCMS-Testing 8cdcbdd
Uģis Ozols ugisozols Merge pull request #1381 from neotericdesign/testing-add-guard-spork-…
…dependency

Add guard-spork '0.5.2' dependency to RefineryCMS-Testing
f7266d7
Philip Arndt parndt Tidy up the users_controller_spec 12572a0
Philip Arndt parndt Added failing spec for #1382 54ea67d
Philip Arndt parndt Fixes #1382 by falling back to ruby to find users who have a '.' in t…
…heir username.
53614a2
Philip Arndt parndt Revert "Add refinerycms-settings gem to templates."
Rationale: The extension does not do anything that merits adding it. If another extension uses it, it should depend on it.

This reverts commit 8b75183.
f4d302f
Philip Arndt parndt Merge branch 'issue_1382' into 2-0-stable bf4c68e
Philip Arndt parndt We can rely on the released version of refinerycms-i18n now. 5f9d93f
Commits on Mar 04, 2012
Philip Arndt parndt When link dialogues were being initialised they were triggering a cli…
…ck on the cancel button which was closing the dialogue. Moved to the appropriate location which fixes #1392.
0a0ce9e
Philip Arndt parndt Fixes #1383 by not using url hashes for routes but using routing help…
…ers once the :after_routes_reloader_hook has fired.
5330a12
Philip Arndt parndt Even if you're not planning to use ruby a lot, RVM is still a good idea. 77662bf
Philip Arndt parndt 1.9.2 and 1.9.3 are acceptable cddb58b
Rob Yurkowski Adds new screenshot location for Getting Started. 5a79f50
Philip Arndt parndt Merge pull request #1394 from robyurkowski/2-0-stable
Update Screenshot.
f359ac7
Rob Yurkowski robyurkowski Fix textile error with nested plus operator. dcd4681
Philip Arndt parndt Merge pull request #1395 from robyurkowski/2-0-stable
Fix textile error.
88b3fde
Commits on Mar 05, 2012
Rob Yurkowski robyurkowski Update for 2.0. ea21867
Rob Yurkowski robyurkowski Missed a segment. d7d0d52
Rob Yurkowski robyurkowski Update for 2.0. 9f718f4
Rob Yurkowski robyurkowski Fixes the errors @ugisozol caught and I missed. 1fe8bd1
Philip Arndt parndt Remove html_safe from already escaped flash message. b622988
Philip Arndt parndt More fun with extension routing. Problems still persist but less of t…
…hem.
a549aa9
Uģis Ozols ugisozols Merge pull request #1401 from robyurkowski/2-0-stable
Update guide for 2-0-stable.
b45574c
Dan Schuman quicksnap Broken link: How To Test Your Engine. 1d6a266
Philip Arndt parndt Merge branch '2-0-stable' into issue_1383 28ff4bc
Philip Arndt parndt Merge pull request #1403 from quicksnap/patch-1
Broken link in Getting Started guide.
46d3de9
Nick Romanowski nodabs Rails includes the application.js file by default in new applications…
…. This enables the asset pipeline to work correctly. I think this feature should be included by the refinery front end as well.
804a530
Philip Arndt parndt Merge branch '2-0-stable' into issue_1383 35cd164
Philip Arndt parndt Name all routes and reload the application's routes after appending m…
…arketable URLs which fixes #1383.
883d663
Philip Arndt parndt Fixes password specs after previously breaking them. 7eef36a
Philip Arndt parndt Merge pull request #1405 from resolve/issue_1383
Fixed problems with Rails 3.2.2 re: Issue #1383
3c43b43
Philip Arndt parndt Updated changelog for 2.0.1 release. a6c04b0
Commits on Mar 06, 2012
Philip Arndt parndt Moved --format Fuubar and --drb out of the .rspec for everyone, I hav…
…e it in my ~/.rspec now.
20f541f
Rob Yurkowski Escapes email but keeps string escaped for multi-line output. 8f494dc
Uģis Ozols ugisozols Use ERB::Util.html_escape because h() is not directly available in co…
…ntroller.
ffb88f0
Uģis Ozols ugisozols No need to instantiate new user object when email param is blank or e…
…mail is not associated with any user account.
29824ee
Commits on Mar 07, 2012
Philip Arndt parndt Formatted the code more nicely and consistently with the rest of the …
…project.
5a5a9fe
Philip Arndt parndt Just because we can squish lines doesn't mean we should. fc45607
Philip Arndt parndt I guess that the {} serves a useful purpose. 0c99022
Philip Arndt parndt Format TitleSectionPresenter consistently. 4dd71f2
Philip Arndt parndt Consistent formatting on SectionPresenter aaf4103
Philip Arndt parndt Consistent formatting on PagePartSectionPresenter 38471ca
Philip Arndt parndt Merge branch '2-0-stable' into code_formatting 4933a68
Commits on Mar 08, 2012
Philip Arndt parndt Fixed calls to super without passing arguments that I broke earlier. …
…(ht: phiggins)
2a961ce
Philip Arndt parndt Allow hide_sections to accept one or many ids to hide using splat. 0edb641
Commits on Mar 09, 2012
Uģis Ozols ugisozols Merge pull request #1419 from resolve/code_formatting
Code formatting changes
113e513
Christer Edvartsen christeredvartsen Use NOTICE instead of PRIVMSG 000a4ef
Uģis Ozols ugisozols Load engine rake tasks because there are no extension tasks in Rails. 5d10aad
Christer Edvartsen christeredvartsen Added configuration option so that the bot does not join/part the cha…
…nnel
a5e9b33
Uģis Ozols ugisozols There are no bin folders in extensions. b32a28c
Uģis Ozols ugisozols require 'will_paginate/view_helpers/action_view' to avoid 'uninitiali…
…zed constant WillPaginate::ActionView::ViewHelpers' in some cases.
61a5e2c
pete higgins phiggins Remove some optional dependencies from testing engine. 397aab9
pete higgins phiggins Bump factory_girl_rails dep.
Conflicts:

	testing/refinerycms-testing.gemspec
6cf1119
Uģis Ozols ugisozols Add guard-rspec to Gemfile. 98a23ca
Commits on Mar 10, 2012
Philip Arndt parndt Use 'bundle exec rake' in place of just 'rake' 3b731e9
Commits on Mar 12, 2012
Philip Arndt parndt Bundler 1.1 is out 08d2592
Keith Pitty keithpitty Fix broken link in readme. 7d450af
Philip Arndt parndt Update guide is a bit out of date so removed the link. Unbolded contr…
…ibute and removed donate option because it's covered under contribute. Removed link from "Extend with custom extensions" because it 404s. Fixed other 404ing links and made GitHub links https
604d7cb
Keith Pitty keithpitty Correct instructions for changing page parts in Refinery 2. 5426abc
Matt Freels freels Properly emit an html opening tag for non-IE browsers. e577ed3
Philip Arndt parndt Added fuubar to the Gemfile. e2b3cbf
Philip Arndt parndt Added options --skip-db and --skip-migrations to the CMS generator ma…
…inly so that we can disable them during test runtime and so that people who need custom databases can run the generator.
c6b89f1
Philip Arndt parndt Don't seed when --skip-migrations is requested. 8ec5227
James Rissler jrissler Locally this was fine, on an nginx based system like heroku - it will…
… look for these 4 stylesheets in a folder called refinery in the folder this stylesheet is located in. (so move these 4 stylesheets into a folder or leave like this)
178d82a
Uģis Ozols ugisozols Add mising config options to pages initializer. Fixes #1438. c403b66
Commits on Mar 13, 2012
eugen neagoe eneagoe Replaced overriden protected render call with alias_method_chain whic…
…h closes #1447
8408e90
Philip Arndt parndt Merge pull request #1449 from eneagoe/2-0-stable
Fix for #1447 for 2-0-stable branch
827539c
Philip Arndt parndt Email the owners and the changers aea5a48
Philip Arndt parndt Fixed edge template - String interpolation requires double quotes. 51dfd8e
Amanda Wagener awagener Link to extension list on website rather than AWOL wiki page. da95104
Amanda Wagener awagener Remove link to testing guide, as the link is broken. bd3879d
Uģis Ozols ugisozols Add failing spec for #1440. 89f05c9
Uģis Ozols ugisozols Explicitly set dataType to be html. #1440. 2efcb2b
Commits on Mar 14, 2012
Uģis Ozols ugisozols Add missing authentication initializer. #1450. 0996160
Commits on Mar 15, 2012
Mark Stuart markstuart Set page part positions on engine generation. 415674a
Philip Arndt parndt Merge pull request #1458 from markstuart/2-0-stable
Set page parts positions in order to ensure ordering is always correct.
eb6e785
Graham Wagener gwagener Geometry has already been converted to a string. def64da
Philip Arndt parndt Merge pull request #1459 from yogh/2-0-stable
Geometry has already been converted to a string
6e4cd18
Philip Arndt parndt Documented changes for version 2.0.2 23c7bee
Philip Arndt parndt Added a forgotten but important changelog entry. 0a4237d
Philip Arndt parndt @ugisozols reminded me of one more change. 6ff3b55
Uģis Ozols ugisozols Run AuthenticationGenerator too. 6a2917f
Commits on Mar 16, 2012
Philip Arndt parndt gsub the sqlite3 gem into group :development, :test which fixes #1465 c60cffe
Rob Yurkowski robyurkowski Merge pull request #1468 from resolve/sqlite_in_generated_gemfile
Fixes #1465 - sqlite3 should never be production.
3b0baaf
Commits on Mar 17, 2012
Philip Arndt parndt Fixes #1470 by only appending to a Gemfile that exists (dummy doesn't…
… have one).
e7f5323
Commits on Mar 18, 2012
Johannes Edelstam jede Replaced label_tag:s with f.label since the labels got wrong for attr…
…ibutes.
58110b2
Commits on Mar 19, 2012
Philip Arndt parndt Fixes #1470 by only appending to a Gemfile that exists (dummy doesn't…
… have one).
ccd379a
Commits on Mar 21, 2012
Philip Arndt parndt Fixes #1485 by requiring refinerycms-settings in new form extensions. 6e84ebe
Commits on Mar 22, 2012
Philip Arndt parndt I do not believe that a bug fix is considered advanced. 13285b3
Philip Arndt parndt Combined approaches from #1445
Conflicts:

	templates/refinery/edge.rb
f038dad
Uģis Ozols ugisozols Update version used in installer template and add JS runtime fix frrom 4d754b9
Uģis Ozols ugisozols Remove rails-3-1 branch for each extension in edge template. d0ba483
Rob Yurkowski robyurkowski Update 'How to get help' doc.
- Add section about patience
- Minor textual corrections and a few elaborations
- Update core team
52a74f7
Philip Arndt parndt Using :transaction strategy which certainly appears to speed things u…
…p but fails tests.
29a0a58
Philip Arndt parndt Only use transaction method when using JS=false because Selenium does…
…n't like it so much (at least with sqlite)
b14c7d0
Uģis Ozols ugisozols GAdd comment in extension template when appending seeds file. 564e7c0
Uģis Ozols ugisozols Fix #1450 by not allowing roles params to get through when creating n…
…ew user instance.

Conflicts:

	authentication/spec/requests/refinery/admin/users_spec.rb
e5b117f
Philip Arndt parndt Instead of instance variables for the various users, switched to let() 02ea0e5
Philip Arndt parndt Updated changelog with changes from 2-0-stable.
Conflicts:

	changelog.md
2734771
Philip Arndt parndt Spotted indentation inconsistency when I was scanning the code for ma…
…gic tricks.
73f1897
Rob Yurkowski robyurkowski Allow whitelisting of mime types inside images validator. cc02f1d
Philip Arndt parndt Tidied up quoted array into a %w[] array. 26af735
Philip Arndt parndt Minor code style change - outdenting. 85f9a04
pete higgins phiggins Fix a spec. ed761ca
Philip Arndt parndt Merge pull request #1495 from phiggins/fix_spec
Fix spec
da1bd42
pete higgins phiggins Remove global hash of Menu instances. b9291bc
pete higgins phiggins Merge branch '2-0-stable' of https://github.com/resolve/refinerycms i…
…nto 2-0-stable
5d5c2be
Commits on Mar 23, 2012
Philip Arndt parndt Merge pull request #1496 from phiggins/backport_menu_fix
Backport menu fix
f5bf2e9
Philip Arndt parndt Explicitly require dataType html for save and continue function which…
… fixes #1497
58847fc
Philip Arndt parndt Fixes #1359 by defaulting --heroku to a blank string instead of a nil…
… which on some systems was putting 'heroku' instead.
56d4835
Philip Arndt parndt Ensure that the Gemfile exists before trying to read it. fdfba8a
Philip Arndt parndt For #1359 refactored the Heroku code as an empty string was previousl…
…y being interpreted as wanting Heroku.
31f466e
Philip Arndt parndt config.assets.initialize_on_precompile = false must go inside config/…
…application.rb

Fixes #1498
4e6a69e
Philip Arndt parndt We don't want to wrap sqlite3 in :development, :test twice. 1bea393
Philip Arndt 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.
e3a20d8
Uģis Ozols ugisozols Add changelog for 2.0.3. 685e569
Commits on Mar 24, 2012
Philip Arndt 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
09190a9
Philip Arndt parndt We want to initialize on precompile once this work is complete. 6c9bfc5
Philip Arndt parndt Enable AuthenticatedSystem again because it shouldn't realistically c…
…ause any problems with asset compilation
8a963fa
Commits on Mar 25, 2012
Philip Arndt 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
6e6f683
Philip Arndt parndt Merge branch '2-0-stable' into asset_compilation_without_database 3d0bf80
Philip Arndt parndt Activate WillPaginate.per_page again as this was a red herring. 27bc759
Philip Arndt parndt Fixed where I messed up line endings. 4b472d5
Philip Arndt parndt Specify orm_adapter requirement in gemspec now that a gem is released. b5477ec
Philip Arndt parndt Specifically require friendly_id 73ef4ed
Philip Arndt parndt Routes no longer need to be loaded inside an ActiveSupport.on_load(:a…
…ctive_record) hook if we manage devise ourselves.
19315cf
Philip Arndt parndt renamed RefineryCoreController to CoreController as it was already in…
…side Refinery namespace.
bc73b24
Philip Arndt 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.
b31c14b
Philip Arndt 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.
df7851f
Commits on Mar 26, 2012
Philip Arndt parndt Require seo_meta ~> 1.3.0 which allows us to have Refinery::Page::Tra…
…nslation monkey patched more intelligently.
a62b885
Philip Arndt parndt module ::Refinery -> module Refinery (cleanup) 57c0141
Philip Arndt parndt Added helpers that were missing because Rails expects these to be pre…
…sent. This removes many warnings when Refinery is executed.
c6a9887
Philip Arndt parndt Cleanup line endings. c2ed25d
Uģis Ozols ugisozols Merge pull request #1511 from resolve/asset_compilation_without_database
Asset precompilation has been solved for 2.0.x
6b220a7
Philip Arndt 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.
2fcb76a
Philip Arndt parndt Ensure that an ExecJS runtime is available for realsies.
Fixes #1512
a7689a0
Uģis Ozols ugisozols Merge pull request #1514 from resolve/ensure_execjs_runtime
Ensure that ExecJS runtime is always available if the Gemfile didn't contain therubyracer already. For #1512
9a90ee5
Philip Arndt parndt Version should be 2.0.3 as this is the next release. e4c3c33
Commits on Mar 27, 2012
Rob Yurkowski robyurkowski Re-orders documentation into more logical categories. f55f4f5
Rob Yurkowski robyurkowski Rename all guides. 88ce641
Rob Yurkowski robyurkowski Update links to new guides. 969b6db
Rob Yurkowski robyurkowski Fixes #1516. 9ed1fd5
Rob Yurkowski robyurkowski Add spec for receiving hide_sections => nil. 59fa0c9
Rob Yurkowski robyurkowski Removes useless quotes. 73179e2
Rob Yurkowski robyurkowski Fix #1393. 4ccebdf
Rob Yurkowski robyurkowski Deprecate body_content_right and body_content_left 5a5bebd
Uģis Ozols ugisozols Merge pull request #1520 from resolve/fix/1393-stable
Deprecate body_content_left and body_content_right (Partially fixes #1393)
cebb70b
Commits on Mar 28, 2012
Denis Kabistan Updated URL for RefineryCMS installation on Heroku. 9c5d2cf
Jeremy Weiskotten jeremyw Fix incorrect information about Guard, added text about Spork. ce51b89
Commits on Mar 29, 2012
Philip Arndt parndt In the generated extension we should not use git when created by vers…
…ion ~> 2.0.0 - we should instead use ~> 2.0.0
a373917
Philip Arndt parndt Ruby file type declaration was appearing twice, fixed. 8dadf60
Philip Arndt parndt Added a script/rails to engine and form extensions' templates to allo…
…w rails commands to work inside extensions.
1435f01
Philip Arndt parndt Added vendor/extensions/**/spec/dummy to the application's gitignore …
…file.
00732f9
Philip Arndt parndt Added .gitignore files for the vendored extensions by default contain…
…ing ignore rule for spec/dummy
dfa2a8f
Commits on Apr 01, 2012
Philip Arndt parndt Fixes #1492 by rewriting in correct conditional logic. Also fixed bro…
…ken translation.
6e6b589
Philip Arndt parndt Ignore .gemfile from future Refinery versions. 0091818
Michael Caviness michaelmichael Escape plus sign, fix formatting typo. 528fe3d
Commits on Apr 02, 2012
pete higgins phiggins Fix presenter finding logic. ee6b135
Uģis Ozols ugisozols Merge pull request #1541 from resolve/issue_1492
Fixes #1492
b54b915
Philip Arndt parndt Corrected changelog entries and dated the 2.0.3 release. 40fcf21
Uģis Ozols ugisozols Add specs for Refinery::Menu and fix stack level too deep error comin…
…g from Refinery::Menu#inspect.
c7b176e
Uģis Ozols ugisozols Add changelog entry about stack level too deep in Refinery::Menu fix. d21aee7
Commits on Apr 04, 2012
Uģis Ozols ugisozols We decided to not override inspect at all. 329fdfe
Philip Arndt parndt Merge pull request #1551 from resolve/refinery_menu_specs_and_error_fix
Add specs for Refinery::Menu and fix stack level too deep error coming from #inspect
03defeb
jkovar jkovar translated what into the actual name 2a2d846
Uģis Ozols ugisozols Multi-kill! #1552, #1553, #1554.
* Update generated engine Gemfile
* Remove --format Fuubar from Guardfile
* Fix failing specs for newly generated engine
7db31eb
Uģis Ozols ugisozols Bump gem versions.
Conflicts:

	Gemfile
60539e5
Philip Arndt parndt Flattr's not really that useful to put here. 5574927
Uģis Ozols ugisozols Use the same :cli guard setup that we're using in Refinery's rGuardfile. 4d694d1
Philip Arndt parndt Support the spec/dummy application primarily and fall back to the ven…
…dored app or else raise an exception.
2139487
Uģis Ozols ugisozols Update changelog. 098b0d8
Commits on Apr 06, 2012
Uģis Ozols ugisozols Add changelog entry about dialog opening fix. 46f35c7
Commits on Apr 07, 2012
Uģis Ozols ugisozols Update links to guides in readme.md. Closes #1575. 6a8e5f2
Commits on Apr 10, 2012
Uģis Ozols ugisozols Add missing en translations for layout_template and layout_template_h…
…elp.
71358b1
Uģis Ozols ugisozols Fix spelling. 2d91347
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.
Conflicts:

	pages/app/models/refinery/page.rb
eddbc17
Nicholas Schultz-Møller nicholassm Adds spec that shows bug in Refinery::Page.find_by_path. 23e825c
Nicholas Schultz-Møller nicholassm Replaces reverse_merge with merge. beb3f85
Uģis Ozols ugisozols Merge pull request #1586 from Subsis/2-0-stable
Fixes page ambiguity for different pages with the same slug in find_by_path.
7f998cb
Philip Arndt parndt Introduced my patch for site_name being configurable in i18n as well …
…but defaulting to the config.
fc951ee
Uģis Ozols ugisozols Add specs for #1576. 7f98772
xyz xyz Update pages/app/views/refinery/admin/pages/_form_advanced_options.ht…
…ml.erb
5a2d757
xyz xyz Update pages/app/views/refinery/admin/pages/_form_advanced_options.ht…
…ml.erb
a5c84f1
Uģis Ozols ugisozols Add specs for #1581. 09becb0
Philip Arndt parndt Capitalise Devise. a54c730
Uģis Ozols ugisozols Add missing changelog entries. ff5e620
Uģis Ozols ugisozols Use full name in changelog. a1d453d
Uģis Ozols ugisozols I don't know how I managed to delete this in previous commit... 0b404ea
Commits on Apr 11, 2012
Philip Arndt parndt Require at least awesome_nested_set 2.1.3 which fixes #1399 a8030d2
Commits on 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 Renamed How to get help to order it behind new changing generated HTM…
…L guide.
2b25dd6