Isaac Connor
|
8d1ae6ac49
|
add back in zm_update-1.31.30.sql
|
2018-04-25 09:39:05 -04:00 |
|
Isaac Connor
|
61fe2a734b
|
Add SIGHUP handler so that zmc reloads instead of dies
|
2018-04-25 09:38:18 -04:00 |
Isaac Connor
|
371f5dbc00
|
a zero duration will lead to a non-monotonic non-incrementing pts, so we have to use 1 instead.
|
2018-04-25 09:37:04 -04:00 |
|
Isaac Connor
|
161fc94496
|
remove useless ()
|
2018-04-25 09:33:12 -04:00 |
|
Isaac Connor
|
80f73854c7
|
Include the groupIds hidden when not on general tab
|
2018-04-25 09:33:02 -04:00 |
|
Isaac Connor
|
dfae6661ab
|
use isset when determining if a column exists, otherwise we throw warnings
|
2018-04-25 09:32:40 -04:00 |
|
Isaac Connor
|
5f415873d4
|
Update GroupIds regardless of changes returned from getFormChanges on Monitor save
|
2018-04-25 09:32:15 -04:00 |
|
Isaac Connor
|
2a81877664
|
spacing
|
2018-04-25 09:31:40 -04:00 |
|
Isaac Connor
|
80803a164c
|
in set(), check to see if there is a method and if there is call it to set the value. Implement using GroupIds to set the GroupIds value. If the new value is a scalar, then turn it into an array.
|
2018-04-25 09:27:43 -04:00 |
|
Isaac Connor
|
f04bccceb2
|
handle out of order pts better
|
2018-04-25 04:59:08 -04:00 |
|
Isaac Connor
|
184596ed4b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-25 04:29:35 -04:00 |
Isaac Connor
|
28921a653b
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-24 11:22:48 -07:00 |
Isaac Connor
|
5b4d160710
|
add total bandwidth at bottom and move buttons to top
|
2018-04-24 14:18:41 -04:00 |
|
Isaac Connor
|
20f6985dff
|
implement capturing bandwidth
|
2018-04-24 14:11:27 -04:00 |
Andrew Bauer
|
426b3cf9d4
|
Update startpackpack.sh
|
2018-04-24 12:43:45 -05:00 |
Andy Bauer
|
678503b992
|
fix ftbs on el7
|
2018-04-24 12:16:19 -05:00 |
|
Isaac Connor
|
e4465c0a61
|
add this to git...
|
2018-04-24 12:44:11 -04:00 |
|
Isaac Connor
|
ad376fc267
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-24 09:40:39 -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
|
21413c0fe6
|
comment out corrupting code
|
2018-04-24 11:49:10 -04:00 |
|
Isaac Connor
|
de149c1328
|
spacing
|
2018-04-24 08:48:35 -07:00 |
|
Isaac Connor
|
cc525b2397
|
Output more detailed shared mem size info
|
2018-04-24 11:41:54 -04:00 |
|
Isaac Connor
|
4d95498664
|
Prevent double init of Ffmpeg by using FFMPEGInit()
|
2018-04-24 11:41:31 -04:00 |
|
Isaac Connor
|
93ad25e124
|
rework zmdc.pl to better handle killing processes
|
2018-04-24 11:41:04 -04:00 |
|
Isaac Connor
|
cc77561826
|
fix last_event being uint64
|
2018-04-24 11:40:38 -04:00 |
|
Isaac Connor
|
9fd2c12765
|
DB Logging is a Debug level
|
2018-04-24 08:42:52 -04:00 |
|
Isaac Connor
|
b5ff820c61
|
Test that shm is always valid in zma so that zma dies if zmc does.
|
2018-04-23 16:24:44 -04:00 |
|
Isaac Connor
|
5f7d404a0c
|
spacing & style. Put locking around db accesses in RealoadLinkedMonitors
|
2018-04-23 16:24:15 -04:00 |
|
Isaac Connor
|
e8eaf5fc80
|
quiten build error
|
2018-04-23 14:43:16 -04:00 |
|
Isaac Connor
|
c0d04521d4
|
cleanup. Google Code Style. Move diag_path from a static to a class member so that multiple zones will create different diag files.
|
2018-04-23 14:36:54 -04:00 |
|
Isaac Connor
|
18b015903a
|
cleanup. Google Code Style. Move diag_path from a static to a class member so that multiple zones will create different diag files.
|
2018-04-23 14:36:46 -04:00 |
|
Isaac Connor
|
3ab0755e03
|
google code style plus other cleanups
|
2018-04-23 13:50:10 -04:00 |
|
Isaac Connor
|
a110ae71f5
|
put lines back preventing double open of mysql
|
2018-04-23 13:48:14 -04:00 |
|
Isaac Connor
|
5255898900
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-04-23 11:38:30 -04:00 |
|
Isaac Connor
|
a68ed3a305
|
watchfeed => watch. Fixes #2086
|
2018-04-23 11:38:25 -04:00 |
|
Isaac Connor
|
e3161687ba
|
google code style
|
2018-04-23 11:16:37 -04:00 |
|
Isaac Connor
|
f752b3077a
|
add the # of seconds before kill to the log line
|
2018-04-23 11:16:24 -04:00 |
|
Isaac Connor
|
235fc640be
|
exit_zmu must come before use
|
2018-04-23 11:15:33 -04:00 |
|
Isaac Connor
|
11cacebb3b
|
use a function called exit_zmu instead of exit() to properly close logs and db. The reason is just to reduce connection lost logs in mysql.
|
2018-04-23 11:14:44 -04:00 |
|
Isaac Connor
|
3b9f7b38c5
|
Use int instead of long. Monitor->GetCaptureDelay returns an int, so no reason to use long.
|
2018-04-23 10:40:42 -04:00 |
|
Isaac Connor
|
609244857d
|
google styleguide updates
|
2018-04-23 10:39:32 -04:00 |
|
Isaac Connor
|
9c0600cace
|
Add a HUP Handler
|
2018-04-23 10:29:42 -04:00 |
|
Andrew Bauer
|
0a24f8550a
|
Update path to zmtriggers.sql
ZM_PATH_DATA is not configured as a make macro. Use @PKGDATADIR@ instead.
|
2018-04-23 08:59:31 -05:00 |
|
Andrew Bauer
|
600b66e27c
|
Update zoneminder.spec
|
2018-04-23 07:41:36 -05:00 |
|
Andrew Bauer
|
93263c40b4
|
Remove mention of el6 from readthedocs
|
2018-04-22 07:30:28 -05:00 |
|
Andy Bauer
|
02f8493b39
|
rpm packaging - remove support for sysvinit aka el6
|
2018-04-22 07:25:06 -05:00 |
|
Andy Bauer
|
f13d174ea5
|
remove support for el6 from the buildsystem
|
2018-04-21 21:49:04 -05:00 |
|
Andrew Bauer
|
35dcedb2ad
|
fix ftbs on el7
adds compiler support for PRIu64
|
2018-04-21 20:55:21 -05:00 |
|
Andrew Bauer
|
4f7e0fedad
|
Update startpackpack.sh
|
2018-04-21 18:50:46 -05:00 |
|
Andrew Bauer
|
db293944c3
|
Update startpackpack.sh
|
2018-04-21 18:49:35 -05:00 |