Isaac Connor
d0adaeaabe
rework user saving action to use User object. Implement a duplicate username check. Deprecate php < 5.3 due to lack of bcrypt password hashing functions. Hence deprecate the use of mysql PASSWORD()
2021-03-21 09:18:12 -04:00
Isaac Connor
68f9c7c9e6
introduce a _last_error member to the object for reporting errors saving.
2021-03-20 19:27:53 -04:00
Isaac Connor
70e61740d3
Fix eslint
2021-03-18 16:48:26 -04:00
Isaac Connor
e39c293a77
fix eslint
2021-03-18 16:48:26 -04:00
Isaac Connor
4cb38a119e
Fix saving Filters and other objects. Apparently comparing 0 to NOW() doesn't work.
2021-03-18 14:09:15 -04:00
Isaac Connor
1b876f24f9
Must have Id as well in order to know which monitor to control
2021-03-17 17:15:04 -04:00
Isaac Connor
28700fd56b
Implement saving DecodingEnabled from function view
2021-03-16 12:09:14 -04:00
Isaac Connor
feec631ca5
Only save updated DiskSpace if event is finished
2021-03-15 15:02:43 -04:00
Isaac Connor
2a6621959c
We CANNOT specify nextId for the next mid to use. If we do that then we can overwrite existing db entries
2021-03-13 12:47:05 -05:00
Isaac Connor
478d11e6f2
Update the auth in streamCmdParams on every request. It wasn't picking up updates
2021-03-13 12:12:20 -05:00
Isaac Connor
0bb4afa0bc
The test for xmlhttprequest is bogus. chrome jquery JSON requests don't send it. Replace with a test for instead. So now only redirect on proper html views.
2021-03-13 12:11:55 -05:00
Isaac Connor
5eae1c0a9f
spacing, add code comment
2021-03-13 12:10:55 -05:00
Isaac Connor
587cebecbb
navbar requests don't pass an auth token so we never send an auth update. Just always send it.
2021-03-13 12:10:35 -05:00
Isaac Connor
9d33688f89
Honour various permissions on what's in the navbar.
2021-03-12 11:40:46 -05:00
Isaac Connor
e5f9654e50
honour Groups:View permission in monitor filters
2021-03-12 11:33:16 -05:00
Isaac Connor
62cfdd8d61
fix searching in snapshots
2021-03-12 10:52:23 -05:00
Isaac Connor
b50916e02a
Allow unknown columns in filters. Allow specifying the table name in FilterTerm.
2021-03-12 10:52:10 -05:00
Isaac Connor
9504d8be61
event_ids => snapshot_ids
2021-03-12 10:40:23 -05:00
Isaac Connor
1ae1a89abf
Only allow show zones for System::View permission
2021-03-12 10:29:13 -05:00
Isaac Connor
ba00bee4b8
fix header alignment
2021-03-12 10:07:33 -05:00
Isaac Connor
70073ea017
Add thumbnails to snapshots list
2021-03-12 10:07:17 -05:00
Isaac Connor
11c2318a05
Rough in the ui for Snapshots
2021-03-12 09:28:05 -05:00
Isaac Connor
6682ec7da5
Add Snapshots and Snapshot_Events Tables. Add HomeView to Users.
2021-03-12 09:26:23 -05:00
Isaac Connor
de0bbf7e04
Instead of fatal error triggering, turn off file logging and log the error elsewhere
2021-03-03 14:31:43 -05:00
Isaac Connor
8aebcf7337
Fix ['mid'] not being defined. Use instead
2021-03-03 12:51:27 -05:00
Isaac Connor
ce4e133c94
Add loading SecondPath in monitor
2021-03-03 09:56:33 -05:00
Isaac Connor
95fe689d58
WIP, rabbit hole too deep
2021-03-03 09:55:57 -05:00
Isaac Connor
849d71efff
Add filtering to groups
2021-03-02 15:10:15 -05:00
Isaac Connor
7d02c68938
silence warning when cookies not used
2021-03-02 15:10:02 -05:00
Isaac Connor
bb747bfc6d
Add RTSPStreamName fields
2021-03-01 16:46:48 -05:00
Isaac Connor
445d815071
fix eslint
2021-02-25 20:35:45 -05:00
Isaac Connor
550d302316
Fix Crud version back to origin
2021-02-25 14:18:51 -05:00
Isaac Connor
d106c2fcc3
Add 4MP and 6MP resoolutions
2021-02-24 15:03:11 -05:00
Isaac Connor
0d2febc958
Make monitor column open the event instead of monitor edit
2021-02-24 12:38:12 -05:00
Andrew Bauer
c8be0d58d5
eslint - fix whitespace
2021-02-22 19:02:24 -06:00
Isaac Connor
82c4a1a417
put third refresh button back for now
2021-02-22 11:57:27 -05:00
Isaac Connor
3a8e2ff869
Hide duplicated refresh button
2021-02-22 11:25:00 -05:00
Isaac Connor
9aad09a735
Refresh bootstrap table if the ajax fails.
2021-02-22 11:24:30 -05:00
Isaac Connor
9fec32fdc5
We now support audio when doing video encoding
2021-02-22 09:55:40 -05:00
Isaac Connor
5d826fd558
Don't try to addup/update DIskSpace used by incomplete events.
2021-02-20 17:11:20 -05:00
Isaac Connor
4d739f35ef
Fix parseTree when using iS or ISNOT. Add strtoupper comparisons for NULL values.
2021-02-20 17:07:07 -05:00
Isaac Connor
0fc4b00ac1
Allow null as well as NULL infilter values
2021-02-20 12:32:38 -05:00
Andrew Bauer
3fb1054093
bstable export requires tableExport plugin
2021-02-18 20:22:19 -06:00
Isaac Connor
c99f43205d
add parenthesis for safety
2021-02-18 13:47:27 -05:00
Isaac Connor
ba6797a143
make definitionPanel have height to fix jumping around as scroll bar appears/disappears
2021-02-18 10:25:05 -05:00
Isaac Connor
f0d8a654f8
Remove debug, use fewer lines
2021-02-17 13:11:55 -05:00
Isaac Connor
c608af4df7
Correct timeline when using Weekday
2021-02-17 13:11:02 -05:00
Isaac Connor
b58ecca040
Allow RTSPServer to be unselected
2021-02-17 12:07:55 -05:00
Isaac Connor
aa94795b96
When auth is not turned on, show an error instead of login fields.
2021-02-16 16:09:23 -05:00
Isaac Connor
317274248b
Allow mid= and dupId= in monitor view to allow mid reuse. Alphabetically sort Monitors in LinkedMonitors by name
2021-02-16 14:16:59 -05:00
Isaac Connor
71183a6002
fix case of vidWidth. Fixes #3162
2021-02-14 16:28:08 -05:00
Isaac Connor
231c9303fd
Handle null vidWidth
2021-02-11 11:50:05 -05:00
Peter Keresztes Schmidt
687ba03eb4
Drop relicts of zma
2021-02-10 13:26:25 +01:00
Isaac Connor
470739e1d5
Add debugging if streamStatus.status doesn't exist
2021-02-09 14:24:09 -05:00
Isaac Connor
79ac92c76d
spacing
2021-02-09 14:23:47 -05:00
Isaac Connor
c2ac171811
truncate file when logging to 255 chars so it gets into the db
2021-02-09 14:23:15 -05:00
Peter Keresztes Schmidt
6c9983155c
Build: Reindent the CMakeLists
...
Indent with 2 spaces
Also remove expressions form closing tags. They have been made optional a while ago since they make reading rather more difficult.
2021-02-04 22:00:56 +01:00
Isaac Connor
d4e83620b2
Split actions and options columns into 50%
2021-02-03 12:57:17 -05:00
Isaac Connor
a7365323dd
Split actions and options in filters to fit more horizontally
2021-02-03 12:57:17 -05:00
Isaac Connor
c35869fd30
Use jquery offset() to get image position
2021-02-02 23:19:53 -05:00
Isaac Connor
c8af90fd24
Add RTSP Server checkbox
2021-02-02 23:19:52 -05:00
Isaac Connor
2fa0fbe448
Upgrade cakephp to 2.10.24
2021-02-02 23:19:52 -05:00
Isaac Connor
2996fe3da7
fix hiding cloneBtn
2021-02-02 23:19:52 -05:00
Isaac Connor
b35e27d0b6
Use decodeURIComponent instead of decodeURI
2021-02-02 09:12:34 -05:00
Isaac Connor
49d3e5ddbf
decodeURI row.Message
2021-02-02 09:09:53 -05:00
Isaac Connor
105eff7a21
Remove references to zma
2021-02-01 17:29:16 -05:00
Isaac Connor
49209d9e72
populate mid if specified to enable reusing mids. Fix auto-populating resolution dropdown
2021-02-01 16:45:13 -05:00
Isaac Connor
0dc6b60985
Use new insert function to allow re-use of monitor Ids
2021-02-01 16:44:41 -05:00
Isaac Connor
50e5f84df2
introduce insert function to be used when we want specifically to insert a db record instead of being smart about update/insert.
2021-02-01 16:44:04 -05:00
Isaac Connor
da7d9c3756
Add default for Monitor Name
2021-02-01 16:43:24 -05:00
Isaac Connor
a3fe577fc6
Fix margin in ptz buttons
2021-01-31 11:45:11 -05:00
Isaac Connor
ee5d5e3cab
wrap fps text in another div to make the title easier to bring up and include the word fps
2021-01-31 10:19:10 -05:00
Isaac Connor
69b9e40b59
Fix textstatus=>textStatus
2021-01-31 10:09:22 -05:00
Isaac Connor
4ba939e267
role=tabList needs to be role=tablist
2021-01-29 20:37:55 -05:00
Isaac Connor
927d11a6a4
Fix tags not allowed under ul
2021-01-29 20:37:34 -05:00
Isaac Connor
c444e5cf07
spacing
2021-01-29 14:05:04 -05:00
Isaac Connor
ec1a7ec427
scale the event width when calculating if the stats table will fit
2021-01-29 14:03:12 -05:00
Isaac Connor
379538b3db
Make the monitor name at the top a link to monitor edit
2021-01-29 09:53:30 -05:00
Isaac Connor
ae41998d7c
Add a check for passthrough and not ffmpeg
2021-01-29 09:53:11 -05:00
Isaac Connor
5524090a80
Remove sleep function. Not going to work anyways
2021-01-28 16:17:15 -05:00
Isaac Connor
e4c6709eca
ensure options always has width and height set
2021-01-27 13:07:31 -05:00
Isaac Connor
6bfbb5462a
console monitor sort must be a post
2021-01-27 11:48:32 -05:00
Isaac Connor
07fa507efe
improve error message when trying to control a remote camera
2021-01-27 11:48:32 -05:00
Isaac Connor
28a004c324
Must load ServerId so that we can tell if it is local or remote
2021-01-27 11:48:32 -05:00
Isaac Connor
7dd9188b3b
fix eslint
2021-01-26 18:09:19 -05:00
Isaac Connor
bacf4a1aca
Add 640x360 resolution
2021-01-26 17:54:22 -05:00
Isaac Connor
410b9840d1
fix eslint
2021-01-26 17:44:23 -05:00
Isaac Connor
491cc1dfe3
ImageBufferCount can now be as low as 2
2021-01-26 15:37:32 -05:00
Isaac Connor
69626651ff
ImageBufferCount can now be as low as 2
2021-01-26 15:33:38 -05:00
Isaac Connor
4dcce4ac95
Merge branch 'rtsp_server'
2021-01-26 14:22:10 -05:00
Isaac Connor
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
Isaac Connor
dc9c7a7e15
handle event not existing a little better.
2021-01-25 18:49:03 -05:00
Isaac Connor
4b5052c351
use my bindButton function on the othe rbuttons
2021-01-25 18:48:47 -05:00
Isaac Connor
1b9f448aca
handle event not existing a little better. Show back button for example.
2021-01-25 18:48:20 -05:00
Isaac Connor
973533c809
Use method to handle case where Event wasn't found
2021-01-25 18:39:57 -05:00
Isaac Connor
86fd86a723
Switch to FriendsOfCake branch 3.0
2021-01-24 12:29:16 -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
Pliable Pixels
ed2a50f4ae
add permission check
2021-01-23 16:18:40 -05:00
Pliable Pixels
68dac0e406
new api to control daemon
2021-01-23 14:22:52 -05:00
Isaac Connor
ea8f264724
Merge branch 'release-1.34'
2021-01-22 15:54:06 -05:00