Commit Graph

495 Commits

Author SHA1 Message Date
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
stubbfel
85cb54f0e1 add roomlist 2013-09-23 18:06:02 +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
fc0e7fba64 add else and pragma 2013-09-23 10:29:48 +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
stubbfel
d85003bf2a fix Outof Range Exception 2013-09-18 12:01:43 +02:00
stubbfel
4a76622165 fix news issue 2013-09-18 11:52:52 +02:00
stubbfel
a54b1aa095 refactor costasnt and appresource 2013-09-17 16:05:17 +02:00
stubbfel
b92208a947 rm mensa and rssmodel from other projects 2013-09-17 15:42:42 +02:00
stubbfel
ad9bbb2342 add rss and mensa model to plc 2013-09-17 15:32:42 +02:00
stubbfel
98d8a43961 add event and news task 2013-09-17 13:48:37 +02:00
stubbfel
b0a8b8f6af add shcedulagent 2013-09-16 19:11:05 +02:00
stubbfel
e5bde7a95b add TileCreator 2013-09-16 16:32:39 +02:00
stubbfel
c01caf703a fix some mapissue and extend functions 2013-09-16 15:18:43 +02:00
stubbfel
0d6d455c1e Merge branch 'hotfix/#191' into develmaster 2013-09-16 10:56:33 +02:00
stubbfel
98213ff494 Merge branch 'hotfix/#191' into develop 2013-09-16 10:56:33 +02:00
stubbfel
2a6b26a2c1 fix the getPlacesByInformations 2013-09-16 10:56:14 +02:00
stubbfel
8f888c4796 Merge branch 'release/#r' into develop 2013-09-12 16:11:19 +02:00
stubbfel
d276e0984e Merge branch 'release/#r' into develmaster 2013-09-12 16:11:01 +02:00
stubbfel
3bcf6314d5 add doku 2013-09-12 16:07:55 +02:00
stubbfel
2f622c0318 add doku 2013-09-12 16:04:33 +02:00
stubbfel
42ddddfa2b add regions 2013-09-12 16:02:00 +02:00
stubbfel
df4fd8ee3d update Appdll and plib 2013-09-12 12:41:23 +02:00
stubbfel
5fb0d589c1 mv qrreader to devpage 2013-09-12 12:06:50 +02:00
stubbfel
3b4e200daa edit utilities 2013-09-12 11:54:19 +02:00
stubbfel
b6140e240c add new icon to the page 2013-09-12 11:43:18 +02:00
stubbfel
a3a8937028 edit file classes 2013-09-12 10:59:17 +02:00
stubbfel
fbf66ddba0 mv favoritfeed to favoritfile 2013-09-12 10:45:54 +02:00
stubbfel
a065ab4a34 edite checkisupdate method 2013-09-12 10:38:17 +02:00
stubbfel
69a42f300a edit api and assets 2013-09-12 10:06:36 +02:00
stubbfel
f8f6436e2b add filter add placenews 2013-09-11 16:06:23 +02:00
stubbfel
15ebfdd96d Merge branch 'release/r184#136#40' into develop 2013-09-10 16:17:18 +02:00
stubbfel
1ce20feff4 Merge branch 'release/r184#136#40' into develmaster 2013-09-10 16:17:17 +02:00
stubbfel
096abee33a some fixes 2013-09-10 16:17:01 +02:00
stubbfel
9846b8af33 Merge branch 'feature/#136' into develop 2013-09-10 16:09:12 +02:00