github.com/AlchemyCMS/alchemy_cms commits | Ecosyste.ms: OpenCollective

Focus the create language tree button.

0305e06cde81f64a239afb5357ad4fdef5314afd authored almost 10 years ago by Thomas von Deyen <[email protected]>

Use alchemy-devise 2.1 beta in Rails app template

8988da034cc710f17a283a9202fce3da90338d6e authored almost 10 years ago by Thomas von Deyen <[email protected]>

v3.1.0.beta3

0b85a48f91810a0e5f3dde4e93b4134c07e63f9d authored almost 10 years ago by Thomas von Deyen <[email protected]>

Using current Alchemy version for Rails app template.

80f97df0cdc3f14a311fbcb55fa5fd2c3f0441ab authored almost 10 years ago by Thomas von Deyen <[email protected]>

Bump version to 3.1.0.beta2

3842d2c12ca6f10d3b9938c44955bda63ac52692 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Use bundle exec rspec to build

bd64e87408f466d0192027b2ee0844bdb13e511b authored almost 10 years ago by Thomas von Deyen <[email protected]>

Re-enable bundler cache on travis and update build script

0832307ec40c1984db6e36deb1cafbb154ef1dba authored almost 10 years ago by Thomas von Deyen <[email protected]>

Disabling bundler cache on travis.

59a7073a18c5d5946d0511c0e55f4c2de51eb866 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Updating travis build settings

667c0f66c45408b2dd08f930e53294b86a1174af authored almost 10 years ago by Thomas von Deyen <[email protected]>

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

Everytime a page is missing it's page layout definition we raise an error. That is annyoing for ...

2763dfac8cd97f55ca59e2be85e5dc4a54c33b8e authored almost 10 years ago by Thomas von Deyen <[email protected]>

add test for translation error messages when content_name is nested on element

3966f40987f82aee9edf9d6f1e6239c34867a200 authored almost 10 years ago by Sergio Cambra <[email protected]>

fix content error translation when content_name is nested on element

01e319a3c2f7d557c555d46eac2fe11aaf1e9128 authored almost 10 years ago by Sergio Cambra <[email protected]>

Reset some more buttons styles for frontend toolbar

4b7d2965f2047480e20128c8679ec7f51d9c50ae authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge pull request #692 from seanhussey/patch-1

Fix typo

780162e9975c5e3f7a66caf7dd6f2bcb484199c1 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Fix typo

5c079eb413e3ed5bed4dc76381f9d9720d624940 authored almost 10 years ago by Sean Hussey <[email protected]>

Merge pull request #690 from magiclabs/fix/element_tagging

Fixes #659

0f47f0edeceeb8341d769749f5b1420533e2ef03 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Fixes #659

We have to make sure to not have spaces in the tag to find it.

a5c55985332431d9b2f6d43a749232fc431b08c2 authored almost 10 years ago by Robin Böning <[email protected]>

Merge pull request #686 from magiclabs/fix/preview-frame-event-binding

Fix refresh event binding on preview frame.

e51dc6c422abab01e5dcddaf4c223570e4ed0613 authored almost 10 years ago by Robin Böning <[email protected]>

Merge pull request #688 from magiclabs/feature/essence-associations

Register each essence as has_many association.

a763485817ccebdd57d690c05009133d689f4c69 authored almost 10 years ago by Robin Böning <[email protected]>

Fix refresh event binding on preview frame.

Everytime we update an element we bind the load event on preview frame.

This patch removes any ...

1b65493f94589bf2eca6076c9015477b833581da authored almost 10 years ago by Thomas von Deyen <[email protected]>

Fix api contents_controller spec

Because of the delegation we need to create the object, not stubbing.

49a92c76a723c877941d96d51e2631f62ab39fb0 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Register each essence as has_many association.

Each class that uses `acts_as_essence` now creates a has_many association on Page and Element cl...

af333ec8d69f48e0b49796e47427e7d27e687063 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Adds delegations to content and essence models.

- restricted?
- public?
- trashed?

are delegated accordingly.

de7701ad685db6dfa3ae95c2acfb7a186c3a56aa authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge pull request #682 from magiclabs/feature/assign_attachment_only

New EssenceFile content option `only` and `except`. Closes #626

bc034844840ef7941fed6f7d985b77b526fbb54b authored almost 10 years ago by Robin Böning <[email protected]>

