Merge branch 'release/#release' into develmaster

This commit is contained in:
stubbfel
2013-10-18 13:01:53 +02:00
5 changed files with 12 additions and 12 deletions

View File

@@ -62,6 +62,11 @@ namespace CampusAppWP8.Pages.Exams
{
base.OnNavigatedTo(e);
if (this.Orientation.Equals(PageOrientation.Landscape) || this.Orientation.Equals(PageOrientation.LandscapeLeft) || this.Orientation.Equals(PageOrientation.LandscapeRight))
{
ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default;
}
if (this.feed == null)
{
this.InitializeFeed();

View File

@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Deployment xmlns="http://schemas.microsoft.com/windowsphone/2012/deployment" AppPlatformVersion="8.0">
<DefaultLanguage xmlns="" code="de-DE" />
<App xmlns="" ProductID="{120b88cc-f3f0-4c5a-a3fd-c26e835338cc}" Title="BTU Campus-App" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="CampusAppWP8 author" Description="Die BTU Campus-App für WP8" Publisher="CampusAppWP8" PublisherID="{3511cc48-91b0-4ffb-9023-b69a81021a46}">
<App xmlns="" ProductID="{120b88cc-f3f0-4c5a-a3fd-c26e835338cc}" Title="BTU CampusApp" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="BTU Cottbus-Senftenberg" Description="Die CampusApp stellt den Studenten und Mitarbeitern der BTU Cottbus viele nützliche Funktionen und Informationen rund um den Unialltag zu Verfügung." Publisher="CampusAppWP8" PublisherID="{3511cc48-91b0-4ffb-9023-b69a81021a46}">
<IconPath IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconPath>
<Capabilities>
<Capability Name="ID_CAP_NETWORKING" />
<Capability Name="ID_CAP_SENSORS" />
<Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
<Capability Name="ID_CAP_PROXIMITY" />
<Capability Name="ID_CAP_MAP" />
<Capability Name="ID_CAP_LOCATION" />
<Capability Name="ID_CAP_ISV_CAMERA" />
<Capability Name="ID_CAP_PHONEDIALER" />
<Capability Name="ID_CAP_MEDIALIB_PLAYBACK" />
<Capability Name="ID_CAP_MEDIALIB_PHOTO" />
<Capability Name="ID_CAP_MICROPHONE" />
<Capability Name="ID_CAP_SPEECH_RECOGNITION" />
</Capabilities>
<Tasks>
@@ -23,10 +18,10 @@
<Tokens>
<PrimaryToken TokenID="CampusAppWP8Token" TaskName="_default">
<TemplateIconic>
<SmallImageURI IsRelative="true" IsResource="false">Assets\Tiles\kachel_small.png</SmallImageURI>
<SmallImageURI IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</SmallImageURI>
<Count>0</Count>
<IconImageURI IsRelative="true" IsResource="false">Assets\Tiles\kachel_medium.png</IconImageURI>
<Title>BTU-CampusApp</Title>
<IconImageURI IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconImageURI>
<Title>BTU CampusApp</Title>
<Message>
</Message>
<BackgroundColor>

View File

@@ -106,7 +106,7 @@ namespace CampusAppWP8.Resources {
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die BTU Campus-App ähnelt.
/// Sucht eine lokalisierte Zeichenfolge, die BTU CampusApp ähnelt.
/// </summary>
public static string ApplicationTitle {
get {

View File

@@ -126,7 +126,7 @@
<comment>Controls the Language and ensures that the font for all elements in the RootFrame aligns with the app's language. Set to the language code of this resource file's language.</comment>
</data>
<data name="ApplicationTitle" xml:space="preserve">
<value>BTU Campus-App</value>
<value>BTU CampusApp</value>
</data>
<data name="SampleProperty" xml:space="preserve">
<value>Beispielwert für die Laufzeiteigenschaft</value>

View File

@@ -409,7 +409,7 @@ namespace CampusAppWP8ScheduledTaskAgent
/// <returns> true, if it is up-to-date, otherwise false. </returns>
private bool CheckRssIsUpToDate(DateTime lastModified)
{
int diff = lastModified.CompareTo(DateTime.Now.AddHours(3));
int diff = lastModified.CompareTo(DateTime.Now.AddDays(1));
if (diff < 0)
{