a20517a6db
spacing
2019-11-01 13:41:37 -04:00
18c13c4bad
Make chosen dropdowns 100% width on monitor edit
2019-11-01 13:40:55 -04:00
9a3bee28d2
add logging and handling of oninput and oninput-this
2019-11-01 13:38:09 -04: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
daf71aa492
improvements to layout on zones and zone
2019-10-29 18:06:03 -04:00
417123019c
fix crumbs
2019-10-23 09:52:36 -04:00
77118d55b2
add 4CIF aspect ratio padding. Fixes #2738
2019-10-23 09:50:49 -04:00
13b02284fe
Merge branch 'master' into timezone_as_config
2019-10-18 13:58:22 -04:00
a6a61b75b9
update ptz css in classic
2019-10-18 13:52:34 -04:00
524a39a224
changeCodec no longer needs to be passed this
2019-10-18 13:40:29 -04:00
fdf48c4123
Merge pull request #2726 from externo6/more-filter-options
...
More filter options
2019-10-16 10:15:58 -04:00
f25a823bc8
Fix event => zm_event
2019-10-16 08:53:40 -04:00
8ee567442e
UPdate replay, scale, codec dropdown onchanges
2019-10-15 15:04:14 -04:00
1cf034ec5f
fix inline js on the back/close button
2019-10-08 18:49:29 -04:00
d1b086ddc6
fix cases of monitor->CanZoom to control->CanZoom
2019-10-08 18:49:11 -04:00
c15e8eebb2
Make PTZ presets fill the entire window width and fix other visual problems with the buttons
2019-10-08 18:48:37 -04:00
f3f972359b
increase width of Zoom, White, Iris controls to fit wider button
2019-10-08 18:28:02 -04:00
5040d5b075
remove extra (
2019-10-05 16:56:05 -04:00
b1496643eb
fix js error in onvif probe
2019-10-03 17:31:10 -04:00
5384b9345a
fix errors on centos 7 with the functions view
2019-10-03 17:30:52 -04:00
11fe748154
Sort control capabilities by Name instead of Id
2019-10-03 17:30:31 -04:00
17611f2e4b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-10-02 19:38:21 -04:00
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
95615fee35
fix eslint
2019-10-02 16:42:50 -04:00
6b65e9a60c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-10-02 16:41:20 -04:00
7b93a445b8
Finish updating the linked Monitors dropdown
2019-10-02 15:42:56 -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
d02aee64e4
Add setting of timezone to Options/Config instead of php.ini
2019-10-02 09:07:18 -04:00
b4d5d92d86
Add some non standard resolutions available on some vivotek cameras
2019-09-30 15:06:32 -04:00
90b02beb94
fix eslint
2019-09-30 09:52:41 -05:00
7271151eb0
add some more aspect ratios
2019-09-28 15:16:25 -04:00
393f0a369c
Revamp timeline. Make it handle being full browser width. remove onclicks.
2019-09-28 14:23:23 -04:00
deef948964
Allow anyone to change their skin
2019-09-28 12:58:17 -04:00
ec9e94b99d
Don't add checkboxes if can't edit groups
2019-09-28 12:58:01 -04:00
80e3922165
add backWindow function to handle back buttons
2019-09-28 12:57:43 -04:00
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
ebcacaa660
Use material icons for buttons
2019-09-26 16:26:37 -04:00
fdaee75310
Use material icons for buttons. Hide the stop button because it does nothing.
2019-09-26 16:26:18 -04:00
e4265bd075
spaces
2019-09-26 16:13:49 -04:00
2b017f782b
Fix missing eid= from View All/View Pages links
2019-09-25 10:35:41 -04:00
bcb8389923
spaces
2019-09-25 10:16:27 -04:00
b936fbac6a
Don't import Monitor.php unless we need to
2019-09-25 10:16:16 -04:00
ca40e760f7
get global cspNonce
2019-09-25 10:15:32 -04:00
54dec069cd
correct quotes and use a button on loging page
2019-09-25 10:15:12 -04:00
1b653e7e79
Add warnings for when SaveJPEGs and VideoWriter are both set to disabled
2019-09-25 10:14:41 -04:00
c7d7d45380
Remove :'s, they can be added using css if desired
2019-09-23 11:49:39 -04:00
9a94ce6e41
remove debug
2019-09-23 10:22:25 -04:00
8d95b2f5f8
Don't select Layout when changing size in montage
2019-09-22 14:22:24 -04:00
7b9eaf42b8
Fix selecting group from groups listing under monitor name. Fixes #2711
2019-09-22 12:03:34 -04:00
d7810bf9b3
fix eslint
2019-09-20 14:16:37 -04:00
6c39fd133d
fix eslint
2019-09-20 10:44:38 -04:00
5d0b4942d6
remove debug
2019-09-20 10:37:48 -04:00
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
a8cbe7d10d
Turn off debug
2019-09-20 10:36:50 -04:00
d4435368bc
fix spacing between presets and home/set
2019-09-19 14:57:48 -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
14e625b775
Set width of dimensions
2019-09-19 14:56:55 -04:00
b9b52c964e
Upgrade monitor saving and viewing
2019-09-19 14:56:16 -04:00
4c206c2e9a
Upgrade Control Object to extend ZM\Object. Add commands function from skin specific control functions
2019-09-19 14:55:17 -04:00
d5ee73a9ee
use CaptureResolution instead of CaptureDimensions because it is already in language
2019-09-19 10:50:20 -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
0eb1fff5b5
remove unused view=image-ffmpeg
2019-09-18 11:16:49 -04:00
f509b4c9d1
spacing
2019-09-18 11:10:40 -04:00
ce1823bd29
spacing and fix saving
2019-09-17 12:46:11 -04:00
bcaabf4cf2
update buttons
2019-09-17 12:09:36 -04:00
f0cfd674c1
Cleanup options skins tab. Setting the values happens in index.php. Use global and
2019-09-17 12:06:54 -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
bce1a48b66
Fix another Monitorid. Fixes #2699
2019-09-05 10:31:22 -04:00
f568e0da30
Fix event->id() to event->Id()
2019-09-04 10:11:16 -04:00
16f0ad4f59
Fix Monitorid => MonitorId
2019-09-03 12:55:45 -04:00
99a2ddba63
Add listing of Secondary Storage area in events list
2019-08-29 11:27:06 -04:00
c6dd3ffbec
tabs to spaces
2019-08-28 09:19:09 -04:00
91ef4f5932
x264 encode works on arm now, so let people choose it
2019-08-28 08:51:42 -04:00
8043ba8092
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-27 16:49:12 -04:00
9b3fecd7a0
Fix iOS autocapitalizing username field on login ( #2687 )
...
I propose removing the auto-capitalization from the username field for Safari under iOS by adding autocapitalize="none" to the username form field. Usernames rarely start with a capital letter, so I think this would be a usability improvement for users logging in through iPhones or iPads.
Having to login to ZM under iOS, I've been frustrated at the need to always press on the Caps Lock key on the virtual keyboard to disable the capitalization of the first letter. This is because iOS auto capitalized non-password and non-email HTML form fields. ZM is also case sensitive, so "Admin" will not work if the main user is "admin".
2019-08-27 16:49:03 -04:00
dfb65d23bf
Fix eslint warnings
2019-08-27 16:48:42 -04:00
41fb11d776
Fix Arched lacking () so not working
2019-08-27 15:19:38 -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
cd883e23b8
Extend inputs to full width on storage popup
2019-08-26 20:45:20 -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
5527685162
Merge branch 'storageareas'
2019-08-26 16:22:10 -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
c4c6935c6e
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-08-23 18:17:50 -04:00
73ba699dc4
Sort filter fields dropdown
2019-08-23 18:17:45 -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
61926d3b85
Only parse the filter if it is valid. Remove unused filterQuery var
2019-08-20 10:03:44 -04:00
ca0b583007
Use material icons for sort because they look nicer
2019-08-19 08:59:15 -04:00
239c68dd7f
add .. to fix #2686
2019-08-19 08:58:52 -04:00
4140d51e9f
database.php cleanup. remove dbFetchMonitor and dbFetchGroup. Their usage has been replaced with the Object::find_one usage. Also more quoting of table and colume names to fix #2659
2019-08-13 11:45:50 -04:00
38a09bbd18
Don't auto-add default storage area to header. If someone wants to see it's space in the header they can add it to storage areas
2019-08-08 15:34:07 -04:00
702cb65d2a
Merge branch 'storageareas'
2019-08-08 13:38:36 -04:00
45b970fb09
fix spacing
2019-08-08 13:34:28 -04:00
b23a1d0955
Merge branch 'master' into storageareas
2019-08-07 15:51:21 -04:00
fb414b3f19
remove debug statements
2019-08-07 15:34:45 -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
39262d55f5
Also show secondary storage area when viewing event
2019-07-24 11:26:07 -04:00
2d46f2adab
add Secondary Storage Area options.
2019-07-24 11:25:51 -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
a4a144d2fa
Merge branch 'master' into filter_add_copy
2019-07-23 10:04:23 -04:00
df0aef89af
gracefully handle when window[fnName] doesn't exist
2019-07-23 10:03:28 -04:00
0e040fc2fc
Add click_autocopy function
2019-07-23 10:00:05 -04:00
346933126d
Update filter view to use Filter::find
2019-07-23 09:59:49 -04:00
df8c46f0f0
Fix #2657
2019-07-08 14:22:46 -04:00
da5e8d19b8
Fix #2656
2019-07-07 17:54:45 -04:00
b84e3499f4
Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message
2019-07-07 17:25:49 -04:00
4b41655dc5
fix
2019-07-07 16:10:53 -04:00
3c1cd1e750
rename var from nevents to nFrames because that's what they are. Fix an error when page=0
2019-07-07 16:03:54 -04:00
256a0aa679
google code style
2019-07-04 09:04:43 -04:00
2470c09b20
Honour thumbnail width when bringing up frames popup for frames and alarm frames
2019-07-03 17:19:10 -04:00
268bc2264b
Merge branch 'storageareas'
2019-07-02 10:19:03 -04:00
1161c251fc
Add a warning when the monitor is not capturing in live view
2019-06-28 10:28:53 -04:00
d972ab6006
add min_section_length test to alarmed events that go unalarmed
2019-06-27 21:50:12 -04:00
305a954ee2
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2019-06-25 22:20:19 -04:00
46f3aabc25
Merge branch 'hwdecode' into storageareas
2019-06-25 15:35:56 -04:00
a28f17653f
Add DecoderHWAccel fields to Monitor
2019-06-25 15:34:45 -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
44e4d93445
Merge branch 'master' into storageareas
2019-06-24 11:35:36 -04:00
6ed0074077
End continuous events on alarm ( #2644 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* add update script to add MinSectionLength
* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
46032385fe
fix viewport on mobile. Fix duplicated css when selected css is base
2019-06-22 14:10:55 -04:00
85b9b045cc
Copy Profile Token to ControlDevice for use with Netcat PTZ script
2019-06-21 12:42:26 -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
4da5c52cd2
remove extra px in svg tag
2019-06-19 20:18:38 +00:00
77eb15ff17
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
2019-06-19 09:22:21 -04:00
70a91c7069
WIP: Add pagination to frames.php in classic ( #2618 )
...
* add pagination to the frames.php results
* remove commented code, fix view all paging
* removing debugging logging statements
* default frames paging to on
2019-06-19 09:22:21 -04:00
199e8182be
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-19 08:36:48 -04:00
dc7707bbc1
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
2019-06-18 10:03:14 -04:00
1336c03f97
WIP: Add pagination to frames.php in classic ( #2618 )
...
* add pagination to the frames.php results
* remove commented code, fix view all paging
* removing debugging logging statements
* default frames paging to on
2019-06-16 12:02:00 -04: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
3a91880e2e
Merge branch 'storageareas'
2019-06-10 16:01:03 -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
265e49fe45
Add a newline after each filter group to make the code easier to read
2019-06-10 15:58:17 -04:00
1749a7a4f9
fix extra closing button tag in shutdown button. Add a newline after each Storage group to make the code easier to read
2019-06-10 15:57:53 -04:00
b9ea9ce0ae
Merge branch 'master' into storageareas
2019-06-07 14:40:43 -04:00
9b507734b2
spacing
2019-06-06 13:49:24 -04:00
41714c676d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-06 13:40:09 -04:00
dfc60baf85
fix eslint spacing
2019-06-06 13:40:00 -04:00
b254e1e392
For column name title field should be taken instead of array name ( #2635 )
2019-06-06 12:58:33 -04:00
4879249d77
V4LMultiBuffer has a string value so testing against an integer fails.
2019-06-06 12:53:25 -04:00
86ad96b788
increase height of donate popup to hold all content
2019-06-04 12:08:08 -04:00
7649f5d6b9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-04 10:33:14 -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
a6f3303859
add options help to linked monitors option ( #2633 )
...
* add options help to linked monitors option
* fix typo and clarify instructions for new widget
2019-06-04 10:05:08 -04:00
7445f5588f
show storage when there are 4 areas. Used to only do it for < 4
2019-05-31 11:01:09 -04:00
aefd735abb
quotes
2019-05-31 11:00:30 -04:00
ee0c21d587
Add API Enabled to User edit
2019-05-29 10:28:25 -04:00
722411475d
Fix +/- buttons on new line in filter not having onclick events bound
2019-05-29 09:23:56 -04:00
07d4310466
Can't cache-bust jquery-ui-theme.css as it loads sprites by relative path
2019-05-29 08:40:48 -04:00
ac8197f2e5
fix eslint errors in monitor.js
2019-05-27 11:25:49 -04:00
3c5d20a2e1
when an event view is scaled, adjust the frame popup window size accordingly
2019-05-24 15:06:37 -04:00
fad919adec
Fix incorrect fix for dealing with bulk frames. prev and next fid should just be +/- 1, so that we show the actual capture frame as opposed to the non-existent db frame record. Fix is by specifying the EventId as well
2019-05-24 14:59:33 -04:00
d5b29923a4
add a.disabled css style
2019-05-24 14:51:39 -04:00
0c00752ab4
fix nextFid and prevFid when using bulk frames. Disable buttons instead of removing them entirely.
2019-05-24 14:51:08 -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
b6747e9b1f
spacing
2019-05-24 11:49:59 -04:00
f9004443cf
Merge branch 'master' into storageareas
2019-05-24 09:37:03 -04:00
2fc7b3cf4d
Don't allow deleting of in-progress recording
2019-05-24 09:31:48 -04:00
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
a4eff3e8e0
fixed html typo
2019-05-17 09:44:22 -04:00
923f798e69
css classess for text that disappear
2019-05-17 09:32:23 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
96f578f1bd
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup. ( #2604 )
2019-05-16 15:37:37 -04:00
1855ee441a
Fix #2609 invalid value horz instead of hori in orientations enumeration
2019-05-15 19:35:19 -04:00
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
7f704263d8
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup.
2019-05-13 10:30:41 -04:00
74d9f4f1aa
Spelling and grammar fixes in help ( #2603 )
...
* Edit Help array to make it match others below. This should not affect the results
* Misc. grammer and spelling fixes along with removing some duplicated words. This should not affect compilation.
* More grammer and spelling errors
* Replace Javascript with ZoneMinder because it did not make sense there.
* More spelling and grammar edits
2019-05-13 07:58:18 -04:00
21710b6e49
demote logs
2019-05-12 15:45:39 -04:00
adb01c4d0e
added password_compat for PHP >=5.3 <5.5
2019-05-12 13:57:25 -04:00
91dd6630b5
enable API options only if API enabled
2019-05-12 12:34:55 -04:00
c1891e35b9
moved API enable back to system
2019-05-12 12:15:08 -04:00
a9d601e5ae
add ability to revoke tokens and enable/disable APIs per user
2019-05-12 10:56:17 -04:00
88d50ec9ca
added revoke all tokens code, removed test code
2019-05-11 15:47:57 -04:00
2ee466f5e4
display user table in api
2019-05-11 14:08:49 -04:00
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
e6b7af4583
initial baby step for api tab
2019-05-10 15:11:35 -04:00
1ca5eee53a
spacing
2019-05-06 10:45:40 -04:00
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -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
6a250d61e3
cache_bust logger.js and overlay.js
2019-04-26 10:25:32 -04:00
8195c4e395
Fixing video export view ( #2585 )
2019-04-20 11:19:27 -04:00
14791ec19b
Merge branch 'master' into storageareas
2019-04-15 13:27:41 -04:00
164a2d4d70
Fix image path ( #2576 )
...
Change the path of the "center.png" image from skins/classic/graphics/graphics/center.png to skins/classic/graphics/center.png.
Note that the `graphics/` directory was previously duplicated.
2019-04-14 15:41:58 -04:00
f0af0619e4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-04-12 14:58:24 -04:00
3f3ae748f0
Merge branch 'add_shutdown_capability' into storageareas
2019-04-12 14:58:11 -04:00
160f5c7bd9
Merge branch 'master' into storageareas
2019-04-12 14:57:54 -04:00
d59f058956
basic update of optionhelp view
2019-04-12 14:57:11 -04:00
1a1c2db15f
add the shutdown view and actions
2019-04-12 14:55:56 -04:00
36336d67be
set width and height of shutdown window
2019-04-12 13:09:25 -04:00
7b98dcbb94
but the shutdown icon in a navbar-txt
2019-04-12 13:08:58 -04:00
d7747b3385
add a shutdown power button to the navbar
2019-04-12 09:37:14 -04:00
37b7c32465
fix errors when no filter specified
2019-04-09 09:45:28 -04:00
5ad9219609
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-09 09:39:39 -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
3abf263e7a
fixup half-merged changes to filter to view in montagereview
2019-04-08 16:57:41 -04:00
780f4f9b9a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-06 09:27:44 -04:00
501324d778
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-04-01 22:09:57 -04:00
d5402e9cba
Correct Storaage Server name in list
2019-04-01 22:09:47 -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
c7e09e03d3
add cache busting to base.js
2019-03-25 16:24:46 -04:00
052a2ef1fd
fix eventserver => eventnotification
2019-03-25 12:20:21 -04:00
7565e171b4
spacing
2019-03-25 12:18:15 -04:00
7e62ccca3c
Handle div by zero when TotalMem is not known for Server
2019-03-25 12:08:56 -04:00
677b9cfbed
Make controlcap popup wider
2019-03-24 09:59:04 -04:00
f311fcc9e0
change to a button
2019-03-22 17:28:23 -04:00
16467595d4
Fix clicking in montage
2019-03-21 17:00:51 -04:00
65fab1b032
add px to width and height of event img
2019-03-21 14:14:45 -04:00
f5dfa0d740
Spacing and fix clone monitor by setting the Id to 0 instead of nextId, so that when we go to save it, we use an insert instead of an update
2019-03-20 15:03:20 -04:00
10a972f2a0
fixes to download video
2019-03-20 14:51:59 -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
ae7391689b
Add some code doc
2019-03-20 14:28:19 -04:00
ad059f985e
spacing
2019-03-20 14:27:23 -04:00
09b42f8b55
remove nonce from js because it is the exported html not part of the zm web ui
2019-03-20 14:27:10 -04:00
52e66adc99
Fix namespace
2019-03-20 14:25:12 -04:00
71cd024fda
spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown
2019-03-19 12:16:31 -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
ad5f6a8729
Camera reboot function ( #2554 )
...
* Adding a button for camera reboot function
This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.
* Adding reboot function option to contorl configuration
This patch adds a reboot option to the camera control configuration
view.
* Adding Reboot field to Controls table
This patch adds a Reboot field to the Controls table to support
a camera reboot control option.
* Correcting button value to match reset
* Updating language files
I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.
* Add missing forward slash
2019-03-18 14:49:05 -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
5a66969fd1
change buttons from inputs to buttons. Add submit to montagereview. get rid of onclick handlers
2019-03-05 14:34:34 -05:00
7b7a58b2f1
remove old xhtml-isms
2019-03-05 14:33:03 -05:00
e59eb510e3
update and fix the donate popup
2019-03-05 13:10:04 -05:00
Isaac Connor
Isaac Connor
Andrew Bauer
externo6
Isaac Connor
Isaac Connor
Paulius Gedrikas
Isaac Connor
Tom Hodder
fri.K
Pliable Pixels
Jonathan Meredith
Javier González Calleja
andornaut
Andrew Bauer
Andrew Bauer
Chris
Matthew Noorenberghe