EDIT / kanjai · Commits

Commit 6144e629719877d0f1dc2bc10e73a85349a40dfd

Authored by Karpikau Andrei
1 parent 26f11ead

test

Inline Side-by-side
Showing 5 changed files with 103 additions and 143 deletions
@@ -4,4 +4,4 @@ You are allowed to: @@ -4,4 +4,4 @@ You are allowed to:
4 1. Remove rake task 4 1. Remove rake task
5 2. Add existing rake tasks 5 2. Add existing rake tasks
6 To add existing rake tasks automatically delete this file and reload the project. 6 To add existing rake tasks automatically delete this file and reload the project.
7 ---><RakeGroup description="" fullCmd="" taksId="rake" /></Settings> 7 +--><RakeGroup description="" fullCmd="" taksId="rake"><RakeGroup description="" fullCmd="" taksId="app"><RakeTask description="List versions of all Rails frameworks and the environment" fullCmd="app:about" taksId="about" /><RakeGroup description="" fullCmd="" taksId="assets"><RakeTask description="Remove old compiled assets" fullCmd="app:assets:clean[keep]" taksId="clean[keep]" /><RakeTask description="Remove compiled assets" fullCmd="app:assets:clobber" taksId="clobber" /><RakeTask description="Load asset compile environment" fullCmd="app:assets:environment" taksId="environment" /><RakeTask description="Compile all the assets named in config.assets.precompile" fullCmd="app:assets:precompile" taksId="precompile" /><RakeTask description="" fullCmd="app:assets:clean" taksId="clean" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="cache_digests"><RakeTask description="Lookup first-level dependencies for TEMPLATE (like messages/show or comments/_comment.html)" fullCmd="app:cache_digests:dependencies" taksId="dependencies" /><RakeTask description="Lookup nested dependencies for TEMPLATE (like messages/show or comments/_comment.html)" fullCmd="app:cache_digests:nested_dependencies" taksId="nested_dependencies" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="db"><RakeTask description="Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all databases in the config)" fullCmd="app:db:create" taksId="create" /><RakeTask description="Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databases in the config)" fullCmd="app:db:drop" taksId="drop" /><RakeGroup description="" fullCmd="" taksId="fixtures"><RakeTask description="Load fixtures into the current environment's database" fullCmd="app:db:fixtures:load" taksId="load" /><RakeTask description="" fullCmd="app:db:fixtures:identify" taksId="identify" /></RakeGroup><RakeTask description="Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)" fullCmd="app:db:migrate" taksId="migrate" /><RakeGroup description="" fullCmd="" taksId="migrate"><RakeTask description="Display status of migrations" fullCmd="app:db:migrate:status" taksId="status" /><RakeTask description="" fullCmd="app:db:migrate:down" taksId="down" /><RakeTask description="" fullCmd="app:db:migrate:redo" taksId="redo" /><RakeTask description="" fullCmd="app:db:migrate:reset" taksId="reset" /><RakeTask description="" fullCmd="app:db:migrate:up" taksId="up" /></RakeGroup><RakeTask description="Rolls the schema back to the previous version (specify steps w/ STEP=n)" fullCmd="app:db:rollback" taksId="rollback" /><RakeGroup description="" fullCmd="" taksId="schema"><RakeGroup description="" fullCmd="" taksId="cache"><RakeTask description="Clear a db/schema_cache.dump file" fullCmd="app:db:schema:cache:clear" taksId="clear" /><RakeTask description="Create a db/schema_cache.dump file" fullCmd="app:db:schema:cache:dump" taksId="dump" /></RakeGroup><RakeTask description="Create a db/schema.rb file that is portable against any DB supported by AR" fullCmd="app:db:schema:dump" taksId="dump" /><RakeTask description="Load a schema.rb file into the database" fullCmd="app:db:schema:load" taksId="load" /><RakeTask description="" fullCmd="app:db:schema:load_if_ruby" taksId="load_if_ruby" /></RakeGroup><RakeTask description="Load the seed data from db/seeds.rb" fullCmd="app:db:seed" taksId="seed" /><RakeTask description="Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the database first)" fullCmd="app:db:setup" taksId="setup" /><RakeGroup description="" fullCmd="" taksId="structure"><RakeTask description="Dump the database structure to db/structure.sql" fullCmd="app:db:structure:dump" taksId="dump" /><RakeTask description="Recreate the databases from the structure.sql file" fullCmd="app:db:structure:load" taksId="load" /><RakeTask description="" fullCmd="app:db:structure:load_if_sql" taksId="load_if_sql" /></RakeGroup><RakeTask description="Retrieves the current schema version number" fullCmd="app:db:version" taksId="version" /><RakeTask description="" fullCmd="app:db:_dump" taksId="_dump" /><RakeTask description="" fullCmd="app:db:abort_if_pending_migrations" taksId="abort_if_pending_migrations" /><RakeTask description="" fullCmd="app:db:charset" taksId="charset" /><RakeTask description="" fullCmd="app:db:collation" taksId="collation" /><RakeGroup description="" fullCmd="" taksId="create"><RakeTask description="" fullCmd="app:db:create:all" taksId="all" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="drop"><RakeTask description="" fullCmd="app:db:drop:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="app:db:forward" taksId="forward" /><RakeTask description="" fullCmd="app:db:load_config" taksId="load_config" /><RakeTask description="" fullCmd="app:db:purge" taksId="purge" /><RakeGroup description="" fullCmd="" taksId="purge"><RakeTask description="" fullCmd="app:db:purge:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="app:db:reset" taksId="reset" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="" fullCmd="app:db:test:clone" taksId="clone" /><RakeTask description="" fullCmd="app:db:test:clone_schema" taksId="clone_schema" /><RakeTask description="" fullCmd="app:db:test:clone_structure" taksId="clone_structure" /><RakeTask description="" fullCmd="app:db:test:deprecated" taksId="deprecated" /><RakeTask description="" fullCmd="app:db:test:load" taksId="load" /><RakeTask description="" fullCmd="app:db:test:load_schema" taksId="load_schema" /><RakeTask description="" fullCmd="app:db:test:load_structure" taksId="load_structure" /><RakeTask description="" fullCmd="app:db:test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="app:db:test:purge" taksId="purge" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="doc"><RakeTask description="Generate docs for the app -- also available doc:rails, doc:guides (options: TEMPLATE=/rdoc-template.rb, TITLE=&quot;Custom Title&quot;)" fullCmd="app:doc:app" taksId="app" /><RakeTask description="" fullCmd="app:doc:clobber" taksId="clobber" /><RakeTask description="" fullCmd="app:doc:clobber_app" taksId="clobber_app" /><RakeTask description="" fullCmd="app:doc:clobber_rails" taksId="clobber_rails" /><RakeTask description="" fullCmd="app:doc:guides" taksId="guides" /><RakeTask description="" fullCmd="app:doc:rails" taksId="rails" /><RakeTask description="" fullCmd="app:doc:reapp" taksId="reapp" /><RakeTask description="" fullCmd="app:doc:rerails" taksId="rerails" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="This task test soap" fullCmd="app:install:user" taksId="user" /><RakeTask description="" fullCmd="app:install:zip_example" taksId="zip_example" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="jobs"><RakeTask description="Exit with error status if any jobs older than max_age seconds haven't been attempted yet" fullCmd="app:jobs:check[max_age]" taksId="check[max_age]" /><RakeTask description="Clear the delayed_job queue" fullCmd="app:jobs:clear" taksId="clear" /><RakeTask description="Start a delayed_job worker" fullCmd="app:jobs:work" taksId="work" /><RakeTask description="Start a delayed_job worker and exit when all available jobs are complete" fullCmd="app:jobs:workoff" taksId="workoff" /><RakeTask description="" fullCmd="app:jobs:check" taksId="check" /><RakeTask description="" fullCmd="app:jobs:environment_options" taksId="environment_options" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="kanjai"><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Copy migrations from kanjai to application" fullCmd="app:kanjai:install:migrations" taksId="migrations" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="log"><RakeTask description="Truncates all *.log files in log/ to zero bytes (specify which logs with LOGS=test,development)" fullCmd="app:log:clear" taksId="clear" /></RakeGroup><RakeTask description="Prints out your Rack middleware stack" fullCmd="app:middleware" taksId="middleware" /><RakeTask description="Enumerate all annotations (use notes:optimize, :fixme, :todo for focus)" fullCmd="app:notes" taksId="notes" /><RakeGroup description="" fullCmd="" taksId="notes"><RakeTask description="Enumerate a custom annotation, specify with ANNOTATION=CUSTOM" fullCmd="app:notes:custom" taksId="custom" /><RakeTask description="" fullCmd="app:notes:fixme" taksId="fixme" /><RakeTask description="" fullCmd="app:notes:optimize" taksId="optimize" /><RakeTask description="" fullCmd="app:notes:todo" taksId="todo" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="rails"><RakeTask description="Applies the template supplied by LOCATION=(/path/to/template) or URL" fullCmd="app:rails:template" taksId="template" /><RakeTask description="Update configs and some other initially generated files (or use just update:configs or update:bin)" fullCmd="app:rails:update" taksId="update" /><RakeGroup description="" fullCmd="" taksId="templates"><RakeTask description="" fullCmd="app:rails:templates:copy" taksId="copy" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="update"><RakeTask description="" fullCmd="app:rails:update:bin" taksId="bin" /><RakeTask description="" fullCmd="app:rails:update:configs" taksId="configs" /></RakeGroup></RakeGroup><RakeTask description="Print out all defined routes in match order, with names" fullCmd="app:routes" taksId="routes" /><RakeTask description="Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions)" fullCmd="app:secret" taksId="secret" /><RakeTask description="Runs all tests in test folder" fullCmd="app:test" taksId="test" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="Run tests quickly by merging all types and not resetting db" fullCmd="app:test:all" taksId="all" /><RakeGroup description="" fullCmd="" taksId="all"><RakeTask description="Run tests quickly, but also reset db" fullCmd="app:test:all:db" taksId="db" /></RakeGroup><RakeTask description="Run tests quickly, but also reset db" fullCmd="app:test:db" taksId="db" /><RakeTask description="" fullCmd="app:test:controllers" taksId="controllers" /><RakeTask description="" fullCmd="app:test:deprecate_all" taksId="deprecate_all" /><RakeTask description="" fullCmd="app:test:functionals" taksId="functionals" /><RakeTask description="" fullCmd="app:test:generators" taksId="generators" /><RakeTask description="" fullCmd="app:test:helpers" taksId="helpers" /><RakeTask description="" fullCmd="app:test:integration" taksId="integration" /><RakeTask description="" fullCmd="app:test:jobs" taksId="jobs" /><RakeTask description="" fullCmd="app:test:mailers" taksId="mailers" /><RakeTask description="" fullCmd="app:test:models" taksId="models" /><RakeTask description="" fullCmd="app:test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="app:test:run" taksId="run" /><RakeTask description="" fullCmd="app:test:single" taksId="single" /><RakeTask description="" fullCmd="app:test:units" taksId="units" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="time"><RakeGroup description="" fullCmd="" taksId="zones"><RakeTask description="Displays all time zones, also available: time:zones:us, time:zones:local -- filter with OFFSET parameter, e.g., OFFSET=-6" fullCmd="app:time:zones:all" taksId="all" /><RakeTask description="" fullCmd="app:time:zones:local" taksId="local" /><RakeTask description="" fullCmd="app:time:zones:us" taksId="us" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="tmp"><RakeTask description="Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)" fullCmd="app:tmp:clear" taksId="clear" /><RakeTask description="Creates tmp directories for sessions, cache, sockets, and pids" fullCmd="app:tmp:create" taksId="create" /><RakeGroup description="" fullCmd="" taksId="cache"><RakeTask description="" fullCmd="app:tmp:cache:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="pids"><RakeTask description="" fullCmd="app:tmp:pids:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="sessions"><RakeTask description="" fullCmd="app:tmp:sessions:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="sockets"><RakeTask description="" fullCmd="app:tmp:sockets:clear" taksId="clear" /></RakeGroup></RakeGroup><RakeTask description="" fullCmd="app:default" taksId="default" /><RakeTask description="" fullCmd="app:environment" taksId="environment" /><RakeGroup description="" fullCmd="" taksId="railties"><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="" fullCmd="app:railties:install:migrations" taksId="migrations" /></RakeGroup></RakeGroup></RakeGroup><RakeTask description="Build kanjai-0.0.11.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove RDoc HTML files" fullCmd="clobber_rdoc" taksId="clobber_rdoc" /><RakeGroup description="" fullCmd="" taksId="db"><RakeTask description="Create the database from config/database.yml for the current Rails.env (use db:create:all to create all databases in the config)" fullCmd="db:create" taksId="create" /><RakeTask description="Drops the database for the current Rails.env (use db:drop:all to drop all databases)" fullCmd="db:drop" taksId="drop" /><RakeGroup description="" fullCmd="" taksId="fixtures"><RakeTask description="Load fixtures into the current environment's database" fullCmd="db:fixtures:load" taksId="load" /></RakeGroup><RakeTask description="Migrate the database (options: VERSION=x, VERBOSE=false)" fullCmd="db:migrate" taksId="migrate" /><RakeGroup description="" fullCmd="" taksId="migrate"><RakeTask description="Display status of migrations" fullCmd="db:migrate:status" taksId="status" /><RakeTask description="" fullCmd="db:migrate:down" taksId="down" /><RakeTask description="" fullCmd="db:migrate:redo" taksId="redo" /><RakeTask description="" fullCmd="db:migrate:reset" taksId="reset" /><RakeTask description="" fullCmd="db:migrate:up" taksId="up" /></RakeGroup><RakeTask description="Rolls the schema back to the previous version (specify steps w/ STEP=n)" fullCmd="db:rollback" taksId="rollback" /><RakeGroup description="" fullCmd="" taksId="schema"><RakeTask description="Create a db/schema.rb file that can be portably used against any DB supported by AR" fullCmd="db:schema:dump" taksId="dump" /><RakeTask description="Load a schema.rb file into the database" fullCmd="db:schema:load" taksId="load" /></RakeGroup><RakeTask description="Load the seed data from db/seeds.rb" fullCmd="db:seed" taksId="seed" /><RakeTask description="Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the db first)" fullCmd="db:setup" taksId="setup" /><RakeGroup description="" fullCmd="" taksId="structure"><RakeTask description="Dump the database structure to an SQL file" fullCmd="db:structure:dump" taksId="dump" /></RakeGroup><RakeTask description="Retrieves the current schema version number" fullCmd="db:version" taksId="version" /><RakeGroup description="" fullCmd="" taksId="create"><RakeTask description="" fullCmd="db:create:all" taksId="all" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="drop"><RakeTask description="" fullCmd="db:drop:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="db:reset" taksId="reset" /></RakeGroup><RakeTask description="Build and install kanjai-0.0.11.gem into system gems" fullCmd="install" taksId="install" /><RakeTask description="Build RDoc HTML files" fullCmd="rdoc" taksId="rdoc" /><RakeTask description="Create tag v0.0.11 and build and push kanjai-0.0.11.gem to Rubygems" fullCmd="release" taksId="release" /><RakeTask description="Rebuild RDoc HTML files" fullCmd="rerdoc" taksId="rerdoc" /><RakeTask description="Report code statistics (KLOCs, etc) from the application or engine" fullCmd="stats" taksId="stats" /><RakeTask description="Run tests" fullCmd="test" taksId="test" /><RakeTask description="" fullCmd="clobber" taksId="clobber" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="doc" taksId="doc" /><RakeTask description="" fullCmd="doc/app" taksId="doc/app" /><RakeTask description="" fullCmd="doc/app/created.rid" taksId="doc/app/created.rid" /><RakeTask description="" fullCmd="environment" taksId="environment" /><RakeTask description="" fullCmd="html" taksId="html" /><RakeTask description="" fullCmd="html/created.rid" taksId="html/created.rid" /><RakeTask description="" fullCmd="load_app" taksId="load_app" /><RakeTask description="" fullCmd="rdoc/created.rid" taksId="rdoc/created.rid" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup><RakeTask description="" fullCmd="tmp" taksId="tmp" /><RakeTask description="" fullCmd="tmp/cache" taksId="tmp/cache" /><RakeTask description="" fullCmd="tmp/cache/assets" taksId="tmp/cache/assets" /><RakeTask description="" fullCmd="tmp/cache/assets/development" taksId="tmp/cache/assets/development" /><RakeTask description="" fullCmd="tmp/cache/assets/production" taksId="tmp/cache/assets/production" /><RakeTask description="" fullCmd="tmp/cache/assets/test" taksId="tmp/cache/assets/test" /><RakeTask description="" fullCmd="tmp/pids" taksId="tmp/pids" /><RakeTask description="" fullCmd="tmp/sessions" taksId="tmp/sessions" /><RakeTask description="" fullCmd="tmp/sockets" taksId="tmp/sockets" /></RakeGroup></Settings>
@@ -27,23 +27,43 @@ @@ -27,23 +27,43 @@
27 <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false"> 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.0" vertical-offset="0" max-vertical-offset="315"> 30 + <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="315">
31 <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" /> 31 <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
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="admin.rb" pinned="false" current-in-tab="false">
  38 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  39 + <provider selected="true" editor-type-id="text-editor">
  40 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  41 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  42 + <folding />
  43 + </state>
  44 + </provider>
  45 + </entry>
  46 + </file>
