Commit Graph

310 Commits

Author SHA1 Message Date
Andrew Bauer cd09ec8fef rough in Modal Ajax framework 2020-09-10 16:56:58 -05:00
Isaac Connor 6abad06db2 increase width of frames view 2020-09-02 18:12:26 -04:00
Andrew Bauer a919be7b2d replace tabs with vert pills 2020-08-28 13:09:49 -05:00
Isaac Connor ccaea26928 Fix logic on MonitorFlip Cookie value 2020-08-27 10:54:54 -04:00
Isaac Connor 6173890a45 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-27 10:34:00 -04:00
Isaac Connor c0d543cd47 Add code to handle monitorsfilterbar on montage 2020-08-27 10:31:06 -04:00
Andrew Bauer 4bacb136c9 enable page-jump-to table extension 2020-08-27 07:46:52 -05:00
Isaac Connor 06942746d6 Merge branch 'release-1.34' 2020-08-25 12:41:33 -04:00
Isaac Connor b0f5f3617a Always set auth_hash and always set auth_relay, using our handy new get_auth_relay function 2020-08-25 12:39:14 -04:00
Isaac Connor f1fab6361f fix dimensions of v4l settings popup 2020-08-25 12:38:46 -04:00
Andrew Bauer 9357017a39 add export fx to tables 2020-08-21 07:11:57 -05:00
Andrew Bauer 3e5bfc445f fix checkbox column disappearing 2020-08-17 12:10:35 -05:00
Andrew Bauer e19d1f507e fix bootstrap-table-cookie correctly 2020-08-17 08:05:50 -05:00
Andrew Bauer 5468c0322e appease the eslint nanny 2020-08-16 16:30:35 -05:00
Andrew Bauer 0cbf559821 only hide cols if cookie not exist 2020-08-16 16:02:43 -05:00
Andrew Bauer 45fde13535 rough in new events view 2020-08-15 15:27:58 -05:00
Andrew Bauer 42fe024681
Update skin.js 2020-08-09 17:43:39 -05:00
Andrew Bauer 9a03a2c7d4
Update skin.js 2020-08-09 17:43:07 -05:00
Andrew Bauer d0e7443a3c rough in update reminder dropdown 2020-08-09 14:18:44 -05:00
Andrew Bauer a6ae4aee01 eslint nanny 2020-08-08 12:26:42 -05:00
Andrew Bauer fd4b9ba4f4 move jquery in functions.php to skin.js 2020-08-08 12:06:57 -05:00
Andrew Bauer b626e0de1c eslint nanny strikes again 2020-08-08 11:19:29 -05:00
Andrew Bauer 96bd6397c6 eslint nanny 2020-08-08 10:38:58 -05:00
Isaac Connor 82357a0675 reapply click function to bandwidth dropdown entries after getNavBar 2020-08-08 11:17:26 -04:00
Andrew Bauer 3792043707 implement bw widget as dropdown 2020-08-08 10:07:26 -05:00
Andrew Bauer c1f37192b9 implement storage widget as dropdown 2020-08-03 10:43:24 -05:00
Andrew Bauer 3351a4de56
fix eslint 2020-08-02 15:33:10 -05:00
Andrew Bauer d6999f5628
iterate through keys in data 2020-08-02 13:33:25 -05:00
Andrew Bauer 2b29a7983a clean up navbar background refresh 2020-08-02 13:01:20 -05:00
Isaac Connor 0139d06fcd Fix data-on-input-this using onchange instead of oninput 2020-07-29 16:41:27 -04:00
Isaac Connor 1508b82754 Fix data-on-input-this using onchange instead of oninput 2020-07-29 16:40:57 -04:00
Isaac Connor 5d883d696b give a better error message when submitThisForm fails 2020-07-27 12:40:25 -04:00
Andrew Bauer eaed5abcd3 add missing bootstrap.bundle.js.map 2020-07-25 16:56:17 -05:00
Andrew Bauer c48fa83c6d upgrade to bootstrap 4.5 2020-07-25 13:18:09 -05:00
Isaac Connor e29c426f04 Pass event object to data-on-click events 2020-05-01 13:04:55 -04:00
Isaac Connor 89245e0d46 Add auth relay information when auth_relay is something other than hashed. 2020-05-01 13:04:37 -04:00
Isaac Connor 9ec89f20d3 Add auth relay information when auth_relay is something other than hashed. 2020-04-29 16:33:41 -04:00
Isaac Connor 5e88181380 Pass event object to data-on-click events 2020-04-29 16:32:55 -04:00
Isaac Connor 91b1d7bbeb alter setButtonState to take either an id or an element so that we can log the missing element 2020-04-23 15:43:36 -04:00
Isaac Connor a6f5ae2601 fix cyclePlay button not working. Move SetButtonState into skin.js 2020-04-23 15:42:30 -04:00
Isaac Connor 055c20c3cc fix eslint 2020-04-23 10:23:46 -04:00
Isaac Connor ac017a5c72 Add support for strftimes' %r when converting to moment.js formatting 2020-04-18 17:51:34 -04:00
Isaac Connor 3700b9fcbe fix eslint 2020-04-17 11:04:07 -04:00
Isaac Connor b74d8d7487 Add support for strftimes' %r when converting to moment.js formatting 2020-04-17 09:44:07 -04:00
Isaac Connor 9f696186a8 Increase height of storage popup for Enabled 2020-03-04 10:48:02 -05:00
Isaac Connor 967e5ad30f alter setButtonState to take either an id or an element so that we can log the missing element 2020-03-02 11:52:32 -05:00
Isaac Connor dce4d17b51 fix cyclePlay button not working. Move SetButtonState into skin.js 2020-02-25 13:17:02 -05:00
Isaac Connor d7f8f201be Fix zoneminder.com url getting undefined being added to it 2020-02-22 10:51:26 -05:00
Isaac Connor 63a3f2e453 Fix zoneminder.com url getting undefined being added to it 2020-02-22 10:50:00 -05:00
Isaac Connor 7535769e4b controlcap needs to be larger 2020-01-05 17:34:40 -05:00
Andrew Bauer 98f7fb63b9 fix eslint errors 2019-12-31 19:24:51 -06:00
Isaac Connor 6a39893c1d include i elements in data-on-click 2019-12-31 19:11:14 -05:00
Isaac Connor ed417a49b4 increase logspopup width to eliminate scrollbars 2019-12-08 11:21:38 -05:00
Isaac Connor caefcc2f7a increase size of export popup 2019-12-02 12:17:33 -05:00
Isaac Connor 03d7bcdd11 better debug logging when on-click-this function isn't defined 2019-12-02 12:17:18 -05:00
Isaac Connor 207e5918c8 fix lint, remove debug 2019-11-19 11:37:45 -05:00
Isaac Connor 5b02bc76f4 Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly 2019-11-05 10:07:42 -05:00
Isaac Connor 9a3bee28d2 add logging and handling of oninput and oninput-this 2019-11-01 13:38:09 -04:00
Isaac Connor 80e3922165 add backWindow function to handle back buttons 2019-09-28 12:57:43 -04:00
Isaac Connor df0aef89af gracefully handle when window[fnName] doesn't exist 2019-07-23 10:03:28 -04:00
Isaac Connor 256a0aa679 google code style 2019-07-04 09:04:43 -04:00
Isaac Connor 86ad96b788 increase height of donate popup to hold all content 2019-06-04 12:08:08 -04:00
Isaac Connor 36336d67be set width and height of shutdown window 2019-04-12 13:09:25 -04:00
Isaac Connor 677b9cfbed Make controlcap popup wider 2019-03-24 09:59:04 -04:00
Isaac Connor e59eb510e3 update and fix the donate popup 2019-03-05 13:10:04 -05:00
Isaac Connor d93924bd89 increase width of controls popup. 2019-02-20 15:39:26 -05:00
Matthew Noorenberghe cdbd59f054 bandwidth.php: Submit to the 'bandwidth' view but render the 'none' view. Fixes #2493 2019-02-10 13:22:08 -08:00
Matthew Noorenberghe a97711de89 Replace or sanitize remaining uses of PHP_SELF. Fixes #2446 2019-02-09 22:12:36 -08:00
Matthew Noorenberghe e36ac1b872 Add a polyfill for NodeList.prototype.forEach 2019-02-08 21:54:23 -08:00
Isaac Connor dca9a81cfd implement data-on-click-true 2019-02-05 16:45:05 -05:00
Isaac Connor a2e04c307d update buttons. reduce duplicated code. Make it so that users with System=View can at least see if there is an update. 2019-01-31 09:40:19 -05:00
Isaac Connor b9584bb5d2 Increase width of user popup 2019-01-23 11:18:46 -05:00
Isaac Connor e712cedbde spacing and quotes 2019-01-22 09:14:44 -05:00
Matt N e7e45b2d95 Remove jQuery use from top-level event listeners in skin.js since view=none doesn't have $j (#2433) 2019-01-22 08:00:39 -05:00
Isaac Connor 785c208ecf Fixes #2426. Ca should have been endTime 2019-01-21 12:01:46 -05:00
Matt N 19c272061a Replace MooTools usage for adding window event listeners (#2429) 2019-01-21 11:14:32 -05:00
Matt N 27bcf3f994 Upgrade jQuery version (#2430)
* Upgrade jQuery to 1.12.4

* Upgrade jQuery to 2.2.4; Stop support for IE8

* 2.2.4 is compatible with 1.12.4
* This fixes a CSP violation on every page load due to jQuery testing of focusin support with a hidden element.
2019-01-21 11:13:40 -05:00
Matt N d7ebc85d81 Replace remaining `console` inline event handlers (#2432)
* Use a hidden submit button in _monitor_filters rather than onkeydown

* events/console: Convert checkbox header toggle inline event listeners
2019-01-21 11:11:40 -05:00
Matt N 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
Matt N d3f8037e58 Replace onclick='submitTab(...' with a click listener (#2424) 2019-01-19 09:42:12 -05:00
Matt N 4e48939660 Add a validateForm event listener and enforce CSP on some views (#2425)
* Add a validateForm event listener and enforce CSP on the controlcap view

* filter.php: Use .validateFormOnSubmit

* server.php: Use .validateFormOnSubmit and fix makePopupButton condition check

* Use .validateFormOnSubmit and enforce CSP on the storage view
2019-01-19 09:41:53 -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 a7db6f08f5 single vs double quotes 2019-01-16 13:47:50 -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
Matt N 083f284599 Replace onclick inline event handlers for createPopup (#2410)
* Move <script> before </body>

* Change makePopupLink to not use onclick

* Change makePopupButton to not use onclick

* Use .popup-link in control_functions.php

* Use makePopupButton in controlcaps.php

* Prevent double-encoding in makePopup*

* Use makePopupButton in devices.php

* Use makePopupButton in logout.php

* Use makePopupLink in monitor.php

* Use makePopupLink and .popup-link in montage.php

* Use makePopupButton in options.php

* Use makePopupButton, makePopupLink, and .popup-link in zones.php
2019-01-15 09:01:58 -05:00
Isaac Connor 0cce0a642b Update chosen library to 1.8.7 2018-12-24 09:37:49 -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 c5f7fb7b18 Merge branch 'master' into server_path_prefix 2018-11-22 10:04:33 -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 86b0e4ea18 fix auth_hash. Should use generateAuthHash instead of accessing session directly 2018-10-22 18:32:39 -04:00
Isaac Connor d1bef49d0b Don't reload on a timeout when refreshing the navbar 2018-10-11 11:30:30 -04:00
Isaac Connor 592f55a550 do a location.reload instead of trying to guess what the current url is. Should solve permission denied problem when watching live view and auth times out. 2018-10-01 10:39:00 -04:00
Isaac Connor 6e5472d305 Merge branch 'master' into server_path_prefix 2018-08-22 12:57:16 -04:00
Isaac Connor 40cd27e68a when refreshing because ajax failed, reload the current view, not just index.php 2018-08-15 17:21:54 -04:00
Isaac Connor 2ff47e04da the updated video-js.css puts the fonts into a font dir. 2018-07-25 17:04:42 -04:00
Isaac Connor 00bdfdcb16 increase height of function popup so that dropdown options fit in it 2018-07-25 09:39:24 -04:00
Isaac Connor dc57a3c91c fix spacing/quotes/google code style 2018-07-24 16:41:09 -04:00
Isaac Connor 2767e7cca3 remove unneeded packaging files from chosen. 2018-07-12 11:35:02 -04:00
Dmitry Smirnov 7db1fabbe1 Removed "chosen" web site; "prism.js" is not distributable. (#2154) 2018-07-11 15:46:43 -04:00