Andrew Bauer
|
5ad8e90dda
|
eslint
|
2021-01-02 13:48:40 -06:00 |
Andrew Bauer
|
f0610b5eb7
|
eslint
|
2021-01-02 13:25:38 -06:00 |
Andrew Bauer
|
809e67d352
|
eslint
|
2021-01-02 12:24:12 -06:00 |
Andrew Bauer
|
e9bdaa988e
|
eslint
|
2021-01-02 12:06:02 -06:00 |
Andrew Bauer
|
cc69b150de
|
WIP replace mootools in zone.js
|
2021-01-02 11:58:03 -06:00 |
Andrew Bauer
|
62575c0d0e
|
WIP replace mootools in zone.js
|
2021-01-02 11:33:21 -06:00 |
Andrew Bauer
|
ebad6194ee
|
remove replace mootools in drawZonePoints function
|
2021-01-02 10:52:17 -06:00 |
Andrew Bauer
|
12c0ccea7c
|
handle objdetect links in a more consistent manner
|
2021-01-02 08:52:26 -06:00 |
Andrew Bauer
|
a61da04969
|
prevent page scrolling when objdetect modal is opened
|
2021-01-02 08:06:35 -06:00 |
Andrew Bauer
|
ea7184e619
|
remove redundant modal toggle from events.js
|
2021-01-01 09:36:49 -06:00 |
rabsym
|
b7970d69a5
|
Avoid top-scroll when returning from bs_modal objdetect
|
2021-01-01 14:15:35 +01:00 |
Andrew Bauer
|
bc30d303f7
|
upgrade to bootstrap-table 18.1 release
|
2020-12-30 08:01:28 -06:00 |
Andrew Bauer
|
2adeedf418
|
additional mootools cleanup in event.js
|
2020-12-25 07:19:41 -06:00 |
Andrew Bauer
|
5fa8cbf158
|
add Frames button to event view
|
2020-12-24 14:46:13 -06:00 |
Andrew Bauer
|
e66b050c72
|
WIP jquery conversion of event view
|
2020-12-24 10:38:44 -06:00 |
Andrew Bauer
|
b093e99688
|
disable click to select on the events table Cause column
|
2020-12-24 07:10:47 -06:00 |
Andrew Bauer
|
816c306518
|
use jquery for submitTab
|
2020-12-23 12:29:39 -06:00 |
Andrew Bauer
|
a94550795b
|
update setButtonState
|
2020-12-23 12:20:31 -06:00 |
Andrew Bauer
|
f64f3262ed
|
WIP replace mootools in evnet.js
|
2020-12-23 12:19:35 -06:00 |
Andrew Bauer
|
f857d12103
|
WIP replace mootools in event.js
|
2020-12-23 10:51:23 -06:00 |
Andrew Bauer
|
493bfa6a16
|
eslint
|
2020-12-23 09:15:31 -06:00 |
Andrew Bauer
|
3c79204592
|
replace mootools in add_monitors
|
2020-12-23 08:54:11 -06:00 |
Andrew Bauer
|
c91a0b2c09
|
fixup jquery click functions
|
2020-12-23 08:37:28 -06:00 |
Andrew Bauer
|
c497b94378
|
use tlzoom class to avoid conflict with thumbnail zoom
|
2020-12-23 07:57:44 -06:00 |
Andrew Bauer
|
a9b92905ca
|
eslint
|
2020-12-22 19:07:12 -06:00 |
Andrew Bauer
|
cc5a732103
|
continue work on timeline.js
|
2020-12-22 16:06:21 -06:00 |
Isaac Connor
|
6be9b294ef
|
Hidden and hidden are two very different classes
|
2020-12-22 17:00:07 -05:00 |
Andrew Bauer
|
8a26252914
|
update object detected link in events
|
2020-12-22 12:42:27 -06:00 |
Andrew Bauer
|
9af383db92
|
set the width style for the objdetect modal
|
2020-12-22 12:30:44 -06:00 |
Andrew Bauer
|
ee45916526
|
move objdetect image to a modal
|
2020-12-22 10:08:31 -06:00 |
Andrew Bauer
|
cbe04674c5
|
remove non-existent id preview
|
2020-12-21 15:59:05 -06:00 |
Andrew Bauer
|
d080109f4b
|
eslint
|
2020-12-21 15:20:38 -06:00 |
Andrew Bauer
|
663748d9a7
|
partial replace mootools
|
2020-12-21 13:07:14 -06:00 |
Andrew Bauer
|
1f3fd93296
|
use setTimeout instead of mootools pass
|
2020-12-20 15:21:38 -06:00 |
Andrew Bauer
|
92361210ce
|
eslint
|
2020-12-20 15:07:16 -06:00 |
Andrew Bauer
|
1d6c4664dc
|
replace mootools in export
|
2020-12-20 10:54:18 -06:00 |
Andrew Bauer
|
0b569e7e37
|
replace mootools in control.js
|
2020-12-20 08:29:39 -06:00 |
Andrew Bauer
|
66ae2c0461
|
replace mootools request JSON
|
2020-12-20 07:59:17 -06:00 |
Isaac Connor
|
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 |
Isaac Connor
|
a855656b88
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-12-17 09:27:23 -05:00 |
Isaac Connor
|
5602b92699
|
Fix issue with timeline where it only shows first frame
|
2020-12-17 09:26:59 -05:00 |
Isaac Connor
|
7f9b977ec2
|
rename onDownClick to onRenameClick cutnpaste error
|
2020-12-15 16:57:27 -05:00 |
Isaac Connor
|
aed83cab31
|
Load delconfirm content on demand
|
2020-12-15 10:11:30 -05:00 |
Isaac Connor
|
bc07c38dc8
|
add 704x576 PAL D1
|
2020-12-14 12:57:59 -05:00 |
Andrew Bauer
|
191e213337
|
upgrade to jquery 3.5.1, use minified javascripts
|
2020-12-14 10:02:43 -06:00 |
Andrew Bauer
|
a5b945f97a
|
touch up event view stat list
|
2020-12-14 06:55:45 -06:00 |
Andrew Bauer
|
4ae47659df
|
use js to build event stats
|
2020-12-13 21:19:38 -06:00 |
Isaac Connor
|
43d0b0fd55
|
Add D1-PAL resolution
|
2020-12-13 16:47:51 -05:00 |
Andrew Bauer
|
48c6309394
|
add emailed & archived status to event view
|
2020-12-13 15:01:47 -06:00 |
Andrew Bauer
|
882447317a
|
eslint
|
2020-12-13 14:42:39 -06:00 |
Andrew Bauer
|
c24564e0cd
|
insert frame stats into frame view
|
2020-12-13 13:20:26 -06:00 |
Andrew Bauer
|
71d1607f69
|
fix php -> js issue when $alarmframe was false
|
2020-12-12 15:06:59 -06:00 |
Andrew Bauer
|
237335c022
|
watch.js - finish mootools replacement
|
2020-12-12 12:45:36 -06:00 |
Isaac Connor
|
51a862057f
|
Fix a link missing a quote
|
2020-12-11 09:49:43 -05:00 |
Isaac Connor
|
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 |
Isaac Connor
|
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 |
Isaac Connor
|
77a35c1813
|
right align colDiskSpace so that digits line up nicely
|
2020-12-11 09:33:54 -05:00 |
Isaac Connor
|
8bda0b5504
|
fix element name on DecodingEnabled
|
2020-12-10 16:24:45 -05:00 |
Isaac Connor
|
c37433acfc
|
show/hide DecodingEnabled depending on function
|
2020-12-10 16:24:33 -05:00 |
Isaac Connor
|
5c1135b2a7
|
Merge branch 'master' into no_decode
|
2020-12-10 15:15:32 -05:00 |
Isaac Connor
|
eb00cf405a
|
Add DecodingEnabled to monitor view
|
2020-12-10 15:14:37 -05:00 |
Isaac Connor
|
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 |
Isaac Connor
|
b12f1cce5b
|
add Function help text to monitor view
|
2020-12-10 14:32:17 -05:00 |
Isaac Connor
|
66a1660423
|
Add missing comma
|
2020-12-10 14:08:01 -05:00 |
Isaac Connor
|
4667e21636
|
Add DecodingEnabled to Function modal
|
2020-12-10 14:06:40 -05:00 |
Isaac Connor
|
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 |
Andrew Bauer
|
9fb953bc84
|
set the right image attributes for frames view
|
2020-12-10 07:24:48 -06:00 |
Andrew Bauer
|
3a4cdb7e50
|
eslint
|
2020-12-09 20:06:38 -06:00 |
Andrew Bauer
|
e0ac68786f
|
remove unneeded thumb animation functions from frames.js
|
2020-12-09 18:48:58 -06:00 |
Andrew Bauer
|
39023b3e7b
|
don't set zoom class in frames.js
|
2020-12-09 18:19:10 -06:00 |
Andrew Bauer
|
c43ffcf58f
|
eslint
|
2020-12-09 18:02:34 -06:00 |
Andrew Bauer
|
026b8cfb0c
|
eslint
|
2020-12-09 17:58:46 -06:00 |
Andrew Bauer
|
951debab7f
|
watch.js - replace mootools ajax w/ jquery
|
2020-12-09 12:25:40 -06:00 |
Andrew Bauer
|
4e09a32836
|
fix one canEdit
|
2020-12-08 14:36:19 -06:00 |
Andrew Bauer
|
69e540c104
|
deploy canView and canEdit js objects
|
2020-12-08 14:25:48 -06:00 |
Isaac Connor
|
63c483ba92
|
canEditMonitors is set in skin.js.php
|
2020-12-08 11:27:18 -05:00 |
Andrew Bauer
|
691f9a70f9
|
eslint
|
2020-12-07 14:44:45 -06:00 |
Andrew Bauer
|
1772d37c08
|
convert updatePresetLabels() to jquery
|
2020-12-07 12:32:07 -06:00 |
Andrew Bauer
|
389ad22dcd
|
watch.js - target not $target
|
2020-12-07 10:36:14 -06:00 |
Andrew Bauer
|
6e17b04a7e
|
WIP continue jquery conversion of watch.js
|
2020-12-07 10:22:54 -06:00 |
Isaac Connor
|
7a827c1fd6
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-12-05 16:57:32 -05:00 |
Isaac Connor
|
4d33667a85
|
Merge branch 'release-1.34'
|
2020-12-05 16:51:42 -05:00 |
Isaac Connor
|
ea6478b8a0
|
Escape column names for mysql 8. Fixes #3092
|
2020-12-05 16:38:53 -05:00 |
Isaac Connor
|
df35bd75a5
|
Escape column names for mysql 8
|
2020-12-05 16:29:23 -05:00 |
Andrew Bauer
|
ed043f9d55
|
bw dropdown - match only on bwselect class
|
2020-12-05 12:31:30 -06:00 |
Isaac Connor
|
0a89b906a0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-12-05 10:41:35 -05:00 |
Isaac Connor
|
9b8f63b36f
|
EstimatedRamUse to Estimated Ram Use so we don't an en_gb translation
|
2020-12-05 10:23:29 -05:00 |
Andrew Bauer
|
7106cd43a7
|
eslint
|
2020-12-04 18:30:05 -06:00 |
Andrew Bauer
|
ac069e6e5e
|
fix zoom class in skins.js
|
2020-12-04 14:47:13 -06:00 |
Andrew Bauer
|
0bf39dc954
|
fix setting the thumbnail class in events
|
2020-12-04 14:44:05 -06:00 |
Andrew Bauer
|
21aeccb5d0
|
centralize thumb animation js, add delay
|
2020-12-04 14:35:39 -06:00 |
Isaac Connor
|
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 |
Isaac Connor
|
11f527514e
|
use a common function for datetime changes.
|
2020-12-04 15:28:26 -05:00 |
Isaac Connor
|
d998eac6ef
|
Update Filter code and Groups display
|
2020-12-04 15:17:04 -05:00 |
Andrew Bauer
|
5665eb14f5
|
fix bw select again
|
2020-12-03 19:33:10 -06:00 |
Andrew Bauer
|
e93de2a3a4
|
partial jquery convesion of watch.js
|
2020-12-03 13:12:01 -06:00 |
Isaac Connor
|
6877054fea
|
Parse tree dumping should be debug not warning
|
2020-12-03 11:17:41 -05:00 |
Isaac Connor
|
c8aac87f74
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-12-03 10:26:27 -05:00 |
Isaac Connor
|
19122d0824
|
Fix bandwidth dropdown clicking
|
2020-12-03 10:25:59 -05:00 |
Andrew Bauer
|
ce4d9cd657
|
put back manual refresh button on watch view
|
2020-12-03 08:38:28 -06:00 |