37 <file leaf-file-name="admin_login.html.erb" pinned="false" current-in-tab="false"> 47 <file leaf-file-name="admin_login.html.erb" pinned="false" current-in-tab="false">
38 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb"> 48 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
39 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
40 - <state vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="390"> 50 + <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="390">
41 <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" /> 51 <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" />
42 <folding /> 52 <folding />
43 </state> 53 </state>
44 </provider> 54 </provider>
45 </entry> 55 </entry>
46 </file> 56 </file>
  57 + <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false">
  58 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  59 + <provider selected="true" editor-type-id="text-editor">
  60 + <state vertical-scroll-proportion="-9.148149" vertical-offset="2858" max-vertical-offset="4110">
  61 + <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
  62 + <folding />
  63 + </state>
  64 + </provider>
  65 + </entry>
  66 + </file>
47 <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false"> 67 <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">
48 <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb"> 68 <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
49 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
@@ -54,11 +74,11 @@ @@ -54,11 +74,11 @@
54 </provider> 74 </provider>
55 </entry> 75 </entry>
56 </file> 76 </file>
57 - <file leaf-file-name="general_admin.js" pinned="false" current-in-tab="false">  
58 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js"> 77 + <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
  78 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
59 <provider selected="true" editor-type-id="text-editor"> 79 <provider selected="true" editor-type-id="text-editor">
60 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">  
61 - <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="28" /> 80 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  81 + <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
62 <folding /> 82 <folding />
63 </state> 83 </state>
64 </provider> 84 </provider>
@@ -67,7 +87,7 @@ @@ -67,7 +87,7 @@
67 <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false"> 87 <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">
68 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 88 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
69 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
70 - <state vertical-scroll-proportion="-21.041666" vertical-offset="95" max-vertical-offset="810"> 90 + <state vertical-scroll-proportion="0.0" vertical-offset="95" max-vertical-offset="810">
71 <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" /> 91 <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" />
72 <folding /> 92 <folding />
73 </state> 93 </state>
@@ -87,7 +107,7 @@ @@ -87,7 +107,7 @@
87 <file leaf-file-name="image.rb" pinned="false" current-in-tab="false"> 107 <file leaf-file-name="image.rb" pinned="false" current-in-tab="false">
88 <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb"> 108 <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
89 <provider selected="true" editor-type-id="text-editor"> 109 <provider selected="true" editor-type-id="text-editor">
90 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390"> 110 + <state vertical-scroll-proportion="0.0" vertical-offset="135" max-vertical-offset="390">
91 <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> 111 <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
92 <folding /> 112 <folding />
93 </state> 113 </state>
@@ -98,7 +118,7 @@ @@ -98,7 +118,7 @@
98 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 118 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
99 <provider selected="true" editor-type-id="text-editor"> 119 <provider selected="true" editor-type-id="text-editor">
100 <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115"> 120 <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115">
101 - <caret line="123" column="13" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" /> 121 + <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" />
102 <folding /> 122 <folding />
103 </state> 123 </state>
104 </provider> 124 </provider>
@@ -109,7 +129,6 @@ @@ -109,7 +129,6 @@
109 <component name="IdeDocumentHistory"> 129 <component name="IdeDocumentHistory">
110 <option name="CHANGED_PATHS"> 130 <option name="CHANGED_PATHS">
111 <list> 131 <list>
112 - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js" />  
113 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general.css.scss" /> 132 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general.css.scss" />
114 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" /> 133 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
115 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_site.css.scss" /> 134 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_site.css.scss" />
@@ -159,6 +178,7 @@ @@ -159,6 +178,7 @@
159 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" /> 178 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" />
160 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" /> 179 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
161 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 180 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
  181 + <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
