tkh_content 0.10.4 → 0.10.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +7 -0
  3. data/app/assets/javascripts/ckeditor/config.js.coffee +3 -1
  4. data/app/controllers/blog_controller.rb +3 -1
  5. data/lib/tkh_content/version.rb +1 -1
  6. metadata +14 -14
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7c8668b344e4cf0d8c448d884e7a9d2d4c32ac89
4
- data.tar.gz: babab662e689ff46d44bb8528e5d51695567795b
3
+ metadata.gz: 97c3a5b5cb2c85e8bec67a660c0004afe9c79990
4
+ data.tar.gz: 97f975a15f0b26e839bd5fa6ab63b6e019095422
5
5
  SHA512:
6
- metadata.gz: 4df7228acc84cc82e5c467fb44e5d61ea8a82af26284cf99056fc8bc3fc35ee3e348382d9d914ed2b35f987176cfe4a99c769248c0ffb1e4bf66458960d0ac03
7
- data.tar.gz: 54daaf9f771ec5dff5695892da94b6a8bc1ba20eb91f19bf5b4fd313075b6466f3ed59c5afbd7e19c5b4ab17b5d274e821d795cb7c7398e68954426a610b81bc
6
+ metadata.gz: 779f7602cb3662a090c7082bede7f4ff86b8848029269bb00c54d27e0fb6bc91c12b396c25b6b68c5163cd5a0e6f02b6cac66bdc185f06f90c46935e36ffa7c3
7
+ data.tar.gz: 4260eefbe10a9875ea336c6c0a0093bd8334d73cb31f8deb6bb944bc76fb765ea9cac901d13cd292edb968bf7bd9373b0127715b5da773e5dafe34b2182d5137
data/CHANGELOG.md CHANGED
@@ -2,6 +2,13 @@
2
2
 
3
3
 
4
4
 
5
+ ## 0.10.5
6
+
7
+ * CKeditor won't create junk HTML entities anymore.
8
+ * Debugged the blog#by_tag method.
9
+ * Removed gem dependency versions.
10
+
11
+
5
12
  ## 0.10.4
6
13
 
7
14
  * Deleted the contact form resource. Exported it to the tkh_mailing_list gem.
data/app/assets/javascripts/ckeditor/config.js.coffee CHANGED
@@ -6,6 +6,8 @@ CKEDITOR.editorConfig = (config) ->
6
6
  config.forcePasteAsPlainText = true
7
7
  config.allowedContent = true
8
8
  # config.extraAllowedContent = true
9
+ config.htmlEncodeOutput = false;
10
+ config.entities = false;
9
11
 
10
12
  config.toolbar_Pure = [
11
13
  { name: 'styles', items: [ 'Format' ] },
@@ -19,4 +21,4 @@ CKEDITOR.editorConfig = (config) ->
19
21
  { name: 'document', items: [ 'Source','-','Save' ] },
20
22
  ]
21
23
  config.toolbar = 'Pure'
22
- true
24
+ true
data/app/controllers/blog_controller.rb CHANGED
@@ -9,7 +9,9 @@ class BlogController < ApplicationController
9
9
  end
10
10
 
11
11
  def by_tag
12
- @tag = Tag.where('name = ?', params[:id]).first
12
+ # this little hack is necessary because globalize won't let me access the tag directly by name
13
+ tag_id = Tag::Translation.find_by( locale: I18n.locale.to_s, name: params[:id] ).ta g_id
14
+ @tag = Tag.find(tag_id)
13
15
  @posts = @tag.pages.published.order('published_at desc').paginate(:page => params[:page], :per_page => 20)
14
16
  render :layout => 'blog'
15
17
  end
data/lib/tkh_content/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module TkhContent
2
- VERSION = "0.10.4"
2
+ VERSION = "0.10.5"
3
3
  end
metadata CHANGED
@@ -1,29 +1,29 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tkh_content
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.4
4
+ version: 0.10.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Swami Atma
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-16 00:00:00.000000000 Z
11
+ date: 2015-03-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 4.0.0
19
+ version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">"
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: 4.0.0
26
+ version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: stringex
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -56,30 +56,30 @@ dependencies:
56
56
  name: simple_form
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
- version: 3.1.0.rc1
61
+ version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
- version: 3.1.0.rc1
68
+ version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: globalize
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
- version: 4.0.0
75
+ version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
- version: 4.0.0
82
+ version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: will_paginate
85
85
  requirement: !ruby/object:Gem::Requirement