Isaac Connor
|
def9134c02
|
fix version of Crud
|
2021-06-13 18:02:44 -04:00 |
|
Isaac Connor
|
0130df5df9
|
documentation updates: add missing filter substitutions, rough in storage areas documentation
|
2021-06-13 17:54:19 -04:00 |
|
Isaac Connor
|
1fb9c57096
|
Some doc updates to matches changes in UI.
|
2021-06-13 17:50:01 -04:00 |
|
Isaac Connor
|
bc0d35f6d7
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2021-05-11 17:31:32 -04:00 |
|
Isaac Connor
|
bb6c045a18
|
Fix query params when including auth_relay. Fixes #2261
|
2021-05-11 17:26:00 -04:00 |
|
Isaac Connor
|
e87033aff9
|
Fix query params when including auth_relay. Fixes #2992
|
2021-05-11 17:25:04 -04:00 |
|
Isaac Connor
|
0d7fe79b27
|
Fixes #2992. If no definition for a monitor is found, don't modify it.
|
2021-05-11 15:27:36 -04:00 |
|
Isaac Connor
|
ed39ffeeb6
|
Bump version to 1.34.26
|
2021-04-19 18:39:02 -04:00 |
|
Isaac Connor
|
ed58447c4d
|
Only update event StorageId when the new StorageId has a value
|
2021-04-19 17:53:08 -04:00 |
|
Isaac Connor
|
7485735e9c
|
Change url used for authentication to magicBox.cgi?action=getDeviceType
|
2021-04-19 17:31:22 -04:00 |
|
Isaac Connor
|
c0eb790e45
|
Fix colour shift in Crop function due to not multiplying x position by colours
|
2021-04-19 17:29:31 -04:00 |
|
Isaac Connor
|
70313ce152
|
Revert "Add on-mouseup and on-mousedown processing"
This reverts commit e0c0598e13.
|
2021-04-19 17:15:35 -04:00 |
|
Isaac Connor
|
ffb2d937e1
|
Revert "Use on-mousedown and on-mouseup if doing continuous"
This reverts commit d7fa28142f.
|
2021-04-19 17:15:20 -04:00 |
|
Isaac Connor
|
aaa1309377
|
Use > instead of >= to fix duplicated log entries display
|
2021-04-19 17:14:51 -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 |
|
Isaac Connor
|
113e495a7d
|
Fix margin in ptz buttons
|
2021-04-14 14:00:24 -04:00 |
|
Isaac Connor
|
c4c0732eb1
|
Bump version to 1.34.25 fix ppa issue
|
2021-04-14 11:26:28 -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
|
a341d2ef84
|
Don't upload orig tarball by adding -sd
|
2021-04-12 16:02:02 -04:00 |
|
Isaac Connor
|
af025db758
|
Release 1.34.24
|
2021-04-11 17:33:24 -04:00 |
|
Isaac Connor
|
64ab6dff95
|
fix missing )
|
2021-04-10 18:16:59 -04:00 |
|
Isaac Connor
|
cf721ae875
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2021-04-10 18:16:17 -04:00 |
|
Isaac Connor
|
2b1e0df6be
|
FIx auth= not getting updated
|
2021-04-09 18:46:41 -04:00 |
|
Isaac Connor
|
492a352bed
|
Use updated auth_hash when sending alarm requests
|
2021-04-09 18:33:32 -04:00 |
|
Isaac Connor
|
d9dc61265d
|
Fix DisableAlarms. Use signal when capture fails instead of erroneously using TRIGGER_OFF. Add status to DumpSettings so that we can query it with zmu.
|
2021-04-09 17:46:11 -04:00 |
|
Isaac Connor
|
9af97c50aa
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2021-03-31 12:40:35 -04:00 |
|
Isaac Connor
|
c8e9c3dd83
|
Spacing, remove redundant public:
|
2021-03-31 12:40:02 -04:00 |
|
Isaac Connor
|
c3ce9913cf
|
Upgrade cakephp to 2.10.24
|
2021-03-31 12:11:12 -04:00 |
|
Isaac Connor
|
c73393579d
|
Handle event creation failing gracefullyish
|
2021-03-31 12:06:33 -04:00 |
|
Isaac Connor
|
eed6a57800
|
remove unused member sd
|
2021-03-31 12:06:14 -04:00 |
|
Isaac Connor
|
9b4eee02d8
|
Make sure id is initialized to 0 so that we can test if event creation worked
|
2021-03-31 12:06:03 -04:00 |
|
Isaac Connor
|
4fb73505b9
|
backport change to not initialize db in logger which fixes small memleak.
|
2021-03-31 12:05:30 -04:00 |
|
Isaac Connor
|
790cdf879a
|
Add D1-PAL resolution
|
2021-03-31 11:05:17 -04:00 |
|
Isaac Connor
|
4cfe777e93
|
Fix path to Monitor.php
|
2021-02-16 11:16:06 -05:00 |
|
Isaac Connor
|
e6358290b4
|
this=>self
|
2021-02-02 17:30:42 -05:00 |
|
Isaac Connor
|
7dd9188b3b
|
fix eslint
|
2021-01-26 18:09:19 -05:00 |
|
Isaac Connor
|
86fd86a723
|
Switch to FriendsOfCake branch 3.0
|
2021-01-24 12:29:16 -05:00 |
|
Isaac Connor
|
73c1264771
|
bump version for release
|
2021-01-23 17:31:19 -05:00 |
Isaac Connor
|
fd21d47bbb
|
Merge pull request #3113 from pliablepixels/feature-api-daemon-control
new api to control daemon
|
2021-01-23 17:28:30 -05:00 |
|
Isaac Connor
|
d3c84a168a
|
Remove the word All from the mark column on console. I think the UX is pretty universal by now.
|
2021-01-22 15:51:31 -05:00 |
|
Isaac Connor
|
cd9f10695d
|
correct colours in links, navbar buttons. sync colours of monitor filter text inputs to match chosen dropdown. make options sidebar black. Remove redundant layout duplicated from base.
|
2021-01-22 15:51:04 -05:00 |
|
Isaac Connor
|
c7ef587d5d
|
Shirnk colMark because I got rid of the word All in the header. Make the monitor filters inline-block which makes them flow with their label when narrow
|
2021-01-22 15:47:44 -05:00 |
|
Isaac Connor
|
436cd3397b
|
apply a top/bottom margin to buttons of 1px to create a tiny space between buttons and console table. Remove commented out styles
|
2021-01-22 15:46:48 -05:00 |
Terry Sanders
|
c21e02e3c7
|
Fixed issue where mysql_free_result can get called twice when a vaild username with an incorrect password is used.
|
2021-01-22 12:23:38 -05:00 |
|
Isaac Connor
|
f9fc10b394
|
When not capturing don't try to create mmap. Fixes #3112
|
2021-01-22 12:23:13 -05:00 |
|
Isaac Connor
|
01ec57f902
|
remove test for negative pts. Negative pts is ok. Have been running this in master for a while with no negative effects.
|
2021-01-22 12:07:47 -05:00 |
|
Isaac Connor
|
7183a47a3a
|
split Netcat security header into multiple lines for legibility
|
2021-01-15 18:45:13 -05:00 |
|
Isaac Connor
|
b019a759a3
|
ffmpeg options doesn't support loglevel setting. SO remove it from help. Fixes #3109
|
2021-01-15 18:43:49 -05:00 |
|
Isaac Connor
|
c9ac5dff62
|
Use parent printMsg
|
2020-12-21 12:17:02 -05:00 |