d961b74084
spacing and double to single quotes
2018-06-06 11:41:00 -04:00
5d772f16f6
fix closing td
2018-06-01 16:18:07 -04:00
77b144a13e
must specify type=button or else some browsers treat it as a submit button
2018-05-18 16:07:58 +02:00
7ad6b01310
double to single quotes and spacing
2018-05-18 15:52:12 +02:00
d8a62e0ede
Show total size for non-montage review downloads as well
2018-05-18 15:51:42 +02:00
2a8ea98249
remove blank space at end of line
2018-05-18 09:12:10 -04:00
4815162bea
fix extra }
2018-05-18 09:11:15 -04:00
8276386a44
We always return an associative array now
2018-05-18 09:06:17 -04:00
fdaf992156
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-05-16 14:18:48 -04:00
93dd943fec
Fix some spacing
2018-05-16 20:17:57 +02:00
780cb693c2
google code style
2018-05-16 11:14:11 -04:00
81c4542a94
correct use of getValue. Use standard ddm element value instead
2018-05-16 11:13:59 -04:00
f16e1953d9
Make Source filter apply to Path as well
2018-05-15 10:45:10 -07:00
485f292943
fix php 5.4 compatibility - remove calls to empty
2018-05-14 12:32:48 -05:00
b2115f9dcf
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-08 13:34:03 -07:00
62edca6dcb
add fileSize to the api, and use it to add remote fileSize reporting in includes/Event
2018-05-08 13:33:56 -07:00
3c4befc73a
improve Name and Source filtering. Default to case insensitive text search.
2018-05-08 14:07:24 -04:00
a4911d8f39
use Event object call for file_exists, which will check remotely. Make MissingFiles and ZeroSize be a link to filter results for those events
2018-05-07 14:08:17 -07:00
2076508374
add Source and Name filters
2018-05-04 06:47:02 -07:00
3fd953a4eb
Move code to generate Source from console into Monitor Object
2018-05-04 06:46:46 -07:00
d43cd322f4
Make event count a link to a filter to list them.
2018-05-03 09:42:14 -07:00
81758fab38
use new Thumbnail code
2018-05-03 09:39:23 -07:00
e64de07560
spacing
2018-05-03 09:39:09 -07:00
dbf760d8af
cleanup no longer needed StatusFilter code. Use class=MonitorFilter instead of id=monitorControl to be consistent
2018-05-03 09:38:56 -07:00
433cffcce7
include Id in Filter dropdown
2018-04-30 15:21:05 -04:00
6c5e6e6184
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-30 07:10:38 -07:00
3f05d46012
Merge zmdc.pl fixes. We can now handle database disconnects gracefully.
2018-04-30 07:09:23 -07:00
e891c88a3e
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-28 12:38:57 -04:00
abd52ebfb1
Add DiskSpace column to storage listing
2018-04-28 12:38:10 -04:00
a4da624f4c
break out of loops when zm-terminate is set
2018-04-27 13:20:38 -07:00
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -04:00
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
dd6683f0be
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-25 10:31:47 -07:00
636d0caf30
handle no swap
2018-04-25 10:28:19 -07:00
80f73854c7
Include the groupIds hidden when not on general tab
2018-04-25 09:33:02 -04:00
5b4d160710
add total bandwidth at bottom and move buttons to top
2018-04-24 14:18:41 -04:00
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -04:00
3560c0d610
fix displayed tbale header twice
2018-04-21 10:35:36 -04:00
781438d4c5
specify E.* in query because otherwise it uses M.Id for Id
2018-04-20 14:25:38 -04:00
fedc4d4cb1
spacing
2018-04-20 14:24:56 -04:00
970830aee3
tidy up
2018-04-20 13:10:38 -04:00
fb44619a66
output the initial table head
2018-04-19 14:33:05 -04:00
5b5cd3f330
fix broken table when no monitors to display
2018-04-19 14:16:30 -04:00
983cd83054
Add default for SignalCheckPoints and add it as a hidden field to the non-misc tabs
2018-04-19 10:01:04 -04:00
cd70ed3dec
always show SignalCheckColour and add a SignalCheckPoints option
2018-04-19 09:45:28 -04:00
fcaac016b5
Merge ../ZoneMinder.connortechnology
2018-04-18 21:12:14 -04:00
28b85e1977
Add ZeroSize test to Event Audit Report
2018-04-18 13:48:20 -07:00
d31207dd53
use find_one instead of new Group so that caching will happen
2018-04-18 12:30:47 -04:00
61249ccf2a
Show pause/play/stop when no stream buffer
2018-04-18 12:30:18 -04:00
36b8cfb115
test element so that processing will continue if buton doesn't exist
2018-04-18 12:29:59 -04:00
ef86746991
Merge ../ZoneMinder.connortechnology
2018-04-17 21:07:48 -04:00
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
92cb7dabd5
merge some fixes from other branches
2018-04-17 08:48:59 -07:00
dc098b5299
put the status into the function column
2018-04-16 14:51:10 -04:00
98b54f87f2
make thumbnail code more readable
2018-04-15 10:27:08 -04:00
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
bb924ee078
add report_event_audit
2018-04-10 13:06:01 -07:00
ae3ccf6ffe
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-06 12:32:07 -07:00
7f850890cb
whitespace
2018-04-06 14:42:20 -04:00
4adebfce1d
Add Monitor Status breakdown to console
2018-04-05 09:53:53 -07:00
70c7eaef0e
fix using wrong array. Should use StorageById
2018-04-04 20:29:01 -04:00
2f6adff1b2
handle when storage area is gone
2018-04-04 20:27:21 -04:00
053322c2c3
add NextFrameId to Frames
2018-04-03 12:32:14 -07:00
66920eb5b8
fix status colour when not capturing
2018-04-03 12:31:54 -07:00
7a5d4d3b19
adjust frame_id for bulk frames
2018-04-03 12:31:39 -07:00
85bb26668e
translate Statuses beter
2018-04-03 12:30:57 -07:00
49aeb4b467
whitespace
2018-04-03 10:38:38 -07:00
09e05b1313
Clean up date stuff, use moment for formatting in secs2dbstr etc
2018-04-03 10:38:03 -07:00
7346a8c733
add select button
2018-04-03 10:36:58 -07:00
e91729692e
add Function filter
2018-04-03 10:36:44 -07:00
614170c181
Add EndTime to event list
2018-04-03 06:57:22 -07:00
793f630ee0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-02 10:43:07 -07:00
d1dd16b81c
fix event_id to EventId
2018-03-28 13:07:53 -07:00
a2452db3de
Add Url to storage for S3 support
2018-03-28 08:23:36 -07:00
4d68f9a757
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-27 13:24:57 -07:00
caffe5f7c9
dot should be red when either fclass or source_class is red
2018-03-27 08:55:15 -04:00
1b5d802890
dot should be red when either fclass or source_class is red
2018-03-27 08:43:58 -04:00
b077cc8900
table header - keep consistent
2018-03-26 11:50:14 -04:00
dfcee7c6c1
table header - keep consistent
2018-03-26 11:14:46 -04:00
411e1d05f2
used chosen for log filters
2018-03-26 11:09:35 -04:00
f790306990
added account icon
2018-03-25 16:18:50 -04:00
cc2f285408
log view tweaks, cleaned up header issues
2018-03-25 16:01:04 -04:00
1179b6ddc4
rounded top for tables and highlights
2018-03-25 11:43:34 -04:00
14f638e009
replaced ionic fonts with material design icons
2018-03-25 09:28:00 -04:00
10aedb51a6
reduced size of totals 2nd row
2018-03-24 18:30:50 -04:00
a68cc79437
using MIT licensed ion-icons, its smaller than FA, replaced some text with icons
2018-03-24 18:25:39 -04:00
0b31cc4d3d
2nd level header tweak
2018-03-24 17:34:46 -04:00
b8f6c2277f
clone icons
2018-03-24 10:21:59 -04:00
140217bef6
icons, muted colors, text tightening
2018-03-24 09:59:39 -04:00
0bb1c5ce71
load groups when duping a monitor
2018-03-23 13:35:45 -07:00
85c757d2b1
Include group in parents list display
2018-03-23 13:35:02 -07:00
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
1c740de5dc
Add Return False to Event Back
2018-03-04 13:37:30 +11:00
db8ab28845
Add return false to window.history.back
...
Adding this makes it work in Safari
2018-03-04 08:37:21 +11:00
c53b6ffbb0
rework montagereview to load data faster and leave event and frame data in json objects
2018-03-02 18:26:50 -08:00
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
7e628bc3fd
add showing groups under Monitor Name on console
2018-03-01 19:23:46 -08:00
c5eec7e2fd
hide save button on successful form completion so we don't get a duplicate submit
2018-02-27 15:10:45 -08:00
83fad681b3
use button tags and hide the button content after click
2018-02-27 11:49:13 -08:00
c50627fd88
GroupIds needs to be an array
2018-02-27 11:21:04 -08:00
6a6eb87686
fix defaults
2018-02-26 18:00:02 -08:00
793e87c26d
Apply chosen style to group and linked monitors dropdown
2018-02-26 17:58:20 -08:00
92c34f6043
add Groups to monitor edit
2018-02-26 16:09:36 -08:00
9d1a8b1e18
Add the danger css tag to cpuload > 5, freeram < 10% and freeswap < 10%
2018-02-26 10:39:45 -08:00
7d88e25ef9
simplify thumbnail/snapshot usage a bit
2018-02-19 17:25:49 -05:00
eeb7190812
fix rand replacing in image url
2018-02-14 13:16:30 -05:00
45bf4544ca
rename SetImageSource to getImageSource which is what it actually does
2018-02-14 11:58:47 -05:00
c7a43a53f0
Sort the event records
2018-02-13 11:28:06 -05:00
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
a35ba812b7
fix merging conditions
2018-02-09 07:57:52 -08:00
63a214869e
rework montagereview to be more performant.
2018-02-09 07:31:19 -08:00
6518311022
Use Status and CaptureFPS and AnalysisFPS to do status coloration
2018-02-09 07:31:03 -08:00
4b51fed500
Rework order of filters. Put Monitors at the end. recalc selected_monitor_ids
2018-02-09 07:30:53 -08:00
cb9eef8563
show No streams found if none were found
2018-02-09 07:30:12 -08:00
6e240f669c
fix filtering
2018-02-08 14:25:58 -08:00
894467cdef
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-02-08 10:51:49 -08:00
b8b2edf847
close the datetime inputs
2018-02-08 10:50:33 -08:00
2a00cf852a
Set a type on the buttons so that they act right
2018-02-08 10:50:22 -08:00
4777808cf0
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-02-08 13:15:41 -05:00
95cfdb327d
further separate addBtn and cloneBtn, fixes
2018-02-08 13:15:27 -05:00
cdfc7f1808
give the buttons div an id and move the styling into the css
2018-02-08 09:30:48 -08:00
4240dc4bde
spacing, add a test for minTime being after maxTime
2018-02-08 09:30:26 -08:00
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
babae4629a
Update and fix console buttons. Use a separate button for clone
2018-02-08 09:47:16 -05:00
a4c59e3e50
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-02-07 09:07:57 -05:00
dec82ecf5c
Fix for when specifying page 1 and no pages
2018-02-07 09:07:51 -05:00
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
dee843d7da
add All and remove default from Storage dropdown options
2018-02-02 12:48:49 -05:00
060e6893cc
fix Storage dropdown population and don't clear value on line type change
2018-02-02 12:48:22 -05:00
26ac1fd695
Include soap version in list of onvif cameras
2018-02-01 11:32:13 -05:00
132fff1931
An ok json return with no status is possible now
2018-01-31 14:35:48 -05:00
7c3efc02cd
put back old add monitor popup
2018-01-31 11:56:57 -05:00
b1f2b677c3
remove path from source
2018-01-30 10:09:12 -05:00
b9a98d34bf
strip query and scheme from source
2018-01-29 19:03:16 -05:00
a60da6811b
revert adding custom port for status updates. It breaks in the non-multiserver case.
2018-01-29 15:17:22 -05:00
6acb555c52
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-01-29 10:42:23 -08:00
d19b8bc5cf
add default value for ServerId in new Storage Object
2018-01-29 10:41:59 -08:00
06673019f9
add default values for zmstats, zmaudit, zmtrigger in new Server
2018-01-29 10:41:43 -08:00
8979f14314
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-29 11:29:33 -05:00
a76fcb331c
Remove debugging. Treat can't get semaphore as a non-error
2018-01-29 08:25:46 -08:00
4751920423
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-29 07:49:38 -08:00
35cda5cf17
Merge sjc04p1fviap02:ZoneMinder into storageareas
2018-01-29 07:45:55 -08:00
a490c0e5bf
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-01-29 07:45:37 -08:00
a782ef1db7
Add debug tests for loading all events
2018-01-29 07:45:28 -08:00
e672841a8d
Add remote server port to monitor url
2018-01-29 07:42:43 -08:00
03122b9015
add onFailure logger, and change link to chain so that responses don't just disappear
2018-01-29 07:38:02 -08:00
dc6842bfbd
Add remote server port to monitor url
2018-01-29 07:32:40 -08:00
b793e6659b
add onFailure logger, and change link to chain so that responses don't just disappear
2018-01-29 07:32:02 -08:00
984d3a2dd1
add Monitor Name to the response listing the available camera feeds
2018-01-29 07:30:46 -08:00
0b2d752ea4
Use chosen on the MonitorIds select.
2018-01-29 10:29:59 -05:00
2dcb0d183f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-28 18:07:33 -08:00
8a4b17fb50
turn into a url instead of boolean. Use it to refresh the options page on change so that changes are instantly noticable
2018-01-28 15:13:57 -05:00
5d4fde88d9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-27 12:17:13 -08:00
456f29fcba
Rename column Id OF Monitor_Statuses to simplify JOINS.
2018-01-26 13:39:37 -05:00
dc46f23af0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-26 10:17:54 -08:00
d001ce467e
use get for status JSON requests
2018-01-26 10:31:55 -05:00
1e3cf9bbf8
handle no streams better
2018-01-25 09:14:21 -08:00
703cd332df
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-25 08:43:53 -08:00
356015a492
Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla
2018-01-25 08:42:08 -08:00
42a27c2ca9
Fix Servers dropdown
2018-01-25 08:41:54 -08:00
57bae7cf17
Fix filtering
2018-01-25 09:14:09 -05:00
fb50f6f996
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-24 17:14:42 -08:00
cc34a3c566
change button type
2018-01-24 23:08:12 +01:00
50fc4a2d94
Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table.
2018-01-24 11:51:11 -05:00
c7ecd580c1
Fix #81 by testing for non-numeric characters in LIMIT. Change type of input to number, making it harder to enter non-numeric characters
2018-01-24 10:27:01 -05:00
ea4937b75e
put back missing s
2018-01-23 17:47:24 -05:00
d9252e2d47
Merge branch 'storageareas' into tesla
2018-01-23 13:29:37 -08:00
fdf1ef795f
Add default value for newStorage['StorageId']
2018-01-23 13:28:46 -08:00
0742217599
Only populate monitorNames if query is valid
2018-01-23 13:28:29 -08:00
c85bb6e614
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-23 09:44:28 -08:00
de08e3114e
more and less debug
2018-01-23 18:16:37 +01:00
8bd1e4cec6
Only show groups filter if there are groups
2018-01-23 18:15:59 +01:00
994766fd50
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-22 13:25:38 -08:00
8fe0e1bdc0
fix Debug => Logger::Debug
2018-01-22 15:58:01 -05:00
8a27ea3a04
Always populate the monitorNames object, and check for duplicate names when saving an existing Monitor as well as new monitors
2018-01-22 11:42:52 -05:00
06c9266c62
use snapshot.jpg more
2018-01-22 03:27:01 +01:00
181a94de82
test for existence of port in url_parts
2018-01-21 11:10:34 -05:00
e26747b5cc
show port when it's not the standard port
2018-01-19 12:15:26 -05:00
95f054c1e6
Show entire path for ffmpeg monitors. Strip out username/password though
2018-01-18 12:40:41 -08:00
ecd5e01b92
Show port when using Remote Method and Port is non-standard
2018-01-18 10:21:05 -08:00
ace66cf977
show port in source column
2018-01-17 13:33:22 -08:00
494d080740
show port in source column
2018-01-17 13:27:44 -08:00
4fecdbd0fa
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-17 12:28:33 -08:00
212bfd4a2c
add Monitor to info shown on event
2018-01-17 12:20:15 -08:00
93623f3fd8
fix filtering by monitor in montagereview
2018-01-17 11:59:54 -08:00
1fbb5bc0f8
Fix zmaudit.pl => zmaudit, etc.
2018-01-17 14:22:04 -05:00
e78a40b45f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-16 11:02:20 -08:00
27ebf1a4aa
Comment out debug code
2018-01-16 14:02:04 -05:00
b09bb528a5
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-16 08:42:41 -08:00
9284e26512
get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot.
2018-01-13 15:15:14 -05:00
bfa31297be
Merge branch 'storageareas' into tesla
2018-01-12 11:26:19 -08:00
4b37c6fc42
Change the Group dropdown to a single indented dropdown, and use chosen on it
2018-01-12 11:25:15 -08:00
c139f7a1bf
we don't need the group setting in the url
2018-01-12 11:24:52 -08:00
5f8756d7ad
Set Tesla defaults for new monitors
2018-01-12 08:11:37 -08:00
ff9f43b5a1
put back code to switch to add_monitors
2018-01-12 08:11:25 -08:00
95c3c26eda
cleanup old Add Monitr button
2018-01-12 08:11:07 -08:00
e2ac13d03e
pretty up the add_monitors interface a bit, add some instructions
2018-01-12 08:10:46 -08:00
666005fb5d
fix single event replay by fixing the reference to player which should be vid
2018-01-11 14:42:00 -05:00
b013da6b95
Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.
2018-01-11 13:14:11 -05:00
3b81cb9eed
Replace ZoneMinder with ZM_WEB_TITLE
2018-01-11 10:57:43 -05:00
b1e8963da9
add header to the login page
2018-01-11 10:57:29 -05:00
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05:00
64f9118e46
remove debug line
2018-01-10 13:47:03 -05:00
4442c571fb
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-10 13:15:20 -05:00
156bdbd089
Add zmstats, zmaudit, zmtrigger flags to Server object listing/editing
2018-01-10 12:59:27 -05:00
4047d0ffc8
add No Server as an option is Server filter
2018-01-09 07:13:03 -08:00
10133073de
Check for SaveJPEGs being set to snapshot instead of hitting the fs to check for a snapshot file
2018-01-04 12:31:20 -05:00
b219f76588
add togglebuttons to select all checbox
2017-12-23 12:58:48 -08:00
cc3b65b5fd
add default value for ServerId in Storage
2017-12-23 12:07:13 -08:00
74269fea73
make montagereview load event images from the server that the storage is located on
2017-12-22 12:33:30 -08:00
2c361de9d3
add Server Storage Areas
2017-12-22 11:39:43 -08:00
148e21d707
fugro
2017-12-21 21:46:21 -05:00
8bfdb73d24
Fix missing change to StartDateTime
...
Fixes filter loading from events if clicked from last hour link.
2017-12-20 15:46:03 -05:00
b4c0f13adf
Allow nondate values
...
Supports -# days/hours/etc
2017-12-20 15:23:14 -05:00
d034ae9ab2
Default value for new brackets
2017-12-18 22:58:38 -05:00
46673bafdb
Merge pull request #68 from digital-gnome/montagereview-datepicker
...
Montagereview datepicker
2017-12-18 13:39:58 -05:00
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
88a1e3eb4d
Fix bad copy
2017-12-17 22:29:56 -05:00
de6ebfc341
Remove chosen from some filter dropdowns and restyle to match
2017-12-17 22:04:10 -05:00
804339f54f
Limit date range and only reload page after change is done
2017-12-17 16:44:57 -05:00
5d190dedff
Set brackets width and allow blank
2017-12-17 14:25:50 -05:00
bb75e6a6ea
Disallow future dates
2017-12-17 14:24:58 -05:00
173ad4f75a
Add datepicker to montagereview
2017-12-17 09:22:31 -05:00
6ffa96dea3
Add chosen to filters
2017-12-16 23:10:20 -05:00
b6917d8b71
Fix initial time parsing
2017-12-16 09:08:50 -05:00
d7532b0340
Add dateTime picker to filter
2017-12-15 22:57:42 -05:00
eec174750e
Default for conjunction
2017-12-15 09:06:40 -05:00
c0fcfe6eb6
Combine possible sort inputs to one in sortQuery, output limitQuery
2017-12-15 08:47:08 -05:00
ce0a8c4486
Add sort/limit to filter object on pageload
2017-12-15 08:47:07 -05:00
dee976cf1a
parseRows just needs to recreate the php logic
2017-12-15 08:47:06 -05:00
2cba20ab46
Make form validation not reload page
2017-12-15 08:47:05 -05:00
2ddb380d0d
Remove submitToFilter
2017-12-15 08:47:05 -05:00
db59f06520
Weekday needs to detect start or end as well
2017-12-15 08:47:04 -05:00
86af2269b2
Move arrays out of ifs, pass to js
2017-12-15 08:47:03 -05:00
a2c785f7eb
Move validateForm
2017-12-15 08:47:03 -05:00
04efff699a
Set url when adding terms
...
Saves changes if reloaded or using back button
2017-12-15 08:47:02 -05:00
c936e9e2a9
No longer need line
2017-12-15 08:47:00 -05:00
c1cf356974
Montagereview filter passing in wrong block
2017-12-15 08:47:00 -05:00
51b4ddb0e4
Add js for filter handling
2017-12-15 08:46:59 -05:00
d5ec45eed7
Include all DateTime possibilities
2017-12-15 08:46:58 -05:00
d2b9614ce7
Change reset to not reload form
2017-12-15 08:46:57 -05:00
fe6a6bec7c
Use disabled button rather than remove
...
Reduces page jumping
2017-12-15 08:46:57 -05:00
8515e77d67
Add text type to text fields
2017-12-15 08:46:56 -05:00
9eb03a881d
Always have a full line on filter page.
...
This allows javascript to copy easily
2017-12-15 08:46:55 -05:00
ee5552d9f9
Redirect Events when post
...
Fixes broken back due to form resubmit
2017-12-13 22:25:28 -05:00
c87d170972
Pass montagereview filter
2017-12-13 22:25:28 -05:00
8909184e2c
fix
2017-12-13 18:14:14 -05:00
046a0dd6e9
need a line break
2017-12-13 16:45:51 -05:00
abad266c5b
introduce chosen to use it to make the filtering dropdowns awesome
2017-12-13 16:15:03 -05:00
4a1a9c48d5
Merge pull request #66 from digital-gnome/storageareas-fixBack
...
Storageareas fix back Redux
2017-12-13 12:40:11 -05:00
0743a283da
Remove back/close if opened in new tab
2017-12-13 12:34:31 -05:00
27c9752f34
Merge pull request #65 from digital-gnome/storageareas-fixBack
...
Storageareas fix back and montagereview popup
2017-12-13 10:23:50 -05:00
1f7a5f26ab
Fix montagereview event popup
2017-12-13 10:22:15 -05:00
e0c2061954
Fix back if window is opened in new tab.
2017-12-13 10:20:02 -05:00
56ace524ff
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-12-12 11:16:26 -05:00
9bd12d5b9a
set a type on the buttons
2017-12-12 11:15:53 -05:00
9fe7ba25e2
improve the download ui
2017-12-11 14:33:17 -08:00
5bd5f03611
redo buttons as button tags
2017-12-11 12:51:38 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
1a5d9d5586
Fix monitor sorting ( #2015 )
...
Fixed issue #2014
2017-12-06 15:43:33 -05:00
e7a43b2618
fix, don't set the storage path to NULL
2017-12-06 10:11:59 -08:00
a64e556047
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-05 15:23:37 -08:00
e0a18143ad
include Group Id in list
2017-12-05 15:20:15 -08:00
d621222ead
fix assignment when should be test
2017-12-05 13:26:21 -08:00
6edb0247ef
Fix popup detection
2017-12-05 13:27:39 -05:00
37cdcb89c4
Fix view button in events view
2017-12-05 12:50:49 -05:00
62cc095c98
always load the storageareas array
2017-12-05 08:31:17 -08:00
6454594633
fix popup detection and add disk usage and storage area to event.
2017-12-05 08:30:58 -08:00
34b708bace
Handle popups that should remain popups
2017-12-05 09:40:03 -05:00
26c9d1991c
fix populating the monitors select
2017-12-04 21:49:34 -05:00
f8d3c07586
Add h264 event view functionality and new feature alarmCues ( #2012 )
...
* Fix nearEventsQuery
Removed dbEscape from getNearEvents previous event because it only returns 0. Now matches next. Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch. Also added start times to allow for videoJS replaymode.
* Unescape filters
Filters need to be unescaped
* Add initial values to page load
* Add replay modes to videojs
* rough in figuring out a frame in between bulk frames
* Add alarmCues
Add a graphical indication of where alarm frames happened in an event. Similar to what zmNinja shows.
* Add remaining buttons to videojs
Functionality for all buttons on videojs streams. FF/RW buttons show as active when they are active.
* Whitespace and fix Bulkframe calcs
* Fix zms events trying to generate with mp4 code
ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed
* ZMS scrub bar
Move zms scrub bar to bottom of image feed. Make it simpler and more like videojs style.
* Wrap event feeds properly
* Fix dvrControls on watch view
* Add scaleToFit
Add a scaleToFit option to event view
* Add navigation for videoJS streams
Disables nav buttons at beginning and end of events. Handles switching from zms to videojs. If zms crashes changes next event function to reload page instead of ajax.
* Add scaleToFit to watch and frame view
Adds scaleToFit to watch view. Since frame view uses the watch cookie this required changes to frame view
* Add transition to zoom
* Change stills view to match stream
Move stills slider bar to match scrub bar on streams. Allow it to resize, make it larger. Add alarmcues.
* Add Stills for every event
Add stills for every event. Match size to stream size
* Progressbox transitions
2017-12-04 21:26:59 -05:00
72a50910e6
Merge pull request #56 from digital-gnome/storageareas-fixMontageReviewFilter
...
Montagereview filter respect groups setting
2017-12-04 17:08:51 -05:00
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
3f62d1e24d
Montagereview filter respect groups setting
2017-12-04 14:35:33 -05:00
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
9aa94bd3ab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-03 16:05:43 -05:00
9ca19b003f
Add download button to montagereview
2017-12-03 14:42:09 -05:00
3e7c573da5
Add download video option to events view
...
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
7a188a84f7
Add montagereview filter passing
...
montagereview now accepts any appropriate filters
2017-12-02 12:29:55 -05:00
6d6b4366de
Fix MontageReview filters
2017-12-02 12:29:54 -05:00
66d6e1a4a4
Add header to watch
2017-12-02 12:28:06 -05:00
11629076f6
Fix Timeline view, add list link
2017-12-02 12:28:06 -05:00
58159963fa
Fix back on timeline view
2017-12-02 12:28:05 -05:00
064ce99eac
Scalecontrol in wrong place
2017-12-02 12:28:05 -05:00
bf5c928e38
Event view compress header
...
Combine all three lines of event view to 2.
2017-12-02 12:28:05 -05:00
50d5a8991d
Events header
...
Moved all non-event links to the header
2017-12-02 12:28:05 -05:00
e6568d01a3
Remove timeline popup
2017-12-02 12:28:05 -05:00
9d1bbfab42
Remove unused code from event
2017-12-02 12:28:05 -05:00
725814d41d
Remove unused code from events
2017-12-02 12:28:05 -05:00
7a5dfb71dc
Remove no longer used max from events
2017-12-02 12:28:05 -05:00
b3ef499e46
remove event popup
2017-12-02 12:28:04 -05:00
f02cd2e615
Remove watch popup
2017-12-02 12:28:04 -05:00
1289269e6f
Change filter to work without popup
2017-12-02 12:28:04 -05:00
adc1b924da
Remove events popup
2017-12-02 12:25:53 -05:00
e34b8abaca
Cleanup events view header
2017-12-02 12:25:53 -05:00
9d5447aa6a
Merge pull request #55 from digital-gnome/storageareas-updateNavbar
...
Add navbar refresh to all pages that use it
2017-12-02 10:44:01 -05:00
e64497c16a
Merge pull request #54 from digital-gnome/storageareas-uifixes
...
Storageareas uifixes
2017-12-01 16:30:29 -05:00
ca3d6546bd
sorty by name when listing monitors by name
2017-12-01 12:30:21 -08:00
5e953cefea
fix old cookie causing errors loading layouts
2017-12-01 12:30:07 -08:00
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
dfb69a2c5b
Merge branch 'tesla' into storageareas
2017-11-28 06:29:42 -05:00
00c5590a71
add Monitor count to servers
2017-11-27 11:56:48 -08:00
c92b3a9408
Converge stills view and stream view
...
Make the stills view look more like stream view. Moved slider up to be like a scrub bar, added alarmcues.
2017-11-26 19:08:07 -05:00
18dc515ba4
stills view loads image when slider used
...
Stills view now loads the selected image if an image is being viewed and the slider is used.
2017-11-26 19:08:07 -05:00
136f0e90f5
Fix autoscale on stills view
...
Switching from stills view and changing the window would make stream view go crazy. Changed to autoscale on switch
2017-11-26 19:08:07 -05:00
b506466a70
Change alarmcues to accept arbitrary containing element
2017-11-26 19:08:07 -05:00
b5db885a31
Add scaleToFit to frame view
...
Changes navigation to use flexbox because absolute positioning was messing with scaletofit. Also makes frame view respect scale choice
2017-11-26 19:08:06 -05:00
55699a9b9b
Change scaleToFit to choose what to fit
...
Adds 4th input to choose what element is the last thing to fit.
2017-11-26 19:08:06 -05:00
68e54400e2
Add scaleToFit to watch view
2017-11-26 19:08:06 -05:00
3920420aa9
Convert scaleToFit to shared function
2017-11-26 19:08:06 -05:00
428d923874
make StatusFIlter do something
2017-11-26 17:39:49 -05:00
39e490e5e5
fix monitor dropdown
2017-11-26 17:32:41 -05:00
4fbdacef05
fix event counts
2017-11-26 17:03:36 -05:00
d6bc727c9c
use htmlSelect to create the Colours dropdown, which fixes a problem caused when I inverted the Colours array
2017-11-26 11:12:00 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
a9f0f3813a
Merge branch 'tesla' into storageareas
2017-11-24 09:31:00 -05:00
900fbe1e0f
update save to a button tag, and add a saveas functionality
2017-11-23 08:26:55 -08:00
2a669896c2
Merge branch 'tesla' into storageareas
2017-11-23 08:42:53 -05:00
9d6b417b60
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
2017-11-22 17:03:37 -08:00
02ec4bdebb
use StartDateTime instead of DateTime in filters, and get rid of Filters button at bottom
2017-11-22 13:49:46 -08:00
3c55daaf36
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
2017-11-22 12:10:54 -08:00
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
121e64a8c6
turn on MOnitors dropdown in filters, an debug
2017-11-22 11:40:07 -08:00
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
11449b77a9
add debugging. increase concurrency of request queue
2017-11-22 11:46:24 -05:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
8b49a475d4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-11-21 19:55:48 -05:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
6eb542f0e2
Merge branch 'storageareas' into LookandFeel
2017-11-20 20:19:27 -05:00
12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
...
Minor UI fixes
2017-11-20 20:15:32 -05:00
b655689f47
Fix cache_bust
...
Cache busting was preventing changing css due to leaving symlinks behind. Adding the css name to each symlink prevents the need for a forced refresh since mtime is the same on unchanged files but filename does not change between css sets.
2017-11-20 12:27:20 -05:00
c7ecb71810
Fix progressbar on short events
...
Fixes rounding errors at the end of events due to zms only returning integers. Especially noticable on short events.
2017-11-17 22:29:10 -05:00
e0f6a7caa9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-17 14:31:03 -05:00
84403f18a0
Revert dvrControls to class
...
Since dvrControls only occurs once now we can leave it as id.
2017-11-17 12:46:08 -05:00
64346a031d
alarmCues to status.php
...
Switched alarm cues from API to ajax/status.php. Less overhead due to only requesting the information it needs and avoids a weird problem with authentication after sitting logged in for hours.
2017-11-16 21:03:03 -05:00
617a92e33e
Re-Add streamstatus pause
...
Handles when stream is paused from zms side.
2017-11-16 16:21:17 -05:00
97be2bf0a3
fix events js vars, eliminating doing the sql query twice
2017-11-15 13:01:07 -05:00
a7b02ea3ba
Fix eventVideo and content div wrapping properly
...
Wrap eventVideo div around both videojs and zms. Consolidate control buttons/status to common set with default values.
2017-11-14 23:04:05 -05:00
93a4dfa3aa
remove extra dropdown addition
2017-11-14 02:42:51 -05:00
5717a19215
be able to popup watch view even if the monitor is not running
2017-11-13 20:29:01 -05:00
99802945fe
be able to popup watch view even if the monitor is not running
2017-11-13 20:28:18 -05:00
1632aa7349
fix nvsocket
2017-11-13 14:25:19 -08:00
d07f36a7ee
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-13 10:27:27 -08:00
ef6cb42c5f
Cleanup
2017-11-11 14:49:43 -05:00
1b8ae2bb45
Fix autoscale for ZMS
...
ZMS zoom would display broken jpegs with arbitrary scale. When using scaleToFit set zms scale to nearest regular scale and let the browser handle the rest.
2017-11-11 14:49:43 -05:00
44c8299faa
Consolidate initPage
2017-11-11 14:49:43 -05:00
91c3e3573c
ZMS controls for videojs
...
Add ZMS style controls to videojs page. Zoom, fast forward, fast reverse, frame skip, play/pause. Some cleanup of old videojs code
2017-11-11 14:49:43 -05:00
21949f5426
Cleanup vjsReplay
2017-11-11 14:49:43 -05:00
f08e75c598
Add remaining buttons to videojs
2017-11-11 14:49:43 -05:00
91cda415bd
Add default values to buttons
2017-11-11 14:49:43 -05:00
1b6992ea6b
Fix stills
...
Event stills fits on the page without a phantom scroll. Still image is scaled to fit the window instead of being full event size.
2017-11-11 14:49:43 -05:00
81a57b086e
Add stills window for everything
...
Stills can work for every event since frames can be generated after the fact by ffmpeg
2017-11-11 14:49:43 -05:00
5e9aacfc09
Stills path fix
2017-11-11 14:49:42 -05:00
5960da0b85
Make mp4 link download
...
download instead of view
2017-11-11 14:49:42 -05:00
1ae3fca599
Fast forward and rewind show active
...
FF and RW show as active if they are active
2017-11-11 14:49:42 -05:00
95622cc3b0
pause on delete
...
Pausing on delete lets a slow network user know that the click worked.
2017-11-11 14:49:42 -05:00
e6ba5162ef
choose correct video download
...
Use download mp4 link if it's a videojs event, otherwise use the video generator link.
2017-11-11 14:49:42 -05:00
ab87848899
Add visual cue to archived events
...
The asterisk didn't do it for me. Added a faint cast to the row.
2017-11-11 14:49:42 -05:00
97058065ff
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-10 10:11:03 -08:00
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -05:00
14e9a13c99
wip
2017-11-09 11:53:04 -08:00
aba7ecd9a6
split lines
2017-11-08 11:18:23 -05:00
c2fab6e959
add the options for nvsocket as an include
2017-11-06 07:31:08 -08:00
7374ced076
0 is a prefectly valid PreEventCount
2017-11-05 10:00:24 -05:00
09f3355e18
add /usr/share/zoneminder/www/cache as a temp dir
2017-11-04 14:52:36 -04:00
cab8c4cd5e
cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style
2017-11-03 13:49:42 -04:00
54d77519c0
Only show Storage and Server filters if there is more than 1
2017-11-03 12:03:01 -04:00
073c06f6a8
fix sizing after switching scale. basically re-apply the layout
2017-11-03 09:23:50 -04:00
5aa61cf1f5
unset the ref so that last monitor isn't duplicated
2017-11-02 07:59:25 -04:00
866c875312
Merge branch 'storageareas' into tesla
2017-11-01 12:01:51 -07:00
1aea1517bf
put back old behaviour for add monitor
2017-11-01 13:09:14 -04:00
eb2ee76f57
disable and re-enabled onclick action when editing layout/cancelling edit
2017-11-01 13:08:01 -04:00
d4080dcdbd
when saving a new layout, auto-select it
2017-11-01 12:19:27 -04:00
8e010b3bd0
get rid of experimental code to fix monitor layout. Apparently draggable does it all for us.
2017-11-01 12:00:48 -04:00
36e13039c7
Switch to LONGTEXT FROM JSON type
2017-11-01 11:05:21 -04:00
33771f92e9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-31 13:32:47 -07:00
9473fbecd8
more debug
2017-10-31 13:32:42 -07:00
3deb8a35bb
fixes
2017-10-30 21:38:27 -04:00
b5491102ef
Fix saving MontageLayouts
2017-10-30 20:21:16 -04:00
52110adfa9
update code because we are now including the entire object in the layouts array
2017-10-30 16:32:14 -04:00
efe8b2db7e
update code because we are now including the entire object in the layouts array
2017-10-30 16:32:03 -04:00
c69e2468b0
add edit and save layout
2017-10-30 16:30:15 -04:00
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
c16e101120
rough in add monitors import wizard
2017-10-27 20:52:08 -07:00
eb48759ff8
wip
2017-10-27 13:37:51 -07:00
71222d7f2f
rework how montage layouts are done, pull from db now
2017-10-27 12:06:26 -07:00
82fbec697f
add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid
2017-10-27 08:37:53 -07:00
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
12b611b9d5
When in live mode say Camera Offline instead of no data
2017-10-25 13:02:28 -07:00
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
ea84bd1e69
add a Status Filter
2017-10-25 09:04:54 -07:00
b6dde354be
rename AnalysisFPS to AnalysisFPSLimit
2017-10-24 17:34:32 -07:00
e9600bc5d3
add monitors.php
2017-10-24 16:25:11 -07:00
6905c6a1fb
add CpuLoad t Servers list
2017-10-24 16:08:52 -07:00
5ba6cf0fb2
Add DiskSpace to Events listings on console
2017-10-24 14:19:36 -07:00
82bf507ee9
Add Status, ram, swap to Servers List
2017-10-24 12:43:32 -07:00
6b2d0aa59b
fix popup when clicking on a monitor on montagereview
2017-10-23 17:03:41 -07:00
5e98587ff4
add Server and Storage filters to montagereview
2017-10-23 17:03:18 -07:00
9cbd33b439
if there is a selected monitor but it isn't in the available monitors, still show the monitors
2017-10-23 17:02:47 -07:00
d2c8a0240a
add a monitors view which is for editing function/enabled/server/storage of multiple monitors
2017-10-23 17:01:43 -07:00
df8fbaccea
Fixes
2017-10-23 11:50:45 -07:00
d477067fa6
add Id and Name as a title popup to the cnanvas so if you mouse over it you can see which monitor it is
2017-10-23 10:55:04 -07:00
681abd64fc
Instead of No Data, make a more general function that will write any text without clearing the image behind it
2017-10-23 10:54:38 -07:00
1bddec1548
Bypass refreshParentWindow
...
This hasn't worked for a while. It looks like it's the result of a fix for filter window redirecting. It's possible other things use it but this fixes event deletion without touching anything else.
2017-10-22 17:23:04 -04:00
298085ae93
Fix archive nulling vid src
2017-10-22 15:02:36 -04:00
3fe46cbaff
Scale to Fit
...
Added a scale to fit option. When navigating between events of different size they will fill the window. Turned on when any event uses it, turned off when any event turns it off.
2017-10-22 12:13:16 -04:00
ecb980c66f
Navigation
...
Videojs navigation now uses ajax. Feels and is faster. Some improvements, namely if zms ever crashes we can still navigate. Both zms and videojs update the address bar so refreshing a page doesn't return you to the first event.
2017-10-21 22:14:46 -04:00
ff8d067639
alarmCues improvements
...
Consolidate selectors and improve edge cases where skew could cause overflow
2017-10-21 22:14:46 -04:00
1eb2edd95c
Converge initial eventData with ajax
...
The initial eventData object on page load didn't have most of the information that the ajax call gave it.
2017-10-21 22:14:46 -04:00
f2f2aa8720
Replay improvement and overlays
2017-10-21 22:14:46 -04:00
c6373d3dca
whitespace and jquery
2017-10-21 22:14:46 -04:00
169b64813b
improve Server and Storage dropdown filters
2017-10-20 14:27:29 -04:00
422b3d0c33
fix to montage which wasn't adding the auth_hash. Still need to add plain auth
2017-10-19 17:56:50 -04:00
cd476192e9
add auth hash if available
2017-10-19 17:52:09 -04:00
7090561d35
use jquery
2017-10-19 12:45:34 -07:00
7725d46808
use the same port as the stream
2017-10-19 12:45:24 -07:00
d4b0c504fe
fix Server and Storage dropdowns
2017-10-19 12:44:33 -07:00
cf2eace2c7
improve htmlSelect and add Storage and Server filters to console
2017-10-19 09:50:07 -04:00
b11a514823
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-10-18 13:27:13 -04:00
c281467e69
Store server and storage filters in session. Add storage and server filters to console. WIP
2017-10-18 13:24:41 -04:00
6e63cd378f
whitespace
2017-10-18 09:44:07 -07:00
32c79f8d23
Add a disk space total to event list
2017-10-18 09:43:51 -07:00
a4fe76a7fc
fix currentTime additions, tweaks, debug
2017-10-17 11:53:58 -07:00
1a13157416
adjust times by client and server utc offsets
2017-10-17 10:10:53 -07:00
a0f54371ca
adjust times by client and server utc offsets
2017-10-17 10:10:48 -07:00
92ff3d9606
Tidy up
2017-10-17 11:50:47 -04:00
4cd59611da
fix when filters are in a popup
2017-10-16 13:46:09 -07:00
75b4de94a7
fix bad char
2017-10-16 12:21:19 -07:00
2fb0acfcc3
remove cellspacing=
2017-10-16 12:20:26 -07:00
29a50626e0
cleanup
2017-10-16 12:19:38 -07:00
2354e9679e
fix seconds calculation when mousing over
2017-10-16 12:26:58 -04:00
69c3fce87e
impose minimum size of timeline, reduce extra redraws on initial load
2017-10-16 12:03:38 -04:00
b862bfd3d2
impose minimum size of timeline, reduce extra redraws on initial load
2017-10-16 12:03:33 -04:00
5c0d8384d9
code style and quotes
2017-10-16 08:31:35 -07:00
ed92abfc76
Add Type to Storage Editing
2017-10-16 08:31:05 -07:00
345d9749ce
Add Type to Storage Editing
2017-10-16 08:31:01 -07:00
8c3c5e4d50
google code style
2017-10-15 16:52:43 -04:00
3a7eee58df
improve navigation
...
Condensed navigation if structure and added handling for crashed zms. Will now reload whatever event is next.
2017-10-15 16:49:50 -04:00
10cdbf30ea
reduce extra ajax calls
2017-10-15 16:46:58 -04:00
3a4a7ada41
progressBar conversion
...
Convert progressBar to jquery and imporove granularity and performance
2017-10-15 16:46:57 -04:00
005190ab44
Merge pull request #36 from digital-gnome/montagereview-ordering
...
MontageReview ordering
2017-10-15 15:23:40 -04:00
d523e0e3f1
remove sorting
...
Don't sort monitors on resize. Fixes labels not matching graphs
2017-10-13 19:53:25 -04:00
48cd4cb55c
Merge pull request #33 from digital-gnome/eventvideo-div
...
move eventvideo div close
2017-10-13 06:09:34 -04:00
32f9e64a14
make evenVideo wrap just the video
2017-10-12 19:52:23 -04:00
2913b211db
move eventvideo div close
...
I think I did this. eventVideo div wasn't properly wrapping everything
2017-10-12 17:38:03 -04:00
28ef94fad0
handle an array as a Hint, fixing bandwidth option
2017-10-12 11:43:53 -07:00
e6c0add17e
add ZM_BANDWIDTH_DEFAULT
2017-10-12 12:09:05 -04:00
8abb8a9259
add Type to Storage
2017-10-12 07:32:48 -07:00
90d3067cab
progressBar offset scope
...
fixes progressBar offset passing a reference instead of a copy by wrapping it in a function. also fixes click events endlessly adding when navigating through zms events.
2017-10-11 21:07:45 -04:00
1c744278e7
rescale fix
...
everything rescales except the buttons.
2017-10-11 21:05:39 -04:00
f702c841f5
navigation handling
...
Navigation can now handle going from videojs streams to zms. It gracefully handles deleting the last event and running out of events. zms limitations means we still can't see mp4 recordings before they are done but we don't get stuck on them anymore.
2017-10-11 21:04:45 -04:00
b9f9dd721b
initialAlarmcues arguements
...
initialAlarmcues now takes an eventId arg. Needed to reload when zms streams switch since they don't reload the page
2017-10-11 20:57:13 -04:00
99dd469a1c
alarmCues fixes
...
use evtStream for width. progressBar isn't always fully loaded in time. Combine skewNone and skewAlarm. Does a more accurate job of keeping everything in line.
2017-10-11 20:49:52 -04:00
067f8a8089
replayAll fixes
...
replayAll now handles end of events gracefully. Fixed bug where back to back continuous events or events that overlap would cause it to try to countdown all of epoch time.
2017-10-11 20:24:39 -04:00
c7626cab94
fix dash
2017-10-10 12:15:41 -07:00
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
06c61f0324
allow periods in monitor name
2017-10-10 10:40:27 -07:00
d0f350d5b2
Merge pull request #29 from digital-gnome/alarmCues-refactor
...
Fix scaling with video.js
2017-10-10 11:09:59 -04:00
3af795264d
add actual disk space as a mouseover in nav bar
2017-10-10 10:38:13 -04:00
8da7d845b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-10 09:37:23 -04:00
c654d008f0
add monitor selector to montagereview and montage.
2017-10-10 09:36:56 -04:00
b6974ea373
Add monitor drorpdown to montagereview
2017-10-09 15:32:09 -04:00
d5799cbf6f
nph-zms alarmcues
2017-10-08 22:36:15 -04:00
d4d2c64974
nav buttons inactive
...
should have been this from the start
2017-10-08 21:49:34 -04:00
65ce6df622
scalingfix
...
changing the scale now works with video.js and alarmcues. some whitespace fixes
2017-10-08 21:46:26 -04:00
c41ef177c2
JS alarmCues
2017-10-08 21:45:05 -04:00
c39cf77a9c
removealarmcuesPHP
...
removed the PHP rendering and placement code
2017-10-08 21:42:12 -04:00
e825e5d61e
initial commit to change color of web console systemstats ( #1981 )
...
* initial commit to change color of web console systemstats
* use css classes
2017-10-07 18:42:39 -04:00
d4cf84f7e6
Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
...
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
ed3d001c65
Merge pull request #26 from digital-gnome/NPH-ZMS-loading-on-mp4
...
Only load imageFeed if needed
2017-10-05 17:09:45 -04:00
69ab1b18ad
fix new gruop not being savable
2017-10-05 16:12:12 -04:00
a7e3c0b458
spacing
2017-10-05 16:11:54 -04:00
827e858feb
use a cached Storage object to prevent hitting the db al lot
2017-10-05 16:11:43 -04:00
6952e84c01
Only load imageFeed if needed
2017-10-05 11:20:42 -04:00
b56a976d7a
fixes to montage review and cleanup in group filtering/editing
2017-10-05 10:46:04 -04:00
87a49ad009
work on infinite depths of groups
2017-10-04 16:40:09 -04:00
398600d5f2
Placement for alarmCues
2017-10-04 11:09:22 -04:00
54949db0b5
spacing/google code style
2017-10-04 10:48:37 -04:00
995809ccb7
fix play/pause while editing zone
2017-10-04 10:48:14 -04:00
5bbe9b40e7
renderAlarmCues function
...
Generates the html for alarmcues and passes it to JS var
2017-10-03 19:26:48 -04:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
c46769495b
Merge pull request #22 from digital-gnome/storageareas-navigation
...
Storageareas navigation
2017-10-03 10:18:44 -04:00
9b241ee370
Also change class
...
With the css class properly set it turns out this wasn't working.
2017-10-02 15:41:04 -04:00
207d57a3e6
use xhtmlfooter function to finish off html
2017-10-02 11:55:52 -04:00
16a731af1c
fix path when changing status.
2017-10-02 11:55:17 -04:00
15ba7d2a35
fixes
2017-10-02 11:25:51 -04:00
c35face630
LengthTypo
2017-10-02 10:52:55 -04:00
ddb7305aab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-02 09:11:55 -04:00
13b192a63e
remove title and close
2017-10-02 09:03:49 -04:00
48a3e5eaa6
Move logic to .js file.
2017-09-30 16:35:03 -04:00
e339b9e12a
Merge branch 'storageareas-Navigationfix' into storageareas-navigation
2017-09-30 15:09:32 -04:00
7c72ff1fd9
Navigation buttons for video.ja
2017-09-30 14:25:00 -04:00
0e2b7d1b52
End of video logic
2017-09-30 14:25:00 -04:00
5f203fc813
JS logic for video.js navigation
2017-09-30 14:24:59 -04:00
4be133ed09
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
2017-09-30 14:19:32 -04:00
22af70601e
Convert to ampersand in filters
...
Querys weren't working because it was passing & instead of &. Nothing else appeared to be using these.
2017-09-29 21:49:58 -04:00
5f42bf4fe5
Change CSS to class, add class to php
...
I needed the styling for the video.js buttons. The fallback mjpeg player used ids.
2017-09-29 21:47:52 -04:00
6a0da487eb
add Parent Group selection to Group Edit
2017-09-28 12:37:15 -04:00
03d25ef10a
more visually appearling code for hiding buttons. Remove cellspacing=0 on the table.
2017-09-27 17:32:42 -04:00
b5699dcac3
google code style
2017-09-26 17:14:27 -04:00
d69b16df24
add group filter to montagereview
2017-09-26 11:28:19 -04:00
00c33aa758
remove extra /div
...
I somehow let an extra /div slip into the commit for making archive work.
2017-09-25 22:14:53 -04:00
cc4b6cd0b0
switch to jquery
...
switched both scaleslider and speedslider to jquery
2017-09-25 22:14:46 -04:00
fef503f90c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-23 13:42:44 -04:00
8ada30ff8c
add a group filter to montage
2017-09-23 13:42:13 -04:00
ab3f15b7c0
Add logic for Archive link on initial load
...
Javascript appears to control this but it was not firing on initial load. Added php logic.
2017-09-14 18:00:35 -04:00
a5f0103601
revert jquery change to speed slider
...
Scale was using getElementById but speed was changed to jquery. It wasn't working so I just changed it to match scale.
2017-09-14 18:00:23 -04:00
a78e568378
Change storage path text box from url to text
...
With the text box set as url you can't use a standard unix path
2017-09-14 18:00:02 -04:00
54b8cce5e4
fix tabs to spaces
2017-09-11 16:57:51 -04:00
edb7762cf3
Merge branch 'master' into storageareas
2017-09-11 16:57:08 -04:00
496ba70819
remove checks for empty and just check for true ( #1980 )
...
Yeah I agree. I think the exists was from pre-object method days.
2017-09-11 13:27:17 -04:00
58a9107675
Fix incorrect links to transparent.png and index.php ( #1982 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Fix links pointing at transparent.gif
* Use relative path to index.php instead of absolute.
The installation may not be rooted at / on the server.
2017-09-10 11:49:53 -04:00
42263bf39a
pass mode when getting mp4 download link
2017-09-08 12:29:10 -04:00
9a6bfb2d02
fix some quotes, double to single
2017-08-22 09:44:45 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
087b7abb94
Merge branch 'master' into fix_event_viewing
2017-08-14 10:41:04 -04:00
c60939e824
fix absolute path to index.php in console.js
2017-08-11 09:08:00 -04:00
6562d5eb47
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-08-09 09:54:34 -04:00
928c4651a6
fix braces, spacing
2017-08-09 09:54:27 -04:00
7cb4090d7d
can't use jquery like that
2017-08-03 12:41:43 -04:00
5a73c38237
video storage fixes ( #1958 )
...
* use a monitor object instead of just a db array.
* fix braces, spacing, move pod docs to bottom
* Fix memleak by freeing input and output frames
* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
6d46b36c80
Hide close button if not in a popup
2017-08-01 14:21:50 -04:00
259b7f7655
fix memleak
2017-07-31 15:49:27 -04:00
33ce55584f
Merge branch 'master' into storageareas
2017-07-26 10:48:42 -04:00
30057ddffe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-26 10:38:25 -04:00
1cfd657168
put back the preg_replace that strips usernames and passwords from monitor source
2017-07-26 10:22:57 -04:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
3bd9d96027
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-21 10:54:57 -04:00
457d909c88
fix quotes
2017-07-21 10:54:33 -04:00
c98255dd75
Merge pull request #1948 from connortechnology/fix_empty_monitor_source_column
...
Fix empty monitor source column
2017-07-14 13:10:52 -05:00
1a8638f3dd
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-07-14 11:50:01 -04:00
89bcfc4e28
fix incorrect gpl license text mailing address
2017-07-14 10:39:50 -05:00
d13d7e9050
recode the bit that outputs the link under source so that it defaults to Monitor # under all situations
2017-07-14 09:57:25 -04:00
df0497b3a7
always use onmouseover, as we can now pull images fairly quickly from the mp4
2017-07-14 09:25:53 -04:00
8bbad9adf8
braces, spaces
2017-07-13 17:35:06 -04:00
a16d01a931
use less ram loading events
2017-07-13 17:34:45 -04:00
37003aebcf
Merge branch 'master' into storageareas
2017-07-13 11:07:06 -04:00
f7a99a1106
make montagereview not load all events and frames at once, so that it doesn't use up all memory
2017-07-13 11:06:08 -04:00
0df6ac2895
Merge branch 'master' into storageareas
2017-07-13 11:04:51 -04:00
403dca78fb
break up a long line
2017-07-13 10:26:24 -04:00
a5f9c01298
fixes braces and spacing and add some debug lines when the onvif-probe output doesn't match what is expected
2017-07-13 10:26:09 -04:00
aff7e94725
default to TCP for Method
2017-07-13 10:23:30 -04:00
363303efa9
use isset instead of empty to get rid of warning
2017-07-13 10:08:36 -04:00
22e957ba46
clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100%
2017-07-12 12:49:01 -04:00
c9689aa010
fix braces,spacing,quotes. Change form method to post
2017-07-12 10:58:20 -04:00
bd681de955
fix braces
2017-07-12 10:57:45 -04:00
Isaac Connor
Isaac
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac Connor
Pliable Pixels
Steve Gilvarry
Isaac Connor
Isaac
digital-gnome
kimmeld
Isaac Connor
APHW2 MFGENG
Isaac Connor
Isaac Connor
ralimi