WS-2018.2.2 <martin@Steamrunner.local Merge branch 'master'

Conflicts:
	codestyles/Default.xml
	colors/Cobalt copy.icls
	filetypes.xml
	find.xml
	scratches.xml
	ui.lnf.xml
This commit is contained in:
Martin Donnelly 2018-09-10 14:24:34 +01:00
commit bb62daae1c
37 changed files with 5660 additions and 103 deletions

7
_linux/abbreviations.xml Normal file
View File

@ -0,0 +1,7 @@
<application>
<component name="AbbreviationManager">
<abbreviations>
<action id="ShowUmlDiagram" />
</abbreviations>
</component>
</application>

6
_linux/git.xml Normal file
View File

@ -0,0 +1,6 @@
<application>
<component name="Git.Application.Settings">
<option name="myPathToGit" value="/usr/bin/git" />
<option name="SSH_EXECUTABLE" value="IDEA_SSH" />
</component>
</application>

5
_linux/keymap.xml Normal file
View File

@ -0,0 +1,5 @@
<application>
<component name="KeymapManager">
<active_keymap name="Default for XWin" />
</component>
</application>

5
_linux/laf.xml Normal file
View File

@ -0,0 +1,5 @@
<application>
<component name="LafManager">
<laf class-name="com.intellij.ide.ui.laf.IntelliJLaf" />
</component>
</application>

View File

@ -0,0 +1,7 @@
<application>
<component name="AbbreviationManager">
<abbreviations>
<action id="ShowUmlDiagram" />
</abbreviations>
</component>
</application>

View File

@ -1,5 +1,16 @@
<application>
<component name="libraryTable">
<library name="jest-DefinitelyTyped" type="javaScript">
<properties>
<sourceFilesUrls>
<item url="file://$APPLICATION_CONFIG_DIR$/javascript/extLibs/http_github.com_DefinitelyTyped_DefinitelyTyped_raw_master_jest_index.d.ts" />
</sourceFilesUrls>
</properties>
<CLASSES>
<root url="file://$APPLICATION_CONFIG_DIR$/javascript/extLibs/http_github.com_DefinitelyTyped_DefinitelyTyped_raw_master_jest_index.d.ts" />
</CLASSES>
<SOURCES />
</library>
<library name="jquery-2.1.4" type="javaScript">
<properties>
<option name="frameworkName" value="jQuery" />

View File

@ -1,6 +1,6 @@
<application>
<component name="Git.Application.Settings">
<option name="myPathToGit" value="C:\Program Files (x86)\Git\bin\git.exe" />
<option name="myPathToGit" value="C:\Users\mdonnel\AppData\Local\Programs\Git\bin\git.exe" />
<option name="SSH_EXECUTABLE" value="IDEA_SSH" />
</component>
</application>

View File

@ -0,0 +1,18 @@
<application>
<component name="atlassian-ide-plugin">
<option name="generalConfigurationData">
<GeneralConfigurationBean>
<option name="anonymousEnhancedFeedbackEnabled" value="false" />
<option name="statsCountersMap">
<map>
<entry key="a" value="0" />
<entry key="b" value="0" />
<entry key="i" value="0" />
<entry key="r" value="0" />
</map>
</option>
<option name="uid" value="1484147216165" />
</GeneralConfigurationBean>
</option>
</component>
</application>

View File

@ -2,6 +2,7 @@
<component name="BaseRefactoringSettings">
<option name="SAFE_DELETE_WHEN_DELETE" value="false" />
<option name="SAFE_DELETE_SEARCH_IN_COMMENTS" value="false" />
<option name="SAFE_DELETE_SEARCH_IN_NON_JAVA" value="false" />
<option name="RENAME_SEARCH_IN_COMMENTS_FOR_FILE" value="false" />
<option name="RENAME_SEARCH_FOR_TEXT_FOR_FILE" value="false" />
<option name="RENAME_SEARCH_FOR_REFERENCES_FOR_FILE" value="false" />

View File

@ -1,5 +1,5 @@
<application>
<component name="CodeStyleSchemeSettings">
<option name="CURRENT_SCHEME_NAME" value="Martins Style" />
<option name="CURRENT_SCHEME_NAME" value="Default (2)" />
</component>
</application>

View File

@ -0,0 +1,3 @@
<code_scheme name="Default (2)">
<option name="RIGHT_MARGIN" value="140" />
</code_scheme>

View File

@ -1,6 +1,6 @@
<application>
<component name="EditorColorsManagerImpl">
<option name="USE_ONLY_MONOSPACED_FONTS" value="false" />
<global_color_scheme name="Cobalt copy" />
<global_color_scheme name="Monokai copy" />
</component>
</application>

View File

@ -901,7 +901,6 @@
<option name="FONT_TYPE" value="2" />
</value>
</option>
<option name="STATIC_FINAL_FIELD_ATTRIBUTES" baseAttributes="STATIC_FIELD_ATTRIBUTES" />
<option name="TEMPLATE_VARIABLE_ATTRIBUTES">
<value>
<option name="FOREGROUND" value="ff3333" />

549
colors/Borland copy.icls Normal file
View File

