Merge branch 'development'

Conflicts: mensa-ubi/AndroidManifest.xml
atomfrede · Nov 3, 2013 · e96c5b7 · e96c5b7
2 parents 2ef5232 + d10f0ce
commit e96c5b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/mensa-ubi/AndroidManifest.xml b/mensa-ubi/AndroidManifest.xml
@@ -18,12 +18,11 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.atomfrede.android.mensa.ubi"
-    android:versionCode="19"
-    android:versionName="1.4.3" >
+    android:versionCode="20"
+    android:versionName="1.4.4" >
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="18" />
-
+        android:targetSdkVersion="19" />
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application

diff --git a/mensa-ubi/project.properties b/mensa-ubi/project.properties
@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-19
 android.library.reference.1=../../com_viewpagerindicator
 android.library.reference.2=../../../Eclipse IDE/workspace/actionbarsherlock
 android.library.reference.3=../../../Eclipse IDE/workspace/menudrawer
diff --git a/mensa-ubi/src/de/atomfrede/android/mensa/ubi/Constants.java b/mensa-ubi/src/de/atomfrede/android/mensa/ubi/Constants.java
@@ -57,9 +57,9 @@ public class Constants {
 	public static final String westendRestaurantUrlNextWeek = "http://www.studentenwerkbielefeld.de/index.php?id=60&tx_studentenwerk_pi1%5Bweek%5D=1";
 	public static final String detmoldUrlNextWeek = "http://www.studentenwerkbielefeld.de/index.php?id=69&L=0&tx_studentenwerk_pi1%5Bweek%5D=1";
 	public static final String lemgoUrlNextWeek = "http://www.studentenwerkbielefeld.de/index.php?id=70&tx_studentenwerk_pi1%5Bweek%5D=1";
-	//TODO add correct urls
-	public static final String hoexterUrlNextWeek = "http://www.studentenwerkbielefeld.de/index.php?id=71&L=0";
-	public static final String musicUrlNextWeek = "http://www.studentenwerkbielefeld.de/index.php?id=72&L=0";
+
+	public static final String hoexterUrlNextWeek = "http://www.studentenwerkbielefeld.de/index.php?id=71&tx_studentenwerk_pi1[week]=1";
+	public static final String musicUrlNextWeek = "http://www.studentenwerkbielefeld.de/index.php?id=72&tx_studentenwerk_pi1[week]=1";
 	public static final String fhKurtSchumacherUrlNextWeek = "http://www.studentenwerkbielefeld.de/index.php?id=63&tx_studentenwerk_pi1[week]=1";
 	public static final String wilhelmBerterlsmannUrlNextWeek = "http://www.studentenwerkbielefeld.de/index.php?id=65&tx_studentenwerk_pi1[week]=1";