Commit Graph

799 Commits

Author SHA1 Message Date
stubbfel
dbd414a19c Merge branch 'release/#r' into develmaster 2013-11-28 12:18:33 +01:00
stubbfel
a31149215b new icons 2013-11-28 12:17:47 +01:00
stubbfel
8a2319110f ad copyrights to the impressum 2013-11-28 09:44:48 +01:00
Christian Fiedler
b11912fa91 Merge branch 'develop' into feature/#290 2013-11-27 14:55:01 +01:00
Christian Fiedler
cf81722efe temp commit 2013-11-27 14:54:36 +01:00
stubbfel
441af8e2a2 fix #276 2013-11-27 13:50:41 +01:00
Christian Fiedler
c3d68f726c Merge branch 'develop' into feature/#290
Conflicts:
	CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
2013-11-27 13:40:39 +01:00
stubbfel
aa9e0f3636 change informationvalue search from contains to equals 2013-11-27 13:38:26 +01:00
stubbfel
8c2ce5db35 refactor impressum 2013-11-27 12:12:44 +01:00
stubbfel
eb012a8d03 Merge branch 'feature/#155' into develop 2013-11-27 11:14:57 +01:00
stubbfel
560fbaea95 fix bugs 2013-11-27 10:12:11 +01:00
Christian Fiedler
e571e3e2e1 daily commit 2013-11-26 19:06:59 +01:00
Christian Fiedler
a1256ff18e Merge branch 'develop' into feature/#290 2013-11-26 16:22:11 +01:00
Christian Fiedler
11016d033f temp commit 2013-11-26 16:21:30 +01:00
stubbfel
a2f1a7082d add listpicker 2013-11-26 15:24:25 +01:00
stubbfel
abd3488608 adddisplaysetting and unicolor 2013-11-26 11:25:10 +01:00
stubbfel
0ebe01dfe6 finish #292 2013-11-26 09:55:55 +01:00
stubbfel
6c77228a45 Merge branch 'feature/#282' into develop 2013-11-25 18:44:37 +01:00
stubbfel
41780b5c35 finish #282 2013-11-25 18:43:36 +01:00
stubbfel
8e5d761748 add todefault button and refreshpage interface 2013-11-25 16:34:51 +01:00
stubbfel
3a7be7d754 add settingstypes 2013-11-25 16:06:46 +01:00
stubbfel
f721d8547c add Locating, Network setting model 2013-11-25 15:30:27 +01:00
Christian Fiedler
4b022cf099 #286 done 2013-11-25 14:50:35 +01:00
stubbfel
7e0a7b25ef add functionsetting,tagsetting, timetamlbe setting 2013-11-25 14:37:07 +01:00
Christian Fiedler
e741652f7e Merge branch 'feature/#285' into develop 2013-11-25 14:14:42 +01:00
Christian Fiedler
edefc17879 #285 done 2013-11-25 14:14:03 +01:00
stubbfel
e6bd2c3df2 add mensasetting 2013-11-25 13:30:53 +01:00
stubbfel
ad3c73dcf2 add functionsetting page 2013-11-25 12:34:01 +01:00
stubbfel
c92e301a7e add menu entries 2013-11-25 10:53:11 +01:00
Christian Fiedler
1589220445 daily commit 2013-11-22 21:54:35 +01:00
Christian Fiedler
ea717fcef0 #284 fixed 2013-11-22 21:24:21 +01:00
Christian Fiedler
f2c32ce2db Merge branch 'feature/#243' into develop 2013-11-22 20:57:33 +01:00
Christian Fiedler
37460f1555 #243 done 2013-11-22 20:57:17 +01:00
Christian Fiedler
d6ff7890c4 Merge branch 'develop' into feature/#243 2013-11-22 11:16:37 +01:00
stubbfel
43c1e203f8 Merge branch 'release/newstart' into develmaster 2013-11-21 13:35:26 +01:00
stubbfel
70d464b4f5 change tilestyle 2013-11-21 13:34:10 +01:00
stubbfel
adb57146f7 Merge branch 'feature/#189' into develop 2013-11-21 13:23:33 +01:00
stubbfel
d81599f367 finish new startpage 2013-11-21 13:23:04 +01:00
stubbfel
c6b1c73d9e final layout 2013-11-21 11:13:11 +01:00
stubbfel
cba34ffa60 new startpage layout 2013-11-20 15:37:42 +01:00
stubbfel
81594caa96 Merge branch 'feature/#280' into develop 2013-11-19 15:22:02 +01:00
stubbfel
697256e49d add appointment to eventpage 2013-11-19 15:21:49 +01:00
stubbfel
18501ed6ca Merge branch 'develop' into feature/#280 2013-11-19 14:18:59 +01:00
stubbfel
ac42cca415 ad to Appointment 2013-11-19 14:18:29 +01:00
Christian Fiedler
5cb5ac0536 loading 2013-11-19 13:28:17 +01:00
Christian Fiedler
5605491ea9 a 2013-11-19 13:17:24 +01:00
stubbfel
5c21a61167 add lecutre dates 2013-11-18 18:41:47 +01:00
stubbfel
8fa38d3014 Merge branch 'feature/#281' into develop 2013-11-18 17:10:45 +01:00
stubbfel
47660d34ea enable datecreation to qrcode 2013-11-18 17:10:11 +01:00
stubbfel
0b3aec7084 add handler 2013-11-18 16:47:39 +01:00