7aa625ea8e
Don't both loading all the Object code until after auth.
2021-04-12 15:59:31 -04:00
a3078d61f7
Default monitor filter bar to showing. Remove container-fluid which was adding padding at right and left. It should go elsewhere if needed.
2021-04-12 15:59:31 -04:00
ed29021179
Rough in an importance setting in monitor that we can use to decrease the log level of certain events like PrimeCapture for cameras that we don't care about
2021-04-11 12:59:18 -04:00
64ab6dff95
fix missing )
2021-04-10 18:16:59 -04:00
cf721ae875
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2021-04-10 18:16:17 -04:00
1ccc416224
Merge branch 'release-1.34'
2021-04-09 20:00:47 -04:00
1ccb8d7aef
Include Event Summaries when loading Monitors
2021-04-09 19:46:57 -04:00
3dcb71933e
Add event summary fields to Monitor Object
2021-04-09 19:46:25 -04:00
2b1e0df6be
FIx auth= not getting updated
2021-04-09 18:46:41 -04:00
492a352bed
Use updated auth_hash when sending alarm requests
2021-04-09 18:33:32 -04:00
2e22cd5c3b
Mark snapshot events as Archived
2021-04-08 15:20:44 -04:00
99c28d1f9f
Change log level to debug when warning about ZM_OPT_AUTH being turned off. Fixes #3207
2021-04-07 09:47:48 -04:00
2d64c616ba
Add help for BadEncoderParameters
2021-04-01 11:53:57 -04:00
73082a2d33
Remove the H264/X264 from the dropdown labels. Could be H265 or other
2021-04-01 11:53:57 -04:00
ba9acd3037
Add test for no encoder settings
2021-04-01 11:53:57 -04:00
7e3d6f867e
Set the default crf so that encoding works
2021-04-01 11:53:57 -04:00
80e5076d2a
cache bust jquery and bootstrap
2021-03-31 18:27:43 -04:00
9af97c50aa
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2021-03-31 12:40:35 -04:00
c3ce9913cf
Upgrade cakephp to 2.10.24
2021-03-31 12:11:12 -04:00
790cdf879a
Add D1-PAL resolution
2021-03-31 11:05:17 -04:00
6c4e423a8b
Spacing
2021-03-30 18:20:31 -04:00
3d01008510
use json_encode($User) instead of specific elements. For some reason $user['Id'] isn't defined for me atm.
2021-03-30 18:20:23 -04:00
cbd8b22efb
Fix setting value when not empty
2021-03-30 14:28:17 -04:00
78c5531357
Increase width of LabelFormat to fit our default. Incrase various number inputs to fit up/down arrows
2021-03-30 13:32:02 -04:00
8582c1a652
Once again fix saving string value to '' so that we can empty LabelFormat
2021-03-30 13:31:26 -04:00
beb7a75d5a
Implement canView for Monitors
2021-03-30 11:52:04 -04:00
aeb98ec790
Implement canView for Groups. Implement Monitors() and Children() functions. Use canView when populating Group dropdown
2021-03-30 11:51:52 -04:00
e9641938f0
Fix eslint
2021-03-27 18:25:04 -04:00
96e641b381
handle if error message doesn't exist
2021-03-27 13:42:00 -04:00
4ee3380e3a
If auth is not turned on, redirect to console
2021-03-27 13:41:49 -04:00
4e9a5cff8e
Style MaxImageBufferCount
2021-03-26 17:02:38 -04:00
8e1b2ccbc7
Add MaxImageBufferCount
2021-03-26 17:02:17 -04:00
617264432e
Add help for ImageBUfferCount and MaxImageBUfferCount
2021-03-26 17:02:03 -04:00
2e675a338b
remove estimated ram use stuff as it is no longer possible
2021-03-26 14:31:18 -04:00
badb1c6131
Add MaxImageBufferCount, remove estimated ram us
2021-03-26 14:31:04 -04:00
c78e6a7cc7
Fix scroll bars on options view
2021-03-26 08:16:15 -04:00
4fab9fe458
fix error due to missing columns
2021-03-25 17:29:35 -04:00
1c8a850acf
Handle stream having something other than an img as it's display
2021-03-23 13:53:45 -04:00
37a8f007c8
remove unised function
2021-03-23 13:53:25 -04:00
7743445323
Handle when there isn't a server Id
2021-03-22 21:30:56 -04:00
16b33536ed
Turn off second Log in header
2021-03-22 17:49:59 -04:00
f306febb5f
use find_one when loading Server which can use caching
2021-03-22 17:49:59 -04:00
1dc32a0eed
Use getBodyTopHTML so that we get error reporting
2021-03-22 13:00:08 -04:00
be0841832e
enable reporting saving errors back to web ui.
2021-03-22 12:59:41 -04:00
3fdd2bff7f
Have to use === because apparently null == NOW() according to php.
2021-03-22 12:59:18 -04:00
c7b22dae81
get rid of nextId entirely. Don't want to use it anywhere other than setting the name
2021-03-22 12:07:23 -04:00
613ed1faf2
Update estimated ram use when we use the dropdown to change resolution
2021-03-22 12:06:48 -04:00
fa08240a4d
Fix set() and __call to use the default value when set value is ''. Fixes issues in monitor view when changing type
2021-03-22 12:06:25 -04:00
c347261e19
Change default of ImageBufferCount to 3
2021-03-22 12:05:36 -04:00
be653980f3
fix eslint
2021-03-21 18:17:13 -04:00
858ae8b11f
fix alignment and min width of datetime column in logs view
2021-03-21 18:17:13 -04:00
7f9c9c6624
web: make eslint happy
2021-03-21 21:40:41 +01:00
8a1284e2fa
Can't use a decimal step. Has to be any because browsers suck.
2021-03-21 12:30:56 -04:00
a57473a146
remove debug
2021-03-21 09:19:31 -04:00
284837d536
quotes, spaces. Also move setting redirect to to where we actually do the redirect so that actions can remove the redirect if there was an error to report.
2021-03-21 09:19:21 -04:00
cc455e5d74
fix require=>require_once for User.php. Use getBodyTopHTML so that we get the error reporting
2021-03-21 09:18:47 -04:00
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
68f9c7c9e6
introduce a _last_error member to the object for reporting errors saving.
2021-03-20 19:27:53 -04:00
70e61740d3
Fix eslint
2021-03-18 16:48:26 -04:00
e39c293a77
fix eslint
2021-03-18 16:48:26 -04:00
4cb38a119e
Fix saving Filters and other objects. Apparently comparing 0 to NOW() doesn't work.
2021-03-18 14:09:15 -04:00
1b876f24f9
Must have Id as well in order to know which monitor to control
2021-03-17 17:15:04 -04:00
28700fd56b
Implement saving DecodingEnabled from function view
2021-03-16 12:09:14 -04:00
feec631ca5
Only save updated DiskSpace if event is finished
2021-03-15 15:02:43 -04:00
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
478d11e6f2
Update the auth in streamCmdParams on every request. It wasn't picking up updates
2021-03-13 12:12:20 -05:00
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
5eae1c0a9f
spacing, add code comment
2021-03-13 12:10:55 -05:00
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
9d33688f89
Honour various permissions on what's in the navbar.
2021-03-12 11:40:46 -05:00
e5f9654e50
honour Groups:View permission in monitor filters
2021-03-12 11:33:16 -05:00
62cfdd8d61
fix searching in snapshots
2021-03-12 10:52:23 -05:00
b50916e02a
Allow unknown columns in filters. Allow specifying the table name in FilterTerm.
2021-03-12 10:52:10 -05:00
9504d8be61
event_ids => snapshot_ids
2021-03-12 10:40:23 -05:00
1ae1a89abf
Only allow show zones for System::View permission
2021-03-12 10:29:13 -05:00
ba00bee4b8
fix header alignment
2021-03-12 10:07:33 -05:00
70073ea017
Add thumbnails to snapshots list
2021-03-12 10:07:17 -05:00
11c2318a05
Rough in the ui for Snapshots
2021-03-12 09:28:05 -05:00
6682ec7da5
Add Snapshots and Snapshot_Events Tables. Add HomeView to Users.
2021-03-12 09:26:23 -05:00
de0bbf7e04
Instead of fatal error triggering, turn off file logging and log the error elsewhere
2021-03-03 14:31:43 -05:00
8aebcf7337
Fix ['mid'] not being defined. Use instead
2021-03-03 12:51:27 -05:00
ce4e133c94
Add loading SecondPath in monitor
2021-03-03 09:56:33 -05:00
95fe689d58
WIP, rabbit hole too deep
2021-03-03 09:55:57 -05:00
849d71efff
Add filtering to groups
2021-03-02 15:10:15 -05:00
7d02c68938
silence warning when cookies not used
2021-03-02 15:10:02 -05:00
4cfe777e93
Fix path to Monitor.php
2021-02-16 11:16:06 -05:00
bb747bfc6d
Add RTSPStreamName fields
2021-03-01 16:46:48 -05:00
445d815071
fix eslint
2021-02-25 20:35:45 -05:00
550d302316
Fix Crud version back to origin
2021-02-25 14:18:51 -05:00
d106c2fcc3
Add 4MP and 6MP resoolutions
2021-02-24 15:03:11 -05:00
0d2febc958
Make monitor column open the event instead of monitor edit
2021-02-24 12:38:12 -05:00
c8be0d58d5
eslint - fix whitespace
2021-02-22 19:02:24 -06:00
82c4a1a417
put third refresh button back for now
2021-02-22 11:57:27 -05:00
3a8e2ff869
Hide duplicated refresh button
2021-02-22 11:25:00 -05:00
9aad09a735
Refresh bootstrap table if the ajax fails.
2021-02-22 11:24:30 -05:00
9fec32fdc5
We now support audio when doing video encoding
2021-02-22 09:55:40 -05:00
5d826fd558
Don't try to addup/update DIskSpace used by incomplete events.
2021-02-20 17:11:20 -05:00
4d739f35ef
Fix parseTree when using iS or ISNOT. Add strtoupper comparisons for NULL values.
2021-02-20 17:07:07 -05:00
0fc4b00ac1
Allow null as well as NULL infilter values
2021-02-20 12:32:38 -05:00
3fb1054093
bstable export requires tableExport plugin
2021-02-18 20:22:19 -06:00
c99f43205d
add parenthesis for safety
2021-02-18 13:47:27 -05:00
ba6797a143
make definitionPanel have height to fix jumping around as scroll bar appears/disappears
2021-02-18 10:25:05 -05:00
f0d8a654f8
Remove debug, use fewer lines
2021-02-17 13:11:55 -05:00
c608af4df7
Correct timeline when using Weekday
2021-02-17 13:11:02 -05:00
b58ecca040
Allow RTSPServer to be unselected
2021-02-17 12:07:55 -05:00
aa94795b96
When auth is not turned on, show an error instead of login fields.
2021-02-16 16:09:23 -05:00
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
71183a6002
fix case of vidWidth. Fixes #3162
2021-02-14 16:28:08 -05:00
231c9303fd
Handle null vidWidth
2021-02-11 11:50:05 -05:00
687ba03eb4
Drop relicts of zma
2021-02-10 13:26:25 +01:00
470739e1d5
Add debugging if streamStatus.status doesn't exist
2021-02-09 14:24:09 -05:00
79ac92c76d
spacing
2021-02-09 14:23:47 -05:00
c2ac171811
truncate file when logging to 255 chars so it gets into the db
2021-02-09 14:23:15 -05:00
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
d4e83620b2
Split actions and options columns into 50%
2021-02-03 12:57:17 -05:00
a7365323dd
Split actions and options in filters to fit more horizontally
2021-02-03 12:57:17 -05:00
c35869fd30
Use jquery offset() to get image position
2021-02-02 23:19:53 -05:00
c8af90fd24
Add RTSP Server checkbox
2021-02-02 23:19:52 -05:00
2fa0fbe448
Upgrade cakephp to 2.10.24
2021-02-02 23:19:52 -05:00
2996fe3da7
fix hiding cloneBtn
2021-02-02 23:19:52 -05:00
b35e27d0b6
Use decodeURIComponent instead of decodeURI
2021-02-02 09:12:34 -05:00
49d3e5ddbf
decodeURI row.Message
2021-02-02 09:09:53 -05:00
105eff7a21
Remove references to zma
2021-02-01 17:29:16 -05:00
49209d9e72
populate mid if specified to enable reusing mids. Fix auto-populating resolution dropdown
2021-02-01 16:45:13 -05:00
0dc6b60985
Use new insert function to allow re-use of monitor Ids
2021-02-01 16:44:41 -05:00
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
da7d9c3756
Add default for Monitor Name
2021-02-01 16:43:24 -05:00
a3fe577fc6
Fix margin in ptz buttons
2021-01-31 11:45:11 -05:00
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
69b9e40b59
Fix textstatus=>textStatus
2021-01-31 10:09:22 -05:00
4ba939e267
role=tabList needs to be role=tablist
2021-01-29 20:37:55 -05:00
927d11a6a4
Fix tags not allowed under ul
2021-01-29 20:37:34 -05:00
c444e5cf07
spacing
2021-01-29 14:05:04 -05:00
ec1a7ec427
scale the event width when calculating if the stats table will fit
2021-01-29 14:03:12 -05:00
379538b3db
Make the monitor name at the top a link to monitor edit
2021-01-29 09:53:30 -05:00
ae41998d7c
Add a check for passthrough and not ffmpeg
2021-01-29 09:53:11 -05:00
5524090a80
Remove sleep function. Not going to work anyways
2021-01-28 16:17:15 -05:00
e4c6709eca
ensure options always has width and height set
2021-01-27 13:07:31 -05:00
6bfbb5462a
console monitor sort must be a post
2021-01-27 11:48:32 -05:00
07fa507efe
improve error message when trying to control a remote camera
2021-01-27 11:48:32 -05:00
28a004c324
Must load ServerId so that we can tell if it is local or remote
2021-01-27 11:48:32 -05:00
7dd9188b3b
fix eslint
2021-01-26 18:09:19 -05:00
bacf4a1aca
Add 640x360 resolution
2021-01-26 17:54:22 -05:00
410b9840d1
fix eslint
2021-01-26 17:44:23 -05:00
491cc1dfe3
ImageBufferCount can now be as low as 2
2021-01-26 15:37:32 -05:00
69626651ff
ImageBufferCount can now be as low as 2
2021-01-26 15:33:38 -05:00
4dcce4ac95
Merge branch 'rtsp_server'
2021-01-26 14:22:10 -05:00
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
dc9c7a7e15
handle event not existing a little better.
2021-01-25 18:49:03 -05:00
4b5052c351
use my bindButton function on the othe rbuttons
2021-01-25 18:48:47 -05:00
1b9f448aca
handle event not existing a little better. Show back button for example.
2021-01-25 18:48:20 -05:00
973533c809
Use method to handle case where Event wasn't found
2021-01-25 18:39:57 -05:00
86fd86a723
Switch to FriendsOfCake branch 3.0
2021-01-24 12:29:16 -05:00
fd21d47bbb
Merge pull request #3113 from pliablepixels/feature-api-daemon-control
...
new api to control daemon
2021-01-23 17:28:30 -05:00
ed2a50f4ae
add permission check
2021-01-23 16:18:40 -05:00
68dac0e406
new api to control daemon
2021-01-23 14:22:52 -05:00
ea8f264724
Merge branch 'release-1.34'
2021-01-22 15:54:06 -05:00
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
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
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
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
e3fdfa659a
fix typo and disable settings btn rather than hide
2021-01-19 10:32:18 -06:00
c13d2ea99f
make watch view event list more efficient
2021-01-19 10:10:51 -06:00
b9c0823774
don't install tools folder
2021-01-18 07:41:08 -06:00
68819a86a0
remove mootools from zoneminder
2021-01-18 07:31:43 -06:00
cb90c06cde
Merge branch 'master' into zma_to_thread
2021-01-17 17:38:34 -05:00
5186ae2433
use bindButton
2021-01-16 13:17:46 -05:00
50af7f25b8
Use less memory in event querying. More work to do here
2021-01-16 13:17:46 -05:00
3dc35c49a2
quotes
2021-01-16 13:17:46 -05:00
d98dde4aee
Use auth hash in event loading. Use monitorURL in ajax calls that need to talk to zms. Use bindButton to handle the non-existence of settings button.
2021-01-16 13:17:46 -05:00
6586aa6338
Introduce a helper function bindButton to do the button event binding with nice error logging.
2021-01-16 13:17:46 -05:00
1e59c5bbde
Merge branch 'release-1.34'
2021-01-15 18:46:07 -05:00
b019a759a3
ffmpeg options doesn't support loglevel setting. SO remove it from help. Fixes #3109
2021-01-15 18:43:49 -05:00
f2fea95f4b
Merge branch 'master' into zma_to_thread
2021-01-14 13:02:52 -05:00
ad330cb949
Make images in modals max-width: 100% so they fit within the modal.
2021-01-14 12:56:54 -05:00
7d08f24895
use pageX and pageY instead of page.x and page.y
2021-01-14 12:56:54 -05:00
16db59ecb1
use pageX and pageY instead of page.x and page.y
2021-01-14 10:33:03 -05:00
9a824716b5
Fix clicking on pills committing the form. Remove hidden inputs and use pills to toggle visibility of divs instead. rename newControl to Control. Use button as the action input
2021-01-12 18:41:24 -05:00
ef2f126eaa
Merge branch 'master' into zma_to_thread
2021-01-12 14:37:25 -05:00
81acf4bf69
Fix ul nesting. Add navbar-nav to collapsed nav elements to fix spacing.
2021-01-12 14:29:53 -05:00
0a9681636f
rename getAcct to getAccount
2021-01-12 14:20:05 -05:00
8de122ef26
remove await that we can't use
2021-01-12 14:13:42 -05:00
c6cf1da47d
Merge branch 'master' into zma_to_thread
2021-01-11 17:08:44 -05:00
a51dfe552b
Remove auth_hash var that overlaps global auth_hash var. Use attr('src') instead of src
2021-01-11 16:41:43 -05:00
3639593ae5
use js.post instead of getJSON.
2021-01-11 15:22:15 -05:00
bb50de268b
Fix setting img.src to new url. Won't have any effect here as we are reloading the whole page.
2021-01-11 15:21:39 -05:00
8204d2d7eb
Introduce sleep() function. Use it on ajax error to wait 1 second before reloading page
2021-01-11 13:57:39 -05:00
1f2c10dcc0
replace mootools getelement and addevent
2021-01-11 13:47:36 -05:00
2f8f0a0b4a
use plain js to get the livestream rather than mootools
2021-01-11 13:47:36 -05:00
ac5c821bbd
use plain js for mouseover thumb animation
2021-01-11 13:47:36 -05:00
11bc2d7682
bind this to streamCmdQuery
2021-01-11 13:47:36 -05:00
4dea379673
increase timeout value for streamQuery to avoid contention with streamScale during jpeg playback
2021-01-11 13:47:36 -05:00
a761b9c0ff
deprecate legacy "stills" option from event view
2021-01-11 13:47:34 -05:00
5b40589d61
add a button to go to the stats view
2021-01-11 13:46:51 -05:00
6796126ae2
autohide frame stats when out of pixels
2021-01-11 13:46:51 -05:00
61dc0adb60
remove extra uneeded on change event handler
2021-01-11 13:46:51 -05:00
bbf233b332
fix frame view scale control
2021-01-11 13:46:51 -05:00
64f755be4a
clean up postlogin js
2021-01-11 13:46:51 -05:00
751102fa6d
eslint
2021-01-11 13:46:51 -05:00
8d75f30d22
remove unneeded comment
2021-01-11 13:46:51 -05:00
Isaac Connor
Peter Keresztes Schmidt
Andrew Bauer
Isaac Connor
Pliable Pixels