WS-2019.1.3 <martin@Cyan-Corvus-414 Merge branch 'master'

This commit is contained in:
Martin Donnelly 2019-06-03 15:12:06 +01:00
commit c7da80f4ee
12 changed files with 0 additions and 257 deletions

View File

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

View File

@ -1,40 +0,0 @@
<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" />
<option name="frameworkVersion" value="1.4." />
</properties>
<CLASSES>
<root url="file://$APPLICATION_CONFIG_DIR$/javascript/extLibs/__code.jquery.com_jquery-2.1.4.js" />
</CLASSES>
<DOCUMENTATION>
<root url="http://api.jquery.com" />
</DOCUMENTATION>
<SOURCES />
</library>
<library name="mui" type="javaScript">
<CLASSES>
<root url="file://$APPLICATION_CONFIG_DIR$/javascript/extLibs/__cdn.muicss.com_mui-0.4.6_js_mui.js" />
</CLASSES>
<SOURCES />
</library>
<library name="zepto" type="javaScript">
<CLASSES>
<root url="file://$APPLICATION_CONFIG_DIR$/javascript/extLibs/__cdnjs.cloudflare.com_ajax_libs_zepto_1.1.4_zepto.js" />
</CLASSES>
<SOURCES />
</library>
</component>
</application>

View File

@ -1,6 +0,0 @@
<application>
<component name="Git.Application.Settings">
<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

@ -1,5 +0,0 @@
<application>
<component name="KeymapManager">
<active_keymap name="$default" />
</component>
</application>

View File

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

View File

@ -1,19 +0,0 @@
<application>
<component name="com.intellij.ide.ui.customization.CustomActionsSchema">
<group value="EditBookmarksGroup" is_group="true" action_type="1" position="3">
<path value="root" />
<path value="Navigation Bar" />
<option name="myInitialPosition" value="-1" />
</group>
<group seperator="true" action_type="1" position="4">
<path value="root" />
<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>

View File

@ -1,9 +0,0 @@
<application>
<component name="ExportableFileTemplateSettings">
<internal_templates>
<template name="HTML File.html" reformat="true" live-template-enabled="true" enabled="true" />
<template name="HTML4 File.html" reformat="true" live-template-enabled="true" enabled="true" />
<template name="XHTML File.xhtml" reformat="true" live-template-enabled="true" enabled="true" />
</internal_templates>
</component>
</application>

View File

@ -1,19 +0,0 @@
<application>
<component name="FileTypeManager" version="17">
<extensionMap>
<mapping ext="orig" type="Dockerfile" />
<mapping pattern="*.aspx?id=3504" type="PLAIN_TEXT" />
<mapping pattern="mdyt" type="PLAIN_TEXT" />
<mapping pattern="Filtering Rules" type="PLAIN_TEXT" />
<mapping pattern="Ruleset Data" type="PLAIN_TEXT" />
<mapping pattern="searchIntermediariesAdv" type="PLAIN_TEXT" />
<mapping pattern="Jenkinsfile" type="PLAIN_TEXT" />
<mapping pattern=".gitkeep" type="PLAIN_TEXT" />
<mapping ext="csv" type="PLAIN_TEXT" />
<mapping ext="opf" type="PLAIN_TEXT" />
<mapping ext="properties" type="PLAIN_TEXT" />
<mapping ext="old" type="PLAIN_TEXT" />
<mapping ext="hml" type="XHTML" />
</extensionMap>
</component>
</application>

View File

@ -1,10 +0,0 @@
<application>
<component name="RemoteServers">
<remote-server name="Docker" type="docker">
<configuration>
<option name="apiUrl" value="unix:///var/run/docker.sock" />
<option name="certificatesPath" />
</configuration>
</remote-server>
</component>
</application>

52
vcs.xml
View File

