c47b4a5a04
Merge branch 'improve_config_efficiency' into storageareas
2018-10-19 15:03:00 -04:00
3723f7acb3
comment out redundatn code increasing load on server
2018-10-19 15:02:10 -04:00
4c7fe8741b
Load the complete config info only for options
2018-10-19 15:00:47 -04:00
98579fc02a
Merge branch 'master' into storageareas
2018-10-19 11:27:43 -04:00
e7ec2faccd
monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url
2018-10-18 20:33:50 -04:00
37a48550e5
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-18 08:57:29 -04:00
b0078fb1d9
whitespace, get rid of redundant ajax startup
2018-10-16 17:20:10 -04:00
f7de3a87e2
show event notes in same event view ( #2259 )
2018-10-16 12:11:25 -04:00
c2af380e29
Merge branch 'master' into storageareas
2018-10-16 11:39:26 -04:00
1b9b2811b3
remove ? from streamCmdParms. Mootools adds it in so this gives us a double ?
2018-10-16 11:39:16 -04:00
7149576a7c
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 10:59:50 -04:00
be78cb1b34
correct falsepi=> false
2018-10-10 16:08:48 -04:00
2881d2af3f
Merge branch 'master' into storageareas
2018-10-10 14:13:27 -04:00
bf3e783c42
remove link to zones_overview that I never got around to creating
2018-10-10 14:13:12 -04:00
c58f043998
Add a mouseover tooltip saying Toggle Filters on up arrow
2018-10-10 14:12:16 -04:00
a46c9a8a7a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-10 14:03:35 -04:00
63a5211789
use url instead of server_url in Monitor object
2018-10-10 14:03:27 -04:00
48e805c09f
Make header flips perisisent based on cookie
2018-10-10 13:11:27 -04:00
229315fc92
Merge branch 'add_archive_filter_to_montagereview' into storageareas
2018-10-09 11:10:27 -04:00
ff00f15b58
add missing ;
2018-10-09 11:10:09 -04:00
90ea6aa076
remove : from labels on monitor filters. They can be put back in css
2018-10-09 11:09:42 -04:00
217d1e44ba
Rough in an archived status filter in montagereview.
2018-10-09 11:06:54 -04:00
015890a509
Merge branch 'master' into storageareas
2018-10-02 15:27:12 -04:00
1978882825
dim x264 encode when on arm ( #2227 )
2018-10-01 09:17:22 -04:00
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
c88dc690a6
Make getNearEvents smarter. When Sorting by something other than Id, include Id in the sort so that events with identical starttime for example maintain the correct chronological order.
2018-09-28 13:24:50 -04:00
c481fc868f
be more robust when curFrames is empty.
2018-09-28 11:25:19 -04:00
da6a142d12
Merge branch 'master' into storageareas
2018-09-27 14:21:43 -04:00
c5c01d56be
fix unsetting fixed width/height/layout. Since they are actually controlled by cookies, the session will overwrite when we try to unset the cookie. Also fix some missing ;'s
2018-09-27 14:20:41 -04:00
e0dc8a5f6b
Merge branch 'master' into storageareas
2018-09-27 13:54:53 -04:00
7ffb46302f
When events have the same starttime, sort secondly by Id
2018-09-26 14:10:49 -04:00
2399615a0a
When events have the same starttime, sort secondly by Id
2018-09-26 14:10:21 -04:00
438b582d35
Merge branch 'add_export_to_filter' into storageareas
2018-09-25 16:11:19 -04:00
53f4276cb7
add thumbnails and an mp4 download in the events list
2018-09-25 16:00:01 -04:00
6aaa0fe39f
Merge branch 'add_export_to_filter' of github.com:/connortechnology/ZoneMinder into add_export_to_filter
2018-09-25 14:57:13 -04:00
01f1ffb591
Merge branch 'master' into add_export_to_filter
2018-09-25 14:54:06 -04:00
5615bfec40
some buttons need to be submit buttons. Correct Reset button and remove extra space in Delete button value
2018-09-25 14:47:23 -04:00
9c437b0303
Merge branch 'add_export_to_filter' into storageareas
2018-09-25 14:35:19 -04:00
772c74243c
Merge branch 'master' into storageareas
2018-09-23 12:25:17 -04:00
b8a2e71bb6
use base64_encode for monitor probe
...
We need to employ the same method of encoding as the onvif probe to avoid fixing one while breaking the other
2018-09-21 12:00:03 -05:00
5dba17e1fc
Merge branch 'master' into storageareas
2018-09-21 10:50:10 -04:00
f53533e61e
fix populating onvif probe data
2018-09-20 10:30:23 -05:00
520d1bb7bf
Merge branch 'master' into storageareas
2018-09-20 09:08:29 -04:00
6181e52c47
gracefully handle non-existence of imageFeed
2018-09-20 09:07:28 -04:00
7abe4c40d5
Merge branch 'fix_2213' into storageareas
2018-09-19 20:02:27 -04:00
8a5c989cac
fix warning when editing users after a monitor has been deleted
2018-09-18 08:52:43 -04:00
328b804465
spacing and quotes
2018-09-14 16:20:00 -04:00
870300ed93
remove debug line
2018-09-14 16:19:41 -04:00
34c7ee32ee
Merge branch 'master' into storageareas
2018-09-14 15:13:57 -04:00
b5b71edbf6
Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80
2018-09-14 14:26:45 -04:00
60b952ab86
Merge branch 'master' into storageareas
2018-09-13 16:20:36 -04:00
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -04:00
c66dd25ebb
implement collapsible headers ( #2203 )
2018-09-11 17:39:40 -04:00
eef928a742
fix find_all => find
2018-09-11 14:31:03 -04:00
684f48979a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-11 14:30:19 -04:00
6fcf65459f
show video tag version if codec set to auto and DefaultVIdeo exists
2018-09-11 08:43:42 -04:00
8608fc97be
fix trms=>terms
2018-09-10 15:11:57 -04:00
0ee261fae3
get rid of code that hid the close/back button on events if there was no history.
2018-09-10 15:11:41 -04:00
93bec93d4a
Fix DefaultCodec in monitor
2018-09-10 15:09:27 -04:00
884ba078c7
Store codec in session for monitor
2018-09-10 15:09:08 -04:00
03f769eacc
Rough in codec specification for Events
2018-09-10 12:22:55 -04:00
978e332e3a
Merge branch 'master' into storageareas
2018-09-09 16:36:31 -04:00
534aebb21f
When loading previous and subsequent log lines, merge the fields in the filters instead of replacing
2018-09-09 16:36:09 -04:00
5eec7e00c5
Merge branch 'master' into storageareas
2018-09-09 14:09:52 -04:00
b8f6617db3
fix another instance of find_all
2018-09-09 12:15:06 -04:00
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
40292f3dad
Add Compression flag
2018-09-07 09:08:33 -04:00
d5cab088d6
Merge branch 'master' into add_export_to_filter
2018-09-05 10:33:10 -04:00
8245d193e2
Merge branch 'master' into storageareas
2018-09-04 09:48:47 -04:00
f4c2d8adea
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-03 12:29:09 -04:00
e5a2581dcc
optionhelp - support links markdown style ( #2198 )
2018-09-03 09:56:52 -04:00
2858564155
Merge branch 'master' into storageareas
2018-08-31 16:06:13 -04:00
9ec415b30a
Just reload the event view instead of dynamically updating the stream. Fixes #2196
2018-08-31 15:56:21 -04:00
799b34eee8
handle xhr errors like when auth is no longer valid. Do a page refresh when this happens
2018-08-31 10:34:54 -04:00
b1fe80a0bd
Add JSON/MaybeXS to dependencies, replacing JSON/Any
2018-08-30 18:30:33 -04:00
4e32089a48
Merge branch 'master' into storageareas
2018-08-30 14:51:27 -04:00
8f0fb0843a
Add Privacy Statement ( #2194 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* create and load default.php
* fix typos
* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
6e5472d305
Merge branch 'master' into server_path_prefix
2018-08-22 12:57:16 -04:00
d768f5f7fc
Merge branch 'master' into storageareas
2018-08-13 15:35:55 -04:00
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
2018-08-13 15:33:43 -04:00
026390ccd8
Merge branch 'master' into storageareas
2018-08-13 15:26:29 -04:00
56f4d768c2
Add Privacy Statement ( #2176 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* push privacy text to all language files
2018-08-13 15:23:44 -04:00
2ad4b17d36
Merge branch 'master' into storageareas
2018-08-08 16:24:55 -04:00
d87a41b629
Set button types so that they do things in all browsers.Fix Delete button when translated
2018-08-08 15:11:30 -04:00
683789eb41
Merge branch 'master' into storageareas
2018-08-03 10:27:48 -04:00
b72d520e02
implement the ability to pass a disabled option to htmlSelect. Use it to disable the h264 passthrough option for non-ffmpeg monitors. Instead of disappearing it.
2018-08-03 10:02:42 -04:00
b85f74bb99
when selecting auto, we need to remove the width & height css key
2018-07-31 16:55:54 -04:00
c934295bf9
we shall always pass width & height as pixels without units.
2018-07-31 16:55:13 -04:00
b20d61e0df
fix onclick when editing layout
2018-07-31 16:47:25 -04:00
588ca2cf62
Merge branch 'master' into storageareas
2018-07-31 10:52:24 -04:00
bb4861bb8c
Merge branch 'storageareas' into add_export_to_filter
2018-07-25 17:08:20 -04:00
6c1371fac7
Merge branch 'master' into add_export_to_filter
2018-07-25 17:06:49 -04:00
6ab1c3ced8
proper case table header
2018-07-25 09:39:08 -04:00
8a43f4400e
Merge branch 'add_export_to_filter' of github.com:connortechnology/ZoneMinder into add_export_to_filter
2018-07-17 08:27:23 -04:00
37779ff51d
use a window.location.assign instead of creating a popup to export
2018-07-17 08:26:19 -04:00
683e8716f2
add type=button to button to prevent them from submitting
2018-07-17 08:25:15 -04:00
a41ce9c9fe
default to exporting all event data
2018-07-17 08:24:19 -04:00
05f0338219
use a unique connection key for downloads
2018-07-12 14:07:19 -04:00
ce22f207e3
Merge branch 'master' into add_export_to_filter
2018-07-12 11:40:32 -04:00
87f68e4a5b
Merge branch 'master' into storageareas
2018-07-12 10:47:18 -04:00
8a936cdcc9
Merge branch 'master' into add_export_to_filter
2018-07-11 16:43:02 -04:00
410b1ad810
Merge branch 'master' into cycle_width
2018-07-11 15:49:44 -04:00
115e554d94
Remove erroneous t and convert tabs to spaces
2018-07-11 15:46:11 -04:00
18c3618e28
Arp tool ( #2155 )
...
* let cmake set path to arp
* declare cameras array
* fix probeV4L function
* typo
* fix another typo - my machine is possessed.
* update redhat, debian, ubuntu build dependencies
2018-07-11 15:43:59 -04:00
f56d751661
join multiple echos into 1
2018-07-10 13:47:30 -04:00
7ed316d3a5
We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148
2018-07-10 11:49:45 -04:00
13055bdda6
rework monitorprobe to be more logical, and not use Fatal.
2018-07-10 11:49:02 -04:00
d3034670a0
Merge branch 'master' into storageareas
2018-07-10 11:03:33 -04:00
a26ab59c30
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-10 11:01:47 -04:00
831fe57025
Spacing and google code style
2018-07-10 11:00:52 -04:00
0b4d76f931
Add PathPrefix column to the server list
2018-07-09 14:36:46 -04:00
e98578b2d7
Use Server.js objects for Servers array populated by json
2018-07-09 14:30:55 -04:00
51cfd9b265
Use Server.js object for generating url to images
2018-07-09 14:30:06 -04:00
8db6561030
Add missing ;
2018-07-09 13:08:20 -04:00
0824f740ae
Make video 100% width in cycle. Also fix monitors filtering by putting it in a form
2018-07-09 12:50:57 -04:00
3d1fe728f1
Merge ../ZoneMinder.master into server_path_prefix
2018-07-09 12:33:58 -04:00
12a673169f
spacing
2018-07-09 12:33:37 -04:00
ba8dc2059d
spacing
2018-07-09 12:33:21 -04:00
afa31842b5
spacing
2018-07-09 12:28:39 -04:00
d051342e9f
Add PathPrefix
2018-07-09 12:10:29 -04:00
e29ed9bc54
add Export button to Filter
2018-07-09 12:01:40 -04:00
4c916e880b
Pass event_ids when reloading after export generation.
2018-07-09 12:01:25 -04:00
4de7ae8edc
Pass event_ids when reloading after export generation.
2018-07-09 12:01:09 -04:00
5ea2edb2ee
Convert export from a popup to a full page.
2018-07-09 12:00:10 -04:00
8ca35fa5ab
add Export button to Filter
2018-07-09 11:59:44 -04:00
24a5b78f4c
Convert export from a popup to a full page. Add loading events by filter.
2018-07-09 11:59:08 -04:00
6cf336cc33
Always use a /zm in urls to zm assets
2018-07-09 09:47:20 -04:00
4a4e845e9c
Fix stupid code that defaulted minTimeSecs to 2010 instead of the first event
2018-07-08 16:24:53 -04:00
ade8d078df
Define minTimeSecs and maxTimeSecs
2018-07-08 15:28:55 -04:00
d8a4acf319
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-08 15:08:54 -04:00
d257b53e82
Add missing ) to frame sql when no min/max time specified
2018-07-08 15:08:49 -04:00
dcb9999398
fix regex to match IP and first numbers of MAC in the `arp -a` output ( Closes : #2144 );
...
fixes probing of network cameras.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2018-07-06 16:16:36 +10:00
084f1ab1d6
Add missing reloadWebSite js function
...
Somehow this went missing when the new website monitor type was merged
2018-07-05 08:43:21 -05:00
29f0747895
Merge branch 'master' into storageareas
2018-06-25 16:15:46 -04:00
d271d8bf1d
Fix my botched change to generateAuthHash
2018-06-25 14:50:54 -04:00
b0411cbfd2
Merge branch 'master' into storageareas
2018-06-16 16:47:53 -04:00
09aa3afaac
Fix capitalisation of Ffmpeg
2018-06-16 16:47:09 -04:00
55f2e7c6a2
Fix #2124 . Always allow selection of checkboxes, include canEdit(Events) in button disabling.
2018-06-15 15:21:10 -04:00
f2d00b6af5
update Storage Video Writer options to only allow Passthrough for FFmpeg
2018-06-14 13:39:13 -04:00
7520d20751
update Storage Video Writer options to only allow Passthrough for FFmpeg
2018-06-14 13:36:32 -04:00
e88c73195d
Merge branch 'fix_perl_logging' into storageareas
2018-06-08 09:30:16 -04:00
05a434893e
We should be able to edit zones even if zm isn't running
2018-06-06 16:59:07 -04:00
0937bfdf84
consoleTableBody needs to be an id in order for dragndrop sorting to work
2018-06-06 13:37:12 -04:00
3109536dda
Alternate fix for video generation under csrf. Now we just turn off output buffering (discarding contents before sending the avi
2018-06-06 11:55:51 -04:00
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
Isaac Connor
Pliable Pixels
Andrew Bauer
Isaac Connor
Isaac Connor
Andy Bauer
Dmitry Smirnov
Andrew Bauer
Isaac Connor
Isaac
Isaac Connor
Pliable Pixels
Steve Gilvarry
Isaac
digital-gnome