Commit graph

Select branches

Hide pull requests

c3_charts

master

BUILD-100

BUILD-101

BUILD-102

BUILD-103

BUILD-104

BUILD-105

BUILD-106

BUILD-107

BUILD-108

BUILD-109

BUILD-11

BUILD-110

BUILD-111

BUILD-112

BUILD-113

BUILD-114

BUILD-115

BUILD-116

BUILD-117

BUILD-118

BUILD-119

BUILD-12

BUILD-120

BUILD-121

BUILD-122

BUILD-123

BUILD-124

BUILD-125

BUILD-126

BUILD-127

BUILD-128

BUILD-13

BUILD-130

BUILD-131

BUILD-133

BUILD-134

BUILD-135

BUILD-136

BUILD-137

BUILD-138

BUILD-139

BUILD-14

BUILD-140

BUILD-141

BUILD-142

BUILD-143

BUILD-144

BUILD-145

BUILD-147

BUILD-148

BUILD-149

BUILD-15

BUILD-150

BUILD-151

BUILD-152

BUILD-153

BUILD-155

BUILD-156

BUILD-157

BUILD-158

BUILD-159

BUILD-16

BUILD-160

BUILD-161

BUILD-162

BUILD-163

BUILD-164

BUILD-165

BUILD-166

BUILD-167

BUILD-168

BUILD-169

BUILD-17

BUILD-170

BUILD-171

BUILD-175

BUILD-176

BUILD-179

BUILD-18

BUILD-180

BUILD-183

BUILD-184

BUILD-185

BUILD-187

BUILD-188

BUILD-189

BUILD-190

BUILD-191

BUILD-192

BUILD-193

BUILD-194

BUILD-195

BUILD-196

BUILD-197

BUILD-198

BUILD-199

BUILD-2

BUILD-200

BUILD-209

BUILD-21

BUILD-210

BUILD-211

BUILD-212

BUILD-22

BUILD-23

BUILD-24

BUILD-25

BUILD-26

BUILD-27

BUILD-28

BUILD-29

BUILD-30

BUILD-31

BUILD-32

BUILD-33

BUILD-34

BUILD-35

BUILD-36

BUILD-37

BUILD-38

BUILD-39

BUILD-40

BUILD-41

BUILD-42

BUILD-43

BUILD-44

BUILD-45

BUILD-46

BUILD-47

BUILD-48

BUILD-49

BUILD-50

BUILD-51

BUILD-52

BUILD-53

BUILD-54

BUILD-55

BUILD-56

BUILD-57

BUILD-58

BUILD-59

BUILD-60

BUILD-61

BUILD-62

BUILD-63

BUILD-64

BUILD-65

BUILD-66

BUILD-67

BUILD-68

BUILD-69

BUILD-70

BUILD-71

BUILD-72

BUILD-73

BUILD-74

BUILD-75

BUILD-76

BUILD-77

BUILD-78

BUILD-79

BUILD-80

BUILD-81

BUILD-82

BUILD-83

BUILD-84

BUILD-85

BUILD-86

BUILD-87

BUILD-88

BUILD-89

BUILD-90

BUILD-91

BUILD-92

BUILD-93

BUILD-94

BUILD-95

BUILD-96

BUILD-97

BUILD-98

BUILD-99

Mono Color