162 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
163 </list> 183 </list>
164 </option> 184 </option>
@@ -194,6 +214,8 @@ @@ -194,6 +214,8 @@
194 <sortByType /> 214 <sortByType />
195 </navigator> 215 </navigator>
196 <panes> 216 <panes>
  217 + <pane id="RailsProjectView" />
  218 + <pane id="Scope" />
197 <pane id="ProjectPane"> 219 <pane id="ProjectPane">
198 <subPane> 220 <subPane>
199 <PATH> 221 <PATH>
@@ -240,7 +262,7 @@ @@ -240,7 +262,7 @@
240 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 262 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
241 </PATH_ELEMENT> 263 </PATH_ELEMENT>
242 <PATH_ELEMENT> 264 <PATH_ELEMENT>
243 - <option name="myItemId" value="kanjai" /> 265 + <option name="myItemId" value="tasks" />
244 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 266 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
245 </PATH_ELEMENT> 267 </PATH_ELEMENT>
246 </PATH> 268 </PATH>
@@ -254,7 +276,11 @@ @@ -254,7 +276,11 @@
254 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 276 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
255 </PATH_ELEMENT> 277 </PATH_ELEMENT>
256 <PATH_ELEMENT> 278 <PATH_ELEMENT>
257 - <option name="myItemId" value="config" /> 279 + <option name="myItemId" value="lib" />
  280 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  281 + </PATH_ELEMENT>
  282 + <PATH_ELEMENT>
  283 + <option name="myItemId" value="kanjai" />
