Isaac Connor
|
61bc0ddd0a
|
add missing t and merge some lines
|
2020-01-07 11:01:53 -05:00 |
|
Isaac Connor
|
71581831b5
|
fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons
|
2020-01-05 17:34:27 -05:00 |
|
Isaac Connor
|
6ac26ec1aa
|
quotes
|
2020-01-05 17:33:53 -05:00 |
|
Isaac Connor
|
00f8a450de
|
spaces and quotes
|
2020-01-05 14:59:25 -05:00 |
|
Isaac Connor
|
7fdf6165d5
|
Fix case in var name
|
2020-01-03 17:08:11 -05:00 |
|
Isaac Connor
|
0a495395b0
|
Restore Gain tab
|
2020-01-03 16:34:46 -05:00 |
|
Isaac Connor
|
f572c4092a
|
add checks for Zoom, Focus, White, Iris movement types
|
2020-01-03 15:58:57 -05:00 |
|
Isaac Connor
|
0b3776dbf0
|
change text inputs to number inputs, cleanups
|
2020-01-03 15:57:29 -05:00 |
|
Isaac Connor
|
3cfc1a0a6d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-02 16:45:39 -05:00 |
|
Isaac Connor
|
60d45d967f
|
test for existence of selected checkboxes in post data because if none are selected, the array won't exist
|
2020-01-02 10:17:07 -05:00 |
Andrew Bauer
|
98f7fb63b9
|
fix eslint errors
|
2019-12-31 19:24:51 -06:00 |
|
Isaac Connor
|
714d304528
|
Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation
|
2019-12-31 19:10:29 -05:00 |
|
Isaac Connor
|
1977e48ddd
|
DefaultScale is a member of the Monitor, not the event
|
2019-12-26 15:21:27 -05:00 |
|
Isaac Connor
|
42a724891b
|
spacing
|
2019-12-20 16:11:38 -05:00 |
|
Isaac Connor
|
63d20a1514
|
Move hidden inputs to top of form
|
2019-12-20 16:11:24 -05:00 |
|
Isaac Connor
|
5a45835006
|
break up long lines
|
2019-12-20 16:11:10 -05:00 |
|
Isaac Connor
|
23dde04725
|
remove timeout on changing runstate.
|
2019-12-20 16:10:30 -05:00 |
|
Isaac Connor
|
3c59be9616
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-12-19 09:24:44 -05:00 |
|
Isaac Connor
|
958a6b8218
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-12-18 19:06:19 -05:00 |
|
Isaac Connor
|
e39a95d761
|
Add AlarmedZoned to filters, work on fixing filter behaviour in js. Enable viewing filter results in montagereview
|
2019-12-18 19:06:10 -05:00 |
|
Isaac Connor
|
67cc9faa8c
|
remove contentForm id from form in state view which isn't used and conflicts if it is used anywhere else.
|
2019-12-18 19:05:06 -05:00 |
|
Isaac Connor
|
34354f5871
|
Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab.
|
2019-12-18 12:13:00 -05:00 |
|
Isaac Connor
|
3b12b67b4a
|
fix eslint
|
2019-12-18 10:40:51 -05:00 |
|
Isaac Connor
|
5b7efb2b33
|
fix mouseover streaming in chrome when adblocker disabled
|
2019-12-13 17:48:22 -05:00 |
|
Isaac Connor
|
0dbc1ef15c
|
Use multiport when talking monitor stream on montage
|
2019-12-13 11:51:55 -05:00 |
|
Isaac Connor
|
0bbbbb302e
|
add default for Units in new zone
|
2019-12-13 11:51:07 -05:00 |
|
Isaac Connor
|
3af6358314
|
fix & to &
|
2019-12-02 15:49:49 -05:00 |
|
Isaac Connor
|
72cb5bd1bb
|
add missing </select>
|
2019-12-02 15:49:42 -05:00 |
|
Isaac Connor
|
09faa0a731
|
fix & to &
|
2019-12-02 15:49:32 -05:00 |
|
Isaac Connor
|
b686649589
|
fix & instead of &.
|
2019-12-02 15:34:31 -05:00 |
|
Isaac Connor
|
8bf74d2f35
|
fix & instead of &.
|
2019-12-02 15:34:23 -05:00 |
|
Isaac Connor
|
24022d157d
|
use & instead of &. Put inputs out of table where they belong
|
2019-12-02 15:33:58 -05:00 |
|
Isaac Connor
|
f7e01aa999
|
switch to material icon for dot
|
2019-12-02 14:31:05 -05:00 |
|
Isaac Connor
|
cf35db120d
|
change to material icons, fix missing div
|
2019-12-02 14:21:51 -05:00 |
|
Isaac Connor
|
8e645e45e1
|
fix selecting Monitors by passing MonitorId as MonitorId[]
|
2019-12-02 14:21:25 -05:00 |
|
Isaac Connor
|
b70b75421b
|
quotes and spacing
|
2019-12-02 14:18:27 -05:00 |
|
Isaac Connor
|
9d0a416311
|
remove debugging code
|
2019-12-02 13:41:42 -05:00 |
|
Isaac Connor
|
c9a324b7b3
|
improve the configureExportButton to look at specific inputs instead of just counting checkboxes
|
2019-12-02 13:40:02 -05:00 |
|
Isaac Connor
|
09a6e06132
|
change layout from a table to something more bootstrappy. Use the new html_radio function generate the radio buttons for Format and Compression. Remove the data-on-click from the export button because we added setting up the click event in the javascript already
|
2019-12-02 13:38:23 -05:00 |
Isaac Connor
|
7e92900542
|
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
|
2019-11-29 13:50:02 -05:00 |
|
Isaac Connor
|
5ebf929598
|
Add Event counts, event disk usage to storage tab of options. Disable checkbox selection when there are events stored on the storage area.
|
2019-11-26 14:36:39 -05:00 |
|
Isaac Connor
|
ab9f99bdbb
|
Fix Width & Height rotation when scaling. Fixes #2760
|
2019-11-22 12:18:30 -05:00 |
|
Isaac Connor
|
5feeedf7f4
|
Mostly spacing, but Event doesn't have DefaultScale, that comes from Monitor
|
2019-11-20 09:31:58 -05:00 |
|
Isaac Connor
|
ac96a19371
|
Fix filtering monitors by user's MonitorId restriction
|
2019-11-19 17:21:01 -05:00 |
|
Isaac Connor
|
207e5918c8
|
fix lint, remove debug
|
2019-11-19 11:37:45 -05:00 |
|
Isaac Connor
|
56618aac32
|
Handle buttons not existing
|
2019-11-10 15:49:39 -05:00 |
|
Isaac Connor
|
5b02bc76f4
|
Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly
|
2019-11-05 10:07:42 -05:00 |
|
Isaac Connor
|
54c11bc0d1
|
define monitor_options as an empty array instead of php implicitly dealing with it
|
2019-11-01 13:42:01 -04:00 |
|
Isaac Connor
|
a20517a6db
|
spacing
|
2019-11-01 13:41:37 -04:00 |
|
Isaac Connor
|
3653ad5ce3
|
update group editing, solving inline javascript problems and removing cruft
|
2019-11-01 13:37:52 -04:00 |
|
Isaac Connor
|
6ae220f756
|
improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript
|
2019-10-29 18:06:32 -04:00 |
|
Isaac Connor
|
77118d55b2
|
add 4CIF aspect ratio padding. Fixes #2738
|
2019-10-23 09:50:49 -04:00 |
|
Isaac Connor
|
13b02284fe
|
Merge branch 'master' into timezone_as_config
|
2019-10-18 13:58:22 -04:00 |
|
Isaac Connor
|
524a39a224
|
changeCodec no longer needs to be passed this
|
2019-10-18 13:40:29 -04:00 |
Isaac Connor
|
fdf48c4123
|
Merge pull request #2726 from externo6/more-filter-options
More filter options
|
2019-10-16 10:15:58 -04:00 |
|
Isaac Connor
|
f25a823bc8
|
Fix event => zm_event
|
2019-10-16 08:53:40 -04:00 |
|
Isaac Connor
|
8ee567442e
|
UPdate replay, scale, codec dropdown onchanges
|
2019-10-15 15:04:14 -04:00 |
|
Isaac Connor
|
1cf034ec5f
|
fix inline js on the back/close button
|
2019-10-08 18:49:29 -04:00 |
|
Isaac Connor
|
5040d5b075
|
remove extra (
|
2019-10-05 16:56:05 -04:00 |
|
Isaac Connor
|
b1496643eb
|
fix js error in onvif probe
|
2019-10-03 17:31:10 -04:00 |
|
Isaac Connor
|
5384b9345a
|
fix errors on centos 7 with the functions view
|
2019-10-03 17:30:52 -04:00 |
|
Isaac Connor
|
11fe748154
|
Sort control capabilities by Name instead of Id
|
2019-10-03 17:30:31 -04:00 |
|
Isaac Connor
|
17611f2e4b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-10-02 19:38:21 -04:00 |
|
Isaac Connor
|
769717b571
|
Merge pull request #2715 from connortechnology/fix_2620
Add delete from logs ajax capability. Make the clear button use it. …
|
2019-10-02 16:43:08 -04:00 |
|
Isaac Connor
|
95615fee35
|
fix eslint
|
2019-10-02 16:42:50 -04:00 |
|
Isaac Connor
|
6b65e9a60c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-10-02 16:41:20 -04:00 |
|
Isaac Connor
|
7b93a445b8
|
Finish updating the linked Monitors dropdown
|
2019-10-02 15:42:56 -04:00 |
|
Isaac Connor
|
e4b5052fb4
|
Add delete from logs ajax capability. Make the clear button use it. Fixes #2620
|
2019-10-02 15:39:04 -04:00 |
|
Isaac Connor
|
d02aee64e4
|
Add setting of timezone to Options/Config instead of php.ini
|
2019-10-02 09:07:18 -04:00 |
|
Isaac Connor
|
b4d5d92d86
|
Add some non standard resolutions available on some vivotek cameras
|
2019-09-30 15:06:32 -04:00 |
Andrew Bauer
|
90b02beb94
|
fix eslint
|
2019-09-30 09:52:41 -05:00 |
|
Isaac Connor
|
393f0a369c
|
Revamp timeline. Make it handle being full browser width. remove onclicks.
|
2019-09-28 14:23:23 -04:00 |
|
Isaac Connor
|
deef948964
|
Allow anyone to change their skin
|
2019-09-28 12:58:17 -04:00 |
|
Isaac Connor
|
ec9e94b99d
|
Don't add checkboxes if can't edit groups
|
2019-09-28 12:58:01 -04:00 |
externo6
|
7479d3f1f1
|
Add LIKE and NOT LIKE to filter options
This is useful for filtering notes.
EG filtering detected objects from zmeventnofification;
WHERE notes LIKE %detect%
WHERE notes NOT LIKE %car%
|
2019-09-28 13:03:16 +01:00 |
|
Isaac Connor
|
ebcacaa660
|
Use material icons for buttons
|
2019-09-26 16:26:37 -04:00 |
|
Isaac Connor
|
fdaee75310
|
Use material icons for buttons. Hide the stop button because it does nothing.
|
2019-09-26 16:26:18 -04:00 |
|
Isaac Connor
|
e4265bd075
|
spaces
|
2019-09-26 16:13:49 -04:00 |
|
Isaac Connor
|
2b017f782b
|
Fix missing eid= from View All/View Pages links
|
2019-09-25 10:35:41 -04:00 |
|
Isaac Connor
|
bcb8389923
|
spaces
|
2019-09-25 10:16:27 -04:00 |
|
Isaac Connor
|
b936fbac6a
|
Don't import Monitor.php unless we need to
|
2019-09-25 10:16:16 -04:00 |
|
Isaac Connor
|
ca40e760f7
|
get global cspNonce
|
2019-09-25 10:15:32 -04:00 |
|
Isaac Connor
|
54dec069cd
|
correct quotes and use a button on loging page
|
2019-09-25 10:15:12 -04:00 |
|
Isaac Connor
|
1b653e7e79
|
Add warnings for when SaveJPEGs and VideoWriter are both set to disabled
|
2019-09-25 10:14:41 -04:00 |
|
Isaac Connor
|
c7d7d45380
|
Remove :'s, they can be added using css if desired
|
2019-09-23 11:49:39 -04:00 |
|
Isaac Connor
|
9a94ce6e41
|
remove debug
|
2019-09-23 10:22:25 -04:00 |
|
Isaac Connor
|
8d95b2f5f8
|
Don't select Layout when changing size in montage
|
2019-09-22 14:22:24 -04:00 |
|
Isaac Connor
|
7b9eaf42b8
|
Fix selecting group from groups listing under monitor name. Fixes #2711
|
2019-09-22 12:03:34 -04:00 |
|
Isaac Connor
|
d7810bf9b3
|
fix eslint
|
2019-09-20 14:16:37 -04:00 |
|
Isaac Connor
|
6c39fd133d
|
fix eslint
|
2019-09-20 10:44:38 -04:00 |
|
Isaac Connor
|
5d0b4942d6
|
remove debug
|
2019-09-20 10:37:48 -04:00 |
|
Isaac Connor
|
0d19b0dc85
|
Use a subselect instead of inner join because the inner join won't return monitors that don't have a group
|
2019-09-20 10:37:19 -04:00 |
|
Isaac Connor
|
b05ecd881e
|
add onchange to scale
|
2019-09-19 14:57:21 -04:00 |
|
Isaac Connor
|
2da9edf0ff
|
add onchange to scale
|
2019-09-19 14:57:17 -04:00 |
|
Isaac Connor
|
b9b52c964e
|
Upgrade monitor saving and viewing
|
2019-09-19 14:56:16 -04:00 |
|
Isaac Connor
|
d5ee73a9ee
|
use CaptureResolution instead of CaptureDimensions because it is already in language
|
2019-09-19 10:50:20 -04:00 |
|
Isaac Connor
|
1bd70319a9
|
Add a dimensions dropdown to ease entering monitor dimensions
|
2019-09-19 10:48:25 -04:00 |
|
Isaac Connor
|
b3b7ec660b
|
Add a test for the built-in layouts. Can't edit them.
|
2019-09-18 11:19:28 -04:00 |
|
Isaac Connor
|
9e8c17dfaf
|
Merge branch 'master' into tolland-remove-extra-px
|
2019-09-18 11:17:50 -04:00 |
|
Isaac Connor
|
0eb1fff5b5
|
remove unused view=image-ffmpeg
|
2019-09-18 11:16:49 -04:00 |