Commit graph

  • 3aece9551b Small refactoring Ziver Koc 2015-12-08 21:51:05 +01:00
  • 2c489e56c9 Initial implementation of DB upgrader Ziver Koc 2015-12-08 17:58:18 +01:00
  • 5e98b51287 Bug fix: use null instead of undefined in html Daniel Collin 2015-12-08 17:08:39 +01:00
  • 0954e9c0c5 Preventing SQL-injection with PreparedStatement Daniel Collin 2015-12-08 13:22:33 +01:00
  • bb9bfa89ba Bugfix Ziver Koc 2015-12-08 16:44:39 +01:00
  • d384209df0 Generated Zutil.jar Ziver Koc 2015-12-08 16:40:14 +01:00
  • c1af8a1e17 Refactoring in Zutil Ziver Koc 2015-12-08 16:39:28 +01:00
  • 4d60a60c1d Added SQL List handler and renamed existing handlers Ziver Koc 2015-12-08 16:29:04 +01:00
  • 432d7cb438 Moved Configurator to the correct package Ziver Koc 2015-12-08 16:19:43 +01:00
  • f3bf9d716d fix build script since it did no longer build Daniel Collin 2015-12-08 09:15:14 +01:00
  • c04ca7a926 Some small fixes Ziver Koc 2015-12-07 22:51:11 +01:00
  • 4ff6ae2b4c Added DB initialization logic and upgrade needed detection Ziver Koc 2015-12-07 22:41:51 +01:00
  • d3f3c02f78 Added File copy method Ziver Koc 2015-12-07 22:40:36 +01:00
  • 4419be3661 Removed hal.db (added to gitignore) Ziver Koc 2015-12-07 22:05:11 +01:00
  • 4bea6adf89 Fixed issue where all sensor data was shown as 0 Ziver Koc 2015-12-07 22:02:33 +01:00
  • 9fd1537edb Removed confidence reset to 1.0 Ziver Koc 2015-12-07 21:59:13 +01:00
  • 80d07bdbf2 Added property methods to HalContext Ziver Koc 2015-12-07 21:56:52 +01:00
  • 4370557958 SQL bug fix (Overview page still not working) Ziver Koc 2015-12-07 21:49:00 +01:00
  • fdc9183c0c Changed DB access to a getter Ziver Koc 2015-12-07 21:48:13 +01:00
  • 8cd81766a0 Added conf file for configuring server ports Ziver Koc 2015-12-07 21:20:47 +01:00
  • 46728b4768 added null points in charts Daniel Collin 2015-12-07 17:55:18 +01:00
  • 5f28b017f7 Compacted libs and made the code Java 7 compliant Ziver Koc 2015-12-07 17:00:47 +01:00
  • 9b9774e150 bug fixes Daniel Collin 2015-12-07 16:47:48 +01:00
  • 4c05900dfc adding ant build script Daniel Collin 2015-12-04 12:18:45 +01:00
  • 25d70c8075 Updated Zutil binary Ziver Koc 2015-12-04 11:37:10 +01:00
  • a0dce97932 Small log fix Ziver Koc 2015-12-04 10:42:34 +01:00
  • b6b82b47f8 bug fixes dcollin 2015-12-04 10:42:54 +01:00
  • 99e5b3a1f2 Merge branch 'master' of http://repo.koc.se/hal Ziver Koc 2015-12-04 10:34:10 +01:00
  • 79468d8e0d bug fixes dcollin 2015-12-04 10:33:27 +01:00
  • c99cedb2ad Some bug fixes Ziver Koc 2015-12-04 10:33:22 +01:00
  • d3ba64477b sqlite bug fix dcollin 2015-12-04 10:10:56 +01:00
  • 1949d11f99 Bug fix dcollin 2015-12-04 09:19:17 +01:00
  • 6dbaff4444 Some cleanup dcollin 2015-12-04 09:13:58 +01:00
  • 2aa2c76025 Added network sync dcollin 2015-12-04 09:09:02 +01:00
  • c27620d63d Added synchronizer daemon dcollin 2015-12-04 07:36:07 +01:00
  • 6c5a5585c2 Added heatmap dcollin 2015-12-04 06:58:47 +01:00
  • 9195e578d1 Some more html structure in configure page dcollin 2015-12-04 05:51:02 +01:00
  • de1706d67a Added configuration page dcollin 2015-12-04 05:20:23 +01:00
  • b88f260ebc basic plotting working dcollin 2015-12-04 03:45:30 +01:00
  • 4a60f18489 fix Calendar import dcollin 2015-12-04 01:25:37 +01:00
  • fab111a6cb Added Http Server dcollin 2015-12-04 01:19:02 +01:00
  • 7b6e1e2d7a Fixed sequence ids and removed old entroiews dcollin 2015-12-04 00:58:56 +01:00
  • 1fdc895ef4 Added 5-minute, hour and day aggregator dcollin 2015-12-04 00:21:14 +01:00
  • adf49efc9a Added 5 min agrigator daemon dcollin 2015-12-03 20:26:31 +01:00
  • b985776394 Added some structural classes Ziver Koc 2015-12-03 18:40:57 +01:00
  • 89d8834d80 Added number to word converter Ziver Koc 2015-12-03 16:16:12 +01:00
  • 958f36dc7e updated DB Ziver Koc 2015-12-03 16:09:18 +01:00
  • d016904147 increased ttl Ziver Koc 2015-11-20 21:49:18 +01:00
  • 6dbc31b521 Merge branch 'master' of http://repo.koc.se/zutil-java Ziver Koc 2015-11-20 21:30:23 +01:00
  • aa656cdc05 Updated Tellstick drivers and Switched from System.ou.print to Logger Ziver Koc 2015-11-20 21:29:55 +01:00
  • 33e749dfc7 Added TimedHashSet that entries have limited TTL Ziver Koc 2015-11-20 21:29:05 +01:00
  • 52c6f7e01c Some bug fixes Ziver Koc 2015-11-20 16:51:19 +01:00
  • 4a027fab5f Added setContent method Ziver Koc 2015-11-20 16:09:07 +01:00
  • c2138902f0 Replaced serial library with a newer one Ziver Koc 2015-11-19 19:09:03 +01:00
  • 2df55ef214 Added Oregon protocoll Ziver Koc 2015-11-19 01:27:18 +01:00
  • af01fb9ae9 Added new telstick windows drivers Ziver Koc 2015-11-18 21:51:25 +01:00
  • 66bebc6f52 Fixed bug in JSONObjectOutputStream and Base64Encoder Ziver Koc 2015-11-18 17:25:14 +01:00
  • 034166b413 Added Base64Encoder Ziver Koc 2015-11-17 18:59:50 +01:00
  • 67e4d54fde Made Configurator support generics Ziver Koc 2015-11-16 17:49:10 +01:00
  • b92465b62b Added recursive Templator logic Ziver Koc 2015-11-16 12:36:53 +01:00
  • ad04f622d3 Updating .classpath file for Eclipse dcollin 2015-11-05 10:55:51 +01:00
  • 2a51090813 JSON object stream bug fixes Ziver Koc 2015-11-12 15:16:00 +01:00
  • 0f94a575a3 Added so FileSearcher matches all files if no specific patter has been given Ziver Koc 2015-11-12 13:11:12 +01:00
  • 997ec1c52b Renamed FileSearch class and defined default values Ziver Koc 2015-11-11 18:07:48 +01:00
  • e2e6a40ce9 Fixed SSDP caching bug Ziver Koc 2015-11-11 13:26:14 +01:00
  • 611770fa1f Added bytereturn for file Ziver Koc 2015-11-08 15:53:25 +01:00
  • 8033c47f40 Updated SSDPServer to send custom headers in notify Ziver Koc 2015-11-05 02:46:46 +01:00
  • 8ca2f21c7c Updated JSONObjectOutputStream to support extended generics Ziver Koc 2015-11-05 02:07:08 +01:00
  • 2dae3a6f01 Removed multicast from client Ziver Koc 2015-11-02 15:47:38 +01:00
  • 81c399528d SSDPClient bugfix Ziver Koc 2015-10-29 20:39:24 +01:00
  • ef173f479b Bugfix for json map with null entry Ziver Koc 2015-10-29 20:03:28 +01:00
  • 5fa807e50b Optimization in SSDP Ziver Koc 2015-10-29 13:09:35 +01:00
  • 0956e4aee3 Improved logging Ziver Koc 2015-10-29 12:52:10 +01:00
  • 7cf36636e7 Bugfix in JSONParser Ziver Koc 2015-10-29 10:51:06 +01:00
  • 2130877265 Small update to JSONParser Ziver Koc 2015-10-28 17:23:27 +01:00
  • aea3b9467e Updated junit test Ziver Koc 2015-10-28 17:01:45 +01:00
  • d952b3bcb7 Bugfix for list and maps containing null objects Ziver Koc 2015-10-28 16:01:24 +01:00
  • 304213c1d2 Updated loggin Ziver Koc 2015-10-28 12:57:36 +01:00
  • 2613b943ce Updated some log output Ziver Koc 2015-10-28 10:57:01 +01:00
  • 2e476d6689 SSDPClient now uses StandardSSDPInfo class publicly Ziver Koc 2015-10-27 17:19:43 +01:00
  • f1e5e17d50 StreamLogger bug fix and added new line to JSONWriter flush function Ziver Koc 2015-10-22 15:50:19 +00:00
  • e9715298b6 Small update to Console class Ziver Koc 2015-10-20 15:57:17 +00:00
  • a04041c07c Added Stream logger classes Ziver Koc 2015-10-15 19:26:17 +00:00
  • 4a817cbf31 Added Map and List support to JSON object stream Ziver Koc 2015-10-13 16:09:03 +00:00
  • 0dd8e7b415 Updated mysql Ziver Koc 2015-10-09 19:40:25 +00:00
  • 4bfef36b65 removing duplicate zutil jar Ziver Koc 2015-10-09 19:37:24 +00:00
  • e709e77731 removing duplicate zutil jar Ziver Koc 2015-10-09 19:34:19 +00:00
  • 5e3a28e748 removing duplicate zutil jar Ziver Koc 2015-10-09 19:33:47 +00:00
  • 267d5c6270 Bugfix and small update to JSONObjectInputStream Ziver Koc 2015-10-09 15:43:48 +00:00
  • 73868960f4 Some fixes in Encrypter Ziver Koc 2015-10-08 15:23:35 +00:00
  • 051f6fdcf8 Fixed null field issues in JSON Ziver Koc 2015-10-07 22:32:26 +00:00
  • 0bb193fba3 Temporary fix for JSON null fields Ziver Koc 2015-10-07 16:25:59 +00:00
  • cf43992266 Changed name of license file Ziver Koc 2015-10-04 19:22:28 +00:00
  • 3cedc18232 Bugfix Ziver Koc 2015-10-02 16:38:28 +00:00
  • 793b14fe81 Enabled recursion and search of compressed files Ziver Koc 2015-10-02 15:40:45 +00:00
  • 38f03585e4 Added InputStream and Writer in constructor of Json classes Ziver Koc 2015-10-01 16:02:48 +00:00
  • 1dba0c88aa Updated licence and moved tests to a new folder Ziver Koc 2015-10-01 15:23:40 +00:00
  • 650e61b0f8 Updated json syntax Ziver Koc 2015-09-29 21:20:59 +00:00
  • 6d1b8898c8 Added PBKDF2 hash method Ziver Koc 2015-09-29 20:51:38 +00:00
  • 577aea998b Added static method for retreiving configuration Ziver Koc 2015-09-26 21:20:00 +00:00