Merge pull request #685 from magiclabs/feature/fixed-table-header

Adds fixed resource table headers

7fae2a66952d5174f09d6d6fe1d348eb31b3c25d authored almost 10 years ago by Robin Böning <[email protected]>

Adds fixed resource table headers

Resource table header will stay on top of table regardless of scroll position of table.

Also ad...

f66426d5b3861656ae714d721fdb3364bce23943 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Remove border-radius from focus style

And fixes subnavi tab focus style.

cdb05aa6c843da14198c1ce039ee41a99e60e5f5 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Fix :focus style for icon buttons.

e33efae2207aa6811627e82bf6b14631b35687ff authored almost 10 years ago by Thomas von Deyen <[email protected]>

Fix dialog height, if dialog body exceeds screen height.

b9a866383a73c0497063534da040f1742bd32861 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Require at least select2-rails 3.5.9.1

We need this version to get select2 3.5.1, which adds the possibility to set the current locale.

221985b423c4292be08e17b38155d83656c9831d authored almost 10 years ago by Thomas von Deyen <[email protected]>

Set select2 locale to current ::I18n.locale

6827f77cfb668d3c93769b36b92cca829aa12b8b authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge pull request #667 from magiclabs/update-installer

Update installer

53a8ca4b07e3f40937b5893edbbc4b03b95dfe86 authored almost 10 years ago by Robin Böning <[email protected]>

New EssenceFile content option `only` and `except`

You can now pass only and/or except option to EssenceFile content settings. It will not/only loa...

7f4a51108e54c1798da4ddacd73e779ad98fcb38 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Ensure to run bundle install after adding gems to Gemfile

716618138d762c928dbaca1bad0242e6f59a1ebb authored almost 10 years ago by Thomas von Deyen <[email protected]>

Better readable output from standalone installer

9dc6b04526609ae29779a9c31026df03a4cf16fb authored almost 10 years ago by Thomas von Deyen <[email protected]>

Update the post install message

d9d6e9f1f295298242d8d73401e410a037d7f2e1 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Do not show messages while running install task from standalone installer

476e164620b8183b0ca5e968cec6c83b6aa9f02d authored almost 10 years ago by Thomas von Deyen <[email protected]>

Fix the Rails version in stand alone installer

299e9ce529f5c45dd5b4d87476805d2bafd0edbd authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge pull request #680 from magiclabs/fix/image-loading-event

Fix image loading event

da6953e2521a9a1a2e80b0001b50fdc777f0e505 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Adds Russian TinyMCE translation.

0fef4a2a6e9da3d6bb2b807807dbe1abcccdc411 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Adds missing select2 translations.

The:

- Spanish
- French
- Dutch

select2 translations where missing.

d3b35895c3a8d65621f0ef60dcf0596748ffe580 authored almost 10 years ago by Thomas von Deyen <[email protected]>

spanish translation for contact form

5246f72f89a7b7223978e9dd8912a33ef31bf0f4 authored almost 10 years ago by Sergio Cambra <[email protected]>

copy spanish translation file

7555b2b1c15703eb58a8656a288127c1974ef790 authored almost 10 years ago by Sergio Cambra <[email protected]>

translate <page link> in <some pictures> hardcoded string on picture info dialog

b35b4dc6d3f7c4016e1ccaaa8e8262fd313af041 authored almost 10 years ago by Sergio Cambra <[email protected]>

Adds spanish translation

40750694d3f07f75ed4f4bc75dd2ae200e1eadcc authored almost 10 years ago by Sergio Cambra <[email protected]>

Russian translations for select2 and simple_form gem

- added Alchemy page_status time format
- minor improvements

07d2a2ca4848908babc712d81f90c3b7cb697efd authored almost 10 years ago by 18augst <[email protected]>

Translated to Russian

ef7d5d1961e61edbd32b71cc72a90859b50e8bf6 authored almost 10 years ago by augst <[email protected]>

Enables the Progress Bar introduced with Turbolinks 2.5

d11569aa7cd3d70857bd749a99051328bc055694 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Ensures to use at least Turbolinks 2.5. Closes #602

Fixes image loading event issues in Firefox

4ff536b5b5a029454e8d31da8cd2e806b2a0dd4f authored almost 10 years ago by Thomas von Deyen <[email protected]>

Ensure to not use AMS >= 0.9.1

active_model_serializers 0.9.1 breaks the API. 0.9.0 works as expected. See https://travis-ci.or...

