WS-11.0.3 <marti@DESKTOP-ITST4MB Merge branch 'master'
This commit is contained in:
commit
b7f91eeee3
@ -1,6 +1,6 @@
|
|||||||
<application>
|
<application>
|
||||||
<component name="Git.Application.Settings">
|
<component name="Git.Application.Settings">
|
||||||
<option name="myPathToGit" value="C:\Program Files (x86)\Git\cmd\git.exe" />
|
<option name="myPathToGit" value="C:\Program Files\Git\cmd\git.exe" />
|
||||||
<option name="SSH_EXECUTABLE" value="IDEA_SSH" />
|
<option name="SSH_EXECUTABLE" value="IDEA_SSH" />
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
@ -1,5 +0,0 @@
|
|||||||
<application>
|
|
||||||
<component name="CodeStyleSchemeSettings">
|
|
||||||
<option name="CURRENT_SCHEME_NAME" value="Default (1)" />
|
|
||||||
</component>
|
|
||||||
</application>
|
|
@ -1,8 +1,6 @@
|
|||||||
<scheme name="Cobalt copy" version="142" parent_scheme="Default">
|
<scheme name="Cobalt copy" version="142" parent_scheme="Default">
|
||||||
<option name="LINE_SPACING" value="1.0" />
|
<option name="LINE_SPACING" value="1.0" />
|
||||||
<option name="EDITOR_FONT_SIZE" value="22" />
|
<option name="EDITOR_FONT_SIZE" value="14" />
|
||||||
<option name="CONSOLE_FONT_NAME" value="PxPlus VGA SquarePx" />
|
|
||||||
<option name="CONSOLE_FONT_SIZE" value="24" />
|
|
||||||
<option name="EDITOR_FONT_NAME" value="Source Code Pro" />
|
<option name="EDITOR_FONT_NAME" value="Source Code Pro" />
|
||||||
<colors>
|
<colors>
|
||||||
<option name="CARET_COLOR" value="ffffff" />
|
<option name="CARET_COLOR" value="ffffff" />
|
||||||
@ -273,6 +271,11 @@
|
|||||||
<option name="FOREGROUND" value="6b8b8" />
|
<option name="FOREGROUND" value="6b8b8" />
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
|
<option name="CONSOLE_DARKGRAY_OUTPUT">
|
||||||
|
<value>
|
||||||
|
<option name="FOREGROUND" value="6e6e6e" />
|
||||||
|
</value>
|
||||||
|
</option>
|
||||||
<option name="CONSOLE_ERROR_OUTPUT">
|
<option name="CONSOLE_ERROR_OUTPUT">
|
||||||
<value>
|
<value>
|
||||||
<option name="FOREGROUND" value="ffb3b3" />
|
<option name="FOREGROUND" value="ffb3b3" />
|
||||||
@ -288,6 +291,11 @@
|
|||||||
<option name="FOREGROUND" value="68e868" />
|
<option name="FOREGROUND" value="68e868" />
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
|
<option name="CONSOLE_MAGENTA_BRIGHT_OUTPUT">
|
||||||
|
<value>
|
||||||
|
<option name="FOREGROUND" value="ff2eff" />
|
||||||
|
</value>
|
||||||
|
</option>
|
||||||
<option name="CONSOLE_MAGENTA_OUTPUT">
|
<option name="CONSOLE_MAGENTA_OUTPUT">
|
||||||
<value>
|
<value>
|
||||||
<option name="FOREGROUND" value="ff2eff" />
|
<option name="FOREGROUND" value="ff2eff" />
|
||||||
@ -314,9 +322,14 @@
|
|||||||
<option name="FONT_TYPE" value="2" />
|
<option name="FONT_TYPE" value="2" />
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
|
<option name="CONSOLE_YELLOW_BRIGHT_OUTPUT">
|
||||||
|
<value>
|
||||||
|
<option name="FOREGROUND" value="f8ed26" />
|
||||||
|
</value>
|
||||||
|
</option>
|
||||||
<option name="CONSOLE_YELLOW_OUTPUT">
|
<option name="CONSOLE_YELLOW_OUTPUT">
|
||||||
<value>
|
<value>
|
||||||
<option name="FOREGROUND" value="754200" />
|
<option name="FOREGROUND" value="b1ab3b" />
|
||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
<option name="CSS.COMMENT">
|
<option name="CSS.COMMENT">
|
||||||
@ -1101,6 +1114,11 @@
|
|||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
<option name="LOCAL_VARIABLE_ATTRIBUTES" baseAttributes="TEXT" />
|
<option name="LOCAL_VARIABLE_ATTRIBUTES" baseAttributes="TEXT" />
|
||||||
|
<option name="LOG_EXPIRED_ENTRY">
|
||||||
|
<value>
|
||||||
|
<option name="FOREGROUND" value="929292" />
|
||||||
|
</value>
|
||||||
|
</option>
|
||||||
<option name="MACRONAME">
|
<option name="MACRONAME">
|
||||||
<value>
|
<value>
|
||||||
<option name="FOREGROUND" value="ffdd00" />
|
<option name="FOREGROUND" value="ffdd00" />
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<application>
|
<application>
|
||||||
<component name="EditorSettings">
|
<component name="EditorSettings">
|
||||||
<option name="ARE_LINE_NUMBERS_SHOWN" value="true" />
|
<option name="ARE_LINE_NUMBERS_SHOWN" value="true" />
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
8
filetypes.xml
Normal file
8
filetypes.xml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<application>
|
||||||
|
<component name="FileTypeManager" version="16">
|
||||||
|
<extensionMap>
|
||||||
|
<mapping pattern="DockerFile" type="Dockerfile" />
|
||||||
|
<mapping ext="config" type="PLAIN_TEXT" />
|
||||||
|
</extensionMap>
|
||||||
|
</component>
|
||||||
|
</application>
|
6
find.xml
6
find.xml
@ -1,11 +1,11 @@
|
|||||||
<application>
|
<application>
|
||||||
<component name="FindSettings">
|
<component name="FindSettings">
|
||||||
<option name="caseSensitive" value="true" />
|
<option name="caseSensitive" value="true" />
|
||||||
<option name="customScope" value="Directory 'C:\Users\marti\dev\booksnew\build\darkvalley\OEBPS'" />
|
<option name="customScope" value="File 'C:\mddev\silvrapi\public\js\weight.js'" />
|
||||||
<option name="defaultScopeName" value="Directory 'C:\Users\marti\dev\booksnew\build\darkvalley\OEBPS'" />
|
<option name="defaultScopeName" value="File 'C:\mddev\silvrapi\public\js\weight.js'" />
|
||||||
<option name="localCaseSensitive" value="true" />
|
<option name="localCaseSensitive" value="true" />
|
||||||
<option name="CASE_SENSITIVE_SEARCH" value="true" />
|
<option name="CASE_SENSITIVE_SEARCH" value="true" />
|
||||||
<option name="LOCAL_CASE_SENSITIVE_SEARCH" value="true" />
|
<option name="LOCAL_CASE_SENSITIVE_SEARCH" value="true" />
|
||||||
<option name="SEARCH_SCOPE" value="Directory 'C:\Users\marti\dev\booksnew\build\darkvalley\OEBPS'" />
|
<option name="SEARCH_SCOPE" value="File 'C:\mddev\silvrapi\public\js\weight.js'" />
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
30
ignore.xml
Normal file
30
ignore.xml
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
<application>
|
||||||
|
<component name="IgnoreSettings" missingGitignore="true" ignoredFileStatus="true" outerIgnoreRules="true" settingsFixed="true">
|
||||||
|
<languages>
|
||||||
|
<language id="Bazaar" ENABLE="true" NEW_FILE="true" />
|
||||||
|
<language id="Chef" ENABLE="false" NEW_FILE="true" />
|
||||||
|
<language id="Cvs" ENABLE="true" NEW_FILE="true" />
|
||||||
|
<language id="Darcs" ENABLE="true" NEW_FILE="true" />
|
||||||
|
<language id="Docker" ENABLE="false" NEW_FILE="true" />
|
||||||
|
<language id="Floobits" ENABLE="false" NEW_FILE="true" />
|
||||||
|
<language id="Fossil" ENABLE="true" NEW_FILE="true" />
|
||||||
|
<language id="Git" ENABLE="true" NEW_FILE="true" />
|
||||||
|
<language id="JSHint" ENABLE="false" NEW_FILE="true" />
|
||||||
|
<language id="Mercurial" ENABLE="true" NEW_FILE="true" />
|
||||||
|
<language id="Monotone" ENABLE="true" NEW_FILE="true" />
|
||||||
|
<language id="Nodemon" ENABLE="false" NEW_FILE="true" />
|
||||||
|
<language id="Npm" ENABLE="false" NEW_FILE="true" />
|
||||||
|
<language id="Perforce" ENABLE="true" NEW_FILE="true" />
|
||||||
|
<language id="Team Foundation" ENABLE="true" NEW_FILE="true" />
|
||||||
|
</languages>
|
||||||
|
<userTemplates>
|
||||||
|
<template name="Example user template">### Example user template
|
||||||
|
|
||||||
|
# IntelliJ project files
|
||||||
|
.idea
|
||||||
|
*.iml
|
||||||
|
out
|
||||||
|
gen</template>
|
||||||
|
</userTemplates>
|
||||||
|
</component>
|
||||||
|
</application>
|
52
multimarkdown.shared.xml
Normal file
52
multimarkdown.shared.xml
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
<application>
|
||||||
|
<component name="ApplicationShared">
|
||||||
|
<PreviewSettings splitEditorLayout="FIRST" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showPreviewTab="yes" showModifiedHtmlTab="false" showUnmodifiedHtmlTab="false" showGitHubPageIfSynced="false" allowBrowsingInPreview="false">
|
||||||
|
<PanelProvider>
|
||||||
|
<provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
|
||||||
|
</PanelProvider>
|
||||||
|
</PreviewSettings>
|
||||||
|
<ParserSettings parsingTimeout="50">
|
||||||
|
<PegdownExtensions>
|
||||||
|
<option name="ABBREVIATIONS" value="false" />
|
||||||
|
<option name="ANCHORLINKS" value="false" />
|
||||||
|
<option name="ATXHEADERSPACE" value="false" />
|
||||||
|
<option name="AUTOLINKS" value="false" />
|
||||||
|
<option name="DEFINITIONS" value="false" />
|
||||||
|
<option name="FENCED_CODE_BLOCKS" value="false" />
|
||||||
|
<option name="FOOTNOTES" value="false" />
|
||||||
|
<option name="FORCELISTITEMPARA" value="false" />
|
||||||
|
<option name="HARDWRAPS" value="false" />
|
||||||
|
<option name="QUOTES" value="false" />
|
||||||
|
<option name="RELAXEDHRULES" value="false" />
|
||||||
|
<option name="SMARTS" value="false" />
|
||||||
|
<option name="STRIKETHROUGH" value="false" />
|
||||||
|
<option name="SUPPRESS_HTML_BLOCKS" value="false" />
|
||||||
|
<option name="SUPPRESS_INLINE_HTML" value="false" />
|
||||||
|
<option name="TABLES" value="false" />
|
||||||
|
<option name="TASKLISTITEMS" value="false" />
|
||||||
|
<option name="TOC" value="false" />
|
||||||
|
<option name="WIKILINKS" value="false" />
|
||||||
|
</PegdownExtensions>
|
||||||
|
<ParserOptions>
|
||||||
|
<option name="GITHUB_WIKI_LINKS" value="false" />
|
||||||
|
</ParserOptions>
|
||||||
|
</ParserSettings>
|
||||||
|
<HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false">
|
||||||
|
<GeneratorProvider>
|
||||||
|
<provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
|
||||||
|
</GeneratorProvider>
|
||||||
|
<headerTop />
|
||||||
|
<headerBottom />
|
||||||
|
<bodyTop />
|
||||||
|
<bodyBottom />
|
||||||
|
</HtmlSettings>
|
||||||
|
<CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
|
||||||
|
<StylesheetProvider>
|
||||||
|
<provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
|
||||||
|
</StylesheetProvider>
|
||||||
|
<ScriptProviders />
|
||||||
|
<cssText />
|
||||||
|
</CssSettings>
|
||||||
|
</component>
|
||||||
|
<component name="MultiMarkdownSettings" abbreviations="false" anchorLinks="true" autoLinks="true" definitions="true" enableTrimSpaces="false" fencedCodeBlocks="true" forceListPara="false" hardWraps="true" headerSpace="false" quotes="false" relaxedHRules="true" showHtmlText="true" showHtmlTextAsModified="false" smarts="false" strikethrough="true" suppressHTMLBlocks="false" suppressInlineHTML="false" tables="true" taskLists="true" wikiLinks="true" todoComments="false" useCustomCss="false" enableFirebug="false" useHighlightJs="true" includesHljsCss="false" includesLayoutCss="false" includesColorsCss="true" footnotes="false" htmlTheme="2" maxImgWidth="900" parsingTimeout="10000" pageZoom="1.0" updateDelay="1000" tabbedPaneIndex="0" customCss="" customFxCss="" useOldPreview="false" githubWikiLinks="true" />
|
||||||
|
</application>
|
@ -16,7 +16,6 @@
|
|||||||
</entry>
|
</entry>
|
||||||
</component>
|
</component>
|
||||||
<component name="NodeLocalInterpreterManager">
|
<component name="NodeLocalInterpreterManager">
|
||||||
<node-interpreter path="C:/Program Files (x86)/nodejs/node.exe" version="5.4.0" last-modified="1452116096000" />
|
<node-interpreter path="C:/Program Files/nodejs/node.exe" version="5.5.0" last-modified="1453338704000" />
|
||||||
<node-interpreter path="C:/Program Files/nodejs/node.exe" version="5.5.0" last-modified="1455371313740" />
|
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
@ -1,6 +1,6 @@
|
|||||||
<application>
|
<application>
|
||||||
<component name="ScratchFileService">
|
<component name="ScratchFileService">
|
||||||
<file url="file://$APPLICATION_CONFIG_DIR$/scratches/scratch" value="HTML" />
|
<file url="file://$APPLICATION_CONFIG_DIR$/scratches/scratch" value="HTML" />
|
||||||
<file url="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1" value="JSON" />
|
<file url="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1" value="HTML" />
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
4
vcs.xml
4
vcs.xml
@ -6,6 +6,10 @@
|
|||||||
<option name="url" value="https://martind2000@bitbucket.org/martind2000/silvrapi.git" />
|
<option name="url" value="https://martind2000@bitbucket.org/martind2000/silvrapi.git" />
|
||||||
<option name="userName" value="" />
|
<option name="userName" value="" />
|
||||||
</UrlAndUserName>
|
</UrlAndUserName>
|
||||||
|
<UrlAndUserName>
|
||||||
|
<option name="url" value="http://censis.visualstudio.com" />
|
||||||
|
<option name="userName" value="martind2000@hotmail.com" />
|
||||||
|
</UrlAndUserName>
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
<option name="cloneParentDir" value="C:\Users\marti\dev" />
|
<option name="cloneParentDir" value="C:\Users\marti\dev" />
|
||||||
|
Loading…
Reference in New Issue
Block a user