Commit Graph

388 Commits

Author SHA1 Message Date
Christian Fiedler
589bee809f fixed static name 2013-09-05 14:20:53 +02:00
Christian Fiedler
e02c2d3607 adding classes to dict 2013-09-04 18:59:03 +02:00
Christian Fiedler
4fba48225b ics classes done 2013-09-04 17:28:30 +02:00
Christian Fiedler
f73d722555 ics classes, statics 2013-09-03 18:49:52 +02:00
Christian Fiedler
53fb8599d1 ics classes 2013-09-02 18:09:19 +02:00
Christian Fiedler
81893c8224 added ics classes 2013-08-29 17:05:05 +02:00
Christian Fiedler
4140f2771e dictionary done 2013-08-28 18:05:16 +02:00
Christian Fiedler
880422dc41 ics import 2013-08-26 17:34:58 +02:00
Christian Fiedler
dd468d83f5 Merge branch 'hotfix/QRreader_btn' into develop 2013-08-22 16:01:12 +02:00
Christian Fiedler
d1b95c133d added qr-reader to startpage appbar 2013-08-22 16:00:42 +02:00
stubbfel
6b56b497d2 Merge branch 'release/#166' into develmaster 2013-08-22 15:37:34 +02:00
stubbfel
7c65aba801 update ignore 2013-08-22 15:36:36 +02:00
stubbfel
9d2da2ee41 Merge branch 'feature/#166' into develop 2013-08-22 15:16:43 +02:00
stubbfel
015abffa6e fixes 2013-08-22 15:16:25 +02:00
stubbfel
50012c8ab9 finish nfcpage 2013-08-22 15:11:59 +02:00
Christian Fiedler
e68667c0aa Merge branch 'release/#168' into develmaster 2013-08-21 17:58:29 +02:00
Christian Fiedler
4d161d5a0f #168 2013-08-21 17:57:24 +02:00
stubbfel
065a8e62c3 end day 2013-08-21 16:34:32 +02:00
stubbfel
ac67505a1d add toNfcString 2013-08-21 15:55:40 +02:00
Christian Fiedler
6c7db0698a Merge branch 'hotfix/#160_#161' into develop 2013-08-21 15:43:21 +02:00
Christian Fiedler
3677988087 Merge branch 'hotfix/#160_#161' into develmaster 2013-08-21 15:43:20 +02:00
Christian Fiedler
47e4b18ce5 #160 #161 2013-08-21 15:42:51 +02:00
stubbfel
dff16799a3 fix messages 2013-08-21 15:26:32 +02:00
stubbfel
e0d1082a93 add NDEFMessage 2013-08-21 11:50:24 +02:00
stubbfel
ebdefaa5e6 add ndefdraft 2013-08-20 16:25:47 +02:00
Christian Fiedler
936f01daf1 Merge branch 'release/#17' into develmaster 2013-08-20 15:56:40 +02:00
Christian Fiedler
d9d8b58f31 Merge branch 'feature/#17' into develop
Conflicts:
	CampusAppWP8/CampusAppWP8/packages.config
2013-08-20 15:55:41 +02:00
Christian Fiedler
f5f2b29f51 reset to StartPage 2013-08-20 15:37:58 +02:00
Christian Fiedler
161db589da #17 2013-08-20 15:32:58 +02:00
stubbfel
b5b3711093 Merge branch 'release/#rcampusmap' into develmaster 2013-08-20 10:55:03 +02:00
stubbfel
f3ff78c6ab Merge branch 'feature/#151' into develop 2013-08-20 10:44:25 +02:00
stubbfel
0e3eac2c6a add offline map 2013-08-20 10:41:43 +02:00
stubbfel
5af71df73f update ignero 2013-08-19 15:48:38 +02:00
stubbfel
51a8e4e515 add placesearch 2013-08-19 15:39:19 +02:00
stubbfel
cbe5325785 mv dispatcher 2013-08-19 11:11:24 +02:00
stubbfel
305737366e update doku 2013-08-15 15:28:20 +02:00
stubbfel
10e1ecb220 Merge branch 'release/#157_#159' into develmaster 2013-08-15 14:42:08 +02:00
stubbfel
15ee2cd3aa change icons in mealmodel 2013-08-15 14:05:03 +02:00
stubbfel
24c4e79c84 Merge branch 'feature/#157' into develop 2013-08-15 13:53:11 +02:00
stubbfel
38fbbfe053 add onfailing to all pages which use MainModel 2013-08-15 13:52:13 +02:00
stubbfel
af62e79351 add failonweb and onfile do mensapage 2013-08-15 13:11:34 +02:00
stubbfel
5fcdeb4d24 Merge branch 'develop' into feature/#157 2013-08-15 13:04:46 +02:00
stubbfel
c1136de32a extend erromsg 2013-08-15 13:04:04 +02:00
stubbfel
fd8ea7ccb7 add errormessgesboxes 2013-08-15 12:58:58 +02:00
Christian Fiedler
71025bee01 Merge branch 'release/#152_#158' into develmaster 2013-08-15 12:26:29 +02:00
Christian Fiedler
143cfd7fae #152 #158 2013-08-15 12:24:02 +02:00
stubbfel
39fa393745 add onFailed to mensaplan 2013-08-15 11:10:49 +02:00
Christian Fiedler
bac1c05e33 Merge branch 'hotfix/onFailedSave_WriteThread' into develop 2013-08-14 14:32:20 +02:00
Christian Fiedler
df584aa524 Merge branch 'hotfix/onFailedSave_WriteThread' into develmaster 2013-08-14 14:32:19 +02:00
Christian Fiedler
504cc8bb50 onFailedSave_WriteThread 2013-08-14 14:32:02 +02:00