Isaac Connor
|
ef86746991
|
Merge ../ZoneMinder.connortechnology
|
2018-04-17 21:07:48 -04:00 |
Isaac Connor
|
10a191ae5b
|
add event_disk_space to storage to differentiate between real used space versus event used disk space. Use this in the navbar to show actual disk use and also event disk use
|
2018-04-17 14:14:40 -07:00 |
|
Isaac Connor
|
92cb7dabd5
|
merge some fixes from other branches
|
2018-04-17 08:48:59 -07:00 |
|
Isaac Connor
|
dc098b5299
|
put the status into the function column
|
2018-04-16 14:51:10 -04:00 |
|
Isaac Connor
|
98b54f87f2
|
make thumbnail code more readable
|
2018-04-15 10:27:08 -04:00 |
|
Isaac Connor
|
f9f78e9aa3
|
Convert event_id to a 64bit unsigned int
|
2018-04-12 13:40:11 -07:00 |
|
Isaac Connor
|
bb924ee078
|
add report_event_audit
|
2018-04-10 13:06:01 -07:00 |
|
Isaac Connor
|
ae3ccf6ffe
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-06 12:32:07 -07:00 |
|
Isaac Connor
|
7f850890cb
|
whitespace
|
2018-04-06 14:42:20 -04:00 |
|
Isaac Connor
|
4adebfce1d
|
Add Monitor Status breakdown to console
|
2018-04-05 09:53:53 -07:00 |
|
Isaac Connor
|
70c7eaef0e
|
fix using wrong array. Should use StorageById
|
2018-04-04 20:29:01 -04:00 |
|
Isaac Connor
|
2f6adff1b2
|
handle when storage area is gone
|
2018-04-04 20:27:21 -04:00 |
|
Isaac Connor
|
053322c2c3
|
add NextFrameId to Frames
|
2018-04-03 12:32:14 -07:00 |
|
Isaac Connor
|
66920eb5b8
|
fix status colour when not capturing
|
2018-04-03 12:31:54 -07:00 |
|
Isaac Connor
|
7a5d4d3b19
|
adjust frame_id for bulk frames
|
2018-04-03 12:31:39 -07:00 |
|
Isaac Connor
|
85bb26668e
|
translate Statuses beter
|
2018-04-03 12:30:57 -07:00 |
|
Isaac Connor
|
49aeb4b467
|
whitespace
|
2018-04-03 10:38:38 -07:00 |
|
Isaac Connor
|
09e05b1313
|
Clean up date stuff, use moment for formatting in secs2dbstr etc
|
2018-04-03 10:38:03 -07:00 |
|
Isaac Connor
|
7346a8c733
|
add select button
|
2018-04-03 10:36:58 -07:00 |
|
Isaac Connor
|
e91729692e
|
add Function filter
|
2018-04-03 10:36:44 -07:00 |
|
Isaac Connor
|
614170c181
|
Add EndTime to event list
|
2018-04-03 06:57:22 -07:00 |
|
Isaac Connor
|
793f630ee0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-02 10:43:07 -07:00 |
|
Isaac Connor
|
d1dd16b81c
|
fix event_id to EventId
|
2018-03-28 13:07:53 -07:00 |
|
Isaac Connor
|
a2452db3de
|
Add Url to storage for S3 support
|
2018-03-28 08:23:36 -07:00 |
|
Isaac Connor
|
4d68f9a757
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-27 13:24:57 -07: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
|
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
|
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
|
14f638e009
|
replaced ionic fonts with material design icons
|
2018-03-25 09:28:00 -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 |
|
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
|
b4c13d56d6
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-06 12:29:59 -05:00 |
Steve Gilvarry
|
1c740de5dc
|
Add Return False to Event Back
|
2018-03-04 13:37:30 +11:00 |
|
Steve Gilvarry
|
db8ab28845
|
Add return false to window.history.back
Adding this makes it work in Safari
|
2018-03-04 08:37:21 +11:00 |
|
Isaac Connor
|
c53b6ffbb0
|
rework montagereview to load data faster and leave event and frame data in json objects
|
2018-03-02 18:26:50 -08:00 |
Andrew Bauer
|
3e77a85549
|
url to css/spinner.css should be relative
fixes http 404 not found errors for this css file
|
2018-03-02 17:19:10 -06:00 |
|
Isaac Connor
|
7e628bc3fd
|
add showing groups under Monitor Name on console
|
2018-03-01 19:23:46 -08:00 |
|
Isaac Connor
|
c5eec7e2fd
|
hide save button on successful form completion so we don't get a duplicate submit
|
2018-02-27 15:10:45 -08:00 |
|
Isaac Connor
|
83fad681b3
|
use button tags and hide the button content after click
|
2018-02-27 11:49:13 -08:00 |
|
Isaac Connor
|
c50627fd88
|
GroupIds needs to be an array
|
2018-02-27 11:21:04 -08:00 |
|
Isaac Connor
|
6a6eb87686
|
fix defaults
|
2018-02-26 18:00:02 -08:00 |
|
Isaac Connor
|
793e87c26d
|
Apply chosen style to group and linked monitors dropdown
|
2018-02-26 17:58:20 -08:00 |
|
Isaac Connor
|
92c34f6043
|
add Groups to monitor edit
|
2018-02-26 16:09:36 -08:00 |
|
Isaac Connor
|
9d1a8b1e18
|
Add the danger css tag to cpuload > 5, freeram < 10% and freeswap < 10%
|
2018-02-26 10:39:45 -08:00 |
Isaac Connor
|
7d88e25ef9
|
simplify thumbnail/snapshot usage a bit
|
2018-02-19 17:25:49 -05:00 |
|
Isaac Connor
|
eeb7190812
|
fix rand replacing in image url
|
2018-02-14 13:16:30 -05:00 |
|
Isaac Connor
|
45bf4544ca
|
rename SetImageSource to getImageSource which is what it actually does
|
2018-02-14 11:58:47 -05:00 |
|
Isaac Connor
|
c7a43a53f0
|
Sort the event records
|
2018-02-13 11:28:06 -05:00 |
|
Isaac Connor
|
535cdf6485
|
When there isn't an event for the given moment, play the previous one. If still no events found, popup live
|
2018-02-13 11:27:55 -05:00 |
|
Isaac Connor
|
a35ba812b7
|
fix merging conditions
|
2018-02-09 07:57:52 -08:00 |
|
Isaac Connor
|
63a214869e
|
rework montagereview to be more performant.
|
2018-02-09 07:31:19 -08:00 |
|
Isaac Connor
|
6518311022
|
Use Status and CaptureFPS and AnalysisFPS to do status coloration
|
2018-02-09 07:31:03 -08:00 |
|
Isaac Connor
|
4b51fed500
|
Rework order of filters. Put Monitors at the end. recalc selected_monitor_ids
|
2018-02-09 07:30:53 -08:00 |
|
Isaac Connor
|
cb9eef8563
|
show No streams found if none were found
|
2018-02-09 07:30:12 -08:00 |
|
Isaac Connor
|
6e240f669c
|
fix filtering
|
2018-02-08 14:25:58 -08:00 |
|
Isaac Connor
|
894467cdef
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-02-08 10:51:49 -08:00 |
|
Isaac Connor
|
b8b2edf847
|
close the datetime inputs
|
2018-02-08 10:50:33 -08:00 |
|
Isaac Connor
|
2a00cf852a
|
Set a type on the buttons so that they act right
|
2018-02-08 10:50:22 -08:00 |
|
Isaac Connor
|
4777808cf0
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-08 13:15:41 -05:00 |
|
Isaac Connor
|
95cfdb327d
|
further separate addBtn and cloneBtn, fixes
|
2018-02-08 13:15:27 -05:00 |
|
Isaac Connor
|
cdfc7f1808
|
give the buttons div an id and move the styling into the css
|
2018-02-08 09:30:48 -08:00 |
|
Isaac Connor
|
4240dc4bde
|
spacing, add a test for minTime being after maxTime
|
2018-02-08 09:30:26 -08:00 |
|
Isaac Connor
|
cfe53c0ffe
|
Explicitly set the danger class on each line because they can get out of sync when using the All toggle
|
2018-02-08 09:57:11 -05:00 |
|
Isaac Connor
|
babae4629a
|
Update and fix console buttons. Use a separate button for clone
|
2018-02-08 09:47:16 -05:00 |
Isaac Connor
|
a4c59e3e50
|
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
|
2018-02-07 09:07:57 -05:00 |
|
Isaac Connor
|
dec82ecf5c
|
Fix for when specifying page 1 and no pages
|
2018-02-07 09:07:51 -05:00 |
|
Isaac Connor
|
e25af4b40c
|
cleanup, reset result
|
2018-02-02 16:07:13 -05:00 |
|
Isaac Connor
|
dee843d7da
|
add All and remove default from Storage dropdown options
|
2018-02-02 12:48:49 -05:00 |
|
Isaac Connor
|
060e6893cc
|
fix Storage dropdown population and don't clear value on line type change
|
2018-02-02 12:48:22 -05:00 |
|
Isaac Connor
|
26ac1fd695
|
Include soap version in list of onvif cameras
|
2018-02-01 11:32:13 -05:00 |
|
Isaac Connor
|
132fff1931
|
An ok json return with no status is possible now
|
2018-01-31 14:35:48 -05:00 |
|
Isaac Connor
|
7c3efc02cd
|
put back old add monitor popup
|
2018-01-31 11:56:57 -05:00 |
|
Isaac Connor
|
b1f2b677c3
|
remove path from source
|
2018-01-30 10:09:12 -05:00 |
|
Isaac Connor
|
b9a98d34bf
|
strip query and scheme from source
|
2018-01-29 19:03:16 -05:00 |
|
Isaac Connor
|
a60da6811b
|
revert adding custom port for status updates. It breaks in the non-multiserver case.
|
2018-01-29 15:17:22 -05:00 |
|
Isaac Connor
|
6acb555c52
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-29 10:42:23 -08:00 |
|
Isaac Connor
|
d19b8bc5cf
|
add default value for ServerId in new Storage Object
|
2018-01-29 10:41:59 -08:00 |
|
Isaac Connor
|
06673019f9
|
add default values for zmstats, zmaudit, zmtrigger in new Server
|
2018-01-29 10:41:43 -08:00 |
|
Isaac Connor
|
8979f14314
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-29 11:29:33 -05:00 |
|
Isaac Connor
|
a76fcb331c
|
Remove debugging. Treat can't get semaphore as a non-error
|
2018-01-29 08:25:46 -08:00 |
|
Isaac Connor
|
4751920423
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-29 07:49:38 -08:00 |
|
Isaac Connor
|
35cda5cf17
|
Merge sjc04p1fviap02:ZoneMinder into storageareas
|
2018-01-29 07:45:55 -08:00 |
|
Isaac Connor
|
a490c0e5bf
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-29 07:45:37 -08:00 |
|
Isaac Connor
|
a782ef1db7
|
Add debug tests for loading all events
|
2018-01-29 07:45:28 -08:00 |
|
Isaac Connor
|
e672841a8d
|
Add remote server port to monitor url
|
2018-01-29 07:42:43 -08:00 |
|
Isaac Connor
|
03122b9015
|
add onFailure logger, and change link to chain so that responses don't just disappear
|
2018-01-29 07:38:02 -08:00 |
|
Isaac Connor
|
dc6842bfbd
|
Add remote server port to monitor url
|
2018-01-29 07:32:40 -08:00 |
|
Isaac Connor
|
b793e6659b
|
add onFailure logger, and change link to chain so that responses don't just disappear
|
2018-01-29 07:32:02 -08:00 |
|
Isaac Connor
|
984d3a2dd1
|
add Monitor Name to the response listing the available camera feeds
|
2018-01-29 07:30:46 -08:00 |
|
Isaac Connor
|
0b2d752ea4
|
Use chosen on the MonitorIds select.
|
2018-01-29 10:29:59 -05:00 |