Commit Graph

734 Commits

Author SHA1 Message Date
Isaac Connor 1eadb814e2 Fix use of onclick and onchange. Fix bulk frame lookup. Make scanning events more efficient 2019-06-10 15:59:19 -04:00
Isaac Connor dfc60baf85 fix eslint spacing 2019-06-06 13:40:00 -04:00
Isaac Connor 9d6091e271 better fix for #2453. Pushing an element causes td's within td's. Weird formatting, etc. We use an html escaping function to prevent XSS 2019-06-04 10:32:54 -04:00
Isaac Connor 722411475d Fix +/- buttons on new line in filter not having onclick events bound 2019-05-29 09:23:56 -04:00
Isaac Connor ac8197f2e5 fix eslint errors in monitor.js 2019-05-27 11:25:49 -04:00
Isaac Connor e2d56597bf Don't use an onlick inline js to show the caution text 2019-05-24 12:40:02 -04:00
Isaac Connor 2eebdb094c move chosen setup to initPage 2019-05-24 11:54:14 -04:00
Isaac Connor a0dbb70af6 filter the form submit on enter to only affect input elements, not textareas 2019-04-26 10:40:11 -04:00
Isaac Connor 735a996e41 dsiable form submit on enter on the monitor view 2019-04-26 10:26:16 -04:00
Andrew Bauer 50dd63c21d fix eslint 2019-04-08 19:58:18 -05:00
Andrew Bauer 8af96e3c00 fix eslint errors 2019-04-08 18:40:52 -05:00
Isaac Connor 780f4f9b9a Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-04-06 09:27:44 -04:00
Andrew Bauer e97751558f eslint fix 2019-03-30 10:41:04 -05:00
Isaac Connor 90e97ff135 Merge branch 'master' into storageareas 2019-03-28 11:20:29 -04:00
Isaac Connor 49e3f0a68e eslint fixes 2019-03-28 09:43:31 -04:00
Isaac Connor ee4b452e42 Update monitor edit to not use inline js 2019-03-25 16:25:09 -04:00
Isaac Connor 16467595d4 Fix clicking in montage 2019-03-21 17:00:51 -04:00
Isaac Connor d4353af8af Fix eslint errors 2019-03-20 14:51:39 -04:00
Isaac Connor a5366d522d Fixup exporting 2019-03-20 14:29:05 -04:00
Isaac Connor 3f9564c10a Merge branch 'master' into storageareas 2019-03-19 10:37:35 -04:00
Isaac Connor 428f7e8e8f create setup_onclick and disable_onclick in the monitor object. Use it to setup and disable the click event when editing/cancelling layout editing 2019-03-19 10:24:30 -04:00
Isaac Connor 520c41da23 Merge ../ZoneMinder.connortechnology.bad into storageareas 2019-03-18 14:40:03 -04:00
Matthew Noorenberghe ac547e0d5d Don't scroll to the top of the page when force/cancel alarm is clicked 2019-03-10 20:58:24 -07:00
Matthew Noorenberghe e6220e9d07 Fix eslint issues in cycle.js 2019-03-10 20:56:08 -07:00
Isaac Connor 6c8eac1ac8 Merge branch 'storageareas' into h265 2019-03-06 11:10:01 -05:00
Isaac Connor fa124eb29a Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-03-05 14:35:15 -05:00
Isaac Connor f0f2b6a17c implement click_automove and submitToMontrageReview for onclick handlers 2019-03-05 14:35:02 -05:00
Isaac Connor e59eb510e3 update and fix the donate popup 2019-03-05 13:10:04 -05:00
Isaac Connor 73ae3f49ed Merge branch 'master' into storageareas 2019-03-05 11:35:55 -05:00
Isaac Connor 8053f61a08 fix eslint missing {} 2019-03-05 11:02:09 -05:00
Isaac Connor 76ee31bf68 fix eslint missing {} 2019-03-05 11:01:58 -05:00
Isaac Connor 778707c8df Merge branch 'master' into storageareas 2019-03-04 14:33:28 -05:00
Isaac Connor 7cee8356bd Fix setting frame width when changing from fixed width to scaled 2019-03-04 13:43:03 -05:00
Isaac Connor 96e29c0299 fix up remaining issues with cycle updates 2019-03-04 13:35:40 -05:00
Isaac Connor 675b4975b0 Fix control presets 2019-03-01 13:37:34 -05:00
Isaac Connor 5da51d51bc Merge branch 'master' into storageareas 2019-02-26 10:55:51 -05:00
Isaac Connor 53c0fae688 Merge fix from storageareas for archive/delete in events list 2019-02-26 10:22:58 -05:00
Isaac Connor 3b06f3015a redirect to console of successfullogin takes us to login 2019-02-24 10:07:42 -05:00
Isaac Connor fd310c0f0a Merge branch 'master' into storageareas 2019-02-22 11:33:47 -05:00
Isaac Connor 45778384a6 Merge branch 'release-1.32' 2019-02-22 11:24:23 -05:00
Isaac Connor 9a2dd06e1d Fix use of empty which isn't supported in old php. Remove the code entirely as I think it was just cutnpasted from somewhere else. We don't care if it is a new server or not in the validate code.
Fixes #2540
2019-02-22 11:22:44 -05:00
Isaac Connor 410cb70ddb
get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again. (#2534) 2019-02-22 09:20:54 -05:00
Isaac Connor 8dd8888975
Php namespace (#2537)
* experiment with namespaces on the Server class

* experiment with namespaces on the Server class

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
Isaac Connor 6d1541a4d2 Merge branch 'fix_privacy_view' into storageareas 2019-02-19 12:57:01 -05:00
Isaac Connor 97a888c0db get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again. 2019-02-19 12:54:12 -05:00
Isaac Connor a3374aa26c Merge branch 'reload_zmfilter_on_filter_save' into storageareas 2019-02-11 13:26:53 -05:00
Matt N 9675367e03 event.js: Wait for delete request to succeed before navigating. Fixes #2384 (#2515) 2019-02-11 09:34:51 -05:00
Matthew Noorenberghe cda4a28fec Fix accidental use of 'let' in 255806bd54 2019-02-10 11:14:55 -08:00
Isaac Connor 555cb4780d Merge branch 'master' into storageareas 2019-02-10 12:37:45 -05:00
Matthew Noorenberghe 99f1e23c5b Replace usage of PHP_SELF in views/. Fixes #2450 2019-02-09 21:39:19 -08:00