@ -0,0 +1,549 @@
<scheme name="Borland copy" version="142" parent_scheme="Default">
<metaInfo>
<property name="created">2017-03-01T09:27:31</property>
<property name="ide">WebStorm</property>
<property name="ideVersion">2016.3.3.0.0</property>
<property name="modified">2017-03-01T09:28:03</property>
<property name="originalScheme">Borland</property>
</metaInfo>
<font>
<option name="EDITOR_FONT_NAME" value="Roboto Mono" />
<option name="EDITOR_FONT_SIZE" value="12" />
</font>
<font>
<option name="EDITOR_FONT_NAME" value="Lucida Console" />
<option name="EDITOR_FONT_SIZE" value="12" />
</font>
<option name="CONSOLE_FONT_NAME" value="Monospaced" />
<colors>
<option name="CARET_COLOR" value="ffffff" />
<option name="CARET_ROW_COLOR" value="1e18ab" />
<option name="CONSOLE_BACKGROUND_KEY" value="" />
</colors>
<attributes>
<option name="COFFEESCRIPT.FUNCTION_NAME" baseAttributes="DEFAULT_FUNCTION_DECLARATION" />
<option name="CONSOLE_BLUE_OUTPUT">
<value>
<option name="FOREGROUND" value="50b2ff" />
</value>
</option>
<option name="CONSOLE_ERROR_OUTPUT">
<value>
<option name="FOREGROUND" value="ff2b3c" />
</value>
</option>
<option name="CONSOLE_GRAY_OUTPUT">
<value>
<option name="FOREGROUND" value="b7b7b7" />
</value>
</option>
<option name="CONSOLE_GREEN_OUTPUT">
<value>
<option name="FOREGROUND" value="cb00" />
</value>
</option>
<option name="CONSOLE_NORMAL_OUTPUT">
<value />
</option>
<option name="CONSOLE_SYSTEM_OUTPUT">
<value />
</option>
<option name="CONSOLE_USER_INPUT">
<value>
<option name="FOREGROUND" value="2cf03" />
<option name="FONT_TYPE" value="2" />
</value>
</option>
<option name="CSS.FUNCTION">
<value>
<option name="FOREGROUND" value="20a3ff" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="CSS.IDENT">
<value>
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="CSS.IMPORTANT">
<value>
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="CSS.KEYWORD">
<value>
<option name="FONT_TYPE" value="1" />
<option name="EFFECT_TYPE" value="1" />
</value>
</option>
<option name="CSS.NUMBER">
<value>
<option name="FOREGROUND" value="ff00ff" />
</value>
</option>
<option name="CSS.PROPERTY_NAME">
<value>
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="CSS.TAG_NAME">
<value>
<option name="FOREGROUND" value="2d103" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="DEFAULT_INVALID_STRING_ESCAPE" />
<option name="CUSTOM_KEYWORD1_ATTRIBUTES" baseAttributes="DEFAULT_KEYWORD" />
<option name="CUSTOM_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_LINE_COMMENT" />
<option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_BLOCK_COMMENT" />
<option name="CUSTOM_NUMBER_ATTRIBUTES" baseAttributes="DEFAULT_NUMBER" />
<option name="CUSTOM_STRING_ATTRIBUTES" baseAttributes="DEFAULT_STRING" />
<option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="DEFAULT_VALID_STRING_ESCAPE" />
<option name="DBNavigator.TextAttributes.SQL.DataType">
<value>
<option name="FOREGROUND" value="fb7dff" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="DBNavigator.TextAttributes.SQL.Keyword">
<value>
<option name="FOREGROUND" value="df00" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="DBNavigator.TextAttributes.SQL.String">
<value>
<option name="FOREGROUND" value="41c2f1" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="DBNavigator.TextAttributes.SQL.Variable">
<value>
<option name="FOREGROUND" value="b519d9" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="DEFAULT_ATTRIBUTE" baseAttributes="DEFAULT_IDENTIFIER" />
<option name="DEFAULT_CONSTANT" baseAttributes="DEFAULT_IDENTIFIER" />
<option name="DEFAULT_ENTITY" baseAttributes="DEFAULT_IDENTIFIER" />
<option name="DEFAULT_IDENTIFIER" baseAttributes="TEXT" />
<option name="DEFAULT_INSTANCE_FIELD" baseAttributes="DEFAULT_IDENTIFIER" />
<option name="DEFAULT_LABEL" baseAttributes="DEFAULT_IDENTIFIER" />
<option name="DEFAULT_METADATA" baseAttributes="TEXT" />
<option name="DEFAULT_PREDEFINED_SYMBOL" baseAttributes="DEFAULT_IDENTIFIER" />
<option name="DEFAULT_STATIC_FIELD" baseAttributes="DEFAULT_IDENTIFIER" />
<option name="DEFAULT_STATIC_METHOD" baseAttributes="DEFAULT_FUNCTION_DECLARATION" />
<option name="DEFAULT_TAG" baseAttributes="TEXT" />
<option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR" baseAttributes="TEXT" />
<option name="DELETED_TEXT_ATTRIBUTES">
<value>
<option name="FOREGROUND" value="c3c3c3" />
<option name="EFFECT_TYPE" value="1" />
</value>
</option>
<option name="DEPRECATED_ATTRIBUTES">
<value>
<option name="FOREGROUND" value="c0c0c0" />
<option name="EFFECT_COLOR" value="404040" />
<option name="EFFECT_TYPE" value="3" />
</value>
</option>
<option name="DIFF_CONFLICT">
<value>
<option name="BACKGROUND" value="a9827e" />
<option name="ERROR_STRIPE_COLOR" value="a9827e" />
</value>
</option>
<option name="DIFF_DELETED">
<value>
<option name="BACKGROUND" value="5e5e5e" />
<option name="ERROR_STRIPE_COLOR" value="5e5e5e" />
</value>
</option>
<option name="DIFF_INSERTED">
<value>
<option name="BACKGROUND" value="5b0c" />
<option name="ERROR_STRIPE_COLOR" value="b70f" />
</value>
</option>
<option name="DIFF_MODIFIED">
<value>
<option name="BACKGROUND" value="8c9dbd" />
<option name="ERROR_STRIPE_COLOR" value="8c9dbd" />
</value>
</option>
<option name="DUPLICATE_FROM_SERVER">
<value>
<option name="EFFECT_COLOR" value="ff2b3c" />
<option name="EFFECT_TYPE" value="4" />
</value>
</option>
<option name="FOLDED_TEXT_ATTRIBUTES">
<value>
<option name="FOREGROUND" value="666666" />
<option name="FONT_TYPE" value="1" />
<option name="EFFECT_COLOR" value="2cf03" />
</value>
</option>
<option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
<value>
<option name="FOREGROUND" value="20a3ff" />
<option name="FONT_TYPE" value="2" />
<option name="EFFECT_COLOR" value="ff" />
<option name="EFFECT_TYPE" value="1" />
</value>
</option>
<option name="HAML_FILTER_CONTENT">
<value>
<option name="FONT_TYPE" value="2" />
</value>
</option>
<option name="HTML_ATTRIBUTE_NAME">
<value>
<option name="FOREGROUND" value="91d2ff" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="HTML_ATTRIBUTE_VALUE">
<value>
<option name="FOREGROUND" value="c3fbc2" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="HTML_COMMENT">
<value>
<option name="FOREGROUND" value="c6c6c6" />
<option name="FONT_TYPE" value="2" />
</value>
</option>
<option name="HTML_ENTITY_REFERENCE">
<value>
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="HTML_TAG">
<value />
</option>
<option name="HTML_TAG_NAME">
<value>
<option name="FOREGROUND" value="2d103" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="HYPERLINK_ATTRIBUTES">
<value>
<option name="FOREGROUND" value="20a3ff" />
<option name="FONT_TYPE" value="2" />
<option name="EFFECT_COLOR" value="ff" />
<option name="EFFECT_TYPE" value="1" />
</value>
</option>
<option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
<value>
<option name="BACKGROUND" value="171eff" />
<option name="ERROR_STRIPE_COLOR" value="ccccff" />
</value>
</option>
<option name="INFO_ATTRIBUTES">
<value>
<option name="EFFECT_COLOR" value="cccccc" />
<option name="ERROR_STRIPE_COLOR" value="ffd05c" />
<option name="EFFECT_TYPE" value="2" />
</value>
</option>
<option name="INJECTED_LANGUAGE_FRAGMENT">
<value>
<option name="FOREGROUND" value="ffffff" />
</value>
</option>
<option name="JADE_ATTRIBUTE_NAME">
<value>
<option name="FOREGROUND" value="f4ffd7" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="JADE_COLON">
<value>
<option name="FOREGROUND" value="5ff0c" />
</value>
</option>
<option name="JADE_COMMENT">
<value>
<option name="FOREGROUND" value="c6c6c6" />
<option name="FONT_TYPE" value="2" />
</value>
</option>
<option name="JADE_DOCTYPE">
<value>
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="JADE_FILE_PATH">
<value>
<option name="FOREGROUND" value="64ffe7" />
</value>
</option>
<option name="JADE_JS_BLOCK">
<value>
<option name="FOREGROUND" value="c6b0ff" />
</value>
</option>
<option name="JADE_NUMBER">
<value>
<option name="FOREGROUND" value="ff4f93" />
</value>
</option>
<option name="JADE_PARENTS">
<value>
<option name="FOREGROUND" value="ffffff" />
</value>
</option>
<option name="JADE_STATEMENTS">
<value>
<option name="FOREGROUND" value="ff7522" />
</value>
</option>
<option name="JADE_TAG_CLASS">
<value>
<option name="FOREGROUND" value="ca1cf2" />
<option name="FONT_TYPE" value="2" />
</value>
</option>
<option name="JADE_TAG_ID">
<value>
<option name="FOREGROUND" value="56b0ff" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="JADE_TAG_NAME">
<value>
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="JADE_TEXT">
<value>
<option name="FOREGROUND" value="45ff00" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="JADE_UNBUF_COMMENT">
<value>
<option name="FOREGROUND" value="c6c6c6" />
<option name="FONT_TYPE" value="2" />
</value>
</option>
<option name="JS.BADCHARACTER">
<value>
<option name="EFFECT_COLOR" value="bfb29a" />
<option name="EFFECT_TYPE" value="5" />
</value>
</option>
<option name="JS.BRACES">
<value>
<option name="FOREGROUND" value="68fcff" />
</value>
</option>
<option name="JS.BRACKETS">
<value>
<option name="FOREGROUND" value="68fcff" />
</value>
</option>
<option name="JS.COMMA">
<value>
<option name="FOREGROUND" value="ffffff" />
</value>
</option>
<option name="JS.DOC_COMMENT">
<value>
<option name="FOREGROUND" value="c0c0c0" />
<option name="FONT_TYPE" value="2" />
</value>
</option>
<option name="JS.DOC_MARKUP">
<value>
<option name="FOREGROUND" value="ffd05c" />
</value>
</option>
<option name="JS.DOT">
<value>
<option name="FOREGROUND" value="68fcff" />
</value>
</option>
<option name="JS.GLOBAL_FUNCTION">
<value>
<option name="FOREGROUND" value="edec37" />
<option name="FONT_TYPE" value="2" />
</value>
</option>
<option name="JS.GLOBAL_VARIABLE">
<value>
<option name="FOREGROUND" value="edec37" />
<option name="BACKGROUND" value="ba0002" />
<option name="FONT_TYPE" value="3" />
</value>
</option>
<option name="JS.INSTANCE_MEMBER_FUNCTION">
<value>
<option name="FOREGROUND" value="45ff00" />
</value>
</option>
<option name="JS.INSTANCE_MEMBER_VARIABLE">
<value>
<option name="FOREGROUND" value="ff00" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="JS.INVALID_STRING_ESCAPE">
<value>
<option name="FOREGROUND" value="bf4f29" />
</value>
</option>
<option name="JS.KEYWORD">
<value>
<option name="FOREGROUND" value="edec37" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="JS.LOCAL_VARIABLE">
<value>
<option name="FOREGROUND" value="ff00" />
</value>
</option>
<option name="JS.NUMBER">
<value>
<option name="FOREGROUND" value="ff00ff" />
</value>
</option>
<option name="JS.OPERATION_SIGN">
<value>
<option name="FOREGROUND" value="edec37" />
</value>
</option>
<option name="JS.PARAMETER">
<value>
<option name="FOREGROUND" value="ff00" />
<option name="EFFECT_COLOR" value="ff00" />
<option name="EFFECT_TYPE" value="1" />
</value>
</option>
<option name="JS.PARENTHS">
<value>
<option name="FOREGROUND" value="68fcff" />
</value>
</option>
<option name="JS.REGEXP">
<value>
<option name="FOREGROUND" value="c0c0c0" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="JS.SEMICOLON">
<value>
<option name="FOREGROUND" value="edec37" />
</value>
</option>
<option name="JS.STATIC_MEMBER_FUNCTION">
<value>
<option name="FOREGROUND" value="ff2b3c" />
<option name="FONT_TYPE" value="2" />
</value>
</option>
<option name="JS.STRING">
<value>
<option name="FOREGROUND" value="ffffff" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="JS.VALID_STRING_ESCAPE">
<value>
<option name="FOREGROUND" value="b707c9" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="LOG_EXPIRED_ENTRY">
<value>
<option name="FOREGROUND" value="bfb29a" />
</value>
</option>
<option name="LOG_WARNING_OUTPUT">
<value />
</option>
<option name="MATCHED_BRACE_ATTRIBUTES">
<value>
<option name="FOREGROUND" value="fff608" />
<option name="BACKGROUND" value="4e40ff" />
<option name="EFFECT_COLOR" value="fffb00" />
<option name="EFFECT_TYPE" value="2" />
</value>
</option>
<option name="SEARCH_RESULT_ATTRIBUTES">
<value>
<option name="EFFECT_COLOR" value="ccccff" />
<option name="ERROR_STRIPE_COLOR" value="ccccff" />
</value>
</option>
<option name="TEXT">
<value>
<option name="FOREGROUND" value="edec37" />
<option name="BACKGROUND" value="80" />
</value>
</option>
<option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
<value>
<option name="EFFECT_COLOR" value="ff00" />
<option name="ERROR_STRIPE_COLOR" value="ff00" />
</value>
</option>
<option name="TYPO">
<value>
<option name="EFFECT_COLOR" value="ffffff" />
<option name="EFFECT_TYPE" value="5" />
</value>
</option>
<option name="UNMATCHED_BRACE_ATTRIBUTES">
<value>
<option name="FOREGROUND" value="ffee6a" />
<option name="BACKGROUND" value="ff2b3c" />
</value>
</option>
<option name="WARNING_ATTRIBUTES">
<value>
<option name="EFFECT_COLOR" value="ff7a29" />
<option name="ERROR_STRIPE_COLOR" value="ebc700" />
</value>
</option>
<option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
<value>
<option name="BACKGROUND" value="171eff" />
<option name="ERROR_STRIPE_COLOR" value="ffcdff" />
</value>
</option>
<option name="WRITE_SEARCH_RESULT_ATTRIBUTES">
<value>
<option name="EFFECT_COLOR" value="ffcdff" />
<option name="ERROR_STRIPE_COLOR" value="ffcdff" />
</value>
</option>
<option name="XML_ATTRIBUTE_VALUE">
<value>
<option name="FOREGROUND" value="df00" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="XML_PROLOGUE" baseAttributes="TEXT" />
<option name="XML_TAG">
<value />
</option>
<option name="XML_TAG_NAME">
<value>
<option name="FOREGROUND" value="c9dad6" />
<option name="FONT_TYPE" value="1" />
</value>
</option>
<option name="YAML_SCALAR_KEY">
<value>
<option name="FOREGROUND" value="fb7dff" />
</value>
</option>
</attributes>
</scheme>

