stubbfel/win8phoneApp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/#52' into develop

Browse Source
This commit is contained in:
stubbfel
2013-06-20 12:32:49 +02:00
parent 52872b108b eb91cbae44
commit 775533ec32
11 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CampusAppWP8/CampusAppWP8/Feed/Lecture/LectureApi.cs → CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs
View File

@@ -5,7 +5,7 @@
// <author>stubbfel</author>
// <sience>13.06.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Feed.Lecture
namespace CampusAppWP8.Api.Lecture
{
using System;
using CampusAppWP8.Model.Lecture;

2
CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
View File

@@ -116,7 +116,7 @@
<Compile Include="Pages\Campusmap\CampusMapPage.xaml.cs">
<DependentUpon>CampusMapPage.xaml</DependentUpon>
</Compile>
<Compile Include="Feed\Lecture\LectureApi.cs" />
<Compile Include="Api\Lecture\LectureApi.cs" />
<Compile Include="Feed\Departments\DepartmentFeed.cs" />
<Compile Include="Pages\Departments\DepartmentPage.xaml.cs">
<DependentUpon>DepartmentPage.xaml</DependentUpon>

2
CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs
View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CampusAppWP8.Feed.Departments
namespace CampusAppWP8.Api.Departments
{
class DepartmentFeed : XmlFeed<DepartmentViewModel>
{

2
CampusAppWP8/CampusAppWP8/Feed/Events/EventFeed.cs
View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
using CampusAppWP8.Model.events_news;
using CampusAppWP8.Utility;
namespace CampusAppWP8.Feed.Events
namespace CampusAppWP8.Api.Events
{
/// <summary>
/// Event Feed.

2
CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
View File

@@ -5,7 +5,7 @@
// <author>stubbfel</author>
// <sience>03.05.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Feed.Mensa
namespace CampusAppWP8.Api.Mensa
{
using System;
using System.Collections.ObjectModel;

2
CampusAppWP8/CampusAppWP8/Feed/News/NewsFeed.cs
View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
using CampusAppWP8.Model.events_news;
using CampusAppWP8.Utility;
namespace CampusAppWP8.Feed.News
namespace CampusAppWP8.Api.News
{
/// <summary>
/// News Feed.

2
CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs
View File

@@ -1,4 +1,4 @@
using CampusAppWP8.Feed.Departments;
using CampusAppWP8.Api.Departments;
using CampusAppWP8.Utility;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Tasks;

2
CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs
View File

@@ -14,7 +14,7 @@ namespace CampusAppWP8.Pages.Events
using System.Windows;
using System.Windows.Controls;
using System.Windows.Navigation;
using CampusAppWP8.Feed.Events;
using CampusAppWP8.Api.Events;
using CampusAppWP8.Model.events_news;
using CampusAppWP8.Utility;
using Microsoft.Phone.Controls;

2
CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
View File

@@ -12,7 +12,7 @@ namespace CampusAppWP8.Pages.Lecture
using System.Windows;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using CampusAppWP8.Feed.Lecture;
using CampusAppWP8.Api.Lecture;
using CampusAppWP8.Model.Lecture;
using CampusAppWP8.Model.Utility;
using CampusAppWP8.Resources;

2
CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs
View File

@@ -14,7 +14,7 @@ namespace CampusAppWP8.Pages.News
using System.Windows;
using System.Windows.Controls;
using System.Windows.Navigation;
using CampusAppWP8.Feed.News;
using CampusAppWP8.Api.News;
using CampusAppWP8.Model.events_news;
using CampusAppWP8.Utility;
using Microsoft.Phone.Controls;

2
CampusAppWP8/CampusAppWP8/pages/mensa/MensaPage.xaml.cs
View File

@@ -9,7 +9,7 @@ namespace CampusAppWP8.Pages.Mensa
{
using System;
using System.Windows.Navigation;
using CampusAppWP8.Feed.Mensa;
using CampusAppWP8.Api.Mensa;
using CampusAppWP8.Utility;
using Microsoft.Phone.Controls;