1d1b0e58d2
consolidate getJson fail callbacks to one function
2020-09-20 08:41:16 -05:00
0c8bb25889
eslint
2020-09-11 16:49:36 -05:00
2ee70442c0
use done() and fail() callbacks for getJSON
2020-09-11 14:30:36 -05:00
b34c6dcfc2
correct log, code docs
2020-09-07 13:29:36 -04:00
0ced21dda7
Persist video volume in a cookie so that subsequent events remember the volume level.
...
Fixes #3013
2020-08-26 15:15:57 -04:00
f71926c736
Merge branch 'release-1.34'
2020-06-05 10:09:07 -04:00
20870e22fa
fix eslint errors
2020-05-29 13:28:33 -04:00
a9cec3ebbd
spacing
2020-05-23 16:13:29 -04:00
bf99daf494
Merge branch 'rate_dropdown'
2020-04-23 16:36:34 -04:00
25cd13f8ad
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-04-23 16:25:35 -04:00
5bf068791b
Merge branch 'rate_dropdown' into release-1.34
2020-04-23 16:11:59 -04:00
a6f5ae2601
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-04-23 15:42:30 -04:00
f8fa0340fc
fix eslint
2020-03-14 09:27:07 -04:00
9a3127da06
Merge branch 'rate_dropdown'
2020-03-10 18:47:19 -04:00
59bd658a96
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
2020-03-10 18:46:20 -04:00
dce4d17b51
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-02-25 13:17:02 -05:00
8a83449fba
Handle a zero value for scale
2020-02-25 11:18:13 -05:00
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -05:00
00f8a450de
spaces and quotes
2020-01-05 14:59:25 -05:00
d87bf5a156
replace the rate display with a dropdown
2019-12-20 11:02:12 -05:00
524a39a224
changeCodec no longer needs to be passed this
2019-10-18 13:40:29 -04:00
dfb65d23bf
Fix eslint warnings
2019-08-27 16:48:42 -04:00
7768d39eb9
Add auth to streamParms so that multi-server event viewing works
2019-08-26 16:19:44 -04:00
7598654740
add auth hash to ajax streams, and use monitorUrl instead of thisUrl to talk to zms
2019-08-23 17:58:40 -04:00
d4353af8af
Fix eslint errors
2019-03-20 14:51:39 -04:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
9675367e03
event.js: Wait for delete request to succeed before navigating. Fixes #2384 ( #2515 )
2019-02-11 09:34:51 -05:00
a2d4dc974b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-21 11:19:07 -05:00
e663397816
spacing
2019-01-21 11:17:21 -05:00
19c272061a
Replace MooTools usage for adding window event listeners ( #2429 )
2019-01-21 11:14:32 -05:00
a1a42345e3
More eslint fixes; eslint in php; add eslint to travis ( #2419 )
...
* Add eslint to travis.yml
* Update eslint package versions and apply new indent rules
* Enable the brace-style and block-style eslint rules
* Enable the 'curly' eslint rule
* Enable the 'keyword-spacing' eslint rule
* Enable the 'key-spacing' eslint rule
* Enable the 'object-curly-spacing' eslint rule
* Enable the 'no-new-object' eslint rule
* Only disable the no-caller eslint rule in the one affected file
* Enable the 'no-unused-vars' eslint rule for local variables
* Add linting of JS in .php files
2019-01-19 10:32:40 -05:00
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
f726666f54
Merge branch 'master' into h265
2019-01-14 12:36:11 -05:00
1130d6650a
Fix spacing and pass popup to previous/next event so that popups stay as popups
2018-12-21 10:50:19 -05:00
c530337c50
Merge pull request #2331 from connortechnology/fix_ios9
...
Fix ios9
2018-12-11 09:29:50 -06:00
1e8c4276bb
fix #2319 some more. This is fixing rate sticking across gapless events and reload
2018-12-10 17:32:17 -05:00
18ce7c9ea0
Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead.
2018-12-03 15:17:16 -05:00
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
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
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
3be31020b7
Automatically add width to frames view when thumbnails are turned on.
2018-11-14 15:54:01 -05:00
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
c481fc868f
be more robust when curFrames is empty.
2018-09-28 11:25:19 -04:00
6181e52c47
gracefully handle non-existence of imageFeed
2018-09-20 09:07:28 -04:00
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -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
03f769eacc
Rough in codec specification for Events
2018-09-10 12:22:55 -04:00
9ec415b30a
Just reload the event view instead of dynamically updating the stream. Fixes #2196
2018-08-31 15:56:21 -04:00
666005fb5d
fix single event replay by fixing the reference to player which should be vid
2018-01-11 14:42:00 -05:00
0743a283da
Remove back/close if opened in new tab
2017-12-13 12:34:31 -05:00
Andrew Bauer
Isaac Connor
Isaac Connor
Matt N
Isaac Connor
digital-gnome