258 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 284 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
259 </PATH_ELEMENT> 285 </PATH_ELEMENT>
260 </PATH> 286 </PATH>
@@ -271,10 +297,6 @@ @@ -271,10 +297,6 @@
271 <option name="myItemId" value="config" /> 297 <option name="myItemId" value="config" />
272 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 298 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
273 </PATH_ELEMENT> 299 </PATH_ELEMENT>
274 - <PATH_ELEMENT>  
275 - <option name="myItemId" value="initializers" />  
276 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
277 - </PATH_ELEMENT>  
278 </PATH> 300 </PATH>
279 <PATH> 301 <PATH>
280 <PATH_ELEMENT> 302 <PATH_ELEMENT>
@@ -286,19 +308,11 @@ @@ -286,19 +308,11 @@
286 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 308 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
287 </PATH_ELEMENT> 309 </PATH_ELEMENT>
288 <PATH_ELEMENT> 310 <PATH_ELEMENT>
289 - <option name="myItemId" value="app" />  
290 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
291 - </PATH_ELEMENT>  
292 - <PATH_ELEMENT>  
293 - <option name="myItemId" value="views" />  
294 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
295 - </PATH_ELEMENT>  
296 - <PATH_ELEMENT>  
297 - <option name="myItemId" value="layouts" /> 311 + <option name="myItemId" value="config" />
298 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 312 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
299 </PATH_ELEMENT> 313 </PATH_ELEMENT>
300 <PATH_ELEMENT> 314 <PATH_ELEMENT>
301 - <option name="myItemId" value="kanjai" /> 315 + <option name="myItemId" value="initializers" />
302 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 316 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
303 </PATH_ELEMENT> 317 </PATH_ELEMENT>
304 </PATH> 318 </PATH>
@@ -351,6 +365,10 @@ @@ -351,6 +365,10 @@
351 <option name="myItemId" value="controllers" /> 365 <option name="myItemId" value="controllers" />
352 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 366 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
353 </PATH_ELEMENT> 367 </PATH_ELEMENT>
  368 + <PATH_ELEMENT>
  369 + <option name="myItemId" value="kanjai" />
  370 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  371 + </PATH_ELEMENT>