• 23df77f898 Merge remote-tracking branch 'origin/master' into device_refactoring BUILD-68 Ziver Koc 2016-08-25 16:55:56 +02:00
• 73a36dfcca Adde toString methods to all SensorData types Ziver Koc 2016-08-25 16:53:47 +02:00
• fa9f7aed2b OregonProtocol now supports multiple types of SensorData Ziver Koc 2016-08-25 16:49:42 +02:00
• d91d5c5b81 Added missing licence file for tellstick reference code Ziver Koc 2016-08-25 16:24:15 +02:00
• 87abfd147f Configurator can now handle enums Ziver Koc 2016-08-24 17:25:31 +02:00
• 3fd3b0430f Updated plugin files and added Upgrade post work Ziver Koc 2016-08-24 17:27:16 +02:00
• c50e50305f Added enum configuration to Oregon and updated configuration pages to show new device structure correctly Ziver Koc 2016-08-24 17:26:36 +02:00
• cee57cba93 Powering down adc BUILD-67 Ziver Koc 2016-08-22 17:13:08 +02:00
• 95240dd392 Added data class getter in device config so that we can load generic device data Ziver Koc 2016-08-22 16:58:38 +02:00
• bd622bd231 Small change to comment and method name Ziver Koc 2016-08-20 23:34:30 +02:00
• 6b4b565a62 updated some log traces and plugin files Ziver Koc 2016-08-19 16:38:03 +02:00
• 253e359483 Added Tellstic sensor test Ziver Koc 2016-08-19 16:25:18 +02:00
• b405c12293 more bugfixes Ziver Koc 2016-08-19 16:09:11 +02:00
• aeef862ab4 bug fix Ziver Koc 2016-08-19 16:02:50 +02:00
• d692c30bd9 Refactored remaining code (RPi Plugin) Ziver Koc 2016-08-19 15:55:00 +02:00
• 3a8bb12bab Fixed test cases Ziver Koc 2016-08-18 16:43:05 +02:00
• a9b8799f21 Finnished major refactoring of Telstick plugin Ziver Koc 2016-08-18 16:27:57 +02:00
• 3bdb4ea043 Some progress Ziver Koc 2016-08-17 16:45:02 +02:00
• 52afc53660 Initial refactoring of device structure Ziver Koc 2016-08-17 15:46:10 +02:00
• 1526e58b06 Preparations for a major refactoring BUILD-66 Ziver Koc 2016-08-16 16:12:44 +02:00
• bd54762bac Removed old arduino code that has been replaced by HalMultiSensor Ziver Koc 2016-08-16 15:58:30 +02:00
• 21ab281ec6 Added Junit test for Tellstick Controller and reverted equals(Hal...) as it was causing unforeseen issues. BUILD-65 Ziver Koc 2016-08-15 17:36:46 +02:00
• a3293714c5 Some more work on MDNS BUILD-79 Ziver Koc 2016-08-12 15:11:26 +02:00
• 865d0da0aa Initial MDNS API Ziver Koc 2016-08-10 16:56:42 +02:00
• 5e1f2d65e6 Uncommented probe send Ziver Koc 2016-08-10 11:16:32 +02:00
• 0774bcd26c Added TC for dns request Ziver Koc 2016-08-10 00:11:02 +02:00
• e8e3deb056 Added DNS message compression, it does not handle it right now Ziver Koc 2016-08-09 17:57:17 +02:00
• e69ab31dd2 Small fix Ziver Koc 2016-08-08 20:53:47 +02:00
• 1a6edff347 Small refactoring Ziver Koc 2016-08-08 17:30:58 +02:00
• 123044aaf3 Configurator now checks the whole inherited class hierarchy Ziver Koc 2016-08-02 17:44:20 +02:00
• 2fcc8e98c5 Added ObjectCache class and fixed som hashmap iterator issues Ziver Koc 2016-07-30 00:18:45 +02:00
• 2c1ccb8b57 Concurrency fixes BUILD-64 Ziver Koc 2016-07-28 15:31:45 +02:00
• 6dd2210be1 Reverted method def change Ziver Koc 2016-07-25 17:34:42 +02:00
• cbca0c42c4 Some robustness changes Ziver Koc 2016-07-23 01:00:53 +02:00
• b79284009d SMall cleanup Ziver Koc 2016-07-22 23:15:34 +02:00
• 5f230a921d Fixed issue where user set params on DeviceData is reset when new sensor data is registered. BUILD-63 Ziver Koc 2016-07-19 01:07:52 +02:00
• 7155b98934 Fixed null items for longer sensor intervals BUILD-62 Ziver Koc 2016-07-18 19:57:23 +02:00
• 78895b2354 bug fixes BUILD-61 Ziver Koc 2016-07-18 18:52:48 +02:00
• 858a3eb6ff bugfix BUILD-60 Ziver Koc 2016-07-17 03:15:52 +02:00
• a546628a16 bugfix BUILD-59 Ziver Koc 2016-07-17 03:04:59 +02:00
• f3482be14d Adde remote debug option to ant and also added titles to map icons BUILD-58 Ziver Koc 2016-07-17 03:00:03 +02:00
• 19bd06e28b bug fix BUILD-57 Ziver Koc 2016-07-17 00:22:24 +02:00
• 1983f3a55d Added data report interval so the null values in the graphs are specific to different protocols BUILD-56 Ziver Koc 2016-07-17 00:16:33 +02:00
• 3be4168cf2 Fixed warnings Ziver Koc 2016-07-16 23:26:27 +02:00
• e4930e5edb Optimized imports Ziver Koc 2016-07-16 22:53:56 +02:00
• cc0fd5c1f6 Small Zutil update BUILD-55 Ziver Koc 2016-07-15 16:49:04 +02:00
• 52deb4b16d Added mark support to boundary stream and that fixed hasNext() in multipart Ziver Koc 2016-07-15 16:48:47 +02:00
• 99973b7c98 Fixed file upload Ziver Koc 2016-07-14 17:50:39 +02:00
• 6c8a591bd5 Fixed file upload BUILD-54 Ziver Koc 2016-07-14 17:50:38 +02:00
• 8ad285cd61 Changed stream read methods to default not close the streams Ziver Koc 2016-07-14 17:50:17 +02:00
• 95586441ee Moved simple string split from benchmark to util class Ziver Koc 2016-07-14 17:49:06 +02:00
• dc91d5e992 bug fix Ziver Koc 2016-07-13 21:29:38 +02:00
• 5606f57514 Some progress on fileupload Ziver Koc 2016-07-13 17:22:11 +02:00
• c0412d40c7 Some progress on fileupload BUILD-53 Ziver Koc 2016-07-13 17:21:45 +02:00
• f2939f819f Fixed all issues in boundary stream Ziver Koc 2016-07-12 17:22:30 +02:00
• 43dc9a11cb Added timeout to ant junit test Ziver Koc 2016-07-12 17:22:04 +02:00
• 739b923e1e Boundry stream is working more like a iterator now Ziver Koc 2016-07-11 23:55:47 +02:00
• e4a5af69db Some more progress in multipart Ziver Koc 2016-07-11 18:05:21 +02:00
• a700cf2863 Troubleshooting multipart Ziver Koc 2016-07-10 22:09:56 +02:00
• 795893ea2e Udated configuration and light sensor BUILD-51 Ziver Koc 2016-07-08 22:14:23 +02:00
• 077963ae28 Using buffered boundary stream in multipart parser. But currently not working Ziver Koc 2016-07-08 16:23:29 +02:00
• 53dec4603c Multipart is parsing field name now Ziver Koc 2016-07-07 15:59:25 +02:00
• 1cd48ac2ff Updated benchmark jar Ziver Koc 2016-07-07 15:50:32 +02:00
• 5cffdc49d1 Started implementation of http multiform Ziver Koc 2016-07-06 17:36:57 +02:00
• 765063ae47 Renamed Boundary buffer and improved InputStreamCloser Ziver Koc 2016-07-06 17:35:58 +02:00
• f77a757b6d Refactored some things in the http package Ziver Koc 2016-07-06 17:34:59 +02:00
• 1dfaf781d2 Added background upload model to map page, only UI for now BUILD-50 Ziver Koc 2016-07-04 17:21:12 +02:00
• 6b70f2f900 Added 3D printable sensor enclosure for Hal Arduino sensor BUILD-49 Ziver Koc 2016-07-02 17:59:44 +02:00
• c5b0b501ae Map shows actual data and device positions are saved in DB BUILD-48 Ziver Koc 2016-07-02 00:12:07 +02:00
• 372a66a219 Forgot JS libraries for previous commit BUILD-47 Ziver Koc 2016-07-01 17:10:21 +02:00
• f03dd529e2 Map is now editable, no save or read of data BUILD-46 Ziver Koc 2016-07-01 17:09:33 +02:00
• 866e776b19 Map view uses sensor and event objects BUILD-45 Ziver Koc 2016-06-29 17:14:05 +02:00
• e091a9abe6 Small refactoring Ziver Koc 2016-06-29 17:13:23 +02:00
• 87badd45bc Map is now interactive, but static no sensor data is used BUILD-44 Ziver Koc 2016-06-28 18:33:40 +02:00
• 74ad14e052 Added more mime types BUILD-52 Ziver Koc 2016-06-28 18:32:59 +02:00
• 6d14db8607 Addad initial map page BUILD-43 Ziver Koc 2016-06-23 22:04:54 +02:00
• c765b4d983 Added ability to hide subnav with showSubNav() in HalHttpPage Ziver Koc 2016-06-23 21:17:19 +02:00
• 3b71021422 Implemented page and daemon plugins and some refactorings BUILD-42 Ziver Koc 2016-06-19 17:53:42 +02:00
• 5a328913ed Implemented Class iterator for plugin manager Ziver Koc 2016-06-19 17:53:04 +02:00
• cddec2cb91 Using proper Navigation object, one step closer to implementing Page plugins BUILD-41 Ziver Koc 2016-06-19 17:13:55 +02:00
• 095109eb41 Added redirection page and fixed Navigation class Ziver Koc 2016-06-19 17:12:43 +02:00
• 2c46c7ecf3 Some refactorings. Ziver Koc 2016-06-16 16:34:25 +02:00
• 645dd41074 Added UI navigation class Ziver Koc 2016-06-15 21:28:42 +02:00
• 74c2d79428 Bugfix BUILD-40 Ziver Koc 2016-06-11 13:49:24 +02:00
• d04706f9d1 Fixed multiplier issue BUILD-39 Ziver Koc 2016-06-10 21:50:59 +02:00
• 26c909ac8d Fixed DHT sensor BUILD-38 Ziver Koc 2016-06-10 19:33:26 +02:00
• c2c5935284 Fixed so that UPS data is konverted to kwh instead of only being watts BUILD-37 Ziver Koc 2016-06-04 14:58:09 +02:00
• 6c11751720 Fixed null points in charts BUILD-36 Ziver Koc 2016-06-02 20:45:24 +02:00
• 74c49244e7 PowerChalange uses Ajax now and will update minute and hourly charts periodically. BUILD-35 Ziver Koc 2016-06-02 17:50:25 +02:00
• 947abc8497 Implamanted HTTP cache control for HttpFilePage Ziver Koc 2016-06-02 17:48:23 +02:00
• b229671abf Initial implementaion of json support for charts BUILD-34 Ziver Koc 2016-06-01 16:27:28 +02:00
• 80a7989481 fixed charts showing all data for a user in the same line drawing and also added a morris override css BUILD-33 Ziver Koc 2016-06-01 11:14:58 +02:00
• 92fb46ea0f Fixed some issues with oregon protocoll and first version of HalMultiSensor done. BUILD-32 Ziver Koc 2016-05-31 21:11:53 +02:00
• 37c1809a61 Changed SSDPClient to use multicast and listen to the network Ziver Koc 2016-05-31 16:55:08 +02:00
• 4f6066fe7a Added some improved robostness to sensor sync daemon BUILD-31 Ziver Koc 2016-05-31 14:33:46 +02:00
• 868364a0ca refactored UDPThreadedNetwork Ziver Koc 2016-05-31 10:37:29 +02:00
• eff019c012 Arduino trying to get DHT senosors to work BUILD-30 Ziver Koc 2016-05-29 22:23:29 +02:00
• 5fd432ee4c Charts will autohide the popup and fixed logging property BUILD-29 Ziver Koc 2016-05-27 16:36:24 +02:00
• fa4a5911e5 bugfix BUILD-28 Ziver Koc 2016-05-26 16:54:54 +02:00
• eee2af5799 Switched sensor detail chart to 24 hours BUILD-27 Ziver Koc 2016-05-26 16:51:26 +02:00