Patrick McDonagh
|
72f1cb6684
|
Working with SampleData.py and SSL. Issues still exist with tag graphs
|
2016-10-28 18:22:23 -05:00 |
|
Patrick McDonagh
|
611502c74a
|
Ditched Backbone in favor of Angular
|
2016-10-27 17:19:25 -05:00 |
|
Patrick McDonagh
|
d0f329bc7f
|
Adds backbone and marionette functions
|
2016-10-26 17:45:25 -05:00 |
|
Patrick McDonagh
|
c9b4c2f4d7
|
First commit for this branch. Adds files for Flask and flask-restless
|
2016-10-25 19:01:36 -05:00 |
|
Patrick McDonagh
|
49c8012532
|
Uses pycomm_helper package instead of that janky old tag package
|
2016-10-14 19:19:02 -05:00 |
|
Patrick McDonagh
|
4b9dd1bc71
|
Instead of cloning pycomm (which may require installing git), just copy it and install it locally
|
2016-10-14 10:06:52 -05:00 |
|
Patrick McDonagh
|
6dcbcd2846
|
Reorganizes for 2 docker containers
|
2016-10-13 17:18:52 -05:00 |
|
Patrick McDonagh
|
e374169c71
|
Silences npm install
|
2016-10-13 13:41:40 -05:00 |
|
Patrick McDonagh
|
14dd0ff29b
|
Instead of migrate behavior being alter, added default db structure
|
2016-10-13 12:15:15 -05:00 |
|
Patrick McDonagh
|
84fc2fbccc
|
Changes migrate behavior to alter
|
2016-10-13 09:49:44 -05:00 |
|
Patrick McDonagh
|
069c9a9915
|
First attempt at docker configuration
|
2016-10-12 19:05:52 -05:00 |
|
Patrick McDonagh
|
5e5cfde3cf
|
per POCONSOLE-59, updates submodule URL
|
2016-09-09 18:24:21 -05:00 |
|
Patrick McDonagh
|
f1603aec41
|
Adds modal to confirm Tag Data Deletion
|
2016-07-28 14:20:57 -05:00 |
|
Patrick McDonagh
|
871bf70161
|
Converts CSV Method for getting all data to new separate column method
|
2016-07-28 13:11:18 -05:00 |
|
Patrick McDonagh
|
8fe01d0a7d
|
rewrites CSV method to give a separate column for each tag
|
2016-07-28 10:52:04 -05:00 |
|
Patrick McDonagh
|
7cb4a38841
|
POCONSOLE-57 needed a few changes
|
2016-07-27 17:39:38 -05:00 |
|
Patrick McDonagh
|
3dda1c48eb
|
Fixes POCONSOLE-57, Adds Delete All Tag Data button to Config page
|
2016-07-27 17:30:49 -05:00 |
|
Patrick McDonagh
|
67a5ef3ee5
|
Fixes POCONSOLE-56. Start/End times are now working and enough data points are being pulled.
|
2016-07-27 17:30:17 -05:00 |
|
Patrick McDonagh
|
5ea8697662
|
Merged branch master into master
|
2016-07-27 16:04:46 -05:00 |
|
Patrick McDonagh
|
af943599db
|
changes migrate behavior to "safe" vs "alter"
|
2016-07-27 16:04:40 -05:00 |
|
Patrick McDonagh
|
e03dd1294d
|
changes migrate behavior to "save" vs "alter"
|
2016-07-27 16:04:07 -05:00 |
|
Patrick McDonagh
|
325d4affbd
|
Completes POCONSOLE-51. Forces SSL/HTTPS
|
2016-06-22 11:47:58 -05:00 |
|
Patrick McDonagh
|
1ec4035ea9
|
Adds SSL certificate use
|
2016-06-22 11:03:06 -05:00 |
|
Patrick McDonagh
|
99d989790c
|
Fixes timeouts for raspberry pi devices
|
2016-06-22 11:02:39 -05:00 |
|
Patrick McDonagh
|
c778152e36
|
Fixes POCloud Driver to work with Sails framework
|
2016-05-27 17:33:06 -05:00 |
|
Patrick McDonagh
|
8342efeeee
|
Updated Tag submodule
|
2016-05-24 21:30:32 -05:00 |
|
Patrick McDonagh
|
3ae3224880
|
Closes POCONSOLE-36. PLC Logic for handshaking and corrections to datalogger driver
|
2016-05-13 10:26:57 -05:00 |
|
Patrick McDonagh
|
742f610ede
|
Updates webpage to allow input of plc handshake tags
|
2016-05-13 09:55:59 -05:00 |
|
Patrick McDonagh
|
548288bd29
|
Changes handshaking to be normal tag with class = 6, allows multiple handshake tags
|
2016-05-13 09:41:30 -05:00 |
|
Patrick McDonagh
|
01c23b142c
|
Adds handshaking
|
2016-05-13 09:26:41 -05:00 |
|
Patrick McDonagh
|
59ec89bd2a
|
Test Fix for POCONSOLE-34 of tags not clearing data correctl
|
2016-05-09 15:41:50 -05:00 |
|
Patrick McDonagh
|
6f58daa492
|
Removed logging
|
2016-05-08 13:52:30 -05:00 |
|
Patrick McDonagh
|
726ce9eb05
|
update tag module again
|
2016-05-06 11:28:31 -05:00 |
|
Patrick McDonagh
|
ca4e00fa2b
|
Update tag module
|
2016-05-06 11:23:20 -05:00 |
|
Patrick McDonagh
|
7d42661112
|
devices were always CLX
|
2016-05-06 11:19:24 -05:00 |
|
Patrick McDonagh
|
33b8983685
|
refactored tricky function
|
2016-05-05 17:29:26 -05:00 |
|
Patrick McDonagh
|
0a045cd2b4
|
form-group was blocking post data
|
2016-05-05 16:21:02 -05:00 |
|
Patrick McDonagh
|
7b98b317b2
|
log request body
|
2016-05-05 16:13:21 -05:00 |
|
Patrick McDonagh
|
e8cc9f1465
|
Document Upload and Deletion work great
|
2016-05-05 15:53:45 -05:00 |
|
Patrick McDonagh
|
4ad91f1271
|
Class was misspelled
|
2016-05-05 09:55:08 -05:00 |
|
Patrick McDonagh
|
6e043a1c4a
|
don't need to track .tmp folder
|
2016-05-05 09:51:49 -05:00 |
|
Patrick McDonagh
|
2565799059
|
fixed columns running together
|
2016-05-05 09:49:34 -05:00 |
|
Patrick McDonagh
|
a171f8c1c0
|
Fixed post URL
|
2016-05-05 09:38:19 -05:00 |
|
Patrick McDonagh
|
6700487076
|
Adds ability to store documents
|
2016-05-05 09:30:47 -05:00 |
|
Patrick McDonagh
|
3d7806b04d
|
Trying to ignore .tmp folder
|
2016-05-04 18:29:23 -05:00 |
|
Patrick McDonagh
|
3628d73452
|
Ignore files added by the file upload
|
2016-05-04 18:28:21 -05:00 |
|
Patrick McDonagh
|
7f24d04759
|
File storage started
|
2016-05-04 17:51:44 -05:00 |
|
Patrick McDonagh
|
ba7a76ac59
|
Fixed tag module weirdness
|
2016-05-04 13:18:19 -05:00 |
|
Patrick McDonagh
|
123f192844
|
Fixed script to restart loggers
|
2016-05-04 12:54:38 -05:00 |
|
Patrick McDonagh
|
569e2a4cfc
|
fixed variable error
|
2016-05-04 11:05:11 -05:00 |
|