@ -1,52 +0,0 @@
<application>
<component name="GitRememberedInputs">
<option name="visitedUrls">
<list>
<UrlAndUserName>
<option name="url" value="git@ltsgit.open.ac.uk:html5libcore.git" />
<option name="userName" value="" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="http://z178977@repo.devinfotech.co.uk/scm/pa/crime-reporting.git" />
<option name="userName" value="" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="https://z178977@repo.devinfotech.co.uk/scm/pa/crime-reporting.git" />
<option name="userName" value="" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="https://martind2000@bitbucket.org/martind2000/rinser.git" />
<option name="userName" value="" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="http://gitlab.silvrtree.co.uk/martind2000/nci.git" />
<option name="userName" value="" />
</UrlAndUserName>
<UrlAndUserName>
<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>
<UrlAndUserName>
<option name="url" value="https://gitlab.silvrtree.co.uk/martind2000/traintimesPWA.git" />
<option name="userName" value="" />
</UrlAndUserName>
</list>
</option>
<option name="cloneParentDir" value="$USER_HOME$/dev" />
</component>
<component name="Vcs.Log.App.Settings">
<option name="SHOW_CHANGES_FROM_PARENTS" value="true" />
</component>
</application>

View File

@ -1,42 +0,0 @@
<application>
<component name="ApplicationTasksOptions">
<TaskOptions isEnabled="false">
<option name="arguments" value="--compilation_level SIMPLE_OPTIMIZATIONS --js $FileName$" />
<option name="checkSyntaxErrors" value="true" />
<option name="description" value="Compiles .js files" />
<option name="exitCodeBehavior" value="ERROR" />
<option name="fileExtension" value="js" />
<option name="immediateSync" value="true" />
<option name="name" value="Closure Compiler" />
<option name="output" value="$FileNameWithoutExtension$.min.js" />
<option name="outputFilters">
<array />
</option>
<option name="outputFromStdout" value="true" />
<option name="program" value="$USER_HOME$/dev/source/google-closure-compiler-bin/compiler.jar" />
<option name="scopeName" value="Project Files" />
<option name="trackOnlyRoot" value="true" />
<option name="workingDir" value="$FileDir$" />
<envs />
</TaskOptions>
<TaskOptions isEnabled="true">
<option name="arguments" value="path/to/project/$FileName$" />
<option name="checkSyntaxErrors" value="true" />
<option name="description" value="Compiles .scss files into .css files using compass" />
<option name="exitCodeBehavior" value="ERROR" />
<option name="fileExtension" value="scss" />
<option name="immediateSync" value="true" />
<option name="name" value="Compass SCSS" />
<option name="output" value="" />
<option name="outputFilters">
<array />
</option>
<option name="outputFromStdout" value="false" />
<option name="program" value="$USER_HOME$/.nvm/versions/node/v5.7.0/bin/node-sass" />
<option name="scopeName" value="Project Files" />
<option name="trackOnlyRoot" value="true" />
<option name="workingDir" value="$FileDir$" />
<envs />
</TaskOptions>
</component>
</application>

View File

@ -1,43 +0,0 @@
<application>
<component name="WebServers">
<option name="servers">
<webServer id="fd187101-ee66-4090-8a3e-ce3ccfdf9d7e" name="Dropbox" url="http://dl.dropbox.com/u/233909/html5">
<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">
<option name="port" value="21" />
</fileTransfer>
</webServer>
<webServer id="8a7b3e70-68a2-4886-b054-c3434d1f7579" name="silvrtree" url="http://silvrtree.com/wosl/animal">
<fileTransfer host="silvrtree.com" port="21" rootFolder="/wosl">
<option name="port" value="21" />
</fileTransfer>
</webServer>
<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">
<advancedOptions>
<advancedOptions dataProtectionLevel="Private" />
</advancedOptions>
<option name="port" value="21" />
</fileTransfer>
</webServer>
<webServer id="4bd23968-f300-4e8d-98c2-bd47a4c83cdd" name="ST2" url="http://silvrtree.com/">
<fileTransfer host="silvrtree.com" port="21" rootFolder="/d">
<option name="port" value="21" />
</fileTransfer>
</webServer>
<webServer id="9f601337-579d-4f84-9e89-a15c98ff0ec3" name="test" url="http://www.artizanconsulting.co.uk">
<fileTransfer host="www.artizanconsulting.co.uk" port="21">
<advancedOptions>
<advancedOptions dataProtectionLevel="Private" />
</advancedOptions>
<option name="port" value="21" />
</fileTransfer>
</webServer>
</option>
</component>
</application>