Commit Graph

3469 Commits

Author SHA1 Message Date
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 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