Commit Graph

2357 Commits

Author SHA1 Message Date
Andrew Bauer 36ab7b01e8
Merge pull request #2018 from connortechnology/robots
add a robots.txt to the docroot to tell bots to not scrape our ZM install
2018-01-04 20:42:15 -06:00
Pliable Pixels 08b5c26a15 2019 maxscoreframeid (#2020)
* added MaxScoreFrameId to address #2019

* consistent quotes
2017-12-07 14:11:06 -05:00
Isaac Connor fb424a7eef add a robots.txt to the docroot to tell bots to not scrape our ZM install. 2017-12-07 09:32:23 -05:00
kimmeld 1a5d9d5586 Fix monitor sorting (#2015)
Fixed issue #2014
2017-12-06 15:43:33 -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 fb952179cd Fix delete filter (#2010)
Delete filter didn't work because the request does not include 'object'.
2017-12-04 21:26:21 -05:00
digital-gnome 03ad4898d9 Fix montage monitors jumping on alert (#2013)
The alert class from bootstrap was not overriden on monitors in montage.
2017-12-04 21:25:56 -05:00
Andrew Bauer e825e5d61e initial commit to change color of web console systemstats (#1981)
* initial commit to change color of web console systemstats

* use css classes
2017-10-07 18:42:39 -04:00
Pliable Pixels a8fc832481 fix for monitor API edit perm (#1995) 2017-10-07 09:55:13 -04:00
Steve Gilvarry 9c40f65757 Fix user language setting never being used
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858675 pointed here
https://forums.zoneminder.com/viewtopic.php?t=19403
Checked and sure enough was still there not pointing to the lang folder.
2017-09-29 11:20:20 +10:00
Isaac Connor 54b8cce5e4 fix tabs to spaces 2017-09-11 16:57:51 -04:00
Andrew Bauer 496ba70819 remove checks for empty and just check for true (#1980)
Yeah I agree.  I think the exists was from pre-object method days.
2017-09-11 13:27:17 -04:00
ralimi 58a9107675 Fix incorrect links to transparent.png and index.php (#1982)
* Fix install location for config files when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Omitted README file that should have appeared in /etc/zm/conf.d

* Fix location for configs when building to alternate directory.

* Fix works, but this should go on a branch instead.

* Fix works, but this should go on a branch instead.

* Fix location for configs when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Remove double quotes. This is a list of paths.

* Allow SSL database connection to be secured with SSL.

* Fix incorrect variable name

* Fix PHP syntax errors

* SSL connection parameters must also be passed in API.

* Fix links pointing at transparent.gif

* Use relative path to index.php instead of absolute.

The installation may not be rooted at / on the server.
2017-09-10 11:49:53 -04:00
peruchi d71b30aff3 Images Gif to PNG (#1969)
* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG
2017-08-16 14:51:20 -04:00
Isaac Connor f573158fbb fix breakage caused by empty SSL_CERT options 2017-08-15 19:40:02 -04:00
Isaac Connor b6965a2c3f fix spacing/braces 2017-08-14 11:38:21 -04:00
Isaac Connor 087b7abb94 Merge branch 'master' into fix_event_viewing 2017-08-14 10:41:04 -04:00
ralimi ecb7df0e8b Support SSL for mysql connections (#1965)
* Fix install location for config files when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Omitted README file that should have appeared in /etc/zm/conf.d

* Fix location for configs when building to alternate directory.

* Fix works, but this should go on a branch instead.

* Fix works, but this should go on a branch instead.

* Fix location for configs when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Remove double quotes. This is a list of paths.

* Allow SSL database connection to be secured with SSL.

* Fix incorrect variable name

* Fix PHP syntax errors

* SSL connection parameters must also be passed in API.

* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
Isaac Connor 6562d5eb47 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-08-09 09:54:34 -04:00
Isaac Connor 928c4651a6 fix braces, spacing 2017-08-09 09:54:27 -04:00
Isaac Connor 5a73c38237 video storage fixes (#1958)
* use a monitor object instead of just a db array.

* fix braces, spacing, move pod docs to bottom

* Fix memleak by freeing input and output frames

* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
Isaac Connor 1cfd657168 put back the preg_replace that strips usernames and passwords from monitor source 2017-07-26 10:22:57 -04:00
Andrew Bauer 5cf2be528a Merge pull request #1950 from connortechnology/fix_api_logs
fix path to logs for api
2017-07-14 13:19:12 -05:00
Andrew Bauer c98255dd75 Merge pull request #1948 from connortechnology/fix_empty_monitor_source_column
Fix empty monitor source column
2017-07-14 13:10:52 -05:00
Isaac Connor 240a990c7f fix writing to config 2017-07-14 12:19:43 -04:00
Isaac Connor e203064bf7 updates bootstrap.php.in to match config.php's conf.d loading 2017-07-14 12:03:00 -04:00
Isaac Connor 13a72b7a99 fix path to logs for api 2017-07-14 11:58:15 -04:00
Andrew Bauer 89bcfc4e28 fix incorrect gpl license text mailing address 2017-07-14 10:39:50 -05:00
Isaac Connor d13d7e9050 recode the bit that outputs the link under source so that it defaults to Monitor # under all situations 2017-07-14 09:57:25 -04:00
Isaac Connor f7a99a1106 make montagereview not load all events and frames at once, so that it doesn't use up all memory 2017-07-13 11:06:08 -04:00
Isaac Connor 403dca78fb break up a long line 2017-07-13 10:26:24 -04:00
Isaac Connor a5f9c01298 fixes braces and spacing and add some debug lines when the onvif-probe output doesn't match what is expected 2017-07-13 10:26:09 -04:00
Isaac Connor cb88952a77 braces and spacing 2017-07-13 10:25:14 -04:00
Isaac Connor c9689aa010 fix braces,spacing,quotes. Change form method to post 2017-07-12 10:58:20 -04:00
Isaac Connor bd681de955 fix braces 2017-07-12 10:57:45 -04:00
Isaac Connor dfd1c2844a remove storageId 2017-07-11 11:28:15 -04:00
Isaac Connor 0eb7bfabf2 put the ajax query back to a post 2017-07-07 12:15:09 -04:00
Isaac Connor 90882edc31 make montage images be display: block; This makes the layout not jump around when a camera feed dies 2017-07-07 10:05:20 -04:00
Isaac Connor 2dd8b5df1f in dark and flat, the buttons use a larger font. The fixed size is not appropriate 2017-07-07 09:59:41 -04:00
Isaac Connor 39745e49d4 I think we switch to border-box model or something, anyways, the box that the pantilt buttons go in needs to be 100px not 96px 2017-07-07 09:51:51 -04:00
Andrew Bauer 4128f5861f Merge pull request #1940 from connortechnology/montagereview_rework
Montagereview rework
2017-07-07 08:34:01 -05:00
Isaac Connor 50adec45c5 Strip non 7-bit ascii chars from log message 2017-07-06 11:45:17 -04:00
Isaac Connor c372787882 fix typo 2017-07-06 10:50:56 -04:00
Isaac Connor 6b2e23e1a5 Merge branch 'montagereview_rework' of ../ZoneMinder.master into montagereview_rework 2017-07-05 14:27:46 -04:00
Isaac Connor d61dfcd410 scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc. 2017-07-05 14:23:01 -04:00
Isaac Connor 720748a731 code cleanup mostly. scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc. 2017-07-05 14:22:44 -04:00
Isaac Connor 0b4a2b41cc fix scale on initial montage load. Replace calls to functions.php/getStreamSrc with object based call 2017-07-05 14:20:50 -04:00
Isaac Connor 3068987308 Merge branch 'master' into montagereview_rework 2017-07-05 13:53:00 -04:00
Isaac Connor 8c19b129d7 more wip 2017-07-04 12:33:01 -04:00
Isaac Connor f87a89a5ce more fixes 2017-07-04 11:51:23 -04:00