Commit Graph

172 Commits

Author SHA1 Message Date
stubbfel
dd7ef6e82e rmfile onsaved 2013-07-22 16:26:03 +02:00
stubbfel
1d434a394f finish #121 2013-07-22 16:01:25 +02:00
stubbfel
d17b4b7e33 Merge branch 'feature/#119' into develop 2013-07-22 15:08:41 +02:00
stubbfel
b78250401c finish #119 2013-07-22 14:46:44 +02:00
Christian Fiedler
0072df1186 #120 2013-07-22 13:48:05 +02:00
Christian Fiedler
74224a4fc5 #118 2013-07-22 11:46:22 +02:00
Christian Fiedler
0ceb0584d1 #115 2013-07-19 17:45:16 +02:00
Christian Fiedler
88b664284f #115 2013-07-19 17:42:55 +02:00
Christian Fiedler
b9f268d594 #103 and fixes in events and news 2013-07-19 17:15:47 +02:00
stubbfel
c886b3e573 finish #114 2013-07-17 13:47:02 +02:00
stubbfel
98a51bce24 change tilestyle 2013-07-17 12:22:32 +02:00
stubbfel
03789a9a38 add all 2013-07-17 11:33:11 +02:00
stubbfel
92db7d16f3 clear git 2013-07-17 11:31:47 +02:00
stubbfel
9454a764d6 patch two 2013-07-17 10:49:34 +02:00
stubbfel
a433d47583 fist patch to prj file 2013-07-17 10:07:37 +02:00
stubbfel
e2ee1aad9f fix #113 2013-07-16 15:09:17 +02:00
stubbfel
d71f6db920 deletion 2013-07-16 13:59:42 +02:00
stubbfel
eb68b666f7 Merge branch 'develmaster' into develop 2013-07-16 13:48:11 +02:00
stubbfel
d9a54b2b13 delete #72 2013-07-16 13:43:15 +02:00
Christian Fiedler
8b4ee44520 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-07-16 13:40:40 +02:00
Christian Fiedler
9c0415ddbb fixed constants 2013-07-16 13:39:53 +02:00
stubbfel
52a3154caf Merge branch 'develmaster' of 141.43.76.143:repos/bare/win8phoneApp into develmaster 2013-07-16 13:38:33 +02:00
stubbfel
18f72e6096 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-07-16 13:38:23 +02:00
Christian Fiedler
3616bd233f Merge branch 'hotfix/#79' into develop
Conflicts:
	CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs
	CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs
	CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
	CampusAppWP8/CampusAppWP8/Resources/Constants.resx
2013-07-16 13:35:38 +02:00
Christian Fiedler
573a562e03 Merge branch 'hotfix/#79' into develmaster
Conflicts:
	CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs
	CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs
	CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
	CampusAppWP8/CampusAppWP8/Resources/Constants.resx
2013-07-16 13:33:10 +02:00
stubbfel
25d6217a9b delete BaseModel 2013-07-16 13:29:33 +02:00
stubbfel
5fbd297af5 delete FileList 2013-07-16 13:26:09 +02:00
Christian Fiedler
f1e41b1fce #79 #96 2013-07-16 13:22:04 +02:00
stubbfel
cf4c5dc486 change to XMLModel 2013-07-16 12:20:16 +02:00
stubbfel
347e45f561 change to XMLModel 2013-07-16 11:59:38 +02:00
stubbfel
544ae68f2c enable department 2013-07-16 11:41:32 +02:00
stubbfel
db15808e24 change to xmlmodel 2013-07-16 10:40:09 +02:00
stubbfel
7e99840b6c rrefactor linkpage 2013-07-15 18:53:29 +02:00
Christian Fiedler
19e18a4daa Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-07-15 17:30:43 +02:00
Christian Fiedler
2a24c01854 removed icon 2013-07-15 17:29:37 +02:00
Christian Fiedler
2ef3d053b1 mega merge 2013-07-15 17:28:36 +02:00
stubbfel
bda60de4f5 reafactor #100 2013-07-15 17:21:36 +02:00
Christian Fiedler
e70a6d36f1 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop
Conflicts:
	CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
2013-07-15 16:59:59 +02:00
Christian Fiedler
80d008a431 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop
Conflicts:
	CampusAppWP8/CampusAppWP8/Model/Events/RSSChannelModel.cs
	CampusAppWP8/CampusAppWP8/Model/Events/RSSModel.cs
	CampusAppWP8/CampusAppWP8/Pages/Events/EventIndexPage.xaml.cs
	CampusAppWP8/CampusAppWP8/Pages/News/NewsIndexPage.xaml.cs
	CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs
	CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
	CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
	CampusAppWP8/CampusAppWP8/Resources/Constants.resx
	CampusAppWP8/CampusAppWP8/pages/StartPage.xaml
	CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs
2013-07-15 16:58:31 +02:00
stubbfel
a2eeb54c55 finish #107 2013-07-15 15:17:21 +02:00
stubbfel
505b19e57d Merge branch 'hotfix/#100' into develop 2013-07-15 15:02:31 +02:00
stubbfel
5c8756ac21 finish #100 2013-07-15 15:02:13 +02:00
stubbfel
10018077fc add style 2013-07-15 13:35:18 +02:00
stubbfel
ca13f3f581 finish #104 2013-07-15 13:26:47 +02:00
Christian Fiedler
6f1eae3ca8 no message 2013-07-12 18:25:17 +02:00
Christian Fiedler
8335c47b0f #57 #90 #80 2013-07-12 18:08:17 +02:00
stubbfel
ed891074e0 add listbuttonstyle to all pages 2013-07-11 16:43:39 +02:00
stubbfel
6dc522b6a8 add listButtonstyle 2013-07-11 15:31:02 +02:00
stubbfel
9e31f121ba add Landscape Orientation at studentencouncil 2013-07-09 10:20:23 +02:00
stubbfel
e46a7a22e1 add Landscape Orientation at linkpage 2013-07-09 10:17:38 +02:00