54108bddc6b63c5101fc31a84f27bc2955bd37ad authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge pull request #679 from magiclabs/fix/module_generator

Fix module generator.

909a0543f69a47de4af17df72fc1e1bd215ed8b8 authored almost 10 years ago by Robin Böning <[email protected]>

Register custom module ability class.

56a50190018bbf32d110c0bda348a982c8f2080b authored almost 10 years ago by Thomas von Deyen <[email protected]>

Do not prepend /assets path prefix to module icons

4d219e4ac326f18274ced8dba6afc472581abef0 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge pull request #675 from louim/master

Changed translations for sort pages to better explain the button action

f312aed21f92305b8bb211487ecd202ae555eace authored almost 10 years ago by Thomas von Deyen <[email protected]>

Changed translations for sort pages to better explain the button action

ca1ddab7db425e22a82590719ac3456b9c5aa08c authored almost 10 years ago by Louis-Michel Couture <[email protected]>

Updates resource integration spec to Rspec 3 syntax

e0b09c79e4f36de1c7447a31f01969b4f09bc571 authored almost 10 years ago by Thomas von Deyen <[email protected]>

i really have trouble with formatting

77902f41a8e913fecba3d51be7841f6ab65c1545 authored almost 10 years ago by Thorsten Kohpeiß <[email protected]>

use soft tabs

628b0b80e057e5e45209dc3d10edf4776752fa2f authored almost 10 years ago by Thorsten Kohpeiß <[email protected]>

Useing soft tabs and remove unused code

97b06aa23c3c7baed349d87e2cc0f6966fdcc833 authored almost 10 years ago by Thorsten Kohpeiß <[email protected]>

added tests for time fields in resources

Conflicts:
spec/features/admin/resources_integration_spec.rb

eec788519c0a32243dbbb18db4f0e2bb3fa21b68 authored almost 10 years ago by Thorsten Kohpeiß <[email protected]>

Update resources_helper.rb

Added time selector for time fields.

8ba029222dadb99729ad6fef9c3d420ae5eed704 authored almost 10 years ago by Thorsten Kohpeiß <[email protected]>

Merge branch 'zirni-legacy_url'

bfaaf10f0ae2e7048fff2a70af9982430027c3a7 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Adds missing spec for redirecting legacy url with nested urlname

6382f8aefde51aadaf9c5afa6ec4d9cbfb7fb346 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Convert attachments_controller spec stub into Rspec 3 syntax

f93d1cb5c3924c064e25b8c0c72028bff00daed1 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Convert legacy page redirection specs into Rspec 3 syntax

fa1d6e9ac350e4426e706cdbeaea51b250fd0965 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge branch 'legacy_url' of https://github.com/zirni/alchemy_cms into zirni-legacy_url

Conflicts:
spec/controllers/pages_controller_spec.rb

3d43095037b4a3cccb18cf4a68b5cc558d5c4702 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Adds specs for downloading public attachments.

54da4d16b3c282e222b51ea0930add9dd2cd7f90 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge branch 'master' into rails-4.2

Conflicts:
app/controllers/alchemy/contents_controller.rb
spec/libraries/resource_spec.rb

b18f3411d88c6daa50e36046a2ac4710cc52284b authored almost 10 years ago by Thomas von Deyen <[email protected]>

Set sass-rails version to be a least 4.0.5

and removes the explicit sass 3.2.19 dependency. sass-rails handles this for us.

438d38823710cd2d12274e811bb3d13de3832dc1 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Raised version to 3.1.0.beta1

1ee5a5e3cac3a37ac54516c89c3134e5cbdb8db0 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge pull request #664 from magiclabs/tinymce-4.1-fixes

Updates TinyMCE config and skin to TinyMCE v4.1

e9b1d3ac41e6dae8b26ed7fba9a81bf40f6cf93f authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge pull request #663 from magiclabs/feature/json-api-namespace

New json api namespace

6ef4d80ff7b5dc6c12879f2179ea0d3a648281c7 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Adds upgrade note for '/api' namespace

317c2ad4d00d05361e97dfc897e98b9027be30bf authored almost 10 years ago by Thomas von Deyen <[email protected]>

Updates TinyMCE config and skin to TinyMCE v4.1

83894099af75012c858ea1371335dfbea53af5b2 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Fixes api pages controller spec.

