48d5fa00d4
remove libsys-cpuload-perl as a dependency
2018-04-17 21:10:55 -04:00
04cb1f9300
use ZoneMinder::Server::CpuLoad rather than Sys:CpuLoad ( #2080 )
2018-04-17 21:09:41 -04:00
118115f035
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-17 21:08:07 -04:00
ef86746991
Merge ../ZoneMinder.connortechnology
2018-04-17 21:07:48 -04:00
f620781f7e
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-17 21:07:00 -04:00
aaa7844350
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-17 14:18:01 -07:00
10a191ae5b
add event_disk_space to storage to differentiate between real used space versus event used disk space. Use this in the navbar to show actual disk use and also event disk use
2018-04-17 14:14:40 -07:00
17fbb49025
cannot assign categories when type=link
...
RPM packaging calls the freedesktop tool "desktop-file-install", which fails with:
```
error: key "Categories" is present in group "Desktop Entry", but the type is "Link" while this key is only valid for type "Application"
```
@connortechnology This fails the build so I'm removing the categories. Let me know if you've got any other ideas.
2018-04-17 15:50:30 -05:00
3a80c60d2e
rpm spefile changes - account for new files
2018-04-17 15:13:38 -05:00
08447de7ca
bump rpm specfile version
2018-04-17 14:53:55 -05:00
e56cf0b31c
switch to uint64_t for event_id because long long can actually be 128 bit
2018-04-17 13:57:19 -04:00
fd1c69d48a
switch to uint64_t for event_id because long long can actually be 128 bit
2018-04-17 13:51:20 -04:00
c043a157ad
spacing and add Server function
2018-04-17 12:37:30 -04:00
92c8b9038c
fix to group caching and group deleting
2018-04-17 12:36:35 -04:00
196b8c52dc
Apply multiport to event viewing as well
2018-04-17 12:35:59 -04:00
3b0282f6ec
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-17 12:32:10 -04:00
0198ac832d
improve logging around loss of signal and lock around static sql
2018-04-17 12:30:58 -04:00
92cb7dabd5
merge some fixes from other branches
2018-04-17 08:48:59 -07:00
7e7e353a8c
Use a more efficient SQL when finding Orphaned Frames
2018-04-17 08:47:11 -07:00
ef70ff86e9
cleanup zmaControl
2018-04-17 11:36:14 -04:00
34111251d9
Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error.
2018-04-17 07:02:52 -07:00
bdbe334576
Fix travis build status ( #2077 )
...
* Fix travis build status
* Update README.md
2018-04-16 14:52:05 -04:00
dc098b5299
put the status into the function column
2018-04-16 14:51:10 -04:00
98b54f87f2
make thumbnail code more readable
2018-04-15 10:27:08 -04:00
2860e067bc
Fix caching when an array is passed to new
2018-04-15 10:26:57 -04:00
bef7098cb4
Fix Event->Storage()
2018-04-15 10:26:38 -04:00
279e437545
Put back zmupdate and do more output
2018-04-14 23:07:33 -04:00
998d60a4b2
whitespace
2018-04-14 22:26:57 -04:00
dcfd9a60bc
close the session earlier
2018-04-14 22:26:47 -04:00
ce5e484f2a
Work harder to ensure we return a Storage object
2018-04-14 21:50:27 -04:00
05fdc51be0
Fix Sql caching
2018-04-14 15:05:05 -04:00
dd945eed75
remove wip .42
2018-04-14 11:09:35 -04:00
925f640118
Fix Filters using a cached SQL
2018-04-14 11:09:01 -04:00
0b0fbae1c5
Add output of paused image when paused
2018-04-12 18:43:57 -04:00
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
b974b4dcd1
google code style, and when paused, don't die after 10 seconds
2018-04-12 13:14:00 -04:00
2af539e916
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-12 11:39:30 -04:00
8518278476
coverity scan fixes/cleanups
2018-04-12 11:29:35 -04:00
c766c1ddd1
spacing cleanup
2018-04-12 10:28:22 -04:00
71d5984eb0
delete stream after use
2018-04-12 10:26:18 -04:00
ea8a132289
use swscale's new init function
2018-04-12 10:25:06 -04:00
65c69d419b
google code style and remove throws from constructors and destructors
2018-04-12 10:24:47 -04:00
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
3130a21a28
google code style
2018-04-12 10:23:20 -04:00
f17c8475be
clean up order of declarations
2018-04-12 10:23:10 -04:00
3b7992a39b
converity scan fixes, and close the .mp4 after updating the db record.
2018-04-12 10:22:46 -04:00
c466f50255
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-11 13:50:50 -07:00
47b871ed9f
implement MIN_STREAMING_PORT for Multi-server
2018-04-11 13:50:35 -07:00
989ed65f52
spacing and braces, remove a dead unused function
2018-04-11 10:50:28 -04:00
22f86da372
Have to use the .sock file instead of w.lock
2018-04-11 10:38:13 -04:00
Isaac Connor
Andrew Bauer
Isaac Connor
Andy Bauer
spanner3003