f56d751661
join multiple echos into 1
2018-07-10 13:47:30 -04:00
8db6561030
Add missing ;
2018-07-09 13:08:20 -04:00
12a673169f
spacing
2018-07-09 12:33:37 -04:00
ba8dc2059d
spacing
2018-07-09 12:33:21 -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
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
55f2e7c6a2
Fix #2124 . Always allow selection of checkboxes, include canEdit(Events) in button disabling.
2018-06-15 15:21:10 -04:00
7ad6b01310
double to single quotes and spacing
2018-05-18 15:52:12 +02: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
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -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
fedc4d4cb1
spacing
2018-04-20 14:24:56 -04:00
36b8cfb115
test element so that processing will continue if buton doesn't exist
2018-04-18 12:29:59 -04:00
bb924ee078
add report_event_audit
2018-04-10 13:06:01 -07:00
053322c2c3
add NextFrameId to Frames
2018-04-03 12:32:14 -07:00
7a5d4d3b19
adjust frame_id for bulk frames
2018-04-03 12:31:39 -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
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
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05: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
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
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
63a214869e
rework montagereview to be more performant.
2018-02-09 07:31:19 -08:00
cb9eef8563
show No streams found if none were found
2018-02-09 07:30:12 -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
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
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
060e6893cc
fix Storage dropdown population and don't clear value on line type change
2018-02-02 12:48:22 -05:00
132fff1931
An ok json return with no status is possible now
2018-01-31 14:35:48 -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
a76fcb331c
Remove debugging. Treat can't get semaphore as a non-error
2018-01-29 08:25:46 -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
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
Isaac Connor
Andrew Bauer
Isaac
Andrew Bauer
Isaac Connor
Isaac Connor