Isaac Connor
552e14a971
Merge branch 'master' into storageareas
2019-01-18 10:36:59 -05:00
Matt N
deaf651aad
Fix eslint violations ( #2416 )
...
* Add more JS libraries to eslintignore
* eslint . --fix
Automatic fixes only
* frame.js: eslint fixes
* events.js: manual eslint fixes
* skin.js: manual eslint fixes
* watch.js: manual eslint fixes
* Remove some tabs used for indentation in JS
* state.js: Fix new-cap eslint violation
* Disable guard-for-in eslint rule to get everything passing
2019-01-18 10:00:55 -05:00
Matt N
6bb5aa1b87
More inline JS / nonce conversions ( #2415 )
...
* monitor.php: Add nonce and move <script> inside </body>
* export_functions.php: Untested: Add @nonce to <script>
* blank.php: Add @nonce to <script> and add to CSP enforced views
* Enforce CSP on login and privacy views
* group.php: Add nonce and move <script> inside </body>
* filter.php: Add @nonce to <script>
* Fix updateButtons argument on the filter page upon change and page load
* events.php: Add @nonce to <script>
2019-01-18 09:51:06 -05:00
Isaac Connor
87d1390fed
Merge branch 'storageareas' into h265
2019-01-16 15:20:17 -05:00
Isaac Connor
f49dd93b6a
Merge branch 'master' into storageareas
2019-01-16 14:39:56 -05:00
Matt N
d33fec9c3f
Add a CSP script-src policy with nonce-source and convert more inline event handlers ( #2413 )
...
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy
* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'
Only handle ones that don't return a value.
* Use @data-on-click to attach inline click event handlers with no args and no return value
* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument
* Enforce a script-src CSP on views without inline JS
* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
Isaac Connor
ac27005944
remove debug
2019-01-15 11:38:43 -05:00
Isaac Connor
07c7c271a6
prevent error when event has no frames. Fix PathToIndex() -> PathToIndex. Fixes #2411
2019-01-15 11:38:19 -05:00
Isaac Connor
f726666f54
Merge branch 'master' into h265
2019-01-14 12:36:11 -05:00
Isaac Connor
52466c398b
Merge branch 'split_actions' into storageareas
2019-01-04 15:28:55 -05:00
Isaac Connor
b8d065275b
Merge branch 'master' into storageareas
2019-01-04 15:22:18 -05:00
Isaac Connor
99471836b7
Use monitor's serverId when loading server object so that images load from recording server.
2019-01-02 11:28:12 -05:00
Isaac Connor
8a1707a615
Add monitorServerId array to provide server info for each monitor so that we can load images from the recording server.
2019-01-02 11:27:46 -05:00
Isaac Connor
79113a6869
Add a default Server object to handle non-multi-server case
2019-01-02 10:56:40 -05:00
Isaac Connor
1a1231fdaa
Merge branch 'master' into storageareas
2018-12-28 10:47:27 -05:00
Isaac Connor
101f24feb5
Update area when editing x and y coords ( #2366 )
2018-12-27 14:28:14 -05:00
Isaac Connor
27826b4aca
Merge branch 'master' into storageareas
2018-12-24 09:48:29 -05:00
Isaac Connor
1130d6650a
Fix spacing and pass popup to previous/next event so that popups stay as popups
2018-12-21 10:50:19 -05:00
Andrew Bauer
3cf6bf1786
Merge pull request #2243 from connortechnology/add_archive_filter_to_montagereview
...
Rough in an archived status filter in montagereview.
2018-12-11 09:36:35 -06:00
Andrew Bauer
c530337c50
Merge pull request #2331 from connortechnology/fix_ios9
...
Fix ios9
2018-12-11 09:29:50 -06:00
Isaac Connor
c8c34d3f95
Merge branch 'master' into storageareas
2018-12-11 10:21:22 -05:00
Isaac Connor
1e8c4276bb
fix #2319 some more. This is fixing rate sticking across gapless events and reload
2018-12-10 17:32:17 -05:00
Isaac Connor
a9290759a5
Merge branch 'fix_ios9' into storageareas
2018-12-03 16:25:34 -05:00
Isaac Connor
18ce7c9ea0
Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead.
2018-12-03 15:17:16 -05:00
Isaac Connor
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
Andrew Bauer
5a88cbcddb
Merge pull request #2329 from connortechnology/fix_2319
...
Fix rate resetting
2018-11-29 09:57:13 -06:00
Isaac Connor
c0a9fae01f
Merge branch 'fix_2319' into storageareas
2018-11-29 09:57:41 -05:00
Isaac Connor
605397b565
Fix rate resetting by storing it in a cookie and using that on initial event load. Fixes #2319
2018-11-29 09:43:21 -05:00
Isaac Connor
1e915e9567
Merge branch 'master' into server_path_prefix
2018-11-28 10:45:36 -05:00
Isaac Connor
57acb2aac6
Merge branch 'server_path_prefix' into storageareas
2018-11-28 10:41:11 -05:00
Isaac Connor
f8b2ff5c77
rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()
2018-11-27 17:35:25 -05:00
Isaac Connor
b5430a1927
Merge branch 'fix_2317' into storageareas
2018-11-23 15:35:55 -05:00
Isaac Connor
6128d2a4d9
fix #2317 by updating the url encoding of a filter to match events for that monitor
2018-11-23 15:34:23 -05:00
Isaac Connor
19f3cce41f
Dont auto-guess pathPrefix
2018-11-23 13:54:14 -05:00
Isaac Connor
7ad19be0d7
Merge branch 'server_path_prefix' into storageareas
2018-11-23 13:29:01 -05:00
Isaac Connor
dea5db9dd9
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 11:11:39 -05:00
Isaac Connor
c5f7fb7b18
Merge branch 'master' into server_path_prefix
2018-11-22 10:04:33 -05:00
Isaac Connor
62e511cfd1
Merge branch 'master' into h265
2018-11-17 10:41:20 -05:00
Isaac Connor
f72651da5a
Add auth hash to ajax fps and status calls in zone edit
2018-11-15 12:22:35 -05:00
Isaac Connor
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
Isaac Connor
d89c0bc737
Merge branch 'master' into storageareas
2018-11-14 15:55:00 -05:00
Isaac Connor
3be31020b7
Automatically add width to frames view when thumbnails are turned on.
2018-11-14 15:54:01 -05:00
Isaac Connor
9148d3f7c4
Merge branch 'zone_point_buttons' into storageareas
2018-10-24 12:44:21 -04:00
Isaac Connor
9cf31eafa0
Use a button element instead of an anchor tag for plus and minus point buttons. Cleanup dead code
2018-10-24 12:43:43 -04:00
Isaac Connor
ca8770bd5a
Merge branch 'fix_rce' into storageareas
2018-10-24 10:17:16 -04:00
Isaac Connor
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
Isaac Connor
559f34a838
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:33:09 -04:00
Isaac Connor
069f67a10f
Break some long lines
2018-10-20 14:32:58 -04:00
Isaac Connor
c9c46aa12d
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:32:25 -04:00
Isaac Connor
f5eca2da1e
No longer need to add thisUrl to monitorUrl
2018-10-20 11:37:36 -04:00
Isaac Connor
3723f7acb3
comment out redundatn code increasing load on server
2018-10-19 15:02:10 -04:00
Isaac Connor
98579fc02a
Merge branch 'master' into storageareas
2018-10-19 11:27:43 -04:00
Isaac Connor
e7ec2faccd
monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url
2018-10-18 20:33:50 -04:00
Isaac Connor
b0078fb1d9
whitespace, get rid of redundant ajax startup
2018-10-16 17:20:10 -04:00
Isaac Connor
c2af380e29
Merge branch 'master' into storageareas
2018-10-16 11:39:26 -04:00
Isaac Connor
1b9b2811b3
remove ? from streamCmdParms. Mootools adds it in so this gives us a double ?
2018-10-16 11:39:16 -04:00
Isaac Connor
2881d2af3f
Merge branch 'master' into storageareas
2018-10-10 14:13:27 -04:00
Isaac Connor
a46c9a8a7a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-10 14:03:35 -04:00
Isaac Connor
63a5211789
use url instead of server_url in Monitor object
2018-10-10 14:03:27 -04:00
Isaac Connor
48e805c09f
Make header flips perisisent based on cookie
2018-10-10 13:11:27 -04:00
Isaac Connor
229315fc92
Merge branch 'add_archive_filter_to_montagereview' into storageareas
2018-10-09 11:10:27 -04:00
Isaac Connor
217d1e44ba
Rough in an archived status filter in montagereview.
2018-10-09 11:06:54 -04:00
Isaac Connor
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
Isaac Connor
c481fc868f
be more robust when curFrames is empty.
2018-09-28 11:25:19 -04:00
Isaac Connor
9c437b0303
Merge branch 'add_export_to_filter' into storageareas
2018-09-25 14:35:19 -04:00
Isaac Connor
520d1bb7bf
Merge branch 'master' into storageareas
2018-09-20 09:08:29 -04:00
Isaac Connor
6181e52c47
gracefully handle non-existence of imageFeed
2018-09-20 09:07:28 -04:00
Isaac Connor
870300ed93
remove debug line
2018-09-14 16:19:41 -04:00
Isaac Connor
34c7ee32ee
Merge branch 'master' into storageareas
2018-09-14 15:13:57 -04:00
Isaac Connor
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
Isaac Connor
60b952ab86
Merge branch 'master' into storageareas
2018-09-13 16:20:36 -04:00
Isaac Connor
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -04:00
Andrew Bauer
c66dd25ebb
implement collapsible headers ( #2203 )
2018-09-11 17:39:40 -04:00
Isaac Connor
eef928a742
fix find_all => find
2018-09-11 14:31:03 -04:00
Isaac Connor
8608fc97be
fix trms=>terms
2018-09-10 15:11:57 -04:00
Isaac Connor
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
Isaac Connor
03f769eacc
Rough in codec specification for Events
2018-09-10 12:22:55 -04:00
Isaac Connor
978e332e3a
Merge branch 'master' into storageareas
2018-09-09 16:36:31 -04:00
Isaac Connor
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
Isaac Connor
d5cab088d6
Merge branch 'master' into add_export_to_filter
2018-09-05 10:33:10 -04:00
Isaac Connor
2858564155
Merge branch 'master' into storageareas
2018-08-31 16:06:13 -04:00
Isaac Connor
9ec415b30a
Just reload the event view instead of dynamically updating the stream. Fixes #2196
2018-08-31 15:56:21 -04:00
Isaac Connor
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
Isaac Connor
4e32089a48
Merge branch 'master' into storageareas
2018-08-30 14:51:27 -04:00
Andrew Bauer
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
Isaac Connor
6e5472d305
Merge branch 'master' into server_path_prefix
2018-08-22 12:57:16 -04:00
Isaac Connor
d768f5f7fc
Merge branch 'master' into storageareas
2018-08-13 15:35:55 -04:00
Isaac Connor
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
.
2018-08-13 15:33:43 -04:00
Isaac Connor
026390ccd8
Merge branch 'master' into storageareas
2018-08-13 15:26:29 -04:00
Andrew Bauer
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
Isaac Connor
b85f74bb99
when selecting auto, we need to remove the width & height css key
2018-07-31 16:55:54 -04:00
Isaac Connor
b20d61e0df
fix onclick when editing layout
2018-07-31 16:47:25 -04:00
Isaac Connor
37779ff51d
use a window.location.assign instead of creating a popup to export
2018-07-17 08:26:19 -04:00
Isaac Connor
05f0338219
use a unique connection key for downloads
2018-07-12 14:07:19 -04:00
Isaac Connor
ce22f207e3
Merge branch 'master' into add_export_to_filter
2018-07-12 11:40:32 -04:00
Isaac Connor
8a936cdcc9
Merge branch 'master' into add_export_to_filter
2018-07-11 16:43:02 -04:00
Isaac Connor
f56d751661
join multiple echos into 1
2018-07-10 13:47:30 -04:00
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
8db6561030
Add missing ;
2018-07-09 13:08:20 -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
e29ed9bc54
add Export button to Filter
2018-07-09 12:01:40 -04:00
Isaac Connor
4c916e880b
Pass event_ids when reloading after export generation.
2018-07-09 12:01:25 -04:00
Isaac Connor
4de7ae8edc
Pass event_ids when reloading after export generation.
2018-07-09 12:01:09 -04:00
Isaac Connor
5ea2edb2ee
Convert export from a popup to a full page.
2018-07-09 12:00:10 -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
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
55f2e7c6a2
Fix #2124 . Always allow selection of checkboxes, include canEdit(Events) in button disabling.
2018-06-15 15:21:10 -04:00
Isaac
7ad6b01310
double to single quotes and spacing
2018-05-18 15:52:12 +02: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
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -04:00
Andrew Bauer
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
Isaac Connor
00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
Isaac Connor
fedc4d4cb1
spacing
2018-04-20 14:24:56 -04:00
Isaac Connor
36b8cfb115
test element so that processing will continue if buton doesn't exist
2018-04-18 12:29:59 -04:00
Isaac Connor
bb924ee078
add report_event_audit
2018-04-10 13:06:01 -07:00
Isaac Connor
053322c2c3
add NextFrameId to Frames
2018-04-03 12:32:14 -07:00
Isaac Connor
7a5d4d3b19
adjust frame_id for bulk frames
2018-04-03 12:31:39 -07:00
Isaac Connor
09e05b1313
Clean up date stuff, use moment for formatting in secs2dbstr etc
2018-04-03 10:38:03 -07:00
Isaac Connor
7346a8c733
add select button
2018-04-03 10:36:58 -07:00
Isaac Connor
793f630ee0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-02 10:43:07 -07:00
Isaac Connor
d1dd16b81c
fix event_id to EventId
2018-03-28 13:07:53 -07:00
Isaac Connor
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
Isaac Connor
c53b6ffbb0
rework montagereview to load data faster and leave event and frame data in json objects
2018-03-02 18:26:50 -08:00
Andrew Bauer
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
Isaac Connor
eeb7190812
fix rand replacing in image url
2018-02-14 13:16:30 -05:00
Isaac Connor
45bf4544ca
rename SetImageSource to getImageSource which is what it actually does
2018-02-14 11:58:47 -05:00
Isaac Connor
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
Isaac Connor
63a214869e
rework montagereview to be more performant.
2018-02-09 07:31:19 -08:00
Isaac Connor
cb9eef8563
show No streams found if none were found
2018-02-09 07:30:12 -08:00
Isaac Connor
4777808cf0
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-02-08 13:15:41 -05:00
Isaac Connor
95cfdb327d
further separate addBtn and cloneBtn, fixes
2018-02-08 13:15:27 -05:00
Isaac Connor
4240dc4bde
spacing, add a test for minTime being after maxTime
2018-02-08 09:30:26 -08:00
Isaac Connor
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
Isaac Connor
babae4629a
Update and fix console buttons. Use a separate button for clone
2018-02-08 09:47:16 -05:00
Isaac Connor
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
Isaac Connor
060e6893cc
fix Storage dropdown population and don't clear value on line type change
2018-02-02 12:48:22 -05:00
Isaac Connor
132fff1931
An ok json return with no status is possible now
2018-01-31 14:35:48 -05:00
Isaac Connor
a60da6811b
revert adding custom port for status updates. It breaks in the non-multiserver case.
2018-01-29 15:17:22 -05:00
Isaac Connor
a76fcb331c
Remove debugging. Treat can't get semaphore as a non-error
2018-01-29 08:25:46 -08:00
Isaac Connor
dc6842bfbd
Add remote server port to monitor url
2018-01-29 07:32:40 -08:00
Isaac Connor
b793e6659b
add onFailure logger, and change link to chain so that responses don't just disappear
2018-01-29 07:32:02 -08:00
Isaac Connor
984d3a2dd1
add Monitor Name to the response listing the available camera feeds
2018-01-29 07:30:46 -08:00
Isaac Connor
dc46f23af0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-26 10:17:54 -08:00
Isaac Connor
d001ce467e
use get for status JSON requests
2018-01-26 10:31:55 -05:00
Isaac Connor
1e3cf9bbf8
handle no streams better
2018-01-25 09:14:21 -08:00
Isaac Connor
fb50f6f996
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-24 17:14:42 -08:00
Isaac Connor
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
Isaac Connor
ea4937b75e
put back missing s
2018-01-23 17:47:24 -05:00
Isaac Connor
d9252e2d47
Merge branch 'storageareas' into tesla
2018-01-23 13:29:37 -08:00
Isaac Connor
0742217599
Only populate monitorNames if query is valid
2018-01-23 13:28:29 -08:00
Isaac Connor
994766fd50
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-22 13:25:38 -08:00
Isaac Connor
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
Isaac Connor
e78a40b45f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-16 11:02:20 -08:00
Isaac Connor
27ebf1a4aa
Comment out debug code
2018-01-16 14:02:04 -05:00
Isaac Connor
bfa31297be
Merge branch 'storageareas' into tesla
2018-01-12 11:26:19 -08:00
Isaac Connor
c139f7a1bf
we don't need the group setting in the url
2018-01-12 11:24:52 -08:00
Isaac Connor
ff9f43b5a1
put back code to switch to add_monitors
2018-01-12 08:11:25 -08:00
Isaac Connor
666005fb5d
fix single event replay by fixing the reference to player which should be vid
2018-01-11 14:42:00 -05:00
Isaac Connor
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
Isaac Connor
74269fea73
make montagereview load event images from the server that the storage is located on
2017-12-22 12:33:30 -08:00
digital-gnome
b4c0f13adf
Allow nondate values
...
Supports -# days/hours/etc
2017-12-20 15:23:14 -05:00
digital-gnome
d034ae9ab2
Default value for new brackets
2017-12-18 22:58:38 -05:00
Isaac Connor
46673bafdb
Merge pull request #68 from digital-gnome/montagereview-datepicker
...
Montagereview datepicker
2017-12-18 13:39:58 -05:00
digital-gnome
de6ebfc341
Remove chosen from some filter dropdowns and restyle to match
2017-12-17 22:04:10 -05:00
digital-gnome
804339f54f
Limit date range and only reload page after change is done
2017-12-17 16:44:57 -05:00
digital-gnome
5d190dedff
Set brackets width and allow blank
2017-12-17 14:25:50 -05:00
digital-gnome
bb75e6a6ea
Disallow future dates
2017-12-17 14:24:58 -05:00
digital-gnome
173ad4f75a
Add datepicker to montagereview
2017-12-17 09:22:31 -05:00
digital-gnome
6ffa96dea3
Add chosen to filters
2017-12-16 23:10:20 -05:00
digital-gnome
d7532b0340
Add dateTime picker to filter
2017-12-15 22:57:42 -05:00
digital-gnome
eec174750e
Default for conjunction
2017-12-15 09:06:40 -05:00
digital-gnome
dee976cf1a
parseRows just needs to recreate the php logic
2017-12-15 08:47:06 -05:00
digital-gnome
2cba20ab46
Make form validation not reload page
2017-12-15 08:47:05 -05:00
digital-gnome
2ddb380d0d
Remove submitToFilter
2017-12-15 08:47:05 -05:00
digital-gnome
86af2269b2
Move arrays out of ifs, pass to js
2017-12-15 08:47:03 -05:00
digital-gnome
a2c785f7eb
Move validateForm
2017-12-15 08:47:03 -05:00
digital-gnome
04efff699a
Set url when adding terms
...
Saves changes if reloaded or using back button
2017-12-15 08:47:02 -05:00
digital-gnome
51b4ddb0e4
Add js for filter handling
2017-12-15 08:46:59 -05:00
digital-gnome
d2b9614ce7
Change reset to not reload form
2017-12-15 08:46:57 -05:00
Isaac Connor
046a0dd6e9
need a line break
2017-12-13 16:45:51 -05:00
Isaac Connor
abad266c5b
introduce chosen to use it to make the filtering dropdowns awesome
2017-12-13 16:15:03 -05:00
digital-gnome
0743a283da
Remove back/close if opened in new tab
2017-12-13 12:34:31 -05:00
digital-gnome
1f7a5f26ab
Fix montagereview event popup
2017-12-13 10:22:15 -05:00
digital-gnome
e0c2061954
Fix back if window is opened in new tab.
2017-12-13 10:20:02 -05:00
Isaac Connor
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
kimmeld
1a5d9d5586
Fix monitor sorting ( #2015 )
...
Fixed issue #2014
2017-12-06 15:43:33 -05:00
digital-gnome
37cdcb89c4
Fix view button in events view
2017-12-05 12:50:49 -05:00
digital-gnome
34b708bace
Handle popups that should remain popups
2017-12-05 09:40:03 -05:00
digital-gnome
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
digital-gnome
3f62d1e24d
Montagereview filter respect groups setting
2017-12-04 14:35:33 -05:00
digital-gnome
9ca19b003f
Add download button to montagereview
2017-12-03 14:42:09 -05:00
digital-gnome
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