Commit Graph

566 Commits

Author SHA1 Message Date
Christian Fiedler
13a0cb2cd4 after merge 2013-10-07 08:30:56 +02:00
Christian Fiedler
018619e599 Merge branch 'develop' into feature/#173
Conflicts:
	CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
	CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop
2013-10-02 19:03:20 +02:00
Christian Fiedler
6be3154818 no message 2013-10-02 19:01:48 +02:00
Christian Fiedler
d8e28522b0 week view finished & canvas creations 2013-10-02 18:59:16 +02:00
stubbfel
3869bbda5b finish #213 2013-10-02 16:12:15 +02:00
stubbfel
b702b0bfd9 Merge branch 'feature/#211' into develop 2013-10-02 13:28:07 +02:00
stubbfel
710b4c1e07 finish#211 2013-10-02 13:27:45 +02:00
stubbfel
d9838ddc16 fixes 2013-10-02 13:25:14 +02:00
stubbfel
ca3bd2381f mv lecture 2013-10-02 12:48:35 +02:00
stubbfel
6ea8d06a0e fix person models 2013-10-02 12:01:46 +02:00
Christian Fiedler
e4257b1e73 canvas fix in appointmentmodel 2013-10-01 18:00:20 +02:00
stubbfel
87fc00071a setup commit 2013-10-01 16:34:48 +02:00
stubbfel
f3d0667310 mv personmodels 2013-10-01 16:34:03 +02:00
stubbfel
7668450d9c mv listpickers 2013-10-01 14:53:03 +02:00
stubbfel
dc3c527996 mv enums 2013-10-01 14:10:20 +02:00
stubbfel
80d05b9c45 mv studentcouncil 2013-10-01 13:51:15 +02:00
stubbfel
5de000ef17 mv exams 2013-10-01 13:49:53 +02:00
stubbfel
c26344fc40 mv CourseModel 2013-10-01 13:25:27 +02:00
stubbfel
cb3dd94b55 mv openinghours 2013-10-01 13:22:39 +02:00
stubbfel
71d113f819 mv linkModels 2013-10-01 12:04:21 +02:00
stubbfel
7b879319b2 set sylechecks 2013-10-01 11:54:50 +02:00
stubbfel
ca9eab8bd5 add abstractMainModel 2013-10-01 11:36:50 +02:00
Christian Fiedler
cd8d94b7ee Merge branch 'develop' into feature/#173 2013-10-01 11:28:28 +02:00
Christian Fiedler
f3507c7960 week view first submit 2013-10-01 11:27:15 +02:00
stubbfel
8527f657fc end day 2013-09-30 18:43:40 +02:00
stubbfel
a898477394 Merge branch 'feature/#207' into develop 2013-09-30 16:04:46 +02:00
stubbfel
a0d68f8d3f add svgs 2013-09-30 16:04:36 +02:00
stubbfel
1753954c33 finish #190 2013-09-30 16:03:51 +02:00
stubbfel
ffa91ee8fd add icons 2013-09-30 15:21:37 +02:00
stubbfel
93c9bbe5d1 new offlinemap 2013-09-30 13:43:58 +02:00
stubbfel
c89fb9ab79 refactor backgroundagent 2013-09-30 11:41:41 +02:00
stubbfel
329e5525e3 fix #205 2013-09-30 11:01:57 +02:00
stubbfel
7c43d8cd70 Merge branch 'hotfix/#209' into develop 2013-09-30 10:40:06 +02:00
stubbfel
1cd34afb9c add asserts 2013-09-30 10:39:46 +02:00
stubbfel
a8b2d33826 Merge branch 'release/r#201#2003' into develop 2013-09-26 15:40:19 +02:00
stubbfel
8dfb7693ac Merge branch 'release/r#201#2003' into develmaster 2013-09-26 15:40:06 +02:00
stubbfel
77b30b35c5 fix releas issue 2013-09-26 15:39:37 +02:00
stubbfel
d565b332e8 Merge branch 'feature/#203' into develop 2013-09-26 14:33:23 +02:00
stubbfel
995edbc32a add svgs 2013-09-26 14:33:11 +02:00
stubbfel
05168211b7 add docs 2013-09-26 14:32:22 +02:00
stubbfel
1dbd2be23f add lens extension 2013-09-26 11:24:53 +02:00
Christian Fiedler
d2157f64b2 create appointment done 2013-09-25 20:20:46 +02:00
stubbfel
0396a62301 sort infolist 2013-09-25 13:41:26 +02:00
stubbfel
dd709f8937 add new offline map , zindex, new icon 2013-09-25 13:25:13 +02:00
Christian Fiedler
cb9b2d62a4 appointment edit/create 2013-09-24 17:55:54 +02:00
Christian Fiedler
29efcd8ddb finished multi appointment 2013-09-24 17:02:19 +02:00
stubbfel
5c1891459b extend campusmap 2013-09-24 16:21:26 +02:00
stubbfel
b075e5bb7e straro 2013-09-24 10:19:20 +02:00
stubbfel
750ebe4e22 Merge branch 'feature/#201' into develop 2013-09-23 18:48:53 +02:00
stubbfel
162c7042ae finish #201 2013-09-23 18:48:39 +02:00