Commit Graph

341 Commits

Author SHA1 Message Date
Christian Fiedler
143cfd7fae #152 #158 2013-08-15 12:24:02 +02:00
Christian Fiedler
bac1c05e33 Merge branch 'hotfix/onFailedSave_WriteThread' into develop 2013-08-14 14:32:20 +02:00
Christian Fiedler
504cc8bb50 onFailedSave_WriteThread 2013-08-14 14:32:02 +02:00
Christian Fiedler
ad6e674f4e Merge branch 'hotfix/#126' into develop 2013-08-14 12:49:01 +02:00
Christian Fiedler
c8f4f743f8 Merge branch 'hotfix/#126' into develmaster 2013-08-14 12:49:00 +02:00
Christian Fiedler
5253217de8 #126 and OnFailed callbacks 2013-08-14 12:43:52 +02:00
stubbfel
12743066c2 Merge branch 'release/r#147' into develop 2013-08-13 15:55:17 +02:00
stubbfel
a7bd54f3a8 Merge branch 'release/r#147' into develmaster 2013-08-13 15:55:17 +02:00
stubbfel
fc69f8054f fix startpage 2013-08-13 15:54:57 +02:00
stubbfel
778c22ff39 Merge branch 'feature/#148' into develop 2013-08-13 15:51:51 +02:00
stubbfel
1566f2382d overide geowatcher and add cbmainmapmodel 2013-08-13 15:50:17 +02:00
stubbfel
d7c914eed6 set scale 2013-08-13 10:50:31 +02:00
stubbfel
39b292e3c3 add testmap 2013-08-12 19:32:28 +02:00
stubbfel
270a390807 Merge branch 'release/r#117#146#147' into develmaster 2013-08-12 17:21:29 +02:00
stubbfel
a55c89dd77 change icon 2013-08-12 17:20:04 +02:00
stubbfel
5ce8c21266 Merge branch 'feature/#147' into develop 2013-08-12 17:16:48 +02:00
stubbfel
aad425e2a3 addcampusapi 2013-08-12 17:15:54 +02:00
Christian Fiedler
0bc533353f Merge branch 'hotfix/#117' into develmaster 2013-08-12 16:52:57 +02:00
Christian Fiedler
3a0b7d8b83 Merge branch 'hotfix/#117' into develop 2013-08-12 16:52:57 +02:00
Christian Fiedler
98fba92a17 #117 fixed tiles 2013-08-12 16:52:28 +02:00
stubbfel
f6b2237b20 add all mensafeed 2013-08-12 16:32:16 +02:00
stubbfel
8d03fbc905 add appsettingsite #145 2013-08-12 10:55:59 +02:00
stubbfel
ab58fabc6e Merge branch 'release/r#146' into develmaster 2013-08-08 15:55:30 +02:00
stubbfel
2f99cfd21a # add camupslist 2013-08-08 15:54:33 +02:00
stubbfel
8fc22539be mv userprofil to isalated storage 2013-08-08 15:15:15 +02:00
stubbfel
4a309ad980 Merge branch 'release/r#141' into develmaster r#141 2013-08-08 13:56:34 +02:00
stubbfel
c301f908ad Merge branch 'feature/#141' into develop 2013-08-08 13:55:03 +02:00
stubbfel
6ce158dc41 add optin and doku 2013-08-08 13:51:20 +02:00
stubbfel
e8fe0bb041 new gitignore 2013-08-07 15:17:36 +02:00
stubbfel
b337eefc8c add geowatcher 2013-08-07 15:16:13 +02:00
stubbfel
70d92c7a3b add test access 2013-08-07 11:38:02 +02:00
stubbfel
363baad60c add spsapi 2013-08-06 16:13:29 +02:00
stubbfel
2606e089df Merge branch 'release/r#138#139' into develmaster r#138#139 2013-08-06 14:53:31 +02:00
stubbfel
a99ff5526c Merge branch 'feature/#138' into develop 2013-08-06 14:11:18 +02:00
stubbfel
64fc09f622 finish 138 2013-08-06 14:11:01 +02:00
stubbfel
a9a96b6ffc instert new mensapp 2013-08-06 14:07:43 +02:00
stubbfel
f79cd5836e add mealmodel 2013-08-06 11:04:43 +02:00
stubbfel
d414e4df47 add fullheaders 2013-08-06 09:46:50 +02:00
stubbfel
4652b82885 Merge branch 'release/#r133' into develmaster 2013-08-05 13:02:56 +02:00
stubbfel
7637b62271 Merge branch 'release/#r133' into develop 2013-08-05 13:02:56 +02:00
stubbfel
55e426f6c2 release fixes 2013-08-05 13:02:39 +02:00
stubbfel
2eea814558 Merge branch 'feature/#133' into develop
Conflicts:
	CampusAppWP8/CampusAppWP8/App.xaml.cs
	CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs
2013-08-05 12:40:14 +02:00
stubbfel
121c728df7 fixes 2013-08-05 11:58:19 +02:00
stubbfel
9a84f847d1 add list to lecture 2013-08-05 11:56:45 +02:00
stubbfel
fa7a84661e finish profilsite 2013-08-05 11:18:32 +02:00
stubbfel
75b6b4501f update20130725 2013-07-25 15:24:24 +02:00
stubbfel
a3014d04c8 add settings to appload 2013-07-25 12:45:56 +02:00
stubbfel
bcceaaaa53 Merge branch 'release/r' into develmaster 2013-07-25 11:08:52 +02:00
stubbfel
6f5496a006 Merge branch 'feature/#refactor' into develop 2013-07-25 11:08:22 +02:00
stubbfel
a366d0e949 formated classes 2013-07-25 11:08:08 +02:00