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
2e932571f3
autohide the event stats when out of pixels
2021-01-11 13:46:51 -05:00
beb74cb54a
replace mootools Request.JSON
2021-01-11 13:46:51 -05:00
381bf0c219
fix cyclePrev with only 1 monitor
2021-01-11 13:46:51 -05:00
3f73c3bc9d
replace Mootool delay with setTimeout
2021-01-11 13:46:50 -05:00
57da991e7a
go back rather than close window
2021-01-11 13:46:50 -05:00
638e801c07
replace mootools .delay method
2021-01-11 13:46:50 -05:00
0963795e44
eslint
2021-01-11 13:46:50 -05:00
774d522cee
eslint
2021-01-11 13:46:50 -05:00
2e815bc23e
eslint
2021-01-11 13:46:50 -05:00
a1678f5ea4
replace mootool Cookie object with plain JS
2021-01-11 13:46:50 -05:00
85da53f86f
add reference to browserInfo function
2021-01-11 13:46:50 -05:00
50bf1d649f
replace Mootools Browser object with our own
2021-01-11 13:46:50 -05:00
d2cc65c8a3
eslint
2021-01-11 13:46:50 -05:00
a6964f66e2
use JS instead of Mootools to detect IE browser
2021-01-11 13:46:50 -05:00
fe8561d868
replace mootools periodical method
2021-01-11 13:46:50 -05:00
6d9fa27b37
Fix changeScale not updating zms url when the page initially loads as not scale to fit
2021-01-11 13:46:50 -05:00
0db759ede1
split long line
2021-01-11 13:46:50 -05:00
8e3217b38a
eslint
2021-01-11 13:46:50 -05:00
1b385ee195
show alarm state and fps on zones view
2021-01-11 13:46:50 -05:00
29f3e9007a
replace mootools in MonitorStream
2021-01-11 13:46:50 -05:00
70f73f5475
modernize monitors view
2021-01-11 13:46:50 -05:00
cf10ce010c
tableExport plugin is no longer used
2021-01-11 13:46:50 -05:00
aeec7b025d
remove js files that define popupSizes
2021-01-11 13:46:50 -05:00
5c6e093b13
old overlay code is no longer used
2021-01-11 13:46:50 -05:00
69268f79a4
remove obsolete controlpreset js files
2021-01-11 13:46:50 -05:00
590d65671c
WIP jquery conversion
2021-01-11 13:46:50 -05:00
ad3894ab1b
WIP replace with jquery
2021-01-11 13:46:50 -05:00
4ade926df4
eslint
2021-01-11 13:46:50 -05:00
d25d2b4894
replace mootools in montagereview.js
2021-01-11 13:46:50 -05:00
3d77069b0b
bring montage minimize chervron into the view
2021-01-11 13:46:50 -05:00
113d2d1797
replace mootools in montage.js
2021-01-11 13:46:50 -05:00
0a5d6ca4ba
replace mootools in cycle.js
2021-01-11 13:46:50 -05:00
b1b71e5f09
fix return too soon when no log results
2021-01-11 13:46:50 -05:00
ddce421cab
eslint
2021-01-11 13:46:50 -05:00
cb6bf682e8
eslint
2021-01-11 13:46:50 -05:00
b6d5802301
revert back to a standard modal (no static backdrop) for objdetect
2021-01-11 13:46:50 -05:00
d9a97fbf40
eslint
2021-01-11 13:46:50 -05:00
6f78b5a105
eslint
2021-01-11 13:46:50 -05:00
b95f1baa96
WIP replace mootools in zone.js
2021-01-11 13:46:50 -05:00
e6a6c1b52f
WIP replace mootools in zone.js
2021-01-11 13:46:50 -05:00
0dbeb89c62
remove replace mootools in drawZonePoints function
2021-01-11 13:46:50 -05:00
dcda8cb679
handle objdetect links in a more consistent manner
2021-01-11 13:46:50 -05:00
a8f79a6e00
prevent page scrolling when objdetect modal is opened
2021-01-11 13:46:50 -05:00
6da429f49f
remove redundant modal toggle from events.js
2021-01-11 13:46:50 -05:00
56bb4a74fc
Avoid top-scroll when returning from bs_modal objdetect
2021-01-11 13:46:50 -05:00
e27dd44547
upgrade to bootstrap-table 18.1 release
2021-01-11 13:46:50 -05:00
f7de6045ef
Change Disabled to Auto and add h265 as codec options
2021-01-11 13:46:50 -05:00
9e9860d6c0
replace mootools getelement and addevent
2021-01-11 09:06:21 -06:00
2094f78adf
use plain js to get the livestream rather than mootools
2021-01-11 07:27:11 -06:00
ff7a1037be
use plain js for mouseover thumb animation
2021-01-11 07:21:51 -06:00
9968a65ee6
bind this to streamCmdQuery
2021-01-10 14:21:52 -06:00
4a2b3e569b
increase timeout value for streamQuery to avoid contention with streamScale during jpeg playback
2021-01-10 13:02:07 -06:00
d45b4ca434
deprecate legacy "stills" option from event view
2021-01-10 10:25:22 -06:00
2e0b32b2fc
add a button to go to the stats view
2021-01-09 16:13:33 -06:00
08d640a06c
autohide frame stats when out of pixels
2021-01-09 16:01:32 -06:00
1ea4ee6ef1
remove extra uneeded on change event handler
2021-01-09 15:09:20 -06:00
9cb1709f77
fix frame view scale control
2021-01-09 15:08:08 -06:00
e415118f77
clean up postlogin js
2021-01-09 14:40:38 -06:00
22be24ccde
eslint
2021-01-09 08:54:13 -06:00
4eeb0a90f6
remove unneeded comment
2021-01-09 08:45:20 -06:00
df44afb164
autohide the event stats when out of pixels
2021-01-09 08:43:53 -06:00
a55e53a737
replace mootools Request.JSON
2021-01-08 14:34:10 -06:00
ece8fccc63
fix cyclePrev with only 1 monitor
2021-01-08 13:16:16 -06:00
c67c1ce6a0
replace Mootool delay with setTimeout
2021-01-08 13:06:56 -06:00
c7690a7088
go back rather than close window
2021-01-08 12:40:26 -06:00
9ec09c0c85
replace mootools .delay method
2021-01-08 12:25:17 -06:00
72eaf267c1
eslint
2021-01-08 10:45:59 -06:00
c0431eca86
eslint
2021-01-08 10:42:45 -06:00
55d99e8e7c
eslint
2021-01-08 10:10:47 -06:00
f816c72517
replace mootool Cookie object with plain JS
2021-01-08 10:04:46 -06:00
b56883a985
add reference to browserInfo function
2021-01-08 09:35:32 -06:00
62fc1fb1aa
replace Mootools Browser object with our own
2021-01-08 09:32:51 -06:00
d0f035596c
eslint
2021-01-08 08:50:57 -06:00
d3a71aff14
use JS instead of Mootools to detect IE browser
2021-01-08 08:27:06 -06:00
43fabd9b65
replace mootools periodical method
2021-01-08 07:32:52 -06:00
a431f08133
eslint
2021-01-06 15:57:30 -06:00
4756a03b16
show alarm state and fps on zones view
2021-01-06 14:27:06 -06:00
9d7f738f61
replace mootools in MonitorStream
2021-01-06 14:19:25 -06:00
6dcedb584d
modernize monitors view
2021-01-05 10:16:51 -06:00
ebbd2888f0
tableExport plugin is no longer used
2021-01-04 15:40:53 -06:00
bd18904bf4
remove js files that define popupSizes
2021-01-04 15:33:26 -06:00
51132cb5e1
old overlay code is no longer used
2021-01-04 13:51:03 -06:00
0cdc2b448d
remove obsolete controlpreset js files
2021-01-04 13:18:05 -06:00
75e2f526ae
WIP jquery conversion
2021-01-04 13:05:33 -06:00
a1b26c8f61
WIP replace with jquery
2021-01-04 10:28:16 -06:00
21180777b4
eslint
2021-01-03 14:23:13 -06:00
49a535abaa
replace mootools in montagereview.js
2021-01-03 11:45:53 -06:00
0dd98855cc
bring montage minimize chervron into the view
2021-01-03 08:53:07 -06:00
1f6b2798ff
replace mootools in montage.js
2021-01-03 07:40:50 -06:00
1ab181ec54
replace mootools in cycle.js
2021-01-02 16:57:23 -06:00
c166b0de0f
fix return too soon when no log results
2021-01-02 16:33:56 -06:00
5ad8e90dda
eslint
2021-01-02 13:48:40 -06:00
f0610b5eb7
eslint
2021-01-02 13:25:38 -06:00
56e88aea89
revert back to a standard modal (no static backdrop) for objdetect
2021-01-02 12:34:33 -06:00
809e67d352
eslint
2021-01-02 12:24:12 -06:00
e9bdaa988e
eslint
2021-01-02 12:06:02 -06:00
cc69b150de
WIP replace mootools in zone.js
2021-01-02 11:58:03 -06:00
62575c0d0e
WIP replace mootools in zone.js
2021-01-02 11:33:21 -06:00
ebad6194ee
remove replace mootools in drawZonePoints function
2021-01-02 10:52:17 -06:00
12c0ccea7c
handle objdetect links in a more consistent manner
2021-01-02 08:52:26 -06:00
a61da04969
prevent page scrolling when objdetect modal is opened
2021-01-02 08:06:35 -06:00
ea7184e619
remove redundant modal toggle from events.js
2021-01-01 09:36:49 -06:00
b7970d69a5
Avoid top-scroll when returning from bs_modal objdetect
2021-01-01 14:15:35 +01:00
7c783aa53d
Deal with Error for Auto not in Array
...
Add value auto into the array, even if not implemented as without it you cannot save a monitor.
2021-01-01 14:38:33 +11:00
bc30d303f7
upgrade to bootstrap-table 18.1 release
2020-12-30 08:01:28 -06:00
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
a362f2abc2
Merge pull request #3102 from connortechnology/fix_3101
...
fix api monitor save daemon control
2020-12-25 13:29:01 -05:00
2adeedf418
additional mootools cleanup in event.js
2020-12-25 07:19:41 -06:00
9209f40daa
eslint
2020-12-24 14:59:27 -06:00
5fa8cbf158
add Frames button to event view
2020-12-24 14:46:13 -06:00
3fd50bb01d
reorganize logger.js and use jquery
2020-12-24 14:32:23 -06:00
e66b050c72
WIP jquery conversion of event view
2020-12-24 10:38:44 -06:00
b093e99688
disable click to select on the events table Cause column
2020-12-24 07:10:47 -06:00
3132820a71
Move daemonControl logic into the model. daemonControl needs to be called on the previous monitor data so that it knows which daemons to stop.
2020-12-23 13:48:12 -05:00
816c306518
use jquery for submitTab
2020-12-23 12:29:39 -06:00
a94550795b
update setButtonState
2020-12-23 12:20:31 -06:00
f64f3262ed
WIP replace mootools in evnet.js
2020-12-23 12:19:35 -06:00
f857d12103
WIP replace mootools in event.js
2020-12-23 10:51:23 -06:00
493bfa6a16
eslint
2020-12-23 09:15:31 -06:00
3c79204592
replace mootools in add_monitors
2020-12-23 08:54:11 -06:00
286a5a72a3
Merge branch 'master' into zma_to_thread
2020-12-23 09:47:31 -05:00
c91a0b2c09
fixup jquery click functions
2020-12-23 08:37:28 -06:00
c497b94378
use tlzoom class to avoid conflict with thumbnail zoom
2020-12-23 07:57:44 -06:00
a9b92905ca
eslint
2020-12-22 19:07:12 -06:00
a1917d83d0
Merge branch 'master' into zma_to_thread
2020-12-22 19:52:09 -05:00
cc5a732103
continue work on timeline.js
2020-12-22 16:06:21 -06:00
6be9b294ef
Hidden and hidden are two very different classes
2020-12-22 17:00:07 -05:00
8a26252914
update object detected link in events
2020-12-22 12:42:27 -06:00
9af383db92
set the width style for the objdetect modal
2020-12-22 12:30:44 -06:00
2ea4b39d93
don't use quotes around the event id
2020-12-22 11:46:31 -06:00
ee45916526
move objdetect image to a modal
2020-12-22 10:08:31 -06:00
a231125fb3
Replace Download with a direct link to the mp4 like it used to be. Add back a Frames link
2020-12-22 10:23:44 -05:00
cbe04674c5
remove non-existent id preview
2020-12-21 15:59:05 -06:00
d080109f4b
eslint
2020-12-21 15:20:38 -06:00
663748d9a7
partial replace mootools
2020-12-21 13:07:14 -06:00
1f3fd93296
use setTimeout instead of mootools pass
2020-12-20 15:21:38 -06:00
92361210ce
eslint
2020-12-20 15:07:16 -06:00
1d6c4664dc
replace mootools in export
2020-12-20 10:54:18 -06:00
0b569e7e37
replace mootools in control.js
2020-12-20 08:29:39 -06:00
66ae2c0461
replace mootools request JSON
2020-12-20 07:59:17 -06:00
381cc30e5d
Set default value for DefaultScale to 0 which is ScaleToFit
2020-12-18 10:54:08 -05:00
0104e2ba7f
Add a sorted_monitor_ids array to use when generating sorted lists of monitors. Return proper json when things aren't set instead of empty string. Use sorted_monitor_ids to populate the monitor dropdown in filters
2020-12-18 10:23:41 -05:00
8d52baeee2
Merge branch 'master' into rtsp_server
...
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1. 0 means no error but also no success.
Debugging and braces improvements in local_camera.
2020-12-17 10:16:54 -05:00
a855656b88
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-12-17 09:27:23 -05:00
5602b92699
Fix issue with timeline where it only shows first frame
2020-12-17 09:26:59 -05:00
7f9b977ec2
rename onDownClick to onRenameClick cutnpaste error
2020-12-15 16:57:27 -05:00
8c85c50ce1
Add titles to fps values and only show analysis if doing it
2020-12-15 16:56:53 -05:00
997a05eb8b
AV_CODEC_ID for H264 is 27 not 220
2020-12-15 16:56:27 -05:00
7dc4633d27
rename onDownClick to onRenameClick cutnpaste error
2020-12-15 16:56:05 -05:00
48db741b4e
Fix merge from master
2020-12-15 15:59:02 -05:00
de38c29e83
Fix lack of # for zoomvalue
2020-12-15 15:56:41 -05:00
e123322d06
Merge branch 'master' into rtsp_server
2020-12-15 11:00:13 -05:00
99e7ae3505
Merge branch 'master' into rtsp_server
2020-12-15 10:14:19 -05:00
aed83cab31
Load delconfirm content on demand
2020-12-15 10:11:30 -05:00
bc07c38dc8
add 704x576 PAL D1
2020-12-14 12:57:59 -05:00
191e213337
upgrade to jquery 3.5.1, use minified javascripts
2020-12-14 10:02:43 -06:00
a5b945f97a
touch up event view stat list
2020-12-14 06:55:45 -06:00
4ae47659df
use js to build event stats
2020-12-13 21:19:38 -06:00
43d0b0fd55
Add D1-PAL resolution
2020-12-13 16:47:51 -05:00
48c6309394
add emailed & archived status to event view
2020-12-13 15:01:47 -06:00
882447317a
eslint
2020-12-13 14:42:39 -06:00
c24564e0cd
insert frame stats into frame view
2020-12-13 13:20:26 -06:00
71d1607f69
fix php -> js issue when $alarmframe was false
2020-12-12 15:06:59 -06:00
237335c022
watch.js - finish mootools replacement
2020-12-12 12:45:36 -06:00
2f0df74c54
show the analyse image in frames view if it exists
2020-12-12 11:37:50 -06:00
51a862057f
Fix a link missing a quote
2020-12-11 09:49:43 -05:00
c26fc1f36a
Replace thisUrl with the export ajax request as a GET parameter, making it easier to find inlogs.
2020-12-11 09:42:35 -05:00
3483ee8db1
clean up code a little by make an event_link string and using it. Fix the cause column not being a valid link. I think it used to popup an edit but it should just go to the event view
2020-12-11 09:34:50 -05:00
77a35c1813
right align colDiskSpace so that digits line up nicely
2020-12-11 09:33:54 -05:00
bfd16db34b
add format padding so that right align file size strings will line up nicely.
2020-12-11 09:33:36 -05:00
f89da79c27
Fix comparing empty arrays. explode on an empty string returns an array with a single element '' instead of an empty array
2020-12-10 16:25:24 -05:00
8bda0b5504
fix element name on DecodingEnabled
2020-12-10 16:24:45 -05:00
c37433acfc
show/hide DecodingEnabled depending on function
2020-12-10 16:24:33 -05:00
da8d96ddda
Don't pass types to changes, it doesn't do anything. Add DecodingEnabled to request
2020-12-10 16:24:09 -05:00
5c1135b2a7
Merge branch 'master' into no_decode
2020-12-10 15:15:32 -05:00
eb00cf405a
Add DecodingEnabled to monitor view
2020-12-10 15:14:37 -05:00
2e9f991211
give the label column in monitor view a min-width of 300px so that it is always large enough
2020-12-10 14:32:44 -05:00
b12f1cce5b
add Function help text to monitor view
2020-12-10 14:32:17 -05:00
66a1660423
Add missing comma
2020-12-10 14:08:01 -05:00
4667e21636
Add DecodingEnabled to Function modal
2020-12-10 14:06:40 -05:00
ced396e437
Add DecodingEnabled to Monitors
2020-12-10 14:06:26 -05:00
37d4b3472f
Add useful help for function modal describing each mode and the purpose of the Enabled checkbox
2020-12-10 13:43:28 -05:00
9fb953bc84
set the right image attributes for frames view
2020-12-10 07:24:48 -06:00
3a4cdb7e50
eslint
2020-12-09 20:06:38 -06:00
e0ac68786f
remove unneeded thumb animation functions from frames.js
2020-12-09 18:48:58 -06:00
39023b3e7b
don't set zoom class in frames.js
2020-12-09 18:19:10 -06:00
c43ffcf58f
eslint
2020-12-09 18:02:34 -06:00
026b8cfb0c
eslint
2020-12-09 17:58:46 -06:00
5482d3b3d5
Quiet error when calling logout when already logged out
2020-12-09 17:56:27 -05:00
eb4b7f248d
handle sort_field and limit not existing in _REQUEST
2020-12-09 17:56:27 -05:00
38cf667ee1
report both capture_fps and analysis_fps
2020-12-09 15:03:40 -05:00
28a3868069
report both capture_fps and analysis_fps
2020-12-09 15:03:33 -05:00
951debab7f
watch.js - replace mootools ajax w/ jquery
2020-12-09 12:25:40 -06:00
4e09a32836
fix one canEdit
2020-12-08 14:36:19 -06:00
69e540c104
deploy canView and canEdit js objects
2020-12-08 14:25:48 -06:00
63c483ba92
canEditMonitors is set in skin.js.php
2020-12-08 11:27:18 -05:00
63e36340c6
Remove extra }
2020-12-08 11:26:52 -05:00
84c7a117f5
Use width and height attrs instead of css for rendering speed. Also alt doesn't need validHtmlStr because Event.Id will have no weird characters
2020-12-08 11:26:43 -05:00
bfe5bb0249
Include code to handle when we are already logged in but trying to auth with a mismatched auth_hash
2020-12-08 11:19:22 -05:00
c156731f0b
Allow users with canView Events to view event list. Don't allow unarchive or delete if they don't have canEdit
2020-12-08 10:33:25 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
691f9a70f9
eslint
2020-12-07 14:44:45 -06:00
1772d37c08
convert updatePresetLabels() to jquery
2020-12-07 12:32:07 -06:00
389ad22dcd
watch.js - target not $target
2020-12-07 10:36:14 -06:00
6e17b04a7e
WIP continue jquery conversion of watch.js
2020-12-07 10:22:54 -06:00
7a827c1fd6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-12-05 16:57:32 -05:00
4d33667a85
Merge branch 'release-1.34'
2020-12-05 16:51:42 -05:00
ea6478b8a0
Escape column names for mysql 8. Fixes #3092
2020-12-05 16:38:53 -05:00
fdbca4760f
dbFetchAll should always return an array. Not null on error
2020-12-05 16:38:25 -05:00
df35bd75a5
Escape column names for mysql 8
2020-12-05 16:29:23 -05:00
ed043f9d55
bw dropdown - match only on bwselect class
2020-12-05 12:31:30 -06:00
0a89b906a0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-12-05 10:41:35 -05:00
9b8f63b36f
EstimatedRamUse to Estimated Ram Use so we don't an en_gb translation
2020-12-05 10:23:29 -05:00
7106cd43a7
eslint
2020-12-04 18:30:05 -06:00
ac069e6e5e
fix zoom class in skins.js
2020-12-04 14:47:13 -06:00
0bf39dc954
fix setting the thumbnail class in events
2020-12-04 14:44:05 -06:00
21aeccb5d0
centralize thumb animation js, add delay
2020-12-04 14:35:39 -06:00
0d0eac98be
Move the form below the navbar because it has a form in it. Remove oninput from minTime and maxTime
2020-12-04 15:28:51 -05:00
11f527514e
use a common function for datetime changes.
2020-12-04 15:28:26 -05:00
d998eac6ef
Update Filter code and Groups display
2020-12-04 15:17:04 -05:00
3a7571dd63
undo bogus cache use in Object constructor
2020-12-04 15:16:43 -05:00
5665eb14f5
fix bw select again
2020-12-03 19:33:10 -06:00
e93de2a3a4
partial jquery convesion of watch.js
2020-12-03 13:12:01 -06:00
05bd6e1c56
Fix editing groups causing a new Group to be added. You have to tell cakephp which Group you are saving. Also fix the resulting output to be the saved group, not a list of monitors. Fixes #3088
2020-12-03 13:14:19 -05:00
6877054fea
Parse tree dumping should be debug not warning
2020-12-03 11:17:41 -05:00
c8aac87f74
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-12-03 10:26:27 -05:00
19122d0824
Fix bandwidth dropdown clicking
2020-12-03 10:25:59 -05:00
ce4d9cd657
put back manual refresh button on watch view
2020-12-03 08:38:28 -06:00
74fe47c4c5
don't autorefresh watch view table
2020-12-03 08:31:52 -06:00
dd0cac35fe
include filterquery in watch view event list ajax
2020-12-03 07:53:09 -06:00
a38c392266
eslint
2020-12-03 07:22:32 -06:00
d5df996bca
deploy animated thumbnails on watch view
2020-12-02 19:44:12 -06:00
76eea525b7
Merge pull request #3085 from hax0kartik/Font
...
Font
2020-12-02 16:16:21 -05:00
1c10cc492b
Fix StartTime to StartDateTime
2020-12-02 13:15:32 -05:00
aac47ed361
fixes to export functions
2020-12-02 12:02:24 -06:00
f13533cab7
convert export functions to jquery
2020-12-02 10:53:55 -06:00
70689acf8d
remove data-mobile-responsive, use table-responsive-sm instead
2020-12-02 07:47:57 -06:00
347c64eb7d
remove warning
2020-12-01 13:30:57 -06:00
6da826d79c
fix typo
2020-12-01 13:29:43 -06:00
8397ec3b9d
Merge branch 'release-1.34'
2020-12-01 14:28:10 -05:00
48775e2230
Fix Clear Log by using minTime and maxTime as timestamps. Fix export including unselected filters. Can't just serialize the form asit may contain fields in teh querystring so you get an array of values instead of a single value
2020-12-01 14:24:41 -05:00
baeb1dbd5b
Take an optional debug param in dbQuery
2020-12-01 14:07:23 -05:00
ae7a706526
Handle minTime and maxTime being specified as either a timstamp or a datetime. Remove duplicated query building code. Reduce ram requirements when exporting logs.
2020-12-01 14:04:51 -05:00
051e361958
eslint
2020-12-01 12:19:01 -06:00
b0da7f5920
fix navbar bandwidth dropdown
2020-12-01 10:27:08 -06:00
93f11bbc82
set responsive breakpoint for small screens on watch & events views
2020-12-01 09:50:32 -06:00
f12c8f453e
after deleting an event, call streamNext rather than reload
2020-12-01 09:30:06 -06:00
23fcd1f2c5
modernize the event playback view
2020-12-01 09:07:42 -06:00
ac01e0638a
Update skin.css
2020-11-30 10:19:12 -06:00
ee9f98d7e6
make modal content more readable on dark skin
2020-11-30 10:06:35 -06:00
836cd2d58d
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font
2020-11-30 09:45:39 -05:00
67dac2651b
Log an error with path when can't open video
2020-11-29 17:06:07 -05:00
528699f942
Use ctzll + new font format for improving drawing speed
2020-11-28 18:46:20 +05:30
d68b922632
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-27 13:30:31 -05:00
8c56ac80c5
Make Name,Path,Url in storage modal 100%
2020-11-27 13:30:24 -05:00
80c4e2fa57
Fix table not being 100%. Use appropriate bootstrap style labels for radios
2020-11-27 13:29:57 -05:00
a67fb0bb16
eslint
2020-11-26 19:28:25 -06:00
8d8054bc0f
deploy bstable to watch view
2020-11-26 17:00:05 -06:00
08dabf1a4f
don't add "zoom" class when thumb animation is off
2020-11-25 13:29:14 -06:00
28614ce703
change where we check for web_animate_thumbs
2020-11-25 13:16:11 -06:00
ff4b0e6309
add option to disable thumb animation
2020-11-25 13:03:16 -06:00
cf08010ebe
Fix redirect on zone editing
2020-11-18 13:04:56 -05:00
5bf5d58ac1
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
2020-11-16 11:32:50 -05:00
a2b5271835
fix copy/paste typo
2020-11-14 17:34:59 -06:00
0ffb5e153c
modify FilterTerm to support Frames view searches
2020-11-14 17:33:18 -06:00
f3756def08
deploy server side pagination for frames view
2020-11-14 14:45:22 -06:00
9aa6fea6a3
frames view server pagination WIP
2020-11-14 14:19:28 -06:00
f88d721ae3
fix issue with events view and ALL pagination
2020-11-14 10:27:33 -06:00
f32d10a1ab
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-13 17:16:13 -05:00
66f7cc55dc
Spacing code comments, quotes
2020-11-13 17:05:23 -05:00
52e747791d
rough in frames server pagination backend
2020-11-13 12:34:01 -06:00
a581cb9de1
Make various text input options be 90%
2020-11-13 10:18:35 -05:00
70ebd570e0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-13 09:52:10 -05:00
3cf31435a7
fix next/prev buttons by correcting the sort_field when it is StartTime or EndTime
2020-11-13 09:51:54 -05:00
c0225a35aa
use different variable assignment for clarity
2020-11-13 07:24:17 -06:00
a15c8ea7d8
Merge pull request #3072 from ZoneMinder/iconnor_ajax_event_changes
...
Rework code to use Filter methods to generate advanced search
2020-11-13 07:10:08 -06:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
95f8aad19b
Fix detection of filter['id']
2020-11-11 17:39:55 -05:00
fe733fe1e6
Must use & instead of & in filter redirect
2020-11-11 17:39:37 -05:00
73e8c04b6f
Fix encoding of = in filter['Id']. Fixes redirect after saving
2020-11-11 17:39:20 -05:00
52c7cc5869
reorganize code. Remove Server caching as it is done in Object.php.
2020-11-11 11:49:44 -05:00
b4aacde5bf
Remove debug. Auth is pretty solid these days
2020-11-10 13:15:46 -05:00
5b10fff2a0
Use cached objects when using new instead of only find_one
2020-11-10 13:14:36 -05:00
f2630b8fbc
Merge branch 'master' into move_event_totals_to_monitor_status
2020-11-06 14:17:23 -05:00
59403dc11b
Move event stat totals to Monitor_Status.
2020-11-06 14:00:18 -05:00
6ed006bc60
rename StartTime and EndTime to StartDateTime and EndDateTime in the named query params
2020-11-06 12:25:04 -05:00
402b559b2c
Add StartTime and EndTime virtual fields for backwards compatability
2020-11-06 11:15:12 -05:00
68cdd2123d
Merge branch 'release-1.34'
2020-11-05 13:55:15 -05:00
746882ba85
Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070
2020-11-05 13:45:02 -05:00
7b8ee6af9f
Rework code to use Filter methods to generate advanced search functionality. Reduces sql queries to 1 or 2, using count() to populate [total] and [totalNotFiltered]. Does pagination using array_splice instead of SQL queries. Will use more ram, but reduces db load.
2020-11-05 12:20:49 -05:00
ee89eb45e6
Fix EndTime to EndDateTime
2020-11-04 18:39:02 -05:00
e085e08caa
Fix missed StartTime to StartDateTime
2020-11-04 18:27:51 -05:00
130588eb8f
fix typos
2020-11-04 18:22:50 -05:00
d37bce4e0e
Fix missed StartTime to StartDateTime
2020-11-04 18:20:59 -05:00
289612a826
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-11-04 18:10:55 -05:00
b17fa8f9c1
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:58:03 -05:00
ce99a9456b
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:56:44 -05:00
68ad1cf1f7
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:56:37 -05:00
786e2fec92
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:56:27 -05:00
af9e279f9e
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:55:27 -05:00
d75e93249c
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:54:12 -05:00
9d22de98a3
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:53:45 -05:00
9e6a9cad80
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:53:17 -05:00
8029f59eac
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:52:50 -05:00
2d33dd5386
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:52:32 -05:00
0d404ac66f
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:50:45 -05:00
4731041a40
FS Storage DiskSpace isn't implemented.
2020-11-04 12:42:04 -05:00
e67532ef76
implement is_valid_attr. Fix incorrect EventDiskspace vs FS DiskSpace. FS DiskSpace isn't implemented. DiskPercent is.
2020-11-04 12:40:43 -05:00
387b2b1fc2
add attr validation to addTerm. Add addTerms
2020-11-04 12:39:42 -05:00
af399bb174
Reqiure Id to have a value not just be set
2020-11-04 09:18:41 -05:00
2c899bd3c5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-03 12:11:58 -05:00
6112db627c
Even if we found the filter in the db, if it is present in the query string, update the object with the new values
2020-11-03 11:59:28 -05:00
b2385ccecc
colour match a:link to navbar colour. This has the effect of brightening up all links.
2020-11-03 11:53:15 -05:00
dda1decfb1
When redirecting after execute, redirect to the full filter querystring, as it may not have an Id and may have additional changes
2020-11-03 11:45:22 -05:00
f7c9a0e03d
Must urlencode [Id]=
2020-11-03 11:44:54 -05:00
3b785cfde0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-02 16:31:53 -05:00
736c2e4cf5
Merge pull request #3068 from ZoneMinder/fix_endtime
...
Test for EndTime value before using strftime on it.
2020-11-02 15:21:43 -06:00
0f74e24bfc
Join Monitors as M as well in total and totalNotFiltered queries
2020-11-02 15:50:38 -05:00
bd1d4f954b
Test for EndTime value before using strftime on it.
2020-11-02 15:45:05 -05:00
96a9a73320
roll back events.php
2020-11-02 14:33:40 -06:00
7650e0bf51
cleanup my totalNotFiltered code. Join Monitors as well as they can be referenced by the filter
2020-11-02 12:43:45 -05:00
492e65c2fd
Add missing PathToAPI
2020-11-02 12:42:30 -05:00
73e6d5a9d0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-01 18:44:15 -05:00
6e3eb922e0
Use relative symlinks for monitor event directories
...
This way the link continues to work from backups and after the user moves ZM data to a new directory.
2020-11-01 14:55:08 -08:00
3d795be864
remove the thumbnail col if WEB_LIST_THUMBS is off
2020-11-01 15:46:43 -06:00
787953559d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-01 16:11:10 -05:00
824f38c746
hide settings buttons rather than disable for non Local monitors
2020-11-01 08:05:53 -06:00
30e0e49ee7
Fix total rows when using search
2020-10-31 14:09:47 -04:00
5047c28157
attempt to fix totalnotfiltered
2020-10-31 11:26:29 -05:00
41e88fad6e
translate \n to <br/>. Fixes #3064
2020-10-29 15:08:14 -04:00
Isaac Connor
Peter Keresztes Schmidt
Andrew Bauer
Isaac Connor
Pliable Pixels
rabsym
Steve Gilvarry
Andrew Bauer
hax0kartik
Matt N