Commit Graph

364 Commits

Author SHA1 Message Date
stubbfel
50012c8ab9 finish nfcpage 2013-08-22 15:11:59 +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
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
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
Christian Fiedler
ad6e674f4e Merge branch 'hotfix/#126' into develop 2013-08-14 12:49:01 +02:00
Christian Fiedler
c8f4f743f8 Merge branch 'hotfix/#126' into develmaster 2013-08-14 12:49:00 +02:00
Christian Fiedler
5253217de8 #126 and OnFailed callbacks 2013-08-14 12:43:52 +02:00
stubbfel
12743066c2 Merge branch 'release/r#147' into develop 2013-08-13 15:55:17 +02:00
stubbfel
a7bd54f3a8 Merge branch 'release/r#147' into develmaster 2013-08-13 15:55:17 +02:00
stubbfel
fc69f8054f fix startpage 2013-08-13 15:54:57 +02:00
stubbfel
778c22ff39 Merge branch 'feature/#148' into develop 2013-08-13 15:51:51 +02:00
stubbfel
1566f2382d overide geowatcher and add cbmainmapmodel 2013-08-13 15:50:17 +02:00
stubbfel
d7c914eed6 set scale 2013-08-13 10:50:31 +02:00
stubbfel
39b292e3c3 add testmap 2013-08-12 19:32:28 +02:00
stubbfel
270a390807 Merge branch 'release/r#117#146#147' into develmaster 2013-08-12 17:21:29 +02:00
stubbfel
a55c89dd77 change icon 2013-08-12 17:20:04 +02:00
stubbfel
5ce8c21266 Merge branch 'feature/#147' into develop 2013-08-12 17:16:48 +02:00
stubbfel
aad425e2a3 addcampusapi 2013-08-12 17:15:54 +02:00
Christian Fiedler
0bc533353f Merge branch 'hotfix/#117' into develmaster 2013-08-12 16:52:57 +02:00
Christian Fiedler
3a0b7d8b83 Merge branch 'hotfix/#117' into develop 2013-08-12 16:52:57 +02:00
Christian Fiedler
98fba92a17 #117 fixed tiles 2013-08-12 16:52:28 +02:00
stubbfel
f6b2237b20 add all mensafeed 2013-08-12 16:32:16 +02:00
stubbfel
8d03fbc905 add appsettingsite #145 2013-08-12 10:55:59 +02:00
stubbfel
ab58fabc6e Merge branch 'release/r#146' into develmaster 2013-08-08 15:55:30 +02:00
stubbfel
2f99cfd21a # add camupslist 2013-08-08 15:54:33 +02:00
stubbfel
8fc22539be mv userprofil to isalated storage 2013-08-08 15:15:15 +02:00
stubbfel
4a309ad980 Merge branch 'release/r#141' into develmaster r#141 2013-08-08 13:56:34 +02:00
stubbfel
c301f908ad Merge branch 'feature/#141' into develop 2013-08-08 13:55:03 +02:00