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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
289612a826
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-11-04 18:10:55 -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
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
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
492e65c2fd
Add missing PathToAPI
2020-11-02 12:42:30 -05:00
3d795be864
remove the thumbnail col if WEB_LIST_THUMBS is off
2020-11-01 15:46:43 -06:00
824f38c746
hide settings buttons rather than disable for non Local monitors
2020-11-01 08:05:53 -06:00
75ec13871d
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-10-29 09:40:49 -04:00
97f4d9e7a2
Make the event count and diskspace in the storage row be a link to events for that storage area.
2020-10-29 09:40:14 -04:00
368c1649fe
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-10-29 08:47:34 -04:00
858674c0b2
Merge branch 'master' into filter_locking
2020-10-28 12:52:52 -04:00
686f793d09
fix truth value for ZM_OPT_USE_GEOLOCATION
2020-10-28 12:49:39 -04:00
df788f2810
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-28 12:40:00 -04:00
c67b3c5a1f
fix button disabled status. We now have checkboxes that aren't actions so we need to be more explicit
2020-10-26 18:49:41 -04:00
a5bb2365b5
update auth_relay when we update auth_hash
2020-10-26 18:49:03 -04:00
a2596505e9
add LockRows to Filters
2020-10-26 18:47:17 -04:00
fad4339713
no need for full page reload with server pagination
2020-10-26 12:12:50 -05:00
1f64a263eb
give better log when jqxhr is empty
2020-10-26 13:06:41 -04:00
59cf5c33c2
reset search on events load
2020-10-26 13:06:22 -04:00
e5563dc901
remove unwanted #
2020-10-25 16:06:37 -05:00
6d00924c9b
deploy server pagination for events view
2020-10-25 12:11:34 -05:00
cb073950b9
events view server pagination WIP
2020-10-25 10:28:22 -05:00
a2dc4b5f08
handle params.daa not existing
2020-10-24 09:45:38 -04:00
efaf95beda
dirty hack to rename data.filter to data.advsearch
2020-10-24 08:51:26 -04:00
da080d44c1
rename filter from bootstrap-table to advsearch so as not to conflict with our existing filter
2020-10-23 16:44:50 -04:00
8a3e0e108c
Put back filter query code
2020-10-23 14:02:27 -04:00
ad137adb4c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-23 11:30:19 -04:00
d425d1006e
push newevents.php to master
2020-10-23 10:21:32 -05:00
5d7e3b0510
handle no responseText in jqxhr
2020-10-23 11:12:57 -04:00
d62a5caccd
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-23 09:35:13 -04:00
90e81c5774
Merge branch 'release-1.34'
2020-10-23 09:34:35 -04:00
c8392feba3
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-10-22 16:35:44 -04:00
29819d8044
fix copy/paste error with events.php
2020-10-22 13:27:47 -05:00
230f35f0c0
comment out debug in events.js
2020-10-22 08:50:06 -05:00
0d14dcfbfa
WIP events view server pagination
2020-10-22 08:49:07 -05:00
9372b2ef8c
remove debug
2020-10-22 08:53:05 -04:00
452416e72a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-20 19:23:12 -04:00
d88fd5e4e0
Revert WEB_EVENT_SORT_FIELD change from StartTime to StartDateTime back to StartTime. StartTime is the column name.
2020-10-20 19:23:03 -04:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
b5aa215e31
WIP events view server pagination
2020-10-20 12:59:30 -05:00
6357c02ec9
WIP events view server pagination
2020-10-20 12:13:12 -05:00
bb5646baac
Load Logout modal content on click instead of every page load
2020-10-20 12:31:06 -04:00
5b27d77ea4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-20 11:52:25 -04:00
1a77958548
Make loading the function modal happen on click instead of every page load.
2020-10-20 11:52:18 -04:00
bfa45b0c43
continue work on event view server pagination
2020-10-20 08:10:43 -05:00
4e391708f1
event view server pagination WIP
2020-10-19 14:18:21 -05:00
8a6aaa019f
Bump version for release to 1.34.22
2020-10-19 14:29:18 -04:00
0e63874533
fix calling changeScale when scale is 0 instead of auto
2020-10-19 14:28:21 -04:00
127ef9a130
Fix scaling when using ScaleToFit
2020-10-19 14:28:02 -04:00
080557d580
add an id to buttons div so that we can use it when calling scaleToFit
2020-10-19 14:27:43 -04:00
7ae7e05f14
roughin ajax call in event.js for server side pagination
2020-10-19 09:29:39 -05:00
e2b76257eb
Merge branch 'release-1.34'
2020-10-19 09:10:28 -04:00
14894dfb00
remove extra comma
2020-10-19 09:08:25 -04:00
6f45de04f8
partial roughin ajax event view server side pagination
2020-10-19 07:50:11 -05:00
97d05c2f88
move newlog ajax request to log
2020-10-18 07:20:59 -05:00
220a89b459
fix eslint
2020-10-17 16:17:30 -04:00
be63acdcc0
rollback bstable to 1.17.1git90f47e7
2020-10-17 11:49:17 -05:00
442fadb585
link bstable locale to zoneminder's
2020-10-17 07:28:14 -05:00
4044d60412
update bstable to 9fa4c82, add bstable locale extenstion
2020-10-17 07:23:26 -05:00
1ed160866b
add legacy watch view alarm buttons to toolbar
2020-10-16 15:47:42 -05:00
3fdbae7761
add 1440p to the resolution list
2020-10-16 14:54:54 -04:00
c5cd617204
Load logoutModal on click instead of always
2020-10-16 14:51:47 -04:00
d6dfde5630
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-16 12:21:22 -04:00
8c7c4c4b1b
add a call to drawZonePoints to handle case where image doesn't load. Remove debug and dead code
2020-10-16 12:21:12 -04:00
b9b45d8b9e
definitionPanel shouldn't be floated, or relse should be set to 100% width
2020-10-16 12:14:58 -04:00
c70493a43f
Add clear: both to content div. In general the content div is 100% so should drop below floats
2020-10-16 12:14:31 -04:00
f98a885ed5
update the watch view header
2020-10-16 08:08:23 -05:00
4f56f9d82b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-15 17:20:10 -04:00
12b75e93b8
Merge branch 'release-1.34'
2020-10-15 17:19:56 -04:00
78cbacae2e
When changing rates, if not using video.js, send CMD_VARPLAY to tell zms what to do
2020-10-15 17:18:38 -04:00
5869817e0d
set playbackrates in video.js to match the ones offered by the zms player. Use the rates array set in includes/config.php
2020-10-15 17:17:20 -04:00
7bb227283d
Update rates in includes/config.php
2020-10-15 17:15:54 -04:00
2fbbe11079
make the filter button style consistent
2020-10-15 08:01:32 -05:00
f32a7aaff5
deploy insertModalHtml
2020-10-14 15:58:39 -05:00
ec040b1bfd
don't set popup flag in event view
2020-10-14 13:59:15 -05:00
a60815a700
eslint
2020-10-14 11:20:37 -05:00
c3a98c1f44
replace shutdown form submit with ajax
2020-10-14 10:03:33 -05:00
da948065bb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-14 10:39:31 -04:00
10c0a6617c
Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php.
2020-10-14 10:39:25 -04:00
ba82088b99
make all the data-on-xxx js bindings functions
2020-10-14 08:51:44 -05:00
ff14d11fef
Don't output the filter, just log it!
2020-10-13 10:07:27 -04:00
e4fec8c5ea
code style cleanups, most defaulting to 'Id' as the term attr so that we can use an empty filter as a quick jump to event feature
2020-10-13 09:02:38 -04:00
c4ea27db8d
fix buttons in shutdown modal
2020-10-12 14:51:33 -05:00
49fec5142c
remove popup code form skin.js
2020-10-12 13:34:40 -05:00
e5e1455f7a
replace embedded popuplinks in watch view
2020-10-12 13:26:20 -05:00
332ec2032a
replace createPopup with location.assign
2020-10-12 12:37:23 -05:00
ed5f6b2625
convert shutdown popup to modal
2020-10-12 12:16:52 -05:00
0f263407a5
make redirect conditional on previous view
2020-10-12 10:32:25 -05:00
3646a66168
translate unquoted literal Filter
2020-10-12 11:20:22 -04:00
1ffa1cc33b
Add button update checks for AutoUnarchive
2020-10-12 10:56:01 -04:00
1854e02ab3
Accept both Id and filter[Id] when loading filters.
2020-10-12 10:55:42 -04:00
3fa0ef25f6
Add a link to the filter representing the events list
2020-10-12 10:55:03 -04:00
03c8e86908
update some quotes
2020-10-10 11:09:51 -04:00
9cc7f0d360
Merge branch 'release-1.34'
2020-10-08 09:28:25 -04:00
c28ff1f2b4
Include loading EndTime when loading Events data so that we can determine if an event is in-progress
...
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
95b09ad182
Add samesite=strict to all Cookie setting
2020-10-07 11:26:18 -04:00
7f67d09749
test for monitorIds value before calling explode because explode will return an array with an empty first element instead of an empty array
2020-10-07 11:14:57 -04:00
ae7ed5a342
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-06 16:51:24 -04:00
9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
044ce61ddb
Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be.
2020-10-06 16:47:51 -04:00
76af02cc76
whitespace
2020-10-05 16:31:26 -05:00
01596ec26c
whitespace
2020-10-05 15:53:46 -05:00
9c7ebf8c9e
unpopup video view
2020-10-05 15:44:07 -05:00
f93450f9ea
remove plugin support for viewing downloads
2020-10-05 14:44:45 -05:00
321de3c604
only update changed elements in video view
2020-10-05 13:59:44 -05:00
862f0ca732
add xmlfooter to video view, replace mootools
2020-10-05 09:37:00 -05:00
2e6efbb349
replace inlince onchange event in control view
2020-10-03 21:44:24 -05:00
d9b8a7ceb2
remove unused view
2020-10-03 21:35:38 -05:00
adb715c42c
fix typo
2020-10-03 21:32:07 -05:00
a0ad52bac9
replace another inline onchange event
2020-10-03 21:30:48 -05:00
b4d2fa5e75
replace inline onchange event
2020-10-03 21:14:24 -05:00
65b6dad48c
eslint
2020-10-03 17:38:56 -05:00
8d19cee811
unpopup the addnewuser button
2020-10-03 17:12:44 -05:00
aee5430bc8
only load preset and settings modals when needed
2020-10-03 17:00:20 -05:00
1643fb686b
convert settings popup to modal
2020-10-03 16:51:25 -05:00
391ce88f05
eslint
2020-10-02 21:11:54 -05:00
a97e526298
fix save button in controlpreset modal
2020-10-02 16:10:32 -05:00
802e439cb5
convert controlpreset view to a modal
2020-10-02 15:46:28 -05:00
7b5090ceab
move newlog view to log view
2020-10-02 13:26:35 -05:00
c5f69b9441
eslint
2020-10-02 13:24:30 -05:00
950b04c659
convert popuplink
2020-10-02 12:51:17 -05:00
6c0f61ebbd
rework devices view, remove inline onclick
2020-10-02 12:39:05 -05:00
1691e4321b
don't log ajax response text if it is empty
2020-10-02 10:28:50 -05:00
a80b4b91fb
fix x10 device edit
2020-10-01 16:03:58 -05:00
186b8ac947
convert x10 device view to a modal
2020-10-01 15:52:33 -05:00
c61c111d9e
modernize devices view
2020-10-01 12:52:20 -05:00
ef958b1649
enable mgmt of x10 device permissions
2020-10-01 10:51:59 -05:00
e26e36606f
update version check logic in navbar
2020-10-01 08:46:58 -05:00
c4cf52c2bc
new version notice is now part of the navbar
2020-10-01 08:15:20 -05:00
591a30f1fe
fix typo
2020-09-30 13:33:11 -05:00
4bc373105d
fix typo
2020-09-30 13:12:58 -05:00
9b9138f113
replace popup calls in montagereview
2020-09-30 12:20:24 -05:00
d77b55d1d6
replace popup code in add_monitor
2020-09-30 10:40:13 -05:00
9bb82f6e9a
whitespace
2020-09-30 09:25:52 -05:00
2d30d7aafa
convert download view to modal
2020-09-30 09:12:54 -05:00
3024c46dbb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-29 14:50:13 -04:00
6eaa8aa211
whitespace
2020-09-29 13:05:00 -05:00
4694ce59bb
export event function does not need element
2020-09-29 12:55:57 -05:00
a12a870e2c
download.js - replace mootools with jquery
2020-09-29 12:51:01 -05:00
953a6e0785
more fixes to download view
2020-09-29 10:15:58 -05:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
5200af8206
add missing return to download view
2020-09-29 09:50:15 -05:00
1af20cea6a
Fix unarchive. The reload was killing the getJSON. Should only do that on success
2020-09-29 09:42:31 -04:00
fc366aa503
add missing echo
2020-09-28 15:41:07 -05:00
1361f0936c
clean up download view
2020-09-28 15:38:56 -05:00
3531b8a854
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-09-28 16:14:07 -04:00
26636e1172
calculate thumb height based on ratio for frames
2020-09-28 16:13:56 -04:00
58902c70d6
use output_script_if_exists to cache_bust most of the js
2020-09-28 09:49:07 -04:00
ecac5e051a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-28 09:34:14 -04:00
0a4a144bbc
Merge branch 'location'
2020-09-28 09:33:28 -04:00
699cbed6af
add back and refresh buttons to export view
2020-09-27 12:43:12 -05:00
9ea58dc4a1
eslint
2020-09-27 12:16:04 -05:00
c1a0afef95
make group view into a modal
2020-09-27 12:12:01 -05:00
784533ac07
clean up group view
2020-09-27 08:11:45 -05:00
47e5a26da4
eslint
2020-09-27 07:41:05 -05:00
a6413ccd7f
call modal when edit btn is clicked on event view
2020-09-27 07:12:32 -05:00
2655118cbd
change call to popup -> view in event.js
2020-09-26 21:21:29 -05:00
9d2450d55d
load export view, rather than popup
2020-09-26 21:15:50 -05:00
b2cf48a645
remove unused call to filter popup
2020-09-26 21:06:57 -05:00
1260d7bbb2
convert controlcap tabs to pills
2020-09-26 17:05:13 -05:00
935f73ad33
reconfig controlcap cancel button
2020-09-26 16:39:31 -05:00
dc08319037
add navbar to error view
2020-09-26 14:29:02 -05:00
112003f9de
eslint
2020-09-26 13:55:56 -05:00
0c4fcbbe97
convert controlcaps view to bstable
2020-09-26 12:09:41 -05:00
48a649a132
extend pill list bkgnd vertically in options
2020-09-26 07:30:15 -05:00
df5192a6b4
link to controlcaps from options view
2020-09-25 21:46:54 -05:00
b7efdebf9a
dynamically find the Level col index
2020-09-25 21:26:22 -05:00
f4e7e264f0
fix makelink
2020-09-25 16:18:44 -05:00
582d85f083
unpopup the controlcaps views
2020-09-25 16:12:05 -05:00
eedf18073f
add navbar to controlcap views
2020-09-25 16:05:16 -05:00
6a5610e404
add back and refresh buttons to user view
2020-09-25 15:49:18 -05:00
ea99bc173e
add navbar to monitor probe views
2020-09-25 14:49:14 -05:00
2b0badfebe
add back and refresh buttons to zones
2020-09-25 13:44:55 -05:00
8018bd4ed9
add back & refresh buttons to zone view
2020-09-25 13:37:06 -05:00
d66b0be1bb
fix scalecontrol on frame view
2020-09-25 13:08:55 -05:00
c73dbc480f
unpopup the svg ploygon in zones
2020-09-25 12:34:04 -05:00
ae9139b00c
unpopup zone view
2020-09-25 10:52:13 -05:00
1ac5572d59
unpopup the zones view
2020-09-25 07:56:09 -05:00
493b9d0ef7
revert newlog row colors back to former
2020-09-25 07:21:14 -05:00
f9d28ddabe
stick a map on the location tab
2020-09-24 20:31:22 -04:00
a3f4837186
Use config options for tile datam access tokens and turning geolocation on/off
2020-09-24 20:30:57 -04:00
a109d7bba0
leaflet can't be cache busted so update output_link_if_exists and output_script_if_exists to take a cache_bust flag
2020-09-24 20:21:38 -04:00
386f991364
Merge branch 'master' into location
2020-09-24 19:28:57 -04:00
bcb430d393
copy log.css to newlog and add a style for bg-danger
2020-09-24 16:03:26 -04:00
310e52840d
remove under construction banner
2020-09-24 12:29:28 -05:00
89fddf3555
decrease refresh timing
2020-09-24 12:27:03 -05:00
d58f776d9d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-24 12:13:01 -04:00
e6d7a528d8
Use newer Filter object methods
2020-09-24 12:12:49 -04:00
cdc07715b7
remove parseFilterToTre and fix filter['query'] to filter['querystring']
2020-09-24 12:12:37 -04:00
e4a1bacbbf
get adv search working in newlog view
2020-09-24 11:05:34 -05:00
88f1dcca13
centralize bstable icon var, change table refresh icon
2020-09-24 08:25:39 -05:00
e4bbbce161
fix eslint
2020-09-24 09:13:44 -04:00
9c7bbd4aa7
introduce output_script_if_exists, use it to link leaflet.js if it exists
2020-09-24 09:13:25 -04:00
624bcdcde0
Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them
2020-09-24 09:01:30 -04:00
b4450fecec
init bootstrap-table only once
2020-09-23 14:32:40 -05:00
16a593e904
eslint
2020-09-23 13:56:41 -05:00
3f2f7359f0
rough in new log view - very rough
2020-09-23 13:09:19 -05:00
70be6bc84c
Add an estimated ram use to buffer tabs
2020-09-22 16:21:59 -04:00
eb736df405
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-22 15:51:49 -04:00
fbc15c8109
Fix FPS Report Interval label
2020-09-22 15:51:44 -04:00
d2ba9c5234
load bs-table toolbar & autorefresh
2020-09-22 14:23:25 -05:00
2bdbb48692
update to bootstrap-table 1.18.0 and more extensions
2020-09-22 14:09:02 -05:00
ed6d5a55a5
put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button
2020-09-22 14:33:26 -04:00
b1dd42dd8b
Use bootstrap nav pills to just hide/show the tab instead of doing form submits in monitor editing
2020-09-22 14:05:11 -04:00
7196eaf0d0
Minimum value for label position is 0, not 1.
2020-09-22 13:14:25 -04:00
2457dcb16f
Minimum value for label position is 0, not 1.
2020-09-22 13:12:39 -04:00
b6541aa1ff
Move log export to a generic modal
2020-09-21 13:01:58 -04:00
cbbdfdbd43
Introduce generic getModal and manageModalBtns
2020-09-21 13:00:55 -04:00
2ff2fbecd9
Remove fieldset styling. We were conflicting with bootstrap
2020-09-21 13:00:29 -04:00
1d1b0e58d2
consolidate getJson fail callbacks to one function
2020-09-20 08:41:16 -05:00
c75f5c68c1
unpopup the log view
2020-09-19 12:59:15 -05:00
0a7848d9d2
remove uneeded state php and js files
2020-09-19 12:36:55 -05:00
a3c0e160a2
convert state modal to ajax request
2020-09-19 12:36:04 -05:00
bf29357455
Merge branch 'release-1.34'
2020-09-19 12:01:21 -04:00
3492582b98
add missing css for settings popup
2020-09-19 12:00:32 -04:00
7c1ec4f957
convert logout modal to ajax request
2020-09-19 10:44:05 -05:00
Andrew Bauer
Isaac Connor
Andrew Bauer
Isaac Connor
hax0kartik