Commit Graph

347 Commits

Author SHA1 Message Date
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