alchemy_cms 3.1.0.beta2 → 3.1.0.beta3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d3f9fd30a6baa86b0499dff4647278d18e65596e
4
- data.tar.gz: 2391c52bfedb51e86cd9221e30af4a262734e524
3
+ metadata.gz: 859dd48efcaa5e4a53d4a8c8cee97beea9459326
4
+ data.tar.gz: 62f8d71b7fc81dd4fe7a5c525cd1fff53fa22c5f
5
5
  SHA512:
6
- metadata.gz: 9f2c4f1c5e7da9afab852f2d8a73cd1e9832e4e98ceb52b2fce51f8a67dc324499f6733b1c35749d6c386040eb36b29d7816a9156ac6f55dde55bb4cfcbb63f8
7
- data.tar.gz: 716c636e3c9770bdc2eddc5c5f25beec76e2dd2bbbb44020997dca8a5f661b250494e29e175fd158d29d595204726d3c556778829656a28c09020a6b97aa3a50
6
+ metadata.gz: a8fc724874b0f6e7fe5283df9382ca27778a7a310bb51d98ae988becd44d9fe01ffce3dcb441280bbb13069c3601a37c93f479867fe8bcd4e33619100d7df12e
7
+ data.tar.gz: f74a8e1c35f0fd9419343980c84d59318551622585094a67c4fd0a165b7b8e16c044e7e6bf5b79f064b5b7c9ddd88494271ca7819bd5fc1ea4e1e8549ded4ad8
data/README.md CHANGED
@@ -1,7 +1,7 @@
1
1
  [![Gem Version](https://badge.fury.io/rb/alchemy_cms.png)](http://badge.fury.io/rb/alchemy_cms)
2
2
  [![Build Status](https://travis-ci.org/magiclabs/alchemy_cms.svg?branch=master)](https://travis-ci.org/magiclabs/alchemy_cms) [![Code Climate](https://codeclimate.com/github/magiclabs/alchemy_cms.png)](https://codeclimate.com/github/magiclabs/alchemy_cms) [![Coverage Status](https://coveralls.io/repos/magiclabs/alchemy_cms/badge.png?branch=master)](https://coveralls.io/r/magiclabs/alchemy_cms?branch=master)
3
3
 
4
- **CAUTION: This master branch is a development branch that can contain bugs. For productive environments you should use the [current Ruby gem version](http://rubygems.org/gems/alchemy_cms/versions/3.0.0), or the [latest stable branch (3.0-stable)](https://github.com/magiclabs/alchemy_cms/tree/3.0-stable).**
4
+ **CAUTION: This master branch is a development branch that can contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms/versions/3.0.0), or the [latest stable branch (3.0-stable)](https://github.com/magiclabs/alchemy_cms/tree/3.0-stable).**
5
5
 
6
6
  About
7
7
  -----
@@ -104,9 +104,11 @@ the Devise based user model that Alchemy provides and was extracted [into its ow
104
104
  If you don't have your own user class, you can use the Alchemy user model. Just add the following gem into your `Gemfile`:
105
105
 
106
106
  ```ruby
107
- gem 'alchemy-devise', '~> 2.0'
107
+ gem 'alchemy-devise', github: 'magiclabs/alchemy-devise', branch: 'master'
108
108
  ```
109
109
 
110
+ **NOTE:** You normally want to use a stable branch, like `2.0-stable`.
111
+
110
112
  Then run:
111
113
 
112
114
  ```shell
@@ -36,6 +36,7 @@ Gem::Specification.new do |gem|
36
36
  gem.add_runtime_dependency 'coffee-rails', '~> 4.0.0'
37
37
  gem.add_runtime_dependency 'compass-rails', '>= 1.1.2'
38
38
  gem.add_runtime_dependency 'sassy-buttons', '~> 0.2.6'
39
+ gem.add_runtime_dependency 'sprockets', '~> 2.11.3'
39
40
  gem.add_runtime_dependency 'select2-rails', '>= 3.5.9.1', '< 4.0'
40
41
  gem.add_runtime_dependency 'tvdeyen-handles_sortable_columns', '~> 0.1.5'
41
42
  gem.add_runtime_dependency 'spinner.rb'
@@ -33,7 +33,7 @@
33
33
  <%= form.hidden_field :parent_id, value: root.id %>
34
34
  <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %>
35
35
  <div class="submit">
36
- <%= form.button _t("create_tree_as_new_language", language: @language.name) %>
36
+ <%= form.button _t("create_tree_as_new_language", language: @language.name), autofocus: true %>
37
37
  </div>
38
38
  <% end %>
39
39
 
@@ -1,8 +1,7 @@
1
1
  module Alchemy
2
- VERSION = "3.1.0.beta2"
2
+ VERSION = "3.1.0.beta3"
3
3
 
4
4
  def self.version
5
5
  VERSION
6
6
  end
7
-
8
7
  end
@@ -1,8 +1,6 @@
1
1
  # This rails template installs Alchemy and all depending gems.
2
2
  require File.expand_path('../../../alchemy/version', __FILE__)
3
3
 
4
- gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: 'master'
5
- gem 'alchemy-devise', github: 'magiclabs/alchemy-devise', branch: 'master'
4
+ gem 'alchemy_cms', "#{Alchemy::VERSION}"
5
+ gem 'alchemy-devise', '>= 2.1.0.beta2'
6
6
  gem 'capistrano', '~> 2.15.5', group: 'development'
7
-
8
- run 'bundle install'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0.beta2
4
+ version: 3.1.0.beta3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2014-12-17 00:00:00.000000000 Z
15
+ date: 2014-12-18 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: rails
@@ -258,6 +258,20 @@ dependencies:
258
258
  - - "~>"
259
259
  - !ruby/object:Gem::Version
260
260
  version: 0.2.6
261
+ - !ruby/object:Gem::Dependency
262
+ name: sprockets
263
+ requirement: !ruby/object:Gem::Requirement
264
+ requirements:
265
+ - - "~>"
266
+ - !ruby/object:Gem::Version
267
+ version: 2.11.3
268
+ type: :runtime
269
+ prerelease: false
270
+ version_requirements: !ruby/object:Gem::Requirement
271
+ requirements:
272
+ - - "~>"
273
+ - !ruby/object:Gem::Version
274
+ version: 2.11.3
261
275
  - !ruby/object:Gem::Dependency
262
276
  name: select2-rails
263
277
  requirement: !ruby/object:Gem::Requirement