ctdo/bunti
16
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • c0cd519a4f working on cache and controllers maint/lp Lucas Pleß 2012-05-26 01:56:44 +02:00
  • 892a7e6905 working on ethersex stuff Lucas Pleß 2012-05-25 18:02:59 +02:00
  • 8c363fbf64 Anderungen 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 +02:00
  • f98ab7c225 blau Lucas Pleß 2012-05-11 00:44:30 +02:00
  • 6b41c9cb92 Merge remote-tracking branch 'remotes/origin/maint/henne' into maint/lp Lucas Pleß 2012-05-11 00:43:07 +02:00
  • f1bae83556 merge complete master maint/henne Hendrik Fellerhoff 2012-05-10 17:05:04 +02:00
  • 8248804ac7 diverse fortschritte, page für crashtest Hendrik Fellerhoff 2012-05-10 17:03:33 +02:00
  • 0c356f3bdb corrected buntiethersexdevice. Lucas Pleß 2012-03-30 17:14:29 +02:00
  • 2c7694036d clean up Lucas Pleß 2012-03-30 17:00:30 +02:00
  • a5329a0bcc moved model classes, extended Ethersex Device section Lucas Pleß 2012-03-26 23:21:44 +02:00
  • ed69f6a0e3 removed Devices classes Lucas Pleß 2012-03-26 23:02:58 +02:00
  • 4f288256e8 moved model classes to their packages Lucas Pleß 2012-03-26 23:02:42 +02:00
  • ebaf602737 bugfix im prototype prototype_par56 Hendrik Fellerhoff 2012-03-26 13:45:37 +02:00
  • 41bfcd33c3 first approach to connect to ethersex devices like lampel Lucas Pleß 2012-03-26 01:26:52 +02:00
  • 53f6e29eb3 added devices to rooms Lucas Pleß 2012-03-25 19:56:09 +02:00
  • b224e1b0ba changed dao dependencies from hibernate to JPA api. Lucas Pleß 2012-03-25 19:47:16 +02:00
  • 8f2610314e moved devicechange event and the webmodel to web.model Lucas Pleß 2012-03-25 18:30:51 +02:00
  • 1921417667 Merge branch 'maint/jjg' into maint/lp Lucas Pleß 2012-03-25 18:17:57 +02:00
  • 03ed17d10d refactoring of the controllers and some cleanup Lucas Pleß 2012-03-25 17:58:07 +02:00
  • 0cb8e585af jpa+hibernate basically working Lucas Pleß 2012-03-25 16:23:45 +02:00
  • ec3620df77 Merge branch 'maint/henne' into maint/lp Lucas Pleß 2012-03-24 22:00:51 +01:00
  • 60d5fc8323 devices view/models created Hendrik Fellerhoff 2012-03-23 03:13:44 +01:00
  • 4e26793524 views.js wasn't added to git - dunno why ;D Hendrik Fellerhoff 2012-03-23 02:59:58 +01:00
  • b11e96dc64 first routes added Hendrik Fellerhoff 2012-03-23 02:57:42 +01:00
  • d6b7f80c93 buzzer is now a template Hendrik Fellerhoff 2012-03-23 02:57:18 +01:00
  • b21670aea2 now using template and json object to generate room tabs Hendrik Fellerhoff 2012-03-23 02:41:15 +01:00
  • 274fdf53c1 prototype javascript removed Hendrik Fellerhoff 2012-03-23 00:54:41 +01:00
  • efb07b64da main.js included in index.jsp Hendrik Fellerhoff 2012-03-23 00:53:01 +01:00
  • 51005c7f7b first two templates added, javascript now in a seperate file Hendrik Fellerhoff 2012-03-23 00:52:33 +01:00
  • c0782344e7 added handlebars.js templating system Hendrik Fellerhoff 2012-03-23 00:41:02 +01:00
  • 594e545080 rooms.json added, it includes sample json for a roomlist Hendrik Fellerhoff 2012-03-22 14:58:09 +01:00
  • 67d82c4af6 some code removed Hendrik Fellerhoff 2012-03-22 14:57:18 +01:00
  • 855efcd572 buzzer works, some code removed Hendrik Fellerhoff 2012-03-22 14:53:01 +01:00
  • 55fe1dca17 annotation based hibernate. but relations are still broken and the inheritance (Device) is not working correctly Lucas Pleß 2012-03-21 23:43:00 +01:00
  • a833a3b6a4 interval instead of timeout Hendrik Fellerhoff 2012-03-21 23:42:49 +01:00
  • e49a0ddbab colorpicker change does the following: updates all lamps which are selected in the select box Hendrik Fellerhoff 2012-03-21 22:56:19 +01:00
  • e60ffe6360 sending reorganized, dynamically create the first select of par56 Hendrik Fellerhoff 2012-03-21 22:35:03 +01:00
  • 04f77c6553 renamed controller and removed duplicate function to update device data. Lucas Pleß 2012-03-21 22:17:40 +01:00
  • 7d2fe8fd04 colorpicker working for one predefined lamp Hendrik Fellerhoff 2012-03-21 22:06:16 +01:00
  • c09e08200f tried to make hibernate work with h2 and annotations Lucas Pleß 2012-03-21 21:23:16 +01:00
  • 793cb2a940 renamed getDeviceID to getId Lucas Pleß 2012-03-21 21:22:53 +01:00
  • 351f1b1816 Merge branch 'maint/lp' Lucas Pleß 2012-03-21 19:52:44 +01:00
  • 620796248b colorpicker added, par56 licht ansicht erweitert Hendrik Fellerhoff 2012-03-21 04:19:34 +01:00
  • 56293334e5 title zu den circles in der lampe hinzugefügt Hendrik Fellerhoff 2012-03-21 03:48:44 +01:00
  • b8d6002f1b diverse style anpassungen: hintergrund bei lampel vertical tabs navi bar verkleinert und border-bottom radius entfernt Hendrik Fellerhoff 2012-03-21 03:46:48 +01:00
  • e0cd2112ed Merge branch 'master' of git.ctdo.de:bunti Hendrik Fellerhoff 2012-03-21 03:26:21 +01:00
  • 493231cd0d Styles 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 +01:00
  • 129c0d53bd Styles für grünen kreis hinzugefügt Hendrik Fellerhoff 2012-03-21 03:05:23 +01:00
  • 4ad6fe2a5b main tabs container mittig, schriftart global verdana,arial,sans-serif Hendrik Fellerhoff 2012-03-21 03:02:31 +01:00
  • 7c554a610d vertikale tabs implementiert und testweise eingefügt Hendrik Fellerhoff 2012-03-21 02:54:33 +01:00
  • 5820b94859 model js angelegt, model für räume angelegt Hendrik Fellerhoff 2012-03-21 02:11:50 +01:00
  • 4f755abce6 rooms controller Lucas Pleß 2012-03-21 01:04:53 +01:00
  • 4adf28dccb buzzer vorlage erstellt incl styles Hendrik Fellerhoff 2012-03-21 01:03:17 +01:00
  • 1a5590725b backbone js added; code cleanup; reorganize slider Hendrik Fellerhoff 2012-03-21 00:45:40 +01:00
  • 8b362e1ebc rooms controller Lucas Pleß 2012-03-21 00:44:55 +01:00
  • 64f90ce109 rooms controller Lucas Pleß 2012-03-21 00:44:41 +01:00
  • 6f2614350b implemented switching device Lucas Pleß 2012-03-21 00:23:49 +01:00
  • 7dfb3f91a3 cleanup Lucas Pleß 2012-03-20 23:25:23 +01:00
  • dd7225cbbe changed the encoding Lucas Pleß 2012-03-20 23:14:18 +01:00
  • 0dfa4a1370 some work on the gui Lucas Pleß 2012-03-20 18:01:54 +01:00
  • 39022b66e3 some work on the gui Lucas Pleß 2012-03-15 01:03:45 +01:00
  • 71421bd559 extended controller and created a test web gui extended BuntiDevice with a picture Path Lucas Pleß 2012-03-14 00:57:00 +01:00
  • 9c54e5d73c working on rest controller. something with Collection<DeviceUpdate> is not working... Lucas Pleß 2012-03-12 01:17:52 +01:00
  • 68b44c76a8 removed atmosphere from project Lucas Pleß 2012-03-12 00:18:20 +01:00
  • dfba009524 broken version. would work with Athmosphere 0.7.2 will update to 0.9 ... need some refactoring Lucas Pleß 2012-03-10 23:57:15 +01:00
  • 2c259d8bfc Do some code clean up maint/jjg Juergen Jung 2012-03-10 22:20:57 +01:00
  • a1feb25187 working on websocket Lucas Pleß 2012-03-10 21:38:05 +01:00
  • 23bc67c8ca removed unused tests Lucas Pleß 2012-03-09 23:47:38 +01:00
  • 9dd28ca80d added jQuery files Lucas Pleß 2012-03-09 23:38:09 +01:00
  • b034715014 clean up, many changes in spring. REST controller finally working with JSON Input and Output Lucas Pleß 2012-03-09 23:37:26 +01:00
  • 5ceedf36e0 fix in spring context and in the jsp files Lucas Pleß 2012-03-08 02:10:59 +01:00
  • 2f693b0f7e cleaned up from violations Lucas Pleß 2012-03-08 01:22:31 +01:00
  • e7ca20183a cleaned up artnet classes Lucas Pleß 2012-03-08 00:57:50 +01:00
  • 09f6719485 removed testcontroller Lucas Pleß 2012-03-08 00:07:59 +01:00
  • 7f2378735b cleanup and optimization Lucas Pleß 2012-03-08 00:04:03 +01:00
  • 3bad0fd48f cleanup and removed unnecessary code Lucas Pleß 2012-03-07 22:12:18 +01:00
  • 27bbe2fd5a added more tests Lucas Pleß 2012-03-07 22:10:31 +01:00
  • a93247984c added more tests Lucas Pleß 2012-03-07 22:10:22 +01:00
  • dd4f730ca7 work on rest controller and separated application contexts Lucas Pleß 2012-03-07 19:21:53 +01:00
  • 019c235ea5 cleanup and extension Lucas Pleß 2012-03-07 19:19:21 +01:00
  • 2535e98e41 cleanup Lucas Pleß 2012-03-07 19:17:48 +01:00
  • 2043cf7fee modified dmx addressing in devices Lucas Pleß 2012-03-07 19:17:43 +01:00
  • 99ae75b88f clean up Lucas Pleß 2012-03-07 00:42:30 +01:00
  • d5084b1290 adding new REST controller Lucas Pleß 2012-03-07 00:41:56 +01:00
  • 40bf50c0f2 moved address configuration in seperate file Lucas Pleß 2012-03-07 00:41:24 +01:00
  • e5fb13bdcf removed commented out code Lucas Pleß 2012-03-06 18:11:20 +01:00
  • 3deb94652f added deviceId test. and ChannelValueWrong Lucas Pleß 2012-03-06 18:10:46 +01:00
  • 41452fab63 cleaned up and corrected setValuesFromOptions Lucas Pleß 2012-03-06 17:58:11 +01:00
  • 0f63e33da8 changed toString method to use StringBuilder Lucas Pleß 2012-03-06 17:57:43 +01:00
  • 06adbd5155 corrected a test Lucas Pleß 2012-03-06 17:56:02 +01:00
  • e428a12058 clean up Lucas Pleß 2012-03-06 17:30:37 +01:00
  • 8cd211e6d9 updated tests and split some tests Lucas Pleß 2012-03-06 17:29:57 +01:00
  • 43543682f9 updated tests and split some tests Lucas Pleß 2012-03-06 17:11:21 +01:00
  • 4dc7623153 changed color setters to return status Lucas Pleß 2012-03-06 17:10:02 +01:00
  • 19d286fa29 removed toString and changed setChannelValueByName to return boolean status Lucas Pleß 2012-03-06 17:09:25 +01:00
  • f0f090ee31 einen Fehler bei den Imports korrigiert Lucas Pleß 2012-03-06 01:34:39 +01:00
  • 6a977de482 Bugfixing und erste Unit Tests erstellt. Lucas Pleß 2012-03-06 01:31:38 +01:00
  • 2aeb088b6b Bugfixing und erste Unit Tests erstellt. Lucas Pleß 2012-03-06 01:31:25 +01:00
  • bae9549aff Bugfixing und erste Unit Tests erstellt. Lucas Pleß 2012-03-06 01:24:18 +01:00
  • 542a91f3d5 Add checkstyle to pom.xml Juergen Jung 2012-03-04 12:07:18 +01:00