View File

@ -481,7 +481,6 @@
<option name="ERROR_STRIPE_COLOR" value="ccccff" />
</value>
</option>
<option name="STATIC_FINAL_FIELD_ATTRIBUTES" baseAttributes="STATIC_FIELD_ATTRIBUTES" />
<option name="TEXT">
<value>
<option name="FOREGROUND" value="edec37" />

1561
colors/Monokai copy.icls Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

1697
colors/_@user_Twilight.icls Normal file

File diff suppressed because it is too large Load Diff

View File

@ -35,7 +35,6 @@
<option name="JS.LOCAL_VARIABLE" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
<option name="JS.PARAMETER" baseAttributes="DEFAULT_PARAMETER" />
<option name="JS.REGEXP" baseAttributes="DEFAULT_STRING" />
<option name="STATIC_FINAL_FIELD_ATTRIBUTES" baseAttributes="STATIC_FIELD_ATTRIBUTES" />
<option name="XML_PROLOGUE" baseAttributes="TEXT" />
</attributes>
</scheme>

View File

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
<component name="com.intellij.ide.ui.customization.CustomActionsSchema">
<group value="EditBookmarksGroup" is_group="true" action_type="1" position="3">
@ -11,6 +10,10 @@
<path value="Navigation Bar" />
<option name="myInitialPosition" value="-1" />
</group>
<group value="External Tools" is_group="true" action_type="1" position="23">
<path value="root" />
<path value="Main Toolbar" />
<option name="myInitialPosition" value="-1" />
</group>
</component>
</application>
</application>