354 </PATH> 372 </PATH>
355 <PATH> 373 <PATH>
356 <PATH_ELEMENT> 374 <PATH_ELEMENT>
@@ -372,8 +390,6 @@ @@ -372,8 +390,6 @@
372 </PATH> 390 </PATH>
373 </subPane> 391 </subPane>
374 </pane> 392 </pane>
375 - <pane id="RailsProjectView" />  
376 - <pane id="Scope" />  
377 </panes> 393 </panes>
378 </component> 394 </component>
379 <component name="PropertiesComponent"> 395 <component name="PropertiesComponent">
@@ -553,26 +569,26 @@ @@ -553,26 +569,26 @@
553 </component> 569 </component>
554 <component name="ToolWindowManager"> 570 <component name="ToolWindowManager">
555 <frame x="0" y="23" width="1280" height="728" extended-state="6" /> 571 <frame x="0" y="23" width="1280" height="728" extended-state="6" />
556 - <editor active="true" /> 572 + <editor active="false" />
557 <layout> 573 <layout>
  574 + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
558 <window_info id="Changes" 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" /> 575 <window_info id="Changes" 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" />
559 <window_info id="Terminal" 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" /> 576 <window_info id="Terminal" 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" />
560 - <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" />  
561 - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
562 - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
563 - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />  
564 - <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" />  
565 - <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" />  
566 - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
567 <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" /> 577 <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" />
  578 + <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" />
568 <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" /> 579 <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" />
569 <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" /> 580 <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" />
570 - <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" />  
571 - <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" /> 581 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26171243" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  582 + <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" />
  583 + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
  584 + <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" />
572 <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" /> 585 <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" />
573 <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" /> 586 <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" />
  587 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
