1dd0b44334
eslint nanny strikes again
2020-08-17 16:59:57 -05:00
e3fe75f21b
fix case on filterQuery
2020-08-17 17:42:03 -04:00
80b92573b8
set the icons used in bstable toolbar
2020-08-17 16:18:18 -05:00
e4425d7565
Merge branch 'master' into filter_pre_post
2020-08-17 12:56:20 -04:00
1a6154752a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-16 20:08:49 -04:00
a8455d4ecf
Add necessary globals
2020-08-16 20:08:42 -04:00
5468c0322e
appease the eslint nanny
2020-08-16 16:30:35 -05:00
0cbf559821
only hide cols if cookie not exist
2020-08-16 16:02:43 -05:00
f27f6e6394
fix archive buttons, remove asterisk from event name
2020-08-16 14:46:56 -05:00
94d666b296
tiny text under event name, add emailed column
2020-08-16 14:41:50 -05:00
ee31761627
cleanup & consolidate events view buttons
2020-08-16 13:44:18 -05:00
77c391fcae
Add booleanvalues for operators support
2020-08-16 13:07:42 -04:00
77f9f4bffb
Add ExistsInFileSystem support in Filters. This also includes limiting operators to IS/IS NOT
2020-08-16 13:07:21 -04:00
9be63f1d99
reorganize and init eventTable
2020-08-16 11:34:37 -05:00
93475bef7e
eslint nanny
2020-08-15 16:08:53 -05:00
252bf7995a
eslint nannt
2020-08-15 15:54:58 -05:00
45fde13535
rough in new events view
2020-08-15 15:27:58 -05:00
303cec92f6
Add globals, fixing timeline view
2020-08-11 13:47:37 -04:00
4097693b38
appease the eslint nanny
2020-08-10 13:38:53 -05:00
ec707acdd1
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-09 22:19:43 -04:00
a001c93321
fix zone editing globals and inputs being too big
2020-08-08 11:41:24 -04:00
fc5fabf1c5
fix zone editing globals and inputs being too big
2020-08-06 12:24:51 -04:00
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
ef2ad12846
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-05 20:00:45 -04:00
ddeef6f031
Fix globals and a Fatal without ZM\ prefix
2020-08-05 20:00:39 -04:00
76e0d155d3
declare globals
2020-08-05 19:15:01 -04:00
90671cd4e5
Add missing globals
2020-08-04 18:07:01 -04:00
1ab828c110
Add globals
2020-08-04 17:35:52 -04:00
ba4d6dff64
Add globals definitions
2020-08-04 17:05:58 -04:00
c0f21ab55d
Fix globals
2020-08-04 16:36:24 -04:00
eb1d94345f
remove crud
2020-08-03 11:05:58 -04:00
a2958fe288
Spacing, and don't output mootools for postlogin. Don't use mootools in postlogin
2020-08-03 10:57:08 -04:00
6f9947b583
Switch to jquery in login.js. We no longer include mootool for login view.
2020-08-02 19:12:07 -04:00
6a4ce29bce
eslint fixes
2020-07-30 12:15:05 -04:00
e746f0babe
Use 0 instead of the word auto for scale
2020-07-22 17:28:41 -04:00
f22f3e9262
use a scaled svg and replace inline js
2020-07-13 14:51:07 -04:00
cfd57a851f
fix eslint
2020-07-08 20:53:12 -05:00
880219bb0f
Merge branch 'release-1.34'
2020-07-07 18:58:32 -04:00
6469300af5
fix some csp violations
...
y
2020-07-07 18:57:11 -04:00
89f975e646
remove code to play a sound on alarm. Not going to support that when editing a zone.
2020-07-07 16:40:33 -04:00
33d4680f02
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
2020-07-07 16:35:37 -04:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
8a35ae2daf
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-04 09:04:38 -04:00
d6d70ab06d
Put a list of cameras to cycle through on the left
2020-07-04 09:04:26 -04:00
fd10f545bd
if width/height don't evaluate to an integer, set to auto.
2020-07-04 08:58:09 -04:00
343d8d832e
handle scale values of '' and 'auto'
2020-07-03 19:18:05 -04:00
e778ea0918
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:19:04 -04:00
dcb77cdaea
apply stream scale in zoom coordinates
2020-06-17 14:46:10 +02:00
30072cf9e1
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
2020-06-15 16:06:51 -04:00
f71926c736
Merge branch 'release-1.34'
2020-06-05 10:09:07 -04:00
02bf85bb34
Merge pull request #2950 from roddone/scale_to_fit_watchview
...
Fix the scale to fit option that is not persisted on page refresh
2020-06-02 12:53:50 -04:00
a9c52a21ec
call to changeScale() on page init when "scale to fit" is selected
2020-06-02 17:25:07 +02:00
20870e22fa
fix eslint errors
2020-05-29 13:28:33 -04:00
a9cec3ebbd
spacing
2020-05-23 16:13:29 -04:00
46a13237b5
fix eslint errors
2020-05-22 09:28:15 -04:00
cc04ced406
load zmMontageLayout ddm explicitly instead of passing event element
2020-05-20 09:42:06 -04:00
3faf20516f
add changeInterface handler
2020-05-19 16:58:45 -04:00
270ab36ff4
load zmMontageLayout ddm explicitly instead of passing event element
2020-05-19 16:56:58 -04:00
6bb2c09a72
Merge branch 'release-1.34'
2020-05-15 11:41:34 -04:00
424a4ed0b1
add onclick to div.zoom
2020-05-15 11:34:23 -04:00
94b29c6c7a
replace inline javascript in timeline zoom
2020-05-15 10:44:48 -04:00
edd718afd2
xtell and ytell are data-xtell and data-ytell fixes #2932
2020-05-13 08:02:49 -04:00
807efde523
xtell and ytell are data-xtell and data-ytell fixes #2932
2020-05-13 08:01:04 -04:00
2da88be307
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-05-01 13:04:16 -04:00
4c9f67eb5a
Fix no redirect on login with palemoon browser
2020-05-01 13:03:56 -04:00
289045500b
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
2020-05-01 13:03:35 -04:00
8d8d37c648
fix eslint
2020-05-01 09:57:46 -04:00
74ab2e2e12
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
2020-04-29 16:35:04 -04:00
eebd0a274d
Fix no redirect on login with palemoon browser
2020-04-29 16:34:27 -04:00
8b0f88a707
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-04-29 16:34:07 -04:00
bf99daf494
Merge branch 'rate_dropdown'
2020-04-23 16:36:34 -04:00
8ef70f9080
defend against XSS in Monitor Name
2020-04-23 16:28:19 -04:00
25cd13f8ad
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-04-23 16:25:35 -04:00
da79f761ad
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
2020-04-23 16:17:27 -04:00
908e892d48
Merge branch 'fix_auth_timeouts'
2020-04-23 16:15:30 -04:00
81d329af2f
spacing, eslint
2020-04-23 16:12:04 -04:00
5bf068791b
Merge branch 'rate_dropdown' into release-1.34
2020-04-23 16:11:59 -04:00
91e78410a9
Stop the montagereview update while we reload the page
2020-04-23 16:08:36 -04:00
9a3f699644
Use a little less ram by passing by reference
2020-04-23 16:07:59 -04:00
d3f2dd4d6a
fix
2020-04-23 16:07:23 -04:00
7d0421a02c
defend against XSS in Monitor Name
2020-04-23 16:06:44 -04:00
93a37671c2
Merge branch 'release-1.34'
2020-04-23 16:01:52 -04:00
8e2c76df61
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
2020-04-23 15:59:12 -04:00
63aaf76f0d
handle a 0 value for scale as the scale to fit value
2020-04-23 15:57:42 -04:00
6a9a8f1d5f
check length of returned tr array to prevent errors in js log
2020-04-23 15:55:46 -04:00
12252f1f37
defend against XSS in Monitor Name
2020-04-23 15:54:12 -04:00
7347ef4030
Handle a zero value for scale
2020-04-23 15:52:47 -04:00
91b1d7bbeb
alter setButtonState to take either an id or an element so that we can log the missing element
2020-04-23 15:43:36 -04:00
a6f5ae2601
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-04-23 15:42:30 -04:00
96774bd038
fix inline javascript in ptz buttons
2020-04-23 15:39:31 -04:00
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
264ba6525b
Remove debug
2020-04-21 12:19:18 -04:00
74e5cc3066
eslint
2020-04-10 14:22:44 -04:00
365f0240ad
fix inline javascript in ptz buttons
2020-04-10 11:30:30 -04:00
105be40ce3
fix
2020-04-10 11:09:46 -04:00
c8128de673
defend against XSS in Monitor Name
2020-04-10 11:06:39 -04:00
e9430d48a7
defend against XSS in Monitor Name
2020-04-10 11:06:20 -04:00
aad0b9362c
defend against XSS in Monitor Name
2020-04-10 11:05:48 -04:00
ea8fe7b9a9
check length of returned tr array to prevent errors in js log
2020-04-06 11:59:27 -04:00
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
e2cb8a656d
change exportEvent to expertEvents
2020-04-04 11:53:07 -04:00
402c38725b
Limit version check popups to once per hour
2020-04-04 11:52:40 -04:00
87069b99b6
Fix inline-script errors on groups page referenced in #2890
2020-04-02 14:13:28 -04:00
4eed0a9c29
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
2020-03-27 14:30:41 -04:00
1ab294e291
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
2020-03-27 12:43:21 -04:00
2bd805c1f1
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
2020-03-24 16:16:32 -04:00
5a20ef959f
Merge branch 'release-1.34'
2020-03-20 11:07:46 -04:00
ecaaae90f3
fix streamImg loading when using applet. Also don't alter actParms as it is not a global.
2020-03-20 11:06:01 -04:00
f8fa0340fc
fix eslint
2020-03-14 09:27:07 -04:00
9a3127da06
Merge branch 'rate_dropdown'
2020-03-10 18:47:19 -04:00
59bd658a96
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
2020-03-10 18:46:20 -04:00
84d719f2dd
Merge branch 'release-1.34' into rate_dropdown
2020-03-10 16:06:11 -04:00
e8553babfa
remove extra spaces, fix eslint
2020-03-09 14:43:54 -04:00
55f63e8e9d
Merge branch 'fix_auth_timeouts'
2020-03-04 11:22:08 -05:00
a9e3d0691f
quotes, fix status ajax call using old auth_hash
2020-03-04 11:17:48 -05:00
a2dd24ae1f
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-03-02 14:38:36 -05:00
00de49a5c1
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
2020-03-02 12:43:07 -05:00
967e5ad30f
alter setButtonState to take either an id or an element so that we can log the missing element
2020-03-02 11:52:32 -05:00
b9acf42929
spacing, eslint
2020-02-29 09:28:04 -05:00
bf9ba39aa2
Merge branch 'release-1.34'
2020-02-25 18:22:55 -05:00
c08ec996f7
Fix various aspects of the video generating page. Clean up and update code. Remove inline javascript. Fixes #2843
2020-02-25 18:12:25 -05:00
23e4b43aa0
Stop the montagereview update while we reload the page
2020-02-25 16:53:08 -05:00
3adc20b04e
Use a little less ram by passing by reference
2020-02-25 16:52:45 -05:00
4c2fb6bf08
populate a js var minTime and maxTime and use it when setting up the calendar widget to set minTime for end calendar.
2020-02-25 13:40:44 -05:00
dce4d17b51
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-02-25 13:17:02 -05:00
a7c28be365
change scale to fit value from auto to 0
2020-02-25 12:14:34 -05:00
e2ff241017
handle a 0 value for scale as the scale to fit value
2020-02-25 12:13:05 -05:00
71dd292a8d
Revert "Handle a zero value for scale"
...
This reverts commit a5da6d12f3
2020-02-25 11:19:09 -05:00
a5da6d12f3
Handle a zero value for scale
2020-02-25 11:18:28 -05:00
8a83449fba
Handle a zero value for scale
2020-02-25 11:18:13 -05:00
2f89bd28b7
Handle a zero value for scale
2020-02-25 11:18:02 -05:00
c29f2cb8cf
fix our friend, eslint
2020-02-21 14:22:53 -06:00
ce8c8a755c
fix eslint
2020-02-21 10:29:27 -05:00
dab5c520fe
Merge branch 'master' into add_alarmed_zone_to_filters
2020-02-19 14:20:08 -05:00
789db4e5a6
Fix filter new rows missing their onchange event on attribute dropdown. Fixes #2817
2020-02-18 13:29:06 -05:00
52dfbc92e9
put back operator filtering in parseRows. Do it for all attrs. Fix Zone name in AlarmedZoneId attr
2020-01-24 11:10:02 -05:00
29a04dc1b9
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
2020-01-24 09:50:53 -05:00
948b3d7e43
Impleent click_AutoEmail to hide/show the Email options
2020-01-22 17:02:16 -05:00
9d41334e8f
Merge branch 'master' into add_alarmed_zone_to_filters
2020-01-22 13:45:37 -05:00
dbdb13efd7
Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811
2020-01-20 11:02:43 -05:00
ead52f30b1
Bug fix: Allows for inital/base install without the option MultiPort config value assigned
2020-01-20 00:44:20 -08:00
de5bf21d8a
fix eslint
2020-01-17 15:06:46 -06:00
d0003215b1
Merge branch 'master' into rate_dropdown
2020-01-17 12:30:35 -05:00
a398f33e68
fix delTerm button not being enabled because it is a button now, not an input
2020-01-17 09:17:29 -05:00
6a43c2deb5
fix zoom_range to zoomout_range
2020-01-16 14:17:40 -05:00
f13a7199e1
fix eslint
2020-01-07 21:53:55 -06:00
c64de372a7
when auth_hash changes, update various CmdParms
2020-01-07 17:08:57 -05:00
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -05:00
6ac26ec1aa
quotes
2020-01-05 17:33:53 -05:00
00f8a450de
spaces and quotes
2020-01-05 14:59:25 -05:00
7fdf6165d5
Fix case in var name
2020-01-03 17:08:11 -05:00
f572c4092a
add checks for Zoom, Focus, White, Iris movement types
2020-01-03 15:58:57 -05:00
98f7fb63b9
fix eslint errors
2019-12-31 19:24:51 -06:00
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
42a724891b
spacing
2019-12-20 16:11:38 -05:00
23dde04725
remove timeout on changing runstate.
2019-12-20 16:10:30 -05:00
d87bf5a156
replace the rate display with a dropdown
2019-12-20 11:02:12 -05:00
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
3b12b67b4a
fix eslint
2019-12-18 10:40:51 -05:00
5b7efb2b33
fix mouseover streaming in chrome when adblocker disabled
2019-12-13 17:48:22 -05:00
0dbc1ef15c
Use multiport when talking monitor stream on montage
2019-12-13 11:51:55 -05:00
8e645e45e1
fix selecting Monitors by passing MonitorId as MonitorId[]
2019-12-02 14:21:25 -05:00
b70b75421b
quotes and spacing
2019-12-02 14:18:27 -05:00
9d0a416311
remove debugging code
2019-12-02 13:41:42 -05:00
c9a324b7b3
improve the configureExportButton to look at specific inputs instead of just counting checkboxes
2019-12-02 13:40:02 -05:00
ab9f99bdbb
Fix Width & Height rotation when scaling. Fixes #2760
2019-11-22 12:18:30 -05:00
207e5918c8
fix lint, remove debug
2019-11-19 11:37:45 -05:00
56618aac32
Handle buttons not existing
2019-11-10 15:49:39 -05:00
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
3653ad5ce3
update group editing, solving inline javascript problems and removing cruft
2019-11-01 13:37:52 -04:00
6ae220f756
improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript
2019-10-29 18:06:32 -04:00
524a39a224
changeCodec no longer needs to be passed this
2019-10-18 13:40:29 -04:00
f25a823bc8
Fix event => zm_event
2019-10-16 08:53:40 -04:00
b1496643eb
fix js error in onvif probe
2019-10-03 17:31:10 -04:00
95615fee35
fix eslint
2019-10-02 16:42:50 -04:00
e4b5052fb4
Add delete from logs ajax capability. Make the clear button use it. Fixes #2620
2019-10-02 15:39:04 -04:00
90b02beb94
fix eslint
2019-09-30 09:52:41 -05:00
393f0a369c
Revamp timeline. Make it handle being full browser width. remove onclicks.
2019-09-28 14:23:23 -04:00
e4265bd075
spaces
2019-09-26 16:13:49 -04:00
1b653e7e79
Add warnings for when SaveJPEGs and VideoWriter are both set to disabled
2019-09-25 10:14:41 -04:00
8d95b2f5f8
Don't select Layout when changing size in montage
2019-09-22 14:22:24 -04:00
d7810bf9b3
fix eslint
2019-09-20 14:16:37 -04:00
6c39fd133d
fix eslint
2019-09-20 10:44:38 -04:00
b05ecd881e
add onchange to scale
2019-09-19 14:57:21 -04:00
2da9edf0ff
add onchange to scale
2019-09-19 14:57:17 -04:00
b9b52c964e
Upgrade monitor saving and viewing
2019-09-19 14:56:16 -04:00
1bd70319a9
Add a dimensions dropdown to ease entering monitor dimensions
2019-09-19 10:48:25 -04:00
b3b7ec660b
Add a test for the built-in layouts. Can't edit them.
2019-09-18 11:19:28 -04:00
9e8c17dfaf
Merge branch 'master' into tolland-remove-extra-px
2019-09-18 11:17:50 -04:00
d141632256
general clean of onvif probe view. Use buttons instead of inputs and use data-on-change-this instead of inline js. Also rename username and password to Username and Password to not conflict with authentication to ZM ui.
2019-09-11 09:18:03 -04:00
dfb65d23bf
Fix eslint warnings
2019-08-27 16:48:42 -04:00
d7d2c140a0
Use index to server hosting storage where event is saved to talk to zms
2019-08-27 15:19:18 -04:00
f01bedb33e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-26 18:49:12 -04:00
231c9c3902
move executeFilter to Filter->execute. If no changes have been made, don't make a tempfilter.
2019-08-26 18:48:34 -04:00
292b530f99
Allow montage review maxdatetime to be less than minDateTime. This allows us to set it first so that the reload does kill us
2019-08-26 16:20:23 -04:00
7768d39eb9
Add auth to streamParms so that multi-server event viewing works
2019-08-26 16:19:44 -04:00
e707bd8e72
correct getting frame_id so we get images instead of nodata
2019-08-23 17:59:29 -04:00
7598654740
add auth hash to ajax streams, and use monitorUrl instead of thisUrl to talk to zms
2019-08-23 17:58:40 -04:00
ca0b583007
Use material icons for sort because they look nicer
2019-08-19 08:59:15 -04:00
d4b59211cd
Merge branch 'master' into storageareas
2019-08-07 11:21:19 -04:00
962049fa31
Merge branch 'master' into filter_add_copy
2019-08-06 20:17:21 -04:00
7e6b0058d2
Update Zone buttons. Fix double submit. Fixes #2671
2019-08-02 08:04:38 -04:00
8167ff2143
fix eslint
2019-07-26 12:28:02 -04:00
547e80b1a9
Fix download and export button from events list. Fixes #2668 ( #2670 )
2019-07-24 12:31:43 -04:00
a6a2239e5b
Fixes #2579 by putting the event Id into an attribute of the delete button. Also uses a button instead of a link. Also only does parent refresh if parent exists ( #2662 )
2019-07-24 11:39:21 -04:00
1a0beab703
add Secondary Storage Area options. Storage array is now an array of Objects so use the Name key
2019-07-24 11:25:38 -04:00
0e040fc2fc
Add click_autocopy function
2019-07-23 10:00:05 -04:00
46f3aabc25
Merge branch 'hwdecode' into storageareas
2019-06-25 15:35:56 -04:00
46c19c7efb
fix for zone overlay scaling issues in montage ( #2643 )
...
* remove extra px in svg tag
* add js method to track liveStream img size for zones
* switch to using SVG scaling to deal with zone polygons
* update jsdoc for eslint
* fix blank lines eslint issue
2019-06-24 11:45:40 -04:00
d026c61077
Don't allow saving to built in layouts
2019-06-20 13:48:14 -04:00
ffaad88bf0
switch to using SVG scaling to deal with zone polygons
2019-06-20 17:11:22 +00:00
edd52e7fbf
add js method to track liveStream img size for zones
2019-06-20 12:46:04 +00:00
d87f5e3276
Merge branch 'master' into storageareas
2019-06-11 14:39:08 -04:00
ec7b373913
fix structure of events_by_monitor_id
2019-06-11 14:38:51 -04:00
1e7cf8c7cf
fix eslint, Fix video not resuming after setting speed to 0.
2019-06-11 14:38:28 -04:00
1241761683
Add a title popup telling people about the zoomin/out/pan functions. Add ctrl-click to zoomout
2019-06-11 10:58:54 -04:00
1eadb814e2
Fix use of onclick and onchange. Fix bulk frame lookup. Make scanning events more efficient
2019-06-10 15:59:19 -04:00
dfc60baf85
fix eslint spacing
2019-06-06 13:40:00 -04:00
9d6091e271
better fix for #2453 . Pushing an element causes td's within td's. Weird formatting, etc. We use an html escaping function to prevent XSS
2019-06-04 10:32:54 -04:00
722411475d
Fix +/- buttons on new line in filter not having onclick events bound
2019-05-29 09:23:56 -04:00
ac8197f2e5
fix eslint errors in monitor.js
2019-05-27 11:25:49 -04:00
e2d56597bf
Don't use an onlick inline js to show the caution text
2019-05-24 12:40:02 -04:00
2eebdb094c
move chosen setup to initPage
2019-05-24 11:54:14 -04:00
a0dbb70af6
filter the form submit on enter to only affect input elements, not textareas
2019-04-26 10:40:11 -04:00
735a996e41
dsiable form submit on enter on the monitor view
2019-04-26 10:26:16 -04:00
50dd63c21d
fix eslint
2019-04-08 19:58:18 -05:00
8af96e3c00
fix eslint errors
2019-04-08 18:40:52 -05:00
780f4f9b9a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-06 09:27:44 -04:00
e97751558f
eslint fix
2019-03-30 10:41:04 -05:00
90e97ff135
Merge branch 'master' into storageareas
2019-03-28 11:20:29 -04:00
49e3f0a68e
eslint fixes
2019-03-28 09:43:31 -04:00
ee4b452e42
Update monitor edit to not use inline js
2019-03-25 16:25:09 -04:00
16467595d4
Fix clicking in montage
2019-03-21 17:00:51 -04:00
d4353af8af
Fix eslint errors
2019-03-20 14:51:39 -04:00
a5366d522d
Fixup exporting
2019-03-20 14:29:05 -04:00
3f9564c10a
Merge branch 'master' into storageareas
2019-03-19 10:37:35 -04:00
428f7e8e8f
create setup_onclick and disable_onclick in the monitor object. Use it to setup and disable the click event when editing/cancelling layout editing
2019-03-19 10:24:30 -04:00
520c41da23
Merge ../ZoneMinder.connortechnology.bad into storageareas
2019-03-18 14:40:03 -04:00
ac547e0d5d
Don't scroll to the top of the page when force/cancel alarm is clicked
2019-03-10 20:58:24 -07:00
e6220e9d07
Fix eslint issues in cycle.js
2019-03-10 20:56:08 -07:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
fa124eb29a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-03-05 14:35:15 -05:00
f0f2b6a17c
implement click_automove and submitToMontrageReview for onclick handlers
2019-03-05 14:35:02 -05:00
e59eb510e3
update and fix the donate popup
2019-03-05 13:10:04 -05:00
73ae3f49ed
Merge branch 'master' into storageareas
2019-03-05 11:35:55 -05:00
8053f61a08
fix eslint missing {}
2019-03-05 11:02:09 -05:00
76ee31bf68
fix eslint missing {}
2019-03-05 11:01:58 -05:00
778707c8df
Merge branch 'master' into storageareas
2019-03-04 14:33:28 -05:00
7cee8356bd
Fix setting frame width when changing from fixed width to scaled
2019-03-04 13:43:03 -05:00
96e29c0299
fix up remaining issues with cycle updates
2019-03-04 13:35:40 -05:00
Andrew Bauer
Isaac Connor
Isaac Connor
Andrew Bauer
Romain ODDONE
Romain ODDONE
Garrett Scott
Isaac Connor
Isaac Connor
Isaac Connor
Tom Hodder
Andrew Bauer
Matthew Noorenberghe