skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Make log level configurable with -Dlog.level, default to INFO. Thanks @pitpalme.

Browse Source
This commit is contained in:
Maarten Billemont 2014-08-30 15:53:13 -04:00
parent cc80a66331
commit 2adb74c971
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MasterPassword/Java/masterpassword-android/AndroidManifest.xml
View File

@ -18,7 +18,8 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".UsersActivity" />
</application> </application>
</manifest> </manifest>

4
MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml
View File

@ -1,4 +1,4 @@
<configuration scan="true"> <configuration scan="false">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout"> <layout class="ch.qos.logback.classic.PatternLayout">
@ -6,7 +6,7 @@
</layout> </layout>
</appender> </appender>
<logger name="com.lyndir" level="TRACE" /> <logger name="com.lyndir" level="${log.level:-INFO}" />
<root level="INFO"> <root level="INFO">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />

4
MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml
View File

@ -1,4 +1,4 @@
<configuration scan="true"> <configuration scan="false">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout"> <layout class="ch.qos.logback.classic.PatternLayout">
@ -6,7 +6,7 @@
</layout> </layout>
</appender> </appender>
<logger name="com.lyndir" level="INFO" /> <logger name="com.lyndir" level="${log.level:-INFO}" />
<root level="INFO"> <root level="INFO">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />

3
Site/2013-05/css/main.css
View File

@ -23,8 +23,6 @@ a:link:hover {
} }
a .popup { a .popup {
display: none; display: none;
background: rgba(0, 0, 0, 0.5);
border: 1px solid;
border-radius: 5px; border-radius: 5px;
color: #AAA; color: #AAA;
@ -35,7 +33,6 @@ a .popup {
max-width: inherit; max-width: inherit;
max-height: 400px; max-height: 400px;
margin-right: -100px; margin-right: -100px;
margin-bottom: 20px;
padding: 8px; padding: 8px;
} }
a:hover .popup { a:hover .popup {

2
Site/2013-05/index.html
View File

@ -14,7 +14,7 @@
<link rel="shortcut icon" href="img/favicon.png" type="image/x-png" /> <link rel="shortcut icon" href="img/favicon.png" type="image/x-png" />
<link rel="stylesheet" href="css/bootstrap.min.css"> <link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="css/bootstrap-responsive.min.css"> <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
<link rel="stylesheet" href="css/main.css?4"> <link rel="stylesheet" href="css/main.css?5">
<script src="js/vendor/modernizr-2.6.2.min.js"></script> <script src="js/vendor/modernizr-2.6.2.min.js"></script>
<script src="js/vendor/prefixfree.min.js"></script> <script src="js/vendor/prefixfree.min.js"></script>