Commit 7be1a5487082df856233719e645310cef0413b53

Authored by Karpikau Andrei
1 parent 25f3638f

test

@@ -24,21 +24,21 @@ @@ -24,21 +24,21 @@
24 </component> 24 </component>
25 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
26 <leaf> 26 <leaf>
27 - <file leaf-file-name="engine.rb" pinned="false" current-in-tab="true"> 27 + <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">
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.25240386" vertical-offset="0" max-vertical-offset="416"> 30 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
31 <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" /> 31 <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
32 <folding /> 32 <folding />
33 </state> 33 </state>
34 </provider> 34 </provider>
35 </entry> 35 </entry>
36 </file> 36 </file>
37 - <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">  
38 - <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 37 + <file leaf-file-name=".ruby-version" pinned="false" current-in-tab="false">
  38 + <entry file="file://$PROJECT_DIR$/.ruby-version">
39 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
40 - <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">  
41 - <caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" /> 40 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="105">
  41 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
42 <folding /> 42 <folding />
43 </state> 43 </state>
44 </provider> 44 </provider>
@@ -118,23 +118,21 @@ @@ -118,23 +118,21 @@
118 </provider> 118 </provider>
119 </entry> 119 </entry>
120 </file> 120 </file>
121 - <file leaf-file-name="jquery.fileupload.js" pinned="false" current-in-tab="false">  
122 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js"> 121 + <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false">
  122 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
123 <provider selected="true" editor-type-id="text-editor"> 123 <provider selected="true" editor-type-id="text-editor">
124 - <state vertical-scroll-proportion="0.0" vertical-offset="11295" max-vertical-offset="22245">  
125 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
126 - <folding>  
127 - <element signature="n#!!doc" expanded="true" />  
128 - </folding> 124 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
  125 + <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
  126 + <folding />
129 </state> 127 </state>
130 </provider> 128 </provider>
131 </entry> 129 </entry>
132 </file> 130 </file>
133 - <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false">  
134 - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 131 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  132 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
135 <provider selected="true" editor-type-id="text-editor"> 133 <provider selected="true" editor-type-id="text-editor">
136 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">  
137 - <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" /> 134 + <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
  135 + <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
138 <folding /> 136 <folding />
139 </state> 137 </state>
140 </provider> 138 </provider>
@@ -145,7 +143,6 @@ @@ -145,7 +143,6 @@
145 <component name="IdeDocumentHistory"> 143 <component name="IdeDocumentHistory">
146 <option name="CHANGED_PATHS"> 144 <option name="CHANGED_PATHS">
147 <list> 145 <list>
148 - <option value="$PROJECT_DIR$/lib/admin.rb" />  
149 <option value="$PROJECT_DIR$/config/initializers/devise.rb" /> 146 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
150 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb" /> 147 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb" />
151 <option value="$PROJECT_DIR$/app/views/devise/sessions/new.html.erb" /> 148 <option value="$PROJECT_DIR$/app/views/devise/sessions/new.html.erb" />
@@ -196,6 +193,7 @@ @@ -196,6 +193,7 @@
196 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" /> 193 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
197 <option value="$PROJECT_DIR$/lib/kanjai.rb" /> 194 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
198 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 195 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
  196 + <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
199 </list> 197 </list>
200 </option> 198 </option>
201 </component> 199 </component>
@@ -509,7 +507,7 @@ @@ -509,7 +507,7 @@
509 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 507 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
510 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 508 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
511 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 509 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
512 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25767368" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 510 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25767368" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
513 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 511 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
514 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 512 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
515 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 513 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -540,22 +538,6 @@ @@ -540,22 +538,6 @@
540 <watches-manager /> 538 <watches-manager />
541 </component> 539 </component>
542 <component name="editorHistoryManager"> 540 <component name="editorHistoryManager">
543 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/_edit_resource_links.html.erb">  
544 - <provider selected="true" editor-type-id="text-editor">  
545 - <state vertical-scroll-proportion="-1.875" vertical-offset="0" max-vertical-offset="180">  
546 - <caret line="3" column="51" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="51" />  
547 - <folding />  
548 - </state>  
549 - </provider>  
550 - </entry>  
551 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">  
552 - <provider selected="true" editor-type-id="text-editor">  
553 - <state vertical-scroll-proportion="13.958333" vertical-offset="665" max-vertical-offset="1275">  
554 - <caret line="22" column="57" selection-start-line="22" selection-start-column="57" selection-end-line="22" selection-end-column="57" />  
555 - <folding />  
556 - </state>  
557 - </provider>  
558 - </entry>  
559 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb"> 541 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb">
560 <provider selected="true" editor-type-id="text-editor"> 542 <provider selected="true" editor-type-id="text-editor">
561 <state vertical-scroll-proportion="-8.75" vertical-offset="0" max-vertical-offset="315"> 543 <state vertical-scroll-proportion="-8.75" vertical-offset="0" max-vertical-offset="315">
@@ -959,6 +941,22 @@ @@ -959,6 +941,22 @@
959 </state> 941 </state>
960 </provider> 942 </provider>
961 </entry> 943 </entry>
  944 + <entry file="file://$PROJECT_DIR$/.ruby-version">
  945 + <provider selected="true" editor-type-id="text-editor">
  946 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
  947 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  948 + <folding />
  949 + </state>
  950 + </provider>
  951 + </entry>
  952 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  953 + <provider selected="true" editor-type-id="text-editor">
  954 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
  955 + <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
  956 + <folding />
  957 + </state>
  958 + </provider>
  959 + </entry>
962 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 960 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
963 <provider selected="true" editor-type-id="text-editor"> 961 <provider selected="true" editor-type-id="text-editor">
964 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240"> 962 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
@@ -967,10 +965,10 @@ @@ -967,10 +965,10 @@
967 </state> 965 </state>
968 </provider> 966 </provider>
969 </entry> 967 </entry>
970 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 968 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
971 <provider selected="true" editor-type-id="text-editor"> 969 <provider selected="true" editor-type-id="text-editor">
972 - <state vertical-scroll-proportion="0.25240386" vertical-offset="0" max-vertical-offset="416">  
973 - <caret line="7" column="33" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" /> 970 + <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
  971 + <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
974 <folding /> 972 <folding />
975 </state> 973 </state>
976 </provider> 974 </provider>
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.1" 2 + VERSION = "0.0.2"
3 end 3 end