trusty-cms 1.1.20 → 1.1.21

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (1.1.19)
4
+ trusty-cms (1.1.20)
5
5
  RedCloth (~> 4.2.0)
6
6
  acts_as_tree (~> 0.1.1)
7
7
  bundler (>= 1.0.0)
@@ -30,6 +30,7 @@ GEM
30
30
  remote: https://rubygems.org/
31
31
  specs:
32
32
  RedCloth (4.2.9)
33
+ RedCloth (4.2.9-java)
33
34
  actionmailer (3.2.21)
34
35
  actionpack (= 3.2.21)
35
36
  mail (~> 2.5.4)
@@ -1,7 +1,7 @@
1
1
  CKEDITOR.editorConfig = function( config ) {
2
2
  config.allowedContent = true;
3
3
  config.removeFormatTags = "";
4
- config.protectedSource.push(/<r:([\S]+)*>.*<\/r:\1>/g);
4
+ config.protectedSource.push(/<r:([\S]+).*<\/r:\1>/g);
5
5
  config.protectedSource.push(/<r:[^>\/]*\/>/g);
6
6
  config.forcePasteAsPlainText = true;
7
7
  // if you want to remove clipboard, you have to remove all of these:
data/lib/trusty_cms.rb CHANGED
@@ -5,7 +5,7 @@ unless defined? TrustyCms::Version
5
5
  module Version
6
6
  Major = '1'
7
7
  Minor = '1'
8
- Tiny = '20'
8
+ Tiny = '21'
9
9
  Patch = nil # set to nil for normal release
10
10
 
11
11
  class << self
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.20
4
+ version: 1.1.21
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-12-30 00:00:00.000000000 Z
12
+ date: 2015-01-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: tzinfo