Commit Graph

11618 Commits

Author SHA1 Message Date
Isaac Connor 798d046d81 Remove some debugging lines 2018-06-06 11:39:41 -04:00
Andrew Bauer c30992be3f fixes #2105
A more simplified approach to fixing #2105, compared to previous attempts.
2018-06-06 08:18:33 -05:00
Andrew Bauer a25f5f1b12
don't call Debug after select
This line was causing havoc when starting up zoneminder.
2018-06-05 09:43:40 -05:00
Isaac Connor 794c6b641c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-06-04 14:59:56 -04:00
Isaac Connor 627ee8aeb3 close syslog in order to not leak ram 2018-06-04 14:59:42 -04:00
Andrew Bauer b071aaad7b
Merge pull request #2111 from connortechnology/recursive_mutex
Implement a RecursiveMutex class which is an explicit Recursive Mutex…
2018-06-02 17:30:21 -05:00
Isaac Connor 5d772f16f6 fix closing td 2018-06-01 16:18:07 -04:00
Isaac Connor 173121b645 Merge branch 'recursive_mutex' into storageareas 2018-06-01 11:30:08 -04:00
Isaac Connor db422dc3ce Merge ../ZoneMinder.connortechnology 2018-06-01 11:29:20 -04:00
Isaac Connor 87d9fc447e google code style 2018-06-01 11:27:53 -04:00
Isaac Connor 316dbb5eb8 Implement a RecursiveMutex class which is an explicit Recursive Mutex. Change the db mutex to a recursive Mutex 2018-06-01 11:27:35 -04:00
Andrew Bauer 8559dce350 rpm readme - mention changes to apache config file 2018-06-01 08:51:53 -05:00
Andrew Bauer 00ace16b61
bump zoneminder rpm specfile 2018-05-31 13:54:33 -05:00
Isaac Connor 405b1f92ed add a .fail to log the errors given when a navbar ajax call fails 2018-05-31 10:25:53 -04:00
Isaac Connor 21e26c8c14 Spacing and parenthesis and some debug lines 2018-05-31 10:25:16 -04:00
Isaac Connor 2eb3c8ef6d use a stored prepared sth instead of re-preparing it 2018-05-31 10:24:54 -04:00
Isaac Connor 8792190f75 use 0 for return code when exiting cleanly 2018-05-25 14:21:41 -04:00
Isaac Connor dd8e4da9ba google code style 2018-05-25 14:21:06 -04:00
Isaac Connor 52de6ef7ea delete authenticator when destructing. reduce memleak 2018-05-25 14:20:54 -04:00
Isaac Connor e831c1563d pretty the code structure 2018-05-24 10:59:26 -04:00
Isaac Connor b7129578c1 fix case where pre_event_count=0 and analysis_fps is set because there are no pre_event_buffers 2018-05-24 10:59:15 -04:00
Isaac Connor c98339e152 Google code style, list monitor in debug line listing LastWriteTime 2018-05-24 10:49:20 -04:00
Isaac Connor af3ce3660f Only unlink if file exists, removing warning. Always return a Storage object in Monitor->Storage() fixes Monitor Delete. 2018-05-24 09:54:45 -04:00
Isaac Connor 13e11a1e7f Fix potention div vy zero 2018-05-22 15:52:12 -04:00
Isaac Connor dc5ccd04ef Update thumbnail with high scoring image. 2018-05-22 11:31:03 -04:00
Isaac Connor be424f46f0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-05-18 12:07:22 -04:00
Isaac 77b144a13e must specify type=button or else some browsers treat it as a submit button 2018-05-18 16:07:58 +02:00
Isaac 337db8bb18 Include Content-Length so we get a download progress 2018-05-18 15:52:30 +02:00
Isaac 7ad6b01310 double to single quotes and spacing 2018-05-18 15:52:12 +02:00
Isaac d8a62e0ede Show total size for non-montage review downloads as well 2018-05-18 15:51:42 +02:00
Isaac cfbbc238c9 remove extra spaces and parenthesis 2018-05-18 15:51:12 +02:00
Isaac cc27ce7ee9 Turn off csrf for archive downloading, which prevents out of memeory 2018-05-18 15:50:45 +02:00
Isaac Connor 2a8ea98249 remove blank space at end of line 2018-05-18 09:12:10 -04: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 25703fb2d4 Speed up log query response by generating the options out of the log rows instead of hitting the db again. 2018-05-18 09:05:25 -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 af63619ce6 Fix Messages=>Messaged 2018-05-15 21:56:17 +02:00
Isaac Connor 5df2fbfff2 fix logic to handle no pre_event frames 2018-05-15 15:53:25 -04:00
Isaac Connor 49d75ce039 handle Width and Height not being in ->{} and returnining defaults. Include Path in Source 2018-05-15 10:45:47 -07:00
Isaac Connor f16e1953d9 Make Source filter apply to Path as well 2018-05-15 10:45:10 -07:00
Isaac Connor 4ca77fdd69 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-05-15 12:44:36 -04:00
Isaac Connor 98b2a3f6f0 improve structure/spacing 2018-05-15 12:44:24 -04:00
Isaac Connor 88b66fe5dd Merge ../ZoneMinder.master into storageareas 2018-05-14 14:07:51 -04:00
Isaac Connor 038c5f4e1a log the log line not the uninitialized sql 2018-05-14 13:57:26 -04:00
Isaac Connor 63e6cb1d62 remove parenthesis that confuse older php 2018-05-14 13:56:55 -04:00
Andrew Bauer 485f292943 fix php 5.4 compatibility - remove calls to empty 2018-05-14 12:32:48 -05:00