View File

@ -1,43 +1,12 @@
<application>
<component name="DiffSettings">
<option name="PLACES_MAP">
<entry key="ChangesView">
<PlaceSettings />
</entry>
<entry key="CommitDialog">
<PlaceSettings />
</entry>
<entry key="Default">
<PlaceSettings />
</entry>
<entry key="TestsFiledAssertions">
<PlaceSettings />
</entry>
</option>
</component>
<component name="DiffManager" COMPARISON_POLICY="Ignore spaces" />
<component name="TextDiffSettings">
<option name="PLACES_MAP">
<entry key="ChangesView">
<PlaceSettings>
<option name="EXPAND_BY_DEFAULT" value="false" />
</PlaceSettings>
</entry>
<entry key="CommitDialog">
<PlaceSettings>
<option name="EXPAND_BY_DEFAULT" value="false" />
</PlaceSettings>
</entry>
<entry key="Default">
<PlaceSettings>
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
</PlaceSettings>
</entry>
<entry key="Merge">
<PlaceSettings />
</entry>
<entry key="TestsFiledAssertions">
<PlaceSettings />
</entry>
</option>
</component>
</application>

View File

@ -1,48 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
<component name="MultiLanguageDuplocatorSettings" language="JavaScript">
object
<option name="LOWER_BOUND" value="4" />
<option name="DISCARD_COST" value="0" />
<option name="DISTINGUISH_ATTRIBUTE_VALUES" value="true" />
object
<option name="DISTINGUISH_VARIABLES" value="false" />
<option name="DISTINGUISH_FUNCTIONS" value="false" />
<option name="DISTINGUISH_LITERALS" value="false" />
<option name="LOWER_BOUND" value="10" />
<option name="DISCARD_COST" value="0" />
object
<option name="DISTINGUISH_VARIABLES" value="false" />
<option name="DISTINGUISH_FUNCTIONS" value="true" />
<option name="DISTINGUISH_LITERALS" value="true" />
<option name="LOWER_BOUND" value="10" />
<option name="DISCARD_COST" value="0" />
object
<option name="LOWER_BOUND" value="4" />
<option name="DISCARD_COST" value="0" />
<option name="DISTINGUISH_ATTRIBUTE_VALUES" value="true" />
object
<option name="DISTINGUISH_VARIABLES" value="false" />
<option name="DISTINGUISH_FUNCTIONS" value="true" />
<option name="DISTINGUISH_LITERALS" value="true" />
<option name="LOWER_BOUND" value="10" />
<option name="DISCARD_COST" value="0" />
object
<option name="LOWER_BOUND" value="4" />
<option name="DISCARD_COST" value="0" />
<option name="DISTINGUISH_ATTRIBUTE_VALUES" value="true" />
object
<option name="DISTINGUISH_VARIABLES" value="false" />
<option name="DISTINGUISH_FUNCTIONS" value="true" />
<option name="DISTINGUISH_LITERALS" value="true" />
<option name="LOWER_BOUND" value="10" />
<option name="DISCARD_COST" value="0" />
object
<option name="DISTINGUISH_VARIABLES" value="false" />
<option name="DISTINGUISH_FUNCTIONS" value="true" />
<option name="DISTINGUISH_LITERALS" value="true" />
<option name="LOWER_BOUND" value="10" />
<option name="DISCARD_COST" value="0" />
<component name="DuplocatorSettings">
<option name="SELECTED_PROFILES">
<set>
<option value="ECMAScript 6" />
<option value="JavaScript" />
</set>
</option>
<option name="LAST_SELECTED_LANGUAGE" value="ECMAScript 6" />
</component>
</application>
<component name="MultiLanguageDuplocatorSettings">
<object language="ECMAScript 6">
<option name="DISTINGUISH_FUNCTIONS" value="false" />
</object>
</component>
</application>

