Isaac Connor
|
c6635b8096
|
make swscale more robust by moving bits that can fail into an init function instead of the constructor
|
2018-04-12 10:24:10 -04:00 |
|
Isaac Connor
|
3130a21a28
|
google code style
|
2018-04-12 10:23:20 -04:00 |
|
Isaac Connor
|
f17c8475be
|
clean up order of declarations
|
2018-04-12 10:23:10 -04:00 |
|
Isaac Connor
|
3b7992a39b
|
converity scan fixes, and close the .mp4 after updating the db record.
|
2018-04-12 10:22:46 -04:00 |
|
Isaac Connor
|
989ed65f52
|
spacing and braces, remove a dead unused function
|
2018-04-11 10:50:28 -04:00 |
|
Isaac Connor
|
22f86da372
|
Have to use the .sock file instead of w.lock
|
2018-04-11 10:38:13 -04:00 |
Isaac
|
06fed41d5a
|
whitespace
|
2018-04-06 23:21:47 +02:00 |
|
Isaac
|
da9d4c2a5c
|
whitespace, don't pre-allocate mFormatContext
|
2018-04-06 23:21:40 +02:00 |
|
Isaac
|
64cfb39043
|
do an initial fps report early on
|
2018-04-06 23:21:22 +02:00 |
|
Isaac
|
d8171750cd
|
only call avformat_close_input if mformatContext still has a value. On falure it should have been freed and NULL'd
|
2018-04-06 23:02:15 +02:00 |
Isaac Connor
|
ae3ccf6ffe
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-06 12:32:07 -07:00 |
|
Isaac Connor
|
fdd8be5daf
|
brackets and spaces
|
2018-04-06 14:52:56 -04:00 |
|
Isaac Connor
|
74fb8db5e2
|
make configvals global
|
2018-04-06 14:52:39 -04:00 |
|
Isaac Connor
|
530ac15344
|
remove csrf_startup
|
2018-04-06 14:46:33 -04:00 |
|
Isaac Connor
|
7076ff1b1b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-06 14:42:30 -04:00 |
|
Isaac Connor
|
7f850890cb
|
whitespace
|
2018-04-06 14:42:20 -04:00 |
|
Isaac Connor
|
513708b11c
|
don't need to define the config, it will have already been done. Include auth.php instead of functions.php as the code has been moved
|
2018-04-06 14:42:10 -04:00 |
|
Isaac Connor
|
a789fc88aa
|
implement getAuthHash
|
2018-04-06 14:41:39 -04:00 |
|
Isaac Connor
|
2c02a479d6
|
remove duplicated config code from bootstrap and just include config.php
|
2018-04-06 14:38:32 -04:00 |
|
Isaac Connor
|
53ce8c008a
|
move auth functions into it's own file
|
2018-04-06 14:36:23 -04:00 |
|
Isaac Connor
|
7b23ef80a4
|
blah
|
2018-04-06 14:31:11 -04:00 |
|
Isaac
|
6efffe62b8
|
add c++-11 support for older CMAKE
|
2018-04-06 19:48:17 +02:00 |
|
Isaac
|
668c515b21
|
remove unused code that doesn't compile
|
2018-04-06 19:48:00 +02:00 |
Isaac Connor
|
66bb807b3e
|
Merge pull request #95 from xenoxaos/gapless_playback_fix
changing the querySep in Event.php to allow gapless playback
|
2018-04-06 11:43:29 -04:00 |
|
Isaac Connor
|
2c85e5e4c6
|
remove unneccessary type tags.
|
2018-04-06 11:43:19 -04:00 |
Mike Brown
|
c4a00e0657
|
changing the querySep in Event.php to allow gapless playback
|
2018-04-05 20:42:15 -05:00 |
|
Isaac Connor
|
7a12589a83
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-05 13:41:47 -07:00 |
|
Isaac Connor
|
f1a8d5f1ff
|
start of work on .41. Adding foreign keysy
|
2018-04-05 13:41:24 -07:00 |
|
Isaac Connor
|
9ecbba0947
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-05 14:22:23 -04:00 |
Isaac Connor
|
632ab143fe
|
error when can't set session in cake
|
2018-04-05 14:21:56 -04:00 |
|
Isaac Connor
|
140f11fd58
|
fix clearing groups
|
2018-04-05 13:10:25 -04:00 |
|
Isaac Connor
|
2a000cb5f8
|
fix clearing groups
|
2018-04-05 13:09:14 -04:00 |
|
Isaac Connor
|
4adebfce1d
|
Add Monitor Status breakdown to console
|
2018-04-05 09:53:53 -07:00 |
|
Isaac Connor
|
87f5204c46
|
rename process_configfile to remove namesspace colision
|
2018-04-05 11:44:21 -04:00 |
|
Isaac Connor
|
fb392b2765
|
put back process_configfile
|
2018-04-05 11:33:24 -04:00 |
|
Isaac Connor
|
b9da309904
|
remove spaces
|
2018-04-05 11:33:09 -04:00 |
|
Isaac Connor
|
ec5f955d26
|
more db locking
|
2018-04-05 11:30:14 -04:00 |
|
Isaac Connor
|
fc38fdcc56
|
remove extra spaces
|
2018-04-05 11:30:01 -04:00 |
|
Isaac Connor
|
6faf9b5c35
|
fix including auth on remote restart
|
2018-04-05 11:24:47 -04:00 |
|
Isaac Connor
|
8fee795fb4
|
don't duplicate declaration of process_configfile, because we include our version from ZM
|
2018-04-05 11:24:17 -04:00 |
|
Isaac Connor
|
e28ecf8e28
|
add libfile-slurp-perl as a dependency
|
2018-04-05 10:00:14 -04:00 |
|
Isaac Connor
|
70c7eaef0e
|
fix using wrong array. Should use StorageById
|
2018-04-04 20:29:01 -04:00 |
|
Isaac Connor
|
2f6adff1b2
|
handle when storage area is gone
|
2018-04-04 20:27:21 -04:00 |
|
Isaac Connor
|
1033755dc8
|
add missing {
|
2018-04-04 16:46:38 -04:00 |
|
Isaac Connor
|
6ebedff2e1
|
If using MIN_STREAMING_PORT then use ['SERVER_NAME'] instead of HTTP_HOST because HTTP_HOST may contain a custom port
|
2018-04-04 16:45:25 -04:00 |
|
Isaac Connor
|
489f11bd07
|
empty contents of zone.css because it is no different from base.
|
2018-04-03 21:18:29 -04:00 |
|
Isaac Connor
|
a493fd4dd7
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-03 17:41:49 -04:00 |
|
Isaac Connor
|
9fde052d39
|
merge
|
2018-04-03 14:41:32 -07:00 |
|
Isaac Connor
|
053322c2c3
|
add NextFrameId to Frames
|
2018-04-03 12:32:14 -07:00 |
|
Isaac Connor
|
66920eb5b8
|
fix status colour when not capturing
|
2018-04-03 12:31:54 -07:00 |