0e8c30778dd8fc59da94dcd5eebfaa8768dcdab4 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Updates API routing specs.

09d86f67a5d6c024c344115f0c60969ccd08b853 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Adds new API endpoints for elements and pages

Adds four new API endpoints for loading Alchemy::Elements and Alchemy::Pages via json:

* /api/p...

a0fad90e3f619ce4548c94f292bf96087f422ee8 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge branch 'master' into feature/json-api-namespace

6579e9f8158fb9fbae28af4b31ddd0b93194ddcc authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge pull request #662 from magiclabs/tinymce-update

Tinymce update

90dcfde6ba43ae3859fa5a9d53bf06d31206c0eb authored almost 10 years ago by Robin Böning <[email protected]>

Change the default behavior of the tinymce paste plugin.

The past as text option is now always enabled.

0186e7bb223507cd62f92c169c0d66e91a627c36 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Update Tinymce to 4.1.6

bb448be1748d8b433521b87f11e7d7bc50d44861 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge pull request #661 from magiclabs/fix/sass-dependency

Ensures to use at least sass 3.2.19

908052fa90e24bb678924896c451d630e504d3ea authored almost 10 years ago by Robin Böning <[email protected]>

Convert essence_picture serializer spec into rspec 3 syntax

99188f47db6674d7bc62a90d3b7713b8050066a2 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Adds new API endpoints for contents

Adds three new API endpoints for loading Alchemy::Contents via json:

* /api/contents.json
* /ap...

b56ca70821559e64107044268782506451fa8481 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Make ApplicationController patch reloadable

and don't cache classes in tests!

7443016f4d0cf95526e921a25e81b6b2c7fe45a6 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Refactors content and element permissions.

Uses newly introduced scopes and delegate methods on content model.

6f2fe1aa1ba5484f3fb0920cc202ba9d420680ec authored almost 10 years ago by Thomas von Deyen <[email protected]>

Convert API controller specs into rspec 3 syntax

d07362642b28a8816889ae1e40be164c8cde7dbf authored almost 10 years ago by Thomas von Deyen <[email protected]>

Adds support for nested urlnames in pages api.

d15ae4cf1f381be48e7d46678efff1629066279c authored almost 10 years ago by Thomas von Deyen <[email protected]>

Fix handling of requesting unknown pages via api

196a5e21bb1f4362f64ff863d68d60a7e251647b authored almost 10 years ago by Thomas von Deyen <[email protected]>

Map api requests within preview frame to pages api.

51ab037361baf36842b9f6e05d7a1461116bef7d authored almost 10 years ago by Thomas von Deyen <[email protected]>

Include the link of essence in serialized content

EssenceText, EssenceLink and EssencePicture can have a link, this commit includes the link into ...

264bfe2cc74863942d74d43164216d6e1fbe45a7 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Adds new api namespace

3663263be6be41c1aa513ecbf0d4564985f666d2 authored almost 10 years ago by Thomas von Deyen <[email protected]>

EssencePicture#serialized_ingredient includes content settings

Take the content settings, defined in elements.yml, into account while generating the picture_url

2bff1cbb97044fef3eeb0eb9712354bbfea38e63 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Adds serialized_ingredient method to Content

0587fab4a5531aa7c1865d179d8d60c06e7b940b authored almost 10 years ago by Thomas von Deyen <[email protected]>

Deprecates old json api

8541eeeb3f5b6ffb4dbcab79590461daeeaf4882 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Change the element serializer response

* Moves from content objects to content_ids
* Adds ingredient objects

b14ee74d545512c00f36b54c614de7b7ae6d946c authored almost 10 years ago by Thomas von Deyen <[email protected]>

Ensures to use at least sass 3.2.19

Fixes #656

015bcf4f2baf06f867d7d13cf163535bcdb0dae1 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Merge pull request #658 from magiclabs/rspec-3

Convert tests to RSpec 3

bbd41abc9c4308c58657d03b435789b3ca90a32a authored almost 10 years ago by Robin Böning <[email protected]>

Silence deprecation warning in content preview_content spec

7f2bcf35cb73e4b7918215600812abfcd70f1d53 authored almost 10 years ago by Thomas von Deyen <[email protected]>

Refactor admin/elements_controlller spec to use let()

e6158c54d300701798bc0ae73d8f2f032953f601 authored almost 10 years ago by Thomas von Deyen <[email protected]>