Commit Graph

3637 Commits

Author SHA1 Message Date
Isaac Connor 76d37d4c95 update db record when we findout the disk space of an event 2017-10-10 13:02:26 -04:00
Isaac Connor 6bb331b8a5 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-10 11:51:48 -04:00
Isaac Connor 7f73f0bf8c do a backtrace when we ca;; generateAuthHash without open session 2017-10-10 11:51:35 -04:00
Isaac Connor d0f0ab1afe refreshparent when saving group 2017-10-10 11:51:11 -04:00
Isaac Connor d0f350d5b2 Merge pull request #29 from digital-gnome/alarmCues-refactor
Fix scaling with video.js
2017-10-10 11:09:59 -04:00
Isaac Connor 3af795264d add actual disk space as a mouseover in nav bar 2017-10-10 10:38:13 -04:00
Isaac Connor 8da7d845b4 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-10 09:37:23 -04:00
Isaac Connor c654d008f0 add monitor selector to montagereview and montage. 2017-10-10 09:36:56 -04:00
Isaac Connor b6974ea373 Add monitor drorpdown to montagereview 2017-10-09 15:32:09 -04:00
digital-gnome d5799cbf6f nph-zms alarmcues 2017-10-08 22:36:15 -04:00
digital-gnome d4d2c64974 nav buttons inactive
should have been this from the start
2017-10-08 21:49:34 -04:00
digital-gnome 65ce6df622 scalingfix
changing the scale now works with video.js and alarmcues.  some whitespace fixes
2017-10-08 21:46:26 -04:00
digital-gnome c41ef177c2 JS alarmCues 2017-10-08 21:45:05 -04:00
digital-gnome c39cf77a9c removealarmcuesPHP
removed the PHP rendering and placement code
2017-10-08 21:42:12 -04:00
Isaac Connor d4cf84f7e6 Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
Isaac Connor d0541b0837 Merge pull request #27 from digital-gnome/eventnavFix
Fix nearevents path
2017-10-07 12:49:50 -04:00
digital-gnome e23b4a0d5d Fix event path 2017-10-07 12:42:16 -04:00
Isaac Connor f230aa01ef turn off debug 2017-10-07 11:31:48 -04:00
Isaac Connor ed3d001c65 Merge pull request #26 from digital-gnome/NPH-ZMS-loading-on-mp4
Only load imageFeed if needed
2017-10-05 17:09:45 -04:00
Isaac Connor 69ab1b18ad fix new gruop not being savable 2017-10-05 16:12:12 -04:00
Isaac Connor a7e3c0b458 spacing 2017-10-05 16:11:54 -04:00
Isaac Connor 827e858feb use a cached Storage object to prevent hitting the db al lot 2017-10-05 16:11:43 -04:00
Isaac Connor c768e6ed88 add some more utility functions that should be available everywhere 2017-10-05 16:11:21 -04:00
Isaac Connor 09242d72b3 implement alternate ports for streaming 2017-10-05 16:05:41 -04:00
digital-gnome 6952e84c01 Only load imageFeed if needed 2017-10-05 11:20:42 -04:00
Isaac Connor 40972383c1 remove debug 2017-10-05 10:48:04 -04:00
Isaac Connor b56a976d7a fixes to montage review and cleanup in group filtering/editing 2017-10-05 10:46:04 -04:00
Isaac Connor de03726675 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-10-05 09:35:32 -04:00
Isaac Connor 91c2e07e64 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-04 21:51:38 -04:00
Isaac Connor 6c87ed10c1 add a notice when javascript is turned off 2017-10-04 21:51:30 -04:00
Isaac Connor 87a49ad009 work on infinite depths of groups 2017-10-04 16:40:09 -04:00
digital-gnome 398600d5f2 Placement for alarmCues 2017-10-04 11:09:22 -04:00
digital-gnome ea4b9486aa alarmCues CSS
also function.php to load new vjs override file
2017-10-04 11:09:22 -04:00
Isaac Connor 54949db0b5 spacing/google code style 2017-10-04 10:48:37 -04:00
Isaac Connor 8f8d66189c Google code style 2017-10-04 10:48:24 -04:00
Isaac Connor 995809ccb7 fix play/pause while editing zone 2017-10-04 10:48:14 -04:00
digital-gnome 5bbe9b40e7 renderAlarmCues function
Generates the html for alarmcues and passes it to JS var
2017-10-03 19:26:48 -04:00
APHW2 MFGENG 354262c557 wip nvsocket 2017-10-03 13:28:56 -07:00
Isaac Connor c46769495b Merge pull request #22 from digital-gnome/storageareas-navigation
Storageareas navigation
2017-10-03 10:18:44 -04:00
digital-gnome 9b241ee370 Also change class
With the css class properly set it turns out this wasn't working.
2017-10-02 15:41:04 -04:00
digital-gnome 33a3e04f43 Fix class selector 2017-10-02 15:40:18 -04:00
Isaac Connor 72ca011e2f fix favicon 2017-10-02 13:05:23 -04:00
Isaac Connor 462ea72ef5 properly test for existence of popupSizes 2017-10-02 12:43:52 -04:00
Isaac Connor 351d8ef24d make the word bandwidth also be part of the link 2017-10-02 12:39:39 -04:00
Isaac Connor d831f98dfb remove debug 2017-10-02 12:31:38 -04:00
Isaac Connor c7ac854cfd always include classic.js 2017-10-02 12:30:55 -04:00
Isaac Connor d8c69ab514 error gracefully when popupSizes not defined 2017-10-02 12:30:30 -04:00
Isaac Connor 207d57a3e6 use xhtmlfooter function to finish off html 2017-10-02 11:55:52 -04:00
Isaac Connor b52944258d use css skin based favicon if it exists. 2017-10-02 11:55:36 -04:00
Isaac Connor 16a731af1c fix path when changing status. 2017-10-02 11:55:17 -04:00
Isaac Connor 15ba7d2a35 fixes 2017-10-02 11:25:51 -04:00
digital-gnome c35face630 LengthTypo 2017-10-02 10:52:55 -04:00
Isaac Connor b5a5f45e04 turn off debug 2017-10-02 10:06:07 -04:00
Isaac Connor ddb7305aab Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-02 09:11:55 -04:00
Isaac Connor 13b192a63e remove title and close 2017-10-02 09:03:49 -04:00
Isaac Connor eaf29d2024 add a class to the active view link to highlight it 2017-10-02 09:02:57 -04:00
digital-gnome 48a3e5eaa6 Move logic to .js file. 2017-09-30 16:35:03 -04:00
digital-gnome e339b9e12a Merge branch 'storageareas-Navigationfix' into storageareas-navigation 2017-09-30 15:09:32 -04:00
digital-gnome 7c72ff1fd9 Navigation buttons for video.ja 2017-09-30 14:25:00 -04:00
digital-gnome 0e2b7d1b52 End of video logic 2017-09-30 14:25:00 -04:00
digital-gnome 5f203fc813 JS logic for video.js navigation 2017-09-30 14:24:59 -04:00
Isaac Connor 4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
digital-gnome 22af70601e Convert to ampersand in filters
Querys weren't working because it was passing & instead of &.  Nothing else appeared to be using these.
2017-09-29 21:49:58 -04:00
digital-gnome 5f42bf4fe5 Change CSS to class, add class to php
I needed the styling for the video.js buttons.  The fallback mjpeg player used ids.
2017-09-29 21:47:52 -04:00
digital-gnome febf15812f Add start times to getNearEvents 2017-09-29 21:44:57 -04:00
Isaac Connor 6a0da487eb add Parent Group selection to Group Edit 2017-09-28 12:37:15 -04:00
Isaac Connor 160a553fb9 Don't do csrf for frames view either. If there are a lot of frames, we run out of mem. 2017-09-27 17:33:06 -04:00
Isaac Connor 03d25ef10a more visually appearling code for hiding buttons. Remove cellspacing=0 on the table. 2017-09-27 17:32:42 -04:00
Isaac Connor b5699dcac3 google code style 2017-09-26 17:14:27 -04:00
Isaac Connor 35482ba53c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-09-26 16:13:51 -04:00
Isaac Connor d69b16df24 add group filter to montagereview 2017-09-26 11:28:19 -04:00
Isaac Connor bc1b770c14 add translation for AddNewStorage 2017-09-26 11:27:55 -04:00
digital-gnome 00c33aa758 remove extra /div
I somehow let an extra /div slip into the commit for making archive work.
2017-09-25 22:14:53 -04:00
digital-gnome cc4b6cd0b0 switch to jquery
switched both scaleslider and speedslider to jquery
2017-09-25 22:14:46 -04:00
digital-gnome 7dd95f6afe getNearEvents prev always 0
getNearEvents always returns 0 for prev event.  sortColumn is escaped with passes it with single quotes and breaks the query.  I changed it to match next event by removing the escape.
2017-09-25 22:14:36 -04:00
Isaac Connor fef503f90c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-09-23 13:42:44 -04:00
Isaac Connor aada54769f add a Group object 2017-09-23 13:42:39 -04:00
Isaac Connor 8ada30ff8c add a group filter to montage 2017-09-23 13:42:13 -04:00
Isaac Connor 4e16523cff Say Groups instead of listing the # of monitors in the header 2017-09-23 13:41:52 -04:00
digital-gnome ab3f15b7c0 Add logic for Archive link on initial load
Javascript appears to control this but it was not firing on initial load.  Added php logic.
2017-09-14 18:00:35 -04:00
digital-gnome a5f0103601 revert jquery change to speed slider
Scale was using getElementById but speed was changed to jquery.  It wasn't working so I just changed it to match scale.
2017-09-14 18:00:23 -04:00
digital-gnome a78e568378 Change storage path text box from url to text
With the text box set as url you can't use a standard unix path
2017-09-14 18:00:02 -04:00
Isaac Connor 6fe4b892ef always define auth_hash 2017-09-11 17:05:46 -04:00
Isaac Connor edb7762cf3 Merge branch 'master' into storageareas 2017-09-11 16:57:08 -04:00
Andrew Bauer 496ba70819 remove checks for empty and just check for true (#1980)
Yeah I agree.  I think the exists was from pre-object method days.
2017-09-11 13:27:17 -04:00
ralimi 58a9107675 Fix incorrect links to transparent.png and index.php (#1982)
* Fix install location for config files when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Omitted README file that should have appeared in /etc/zm/conf.d

* Fix location for configs when building to alternate directory.

* Fix works, but this should go on a branch instead.

* Fix works, but this should go on a branch instead.

* Fix location for configs when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Remove double quotes. This is a list of paths.

* Allow SSL database connection to be secured with SSL.

* Fix incorrect variable name

* Fix PHP syntax errors

* SSL connection parameters must also be passed in API.

* Fix links pointing at transparent.gif

* Use relative path to index.php instead of absolute.

The installation may not be rooted at / on the server.
2017-09-10 11:49:53 -04:00
Isaac Connor 42263bf39a pass mode when getting mp4 download link 2017-09-08 12:29:10 -04:00
Isaac Connor a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00
Isaac Connor 676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
Isaac Connor 9a6bfb2d02 fix some quotes, double to single 2017-08-22 09:44:45 -04:00
Isaac Connor 9b95259567 fix deleting monitor, but passing an event Id to deleteEvent instead of a hash consisting of just the Id 2017-08-22 09:33:51 -04:00
Isaac Connor f01adc6be5 fixes 2017-08-17 10:18:51 -04:00
peruchi d71b30aff3 Images Gif to PNG (#1969)
* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG
2017-08-16 14:51:20 -04:00
Isaac Connor f573158fbb fix breakage caused by empty SSL_CERT options 2017-08-15 19:40:02 -04:00
Isaac Connor adab628af9 fix video speed, various other 2017-08-14 18:22:52 -04:00
Isaac Connor b6965a2c3f fix spacing/braces 2017-08-14 11:38:21 -04:00
Isaac Connor 49464d381a Merge branch 'master' into storageareas 2017-08-14 10:44:40 -04:00
Isaac Connor 087b7abb94 Merge branch 'master' into fix_event_viewing 2017-08-14 10:41:04 -04:00
ralimi ecb7df0e8b Support SSL for mysql connections (#1965)
* Fix install location for config files when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Omitted README file that should have appeared in /etc/zm/conf.d

* Fix location for configs when building to alternate directory.

* Fix works, but this should go on a branch instead.

* Fix works, but this should go on a branch instead.

* Fix location for configs when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Remove double quotes. This is a list of paths.

* Allow SSL database connection to be secured with SSL.

* Fix incorrect variable name

* Fix PHP syntax errors

* SSL connection parameters must also be passed in API.

* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
Isaac Connor c60939e824 fix absolute path to index.php in console.js 2017-08-11 09:08:00 -04:00
Isaac Connor 27fe468868 Don't do csrf for view=video because the output buffering will make it run out of ram 2017-08-09 11:15:00 -04:00
Isaac Connor 6562d5eb47 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-08-09 09:54:34 -04:00
Isaac Connor 928c4651a6 fix braces, spacing 2017-08-09 09:54:27 -04:00
Isaac Connor b9addeecfd update deleting the events when deleting a monitor 2017-08-08 15:02:40 -04:00
Isaac Connor 7cb4090d7d can't use jquery like that 2017-08-03 12:41:43 -04:00
Isaac Connor 5a73c38237 video storage fixes (#1958)
* use a monitor object instead of just a db array.

* fix braces, spacing, move pod docs to bottom

* Fix memleak by freeing input and output frames

* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
Isaac Connor 6d46b36c80 Hide close button if not in a popup 2017-08-01 14:21:50 -04:00
Isaac Connor 259b7f7655 fix memleak 2017-07-31 15:49:27 -04:00
Isaac Connor 792d8640c2 use the analyze file if exists as thumbnail 2017-07-28 09:54:33 -04:00
Isaac Connor 33ce55584f Merge branch 'master' into storageareas 2017-07-26 10:48:42 -04:00
Isaac Connor 30057ddffe Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-07-26 10:38:25 -04:00
Isaac Connor 1cfd657168 put back the preg_replace that strips usernames and passwords from monitor source 2017-07-26 10:22:57 -04:00
Isaac Connor cfbfc0dd44 Merge branch 'master' into storageareas 2017-07-21 11:04:32 -04:00
Isaac Connor 3bd9d96027 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-07-21 10:54:57 -04:00
Isaac Connor efb02f3368 fix indent 2017-07-21 10:54:48 -04:00
Isaac Connor 457d909c88 fix quotes 2017-07-21 10:54:33 -04:00
Andrew Bauer 5cf2be528a Merge pull request #1950 from connortechnology/fix_api_logs
fix path to logs for api
2017-07-14 13:19:12 -05:00
Andrew Bauer c98255dd75 Merge pull request #1948 from connortechnology/fix_empty_monitor_source_column
Fix empty monitor source column
2017-07-14 13:10:52 -05:00
Isaac Connor b030fee429 don't do csrf checks for control commands 2017-07-14 12:29:24 -04:00
Isaac Connor 240a990c7f fix writing to config 2017-07-14 12:19:43 -04:00
Isaac Connor e203064bf7 updates bootstrap.php.in to match config.php's conf.d loading 2017-07-14 12:03:00 -04:00
Isaac Connor 13a72b7a99 fix path to logs for api 2017-07-14 11:58:15 -04:00
Isaac Connor 1a8638f3dd Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder 2017-07-14 11:50:01 -04:00
Isaac Connor 9824049c0c fix conf.d loading in api 2017-07-14 11:46:36 -04:00
Andrew Bauer 89bcfc4e28 fix incorrect gpl license text mailing address 2017-07-14 10:39:50 -05:00
Isaac Connor d13d7e9050 recode the bit that outputs the link under source so that it defaults to Monitor # under all situations 2017-07-14 09:57:25 -04:00
Isaac Connor 0e54d4e69a imposing a height on the textpanel causes the text to overflow 2017-07-14 09:26:56 -04:00
Isaac Connor df0497b3a7 always use onmouseover, as we can now pull images fairly quickly from the mp4 2017-07-14 09:25:53 -04:00
Isaac Connor 8bbad9adf8 braces, spaces 2017-07-13 17:35:06 -04:00
Isaac Connor a16d01a931 use less ram loading events 2017-07-13 17:34:45 -04:00
Isaac Connor 63e974192c handle case when no filter is specified 2017-07-13 14:57:27 -04:00
Isaac Connor 37003aebcf Merge branch 'master' into storageareas 2017-07-13 11:07:06 -04:00
Isaac Connor f7a99a1106 make montagereview not load all events and frames at once, so that it doesn't use up all memory 2017-07-13 11:06:08 -04:00
Isaac Connor 0df6ac2895 Merge branch 'master' into storageareas 2017-07-13 11:04:51 -04:00
Isaac Connor 403dca78fb break up a long line 2017-07-13 10:26:24 -04:00
Isaac Connor a5f9c01298 fixes braces and spacing and add some debug lines when the onvif-probe output doesn't match what is expected 2017-07-13 10:26:09 -04:00
Isaac Connor cb88952a77 braces and spacing 2017-07-13 10:25:14 -04:00
Isaac Connor aff7e94725 default to TCP for Method 2017-07-13 10:23:30 -04:00
Isaac Connor 363303efa9 use isset instead of empty to get rid of warning 2017-07-13 10:08:36 -04:00
Isaac Connor f294acde92 add global and for including the state view 2017-07-13 10:07:23 -04:00
Isaac Connor 22e957ba46 clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100% 2017-07-12 12:49:01 -04:00
Isaac Connor 0adc14da4e fix links to Filter and Devices 2017-07-12 11:17:07 -04:00
Isaac Connor c9689aa010 fix braces,spacing,quotes. Change form method to post 2017-07-12 10:58:20 -04:00
Isaac Connor bd681de955 fix braces 2017-07-12 10:57:45 -04:00
Isaac Connor fed4dae7e5 fix width and height in options 2017-07-11 19:13:29 -04:00
Isaac Connor 148d7066f9 Merge branch 'master' into storageareas 2017-07-11 16:15:02 -04:00
Isaac Connor dfd1c2844a remove storageId 2017-07-11 11:28:15 -04:00
Isaac Connor 0eb7bfabf2 put the ajax query back to a post 2017-07-07 12:15:09 -04:00
Isaac Connor 90882edc31 make montage images be display: block; This makes the layout not jump around when a camera feed dies 2017-07-07 10:05:20 -04:00
Isaac Connor 2dd8b5df1f in dark and flat, the buttons use a larger font. The fixed size is not appropriate 2017-07-07 09:59:41 -04:00