View File

@ -0,0 +1,6 @@
<application>
<component name="ConfigurableState">
<option name="host" value="https://gitlab.silvrtree.co.uk" />
<option name="token" value="uVw1sf5iT7Q8bhzsfy7y" />
</component>
</application>

View File

@ -0,0 +1,6 @@
<application>
<component name="SettingsState">
<option name="host" value="https://gitlab.silvrtree.co.uk" />
<option name="token" value="uVw1sf5iT7Q8bhzsfy7y" />
</component>
</application>

View File

@ -3,7 +3,6 @@
<option name="browserPath" value="/Applications/Chromium.app" />
<option name="confirmExit" value="false" />
<option name="showTipsOnStartup" value="false" />
<option name="useDefaultBrowser" value="false" />
</component>
<component name="Registry">
<entry key="ide.firstStartup" value="false" />

View File

@ -1,5 +1,5 @@
<application>
<component name="IgnoreSettings" missingGitignore="true" ignoredFileStatus="true" outerIgnoreRules="true" outerIgnoreWrapperHeight="100" version="1.5" starredTemplates="" settingsFixed="true">
<component name="IgnoreSettings" missingGitignore="true" ignoredFileStatus="true" outerIgnoreRules="true" outerIgnoreWrapperHeight="100" version="2.2.1" starredTemplates="" unignoreActions="true" hideIgnoredFiles="false" informTrackedIgnored="true" notifyIgnoredEditing="true">
<languages>
<language id="Bazaar" NEW_FILE="true" ENABLE="true" />
<language id="CloudFoundry" NEW_FILE="true" ENABLE="false" />
@ -12,6 +12,7 @@
<language id="Fossil" NEW_FILE="true" ENABLE="true" />
<language id="Git" NEW_FILE="true" ENABLE="true" />
<language id="Git exclude" NEW_FILE="true" ENABLE="true" />
<language id="Kubernetes Helm" NEW_FILE="true" ENABLE="false" />
<language id="Jetpack" NEW_FILE="true" ENABLE="false" />
<language id="JSHint" NEW_FILE="true" ENABLE="false" />
<language id="Mercurial" NEW_FILE="true" ENABLE="true" />
@ -19,7 +20,12 @@
<language id="Nodemon" NEW_FILE="true" ENABLE="false" />
<language id="Npm" NEW_FILE="true" ENABLE="false" />
<language id="Perforce" NEW_FILE="true" ENABLE="true" />
<language id="Prettier" NEW_FILE="true" ENABLE="true" />
<language id="StyleLint" NEW_FILE="true" ENABLE="false" />
<language id="Stylint" NEW_FILE="true" ENABLE="false" />
<language id="Swagger Codegen" NEW_FILE="true" ENABLE="false" />
<language id="Team Foundation" NEW_FILE="true" ENABLE="true" />
<language id="Up" NEW_FILE="true" ENABLE="true" />
</languages>
<userTemplates>
<template name="Example user template">### Example user template

