c0cd519a4fworking on cache and controllers
maint/lp
Lucas Pleß
2012-05-26 01:56:44 +0200
892a7e6905working on ethersex stuff
Lucas Pleß
2012-05-25 18:02:59 +0200
8c363fbf64Anderungen am Controller. Die Kanalwerte werden nicht in der DB gespeichert, deswegen bekommt man immer 0 zurueck wenn man sich die Geräte holt. Leider nicht funktional soweit
Lucas Ple
2012-05-25 15:52:42 +0200
f98ab7c225blau
Lucas Pleß
2012-05-11 00:44:30 +0200
6b41c9cb92Merge remote-tracking branch 'remotes/origin/maint/henne' into maint/lp
Lucas Pleß
2012-05-11 00:43:07 +0200
41bfcd33c3first approach to connect to ethersex devices like lampel
Lucas Pleß
2012-03-26 01:26:52 +0200
53f6e29eb3added devices to rooms
Lucas Pleß
2012-03-25 19:56:09 +0200
b224e1b0bachanged dao dependencies from hibernate to JPA api.
Lucas Pleß
2012-03-25 19:47:16 +0200
8f2610314emoved devicechange event and the webmodel to web.model
Lucas Pleß
2012-03-25 18:30:51 +0200
1921417667Merge branch 'maint/jjg' into maint/lp
Lucas Pleß
2012-03-25 18:17:57 +0200
03ed17d10drefactoring of the controllers and some cleanup
Lucas Pleß
2012-03-25 17:58:07 +0200
0cb8e585afjpa+hibernate basically working
Lucas Pleß
2012-03-25 16:23:45 +0200
ec3620df77Merge branch 'maint/henne' into maint/lp
Lucas Pleß
2012-03-24 22:00:51 +0100
60d5fc8323devices view/models created
Hendrik Fellerhoff
2012-03-23 03:13:44 +0100
4e26793524views.js wasn't added to git - dunno why ;D
Hendrik Fellerhoff
2012-03-23 02:59:58 +0100
b11e96dc64first routes added
Hendrik Fellerhoff
2012-03-23 02:57:42 +0100
d6b7f80c93buzzer is now a template
Hendrik Fellerhoff
2012-03-23 02:57:18 +0100
b21670aea2now using template and json object to generate room tabs
Hendrik Fellerhoff
2012-03-23 02:41:15 +0100
274fdf53c1prototype javascript removed
Hendrik Fellerhoff
2012-03-23 00:54:41 +0100
efb07b64damain.js included in index.jsp
Hendrik Fellerhoff
2012-03-23 00:53:01 +0100
51005c7f7bfirst two templates added, javascript now in a seperate file
Hendrik Fellerhoff
2012-03-23 00:52:33 +0100
c0782344e7added handlebars.js templating system
Hendrik Fellerhoff
2012-03-23 00:41:02 +0100
594e545080rooms.json added, it includes sample json for a roomlist
Hendrik Fellerhoff
2012-03-22 14:58:09 +0100
67d82c4af6some code removed
Hendrik Fellerhoff
2012-03-22 14:57:18 +0100
855efcd572buzzer works, some code removed
Hendrik Fellerhoff
2012-03-22 14:53:01 +0100
55fe1dca17annotation based hibernate. but relations are still broken and the inheritance (Device) is not working correctly
Lucas Pleß
2012-03-21 23:43:00 +0100
a833a3b6a4interval instead of timeout
Hendrik Fellerhoff
2012-03-21 23:42:49 +0100
e49a0ddbabcolorpicker change does the following: updates all lamps which are selected in the select box
Hendrik Fellerhoff
2012-03-21 22:56:19 +0100
e60ffe6360sending reorganized, dynamically create the first select of par56
Hendrik Fellerhoff
2012-03-21 22:35:03 +0100
04f77c6553renamed controller and removed duplicate function to update device data.
Lucas Pleß
2012-03-21 22:17:40 +0100
7d2fe8fd04colorpicker working for one predefined lamp
Hendrik Fellerhoff
2012-03-21 22:06:16 +0100
c09e08200ftried to make hibernate work with h2 and annotations
Lucas Pleß
2012-03-21 21:23:16 +0100
793cb2a940renamed getDeviceID to getId
Lucas Pleß
2012-03-21 21:22:53 +0100
351f1b1816Merge branch 'maint/lp'
Lucas Pleß
2012-03-21 19:52:44 +0100
56293334e5title zu den circles in der lampe hinzugefügt
Hendrik Fellerhoff
2012-03-21 03:48:44 +0100
b8d6002f1bdiverse style anpassungen: hintergrund bei lampel vertical tabs navi bar verkleinert und border-bottom radius entfernt
Hendrik Fellerhoff
2012-03-21 03:46:48 +0100
e0cd2112edMerge branch 'master' of git.ctdo.de:bunti
Hendrik Fellerhoff
2012-03-21 03:26:21 +0100
493231cd0dStyles für Schwarzen kreis und Lampel, wenn man bei Lampel auf die Kreise klickt, werden togglen sie schwarz<->farbe
Hendrik Fellerhoff
2012-03-21 03:22:28 +0100
129c0d53bdStyles für grünen kreis hinzugefügt
Hendrik Fellerhoff
2012-03-21 03:05:23 +0100
4ad6fe2a5bmain tabs container mittig, schriftart global verdana,arial,sans-serif
Hendrik Fellerhoff
2012-03-21 03:02:31 +0100
7c554a610dvertikale tabs implementiert und testweise eingefügt
Hendrik Fellerhoff
2012-03-21 02:54:33 +0100
5820b94859model js angelegt, model für räume angelegt
Hendrik Fellerhoff
2012-03-21 02:11:50 +0100
4f755abce6rooms controller
Lucas Pleß
2012-03-21 01:04:53 +0100
4adf28dccbbuzzer vorlage erstellt incl styles
Hendrik Fellerhoff
2012-03-21 01:03:17 +0100