Commit Graph

766 Commits

Author SHA1 Message Date
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
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
Christian Fiedler
d9b732c27b Merge branch 'feature/#173' into develop 2013-11-18 16:08:21 +01:00
Christian Fiedler
cf56df35d3 merged with develop 2013-11-18 16:08:05 +01:00
Christian Fiedler
b604f02ec7 Merge branch 'develop' into feature/#173 2013-11-18 15:50:36 +01:00
stubbfel
b139e9e0e3 new copyfunction and guifixes (mensapige) 2013-11-18 15:41:35 +01:00
stubbfel
6e5d7c308c add accuracy paramter and save command 2013-11-18 13:06:59 +01:00
stubbfel
55f2cf0705 Merge branch 'hotfix/#277' into develop 2013-11-18 11:38:25 +01:00
stubbfel
cea07ff526 add null assert 2013-11-18 11:37:07 +01:00
Christian Fiedler
03b60a40ff nearly done #270 2013-11-15 18:17:02 +01:00
Christian Fiedler
940718e805 intermediat commit 2013-11-15 17:34:42 +01:00
Christian Fiedler
29effd04af Merge branch 'feature/#243' into develop 2013-11-15 14:57:30 +01:00
Christian Fiedler
91c90bce28 done, but not final 2013-11-15 14:57:08 +01:00
Christian Fiedler
d264900b13 nearly done 2013-11-14 20:50:04 +01:00
Christian Fiedler
525964d094 Merge branch 'feature/#204' into develop 2013-11-14 18:19:32 +01:00
Christian Fiedler
4ecc87f863 #204 2013-11-14 18:18:02 +01:00
Christian Fiedler
9607518318 end of day commit 2013-11-13 17:40:10 +01:00
Christian Fiedler
c7f7566e5a Rotation functions added 2013-11-13 14:39:23 +01:00
Christian Fiedler
fa5d2e17e5 #269 done 2013-11-13 13:46:53 +01:00
Christian Fiedler
8365b5b0dc TimeTable done 2013-11-12 17:19:47 +01:00
Christian Fiedler
39f70beab7 TimeSpan-from-ToDay relative loading 2013-11-11 17:46:20 +01:00
Christian Fiedler
6197a4cc12 added timespan-from-today relative appointment loading 2013-11-11 15:15:40 +01:00
Christian Fiedler
d89b544cf0 DayView done 2013-11-08 18:25:22 +01:00
Christian Fiedler
4425a4f562 TimeTableWeek done 2013-11-06 16:55:39 +01:00
Christian Fiedler
1e7d9767ec daily 2013-11-05 19:13:42 +01:00
Christian Fiedler
c225d3b9be daily commit 2013-11-04 19:14:32 +01:00
Christian Fiedler
f1cf9cdefb daily commit 2013-10-29 19:09:22 +01:00
Christian Fiedler
56228da641 daily commit 2013-10-28 19:17:29 +01:00
Christian Fiedler
168f72b979 Merge branch 'develop' into feature/#173 2013-10-25 10:55:20 +02:00
Christian Fiedler
4b33e1fe34 i can see a weekview 2013-10-24 19:26:11 +02:00
Christian Fiedler
c6ea2b5ed7 bla 2013-10-24 13:38:39 +02:00
stubbfel
df6dac4944 Merge branch 'release/r' into develmaster 2013-10-24 13:00:29 +02:00
stubbfel
900d7e1bcd update work folder 2013-10-24 12:58:17 +02:00