View File

@ -1,3 +1,10 @@
<application>
<component name="MarkdownSettings" parsingTimeout="10000" smarts="false" quotes="false" abbreviations="false" hardWraps="false" autoLinks="false" wikiLinks="false" tables="false" definitions="false" fencedCodeBlocks="false" suppressHTMLBlocks="false" suppressInlineHTML="false" strikethrough="false" />
<application>
<component name="MarkdownApplicationSettings">
<MarkdownPreviewSettings>
<HtmlPanelProviderInfo>
<ProviderInfo name="JavaFX WebView" className="org.intellij.plugins.markdown.ui.preview.javafx.JavaFxHtmlPanelProvider" />
</HtmlPanelProviderInfo>
</MarkdownPreviewSettings>
</component>
<component name="MarkdownSettings" parsingTimeout="10000" smarts="false" quotes="false" abbreviations="false" hardWraps="false" autoLinks="false" wikiLinks="false" tables="false" definitions="false" fencedCodeBlocks="false" suppressHTMLBlocks="false" suppressInlineHTML="false" strikethrough="false" />
</application>

5
material_theme.xml Normal file
View File

@ -0,0 +1,5 @@
<application>
<component name="MaterialThemeConfig">
<option name="selectedTheme" value="NONE" />
</component>
</application>

View File

@ -1,5 +1,5 @@
<application>
<component name="PhoneGapSettings">
<option name="executablePath" value="$USER_HOME$/.nvm/versions/node/v5.7.0/bin/cordova" />
<option name="executablePath" value="$USER_HOME$/.nvm/versions/node/v6.9.0/bin/cordova" />
</component>
</application>

View File

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
<component name="PrintSettings">
<option name="printScope" value="2" />
<option name="FONT_NAME" value="Serif" />
<option name="printScope" value="1" />
<option name="SYNTAX_PRINTING" value="false" />
<option name="PRINT_AS_GRAPHICS" value="false" />
<option name="FONT_SIZE" value="8" />
<option name="PRINT_LINE_NUMBERS" value="false" />
<option name="DRAW_BORDER" value="false" />
<option name="FOOTER_HEADER_FONT_NAME" value="Serif" />
</component>
</application>
</application>

21
tfs.xml Normal file
View File

@ -0,0 +1,21 @@
<application>
<component name="org.jetbrains.tfsIntegration.core.configuration.TFSConfigurationManager">
<option name="config">
<map>
<server uri="http://i-t-v-tf01:8080/tfs/">
<value>
<configuration>
<credentials>
<credentials>
<domain>AMORGROUP</domain>
<password>dffedfcfdfd2dfcbdfd9df84dffcdfcfdfc4dfdfdfd9df84df99df9ddf98</password>
<username>martin.donnelly</username>
</credentials>
</credentials>
</configuration>
</value>
</server>
</map>
</option>
</component>
</application>

58
tools/External Tools.xml Normal file
View File

@ -0,0 +1,58 @@
<toolSet name="External Tools">
<tool name="Aurelia" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\au.cmd" />
<option name="PARAMETERS" value="run --watch --dev" />
<option name="WORKING_DIRECTORY" value="C:/dev/web-platform" />
</exec>
</tool>
<tool name="Aurelia HARD" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\au.cmd" />
<option name="PARAMETERS" value="run" />
<option name="WORKING_DIRECTORY" value="C:/dev/web-platform" />
</exec>
</tool>
<tool name="AU BUILD" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\au.cmd" />
<option name="PARAMETERS" value="build" />
<option name="WORKING_DIRECTORY" value="C:/dev/web-platform" />
</exec>
</tool>
<tool name="AU BL" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\au.cmd" />
<option name="PARAMETERS" value="test --bl" />
<option name="WORKING_DIRECTORY" value="C:/dev/web-platform" />
</exec>
</tool>
<tool name="Run tests" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
<exec>
<option name="COMMAND" value="C:\Users\mdonnel\Desktop\runTests.cmd" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="C:/Users/mdonnel/Desktop" />
</exec>
</tool>
<tool name="Aurelia 2" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\au.cmd" />
<option name="PARAMETERS" value="run --watch --dev --debug=web-platform" />
<option name="WORKING_DIRECTORY" value="C:/dev/web-platform" />
</exec>
</tool>
<tool name="Aurelia Test Server" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\au.cmd" />
<option name="PARAMETERS" value="run --watch --dev --use-test-server --test-server-fund-id 21414 --test-site etf-us" />
<option name="WORKING_DIRECTORY" value="C:/dev/web-platform" />
</exec>
</tool>
<tool name="AU UI" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\au.cmd" />
<option name="PARAMETERS" value="test --ui" />
<option name="WORKING_DIRECTORY" value="C:/dev/web-platform" />
</exec>
</tool>
</toolSet>

