Peter Keresztes Schmidt
fd79f3d760
CI/Xenial: Call apt-get update before installing packages
...
Fixes "E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?" errors
2021-04-19 00:58:43 +02:00
Isaac Connor
8d883ee7bf
This breaks
2021-04-18 13:58:26 -04:00
Isaac Connor
df26c25ac9
Add continuous mouseup/down functionailty for Zoom,White,Iris,Focus
2021-04-17 16:32:06 -04:00
Isaac Connor
07b3a7aa57
fix memleak caused by not deleting the packetlock when we can't get the lock
2021-04-17 12:50:26 -04:00
Isaac Connor
5b9745b652
fix memleak due to not delete audio_fifo and video_fifo
2021-04-17 12:50:26 -04:00
Isaac Connor
d598edc7df
Implement duplicate RTSPSTreamName check
2021-04-17 12:50:26 -04:00
Isaac Connor
03767236d9
Clean up constructor/Setup functions. Add copy constructor. Change Load to return a std::list<Zone>
2021-04-17 12:50:26 -04:00
Isaac Connor
5ab9a48599
Don't grab lock in increment_it if we are deleting cuz we will hang
2021-04-17 12:50:26 -04:00
Isaac Connor
96deedfd53
add explicit to LockedPacket constructor
2021-04-17 12:50:26 -04:00
Isaac Connor
5ace2ca082
Fix loading Importance in sql. Change zones to a std::list<Zone>
2021-04-17 12:50:26 -04:00
Isaac Connor
7970bfd3d8
Implement a 10 second timeout in ffmpeg_camera. read_frame can block forever otherwise
2021-04-17 12:50:26 -04:00
Isaac Connor
df36623792
Put a \0 at the beginning of the buffer to help when printing out the contents
2021-04-17 12:50:26 -04:00
Isaac Connor
a0d08b8277
More debug in read_into
2021-04-17 12:50:26 -04:00
Isaac Connor
1d034b16dd
Must join the previous thread before starting a new one or we crash
2021-04-17 12:50:26 -04:00
Isaac Connor
c479c6d68f
Must disconnect on error/reload to avoid memleak. Remove waiting 5 second on failure/reload.
2021-04-17 12:50:26 -04:00
Isaac Connor
968bdc5abe
Correct nal count reporting
2021-04-17 12:50:26 -04:00
Isaac Connor
a067f35491
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-04-17 11:55:59 -04:00
Peter Keresztes Schmidt
76e126f363
CI/Cirrus: Separate make install into own step
...
This way we keep the output shown in the compile section shorter and more readable.
Remove also the filtering by grep since FreeBSD does not use bash as default shell breaking PIPESTATUS.
2021-04-17 12:50:56 +02:00
root
23f1b68e8a
Merge branch 'continuous' into cont_mast
2021-04-16 11:28:10 -04:00
root
f3ea08c4a1
Merge branch 'continuous' into cont_mast
2021-04-16 11:27:48 -04:00
Isaac Connor
3d1b0e2724
Apply onmouseup/down to other ptz buttons
2021-04-16 11:27:08 -04:00
Isaac Connor
c880618d5f
If no button is associated with the event, assume it is a mouseup
2021-04-16 10:24:48 -04:00
Isaac Connor
c9f83de5f4
Merge branch 'release-1.34' into continuous
2021-04-16 10:16:36 -04:00
Isaac Connor
e0c0598e13
Add on-mouseup and on-mousedown processing
2021-04-16 10:15:57 -04:00
Isaac Connor
d7fa28142f
Use on-mousedown and on-mouseup if doing continuous
2021-04-16 10:15:07 -04:00
root
200dda11a2
Merge branch 'continuous' into cont_mast
2021-04-16 10:07:10 -04:00
Isaac Connor
c9c4224dd2
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-04-14 17:19:07 -04:00
Isaac Connor
7489c3850d
Store last command for continuous moves so that moveStop can send the correct stop command
2021-04-14 17:19:01 -04:00
Isaac Connor
113e495a7d
Fix margin in ptz buttons
2021-04-14 14:00:24 -04:00
Isaac Connor
24cfc8583f
Include auth relay in getNavBar request. COOKIES will expire so we need this.
2021-04-14 13:00:16 -04:00
Isaac Connor
bb2b832c58
Allow overriding the version for packpack
2021-04-14 13:00:16 -04:00
Isaac Connor
9b4fcf4e92
Only complain about finding an iterator if we havn't found a new keyframe
2021-04-14 13:00:16 -04:00
Isaac Connor
bd65420c07
Specify columns when inserting admin user. Add Snapshots column
2021-04-14 13:00:16 -04:00
Isaac Connor
c4c0732eb1
Bump version to 1.34.25 fix ppa issue
2021-04-14 11:26:28 -04:00
Isaac Connor
cfefe3fc1a
Merge pull request #3214 from Carbenium/type-limits
...
Fix warnings reported by Wtype-limits and re-enable the warning on GCC
2021-04-13 10:27:56 -04:00
Isaac Connor
d48b03f40f
Update CRUD to 3.2.0. Allow overriding of VERSION for deb
2021-04-12 17:15:14 -04:00
Isaac Connor
95249d5eb4
Merge branch 'release-1.34'
2021-04-12 16:32:57 -04:00
Isaac Connor
a341d2ef84
Don't upload orig tarball by adding -sd
2021-04-12 16:02:02 -04:00
Isaac Connor
3921231cd5
Use some styles for user view to split it into two columns
2021-04-12 16:00:11 -04:00
Isaac Connor
285c06ca23
Bump version to 1.35.26
2021-04-12 15:59:31 -04:00
Isaac Connor
3335976cba
implement remote api Trigger support.
2021-04-12 15:59:31 -04:00
Isaac Connor
007dce45fb
Add disable alarms as an alarm command
2021-04-12 15:59:31 -04:00
Isaac Connor
29e91f48e6
Use Snapshots permission instead of Events for snapshots
2021-04-12 15:59:31 -04:00
Isaac Connor
b125b5d370
Allow users with snapshot::view to view the snapshot image of an event
2021-04-12 15:59:31 -04:00
Isaac Connor
04cc8ed34f
Split user info into two columns
2021-04-12 15:59:31 -04:00
Isaac Connor
f3773a89ad
Add Snpahot permission
2021-04-12 15:59:31 -04:00
Isaac Connor
f59a72a638
Use Snapshots permission instead of Events permission for Snapshots
2021-04-12 15:59:31 -04:00
Isaac Connor
1b50314f9e
Add DisableAlarms function
2021-04-12 15:59:31 -04:00
Isaac Connor
ef10ecc06a
Allow users to start/stop alarms without monitor view permission. When forcing an alarm, disable recording first so that the alarm is distinct. This is necessary due to permissions.
2021-04-12 15:59:31 -04:00
Isaac Connor
e373e871da
Fix memleak caused by loadMonitor that is already loaded
2021-04-12 15:59:31 -04:00
