Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 29 Wiki Activity

Merge branch 'release/0.12.5' into develop

Browse Source
This commit is contained in:
Juan Miguel Boyero Corral 2013-11-10 10:24:05 +01:00
commit e0babd4442
6 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Android-PullToRefresh/bin/android-pulltorefresh.jar
View File

Binary file not shown.

4
HISTORY.md
View File

@ -1,3 +1,7 @@
##0.12.5 (2013-11-10)
* Fixed incorrect layout and NullPointerException in message replys
##0.12.4 (2013-11-09) ##0.12.4 (2013-11-09)
* Fixed ParseException in sessions date * Fixed ParseException in sessions date

4
SWADroid/AndroidManifest.xml
View File

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="es.ugr.swad.swadroid" package="es.ugr.swad.swadroid"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="54" android:versionCode="55"
android:versionName="0.12.4"> android:versionName="0.12.5">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

5
SWADroid/res/raw-es/changes.html
View File

@ -15,6 +15,11 @@
</head> </head>
<body bgcolor="white"> <body bgcolor="white">
<h4>0.12.5 (2013-11-10)</h4>
<ul>
<lh class="fix">[CORRECCIONES]</lh>
<li type="disc">Corregido error que imped&iacute;a responder mensajes</li>
</ul>
<h4>0.12.4 (2013-11-09)</h4> <h4>0.12.4 (2013-11-09)</h4>
<ul> <ul>
<lh class="fix">[CORRECCIONES]</lh> <lh class="fix">[CORRECCIONES]</lh>

5
SWADroid/res/raw/changes.html
View File

@ -15,6 +15,11 @@
</head> </head>
<body bgcolor="white"> <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> <h4>0.12.4 (2013-11-09)</h4>
<ul> <ul>
<lh class="fix">[FIXES]</lh> <lh class="fix">[FIXES]</lh>

56
SWADroid/res/values/ids.xml
View File

@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright (C) 2008 ZXing authors Copyright (C) 2008 ZXing authors
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<resources> <resources>
<!-- Messages IDs --> <!-- Messages IDs -->
<item name="decode_succeeded" type="id"/> <item name="decode_succeeded" type="id"/>
<item name="restart_preview" type="id"/> <item name="restart_preview" type="id"/>
<item name="auto_focus" type="id"/> <item name="auto_focus" type="id"/>
<item name="decode_failed" type="id"/> <item name="decode_failed" type="id"/>
<item name="return_scan_result" type="id"/> <item name="return_scan_result" type="id"/>
<item name="launch_product_query" type="id"/> <item name="launch_product_query" type="id"/>
<item name="decode" type="id"/> <item name="decode" type="id"/>
<item name="quit" type="id"/> <item name="quit" type="id"/>
</resources> </resources>