Isaac Connor
|
ce1499d70f
|
Merge pull request #93 from pliablepixels/92-opt-eventnotification
92 opt eventnotification
|
2018-03-29 11:31:02 -04:00 |
Isaac Connor
|
3fe5bb6fe2
|
open and close the session around user login
|
2018-03-29 11:30:20 -04:00 |
|
Isaac Connor
|
f8457e04e2
|
clean out commented out code
|
2018-03-29 11:30:09 -04:00 |
Pliable Pixels
|
e5505de1d1
|
fixed brace styling
|
2018-03-29 11:27:31 -04:00 |
|
Pliable Pixels
|
d64e58e374
|
silly mistake - wrong names
|
2018-03-29 11:23:35 -04:00 |
|
Pliable Pixels
|
95eb1d3045
|
merged master storage areas, resolved conflicts
|
2018-03-29 08:51:35 -04:00 |
|
Pliable Pixels
|
990d60926e
|
#92 new key
|
2018-03-29 08:47:55 -04:00 |
Isaac Connor
|
31963dcd16
|
say how big the file was
|
2018-03-28 13:41:16 -07:00 |
|
Isaac Connor
|
d1dd16b81c
|
fix event_id to EventId
|
2018-03-28 13:07:53 -07:00 |
|
Isaac Connor
|
842a42bcd5
|
test for existence of mp4 before trying to grab images from it
|
2018-03-28 13:01:58 -07:00 |
|
Isaac Connor
|
5494e1bf7a
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-28 11:54:13 -07:00 |
|
Isaac Connor
|
b22911f554
|
wait to closeEvent on monitor shutdown
|
2018-03-28 14:03:56 -04:00 |
|
Isaac Connor
|
9d5dcd7b0c
|
return to indicate success of load
|
2018-03-28 08:56:03 -07:00 |
|
Isaac Connor
|
a2452db3de
|
Add Url to storage for S3 support
|
2018-03-28 08:23:36 -07:00 |
|
Isaac Connor
|
3056dd240d
|
bump version to get Url in Storage
|
2018-03-28 08:23:13 -07:00 |
|
Isaac Connor
|
2748f47fb7
|
add Url to Storage for S3 support
|
2018-03-28 08:23:03 -07:00 |
|
Isaac Connor
|
3e7bc46bf9
|
Add Amazon S3 file deletion. Add bandwidth use in file move.
|
2018-03-28 08:21:57 -07:00 |
|
Isaac Connor
|
4d6e5d0ab6
|
Add libnumber-bytes-human-perl as a dependency
|
2018-03-28 08:21:17 -07:00 |
|
Isaac Connor
|
4be64152e8
|
put mutex around inserting event stats
|
2018-03-28 09:12:38 -04:00 |
|
Isaac Connor
|
4d68f9a757
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-27 13:24:57 -07:00 |
|
Isaac Connor
|
a5e389fc29
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-03-27 11:04:46 -04:00 |
|
Isaac Connor
|
b8a792cfb7
|
whitespace google code style
|
2018-03-27 11:04:40 -04:00 |
|
Isaac Connor
|
62a0890383
|
Merge pull request #89 from pliablepixels/ui-tweaks
Ui tweaks for storage areas
|
2018-03-27 11:00:25 -04:00 |
|
Isaac Connor
|
d5319dd046
|
Merge pull request #91 from pliablepixels/90-group-incomplete
Fix for Event details apis (anything that needs groups to be loaded)
|
2018-03-27 11:00:03 -04:00 |
|
Pliable Pixels
|
d3350919de
|
Reintroduced empty check rule, closed paranthesis
|
2018-03-27 10:55:36 -04:00 |
|
Isaac Connor
|
3a5ff289d0
|
perfect the whitespace
|
2018-03-27 10:04:32 -04:00 |
|
Isaac Connor
|
bcc7011871
|
update sql loading code in Reload, which will automatically do the db locking
|
2018-03-27 10:04:19 -04:00 |
|
Pliable Pixels
|
caffe5f7c9
|
dot should be red when either fclass or source_class is red
|
2018-03-27 08:55:15 -04:00 |
|
Pliable Pixels
|
1b5d802890
|
dot should be red when either fclass or source_class is red
|
2018-03-27 08:43:58 -04:00 |
|
Pliable Pixels
|
5b7011c61b
|
commented out incomplete definition - please complete it if you need it
|
2018-03-27 03:58:28 -04:00 |
|
Pliable Pixels
|
b077cc8900
|
table header - keep consistent
|
2018-03-26 11:50:14 -04:00 |
|
Pliable Pixels
|
dfcee7c6c1
|
table header - keep consistent
|
2018-03-26 11:14:46 -04:00 |
|
Pliable Pixels
|
411e1d05f2
|
used chosen for log filters
|
2018-03-26 11:09:35 -04:00 |
|
Pliable Pixels
|
f790306990
|
added account icon
|
2018-03-25 16:18:50 -04:00 |
|
Pliable Pixels
|
980684a2f0
|
adjusted h1 size
|
2018-03-25 16:09:31 -04:00 |
|
Pliable Pixels
|
cc2f285408
|
log view tweaks, cleaned up header issues
|
2018-03-25 16:01:04 -04:00 |
|
Pliable Pixels
|
1179b6ddc4
|
rounded top for tables and highlights
|
2018-03-25 11:43:34 -04:00 |
|
Pliable Pixels
|
bf57b65ebb
|
reduced 2nd row of navbar text
|
2018-03-25 09:56:41 -04:00 |
|
Pliable Pixels
|
809e58fae6
|
acct icon to material
|
2018-03-25 09:44:30 -04:00 |
|
Pliable Pixels
|
14f638e009
|
replaced ionic fonts with material design icons
|
2018-03-25 09:28:00 -04:00 |
|
Pliable Pixels
|
acdc076b84
|
padding to navbutton
|
2018-03-24 18:36:10 -04:00 |
|
Pliable Pixels
|
10aedb51a6
|
reduced size of totals 2nd row
|
2018-03-24 18:30:50 -04:00 |
|
Pliable Pixels
|
a68cc79437
|
using MIT licensed ion-icons, its smaller than FA, replaced some text with icons
|
2018-03-24 18:25:39 -04:00 |
|
Pliable Pixels
|
0b31cc4d3d
|
2nd level header tweak
|
2018-03-24 17:34:46 -04:00 |
|
Pliable Pixels
|
b8f6c2277f
|
clone icons
|
2018-03-24 10:21:59 -04:00 |
|
Pliable Pixels
|
140217bef6
|
icons, muted colors, text tightening
|
2018-03-24 09:59:39 -04:00 |
|
Pliable Pixels
|
a9d6bd22bc
|
shortened monitor add
|
2018-03-24 09:59:08 -04:00 |
|
Isaac Connor
|
0bb1c5ce71
|
load groups when duping a monitor
|
2018-03-23 13:35:45 -07:00 |
|
Isaac Connor
|
85c757d2b1
|
Include group in parents list display
|
2018-03-23 13:35:02 -07:00 |
|
Isaac Connor
|
914de097db
|
Fix typo
|
2018-03-23 13:34:46 -07:00 |