100
tools/Tests.xml Normal file
View File

@ -0,0 +1,100 @@
<toolSet name="Tests">
<tool name="Jest fixed-income-sector-breakdown" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-fixed-income-sector-breakdown\lib\en-us-retail\fixed-income-sector-breakdown.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest commodities-sector-breakdown" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-commodities-sector-breakdown\lib\en-us-retail\commodities-sector-breakdown.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest currency-distribution" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-currency-distribution\lib\en-us-retail\currency-distribution.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest geographic-breakdown" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-geographic-breakdown\lib\en-us-retail\geographic-breakdown.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest sector-exposure" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-sector-exposure\lib\en-us-retail\sector-exposure.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest geographic-exposure" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-geographic-exposure\lib\en-us-retail\geographic-exposure.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest quality-breakdown" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-quality-breakdown\lib\en-us-retail\quality-breakdown.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest manager-roster" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-manager-roster\lib\en-us-retail\manager-roster.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest top-exposures" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-top-exposures\lib\en-us-retail\top-exposures.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest asset-class-exposure" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-asset-class-exposure\lib\en-us-retail\asset-class-exposure.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest strategy-breakdown" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-strategy-breakdown\lib\en-us-retail\strategy-breakdown.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest portfolio-statistics-and-positions" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-portfolio-statistics-and-positions\lib\en-us-retail\portfolio-statistics-and-positions.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest credit-quality-exposure" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\portfolio\ft-credit-quality-exposure\lib\en-us-retail\credit-quality-exposure.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
<tool name="Jest fund-static-bar" showInMainMenu="true" showInEditor="true" showInProject="true" showInSearchPopup="true" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="false">
<exec>
<option name="COMMAND" value="C:\Program Files\nodejs\jest.cmd" />
<option name="PARAMETERS" value="C:\dev\iws-international\web-platform\src\components\products\overview\ft-fund-static-bar\lib\en-us-retail\fund-static-bar.spec.js --watch --coverage" />
<option name="WORKING_DIRECTORY" value="C:/dev/iws-international/web-platform" />
</exec>
</tool>
</toolSet>

12
vcs.xml
View File

@ -26,6 +26,18 @@
<option name="url" value="http://martind2000@gitlab.silvrtree.co.uk/martind2000/SilvrAPI.git" />
<option name="userName" value="" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="http://gitlab.silvrtree.co.uk" />
<option name="userName" value="martind2000" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="http://i-t-v-tf01:8080" />
<option name="userName" value="martin.donnelly" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="https://github.com/davezuko/react-redux-starter-kit.git" />
<option name="userName" value="" />
</UrlAndUserName>
</list>
</option>
<option name="cloneParentDir" value="$USER_HOME$/newdev" />

34
vsts_settings.xml Normal file
View File

