EDIT / kanjai · Commits

Commit 5ec49d7ee96cf16830fa04e7bec28fa28a2af0ae

Authored by Karpikau Andrei
1 parent 7e56725a

change version

Inline Side-by-side
Showing 5 changed files with 24 additions and 33 deletions
... ... @@ -136,9 +136,9 @@
136 136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.7.4, rbenv: 2.1.3) [gem]" level="application" />
137 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" />
138 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.3.1, rbenv: 2.1.3) [gem]" level="application" />
140   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.1, rbenv: 2.1.3) [gem]" level="application" />
141   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.1, rbenv: 2.1.3) [gem]" level="application" />
  139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.3.2, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.2, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.2, rbenv: 2.1.3) [gem]" level="application" />
142 142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
143 143 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
144 144 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" />
... ...
... ... @@ -34,21 +34,11 @@
34 34 </provider>
35 35 </entry>
36 36 </file>
37   - <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
38   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
39   - <provider selected="true" editor-type-id="text-editor">
40   - <state vertical-scroll-proportion="0.0" vertical-offset="390" max-vertical-offset="2745">
41   - <caret line="54" column="61" selection-start-line="54" selection-start-column="34" selection-end-line="54" selection-end-column="61" />
42   - <folding />
43   - </state>
44   - </provider>
45   - </entry>
46   - </file>
47 37 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
48 38 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
49 39 <provider selected="true" editor-type-id="text-editor">
50   - <state vertical-scroll-proportion="0.0" vertical-offset="491" max-vertical-offset="2370">
51   - <caret line="49" column="74" selection-start-line="49" selection-start-column="74" selection-end-line="49" selection-end-column="74" />
  40 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2385">
  41 + <caret line="23" column="12" selection-start-line="23" selection-start-column="12" selection-end-line="23" selection-end-column="12" />
52 42 <folding />
53 43 </state>
54 44 </provider>
... ... @@ -541,7 +531,7 @@
541 531 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
542 532 <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" />
543 533 <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" />
544   - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2819063" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  534 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2819063" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
545 535 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
546 536 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
547 537 <window_info id="Version Control" 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" />
... ... @@ -802,14 +792,6 @@
802 792 </state>
803 793 </provider>
804 794 </entry>
805   - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
806   - <provider selected="true" editor-type-id="text-editor">
807   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
808   - <caret line="10" column="275" selection-start-line="10" selection-start-column="275" selection-end-line="10" selection-end-column="275" />
809   - <folding />
810   - </state>
811   - </provider>
812   - </entry>
813 795 <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
814 796 <provider selected="true" editor-type-id="text-editor">
815 797 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
... ... @@ -934,10 +916,18 @@
934 916 </state>
935 917 </provider>
936 918 </entry>
  919 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  920 + <provider selected="true" editor-type-id="text-editor">
  921 + <state vertical-scroll-proportion="0.23659305" vertical-offset="0" max-vertical-offset="634">
  922 + <caret line="10" column="275" selection-start-line="10" selection-start-column="275" selection-end-line="10" selection-end-column="275" />
  923 + <folding />
  924 + </state>
  925 + </provider>
  926 + </entry>
937 927 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
938 928 <provider selected="true" editor-type-id="text-editor">
939   - <state vertical-scroll-proportion="0.0" vertical-offset="491" max-vertical-offset="2370">
940   - <caret line="49" column="74" selection-start-line="49" selection-start-column="74" selection-end-line="49" selection-end-column="74" />
  929 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2385">
  930 + <caret line="23" column="12" selection-start-line="23" selection-start-column="12" selection-end-line="23" selection-end-column="12" />
941 931 <folding />
942 932 </state>
943 933 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.32)
  4 + kanjai (0.0.33)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ... @@ -64,12 +64,12 @@ GEM
64 64 acts_as_tree (2.4.0)
65 65 activerecord (>= 3.0.0)
66 66 arel (6.0.3)
67   - aws-sdk (2.3.1)
68   - aws-sdk-resources (= 2.3.1)
69   - aws-sdk-core (2.3.1)
  67 + aws-sdk (2.3.2)
  68 + aws-sdk-resources (= 2.3.2)
  69 + aws-sdk-core (2.3.2)
70 70 jmespath (~> 1.0)
71   - aws-sdk-resources (2.3.1)
72   - aws-sdk-core (= 2.3.1)
  71 + aws-sdk-resources (2.3.2)
  72 + aws-sdk-core (= 2.3.2)
73 73 backport_new_renderer (1.0.0)
74 74 rails
75 75 bcrypt (3.1.11)
... ...
... ... @@ -21,6 +21,7 @@ module Kanjai
21 21 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
22 22 render :text => content_for_render and return
23 23 else
  24 + ::Application.config.session_store :disabled
24 25 if stale?(@page_data, public: true)
25 26 layer = @page_data.page.page_template.get_html_content
26 27 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
... ...
1 1 module Kanjai
2   - VERSION = "0.0.33"
  2 + VERSION = "0.0.34"
3 3 end
... ...