Commit Graph

719 Commits

Author SHA1 Message Date
Christian Fiedler
4ecc87f863 #204 2013-11-14 18:18:02 +01:00
Christian Fiedler
9607518318 end of day commit 2013-11-13 17:40:10 +01:00
Christian Fiedler
c7f7566e5a Rotation functions added 2013-11-13 14:39:23 +01:00
Christian Fiedler
fa5d2e17e5 #269 done 2013-11-13 13:46:53 +01:00
stubbfel
900d7e1bcd update work folder 2013-10-24 12:58:17 +02:00
stubbfel
8b76c1f687 no message 2013-10-24 11:54:49 +02:00
stubbfel
909a5dd0de Revert "add modul"
This reverts commit f9966f7ad9.
2013-10-24 11:53:51 +02:00
stubbfel
f9966f7ad9 add modul 2013-10-24 11:49:41 +02:00
stubbfel
136676a894 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-10-24 11:31:24 +02:00
Christian Fiedler
4f1ff8b0ce CountChar 2013-10-24 11:29:51 +02:00
stubbfel
133b86a292 Merge branch 'feature/addnfclib' into develop 2013-10-24 11:12:07 +02:00
Christian Fiedler
95f5d71391 after merge 2013-10-23 17:01:25 +02:00
stubbfel
35dd770e6f fix geopoint 2013-10-23 15:58:45 +02:00
stubbfel
7a159e22c6 add submodule 2013-10-23 15:36:09 +02:00
stubbfel
37d2a5fcdb add nfclib 2013-10-23 15:35:42 +02:00
Christian Fiedler
8eea6d58d3 temp 2013-10-23 14:19:05 +02:00
Christian Fiedler
edb1936577 some stuff 2013-10-22 20:31:56 +02:00
Christian Fiedler
55339f2da6 Merge branch 'develop' into feature/#173
Conflicts:
	CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
	CampusAppWP8/CampusAppWP8/Settings.StyleCop
	CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop
2013-10-22 17:33:13 +02:00
stubbfel
4b8b83d583 Merge branch 'hotfix/mvpage' into develop 2013-10-22 14:27:58 +02:00
stubbfel
54a79458f4 fix using 2013-10-22 14:27:37 +02:00
stubbfel
92aabfa4f5 Merge branch 'release/r#' into develmaster 2013-10-22 14:03:39 +02:00
stubbfel
3c4f3239c5 finish #265 2013-10-22 14:01:48 +02:00
stubbfel
0633317ad2 mv spsmodel and placemodel 2013-10-22 13:52:09 +02:00
Christian Fiedler
ed75517f26 done 2013-10-22 13:39:16 +02:00
Christian Fiedler
9bfd258480 done 2013-10-22 13:31:08 +02:00
stubbfel
e556017dc8 add geomappoint 2013-10-22 12:15:42 +02:00
stubbfel
8f4f2c88f7 add docs 2013-10-22 11:01:29 +02:00
stubbfel
99f465bb0c add docs 2013-10-22 10:17:47 +02:00
stubbfel
23ccf8de0e Merge branch 'release/r' into develmaster 2013-10-21 18:52:45 +02:00
stubbfel
c1ef3c13bb Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-10-21 18:51:15 +02:00
stubbfel
b6df184f04 add mapoint 2013-10-21 18:51:09 +02:00
Christian Fiedler
e38f113443 #262 2013-10-21 18:41:21 +02:00
Christian Fiedler
d30d38c1e9 after merge 2013-10-21 18:05:20 +02:00
Christian Fiedler
fc52a18911 after merge 2013-10-21 18:00:14 +02:00
Christian Fiedler
ab6990786d #244 #256 #PortraitLandscapePage 2013-10-21 17:51:19 +02:00
stubbfel
09a7626d49 Merge branch 'feature/#260' into develop 2013-10-21 15:14:29 +02:00
stubbfel
dcff024136 fix docs 2013-10-21 15:14:18 +02:00
stubbfel
d296fe25ea no message 2013-10-21 15:04:24 +02:00
stubbfel
12eb1de958 mv geodb to plc 2013-10-21 15:03:34 +02:00
stubbfel
b4469549be refactor person models 2013-10-21 13:35:11 +02:00
Christian Fiedler
3174669fb1 #256 #244 2013-10-18 21:53:55 +02:00
stubbfel
2b260b2a0b Merge branch 'release/#release' into develmaster 2013-10-18 13:01:53 +02:00
stubbfel
02fc7e4ba5 Merge branch 'feature/release20131018' into develop 2013-10-18 13:01:16 +02:00
stubbfel
224d1efdfc fix names 2013-10-18 13:01:03 +02:00
stubbfel
875fc05fa8 release fixes 2013-10-18 12:32:25 +02:00
stubbfel
5661765481 Merge branch 'release/rc2' into develmaster 2013-10-18 09:36:25 +02:00
stubbfel
af37d3e760 Merge branch 'feature/#257' into develop 2013-10-18 09:35:28 +02:00
stubbfel
a4769600f5 change namespace of taghandler and add docs 2013-10-18 09:32:53 +02:00
stubbfel
a81c36280b update screenshots, change scannfc msgbox, rssbackground to 3 hupdates 2013-10-18 09:14:52 +02:00
stubbfel
0ef0870509 Merge branch 'release/r#255' into develmaster 2013-10-16 15:15:28 +02:00