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
|
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 |
|
Christian Fiedler
|
543247cea2
|
multi appointments
|
2013-09-23 18:16:19 +02:00 |
|
stubbfel
|
85cb54f0e1
|
add roomlist
|
2013-09-23 18:06:02 +02:00 |
|
Christian Fiedler
|
824bd7c8b1
|
no message
|
2013-09-23 14:01:54 +02:00 |
|
Christian Fiedler
|
3ce33a803b
|
bla
|
2013-09-23 14:00:05 +02:00 |
|
stubbfel
|
4047aacf0f
|
att roomlistpage
|
2013-09-23 13:09:27 +02:00 |
|
stubbfel
|
94c538a429
|
Merge branch 'hotfix/#200' into develop
|
2013-09-23 10:30:37 +02:00 |
|
stubbfel
|
d23c6431f1
|
Merge branch 'hotfix/#200' into develmaster
|
2013-09-23 10:30:36 +02:00 |
|
stubbfel
|
fc0e7fba64
|
add else and pragma
|
2013-09-23 10:29:48 +02:00 |
|
Christian Fiedler
|
5f7a563f26
|
merged develop into #173
|
2013-09-23 09:55:33 +02:00 |
|
stubbfel
|
87436ef6e8
|
Merge branch 'release/r' into develmaster
|
2013-09-19 14:27:57 +02:00 |
|
stubbfel
|
2f2237eae2
|
fix map issues
|
2013-09-19 14:27:28 +02:00 |
|
stubbfel
|
e734a750ff
|
add new offline map
|
2013-09-19 14:09:12 +02:00 |
|
stubbfel
|
621aadc9a0
|
Merge branch 'release/r#196' into develmaster
|
2013-09-19 13:12:16 +02:00 |
|
stubbfel
|
7183d6de01
|
Merge branch 'feature/#196' into develop
|
2013-09-19 13:10:16 +02:00 |
|
stubbfel
|
771e1fc7b5
|
add nfc and qr to map
|
2013-09-19 12:34:53 +02:00 |
|
stubbfel
|
04ff3ad80b
|
add filter pid medhod to stringmanager
|
2013-09-19 10:55:07 +02:00 |
|
stubbfel
|
30163addaf
|
Merge branch 'release/r#188' into develmaster
r#188
|
2013-09-18 16:23:41 +02:00 |
|
stubbfel
|
e1b6a2d279
|
add qr and nfc scan to placeNewspage
|
2013-09-18 16:21:46 +02:00 |
|
stubbfel
|
2a02529116
|
Merge branch 'feature/#188' into develop
|
2013-09-18 14:51:14 +02:00 |
|
stubbfel
|
870b7c1f4c
|
add stylecops
|
2013-09-18 14:50:59 +02:00 |
|
stubbfel
|
2f5c104860
|
add docs
|
2013-09-18 14:50:32 +02:00 |
|
stubbfel
|
a12735674b
|
Merge branch 'hotfix/#194' into develop
|
2013-09-18 12:02:00 +02:00 |
|
stubbfel
|
1fde76dfd6
|
Merge branch 'hotfix/#194' into develmaster
|
2013-09-18 12:01:59 +02:00 |
|