Commit Graph

580 Commits

Author SHA1 Message Date
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 3be31020b7 Automatically add width to frames view when thumbnails are turned on. 2018-11-14 15:54:01 -05: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 e7ec2faccd monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url 2018-10-18 20:33:50 -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 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 c481fc868f be more robust when curFrames is empty. 2018-09-28 11:25:19 -04:00
Isaac Connor 6181e52c47 gracefully handle non-existence of imageFeed 2018-09-20 09:07:28 -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
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 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 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
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 15a6eb7e78
Revert "Add Privacy Statement (#2176)" (#2179)
This reverts commit 56f4d768c2.
2018-08-13 15:33:43 -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 f56d751661 join multiple echos into 1 2018-07-10 13:47:30 -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 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