Commit Graph

139 Commits

Author SHA1 Message Date
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
stubbfel
e1ea814861 change homeworkicon at startpage (fix #93) 2013-07-09 10:13:50 +02:00
stubbfel
2f247e29b4 add toogleButton and in import in Studentcouncil 2013-07-08 18:46:31 +02:00
stubbfel
4f10725531 finisch #85 2013-07-08 15:31:56 +02:00
stubbfel
c3a572c6f6 add Qurreystring to navbtn #85 2013-07-08 15:29:01 +02:00
stubbfel
e60bfae1a8 add Navbutton anud add Constatn.rex to global 2013-07-08 14:12:45 +02:00
stubbfel
731e3305b9 finish #86 2013-07-08 12:33:01 +02:00
stubbfel
bc77d076c9 add Phonebotton and import them to openinghours 2013-07-08 12:31:53 +02:00
stubbfel
ea54e23d56 finish #84 2013-07-08 12:14:41 +02:00
stubbfel
0f64e15c3f add GoToMapButton aund add them to Openinghours + change Mailbutton 2013-07-08 12:13:20 +02:00
stubbfel
476a626de4 Merge branch 'feature/#83' into develop 2013-07-08 11:37:43 +02:00
stubbfel
2b4b980883 finish #83 2013-07-08 11:37:28 +02:00
stubbfel
086317fef5 add linkbutto and import button in linkpage und studentcouncil 2013-07-08 11:35:19 +02:00
stubbfel
3755348854 add btuLogo #91 2013-07-08 11:15:48 +02:00
stubbfel
170067df02 finish #78 2013-07-04 13:52:07 +02:00
stubbfel
38becf5ae6 add emaibtn #78 2013-07-04 13:51:32 +02:00
stubbfel
7056650095 add #74 to startpage 2013-07-03 13:44:46 +02:00
stubbfel
f5ef147baa finish #74 2013-07-03 13:37:12 +02:00
stubbfel
c9b3553d2a add models and feed #74 2013-07-02 15:18:40 +02:00
stubbfel
448cfd5118 finish #71 2013-07-02 12:25:05 +02:00
stubbfel
655b4c0638 add Linkpage, Model and feeds 2013-07-02 12:17:15 +02:00
stubbfel
d8071e76eb finish #67 2013-07-01 13:19:07 +02:00
stubbfel
5a55355f98 finish #68 2013-07-01 11:43:56 +02:00
Christian Fiedler
fe46e28a26 Merge branch 'feature/#55' into develop 2013-06-25 14:08:48 +02:00
Christian Fiedler
31b4e4459e #55 2013-06-25 14:06:27 +02:00
stubbfel
94a12f2a77 change icon source of lecture and map 2013-06-24 13:50:24 +02:00
stubbfel
2b96528c7d Merge branch 'feature/#51' into develop 2013-06-24 13:33:39 +02:00
stubbfel
7ee3fa5535 finish testmap 2013-06-24 13:27:16 +02:00
Christian Fiedler
2a8d321a64 fixed a wrong merged line 2013-06-24 12:54:12 +02:00
Christian Fiedler
4b5587770c Merge branch 'feature/#44' into develop
Conflicts:
	CampusAppWP8/CampusAppWP8/pages/StartPage.xaml.cs
2013-06-24 12:44:16 +02:00
Christian Fiedler
a750b5e1a2 #44 themerized icons 2013-06-21 16:25:13 +02:00
stubbfel
709f7fc289 end of day2 #51 2013-06-21 13:02:13 +02:00
stubbfel
811ad35fa9 add mapmodel 2013-06-21 12:37:17 +02:00
stubbfel
bb3de8beec add links to the startpage and doku 2013-06-21 11:22:33 +02:00