Isaac Connor
e3b339e72e
add missing globals
2020-07-25 14:28:26 -04:00
Andrew Bauer
c48fa83c6d
upgrade to bootstrap 4.5
2020-07-25 13:18:09 -05:00
Andrew Bauer
bda7e1a2b7
minor cleanup of getNavBarHTML
2020-07-23 12:52:21 -05:00
Andrew Bauer
e9323f96a5
additional cleanup of getNavBarHTML
2020-07-23 10:52:12 -05:00
Andrew Bauer
062ae675c8
partial cleanup of getNavBarHTML
2020-07-22 13:12:59 -05:00
Isaac Connor
23900cbf01
fix
2020-05-21 13:34:09 -04:00
Isaac Connor
59c08410c1
Put the size of SHM in the title of the shm space used element
2020-05-21 13:32:33 -04:00
Isaac Connor
6dbc917215
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-05-01 13:24:47 -04:00
Isaac Connor
e960e638b3
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 13:07:29 -04:00
Isaac Connor
bd7475a450
use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working
2020-05-01 13:06:15 -04:00
Isaac Connor
830929a85f
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 12:53:47 -04:00
Isaac Connor
0ed6cb7875
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 10:06:41 -04:00
Dvanderploeg
1d618136c0
Merge branch 'master' into camera_control_preset_correction
2020-04-30 22:10:54 -06:00
David van der Ploeg
a952984e1c
Removed value causing preset not to work
...
The first value field would not permit the presetGoto
command to be added as a value. The value would then use
the number as the command. Removing it allows the presets to
call the correct command.
2020-04-30 22:05:48 -06:00
Isaac Connor
e78b718168
use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working
2020-04-29 16:32:26 -04:00
David van der Ploeg
83b4b6b4db
Corrected zoom out button call
...
The zoom out button wasn't calling the correct function
of "data-on-click-this" causing the request to be ignored.
2020-04-27 21:14:58 -06:00
Isaac Connor
cf3785aebf
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-04-24 12:23:48 -04:00
Isaac Connor
8be08d942a
Scale must be an integer value so use '0' instead of auto
2020-04-23 17:40:42 -04:00
Isaac Connor
96774bd038
fix inline javascript in ptz buttons
2020-04-23 15:39:31 -04:00
Isaac Connor
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
Isaac Connor
543628d0ee
cleanup, and add missing </ul> in the navbar when not logged in which seems to be causing the recaptcha render to fail
2020-04-21 09:20:04 -04:00
Isaac Connor
3e8de7dd6c
Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918
2020-04-21 08:30:42 -04:00
Isaac Connor
365f0240ad
fix inline javascript in ptz buttons
2020-04-10 11:30:30 -04:00
Isaac Connor
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
Isaac Connor
2441ae2924
Improve event export a little bit. Add links to eventFrames and eventDetail html.
2020-04-03 15:34:20 -04:00
Isaac Connor
ef9fbac90c
Add Noscript warnings. Whitespace, improve some logic
2020-04-02 18:14:14 -04:00
Isaac Connor
b482993d33
Merge branch 'release-1.34'
2020-03-06 15:04:48 -05:00
Isaac Connor
ac00ca0ad8
Only list enabled Storage Areas
2020-03-04 10:46:59 -05:00
Isaac Connor
76131d1887
Fix timeline. Update parseFilterToTree to add missing operators. Fix logging calls to include ZM namespace. Update code style.
2020-03-01 11:07:31 -05:00
Isaac Connor
638e333702
Scale must be an integer value so use '0' instead of auto
2020-02-25 11:13:20 -05:00
Isaac Connor
d0a8d241d2
Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849
2020-02-24 13:13:54 -05:00
zlodag
a8615c1c85
fixed bug in control functions where left arrow panStep was inverted
2020-02-16 11:41:14 +13:00
Isaac Connor
137bdb1f24
Make shm have error or warning class if full
2020-02-10 14:20:46 -05:00
Isaac Connor
6c7f003198
revert bogus change not including skin.js
2020-01-18 16:08:55 -05:00
Isaac Connor
5b8e5eb349
don't output duplicated js when css=base
2020-01-17 14:51:02 -05:00
Alex Porosanu
28a4bef6ba
fix tar invocation for *BSD platforms
...
"--xform" switch is not supported by tar on BSD platforms i.e. *BSD,
MacOS, etc. As such, use "-s" switch on these platforms, with a
similar regexp.
2020-01-09 22:03:02 +02:00
Isaac Connor
2f1b725ee4
quote SQL for mysql8
2020-01-07 11:01:02 -05:00
Isaac Connor
2c76c12664
Fix export to include files when using DEEP scheme. Also make it more efficient
2019-12-30 22:18:55 -05:00
Isaac Connor
845f35fe00
Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name()
2019-12-26 15:57:25 -05:00
Isaac Connor
18ed90d147
remove second hit to db to load storage areas with no serverid
2019-12-13 17:47:51 -05:00
Isaac Connor
d39193cb6b
convert flip to material icons
2019-12-02 12:33:13 -05:00
Isaac Connor
d1b086ddc6
fix cases of monitor->CanZoom to control->CanZoom
2019-10-08 18:49:11 -04: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
a8cbe7d10d
Turn off debug
2019-09-20 10:36:50 -04:00
Isaac Connor
4c206c2e9a
Upgrade Control Object to extend ZM\Object. Add commands function from skin specific control functions
2019-09-19 14:55:17 -04:00
Isaac Connor
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
Isaac Connor
46032385fe
fix viewport on mobile. Fix duplicated css when selected css is base
2019-06-22 14:10:55 -04:00
Isaac Connor
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
Isaac Connor
7445f5588f
show storage when there are 4 areas. Used to only do it for < 4
2019-05-31 11:01:09 -04:00
Isaac Connor
07d4310466
Can't cache-bust jquery-ui-theme.css as it loads sprites by relative path
2019-05-29 08:40:48 -04:00
Isaac Connor
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
Isaac Connor
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
Isaac Connor
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
Isaac Connor
6a250d61e3
cache_bust logger.js and overlay.js
2019-04-26 10:25:32 -04:00
Isaac Connor
7b98dcbb94
but the shutdown icon in a navbar-txt
2019-04-12 13:08:58 -04:00
Isaac Connor
d7747b3385
add a shutdown power button to the navbar
2019-04-12 09:37:14 -04:00
Isaac Connor
780f4f9b9a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-06 09:27:44 -04:00
Isaac Connor
c7e09e03d3
add cache busting to base.js
2019-03-25 16:24:46 -04:00
Isaac Connor
ad059f985e
spacing
2019-03-20 14:27:23 -04:00
Isaac Connor
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
Isaac Connor
3f9564c10a
Merge branch 'master' into storageareas
2019-03-19 10:37:35 -04:00
Chris
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
Isaac Connor
fa124eb29a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-03-05 14:35:15 -05:00
Isaac Connor
7b7a58b2f1
remove old xhtml-isms
2019-03-05 14:33:03 -05:00
Isaac Connor
190142b24c
Merge branch 'master' into storageareas
2019-03-01 17:47:07 -05:00
Isaac Connor
ff8c5c5db8
remove debug
2019-03-01 17:28:00 -05:00
Isaac Connor
466c379e94
Merge branch 'master' into storageareas
2019-03-01 14:03:49 -05:00
Isaac Connor
675b4975b0
Fix control presets
2019-03-01 13:37:34 -05:00
Isaac Connor
2d75ab50af
Implement deleting from Logs based on line count instead of interval
2019-02-28 16:12:34 -05:00
Isaac Connor
2db030265b
Merge branch 'master' into storageareas
2019-02-27 11:08:04 -05:00
Isaac Connor
a1f1c19c0f
fix missing ZM namepsace
2019-02-27 11:07:52 -05:00
Isaac Connor
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
Isaac Connor
0a7667f2d0
Use buttons instead of divs and inputs ( #2522 )
2019-02-22 09:23:06 -05:00
Isaac Connor
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
Isaac Connor
b7a6aed1cd
Merge branch 'master' into storageareas
2019-02-16 11:51:23 -05:00
Isaac Connor
34873d5636
We must leave ZM_HOME_CONTENT unescaped so that we can insert actual html like image tags
2019-02-16 11:50:09 -05:00
Isaac Connor
a41e8a8834
Merge branch 'master' into storageareas
2019-02-13 11:38:38 -05:00
Isaac Connor
400d4dc27e
encode the label on the preset so that weird characters and quotes don't break the button
2019-02-13 11:24:09 -05:00
Isaac Connor
d1b3b23c09
Merge branch 'master' into storageareas
2019-02-13 09:42:03 -05:00
Isaac Connor
b6a0e704d2
whitespace, remove xhtml cruft
2019-02-12 16:41:08 -05:00
Isaac Connor
2f301cf5fe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-02-12 13:18:08 -05:00
Isaac Connor
5b9bb93703
fix navbar auth
2019-02-12 13:17:55 -05:00
timwsuqld
f95e9c0363
Fix comment about hiding navbar ( #2521 )
...
Fixes #2520
2019-02-11 17:14:33 -05:00
Isaac Connor
40e0019267
fix all the nav missing when a users Monitors Permission is None
2019-02-11 14:15:24 -05:00
Isaac Connor
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
Matthew Noorenberghe
6af2c4ad0e
Escape output of WEB_TITLE, HOME_URL, HOME_CONTENT, & WEB_CONSOLE_BANNER. Fixes #2468
2019-02-09 18:06:21 -08:00
Isaac Connor
533d021dea
Merge branch 'master' into storageareas
2019-01-30 15:17:27 -05:00
Isaac Connor
604dbf8776
fix state changing/etc
2019-01-30 14:36:46 -05:00
Isaac Connor
7260f823cb
Merge branch 'master' into storageareas
2019-01-21 13:52:38 -05:00
Matt N
a1a42345e3
More eslint fixes; eslint in php; add eslint to travis ( #2419 )
...
* Add eslint to travis.yml
* Update eslint package versions and apply new indent rules
* Enable the brace-style and block-style eslint rules
* Enable the 'curly' eslint rule
* Enable the 'keyword-spacing' eslint rule
* Enable the 'key-spacing' eslint rule
* Enable the 'object-curly-spacing' eslint rule
* Enable the 'no-new-object' eslint rule
* Only disable the no-caller eslint rule in the one affected file
* Enable the 'no-unused-vars' eslint rule for local variables
* Add linting of JS in .php files
2019-01-19 10:32:40 -05:00
Isaac Connor
552e14a971
Merge branch 'master' into storageareas
2019-01-18 10:36:59 -05:00
Matt N
eef113b6a7
Convert some characters to HTML entities ( #2417 )
2019-01-18 10:02:48 -05:00
Matt N
6bb5aa1b87
More inline JS / nonce conversions ( #2415 )
...
* monitor.php: Add nonce and move <script> inside </body>
* export_functions.php: Untested: Add @nonce to <script>
* blank.php: Add @nonce to <script> and add to CSP enforced views
* Enforce CSP on login and privacy views
* group.php: Add nonce and move <script> inside </body>
* filter.php: Add @nonce to <script>
* Fix updateButtons argument on the filter page upon change and page load
* events.php: Add @nonce to <script>
2019-01-18 09:51:06 -05:00
Isaac Connor
f49dd93b6a
Merge branch 'master' into storageareas
2019-01-16 14:39:56 -05:00
Matt N
d33fec9c3f
Add a CSP script-src policy with nonce-source and convert more inline event handlers ( #2413 )
...
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy
* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'
Only handle ones that don't return a value.
* Use @data-on-click to attach inline click event handlers with no args and no return value
* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument
* Enforce a script-src CSP on views without inline JS
* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
Matt N
083f284599
Replace onclick inline event handlers for createPopup ( #2410 )
...
* Move <script> before </body>
* Change makePopupLink to not use onclick
* Change makePopupButton to not use onclick
* Use .popup-link in control_functions.php
* Use makePopupButton in controlcaps.php
* Prevent double-encoding in makePopup*
* Use makePopupButton in devices.php
* Use makePopupButton in logout.php
* Use makePopupLink in monitor.php
* Use makePopupLink and .popup-link in montage.php
* Use makePopupButton in options.php
* Use makePopupButton, makePopupLink, and .popup-link in zones.php
2019-01-15 09:01:58 -05:00
Isaac Connor
0bfe1007c8
Merge branch 'master' into storageareas
2018-12-14 10:16:08 -05:00
Andrew Bauer
4d7e98475f
Merge pull request #2297 from connortechnology/introduce_getBodyTopHTML
...
Introduce get body top html
2018-12-11 09:35:54 -06:00
Isaac Connor
50017057de
Merge branch 'master' into storageareas
2018-12-05 09:05:27 -05:00
Isaac Connor
9ffd77428a
fix paths to jquery-ui-theme components, thereby upgrading them to the proper version. This fixes the datetime filters not being shown on skins that don't specify a custom theme for jquery-ui
2018-12-05 09:05:10 -05:00
Isaac Connor
7ad19be0d7
Merge branch 'server_path_prefix' into storageareas
2018-11-23 13:29:01 -05:00
Isaac Connor
c5f7fb7b18
Merge branch 'master' into server_path_prefix
2018-11-22 10:04:33 -05:00
Isaac Connor
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
Isaac Connor
d76d6bb9d1
include overlay.js when viewing the log, so that export works
2018-11-12 15:09:15 -05:00
Isaac Connor
702143e51b
Create a function called getBodyTopHTML that outputs the body tag and anything else that should go at the top.
...
Things like the we require javascript message, and any other messages like error messages.
Use this on the monitor and console view to stick an error message at the top when saving a monitor fails.
This is a pretty quick, crude implementation.
2018-11-07 12:33:54 -05:00
Isaac Connor
461ce3c1f8
Merge branch 'master' into storageareas
2018-10-29 12:52:06 -04:00
Isaac Connor
95a6d0666a
Improve behaviour and reduce extra logging when db goes away
2018-10-29 09:59:26 -04:00
Isaac Connor
8e053aa04b
Merge branch 'master' into storageareas
2018-10-10 14:51:52 -04:00
Isaac Connor
2881d2af3f
Merge branch 'master' into storageareas
2018-10-10 14:13:27 -04:00
Isaac Connor
031c96c71d
Merge branch 'master' into turn_off_navbar
2018-10-10 14:04:29 -04:00
Isaac Connor
a1ab0855db
if navbar=0 is given in the url, don't output the navbar
2018-10-10 14:02:46 -04:00
Isaac Connor
48e805c09f
Make header flips perisisent based on cookie
2018-10-10 13:11:27 -04:00
Isaac Connor
700b3c33a0
fix command line when using .zip
2018-09-25 16:09:50 -04:00
Isaac Connor
53f4276cb7
add thumbnails and an mp4 download in the events list
2018-09-25 16:00:01 -04:00
Isaac Connor
6aaa0fe39f
Merge branch 'add_export_to_filter' of github.com:/connortechnology/ZoneMinder into add_export_to_filter
2018-09-25 14:57:13 -04:00
Isaac Connor
01f1ffb591
Merge branch 'master' into add_export_to_filter
2018-09-25 14:54:06 -04:00
Isaac Connor
c5b23807a4
put back overlay.js for log view.
2018-09-23 10:51:46 -04:00
Andrew Bauer
c66dd25ebb
implement collapsible headers ( #2203 )
2018-09-11 17:39:40 -04:00
Isaac Connor
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
Isaac Connor
40292f3dad
Add Compression flag
2018-09-07 09:08:33 -04:00
Isaac Connor
965ffda01e
Add button types. fix extra px in slideheight
2018-07-17 15:32:30 -04:00
Isaac Connor
43cee7c383
make export work and fix links to jquery.js
2018-07-12 14:07:03 -04:00
Isaac Connor
ebe55cf6a4
Include new Server.js
2018-07-09 14:10:06 -04:00
Isaac Connor
e85c16aba6
Cleanups, add video viewing
2018-07-09 11:58:30 -04:00
Andrew Bauer
015013f247
Center WEB_CONSOLE_BANNER
...
Center WEB_CONSOLE_BANNER under the server stats
2018-07-06 15:59:10 -05:00
Isaac Connor
54e7b0ac16
create ZM_EXPORT_DIR if needed ( #2136 )
2018-06-25 13:57:00 -04:00
Isaac Connor
db6bd67f59
just fix structure/spacing
2018-06-06 11:40:38 -04:00
Isaac
cfbbc238c9
remove extra spaces and parenthesis
2018-05-18 15:51:12 +02:00
Isaac Connor
780cb693c2
google code style
2018-05-16 11:14:11 -04:00
Isaac Connor
acd6b5f4a9
limit the # of log lines deleted to 100 to limit the time spent there.
2018-04-30 14:33:41 -04:00
Isaac Connor
970830aee3
tidy up
2018-04-20 13:10:38 -04:00
Isaac Connor
10a191ae5b
add event_disk_space to storage to differentiate between real used space versus event used disk space. Use this in the navbar to show actual disk use and also event disk use
2018-04-17 14:14:40 -07:00
Isaac Connor
92cb7dabd5
merge some fixes from other branches
2018-04-17 08:48:59 -07:00
Isaac Connor
bb924ee078
add report_event_audit
2018-04-10 13:06:01 -07:00
Isaac Connor
2c85e5e4c6
remove unneccessary type tags.
2018-04-06 11:43:19 -04:00
Pliable Pixels
bf57b65ebb
reduced 2nd row of navbar text
2018-03-25 09:56:41 -04:00
Pliable Pixels
809e58fae6
acct icon to material
2018-03-25 09:44:30 -04:00
Pliable Pixels
14f638e009
replaced ionic fonts with material design icons
2018-03-25 09:28:00 -04:00
Pliable Pixels
a68cc79437
using MIT licensed ion-icons, its smaller than FA, replaced some text with icons
2018-03-24 18:25:39 -04:00
Isaac Connor
ad1b9699f1
Remove CssFileExtra
2018-02-11 14:18:40 -05:00
Isaac Connor
1ed8af8aac
upgrade jquery-ui to 1.12.1
2018-02-08 13:19:16 -05:00
Isaac Connor
4777808cf0
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-02-08 13:15:41 -05:00
Isaac Connor
95cfdb327d
further separate addBtn and cloneBtn, fixes
2018-02-08 13:15:27 -05:00
Isaac Connor
c47c81b810
title is translated, so we can't use it to determine which page we are on, so use view
2018-02-08 09:29:42 -08:00
Isaac Connor
16604e3ee4
fix including jquery in export
2018-02-08 09:29:12 -08:00
Isaac Connor
058b2be9a7
fix chosen sprites
2018-02-02 13:26:44 -05:00
Isaac Connor
e8ace6d4dd
include base version of jquery-ui-theme
2018-02-02 12:47:51 -05:00
Isaac Connor
c35c9c4083
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-25 08:46:38 -05:00
Isaac Connor
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
Isaac
e4c28150fe
cleanup, code style, quotes. Include jquery source instead of trying to link to it
2018-01-24 23:07:57 +01:00
Isaac Connor
55fa86c7be
Add a few more extensions to the list of files to include in export
2018-01-17 16:57:38 -05:00
Isaac Connor
4b37c6fc42
Change the Group dropdown to a single indented dropdown, and use chosen on it
2018-01-12 11:25:15 -08:00
Isaac Connor
b013da6b95
Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.
2018-01-11 13:14:11 -05:00
Isaac Connor
399907a9f0
Always load a base css style. Only show navbar contents when logged in, so we can use it on the login page
2018-01-11 10:57:07 -05:00
Isaac Connor
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05:00
Isaac Connor
c6bf502ee7
only show each Storage area if there are less than 4.
2017-12-22 11:39:27 -08:00
Isaac Connor
148e21d707
fugro
2017-12-21 21:46:21 -05:00
digital-gnome
a091153929
Use seperate structure and theme jquery ui
2017-12-16 20:04:12 -05:00
digital-gnome
d7532b0340
Add dateTime picker to filter
2017-12-15 22:57:42 -05:00
digital-gnome
c0fcfe6eb6
Combine possible sort inputs to one in sortQuery, output limitQuery
2017-12-15 08:47:08 -05:00
digital-gnome
e192d664fd
WIP pass sort and limit
2017-12-15 08:47:07 -05:00
Isaac Connor
abad266c5b
introduce chosen to use it to make the filtering dropdowns awesome
2017-12-13 16:15:03 -05:00
digital-gnome
6974c847e5
Fix controlcss
...
Missing viewCssFileExtra
2017-12-10 09:37:16 -05:00
digital-gnome
19e50e2bde
Also have to remove fixed width
2017-12-07 15:20:54 -05:00
digital-gnome
7db790ec7b
Fix dom filling up with comments
2017-12-07 12:54:22 -05:00
Isaac Connor
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
digital-gnome
43bba23735
Fix filteradd complaining
2017-12-06 10:36:37 -05:00
digital-gnome
f8d3c07586
Add h264 event view functionality and new feature alarmCues ( #2012 )
...
* Fix nearEventsQuery
Removed dbEscape from getNearEvents previous event because it only returns 0. Now matches next. Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch. Also added start times to allow for videoJS replaymode.
* Unescape filters
Filters need to be unescaped
* Add initial values to page load
* Add replay modes to videojs
* rough in figuring out a frame in between bulk frames
* Add alarmCues
Add a graphical indication of where alarm frames happened in an event. Similar to what zmNinja shows.
* Add remaining buttons to videojs
Functionality for all buttons on videojs streams. FF/RW buttons show as active when they are active.
* Whitespace and fix Bulkframe calcs
* Fix zms events trying to generate with mp4 code
ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed
* ZMS scrub bar
Move zms scrub bar to bottom of image feed. Make it simpler and more like videojs style.
* Wrap event feeds properly
* Fix dvrControls on watch view
* Add scaleToFit
Add a scaleToFit option to event view
* Add navigation for videoJS streams
Disables nav buttons at beginning and end of events. Handles switching from zms to videojs. If zms crashes changes next event function to reload page instead of ajax.
* Add scaleToFit to watch and frame view
Adds scaleToFit to watch view. Since frame view uses the watch cookie this required changes to frame view
* Add transition to zoom
* Change stills view to match stream
Move stills slider bar to match scrub bar on streams. Allow it to resize, make it larger. Add alarmcues.
* Add Stills for every event
Add stills for every event. Match size to stream size
* Progressbox transitions
2017-12-04 21:26:59 -05:00
digital-gnome
ab08769adb
Add nice to archive commands
...
Archiving could hammer io/cpu on the server. Big archives would cause problems.
2017-12-04 14:48:17 -05:00
digital-gnome
3e7c573da5
Add download video option to events view
...
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
digital-gnome
7a188a84f7
Add montagereview filter passing
...
montagereview now accepts any appropriate filters
2017-12-02 12:29:55 -05:00
digital-gnome
6d6b4366de
Fix MontageReview filters
2017-12-02 12:29:54 -05:00
digital-gnome
1c201b0efe
Fix timeline filters
2017-12-02 12:28:06 -05:00
digital-gnome
11629076f6
Fix Timeline view, add list link
2017-12-02 12:28:06 -05:00
digital-gnome
1289269e6f
Change filter to work without popup
2017-12-02 12:28:04 -05:00
Isaac Connor
9d5447aa6a
Merge pull request #55 from digital-gnome/storageareas-updateNavbar
...
Add navbar refresh to all pages that use it
2017-12-02 10:44:01 -05:00
digital-gnome
53f886edc4
Make navbar refresh not change header links
2017-12-01 22:15:29 -05:00
digital-gnome
1bbcf239d7
Fix timeline by adding StartDateTime
2017-12-01 16:25:03 -05:00
digital-gnome
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
digital-gnome
f52306ff56
Fix scales to only use fixed width/height on montage
2017-11-26 19:08:06 -05:00
Isaac Connor
09938ef7ee
join the echo's into 1 to also get the line breaks
2017-11-03 09:24:13 -04:00
Isaac Connor
e6918cd1bd
implement crude cache busting code for .js and .css files
2017-11-01 09:41:19 -04:00
Isaac Connor
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
digital-gnome
3fe46cbaff
Scale to Fit
...
Added a scale to fit option. When navigating between events of different size they will fill the window. Turned on when any event uses it, turned off when any event turns it off.
2017-10-22 12:13:16 -04:00
Isaac Connor
c363b5a190
fix some missing break lines in output
2017-10-17 10:10:20 -07:00
Isaac Connor
9e1893311d
google code style
2017-10-16 15:16:33 -04:00
Isaac Connor
78d1c1ed20
google code style and quote marks
2017-10-12 11:43:15 -07:00
Isaac Connor
e6c0add17e
add ZM_BANDWIDTH_DEFAULT
2017-10-12 12:09:05 -04:00
Isaac Connor
ffc1ac43f5
put back disk space in header, more debug in caching storagea
2017-10-10 14:06:21 -04:00
Isaac Connor
31e3a2d28d
turn off disk space reporting
2017-10-10 10:41:04 -07:00
Isaac Connor
3af795264d
add actual disk space as a mouseover in nav bar
2017-10-10 10:38:13 -04:00
Isaac Connor
d4cf84f7e6
Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
...
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
Isaac Connor
6c87ed10c1
add a notice when javascript is turned off
2017-10-04 21:51:30 -04:00
digital-gnome
ea4b9486aa
alarmCues CSS
...
also function.php to load new vjs override file
2017-10-04 11:09:22 -04:00
Isaac Connor
72ca011e2f
fix favicon
2017-10-02 13:05:23 -04:00
Isaac Connor
351d8ef24d
make the word bandwidth also be part of the link
2017-10-02 12:39:39 -04:00
Isaac Connor
c7ac854cfd
always include classic.js
2017-10-02 12:30:55 -04:00
Isaac Connor
b52944258d
use css skin based favicon if it exists.
2017-10-02 11:55:36 -04:00
Isaac Connor
15ba7d2a35
fixes
2017-10-02 11:25:51 -04:00
Isaac Connor
eaf29d2024
add a class to the active view link to highlight it
2017-10-02 09:02:57 -04:00