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
1e3cf9bbf8
handle no streams better
2018-01-25 09:14:21 -08:00
fb50f6f996
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-24 17:14:42 -08: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
0742217599
Only populate monitorNames if query is valid
2018-01-23 13:28:29 -08:00
994766fd50
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-22 13:25:38 -08: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
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
bfa31297be
Merge branch 'storageareas' into tesla
2018-01-12 11:26:19 -08:00
c139f7a1bf
we don't need the group setting in the url
2018-01-12 11:24:52 -08:00
ff9f43b5a1
put back code to switch to add_monitors
2018-01-12 08:11:25 -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
74269fea73
make montagereview load event images from the server that the storage is located on
2017-12-22 12:33:30 -08: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
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
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
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
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
51b4ddb0e4
Add js for filter handling
2017-12-15 08:46:59 -05:00
d2b9614ce7
Change reset to not reload form
2017-12-15 08:46:57 -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
0743a283da
Remove back/close if opened in new tab
2017-12-13 12:34:31 -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
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
37cdcb89c4
Fix view button in events view
2017-12-05 12:50:49 -05:00
34b708bace
Handle popups that should remain popups
2017-12-05 09:40:03 -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
3f62d1e24d
Montagereview filter respect groups setting
2017-12-04 14:35:33 -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
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
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
7a5dfb71dc
Remove no longer used max from events
2017-12-02 12:28:05 -05:00
Isaac Connor
Andrew Bauer
Isaac
Andrew Bauer
Isaac Connor
Isaac Connor
digital-gnome
Isaac Connor
kimmeld