@ -0,0 +1,34 @@
<application>
<component name="VSTSSettings">
<option name="serverContexts">
<array>
<ServerContextState>
<option name="type" value="TFS" />
<option name="uri" value="http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_git/AODB" />
<option name="serverUri" value="http://i-t-v-tf01:8080/tfs/" />
<option name="userId" value="3d4df1bc-d2b5-4ba6-b7d4-17b2a8476f40" />
<option name="teamProjectCollectionReference" value="{&quot;id&quot;:&quot;196a1d1f-c2a0-44c6-b20a-c65809b48d5e&quot;,&quot;name&quot;:&quot;Transport&quot;,&quot;url&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_git/AODB/_apis/projectCollections/196a1d1f-c2a0-44c6-b20a-c65809b48d5e&quot;}" />
<option name="teamProjectReference" value="{&quot;abbreviation&quot;:null,&quot;description&quot;:null,&quot;id&quot;:&quot;949c9ca4-c2e0-4286-8bde-0eae363e76f5&quot;,&quot;name&quot;:&quot;Chroma Refresh&quot;,&quot;revision&quot;:0,&quot;state&quot;:&quot;WELL_FORMED&quot;,&quot;url&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/_apis/projects/949c9ca4-c2e0-4286-8bde-0eae363e76f5&quot;}" />
<option name="gitRepository" value="{&quot;defaultBranch&quot;:&quot;refs/heads/master&quot;,&quot;id&quot;:&quot;255be728-f020-450b-8c5e-0639ec1d4a32&quot;,&quot;name&quot;:&quot;AODB&quot;,&quot;remoteUrl&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma Refresh/_git/AODB&quot;,&quot;url&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32&quot;,&quot;_links&quot;:{&quot;web&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma Refresh/_git/AODB&quot;},&quot;refs&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32/refs/&quot;},&quot;self&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32&quot;},&quot;project&quot;:{&quot;href&quot;:&quot;vstfs:///Classification/TeamProject/949c9ca4-c2e0-4286-8bde-0eae363e76f5&quot;},&quot;commits&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32/commits&quot;},&quot;pullRequests&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32/pullRequests&quot;},&quot;items&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32/items/&quot;},&quot;pushes&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32/pushes&quot;}},&quot;project&quot;:{&quot;abbreviation&quot;:null,&quot;description&quot;:null,&quot;id&quot;:&quot;949c9ca4-c2e0-4286-8bde-0eae363e76f5&quot;,&quot;name&quot;:&quot;Chroma Refresh&quot;,&quot;revision&quot;:0,&quot;state&quot;:&quot;WELL_FORMED&quot;,&quot;url&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/_apis/projects/949c9ca4-c2e0-4286-8bde-0eae363e76f5&quot;}}" />
</ServerContextState>
<ServerContextState>
<option name="type" value="TFS" />
<option name="uri" value="http://_TFS_LAST_USED_URL_" />
<option name="serverUri" value="http://_TFS_LAST_USED_URL_" />
<option name="userId" value="3d4df1bc-d2b5-4ba6-b7d4-17b2a8476f40" />
<option name="teamProjectCollectionReference" value="{&quot;id&quot;:&quot;196a1d1f-c2a0-44c6-b20a-c65809b48d5e&quot;,&quot;name&quot;:&quot;Transport&quot;,&quot;url&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_git/AODB/_apis/projectCollections/196a1d1f-c2a0-44c6-b20a-c65809b48d5e&quot;}" />
<option name="teamProjectReference" value="{&quot;abbreviation&quot;:null,&quot;description&quot;:null,&quot;id&quot;:&quot;949c9ca4-c2e0-4286-8bde-0eae363e76f5&quot;,&quot;name&quot;:&quot;Chroma Refresh&quot;,&quot;revision&quot;:0,&quot;state&quot;:&quot;WELL_FORMED&quot;,&quot;url&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/_apis/projects/949c9ca4-c2e0-4286-8bde-0eae363e76f5&quot;}" />
<option name="gitRepository" value="{&quot;defaultBranch&quot;:&quot;refs/heads/master&quot;,&quot;id&quot;:&quot;255be728-f020-450b-8c5e-0639ec1d4a32&quot;,&quot;name&quot;:&quot;AODB&quot;,&quot;remoteUrl&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma Refresh/_git/AODB&quot;,&quot;url&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32&quot;,&quot;_links&quot;:{&quot;web&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma Refresh/_git/AODB&quot;},&quot;refs&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32/refs/&quot;},&quot;self&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32&quot;},&quot;project&quot;:{&quot;href&quot;:&quot;vstfs:///Classification/TeamProject/949c9ca4-c2e0-4286-8bde-0eae363e76f5&quot;},&quot;commits&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32/commits&quot;},&quot;pullRequests&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32/pullRequests&quot;},&quot;items&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32/items/&quot;},&quot;pushes&quot;:{&quot;href&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/Chroma%20Refresh/_apis/git/repositories/255be728-f020-450b-8c5e-0639ec1d4a32/pushes&quot;}},&quot;project&quot;:{&quot;abbreviation&quot;:null,&quot;description&quot;:null,&quot;id&quot;:&quot;949c9ca4-c2e0-4286-8bde-0eae363e76f5&quot;,&quot;name&quot;:&quot;Chroma Refresh&quot;,&quot;revision&quot;:0,&quot;state&quot;:&quot;WELL_FORMED&quot;,&quot;url&quot;:&quot;http://i-t-v-tf01:8080/tfs/Transport/_apis/projects/949c9ca4-c2e0-4286-8bde-0eae363e76f5&quot;}}" />
</ServerContextState>
</array>
</option>
<option name="properties">
<array>
<PropertyState>
<option name="name" value="lastContextKey" />
<option name="value" value="//_tfs_last_used_url_" />
</PropertyState>
</array>
</option>
</component>
</application>

View File

@ -2,9 +2,9 @@
<component name="WebBrowsersConfiguration">
<browser id="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" name="Chrome" family="CHROME" />
<browser id="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" name="Firefox" family="FIREFOX" />
<browser id="e5120d43-2c3f-47ef-9f26-65e539e05186" name="Safari" family="SAFARI" />
<browser id="53e2f627-b1a7-4dfa-bfa7-5b83cc034776" name="Opera" family="OPERA" />
<browser id="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" name="Internet Explorer" family="EXPLORER" />
<browser id="e5120d43-2c3f-47ef-9f26-65e539e05186" name="Safari" family="SAFARI" active="false" />
<browser id="53e2f627-b1a7-4dfa-bfa7-5b83cc034776" name="Opera" family="OPERA" active="false" />
<browser id="16bf23d4-93e0-4ffc-bfd6-cb13575177b0" name="Internet Explorer" family="EXPLORER" active="false" />
<browser id="b1b2ec2c-20bd-4ee2-89c4-616db004bcd4" name="Yandex" family="CHROME" path="Yandex" active="false" />
</component>
</application>

View File

@ -2,7 +2,7 @@
<component name="WebServers">
<option name="servers">
<webServer id="fd187101-ee66-4090-8a3e-ce3ccfdf9d7e" name="Dropbox" url="http://dl.dropbox.com/u/233909/html5">
<fileTransfer mountedRoot="$USER_HOME$/Dropbox/Public/html5" accessType="MOUNT" />
<fileTransfer port="0" mountedRoot="C:\Users\mdonnel\Dropbox\Public\html5" accessType="MOUNT" />
</webServer>
<webServer id="ce6ed149-73c5-4787-8bc6-da9ebc4c644e" name="Artizan" url="http://www.artizanconsulting.co.uk">
<fileTransfer host="ftp.imperamedia.com" port="21">
@ -14,8 +14,8 @@
<option name="port" value="21" />
</fileTransfer>
</webServer>
<webServer id="2104bcbb-3025-47d7-be32-dcc9405d6bef" name="Export">
<fileTransfer mountedRoot="$USER_HOME$/dev/clean/animal" accessType="MOUNT" />
<webServer id="2104bcbb-3025-47d7-be32-dcc9405d6bef" name="Export" url="http://localhost">
<fileTransfer port="0" mountedRoot="C:\Users\mdonnel\dev\clean\animal" accessType="MOUNT" />
</webServer>
<webServer id="c44d4b38-29c3-4359-aa43-dd43cd88b103" name="Impera" url="http://ftp.imperamedia.com">
<fileTransfer host="ftp.imperamedia.com" port="21">