Merge branch 'release/0.12.5' into develop
This commit is contained in:
commit
e0babd4442
Binary file not shown.
|
@ -1,3 +1,7 @@
|
|||
##0.12.5 (2013-11-10)
|
||||
|
||||
* Fixed incorrect layout and NullPointerException in message replys
|
||||
|
||||
##0.12.4 (2013-11-09)
|
||||
|
||||
* Fixed ParseException in sessions date
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="es.ugr.swad.swadroid"
|
||||
android:installLocation="auto"
|
||||
android:versionCode="54"
|
||||
android:versionName="0.12.4">
|
||||
android:versionCode="55"
|
||||
android:versionName="0.12.5">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
|
|
|
@ -15,6 +15,11 @@
|
|||
</head>
|
||||
|
||||
<body bgcolor="white">
|
||||
<h4>0.12.5 (2013-11-10)</h4>
|
||||
<ul>
|
||||
<lh class="fix">[CORRECCIONES]</lh>
|
||||
<li type="disc">Corregido error que impedía responder mensajes</li>
|
||||
</ul>
|
||||
<h4>0.12.4 (2013-11-09)</h4>
|
||||
<ul>
|
||||
<lh class="fix">[CORRECCIONES]</lh>
|
||||
|
|
|
@ -15,6 +15,11 @@
|
|||
</head>
|
||||
|
||||
<body bgcolor="white">
|
||||
<h4>0.12.5 (2013-11-10)</h4>
|
||||
<ul>
|
||||
<lh class="fix">[FIXES]</lh>
|
||||
<li type="disc">Fixed bug that prevented replying messages</li>
|
||||
</ul>
|
||||
<h4>0.12.4 (2013-11-09)</h4>
|
||||
<ul>
|
||||
<lh class="fix">[FIXES]</lh>
|
||||
|
|
|
@ -1,29 +1,29 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright (C) 2008 ZXing authors
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<resources>
|
||||
|
||||
<!-- Messages IDs -->
|
||||
<item name="decode_succeeded" type="id"/>
|
||||
<item name="restart_preview" type="id"/>
|
||||
<item name="auto_focus" type="id"/>
|
||||
<item name="decode_failed" type="id"/>
|
||||
<item name="return_scan_result" type="id"/>
|
||||
<item name="launch_product_query" type="id"/>
|
||||
<item name="decode" type="id"/>
|
||||
<item name="quit" type="id"/>
|
||||
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright (C) 2008 ZXing authors
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<resources>
|
||||
|
||||
<!-- Messages IDs -->
|
||||
<item name="decode_succeeded" type="id"/>
|
||||
<item name="restart_preview" type="id"/>
|
||||
<item name="auto_focus" type="id"/>
|
||||
<item name="decode_failed" type="id"/>
|
||||
<item name="return_scan_result" type="id"/>
|
||||
<item name="launch_product_query" type="id"/>
|
||||
<item name="decode" type="id"/>
|
||||
<item name="quit" type="id"/>
|
||||
|
||||
</resources>
|
Loading…
Reference in New Issue
Block a user