Isaac Connor
|
8c92fa5dc3
|
Fix version of Crud
|
2021-09-09 13:26:59 -04:00 |
Andrew Bauer
|
a423f2620e
|
Allow cakephp cache engine to be set during build
|
2021-06-18 15:29:54 -05:00 |
|
Isaac Connor
|
9f6eec792c
|
Fix Crud fork
|
2021-06-08 13:01:09 -04:00 |
|
Andrew Bauer
|
cb0a421d25
|
use latest rtspserver commit
|
2021-05-21 15:10:42 -05:00 |
|
Isaac Connor
|
b1ac0e61a9
|
put back upstream version 3.2.0 of Crud
|
2021-05-09 18:18:03 -04:00 |
|
Isaac Connor
|
2cf6ad8089
|
Switch ZMPacket * to a shared_ptr<ZMPacket>. This is so that in LockedPacket we can unlock and then notify and be confident that packet_ won't have been deleted. Change ZMPacket->timestamp to be a timeval instead of timeval *. This might not have been necessary but I like it. No longer cuse the ZMPacket object to wrap the shared image buffers and timestamps. Use a vector for image_buffers.
|
2021-05-08 21:14:20 -04:00 |
|
Isaac Connor
|
86fd86a723
|
Switch to FriendsOfCake branch 3.0
|
2021-01-24 12:29:16 -05:00 |
|
Isaac Connor
|
5bf5d58ac1
|
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
|
2020-11-16 11:32:50 -05:00 |
|
Isaac Connor
|
c4c4c5bcbf
|
fix Crud submodule version
|
2020-05-15 11:34:34 -04:00 |
Isaac Connor
|
94b29c6c7a
|
replace inline javascript in timeline zoom
|
2020-05-15 10:44:48 -04:00 |
|
Isaac Connor
|
3abf263e7a
|
fixup half-merged changes to filter to view in montagereview
|
2019-04-08 16:57:41 -04:00 |
|
Isaac Connor
|
780f4f9b9a
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-04-06 09:27:44 -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
|
be424f46f0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-18 12:07:22 -04:00 |
|
Isaac Connor
|
8276386a44
|
We always return an associative array now
|
2018-05-18 09:06:17 -04:00 |
Isaac
|
93dd943fec
|
Fix some spacing
|
2018-05-16 20:17:57 +02:00 |
|
Isaac Connor
|
c61deb422f
|
update to -zm versions
|
2018-05-10 14:38:49 -04:00 |
Isaac
|
84c94efaa8
|
Move redunddant close methods into parent. Use Fatal instead of croak. Croak is not defined so it causes an infinite loop
|
2018-05-04 02:26:25 +02:00 |
Isaac Connor
|
a4da624f4c
|
break out of loops when zm-terminate is set
|
2018-04-27 13:20:38 -07:00 |
|
Isaac Connor
|
bbb10fa4b4
|
Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34
|
2018-04-24 12:40:15 -04:00 |
|
Isaac Connor
|
578df0c5cc
|
update submodules
|
2018-04-20 16:18:58 -04:00 |
|
Isaac Connor
|
a868bb70ed
|
Better debug when fail to attach images
|
2018-04-20 15:56:14 -04:00 |
Isaac Connor
|
fb44619a66
|
output the initial table head
|
2018-04-19 14:33:05 -04:00 |
|
Isaac Connor
|
2aa689a14a
|
Use a class instead of an id for consoleTable
|
2018-04-19 14:20:02 -04:00 |
Andrew Bauer
|
a5cbc8abd1
|
buildsystem - update git submodules
|
2018-04-18 19:21:14 -05:00 |
|
Andrew Bauer
|
f6540aeba1
|
point git submodules to our own forks
|
2018-04-18 14:00:00 -05:00 |
|
Isaac Connor
|
0b0fbae1c5
|
Add output of paused image when paused
|
2018-04-12 18:43:57 -04:00 |
|
Isaac Connor
|
f9f78e9aa3
|
Convert event_id to a 64bit unsigned int
|
2018-04-12 13:40:11 -07:00 |
|
Isaac Connor
|
989ed65f52
|
spacing and braces, remove a dead unused function
|
2018-04-11 10:50:28 -04:00 |
|
Isaac Connor
|
f1a8d5f1ff
|
start of work on .41. Adding foreign keysy
|
2018-04-05 13:41:24 -07: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
|
7ec71868a6
|
Switch CakePHP-Enum-Behavior to my fixed version
|
2018-01-29 21:25:40 -05:00 |
|
Isaac Connor
|
456f29fcba
|
Rename column Id OF Monitor_Statuses to simplify JOINS.
|
2018-01-26 13:39:37 -05:00 |
|
Isaac Connor
|
348fdafa4e
|
Update submofule
|
2018-01-26 11:34:45 -05:00 |
|
Isaac Connor
|
1b1b93f811
|
use CakePHP-Enum-Behavior to add support for ENUMs to the Monitor model. This should fix #48
|
2018-01-01 14:43:02 -05:00 |
Andy Bauer
|
2dda2d9e1e
|
remove unneeded, empty files
|
2016-12-26 09:49:14 -06:00 |
|
Andrew Bauer
|
68adcc9e67
|
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
|
2015-08-18 14:07:38 -05:00 |
Isaac Connor
|
04366e752a
|
add Servers to options, a server editing popup and a server selection to monitors
|
2015-07-09 11:41:46 -04:00 |
|
Andrew Bauer
|
d915d859ed
|
Convert Crud to submodule
|
2015-06-11 11:56:39 -05:00 |
Ubuntu
|
dd9603f70f
|
Merged Angular UI branch API to master
|
2015-06-11 02:58:58 +00:00 |
Kyle Johnson
|
f1f3de6d7d
|
Moved the api to underneath the web directory
|
2014-04-29 20:41:04 +00:00 |