EDIT / kanjai · Commits

Commit 440fafc345b8db0e1364de7500a5092153874962

Authored by Karpikau Andrei
1 parent 54b62e71

test

Inline Side-by-side
Showing 5 changed files with 13 additions and 13 deletions
@@ -160,7 +160,7 @@ @@ -160,7 +160,7 @@
160 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" /> 160 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" />
161 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" /> 161 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" />
162 <orderEntry type="library" scope="PROVIDED" name="json_pure (v1.8.3, rbenv: 2.1.3) [gem]" level="application" /> 162 <orderEntry type="library" scope="PROVIDED" name="json_pure (v1.8.3, rbenv: 2.1.3) [gem]" level="application" />
163 - <orderEntry type="library" scope="PROVIDED" name="libv8 (v3.16.14.13, rbenv: 2.1.3) [gem]" level="application" /> 163 + <orderEntry type="library" scope="PROVIDED" name="libv8 (v3.16.14.15, rbenv: 2.1.3) [gem]" level="application" />
164 <orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, rbenv: 2.1.3) [gem]" level="application" /> 164 <orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, rbenv: 2.1.3) [gem]" level="application" />
165 <orderEntry type="library" scope="PROVIDED" name="mail (v2.6.4, rbenv: 2.1.3) [gem]" level="application" /> 165 <orderEntry type="library" scope="PROVIDED" name="mail (v2.6.4, rbenv: 2.1.3) [gem]" level="application" />
166 <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.0, rbenv: 2.1.3) [gem]" level="application" /> 166 <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.0, rbenv: 2.1.3) [gem]" level="application" />
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 28 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
29 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
30 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315"> 30 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
31 - <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" /> 31 + <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
32 <folding /> 32 <folding />
33 </state> 33 </state>
34 </provider> 34 </provider>
@@ -175,8 +175,8 @@ @@ -175,8 +175,8 @@
175 <option value="$PROJECT_DIR$/lib/kanjai.rb" /> 175 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
176 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 176 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
177 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" /> 177 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
178 - <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />  
179 <option value="$PROJECT_DIR$/config/initializers/assets.rb" /> 178 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
  179 + <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
180 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 180 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
181 </list> 181 </list>
182 </option> 182 </option>
@@ -1027,18 +1027,18 @@ @@ -1027,18 +1027,18 @@
1027 </state> 1027 </state>
1028 </provider> 1028 </provider>
1029 </entry> 1029 </entry>
1030 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 1030 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
1031 <provider selected="true" editor-type-id="text-editor"> 1031 <provider selected="true" editor-type-id="text-editor">
1032 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">  
1033 - <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" /> 1032 + <state vertical-scroll-proportion="8.333333" vertical-offset="200" max-vertical-offset="810">
  1033 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1034 <folding /> 1034 <folding />
1035 </state> 1035 </state>
1036 </provider> 1036 </provider>
1037 </entry> 1037 </entry>
1038 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 1038 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
1039 <provider selected="true" editor-type-id="text-editor"> 1039 <provider selected="true" editor-type-id="text-editor">
1040 - <state vertical-scroll-proportion="8.333333" vertical-offset="200" max-vertical-offset="810">  
1041 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1040 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
  1041 + <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
1042 <folding /> 1042 <folding />
1043 </state> 1043 </state>
1044 </provider> 1044 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.6) 4 + kanjai (0.0.7)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -108,7 +108,7 @@ GEM @@ -108,7 +108,7 @@ GEM
108 thor (>= 0.14, < 2.0) 108 thor (>= 0.14, < 2.0)
109 json (1.8.3) 109 json (1.8.3)
110 json_pure (1.8.3) 110 json_pure (1.8.3)
111 - libv8 (3.16.14.13) 111 + libv8 (3.16.14.15)
112 loofah (2.0.3) 112 loofah (2.0.3)
113 nokogiri (>= 1.5.9) 113 nokogiri (>= 1.5.9)
114 mail (2.6.4) 114 mail (2.6.4)
@@ -8,7 +8,7 @@ module Kanjai @@ -8,7 +8,7 @@ module Kanjai
8 config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts") 8 config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts")
9 9
10 initializer "kanjai.assets.precompile" do |app| 10 initializer "kanjai.assets.precompile" do |app|
11 - app.config.assets.precompile = %w(kanjai/general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js) 11 + app.config.assets.precompile = %w(general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js)
12 end 12 end
13 13
14 end 14 end
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.7" 2 + VERSION = "0.0.8"
3 end 3 end