Permalink
Browse files

comment

  • Loading branch information...
1 parent c00e63c commit 0820ee6f11f31ff42df482517a5b516bc0aee78a @el-fuego committed Oct 11, 2013
Showing with 64 additions and 81 deletions.
  1. +1 −1 .idea/.name
  2. +0 −9 .idea/grunt-concat-properties.iml
  3. +0 −17 .idea/misc.xml
  4. +1 −1 .idea/modules.xml
  5. +61 −52 .idea/workspace.xml
  6. +1 −1 Gruntfile.js
View
@@ -1 +1 @@
-grunt-concat-properties
+grunt-local-settings
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
- <component name="NewModuleRootManager">
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
-
View
@@ -1,22 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" />
- <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false" SSL_PROTOCOLS="all">
- <option name="USER" value="" />
- <option name="PASSWORD" value="" />
- <option name="mySSHConnectionTimeout" value="30000" />
- <option name="mySSHReadTimeout" value="30000" />
- <option name="LAST_MERGED_REVISION" />
- <option name="MERGE_DRY_RUN" value="false" />
- <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
- <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
- <option name="IGNORE_SPACES_IN_MERGE" value="false" />
- <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
- <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
- <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
- <option name="FORCE_UPDATE" value="false" />
- <option name="IGNORE_EXTERNALS" value="false" />
- <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
- </component>
</project>
View
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/grunt-concat-properties.iml" filepath="$PROJECT_DIR$/.idea/grunt-concat-properties.iml" />
+ <module fileurl="file://$PROJECT_DIR$/.idea/grunt-local-settings.iml" filepath="$PROJECT_DIR$/.idea/grunt-local-settings.iml" />
</modules>
</component>
</project>
View
@@ -1,13 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="6197e9d6-d811-4e4d-9f90-a29cae8f016b" name="Default" comment="first commit">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
+ <list default="true" id="6197e9d6-d811-4e4d-9f90-a29cae8f016b" name="Default" comment="">
+ <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/grunt-concat-properties.iml" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.name" afterPath="$PROJECT_DIR$/.idea/.name" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gruntfile.js" afterPath="$PROJECT_DIR$/Gruntfile.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="grunt-concat-properties.iws" />
<ignored path=".idea/workspace.xml" />
- <file path="/Dummy.txt" changelist="6197e9d6-d811-4e4d-9f90-a29cae8f016b" time="1381420134397" ignored="false" />
+ <file path="/Dummy.txt" changelist="6197e9d6-d811-4e4d-9f90-a29cae8f016b" time="1381495336811" ignored="false" />
<file path="/init.js" changelist="6197e9d6-d811-4e4d-9f90-a29cae8f016b" time="1380545448392" ignored="false" />
<file path="/someProperties.js" changelist="6197e9d6-d811-4e4d-9f90-a29cae8f016b" time="1380558091307" ignored="false" />
<file path="/propertiesAtFolder.js" changelist="6197e9d6-d811-4e4d-9f90-a29cae8f016b" time="1380553252482" ignored="false" />
@@ -58,7 +62,7 @@
<file leaf-file-name="gruntConfig.json" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/AppTest/gruntConfig.json">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -76,7 +80,7 @@
<file leaf-file-name="test.json" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/expected/test.json">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -94,25 +98,16 @@
<file leaf-file-name="Gruntfile.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Gruntfile.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="67" selection-start="703" selection-end="736" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="README.md" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/README.md">
- <provider selected="true" editor-type-id="text-editor">
- <state line="14" column="3" selection-start="232" selection-end="232" vertical-scroll-proportion="0.3398058">
+ <state line="2" column="28" selection-start="55" selection-end="75" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="package.json" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="package.json" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="31" selection-start="919" selection-end="919" vertical-scroll-proportion="-14.125">
+ <state line="7" column="14" selection-start="272" selection-end="272" vertical-scroll-proportion="0.12583892">
<folding />
</state>
</provider>
@@ -121,18 +116,16 @@
<file leaf-file-name="local_settings.js" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tasks/local_settings.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="18" selection-start="210" selection-end="210" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="n#!!doc" expanded="true" />
- </folding>
+ <state line="12" column="9" selection-start="273" selection-end="273" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".jshintrc" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.jshintrc">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="19" selection-start="147" selection-end="147" vertical-scroll-proportion="-4.375">
+ <state line="7" column="19" selection-start="147" selection-end="147" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -156,7 +149,6 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/test/App/View/init.js" />
<option value="$PROJECT_DIR$/test/App/View/inlineProperty.js" />
<option value="$PROJECT_DIR$/test/App/View/prptotypeProperty.js" />
<option value="$PROJECT_DIR$/test/App/models/WithProperties/folder/propertiesAtFolder.js" />
@@ -167,11 +159,12 @@
<option value="$PROJECT_DIR$/test/App/build/properties.js" />
<option value="$PROJECT_DIR$/test/App/models/WithProperties/someProperties.js" />
<option value="$PROJECT_DIR$/test/expected/properties.js" />
- <option value="$PROJECT_DIR$/Gruntfile.js" />
<option value="$PROJECT_DIR$/.jshintrc" />
<option value="$PROJECT_DIR$/test/test.js" />
<option value="$PROJECT_DIR$/tasks/local_settings.js" />
<option value="$PROJECT_DIR$/README.md" />
+ <option value="$PROJECT_DIR$/Gruntfile.js" />
+ <option value="$PROJECT_DIR$/package.json" />
</list>
</option>
</component>
@@ -207,18 +200,17 @@
<sortByType />
</navigator>
<panes>
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="grunt-concat-properties" />
+ <option name="myItemId" value="grunt-local-settings" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="grunt-concat-properties" />
+ <option name="myItemId" value="grunt-local-settings" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -228,15 +220,16 @@
</PATH>
</subPane>
</pane>
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="options.splitter.main.proportions" value="0.3" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="options.lastSelected" value="fileColors" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="options.splitter.details.proportions" value="0.2" />
<property name="options.searchVisible" value="true" />
+ <property name="options.splitter.details.proportions" value="0.2" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
@@ -263,6 +256,23 @@
<list size="0" />
</component>
<component name="ShelveChangesManager" show_recycled="false" />
+ <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false" SSL_PROTOCOLS="all">
+ <option name="USER" value="" />
+ <option name="PASSWORD" value="" />
+ <option name="mySSHConnectionTimeout" value="30000" />
+ <option name="mySSHReadTimeout" value="30000" />
+ <option name="LAST_MERGED_REVISION" />
+ <option name="MERGE_DRY_RUN" value="false" />
+ <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
+ <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
+ <option name="IGNORE_SPACES_IN_MERGE" value="false" />
+ <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
+ <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
+ <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
+ <option name="FORCE_UPDATE" value="false" />
+ <option name="IGNORE_EXTERNALS" value="false" />
+ <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
+ </component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="6197e9d6-d811-4e4d-9f90-a29cae8f016b" name="Default" comment="" />
@@ -273,14 +283,17 @@
<created>1381420110558</created>
<updated>1381420110558</updated>
</task>
- <option name="localTasksCounter" value="2" />
+ <task id="LOCAL-00002" summary="readme">
+ <created>1381420388363</created>
+ <updated>1381420388363</updated>
+ </task>
+ <option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-2" y="25" width="1370" height="745" extended-state="6" />
<editor active="true" />
<layout>
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<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" />
<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" />
<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" />
@@ -294,6 +307,7 @@
<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" />
<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" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" 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" />
<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" />
<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" />
<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" />
@@ -341,7 +355,7 @@
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="first commit" />
+ <option name="LAST_COMMIT_MESSAGE" value="readme" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -356,6 +370,7 @@
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="first commit" />
+ <MESSAGE value="readme" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -364,9 +379,7 @@
<entry file="file://$PROJECT_DIR$/tasks/local_settings.js">
<provider selected="true" editor-type-id="text-editor">
<state line="33" column="17" selection-start="965" selection-end="965" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="n#!!doc" expanded="true" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
@@ -405,13 +418,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/.jshintrc">
- <provider selected="true" editor-type-id="text-editor">
- <state line="7" column="19" selection-start="147" selection-end="147" vertical-scroll-proportion="-4.375">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/test/AppTest/gruntConfig.js">
<provider selected="true" editor-type-id="text-editor">
<state line="4" column="12" selection-start="68" selection-end="68" vertical-scroll-proportion="0.0">
@@ -447,32 +453,35 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tasks/local_settings.js">
+ <entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="18" selection-start="210" selection-end="210" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="n#!!doc" expanded="true" />
- </folding>
+ <state line="14" column="3" selection-start="232" selection-end="232" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Gruntfile.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="2" column="28" selection-start="55" selection-end="75" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/package.json">
+ <entry file="file://$PROJECT_DIR$/.jshintrc">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="31" selection-start="919" selection-end="919" vertical-scroll-proportion="-14.125">
+ <state line="7" column="19" selection-start="147" selection-end="147" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Gruntfile.js">
+ <entry file="file://$PROJECT_DIR$/tasks/local_settings.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="67" selection-start="703" selection-end="736" vertical-scroll-proportion="0.0">
+ <state line="12" column="9" selection-start="273" selection-end="273" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/README.md">
+ <entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="3" selection-start="232" selection-end="232" vertical-scroll-proportion="0.3398058">
+ <state line="7" column="14" selection-start="272" selection-end="272" vertical-scroll-proportion="0.12583892">
<folding />
</state>
</provider>
View
@@ -1,6 +1,6 @@
/*
* grunt-local-settings
- * https://github.com/denis/grunt-templates-concat
+ * https://github.com/denis/grunt-local-settings
*
* Copyright (c) 2013 Yuriy Pulyaev
* Licensed under the MIT license.

0 comments on commit 0820ee6

Please sign in to comment.