summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorTom Hennen <TomHennen@users.noreply.github.com>2015-05-03 15:28:42 -0400
committerTom Hennen <TomHennen@users.noreply.github.com>2015-05-03 15:28:42 -0400
commit9c6c218aa170d6e6939cfd0b7ac7ee0cc02e819b (patch)
tree97ec7d2f05a263d7fd7d89b2b1480070101ede7d /app/src
parentcd4bd0e37d76d48d01e9549ee31610c36279cdc8 (diff)
parente93a631aab90b016ff087a4f13efa56c23847979 (diff)
downloadAntennaPod-9c6c218aa170d6e6939cfd0b7ac7ee0cc02e819b.zip
Merge pull request #788 from TomHennen/update_version_automatically_701
Update about.html version automatically
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/AndroidManifest.xml2
-rw-r--r--app/src/main/assets/.gitignore2
-rw-r--r--app/src/main/templates/about.html (renamed from app/src/main/assets/about.html)6
3 files changed, 7 insertions, 3 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7a4c8366e..97f8bbdad 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.danoeh.antennapod"
android:versionCode="51"
- android:versionName="1.1.1">
+ android:versionName="1.2">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/app/src/main/assets/.gitignore b/app/src/main/assets/.gitignore
new file mode 100644
index 000000000..328840cfc
--- /dev/null
+++ b/app/src/main/assets/.gitignore
@@ -0,0 +1,2 @@
+# this file is generated automatically
+about.html
diff --git a/app/src/main/assets/about.html b/app/src/main/templates/about.html
index af7297564..3a48eeec1 100644
--- a/app/src/main/assets/about.html
+++ b/app/src/main/templates/about.html
@@ -41,9 +41,11 @@
<div id="header" align="center">
<img src="logo.png" alt="Logo" width="100px" height="100px"/>
- <p>AntennaPod, Version 1.1</p>
+ <p>AntennaPod, Version @versionname@, Build @versioncode@</p>
- <p>Copyright © 2014 Daniel Oeh</p>
+ <p>Created by Daniel Oeh</p>
+
+ <p>Copyright © 2015 AntennaPod Contributors <a href="https://github.com/AntennaPod/AntennaPod/blob/master/CONTRIBUTORS">(View)</a></p>
<p>Licensed under the MIT License <a href="LICENSE.html">(View)</a></p>
</div>