Isaac Connor
|
e98578b2d7
|
Use Server.js objects for Servers array populated by json
|
2018-07-09 14:30:55 -04:00 |
|
Isaac Connor
|
51cfd9b265
|
Use Server.js object for generating url to images
|
2018-07-09 14:30:06 -04:00 |
|
Isaac Connor
|
3d1fe728f1
|
Merge ../ZoneMinder.master into server_path_prefix
|
2018-07-09 12:33:58 -04:00 |
|
Isaac Connor
|
12a673169f
|
spacing
|
2018-07-09 12:33:37 -04:00 |
|
Isaac Connor
|
ba8dc2059d
|
spacing
|
2018-07-09 12:33:21 -04:00 |
|
Isaac Connor
|
afa31842b5
|
spacing
|
2018-07-09 12:28:39 -04:00 |
|
Isaac Connor
|
d051342e9f
|
Add PathPrefix
|
2018-07-09 12:10:29 -04:00 |
|
Isaac Connor
|
6cf336cc33
|
Always use a /zm in urls to zm assets
|
2018-07-09 09:47:20 -04:00 |
|
Isaac Connor
|
4a4e845e9c
|
Fix stupid code that defaulted minTimeSecs to 2010 instead of the first event
|
2018-07-08 16:24:53 -04:00 |
|
Isaac Connor
|
ade8d078df
|
Define minTimeSecs and maxTimeSecs
|
2018-07-08 15:28:55 -04:00 |
|
Isaac Connor
|
d8a4acf319
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-07-08 15:08:54 -04:00 |
|
Isaac Connor
|
d257b53e82
|
Add missing ) to frame sql when no min/max time specified
|
2018-07-08 15:08:49 -04:00 |
Dmitry Smirnov
|
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 |
Andrew Bauer
|
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 |
|
Isaac Connor
|
d271d8bf1d
|
Fix my botched change to generateAuthHash
|
2018-06-25 14:50:54 -04:00 |
|
Isaac Connor
|
09aa3afaac
|
Fix capitalisation of Ffmpeg
|
2018-06-16 16:47:09 -04:00 |
|
Isaac Connor
|
55f2e7c6a2
|
Fix #2124. Always allow selection of checkboxes, include canEdit(Events) in button disabling.
|
2018-06-15 15:21:10 -04:00 |
Isaac Connor
|
f2d00b6af5
|
update Storage Video Writer options to only allow Passthrough for FFmpeg
|
2018-06-14 13:39:13 -04:00 |
|
Isaac Connor
|
0937bfdf84
|
consoleTableBody needs to be an id in order for dragndrop sorting to work
|
2018-06-06 13:37:12 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
d961b74084
|
spacing and double to single quotes
|
2018-06-06 11:41:00 -04:00 |
|
Isaac Connor
|
5d772f16f6
|
fix closing td
|
2018-06-01 16:18:07 -04:00 |
Isaac
|
77b144a13e
|
must specify type=button or else some browsers treat it as a submit button
|
2018-05-18 16:07:58 +02:00 |
|
Isaac
|
7ad6b01310
|
double to single quotes and spacing
|
2018-05-18 15:52:12 +02:00 |
|
Isaac
|
d8a62e0ede
|
Show total size for non-montage review downloads as well
|
2018-05-18 15:51:42 +02:00 |
|
Isaac Connor
|
2a8ea98249
|
remove blank space at end of line
|
2018-05-18 09:12:10 -04:00 |
|
Isaac Connor
|
4815162bea
|
fix extra }
|
2018-05-18 09:11:15 -04:00 |
|
Isaac Connor
|
8276386a44
|
We always return an associative array now
|
2018-05-18 09:06:17 -04:00 |
|
Isaac Connor
|
fdaf992156
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-05-16 14:18:48 -04:00 |
|
Isaac
|
93dd943fec
|
Fix some spacing
|
2018-05-16 20:17:57 +02:00 |
|
Isaac Connor
|
780cb693c2
|
google code style
|
2018-05-16 11:14:11 -04:00 |
|
Isaac Connor
|
81c4542a94
|
correct use of getValue. Use standard ddm element value instead
|
2018-05-16 11:13:59 -04:00 |
Isaac Connor
|
f16e1953d9
|
Make Source filter apply to Path as well
|
2018-05-15 10:45:10 -07:00 |
Andrew Bauer
|
485f292943
|
fix php 5.4 compatibility - remove calls to empty
|
2018-05-14 12:32:48 -05:00 |
|
Isaac Connor
|
b2115f9dcf
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-08 13:34:03 -07:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
3c4befc73a
|
improve Name and Source filtering. Default to case insensitive text search.
|
2018-05-08 14:07:24 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
2076508374
|
add Source and Name filters
|
2018-05-04 06:47:02 -07:00 |
|
Isaac Connor
|
3fd953a4eb
|
Move code to generate Source from console into Monitor Object
|
2018-05-04 06:46:46 -07:00 |
|
Isaac Connor
|
d43cd322f4
|
Make event count a link to a filter to list them.
|
2018-05-03 09:42:14 -07:00 |
|
Isaac Connor
|
81758fab38
|
use new Thumbnail code
|
2018-05-03 09:39:23 -07:00 |
|
Isaac Connor
|
e64de07560
|
spacing
|
2018-05-03 09:39:09 -07:00 |
|
Isaac Connor
|
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 |
Isaac Connor
|
433cffcce7
|
include Id in Filter dropdown
|
2018-04-30 15:21:05 -04:00 |
|
Isaac Connor
|
6c5e6e6184
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-30 07:10:38 -07:00 |
|
Isaac Connor
|
3f05d46012
|
Merge zmdc.pl fixes. We can now handle database disconnects gracefully.
|
2018-04-30 07:09:23 -07:00 |
|
Isaac Connor
|
e891c88a3e
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-28 12:38:57 -04:00 |
|
Isaac Connor
|
abd52ebfb1
|
Add DiskSpace column to storage listing
|
2018-04-28 12:38:10 -04:00 |
|
Isaac Connor
|
a4da624f4c
|
break out of loops when zm-terminate is set
|
2018-04-27 13:20:38 -07:00 |