Commit Graph

14595 Commits

Author SHA1 Message Date
Isaac Connor 617b74b8bb fix botched merge 2020-04-23 15:28:38 -04:00
out a7e49bd62a update chinese translation (~ ̄▽ ̄)~ 2020-04-23 15:27:06 -04:00
Isaac Connor c0b7aad2c8 add passive to addEventListener 2020-04-23 15:23:53 -04:00
Isaac Connor 17896b656a cleanup and revert adding Event stack trace 2020-04-23 15:23:11 -04:00
Isaac Connor 54995ab0d1 handle sort_asc not being set. Handle term['val'] not being set. 2020-04-23 15:18:05 -04:00
Isaac Connor f06dc3f171 Update group save action, using Group object methods. Fixes errors on new MariaDB 2020-04-23 15:16:22 -04:00
Isaac Connor b05916fc50 Use === when testing for empty value and setting defaults 2020-04-23 15:08:01 -04:00
Isaac Connor eb26c5f798 Fix use of array_key_exists instead of property_exists 2020-04-23 15:07:28 -04:00
Isaac Connor f5bf474ba6 filter bad characters out of Monitor Name 2020-04-23 14:59:21 -04:00
Isaac Connor 6f08322f7f add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving 2020-04-23 11:12:47 -04:00
Isaac Connor daff14df9b Allow users without System::View to read servers.json 2020-04-23 11:10:30 -04:00
Pliable Pixels 9b77f77ac3 better logs 2020-04-23 11:09:39 -04:00
Isaac Connor c3a80e7e40 Add MonitorId to event data returned for status request 2020-04-23 11:07:07 -04:00
Isaac Connor 59f9f37fff cleanup. Don't output errors that break json response 2020-04-23 11:06:41 -04:00
Isaac Connor 3ac6dc267b out an error if name contains invalid characters 2020-04-23 11:01:34 -04:00
Isaac Connor 57141fddeb handle additional atributes on the html tag in html detection 2020-04-23 10:46:18 -04:00
Isaac Connor 576e3149d6 escape table columns for mysql8 2020-04-23 10:43:01 -04:00
Isaac Connor 7046612b65 Code style updates. Quote the word Function in SQL for newer mysql 2020-04-23 10:41:59 -04:00
Isaac Connor 67b35967d4 MOstly spaces and quotes, remove duplicated db version update and only prepare the sth once. 2020-04-23 10:39:50 -04:00
Isaac Connor a7b553cdbe code style and correct license. Author was contacted and ok'd the change. Fies #2883 2020-04-23 10:37:42 -04:00
Isaac Connor 055c20c3cc fix eslint 2020-04-23 10:23:46 -04:00
Isaac Connor eab08783e9 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-04-23 10:10:08 -04:00
Isaac Connor 10d89ed82e Spacing, quotes, improve debug messages. 2020-04-23 10:00:11 -04:00
Isaac Connor a735f2cd1b
Merge pull request #2919 from connortechnology/fix_recaptcha
Fix recaptcha
2020-04-22 17:54:15 -04:00
Isaac Connor 264ba6525b Remove debug 2020-04-21 12:19:18 -04:00
Isaac Connor b384d233ae add async and defer to recaptcha load 2020-04-21 09:20:33 -04:00
Isaac Connor 543628d0ee cleanup, and add missing </ul> in the navbar when not logged in which seems to be causing the recaptcha render to fail 2020-04-21 09:20:04 -04:00
Isaac Connor d0e83fcfcb handle case where g-recaptcha-response is not in the request, due to failure to render the recaptcha 2020-04-21 09:19:29 -04:00
Isaac Connor 3e8de7dd6c Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918 2020-04-21 08:30:42 -04:00
Patrick 8fd32b8f1d add area definition to zone creation via API 2020-04-18 17:52:42 -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 924841ae71 Merge pull request #2913 from connortechnology/fix_monitor_loading
Fix monitor loading
2020-04-18 17:49:34 -04:00
Isaac Connor 006c0d0029 reference ppa for 1.34 instead of ppa for 1.32 2020-04-14 17:54:10 -04:00
Isaac Connor 2d5d87839f Fix warnings about hashed authentication not being available when using gnutls. Also set cmake_policy(SET CMP0054 NEW) to quiet warnings 2020-04-05 13:35:21 -04:00
Isaac Connor 210d380029 CSP must include all Servers. 2020-04-04 16:57:52 -04:00
Isaac Connor 024431808e fix onchange to data-on-change-this in width,height,scale, layout dropdowns 2020-04-04 16:57:24 -04:00
Isaac Connor 28e21fb0b1 Bump version to 1.34.9 2020-04-04 12:13:07 -04:00
Isaac Connor e2cb8a656d change exportEvent to expertEvents 2020-04-04 11:53:07 -04:00
Isaac Connor 402c38725b Limit version check popups to once per hour 2020-04-04 11:52:40 -04:00
Isaac Connor 6feffe2aa9 whitespace 2020-04-04 11:51:39 -04:00
Isaac Connor 61e6627fce fix fail to update version reminder due to submit button both submitting and formSubmitting as well as view not being set to version 2020-04-04 11:48:42 -04:00
Isaac Connor f81cfc0513 add 1 month as an option to the version popup dropdown 2020-04-04 11:46:31 -04:00
Isaac Connor 38555b0dd4 strip leading and trailing " in trigger message. Accept a space instead of a + in enable/disable commands to match on/off 2020-04-04 11:08:19 -04:00
Isaac Connor 2441ae2924 Improve event export a little bit. Add links to eventFrames and eventDetail html. 2020-04-03 15:34:20 -04:00
Isaac Connor 5d72e3b1b5 ensure no output buffering when downloading an archive. 2020-04-03 15:33:28 -04:00
Isaac Connor 4547332fad Move more styles into export.css. Remove content from dark/export.css and classic/export.css as it is duplicated. 2020-04-03 15:32:22 -04:00
Isaac Connor 4e58a38317 use ini_set(display_errors,0) instead of turning off errors entirely so that we still log errors, just not output them instead of json. 2020-04-03 15:21:31 -04:00
Isaac Connor ef9fbac90c Add Noscript warnings. Whitespace, improve some logic 2020-04-02 18:14:14 -04:00
Isaac Connor 1cc60f0857 fix action on cycle play button 2020-04-02 16:06:27 -04:00
Isaac Connor 87069b99b6 Fix inline-script errors on groups page referenced in #2890 2020-04-02 14:13:28 -04:00