Lucas Pleß
|
ec3620df77
|
Merge branch 'maint/henne' into maint/lp
|
2012-03-24 22:00:51 +01:00 |
|
Hendrik Fellerhoff
|
4e26793524
|
views.js wasn't added to git - dunno why ;D
|
2012-03-23 02:59:58 +01:00 |
|
Hendrik Fellerhoff
|
b11e96dc64
|
first routes added
|
2012-03-23 02:57:42 +01:00 |
|
Hendrik Fellerhoff
|
d6b7f80c93
|
buzzer is now a template
|
2012-03-23 02:57:18 +01:00 |
|
Hendrik Fellerhoff
|
b21670aea2
|
now using template and json object to generate room tabs
|
2012-03-23 02:41:15 +01:00 |
|
Hendrik Fellerhoff
|
274fdf53c1
|
prototype javascript removed
|
2012-03-23 00:54:41 +01:00 |
|
Hendrik Fellerhoff
|
efb07b64da
|
main.js included in index.jsp
|
2012-03-23 00:53:01 +01:00 |
|
Hendrik Fellerhoff
|
51005c7f7b
|
first two templates added, javascript now in a seperate file
|
2012-03-23 00:52:33 +01:00 |
|
Hendrik Fellerhoff
|
c0782344e7
|
added handlebars.js templating system
|
2012-03-23 00:41:02 +01:00 |
|
Hendrik Fellerhoff
|
594e545080
|
rooms.json added, it includes sample json for a roomlist
|
2012-03-22 14:58:09 +01:00 |
|
Hendrik Fellerhoff
|
67d82c4af6
|
some code removed
|
2012-03-22 14:57:18 +01:00 |
|
Hendrik Fellerhoff
|
855efcd572
|
buzzer works, some code removed
|
2012-03-22 14:53:01 +01:00 |
|
Lucas Pleß
|
55fe1dca17
|
annotation based hibernate. but relations are still broken and the inheritance (Device) is not working correctly
|
2012-03-21 23:43:00 +01:00 |
|
Hendrik Fellerhoff
|
a833a3b6a4
|
interval instead of timeout
|
2012-03-21 23:42:49 +01:00 |
|
Hendrik Fellerhoff
|
e49a0ddbab
|
colorpicker change does the following: updates all lamps which are selected in the select box
|
2012-03-21 22:56:19 +01:00 |
|
Hendrik Fellerhoff
|
e60ffe6360
|
sending reorganized, dynamically create the first select of par56
|
2012-03-21 22:35:03 +01:00 |
|
Lucas Pleß
|
04f77c6553
|
renamed controller and removed duplicate function to update device data.
|
2012-03-21 22:17:40 +01:00 |
|
Hendrik Fellerhoff
|
7d2fe8fd04
|
colorpicker working for one predefined lamp
|
2012-03-21 22:06:16 +01:00 |
|
Lucas Pleß
|
c09e08200f
|
tried to make hibernate work with h2 and annotations
|
2012-03-21 21:23:16 +01:00 |
|
Lucas Pleß
|
793cb2a940
|
renamed getDeviceID to getId
|
2012-03-21 21:22:53 +01:00 |
|
Lucas Pleß
|
351f1b1816
|
Merge branch 'maint/lp'
|
2012-03-21 19:52:44 +01:00 |
|
Hendrik Fellerhoff
|
620796248b
|
colorpicker added, par56 licht ansicht erweitert
|
2012-03-21 04:19:34 +01:00 |
|
Hendrik Fellerhoff
|
56293334e5
|
title zu den circles in der lampe hinzugefügt
|
2012-03-21 03:48:44 +01:00 |
|
Hendrik Fellerhoff
|
b8d6002f1b
|
diverse style anpassungen:
hintergrund bei lampel
vertical tabs navi bar verkleinert und border-bottom radius entfernt
|
2012-03-21 03:46:48 +01:00 |
|
Hendrik Fellerhoff
|
e0cd2112ed
|
Merge branch 'master' of git.ctdo.de:bunti
|
2012-03-21 03:26:21 +01:00 |
|
Hendrik Fellerhoff
|
493231cd0d
|
Styles für Schwarzen kreis und Lampel, wenn man bei Lampel auf die Kreise klickt, werden togglen sie schwarz<->farbe
|
2012-03-21 03:22:28 +01:00 |
|
Hendrik Fellerhoff
|
129c0d53bd
|
Styles für grünen kreis hinzugefügt
|
2012-03-21 03:05:23 +01:00 |
|
Hendrik Fellerhoff
|
4ad6fe2a5b
|
main tabs container mittig, schriftart global verdana,arial,sans-serif
|
2012-03-21 03:02:31 +01:00 |
|
Hendrik Fellerhoff
|
7c554a610d
|
vertikale tabs implementiert und testweise eingefügt
|
2012-03-21 02:54:33 +01:00 |
|
Hendrik Fellerhoff
|
5820b94859
|
model js angelegt, model für räume angelegt
|
2012-03-21 02:11:50 +01:00 |
|
Lucas Pleß
|
4f755abce6
|
rooms controller
|
2012-03-21 01:04:53 +01:00 |
|
Hendrik Fellerhoff
|
4adf28dccb
|
buzzer vorlage erstellt incl styles
|
2012-03-21 01:03:17 +01:00 |
|
Hendrik Fellerhoff
|
1a5590725b
|
backbone js added; code cleanup; reorganize slider
|
2012-03-21 00:45:40 +01:00 |
|
Lucas Pleß
|
8b362e1ebc
|
rooms controller
|
2012-03-21 00:44:55 +01:00 |
|
Lucas Pleß
|
64f90ce109
|
rooms controller
|
2012-03-21 00:44:41 +01:00 |
|
Lucas Pleß
|
6f2614350b
|
implemented switching device
|
2012-03-21 00:23:49 +01:00 |
|
Lucas Pleß
|
7dfb3f91a3
|
cleanup
|
2012-03-20 23:25:23 +01:00 |
|
Lucas Pleß
|
dd7225cbbe
|
changed the encoding
|
2012-03-20 23:14:18 +01:00 |
|
Lucas Pleß
|
0dfa4a1370
|
some work on the gui
|
2012-03-20 18:01:54 +01:00 |
|
Lucas Pleß
|
39022b66e3
|
some work on the gui
|
2012-03-15 01:03:46 +01:00 |
|
Lucas Pleß
|
71421bd559
|
extended controller and created a test web gui
extended BuntiDevice with a picture Path
|
2012-03-14 00:57:00 +01:00 |
|
Lucas Pleß
|
9c54e5d73c
|
working on rest controller. something with Collection<DeviceUpdate> is not working...
|
2012-03-12 01:17:52 +01:00 |
|
Lucas Pleß
|
68b44c76a8
|
removed atmosphere from project
|
2012-03-12 00:18:20 +01:00 |
|
Lucas Pleß
|
dfba009524
|
broken version. would work with Athmosphere 0.7.2
will update to 0.9 ... need some refactoring
|
2012-03-10 23:57:15 +01:00 |
|
Lucas Pleß
|
a1feb25187
|
working on websocket
|
2012-03-10 21:38:05 +01:00 |
|
Lucas Pleß
|
23bc67c8ca
|
removed unused tests
|
2012-03-09 23:47:38 +01:00 |
|
Lucas Pleß
|
9dd28ca80d
|
added jQuery files
|
2012-03-09 23:38:09 +01:00 |
|
Lucas Pleß
|
b034715014
|
clean up, many changes in spring. REST controller finally working with JSON Input and Output
|
2012-03-09 23:37:26 +01:00 |
|
Lucas Pleß
|
5ceedf36e0
|
fix in spring context and in the jsp files
|
2012-03-08 02:10:59 +01:00 |
|
Lucas Pleß
|
2f693b0f7e
|
cleaned up from violations
|
2012-03-08 01:22:31 +01:00 |