Commit Graph

591 Commits

Author SHA1 Message Date
stubbfel
b98f85166c Merge branch 'release/#240' into develmaster 2013-10-14 11:53:27 +02:00
stubbfel
67241bdca9 add adom prefs 2013-10-14 11:52:40 +02:00
Christian Fiedler
bb611d60e5 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-10-11 14:50:13 +02:00
Christian Fiedler
c06828e411 news & event feed safety fix 2013-10-11 14:50:02 +02:00
stubbfel
d6ddd42075 Merge branch 'release/#rc1' into develmaster 2013-10-11 14:43:08 +02:00
stubbfel
38e75365ef add doku 2013-10-11 14:42:47 +02:00
stubbfel
4c09ec4139 fix person bug 2013-10-11 14:35:09 +02:00
stubbfel
874636b5af Merge branch 'feature/addseapkericon' into develop 2013-10-11 14:16:40 +02:00
stubbfel
dcec407160 fix speakersize 2013-10-11 14:15:59 +02:00
stubbfel
a454cd50f1 add speaker icon 2013-10-11 14:14:41 +02:00
Christian Fiedler
1cc19e0b74 Merge branch 'feature/#234' into develop 2013-10-11 13:56:31 +02:00
Christian Fiedler
e78a03d403 fixed 2013-10-11 13:56:12 +02:00
Christian Fiedler
027de4972d Merge branch 'develop' into feature/#234 2013-10-11 13:48:16 +02:00
Christian Fiedler
80f1b9ef5c before merge 2013-10-11 13:47:47 +02:00
stubbfel
f0d1fd4cf2 Merge branch 'feature/listfixes' into develop 2013-10-11 13:46:15 +02:00
stubbfel
f06cb08d7b finish 2013-10-11 13:45:05 +02:00
stubbfel
59a726370e finish 2013-10-11 13:44:46 +02:00
Christian Fiedler
baafabc5c1 no message 2013-10-11 13:25:36 +02:00
stubbfel
c63e3611c1 sort News and Event in backgroundagent 2013-10-11 10:52:28 +02:00
stubbfel
ecba094362 new offline map 2013-10-11 10:43:10 +02:00
Christian Fiedler
931d063d1b Merge branch 'release/#220' into develmaster 2013-10-10 18:14:10 +02:00
Christian Fiedler
5115ffa540 Merge branch 'feature/#220' into develop 2013-10-10 18:13:36 +02:00
Christian Fiedler
4c803da166 fixed #220 2013-10-10 18:12:58 +02:00
stubbfel
926e694eba Merge branch 'feature/#215' into develop 2013-10-10 17:37:11 +02:00
stubbfel
7eced53e92 add new files 2013-10-10 17:36:54 +02:00
stubbfel
4a36b1ba36 add btutaghandler 2013-10-10 17:36:02 +02:00
stubbfel
ecf1147c92 add but Tag info 2013-10-10 14:18:44 +02:00
stubbfel
81e2ec2fb2 some fixes and new sorted startpage 2013-10-10 11:45:19 +02:00
Christian Fiedler
9d441ad478 Merge branch 'feature/#229' into develop 2013-10-09 17:56:44 +02:00
Christian Fiedler
e94bffdab4 #229 #227 #225 #221 #218 #187 2013-10-09 17:55:28 +02:00
stubbfel
3ac3c6221d Merge branch 'feature/#214' into develop 2013-10-09 17:28:55 +02:00
stubbfel
92918be6a7 finish#214 2013-10-09 17:13:09 +02:00
stubbfel
094b769f99 Merge branch 'develop' into feature/#214 2013-10-09 11:45:24 +02:00
stubbfel
31da6d78a7 finish #216 2013-10-09 11:43:49 +02:00
stubbfel
1a9cadc805 pause 2013-10-09 11:22:39 +02:00
stubbfel
1193dda749 aqdd buildmap 2013-10-08 18:16:27 +02:00
stubbfel
916ca31713 finish day2 2013-10-08 18:15:53 +02:00
Christian Fiedler
7a52b2ca39 begin 2013-10-08 17:02:41 +02:00
stubbfel
0696798624 Merge branch 'develop' into feature/#214 2013-10-08 16:10:53 +02:00
stubbfel
d19aae4ff0 fixes 2013-10-08 16:10:39 +02:00
stubbfel
8191b87779 Merge branch 'develop' of 141.43.76.143:repos/bare/win8phoneApp into develop 2013-10-08 15:53:24 +02:00
Christian Fiedler
2686deeb0b Merge branch 'feature/#218' into develop 2013-10-08 15:52:06 +02:00
Christian Fiedler
50c1c32466 #222 done 2013-10-08 15:51:16 +02:00
stubbfel
8010781f51 finish #224 2013-10-08 15:50:53 +02:00
stubbfel
e628993a17 finish #226 2013-10-08 15:18:01 +02:00
stubbfel
bb73622aa1 finish #228 2013-10-08 13:46:41 +02:00
stubbfel
f9c2f95ea5 finish 230 2013-10-08 12:50:04 +02:00
stubbfel
0f3bbc3cf6 fix personpage 2013-10-08 12:09:25 +02:00
stubbfel
92097cf881 add header to userprofil 2013-10-08 11:17:06 +02:00
stubbfel
cefe681199 new roomlist 2013-10-08 10:24:36 +02:00