Isaac Connor
|
0937bfdf84
|
consoleTableBody needs to be an id in order for dragndrop sorting to work
|
2018-06-06 13:37:12 -04:00 |
|
Isaac Connor
|
2b00f1d166
|
Merge ../ZoneMinder.master into storageareas
|
2018-06-06 13:06:41 -04:00 |
|
Isaac Connor
|
9050ffaf92
|
spacing, remove some debug lines
|
2018-06-06 12:57:35 -04:00 |
|
Isaac Connor
|
cd64619743
|
Fix controlling daemon when the monitor is Local
|
2018-06-06 12:56:33 -04:00 |
|
Isaac Connor
|
3109536dda
|
Alternate fix for video generation under csrf. Now we just turn off output buffering (discarding contents before sending the avi
|
2018-06-06 11:55:51 -04:00 |
|
Isaac Connor
|
2aac2e1e05
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-06-06 11:41:36 -04:00 |
|
Isaac Connor
|
b4e0cb5eab
|
WHen we are storing jpgs we don't generate a snapshot, so handle that
|
2018-06-06 11:41:28 -04:00 |
|
Isaac Connor
|
d961b74084
|
spacing and double to single quotes
|
2018-06-06 11:41:00 -04:00 |
|
Isaac Connor
|
db6bd67f59
|
just fix structure/spacing
|
2018-06-06 11:40:38 -04:00 |
|
Isaac Connor
|
b3c9f508f4
|
Remove debugging line that is causing systemd to fail
|
2018-06-06 11:40:12 -04:00 |
|
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
|
64d5f180c8
|
add Disconnect to Close
|
2018-05-26 13:03:13 -04:00 |
|
Isaac Connor
|
84db1be31d
|
add version test to get rid of deprecation warning for refcounted_frames
|
2018-05-26 13:01:51 -04:00 |
|
Isaac Connor
|
39db8136b3
|
move pre_event_images init to constructor, getting rid of static_undef tests. Initialize timestamps to 0. Clean up some logic in Analyze
|
2018-05-26 13:01:30 -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
|
4454ca0072
|
Merge branch 'storageareas' into zma_to_thread
|
2018-05-20 10:39:14 -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 |