Conflicts:
Gemfile

We need to tell teatro to run the dummy app.

Gives possibility to run dummy app in production, ie. on Teatro.io.

Enables the possibility to run the dummy app locally.

.. as `shared_examples_for` is an rspec method, which needs to be
defined beforehand.

We depent on a `alchemy_roles` column in the 3.0 upgrader. But not all custom user classes may h...

The setting never worked. Now it does \o/

Like the `alchemy:tidy:element_positions` task, this fixes position values of contents in elements.

We need to require it in the manifest file, since the sass file is imported via sass import stat...

Default Rails 4.2 apps depend on sass-rails 5.0

It is not used anyway and relies on the Alchemy mount point, which is not availble while initial...

Only cache page if caching is enabled in Rails app

Ruby 1.9 is deprecated and support ends in mid 2015.

There is **no reason** to not use Ruby 2.x

Conflicts:
.travis.yml
alchemy_cms.gemspec
spec/dummy/config/application.rb
spec/dummy/confi...

HTTP caching was enabled in the development environment, because Alchemy didn't check for the Ra...

Use primary_key of user to find his locked pages

Fix file assignment

We only need to invalidate the essence_picture_editor cache, so setting the updated_at value at ...

Since we cache the essence_file_editor view now, we need to update the timestamp of the content ...

Fix thumbnail_size calculation for 0x0 crop size values

In very rare circumstances (so rare I can't even reproduce) we have 0x0 crop size values for Ess...

Use Alchemy.user_class's primary_key to find user.

The primary key to find `page.creator`, `page.updater` and `page.locker` is hard coded to `:id`,...

Fixes #704 Always check if locale is available

In a rails app `config.i18n.enforce_available_locales` is set to true by default, so we need to ...

Fixes #707 allow attributes for essence_file

Fixes #705 Error when params hash does not include all contents

Only rely on Rails.root, if present.
Otherwise fallback to simply 'config/routes.rb' string.

Updates deploy script and generator.

Use Regexp to get Alchemy's mount point.

Fixes issues with Rails 4.1.9

1. The capistrano deploy script integration does not require to load the complete rails app anym...

Go' old regular expression is way more reliable and faster then requiring the whole rails to boo...

Adds possibility to restrict resource attributes

Backend user can still see restricted attributes in the index view, but they can't edit these at...

EditorConfig is awesome: http://EditorConfig.org

¯\_(ツ)_/¯

Fixes #669.

Do not raise, if page layout could not be found.

It's where they belong anyway.

Newer versions of compass-rails and sass-rails are not compatible.

See https://github.com/Compa...

This fixes translation issues inside the "leave admin" view.

The signup path was hard coded to `signup_path` method. This method is not always present.

This...

* Only checks if current Rails env is test, not development
* Ensures that all params are presen...

We now only abort if the NameError is because of missing User class and re-raise if not. This st...

If we use multiple version strings we need to put them into an array to make them work properly.

There are very limited usecases that justify the patching of the ApplicationController and there...

Rails 4.2.0 has breaking changes.

The JSON api moved into it's own namespace.

To hvae respond_to and respond_with back.

Conflicts:
app/controllers/alchemy/pages_controller.rb

Fix/resource association search

The associations of a resource needs to be eager loaded when selecting a record and the columns ...

While the usage description of the `alchemy_resource_relations` class method indicated to use st...

This fixes the "wrong number of arguments" error from latest compass-rails 2.0.1 used together w...