574 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 588 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  589 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
575 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 590 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  591 + <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" />
576 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 592 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
577 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> 593 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
578 </layout> 594 </layout>
@@ -598,21 +614,11 @@ @@ -598,21 +614,11 @@
598 <watches-manager /> 614 <watches-manager />
599 </component> 615 </component>
600 <component name="editorHistoryManager"> 616 <component name="editorHistoryManager">
601 - <entry file="file://$PROJECT_DIR$/app/assets/fonts/font-awesome-4.4.0/FontAwesome.otf">  
602 - <provider selected="true" editor-type-id="text-editor">  
603 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="35325">  
604 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
605 - <folding />  
606 - </state>  
607 - </provider>  
608 - </entry>  
609 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/font_awesome_4_4/font-awesome.css.scss.erb"> 617 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/font_awesome_4_4/font-awesome.css.scss.erb">
610 <provider selected="true" editor-type-id="text-editor"> 618 <provider selected="true" editor-type-id="text-editor">
611 <state vertical-scroll-proportion="-8.125" vertical-offset="0" max-vertical-offset="30600"> 619 <state vertical-scroll-proportion="-8.125" vertical-offset="0" max-vertical-offset="30600">
612 <caret line="13" column="23" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="23" /> 620 <caret line="13" column="23" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="23" />
613 - <folding>  
614 - <marker date="1461740260000" expanded="true" signature="-1:-1" placeholder="{...}" />  
615 - </folding> 621 + <folding />
616 </state> 622 </state>
617 </provider> 623 </provider>
618 </entry> 624 </entry>
@@ -620,9 +626,6 @@ @@ -620,9 +626,6 @@
620 <provider selected="true" editor-type-id="text-editor"> 626 <provider selected="true" editor-type-id="text-editor">
621 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165"> 627 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165">
622 <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> 628 <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
623 - <folding>  
624 - <element signature="n#!!doc" expanded="false" />  
625 - </folding>  
626 </state> 629 </state>
627 </provider> 630 </provider>
628 </entry> 631 </entry>
@@ -654,7 +657,6 @@ @@ -654,7 +657,6 @@
654 <provider selected="true" editor-type-id="text-editor"> 657 <provider selected="true" editor-type-id="text-editor">
655 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="195"> 658 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="195">
656 <caret line="6" column="3" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" /> 659 <caret line="6" column="3" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" />
657 - <folding />  
658 </state> 660 </state>
659 </provider> 661 </provider>
660 </entry> 662 </entry>
@@ -670,7 +672,6 @@ @@ -670,7 +672,6 @@
670 <provider selected="true" editor-type-id="text-editor"> 672 <provider selected="true" editor-type-id="text-editor">
671 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416"> 673 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
672 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 674 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
673 - <folding />  
674 </state> 675 </state>
675 </provider> 676 </provider>
676 </entry> 677 </entry>
@@ -678,7 +679,6 @@ @@ -678,7 +679,6 @@
678 <provider selected="true" editor-type-id="text-editor"> 679 <provider selected="true" editor-type-id="text-editor">
679 <state vertical-scroll-proportion="-10.708333" vertical-offset="193" max-vertical-offset="585"> 680 <state vertical-scroll-proportion="-10.708333" vertical-offset="193" max-vertical-offset="585">
680 <caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" /> 681 <caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
681 - <folding />  
682 </state> 682 </state>
683 </provider> 683 </provider>
684 </entry> 684 </entry>
@@ -686,7 +686,6 @@ @@ -686,7 +686,6 @@
686 <provider selected="true" editor-type-id="text-editor"> 686 <provider selected="true" editor-type-id="text-editor">
687 <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="345"> 687 <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="345">
688 <caret line="10" column="39" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" /> 688 <caret line="10" column="39" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />
689 - <folding />  
690 </state> 689 </state>
691 </provider> 690 </provider>
692 </entry> 691 </entry>
@@ -694,7 +693,6 @@ @@ -694,7 +693,6 @@
694 <provider selected="true" editor-type-id="text-editor"> 693 <provider selected="true" editor-type-id="text-editor">
695 <state vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="360"> 694 <state vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="360">
696 <caret line="11" column="111" selection-start-line="11" selection-start-column="111" selection-end-line="11" selection-end-column="111" /> 695 <caret line="11" column="111" selection-start-line="11" selection-start-column="111" selection-end-line="11" selection-end-column="111" />
697 - <folding />  
698 </state> 696 </state>
699 </provider> 697 </provider>
700 </entry> 698 </entry>
@@ -702,7 +700,6 @@ @@ -702,7 +700,6 @@
702 <provider selected="true" editor-type-id="text-editor"> 700 <provider selected="true" editor-type-id="text-editor">
703 <state vertical-scroll-proportion="0.0" vertical-offset="394" max-vertical-offset="975"> 701 <state vertical-scroll-proportion="0.0" vertical-offset="394" max-vertical-offset="975">
704 <caret line="48" column="47" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" /> 702 <caret line="48" column="47" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />
705 - <folding />  
706 </state> 703 </state>
707 </provider> 704 </provider>
708 </entry> 705 </entry>
@@ -710,7 +707,6 @@ @@ -710,7 +707,6 @@
710 <provider selected="true" editor-type-id="text-editor"> 707 <provider selected="true" editor-type-id="text-editor">
711 <state vertical-scroll-proportion="-10.708333" vertical-offset="283" max-vertical-offset="675"> 708 <state vertical-scroll-proportion="-10.708333" vertical-offset="283" max-vertical-offset="675">
712 <caret line="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" /> 709 <caret line="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
713 - <folding />  
714 </state> 710 </state>
715 </provider> 711 </provider>
716 </entry> 712 </entry>
@@ -718,7 +714,6 @@ @@ -718,7 +714,6 @@
718 <provider selected="true" editor-type-id="text-editor"> 714 <provider selected="true" editor-type-id="text-editor">
719 <state vertical-scroll-proportion="-1.875" vertical-offset="0" max-vertical-offset="255"> 715 <state vertical-scroll-proportion="-1.875" vertical-offset="0" max-vertical-offset="255">
720 <caret line="3" column="77" selection-start-line="3" selection-start-column="77" selection-end-line="3" selection-end-column="77" /> 716 <caret line="3" column="77" selection-start-line="3" selection-start-column="77" selection-end-line="3" selection-end-column="77" />
721 - <folding />  
722 </state> 717 </state>
723 </provider> 718 </provider>
724 </entry> 719 </entry>
@@ -726,7 +721,6 @@ @@ -726,7 +721,6 @@
726 <provider selected="true" editor-type-id="text-editor"> 721 <provider selected="true" editor-type-id="text-editor">
727 <state vertical-scroll-proportion="-8.833333" vertical-offset="268" max-vertical-offset="660"> 722 <state vertical-scroll-proportion="-8.833333" vertical-offset="268" max-vertical-offset="660">
728 <caret line="32" column="11" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="11" /> 723 <caret line="32" column="11" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="11" />
729 - <folding />  
730 </state> 724 </state>
731 </provider> 725 </provider>
732 </entry> 726 </entry>
@@ -734,7 +728,6 @@ @@ -734,7 +728,6 @@
734 <provider selected="true" editor-type-id="text-editor"> 728 <provider selected="true" editor-type-id="text-editor">
735 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="392"> 729 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="392">
736 <caret line="0" column="73" selection-start-line="0" selection-start-column="73" selection-end-line="0" selection-end-column="73" /> 730 <caret line="0" column="73" selection-start-line="0" selection-start-column="73" selection-end-line="0" selection-end-column="73" />
737 - <folding />  
738 </state> 731 </state>
739 </provider> 732 </provider>
740 </entry> 733 </entry>
@@ -742,7 +735,6 @@ @@ -742,7 +735,6 @@
742 <provider selected="true" editor-type-id="text-editor"> 735 <provider selected="true" editor-type-id="text-editor">
743 <state vertical-scroll-proportion="0.0" vertical-offset="660" max-vertical-offset="1650"> 736 <state vertical-scroll-proportion="0.0" vertical-offset="660" max-vertical-offset="1650">
744 <caret line="48" column="47" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" /> 737 <caret line="48" column="47" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />
745 - <folding />  
746 </state> 738 </state>
747 </provider> 739 </provider>
748 </entry> 740 </entry>
@@ -750,15 +742,6 @@ @@ -750,15 +742,6 @@
750 <provider selected="true" editor-type-id="text-editor"> 742 <provider selected="true" editor-type-id="text-editor">
751 <state vertical-scroll-proportion="-3.3333333" vertical-offset="205" max-vertical-offset="570"> 743 <state vertical-scroll-proportion="-3.3333333" vertical-offset="205" max-vertical-offset="570">
752 <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" /> 744 <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
753 - <folding />  
754 - </state>  
755 - </provider>  
756 - </entry>  
757 - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">  
758 - <provider selected="true" editor-type-id="text-editor">  
759 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">  
760 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
761 - <folding />  
762 </state> 745 </state>
763 </provider> 746 </provider>
764 </entry> 747 </entry>
@@ -774,7 +757,6 @@ @@ -774,7 +757,6 @@
774 <provider selected="true" editor-type-id="text-editor"> 757 <provider selected="true" editor-type-id="text-editor">
775 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750"> 758 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750">
776 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 759 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
777 - <folding />  
778 </state> 760 </state>
779 </provider> 761 </provider>
780 </entry> 762 </entry>
@@ -782,9 +764,6 @@ @@ -782,9 +764,6 @@
782 <provider selected="true" editor-type-id="text-editor"> 764 <provider selected="true" editor-type-id="text-editor">
783 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="34905"> 765 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="34905">
784 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 766 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
785 - <folding>  
786 - <element signature="n#!!doc" expanded="false" />  
787 - </folding>  
788 </state> 767 </state>
789 </provider> 768 </provider>
790 </entry> 769 </entry>
@@ -792,7 +771,6 @@ @@ -792,7 +771,6 @@
792 <provider selected="true" editor-type-id="text-editor"> 771 <provider selected="true" editor-type-id="text-editor">
793 <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="900"> 772 <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="900">
794 <caret line="20" column="61" selection-start-line="20" selection-start-column="61" selection-end-line="20" selection-end-column="61" /> 773 <caret line="20" column="61" selection-start-line="20" selection-start-column="61" selection-end-line="20" selection-end-column="61" />
795 - <folding />  
796 </state> 774 </state>
797 </provider> 775 </provider>
798 </entry> 776 </entry>
@@ -800,12 +778,7 @@ @@ -800,12 +778,7 @@
800 <provider selected="true" editor-type-id="text-editor"> 778 <provider selected="true" editor-type-id="text-editor">
801 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 779 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
802 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 780 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
803 - <folding>  
804 - <marker date="1453230718000" expanded="true" signature="-1:-1" placeholder="{...}" />  
805 - <marker date="1453230718000" expanded="true" signature="-1:-1" placeholder="{...}" />  
806 - <marker date="1453230718000" expanded="true" signature="-1:-1" placeholder="{...}" />  
807 - <marker date="1453230718000" expanded="true" signature="-1:-1" placeholder="{...}" />  
808 - </folding> 781 + <folding />
809 </state> 782 </state>
810 </provider> 783 </provider>
811 </entry> 784 </entry>
@@ -813,7 +786,6 @@ @@ -813,7 +786,6 @@
813 <provider selected="true" editor-type-id="text-editor"> 786 <provider selected="true" editor-type-id="text-editor">
814 <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070"> 787 <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">
815 <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" /> 788 <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
816 - <folding />  
817 </state> 789 </state>
818 </provider> 790 </provider>
819 </entry> 791 </entry>
@@ -821,7 +793,6 @@ @@ -821,7 +793,6 @@
821 <provider selected="true" editor-type-id="text-editor"> 793 <provider selected="true" editor-type-id="text-editor">
822 <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="105"> 794 <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="105">
823 <caret line="0" column="28" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="28" /> 795 <caret line="0" column="28" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="28" />
824 - <folding />  
825 </state> 796 </state>
826 </provider> 797 </provider>
827 </entry> 798 </entry>
@@ -829,7 +800,6 @@ @@ -829,7 +800,6 @@
829 <provider selected="true" editor-type-id="text-editor"> 800 <provider selected="true" editor-type-id="text-editor">
830 <state vertical-scroll-proportion="0.04918033" vertical-offset="0" max-vertical-offset="610"> 801 <state vertical-scroll-proportion="0.04918033" vertical-offset="0" max-vertical-offset="610">
831 <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="48" /> 802 <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="48" />
832 - <folding />  
833 </state> 803 </state>
834 </provider> 804 </provider>
835 </entry> 805 </entry>
@@ -837,15 +807,6 @@ @@ -837,15 +807,6 @@
837 <provider selected="true" editor-type-id="text-editor"> 807 <provider selected="true" editor-type-id="text-editor">
838 <state vertical-scroll-proportion="-11.875" vertical-offset="0" max-vertical-offset="375"> 808 <state vertical-scroll-proportion="-11.875" vertical-offset="0" max-vertical-offset="375">
839 <caret line="19" column="39" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" /> 809 <caret line="19" column="39" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
840 - <folding />  
841 - </state>  
842 - </provider>  
843 - </entry>  
844 - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">  
845 - <provider selected="true" editor-type-id="text-editor">  
846 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
847 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
848 - <folding />  
849 </state> 810 </state>
850 </provider> 811 </provider>
851 </entry> 812 </entry>
@@ -853,7 +814,6 @@ @@ -853,7 +814,6 @@
853 <provider selected="true" editor-type-id="text-editor"> 814 <provider selected="true" editor-type-id="text-editor">
854 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 815 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
855 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 816 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
856 - <folding />  
857 </state> 817 </state>
858 </provider> 818 </provider>
859 </entry> 819 </entry>
@@ -861,7 +821,6 @@ @@ -861,7 +821,6 @@
861 <provider selected="true" editor-type-id="text-editor"> 821 <provider selected="true" editor-type-id="text-editor">
862 <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="420"> 822 <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="420">
863 <caret line="10" column="41" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" /> 823 <caret line="10" column="41" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
864 - <folding />  
865 </state> 824 </state>
866 </provider> 825 </provider>
867 </entry> 826 </entry>
@@ -877,7 +836,6 @@ @@ -877,7 +836,6 @@
877 <provider selected="true" editor-type-id="text-editor"> 836 <provider selected="true" editor-type-id="text-editor">
878 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3615"> 837 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3615">
879 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 838 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
880 - <folding />  
881 </state> 839 </state>
882 </provider> 840 </provider>
883 </entry> 841 </entry>
@@ -885,7 +843,6 @@ @@ -885,7 +843,6 @@
885 <provider selected="true" editor-type-id="text-editor"> 843 <provider selected="true" editor-type-id="text-editor">
886 <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140"> 844 <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
887 <caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" /> 845 <caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
888 - <folding />  
889 </state> 846 </state>
890 </provider> 847 </provider>
891 </entry> 848 </entry>
@@ -893,9 +850,6 @@ @@ -893,9 +850,6 @@
893 <provider selected="true" editor-type-id="text-editor"> 850 <provider selected="true" editor-type-id="text-editor">
894 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245"> 851 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245">
895 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 852 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
896 - <folding>  
897 - <element signature="n#!!doc" expanded="false" />  
898 - </folding>  
899 </state> 853 </state>
900 </provider> 854 </provider>
901 </entry> 855 </entry>
@@ -903,13 +857,7 @@ @@ -903,13 +857,7 @@
903 <provider selected="true" editor-type-id="text-editor"> 857 <provider selected="true" editor-type-id="text-editor">
904 <state vertical-scroll-proportion="-4.7777777" vertical-offset="4281" max-vertical-offset="7155"> 858 <state vertical-scroll-proportion="-4.7777777" vertical-offset="4281" max-vertical-offset="7155">
905 <caret line="294" column="4" selection-start-line="294" selection-start-column="4" selection-end-line="294" selection-end-column="36" /> 859 <caret line="294" column="4" selection-start-line="294" selection-start-column="4" selection-end-line="294" selection-end-column="36" />
906 - <folding>  
907 - <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />  
908 - <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />  
909 - <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />  
910 - <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />  
911 - <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />  
912 - </folding> 860 + <folding />
913 </state> 861 </state>
914 </provider> 862 </provider>
915 </entry> 863 </entry>
@@ -917,7 +865,6 @@ @@ -917,7 +865,6 @@
917 <provider selected="true" editor-type-id="text-editor"> 865 <provider selected="true" editor-type-id="text-editor">
918 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135"> 866 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
919 <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="24" /> 867 <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="24" />
920 - <folding />  
921 </state> 868 </state>
922 </provider> 869 </provider>
923 </entry> 870 </entry>
@@ -925,7 +872,6 @@ @@ -925,7 +872,6 @@
925 <provider selected="true" editor-type-id="text-editor"> 872 <provider selected="true" editor-type-id="text-editor">
926 <state vertical-scroll-proportion="0.0" vertical-offset="109" max-vertical-offset="540"> 873 <state vertical-scroll-proportion="0.0" vertical-offset="109" max-vertical-offset="540">
927 <caret line="27" column="28" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="28" /> 874 <caret line="27" column="28" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="28" />
928 - <folding />  
929 </state> 875 </state>
930 </provider> 876 </provider>
931 </entry> 877 </entry>
@@ -941,9 +887,7 @@ @@ -941,9 +887,7 @@
941 <provider selected="true" editor-type-id="text-editor"> 887 <provider selected="true" editor-type-id="text-editor">
942 <state vertical-scroll-proportion="-12.0" vertical-offset="3246" max-vertical-offset="8085"> 888 <state vertical-scroll-proportion="-12.0" vertical-offset="3246" max-vertical-offset="8085">
943 <caret line="238" column="19" selection-start-line="236" selection-start-column="0" selection-end-line="238" selection-end-column="19" /> 889 <caret line="238" column="19" selection-start-line="236" selection-start-column="0" selection-end-line="238" selection-end-column="19" />
944 - <folding>  
945 - <marker date="1461316414000" expanded="true" signature="-1:-1" placeholder="..." />  
946 - </folding> 890 + <folding />
947 </state> 891 </state>
948 </provider> 892 </provider>
949 </entry> 893 </entry>
@@ -951,13 +895,7 @@ @@ -951,13 +895,7 @@
951 <provider selected="true" editor-type-id="text-editor"> 895 <provider selected="true" editor-type-id="text-editor">
952 <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490"> 896 <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490">
953 <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" /> 897 <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" />
954 - <folding>  
955 - <marker date="1461763907000" expanded="true" signature="-1:-1" placeholder="..." />  
956 - <marker date="1461763907000" expanded="true" signature="-1:-1" placeholder="..." />  
957 - <marker date="1461763907000" expanded="true" signature="-1:-1" placeholder="..." />  
958 - <marker date="1461763907000" expanded="true" signature="-1:-1" placeholder="..." />  
959 - <marker date="1461763907000" expanded="true" signature="-1:-1" placeholder="..." />  
960 - </folding> 898 + <folding />
961 </state> 899 </state>
962 </provider> 900 </provider>
963 </entry> 901 </entry>
@@ -965,15 +903,6 @@ @@ -965,15 +903,6 @@
965 <provider selected="true" editor-type-id="text-editor"> 903 <provider selected="true" editor-type-id="text-editor">
966 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416"> 904 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
967 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 905 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
968 - <folding />  
969 - </state>  
970 - </provider>  
971 - </entry>  
972 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">  
973 - <provider selected="true" editor-type-id="text-editor">  
974 - <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115">  
975 - <caret line="123" column="13" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />  
976 - <folding />  
977 </state> 906 </state>
978 </provider> 907 </provider>
979 </entry> 908 </entry>
@@ -989,6 +918,29 @@ @@ -989,6 +918,29 @@
989 <provider selected="true" editor-type-id="text-editor"> 918 <provider selected="true" editor-type-id="text-editor">
990 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240"> 919 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
991 <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" /> 920 <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
  921 + </state>
  922 + </provider>
  923 + </entry>
  924 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
  925 + <provider selected="true" editor-type-id="text-editor">
  926 + <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="390">
  927 + <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" />
  928 + <folding />
  929 + </state>
  930 + </provider>
  931 + </entry>
  932 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  933 + <provider selected="true" editor-type-id="text-editor">
  934 + <state vertical-scroll-proportion="0.0" vertical-offset="95" max-vertical-offset="810">
  935 + <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" />
  936 + <folding />
  937 + </state>
  938 + </provider>
  939 + </entry>
  940 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  941 + <provider selected="true" editor-type-id="text-editor">
  942 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
  943 + <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
