Andrew Bauer
|
9af383db92
|
set the width style for the objdetect modal
|
2020-12-22 12:30:44 -06:00 |
|
Andrew Bauer
|
2ea4b39d93
|
don't use quotes around the event id
|
2020-12-22 11:46:31 -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
|
381cc30e5d
|
Set default value for DefaultScale to 0 which is ScaleToFit
|
2020-12-18 10:54:08 -05: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
|
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 |
|
Andrew Bauer
|
2f0df74c54
|
show the analyse image in frames view if it exists
|
2020-12-12 11:37:50 -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
|
bfd16db34b
|
add format padding so that right align file size strings will line up nicely.
|
2020-12-11 09:33:36 -05:00 |
|
Isaac Connor
|
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 |
|
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
|
da8d96ddda
|
Don't pass types to changes, it doesn't do anything. Add DecodingEnabled to request
|
2020-12-10 16:24:09 -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
|
ced396e437
|
Add DecodingEnabled to Monitors
|
2020-12-10 14:06:26 -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 |
|
Isaac Connor
|
5482d3b3d5
|
Quiet error when calling logout when already logged out
|
2020-12-09 17:56:27 -05:00 |
|
Isaac Connor
|
eb4b7f248d
|
handle sort_field and limit not existing in _REQUEST
|
2020-12-09 17:56:27 -05: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 |
|
Isaac Connor
|
63e36340c6
|
Remove extra }
|
2020-12-08 11:26:52 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
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
|
fdbca4760f
|
dbFetchAll should always return an array. Not null on error
|
2020-12-05 16:38:25 -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 |
|
Isaac Connor
|
3a7571dd63
|
undo bogus cache use in Object constructor
|
2020-12-04 15:16:43 -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
|
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 |
|
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 |
|
Andrew Bauer
|
74fe47c4c5
|
don't autorefresh watch view table
|
2020-12-03 08:31:52 -06:00 |
|
Andrew Bauer
|
dd0cac35fe
|
include filterquery in watch view event list ajax
|
2020-12-03 07:53:09 -06:00 |
|
Andrew Bauer
|
a38c392266
|
eslint
|
2020-12-03 07:22:32 -06:00 |
|
Andrew Bauer
|
d5df996bca
|
deploy animated thumbnails on watch view
|
2020-12-02 19:44:12 -06:00 |
Isaac Connor
|
76eea525b7
|
Merge pull request #3085 from hax0kartik/Font
Font
|
2020-12-02 16:16:21 -05:00 |
|
Isaac Connor
|
1c10cc492b
|
Fix StartTime to StartDateTime
|
2020-12-02 13:15:32 -05:00 |
|
Andrew Bauer
|
aac47ed361
|
fixes to export functions
|
2020-12-02 12:02:24 -06:00 |
|
Andrew Bauer
|
f13533cab7
|
convert export functions to jquery
|
2020-12-02 10:53:55 -06:00 |
|
Andrew Bauer
|
70689acf8d
|
remove data-mobile-responsive, use table-responsive-sm instead
|
2020-12-02 07:47:57 -06:00 |
|
Andrew Bauer
|
347c64eb7d
|
remove warning
|
2020-12-01 13:30:57 -06:00 |
|
Andrew Bauer
|
6da826d79c
|
fix typo
|
2020-12-01 13:29:43 -06:00 |
|
Isaac Connor
|
8397ec3b9d
|
Merge branch 'release-1.34'
|
2020-12-01 14:28:10 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
baeb1dbd5b
|
Take an optional debug param in dbQuery
|
2020-12-01 14:07:23 -05:00 |