IU-2021.2.4 <aiko@pro.local Merge branch 'master'

Conflicts:
	colors.scheme.xml
	filetypes.xml
This commit is contained in:
Aiko Mastboom 2022-01-19 09:08:09 +01:00
commit f5723e6164
6 changed files with 8 additions and 50 deletions

View File

@ -1,5 +1,5 @@
<application>
<component name="EditorColorsManagerImpl">
<global_color_scheme name="IntelliJ Light" />
<global_color_scheme name="_@user_Darcula" />
</component>
</application>

View File

@ -8,11 +8,11 @@
<jdbc-url>jdbc:mariadb://192.168.37.100:3306/df-backend</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
<data-source source="LOCAL" name="live_view_studio_dev@192.168.37.100" uuid="2076ef74-1bd2-433c-a06a-e72a8837624a">
<data-source source="LOCAL" name="postgres@192.168.37.100" uuid="2076ef74-1bd2-433c-a06a-e72a8837624a">
<driver-ref>postgresql</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
<jdbc-url>jdbc:postgresql://192.168.37.100:5432/live_view_studio_dev</jdbc-url>
<jdbc-url>jdbc:postgresql://192.168.37.100:5432/dos_dev</jdbc-url>
</data-source>
</component>
</application>

View File

@ -75,41 +75,6 @@
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
</component>
<component name="XDebuggerSettings">
<data-views />

View File

@ -1,11 +1,4 @@
<application>
<component name="DefaultFont">
<option name="FONT_SIZE" value="12" />
<option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
<option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
<option name="USE_LIGATURES" value="true" />
<option name="SECONDARY_FONT_FAMILY" value="Courier" />
</component>
<component name="TodoConfiguration">
<pattern pattern="\btodo\b.*" />
<pattern pattern="\bfixme\b.*" />

View File

@ -1,15 +1,14 @@
<application>
<component name="FindSettings">
<option name="customScope" value="Project Files" />
<option name="defaultScopeName" value="Project Files" />
<option name="customScope" value="Only changes uncommitted to VCS in all files" />
<option name="defaultScopeName" value="Only changes uncommitted to VCS in all files" />
<option name="localRegularExpressions" value="true" />
<option name="showResultsInSeparateView" value="true" />
<option name="LOCAL_REGULAR_EXPRESSIONS" value="true" />
<option name="SHOW_RESULTS_IN_SEPARATE_VIEW" value="true" />
<option name="SEARCH_SCOPE" value="Project Files" />
<option name="SEARCH_SCOPE" value="Only changes uncommitted to VCS in all files" />
<mask>*.leex</mask>
<mask>*.html.eex</mask>
<mask>*.ex</mask>
<mask>*.html.?eex</mask>
<mask>*.js</mask>
<mask>*.css</mask>
@ -18,5 +17,6 @@
<mask>*.jsp</mask>
<mask>*.properties</mask>
<mask>*.java</mask>
<mask>*.ex</mask>
</component>
</application>

View File

@ -1,5 +1,5 @@
<application>
<component name="LafManager" autodetect="true">
<laf class-name="com.intellij.ide.ui.laf.IntelliJLaf" themeId="JetBrainsLightTheme" />
<laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" />
</component>
</application>