992 <folding /> 944 <folding />
993 </state> 945 </state>
994 </provider> 946 </provider>
@@ -1001,26 +953,34 @@ @@ -1001,26 +953,34 @@
1001 </state> 953 </state>
1002 </provider> 954 </provider>
1003 </entry> 955 </entry>
1004 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb"> 956 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1005 <provider selected="true" editor-type-id="text-editor"> 957 <provider selected="true" editor-type-id="text-editor">
1006 - <state vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="390">  
1007 - <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" /> 958 + <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115">
  959 + <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" />
1008 <folding /> 960 <folding />
1009 </state> 961 </state>
1010 </provider> 962 </provider>
1011 </entry> 963 </entry>
1012 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 964 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
1013 <provider selected="true" editor-type-id="text-editor"> 965 <provider selected="true" editor-type-id="text-editor">
1014 - <state vertical-scroll-proportion="-21.041666" vertical-offset="95" max-vertical-offset="810">  
1015 - <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" /> 966 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
  967 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1016 <folding /> 968 <folding />
1017 </state> 969 </state>
1018 </provider> 970 </provider>
1019 </entry> 971 </entry>
1020 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 972 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
1021 <provider selected="true" editor-type-id="text-editor"> 973 <provider selected="true" editor-type-id="text-editor">
1022 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">  
1023 - <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" /> 974 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  975 + <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
  976 + <folding />
  977 + </state>
  978 + </provider>
  979 + </entry>
  980 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  981 + <provider selected="true" editor-type-id="text-editor">
  982 + <state vertical-scroll-proportion="-9.148149" vertical-offset="2858" max-vertical-offset="4110">
  983 + <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
1024 <folding /> 984 <folding />
1025 </state> 985 </state>
1026 </provider> 986 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.10) 4 + kanjai (0.0.11)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -205,7 +205,7 @@ Devise.setup do |config| @@ -205,7 +205,7 @@ Devise.setup do |config|
205 # Turn scoped views on. Before rendering "sessions/new", it will first check for 205 # Turn scoped views on. Before rendering "sessions/new", it will first check for
206 # "users/sessions/new". It's turned off by default because it's slower if you 206 # "users/sessions/new". It's turned off by default because it's slower if you
207 # are using only default views. 207 # are using only default views.
208 - # config.scoped_views = false 208 + config.scoped_views = true
209 209
210 # Configure the default scope given to Warden. By default it's the first 210 # Configure the default scope given to Warden. By default it's the first
211 # devise role declared in your routes (usually :user). 211 # devise role declared in your routes (usually :user).
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.11" 2 + VERSION = "0.0.12"
3 end 3 end