Commit Graph

745 Commits

Author SHA1 Message Date
Christian Fiedler
b604f02ec7 Merge branch 'develop' into feature/#173 2013-11-18 15:50:36 +01:00
stubbfel
b139e9e0e3 new copyfunction and guifixes (mensapige) 2013-11-18 15:41:35 +01:00
stubbfel
6e5d7c308c add accuracy paramter and save command 2013-11-18 13:06:59 +01:00
stubbfel
55f2cf0705 Merge branch 'hotfix/#277' into develop 2013-11-18 11:38:25 +01:00
stubbfel
cea07ff526 add null assert 2013-11-18 11:37:07 +01:00
Christian Fiedler
03b60a40ff nearly done #270 2013-11-15 18:17:02 +01:00
Christian Fiedler
940718e805 intermediat commit 2013-11-15 17:34:42 +01:00
Christian Fiedler
29effd04af Merge branch 'feature/#243' into develop 2013-11-15 14:57:30 +01:00
Christian Fiedler
91c90bce28 done, but not final 2013-11-15 14:57:08 +01:00
Christian Fiedler
d264900b13 nearly done 2013-11-14 20:50:04 +01:00
Christian Fiedler
525964d094 Merge branch 'feature/#204' into develop 2013-11-14 18:19:32 +01:00
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
Christian Fiedler
8365b5b0dc TimeTable done 2013-11-12 17:19:47 +01:00
Christian Fiedler
39f70beab7 TimeSpan-from-ToDay relative loading 2013-11-11 17:46:20 +01:00
Christian Fiedler
6197a4cc12 added timespan-from-today relative appointment loading 2013-11-11 15:15:40 +01:00
Christian Fiedler
d89b544cf0 DayView done 2013-11-08 18:25:22 +01:00
Christian Fiedler
4425a4f562 TimeTableWeek done 2013-11-06 16:55:39 +01:00
Christian Fiedler
1e7d9767ec daily 2013-11-05 19:13:42 +01:00
Christian Fiedler
c225d3b9be daily commit 2013-11-04 19:14:32 +01:00
Christian Fiedler
f1cf9cdefb daily commit 2013-10-29 19:09:22 +01:00
Christian Fiedler
56228da641 daily commit 2013-10-28 19:17:29 +01:00
Christian Fiedler
168f72b979 Merge branch 'develop' into feature/#173 2013-10-25 10:55:20 +02:00
Christian Fiedler
4b33e1fe34 i can see a weekview 2013-10-24 19:26:11 +02:00
Christian Fiedler
c6ea2b5ed7 bla 2013-10-24 13:38:39 +02:00
stubbfel
df6dac4944 Merge branch 'release/r' into develmaster 2013-10-24 13:00:29 +02: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
5e598befd9 Merge branch 'release/#aadsubmodul' into develmaster 2013-10-24 11:34:10 +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
48844cb23e Merge branch 'hotfix/mvpage' into develmaster 2013-10-22 14:27:57 +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