Commit Graph

629 Commits

Author SHA1 Message Date
Isaac Connor 54b8cce5e4 fix tabs to spaces 2017-09-11 16:57:51 -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 087b7abb94 Merge branch 'master' into fix_event_viewing 2017-08-14 10:41:04 -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 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 1cfd657168 put back the preg_replace that strips usernames and passwords from monitor source 2017-07-26 10:22:57 -04: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
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 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 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 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 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
Andrew Bauer 4128f5861f Merge pull request #1940 from connortechnology/montagereview_rework
Montagereview rework
2017-07-07 08:34:01 -05:00
Isaac Connor c372787882 fix typo 2017-07-06 10:50:56 -04:00
Isaac Connor 6b2e23e1a5 Merge branch 'montagereview_rework' of ../ZoneMinder.master into montagereview_rework 2017-07-05 14:27:46 -04:00
Isaac Connor d61dfcd410 scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc. 2017-07-05 14:23:01 -04:00
Isaac Connor 720748a731 code cleanup mostly. scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc. 2017-07-05 14:22:44 -04:00
Isaac Connor 0b4a2b41cc fix scale on initial montage load. Replace calls to functions.php/getStreamSrc with object based call 2017-07-05 14:20:50 -04:00
Isaac Connor 8c19b129d7 more wip 2017-07-04 12:33:01 -04:00
Isaac Connor f87a89a5ce more fixes 2017-07-04 11:51:23 -04:00
Isaac Connor 892f3a06c7 wip 2017-06-23 08:32:09 -04:00
Isaac Connor 5e75588bfb Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause 2017-06-21 17:14:02 -04:00
Isaac Connor 119f8fc86c Fix version checks to fix build on yaketty 2017-06-15 13:02:54 -04:00
Isaac Connor e2139920a8 change some more quotes 2017-06-14 15:09:21 -04:00
Andrew Bauer bf04a68085 Merge pull request #1752 from connortechnology/filter_by_runstate
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
Andrew Bauer c11a219b9f Merge pull request #1896 from connortechnology/dragndrop_monitor_sorting
Dragndrop monitor sorting
2017-06-12 20:49:51 -05:00
Andrew Bauer bacf65ae9a Migrate values from Options -> Paths to zm.conf (#1908)
* initial commit to migrate contents of Options->Paths to zm.conf

* remove paths items from configdata.pm

* remove paths tab from options

* update deb packaging scripts with new cmake vars

* remove extraneous file

* save custom paths variables to config file before dB is freshened

* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
Isaac Connor c6a1518548 remark out call to set progressBarWidth, but that should never change and it uses a var that isn't global barWidth 2017-06-08 14:03:07 -04:00
Isaac Connor cac5819331 update call to getStreamSrc to use ->getStreamSrc. Also remove extraneous canView(Event) 2017-06-08 14:02:27 -04:00
Isaac Connor b4bdc1fd6b Merge branch 'master' into dragndrop_monitor_sorting 2017-06-06 20:39:58 -04:00
Isaac Connor 01717a5c14 Merge branch 'master' into filter_by_runstate 2017-06-06 20:34:47 -04:00
Isaac Connor a9183a1599 more quotes 2017-06-05 09:40:19 -04:00
Isaac Connor a9268d10e3 fix the use of ZM_OPT constants in javascript. Instead, check for existence of the element in the form. 2017-06-02 12:21:12 -04:00
Isaac Connor 555a667035 fix filter button 2017-06-02 12:12:59 -04:00
Isaac Connor 352ea6b6ae spacing 2017-06-02 12:12:41 -04:00
Isaac Connor e47adcf6cc the tfoot has to come after the tbody 2017-06-01 09:36:00 -04:00
Isaac Connor 73ca07792b double quotes to single quotes 2017-05-31 22:11:54 -04:00
Isaac Connor 5c67c87147 remove deprecated cellspacing attr on table 2017-05-31 22:08:44 -04:00
Isaac Connor a940fe429c deprecate the use of the center tag, and only put in the development h3 if it has contents 2017-05-31 22:08:05 -04:00
Isaac Connor 1df147e183 adjust spacing 2017-05-31 22:01:35 -04:00
Isaac Connor 17c8224733 begin to ahndle imageData not being populated 2017-05-31 20:55:10 -04:00
Isaac Connor 2b9134512f remove leftover 2017-05-31 20:45:21 -04:00
Isaac Connor 8596891e4d fix double to single quote mistakes 2017-05-31 12:55:27 -04:00
Isaac Connor 83d6f415b3 cleanup whitespace 2017-05-30 14:07:37 -04:00