a836dd5ab3
UPdate DiskSpace when creating frame images from the mp4
2017-10-23 10:55:24 -07:00
d477067fa6
add Id and Name as a title popup to the cnanvas so if you mouse over it you can see which monitor it is
2017-10-23 10:55:04 -07:00
681abd64fc
Instead of No Data, make a more general function that will write any text without clearing the image behind it
2017-10-23 10:54:38 -07:00
ed9da696b3
Rough in save functionality into Event.
2017-10-23 10:53:58 -07:00
1bddec1548
Bypass refreshParentWindow
...
This hasn't worked for a while. It looks like it's the result of a fix for filter window redirecting. It's possible other things use it but this fixes event deletion without touching anything else.
2017-10-22 17:23:04 -04:00
298085ae93
Fix archive nulling vid src
2017-10-22 15:02:36 -04:00
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
ecb980c66f
Navigation
...
Videojs navigation now uses ajax. Feels and is faster. Some improvements, namely if zms ever crashes we can still navigate. Both zms and videojs update the address bar so refreshing a page doesn't return you to the first event.
2017-10-21 22:14:46 -04:00
ff8d067639
alarmCues improvements
...
Consolidate selectors and improve edge cases where skew could cause overflow
2017-10-21 22:14:46 -04:00
1eb2edd95c
Converge initial eventData with ajax
...
The initial eventData object on page load didn't have most of the information that the ajax call gave it.
2017-10-21 22:14:46 -04:00
f2f2aa8720
Replay improvement and overlays
2017-10-21 22:14:46 -04:00
c6373d3dca
whitespace and jquery
2017-10-21 22:14:46 -04:00
6fba9fa65a
google code style and quotes
2017-10-20 14:54:28 -04:00
169b64813b
improve Server and Storage dropdown filters
2017-10-20 14:27:29 -04:00
422b3d0c33
fix to montage which wasn't adding the auth_hash. Still need to add plain auth
2017-10-19 17:56:50 -04:00
cd476192e9
add auth hash if available
2017-10-19 17:52:09 -04:00
7090561d35
use jquery
2017-10-19 12:45:34 -07:00
7725d46808
use the same port as the stream
2017-10-19 12:45:24 -07:00
d4b0c504fe
fix Server and Storage dropdowns
2017-10-19 12:44:33 -07:00
cf2eace2c7
improve htmlSelect and add Storage and Server filters to console
2017-10-19 09:50:07 -04:00
32ba53cf1b
turn off database debugging
2017-10-18 16:37:45 -04:00
b11a514823
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-10-18 13:27:13 -04:00
c281467e69
Store server and storage filters in session. Add storage and server filters to console. WIP
2017-10-18 13:24:41 -04:00
6e63cd378f
whitespace
2017-10-18 09:44:07 -07:00
32c79f8d23
Add a disk space total to event list
2017-10-18 09:43:51 -07:00
a4fe76a7fc
fix currentTime additions, tweaks, debug
2017-10-17 11:53:58 -07:00
9b809c357b
Fix Bulk frame calculations
2017-10-17 11:53:34 -07:00
1a13157416
adjust times by client and server utc offsets
2017-10-17 10:10:53 -07:00
a0f54371ca
adjust times by client and server utc offsets
2017-10-17 10:10:48 -07:00
c363b5a190
fix some missing break lines in output
2017-10-17 10:10:20 -07:00
e31e106612
fix loading virtual frame from bulk frames
2017-10-17 10:09:30 -07:00
ba4e5572d6
add setting of values to anonymouse member function
2017-10-17 10:09:14 -07:00
92ff3d9606
Tidy up
2017-10-17 11:50:47 -04:00
4cd59611da
fix when filters are in a popup
2017-10-16 13:46:09 -07:00
340b39ad54
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-10-16 12:21:26 -07:00
75b4de94a7
fix bad char
2017-10-16 12:21:19 -07:00
2fb0acfcc3
remove cellspacing=
2017-10-16 12:20:26 -07:00
29a50626e0
cleanup
2017-10-16 12:19:38 -07:00
87d9108290
increase width of events
2017-10-16 12:19:22 -07:00
f81bac530d
increase function popup height
2017-10-16 15:16:54 -04:00
9e1893311d
google code style
2017-10-16 15:16:33 -04:00
7ceeef55fc
rough in figuring out a frame in between bulk frames
2017-10-16 15:16:19 -04:00
6bf9e28a1e
fix use of api when auth not in use and actually specify which monitor to restart
2017-10-16 10:00:41 -07:00
2354e9679e
fix seconds calculation when mousing over
2017-10-16 12:26:58 -04:00
69c3fce87e
impose minimum size of timeline, reduce extra redraws on initial load
2017-10-16 12:03:38 -04:00
b862bfd3d2
impose minimum size of timeline, reduce extra redraws on initial load
2017-10-16 12:03:33 -04:00
5c0d8384d9
code style and quotes
2017-10-16 08:31:35 -07:00
ed92abfc76
Add Type to Storage Editing
2017-10-16 08:31:05 -07:00
345d9749ce
Add Type to Storage Editing
2017-10-16 08:31:01 -07:00
8c3c5e4d50
google code style
2017-10-15 16:52:43 -04:00
3a7eee58df
improve navigation
...
Condensed navigation if structure and added handling for crashed zms. Will now reload whatever event is next.
2017-10-15 16:49:50 -04:00
10cdbf30ea
reduce extra ajax calls
2017-10-15 16:46:58 -04:00
3a4a7ada41
progressBar conversion
...
Convert progressBar to jquery and imporove granularity and performance
2017-10-15 16:46:57 -04:00
005190ab44
Merge pull request #36 from digital-gnome/montagereview-ordering
...
MontageReview ordering
2017-10-15 15:23:40 -04:00
d523e0e3f1
remove sorting
...
Don't sort monitors on resize. Fixes labels not matching graphs
2017-10-13 19:53:25 -04:00
bc84be6008
Merge pull request #34 from digital-gnome/flat-skin-scrollbar
...
height 100 causing phantom scroll
2017-10-13 10:06:23 -04:00
590639039a
height 100 causing phantom scroll
...
Fixes phantom scrollbar in flat skin
2017-10-13 09:01:13 -04:00
48cd4cb55c
Merge pull request #33 from digital-gnome/eventvideo-div
...
move eventvideo div close
2017-10-13 06:09:34 -04:00
32f9e64a14
make evenVideo wrap just the video
2017-10-12 19:52:23 -04:00
2913b211db
move eventvideo div close
...
I think I did this. eventVideo div wasn't properly wrapping everything
2017-10-12 17:38:03 -04:00
28ef94fad0
handle an array as a Hint, fixing bandwidth option
2017-10-12 11:43:53 -07:00
446d3a92c5
spacing and google code style
2017-10-12 11:43:31 -07:00
78d1c1ed20
google code style and quote marks
2017-10-12 11:43:15 -07:00
e6c0add17e
add ZM_BANDWIDTH_DEFAULT
2017-10-12 12:09:05 -04:00
ac1830a40f
increase height of bandwidth popup
2017-10-12 08:54:29 -07:00
b96b2636bb
add the update to add Type to Storage
2017-10-12 07:50:43 -07:00
8abb8a9259
add Type to Storage
2017-10-12 07:32:48 -07:00
a1b13a2555
Merge pull request #32 from digital-gnome/navigationPlus
...
Navigation plus
2017-10-12 09:55:13 -04:00
90d3067cab
progressBar offset scope
...
fixes progressBar offset passing a reference instead of a copy by wrapping it in a function. also fixes click events endlessly adding when navigating through zms events.
2017-10-11 21:07:45 -04:00
1c744278e7
rescale fix
...
everything rescales except the buttons.
2017-10-11 21:05:39 -04:00
f702c841f5
navigation handling
...
Navigation can now handle going from videojs streams to zms. It gracefully handles deleting the last event and running out of events. zms limitations means we still can't see mp4 recordings before they are done but we don't get stuck on them anymore.
2017-10-11 21:04:45 -04:00
b9f9dd721b
initialAlarmcues arguements
...
initialAlarmcues now takes an eventId arg. Needed to reload when zms streams switch since they don't reload the page
2017-10-11 20:57:13 -04:00
99dd469a1c
alarmCues fixes
...
use evtStream for width. progressBar isn't always fully loaded in time. Combine skewNone and skewAlarm. Does a more accurate job of keeping everything in line.
2017-10-11 20:49:52 -04:00
067f8a8089
replayAll fixes
...
replayAll now handles end of events gracefully. Fixed bug where back to back continuous events or events that overlap would cause it to try to countdown all of epoch time.
2017-10-11 20:24:39 -04:00
3f01f887aa
only count event size when s3
2017-10-11 14:10:53 -04:00
e845af94cc
include params when blowing up a dbQuery
2017-10-11 14:06:18 -04:00
798b4838bd
increase group popup height
2017-10-10 16:03:02 -04:00
a286b60150
use already loaded Storage object when lading events
2017-10-10 12:39:53 -07:00
67cb3a7d3c
better human_filesize function
2017-10-10 12:39:36 -07:00
aaffe475d8
turn off debug
2017-10-10 12:39:23 -07:00
26699953bb
allow setting Storage object in the Event object so as not to go back to db for it. Fix null test in DiskSpace
2017-10-10 12:39:14 -07:00
c7626cab94
fix dash
2017-10-10 12:15:41 -07:00
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
ffc1ac43f5
put back disk space in header, more debug in caching storagea
2017-10-10 14:06:21 -04:00
9cbcc43e3d
Merge sjc04p1fviap02.teslamotors.com:ZoneMinder into storageareas
2017-10-10 13:41:32 -04:00
31e3a2d28d
turn off disk space reporting
2017-10-10 10:41:04 -07:00
c1ada1742b
increase function popup height
2017-10-10 10:40:40 -07:00
06c61f0324
allow periods in monitor name
2017-10-10 10:40:27 -07:00
a9d3be549f
try caching storage
2017-10-10 10:39:17 -07:00
76d37d4c95
update db record when we findout the disk space of an event
2017-10-10 13:02:26 -04:00
6bb331b8a5
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-10 11:51:48 -04:00
7f73f0bf8c
do a backtrace when we ca;; generateAuthHash without open session
2017-10-10 11:51:35 -04:00
d0f0ab1afe
refreshparent when saving group
2017-10-10 11:51:11 -04:00
d0f350d5b2
Merge pull request #29 from digital-gnome/alarmCues-refactor
...
Fix scaling with video.js
2017-10-10 11:09:59 -04:00
3af795264d
add actual disk space as a mouseover in nav bar
2017-10-10 10:38:13 -04:00
8da7d845b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-10 09:37:23 -04:00
c654d008f0
add monitor selector to montagereview and montage.
2017-10-10 09:36:56 -04:00
b6974ea373
Add monitor drorpdown to montagereview
2017-10-09 15:32:09 -04:00
d5799cbf6f
nph-zms alarmcues
2017-10-08 22:36:15 -04:00
d4d2c64974
nav buttons inactive
...
should have been this from the start
2017-10-08 21:49:34 -04:00
65ce6df622
scalingfix
...
changing the scale now works with video.js and alarmcues. some whitespace fixes
2017-10-08 21:46:26 -04:00
c41ef177c2
JS alarmCues
2017-10-08 21:45:05 -04:00
c39cf77a9c
removealarmcuesPHP
...
removed the PHP rendering and placement code
2017-10-08 21:42:12 -04:00
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
d4cf84f7e6
Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
...
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
d0541b0837
Merge pull request #27 from digital-gnome/eventnavFix
...
Fix nearevents path
2017-10-07 12:49:50 -04:00
e23b4a0d5d
Fix event path
2017-10-07 12:42:16 -04:00
f230aa01ef
turn off debug
2017-10-07 11:31:48 -04:00
a8fc832481
fix for monitor API edit perm ( #1995 )
2017-10-07 09:55:13 -04:00
ed3d001c65
Merge pull request #26 from digital-gnome/NPH-ZMS-loading-on-mp4
...
Only load imageFeed if needed
2017-10-05 17:09:45 -04:00
69ab1b18ad
fix new gruop not being savable
2017-10-05 16:12:12 -04:00
a7e3c0b458
spacing
2017-10-05 16:11:54 -04:00
827e858feb
use a cached Storage object to prevent hitting the db al lot
2017-10-05 16:11:43 -04:00
c768e6ed88
add some more utility functions that should be available everywhere
2017-10-05 16:11:21 -04:00
09242d72b3
implement alternate ports for streaming
2017-10-05 16:05:41 -04:00
6952e84c01
Only load imageFeed if needed
2017-10-05 11:20:42 -04:00
40972383c1
remove debug
2017-10-05 10:48:04 -04:00
b56a976d7a
fixes to montage review and cleanup in group filtering/editing
2017-10-05 10:46:04 -04:00
de03726675
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-10-05 09:35:32 -04:00
91c2e07e64
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-04 21:51:38 -04:00
6c87ed10c1
add a notice when javascript is turned off
2017-10-04 21:51:30 -04:00
87a49ad009
work on infinite depths of groups
2017-10-04 16:40:09 -04:00
398600d5f2
Placement for alarmCues
2017-10-04 11:09:22 -04:00
ea4b9486aa
alarmCues CSS
...
also function.php to load new vjs override file
2017-10-04 11:09:22 -04:00
54949db0b5
spacing/google code style
2017-10-04 10:48:37 -04:00
8f8d66189c
Google code style
2017-10-04 10:48:24 -04:00
995809ccb7
fix play/pause while editing zone
2017-10-04 10:48:14 -04:00
5bbe9b40e7
renderAlarmCues function
...
Generates the html for alarmcues and passes it to JS var
2017-10-03 19:26:48 -04:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
c46769495b
Merge pull request #22 from digital-gnome/storageareas-navigation
...
Storageareas navigation
2017-10-03 10:18:44 -04:00
9b241ee370
Also change class
...
With the css class properly set it turns out this wasn't working.
2017-10-02 15:41:04 -04:00
33a3e04f43
Fix class selector
2017-10-02 15:40:18 -04:00
72ca011e2f
fix favicon
2017-10-02 13:05:23 -04:00
462ea72ef5
properly test for existence of popupSizes
2017-10-02 12:43:52 -04:00
351d8ef24d
make the word bandwidth also be part of the link
2017-10-02 12:39:39 -04:00
d831f98dfb
remove debug
2017-10-02 12:31:38 -04:00
c7ac854cfd
always include classic.js
2017-10-02 12:30:55 -04:00
d8c69ab514
error gracefully when popupSizes not defined
2017-10-02 12:30:30 -04:00
207d57a3e6
use xhtmlfooter function to finish off html
2017-10-02 11:55:52 -04:00
b52944258d
use css skin based favicon if it exists.
2017-10-02 11:55:36 -04:00
16a731af1c
fix path when changing status.
2017-10-02 11:55:17 -04:00
15ba7d2a35
fixes
2017-10-02 11:25:51 -04:00
c35face630
LengthTypo
2017-10-02 10:52:55 -04:00
b5a5f45e04
turn off debug
2017-10-02 10:06:07 -04:00
ddb7305aab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-02 09:11:55 -04:00
13b192a63e
remove title and close
2017-10-02 09:03:49 -04:00
eaf29d2024
add a class to the active view link to highlight it
2017-10-02 09:02:57 -04:00
48a3e5eaa6
Move logic to .js file.
2017-09-30 16:35:03 -04:00
e339b9e12a
Merge branch 'storageareas-Navigationfix' into storageareas-navigation
2017-09-30 15:09:32 -04:00
7c72ff1fd9
Navigation buttons for video.ja
2017-09-30 14:25:00 -04:00
0e2b7d1b52
End of video logic
2017-09-30 14:25:00 -04:00
5f203fc813
JS logic for video.js navigation
2017-09-30 14:24:59 -04:00
4be133ed09
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
2017-09-30 14:19:32 -04:00
22af70601e
Convert to ampersand in filters
...
Querys weren't working because it was passing & instead of &. Nothing else appeared to be using these.
2017-09-29 21:49:58 -04:00
5f42bf4fe5
Change CSS to class, add class to php
...
I needed the styling for the video.js buttons. The fallback mjpeg player used ids.
2017-09-29 21:47:52 -04:00
febf15812f
Add start times to getNearEvents
2017-09-29 21:44:57 -04:00
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
6a0da487eb
add Parent Group selection to Group Edit
2017-09-28 12:37:15 -04:00
160a553fb9
Don't do csrf for frames view either. If there are a lot of frames, we run out of mem.
2017-09-27 17:33:06 -04:00
03d25ef10a
more visually appearling code for hiding buttons. Remove cellspacing=0 on the table.
2017-09-27 17:32:42 -04:00
b5699dcac3
google code style
2017-09-26 17:14:27 -04:00
35482ba53c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-26 16:13:51 -04:00
d69b16df24
add group filter to montagereview
2017-09-26 11:28:19 -04:00
bc1b770c14
add translation for AddNewStorage
2017-09-26 11:27:55 -04:00
00c33aa758
remove extra /div
...
I somehow let an extra /div slip into the commit for making archive work.
2017-09-25 22:14:53 -04:00
cc4b6cd0b0
switch to jquery
...
switched both scaleslider and speedslider to jquery
2017-09-25 22:14:46 -04:00
7dd95f6afe
getNearEvents prev always 0
...
getNearEvents always returns 0 for prev event. sortColumn is escaped with passes it with single quotes and breaks the query. I changed it to match next event by removing the escape.
2017-09-25 22:14:36 -04:00
fef503f90c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-23 13:42:44 -04:00
aada54769f
add a Group object
2017-09-23 13:42:39 -04:00
8ada30ff8c
add a group filter to montage
2017-09-23 13:42:13 -04:00
4e16523cff
Say Groups instead of listing the # of monitors in the header
2017-09-23 13:41:52 -04:00
ab3f15b7c0
Add logic for Archive link on initial load
...
Javascript appears to control this but it was not firing on initial load. Added php logic.
2017-09-14 18:00:35 -04:00
a5f0103601
revert jquery change to speed slider
...
Scale was using getElementById but speed was changed to jquery. It wasn't working so I just changed it to match scale.
2017-09-14 18:00:23 -04:00
a78e568378
Change storage path text box from url to text
...
With the text box set as url you can't use a standard unix path
2017-09-14 18:00:02 -04:00
6fe4b892ef
always define auth_hash
2017-09-11 17:05:46 -04:00
54b8cce5e4
fix tabs to spaces
2017-09-11 16:57:51 -04:00
edb7762cf3
Merge branch 'master' into storageareas
2017-09-11 16:57:08 -04:00
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
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
42263bf39a
pass mode when getting mp4 download link
2017-09-08 12:29:10 -04:00
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
9a6bfb2d02
fix some quotes, double to single
2017-08-22 09:44:45 -04:00
9b95259567
fix deleting monitor, but passing an event Id to deleteEvent instead of a hash consisting of just the Id
2017-08-22 09:33:51 -04:00
f01adc6be5
fixes
2017-08-17 10:18:51 -04:00
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
f573158fbb
fix breakage caused by empty SSL_CERT options
2017-08-15 19:40:02 -04:00
adab628af9
fix video speed, various other
2017-08-14 18:22:52 -04:00
b6965a2c3f
fix spacing/braces
2017-08-14 11:38:21 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
087b7abb94
Merge branch 'master' into fix_event_viewing
2017-08-14 10:41:04 -04:00
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
c60939e824
fix absolute path to index.php in console.js
2017-08-11 09:08:00 -04:00
27fe468868
Don't do csrf for view=video because the output buffering will make it run out of ram
2017-08-09 11:15:00 -04:00
6562d5eb47
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-08-09 09:54:34 -04:00
928c4651a6
fix braces, spacing
2017-08-09 09:54:27 -04:00
b9addeecfd
update deleting the events when deleting a monitor
2017-08-08 15:02:40 -04:00
7cb4090d7d
can't use jquery like that
2017-08-03 12:41:43 -04:00
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
6d46b36c80
Hide close button if not in a popup
2017-08-01 14:21:50 -04:00
259b7f7655
fix memleak
2017-07-31 15:49:27 -04:00
792d8640c2
use the analyze file if exists as thumbnail
2017-07-28 09:54:33 -04:00
33ce55584f
Merge branch 'master' into storageareas
2017-07-26 10:48:42 -04:00
30057ddffe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-26 10:38:25 -04:00
1cfd657168
put back the preg_replace that strips usernames and passwords from monitor source
2017-07-26 10:22:57 -04:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
3bd9d96027
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-21 10:54:57 -04:00
efb02f3368
fix indent
2017-07-21 10:54:48 -04:00
457d909c88
fix quotes
2017-07-21 10:54:33 -04:00
5cf2be528a
Merge pull request #1950 from connortechnology/fix_api_logs
...
fix path to logs for api
2017-07-14 13:19:12 -05:00
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
b030fee429
don't do csrf checks for control commands
2017-07-14 12:29:24 -04:00
240a990c7f
fix writing to config
2017-07-14 12:19:43 -04:00
e203064bf7
updates bootstrap.php.in to match config.php's conf.d loading
2017-07-14 12:03:00 -04:00
13a72b7a99
fix path to logs for api
2017-07-14 11:58:15 -04:00
1a8638f3dd
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-07-14 11:50:01 -04:00
9824049c0c
fix conf.d loading in api
2017-07-14 11:46:36 -04:00
89bcfc4e28
fix incorrect gpl license text mailing address
2017-07-14 10:39:50 -05:00
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
0e54d4e69a
imposing a height on the textpanel causes the text to overflow
2017-07-14 09:26:56 -04:00
df0497b3a7
always use onmouseover, as we can now pull images fairly quickly from the mp4
2017-07-14 09:25:53 -04:00
8bbad9adf8
braces, spaces
2017-07-13 17:35:06 -04:00
a16d01a931
use less ram loading events
2017-07-13 17:34:45 -04:00
63e974192c
handle case when no filter is specified
2017-07-13 14:57:27 -04:00
37003aebcf
Merge branch 'master' into storageareas
2017-07-13 11:07:06 -04:00
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
0df6ac2895
Merge branch 'master' into storageareas
2017-07-13 11:04:51 -04:00
403dca78fb
break up a long line
2017-07-13 10:26:24 -04:00
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
cb88952a77
braces and spacing
2017-07-13 10:25:14 -04:00
aff7e94725
default to TCP for Method
2017-07-13 10:23:30 -04:00
363303efa9
use isset instead of empty to get rid of warning
2017-07-13 10:08:36 -04:00
f294acde92
add global and for including the state view
2017-07-13 10:07:23 -04:00
22e957ba46
clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100%
2017-07-12 12:49:01 -04:00
0adc14da4e
fix links to Filter and Devices
2017-07-12 11:17:07 -04:00
c9689aa010
fix braces,spacing,quotes. Change form method to post
2017-07-12 10:58:20 -04:00
bd681de955
fix braces
2017-07-12 10:57:45 -04:00
fed4dae7e5
fix width and height in options
2017-07-11 19:13:29 -04:00
148d7066f9
Merge branch 'master' into storageareas
2017-07-11 16:15:02 -04:00
dfd1c2844a
remove storageId
2017-07-11 11:28:15 -04:00
0eb7bfabf2
put the ajax query back to a post
2017-07-07 12:15:09 -04:00
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
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
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
4128f5861f
Merge pull request #1940 from connortechnology/montagereview_rework
...
Montagereview rework
2017-07-07 08:34:01 -05:00
21881235f9
merge changeWidth and changeHeight
2017-07-07 09:31:53 -04:00
d3ec50aa69
various fixes plus use global db functions in logger
2017-07-06 17:45:23 -04:00
50adec45c5
Strip non 7-bit ascii chars from log message
2017-07-06 11:45:17 -04:00
7533d09631
increase log query time minimum to 2 seconds. 1 is too frequent.
2017-07-06 11:42:35 -04:00
c2a042c0e7
replace with $)REQUEST so that logs can be query using a GET. Strip non-asci8bit chars from log message
2017-07-06 11:42:04 -04:00
c372787882
fix typo
2017-07-06 10:50:56 -04:00
4aba4178da
fix spacing
2017-07-06 10:50:07 -04:00
e892841d7e
Fix typo
2017-07-06 10:49:54 -04:00
cf0944f0ad
spacing and quotes
2017-07-06 10:49:36 -04:00
48d1174dd6
hide buttons when using videojs
2017-07-06 10:49:27 -04:00
48373f0d8b
fix filters on console. filter object now has terms under a Query array
2017-07-06 10:49:10 -04:00
5f03faa77e
view=frame needs more vertical space
2017-07-06 10:48:52 -04:00
874dc79948
tell eventdetail popup to close on save
2017-07-06 10:48:33 -04:00
3233105d2c
implement a way to tell a popup to close
2017-07-06 10:48:06 -04:00
9b4fb05d5b
Fix parseFilter because terms is now under Query
2017-07-06 10:47:47 -04:00
d892b94819
spacing
2017-07-06 09:38:30 -04:00
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
6b2e23e1a5
Merge branch 'montagereview_rework' of ../ZoneMinder.master into montagereview_rework
2017-07-05 14:27:46 -04:00
1e21beb1cd
use instead of document.getElementById
2017-07-05 14:25:44 -04:00
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
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
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
3068987308
Merge branch 'master' into montagereview_rework
2017-07-05 13:53:00 -04:00
8c19b129d7
more wip
2017-07-04 12:33:01 -04:00
f87a89a5ce
more fixes
2017-07-04 11:51:23 -04:00
d7950bd732
Merge branch 'master' into knnniggett-configfiles
2017-07-03 21:53:47 -04:00
a263de144b
fixup defaults for Filter
2017-06-29 15:00:17 -04:00
6fc1581b9e
use a monitor object instead of just a db array.
2017-06-28 20:33:53 -04:00
621d2e0e41
remove debug code
2017-06-28 15:18:12 -04:00
8b1459a510
fixes for cambozola on ie, and fixes to setting fixed widths
2017-06-28 15:17:55 -04:00
ed4da1e8bc
change to single quotes
2017-06-28 14:27:09 -04:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
f782aeccd9
fix view is view_video, not action=niew_video
2017-06-26 21:09:54 -04:00
3a113899ed
whitespace and braces fixing
2017-06-26 14:29:45 -04:00
c1b8105c0e
only include csrf if it's going to be used. This fixes view_video using up all ram sending a video file
2017-06-26 14:23:54 -04:00
d97d156efb
Don't do csrf for view_video
2017-06-26 11:48:26 -04:00
b5565bb16a
fix filters, refreshparent in wrong block
2017-06-23 09:04:46 -04:00
892f3a06c7
wip
2017-06-23 08:32:09 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
5e75588bfb
Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause
2017-06-21 17:14:02 -04:00
c7026a1b65
requests should be csrf'd. view_video does not need to be
2017-06-20 10:56:59 -04:00
1932fa7f81
don't do CSRF for requests, and when not auth, clear the request so that we don't do it.
2017-06-20 10:52:16 -04:00
375e4a3e9c
More filter UI fixes
2017-06-20 10:45:16 -04:00
5bdfb8ae4e
add a question mark to delete confirm message and just submit the form
2017-06-20 09:09:21 -04:00
5df4494c6c
make Filters a main window view instead of a popup
2017-06-20 09:08:57 -04:00
93f81daa8d
Fix saving logic
2017-06-20 09:08:25 -04:00
dc96ca72a8
Fix AutoDetail=>AutoDelete, add Id to defaults and remove debugging
2017-06-20 09:08:15 -04:00
965b306ebc
continue redoing filters
2017-06-19 13:24:02 -04:00
1d9e0b7d69
fix saving filters
2017-06-19 10:18:44 -04:00
75c11431e6
deprecate filtersavepopup
2017-06-16 11:10:25 -04:00
3225891843
update/fix filter behaviour
2017-06-15 15:45:43 -04:00
91a070b835
Merge branch 'master' into storageareas
2017-06-15 13:13:08 -04:00
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
8145f2bc4c
whitespace
2017-06-15 12:13:40 -04:00
1f14870b38
updates, fix merge problems
2017-06-14 15:35:35 -04:00
e2139920a8
change some more quotes
2017-06-14 15:09:21 -04:00
9f301e3c51
Merge branch 'log_no_truncate' into storageareas
2017-06-14 10:18:27 -04:00
4219bcd1ca
add the missing .map file for bootstrap
2017-06-14 09:36:49 -04:00
ce6a6a41a8
fix gif->png and the path for arrow-s-u and arrow-s-d
2017-06-14 09:34:03 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
c11a219b9f
Merge pull request #1896 from connortechnology/dragndrop_monitor_sorting
...
Dragndrop monitor sorting
2017-06-12 20:49:51 -05:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
528582fec6
fix tabs
2017-06-09 10:36:38 -04:00
1788aabb6c
Merge branch 'storageareas' into move_dirs
2017-06-09 10:35:58 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
c6a1518548
remark out call to set progressBarWidth, but that should never change and it uses a var that isn't global barWidth
2017-06-08 14:03:07 -04:00
cac5819331
update call to getStreamSrc to use ->getStreamSrc. Also remove extraneous canView(Event)
2017-06-08 14:02:27 -04:00
2c1f576da4
Don't need to check for values in args, beacuse we set one above
2017-06-08 14:01:44 -04:00
405078686a
update getStreamSrc to take a hash instead of an array of thing=thing
2017-06-08 14:01:22 -04:00
81c2216eb6
spaces/quotes
2017-06-08 13:37:26 -04:00
84fd80b242
undo cake log path changes
2017-06-08 12:21:51 -04:00
175e6921f9
use version-generic urls to jquery and jquery-ui
2017-06-07 14:13:03 -04:00
b4bdc1fd6b
Merge branch 'master' into dragndrop_monitor_sorting
2017-06-06 20:39:58 -04:00
01717a5c14
Merge branch 'master' into filter_by_runstate
2017-06-06 20:34:47 -04:00
d524f98d43
add find_all function
2017-06-06 20:29:17 -04:00
1ab5e0e374
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-06 15:36:10 -04:00
04aa01ba0c
add login css files
2017-06-05 21:41:39 -04:00
cfa292a204
update widths of monitors when selecting a layout
2017-06-05 19:53:19 -04:00
46f23efa01
increaes height of eventdetail popup
2017-06-05 19:52:32 -04:00
831bec3398
Merge pull request #1901 from jedelbo/1900-update_danish-translation
...
Update danish translation file
2017-06-05 15:57:09 -05:00
2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
c71a4fd690
fix spacing
2017-06-05 15:36:37 -04:00
08d505360d
spacing
2017-06-05 15:22:32 -04:00
ad4264dad7
spacing
2017-06-05 15:21:27 -04:00
36ae355a2c
spacing, braces
2017-06-05 15:21:07 -04:00
e1da754ff1
scale zones svg as well when changing width/height/scale
2017-06-05 13:25:27 -04:00
2a45cd02ca
sync some missing styles from classic
2017-06-05 12:49:39 -04:00
bfa724d06c
fix spacing
2017-06-05 11:11:34 -04:00
a9183a1599
more quotes
2017-06-05 09:40:19 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
be77269acb
fix merge messup
2017-06-04 17:40:54 -04:00
07835969f1
get rid of viewport line that prevents zooming in and out
2017-06-04 17:31:17 -04:00
a9268d10e3
fix the use of ZM_OPT constants in javascript. Instead, check for existence of the element in the form.
2017-06-02 12:21:12 -04:00
555a667035
fix filter button
2017-06-02 12:12:59 -04:00
352ea6b6ae
spacing
2017-06-02 12:12:41 -04:00
cbc1636b11
Update danish translation file
2017-06-02 13:26:30 +02:00
e47adcf6cc
the tfoot has to come after the tbody
2017-06-01 09:36:00 -04:00
a1af422d29
the [filter][terms] etc part needs to be urlencoded as well. Becase [] are not valid in urls.
2017-06-01 09:35:38 -04:00
73ca07792b
double quotes to single quotes
2017-05-31 22:11:54 -04:00
5c67c87147
remove deprecated cellspacing attr on table
2017-05-31 22:08:44 -04:00
a940fe429c
deprecate the use of the center tag, and only put in the development h3 if it has contents
2017-05-31 22:08:05 -04:00
1df147e183
adjust spacing
2017-05-31 22:01:35 -04:00
502cb6a7d8
fix spacing
2017-05-31 21:34:38 -04:00
83da2dfa05
double to single quotes
2017-05-31 21:30:19 -04:00
98b49fb64d
quotes, spacing
2017-05-31 21:28:40 -04:00
17c8224733
begin to ahndle imageData not being populated
2017-05-31 20:55:10 -04:00
4889f3d0e8
rework logic in GetStreamImg a bit. If no frame is specified, then we can use snapshot...otherwise it should do the frame image!
2017-05-31 20:54:34 -04:00
dbeb000505
Merge ../ZoneMinder.connortechnology
2017-05-31 20:45:37 -04:00
2b9134512f
remove leftover
2017-05-31 20:45:21 -04:00
06a9598755
Merge ../ZoneMinder.connortechnology
2017-05-31 12:55:35 -04:00
8596891e4d
fix double to single quote mistakes
2017-05-31 12:55:27 -04:00
ece10d6278
braces and whitspace
2017-05-31 11:16:55 -04:00
cbe7924041
fix spacing
2017-05-30 19:53:02 -04:00
83d6f415b3
cleanup whitespace
2017-05-30 14:07:37 -04:00
b6ed806d6c
braces and comments
2017-05-30 13:51:00 -04:00
b96f5cf49d
more merges/fixes from SA
2017-05-30 13:50:24 -04:00
8b3b9eb30e
more merges/fixes from SA
2017-05-30 13:47:30 -04:00
1a43334113
Use NULLs instead of '' when saving things
2017-05-30 13:38:57 -04:00
c7b52bd998
fix logging dirs
2017-05-30 13:14:43 -04:00
e9adc3bc5b
restore SA version
2017-05-30 13:14:27 -04:00
e9a0474cf7
add back required lines with a comment
2017-05-30 12:04:12 -04:00
8a732dff8a
add back required lines with a comment
2017-05-30 12:03:31 -04:00
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -04:00
c5288a172d
fix merge problem
2017-05-30 11:57:20 -04:00
00479876f2
fix braces
2017-05-30 11:53:21 -04:00
5bbe13f98f
update cycle from SA
2017-05-30 11:53:05 -04:00
26131f8a10
double quotes to single quotes
2017-05-30 11:52:48 -04:00
a75488e0f3
flat and dark skins add some padding to the header, which makes it extend beyond 99%. These lines are not needed
2017-05-30 11:52:04 -04:00
5c5aafb1e8
white space and a check for mid being set to quiet error messages
2017-05-30 11:37:48 -04:00
59d00b20b1
fix fetchImage
2017-05-30 11:35:52 -04:00
f88abfcb4d
the liveStream element now has the monitorId appended to it, to be consistent with montage so we can reuse code
2017-05-30 11:26:57 -04:00
3062fe43f3
revert csrf on login page. csrf needs to be off in order for zmNinja to work
2017-05-30 11:25:25 -04:00
fe2155dd1a
merges from SA
2017-05-30 11:15:00 -04:00
e855ad685f
small cleanups
2017-05-30 11:14:22 -04:00
845ef6c05a
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-30 10:22:17 -04:00
32daa4faed
Merge branch 'master' into storageareas
2017-05-30 10:21:01 -04:00
c616a3b3b7
fix some bad to '' changes
2017-05-30 09:39:01 -04:00
ff08843d68
replace with ''
2017-05-30 09:10:41 -04:00
e2df0b74d4
remove including state.js.php as it has nothing to do with this pr
2017-05-29 09:51:31 -04:00
bb051fd509
fix merge conflicts
2017-05-25 15:29:31 -04:00
7cfa0b12ec
Merge branch 'dragndrop_monitor_sorting' into storageareas
2017-05-25 15:26:04 -04:00
123aaad080
add applySort function, and the sorting init code
2017-05-25 15:03:30 -04:00
229c8c6e23
Mmove Right buttons to the left, because there is no more room on the right anymore, move the script that sets up the sorting to js/console.js
2017-05-25 15:03:10 -04:00
09c0b47568
remove no longer used styles, and increase the width of the Mark Column to accomodate the up/down arrows
2017-05-25 15:02:30 -04:00
aacfea735e
always include bootstrap, and include jquery
2017-05-25 15:00:44 -04:00
afce83d289
Merge branch 'master' into dragndrop_monitor_sorting
2017-05-25 14:31:41 -04:00
31b5a99b43
remove old code to do sequence up/down arrows, replace with jquery sortable
2017-05-25 14:30:07 -04:00
043d722651
braces,whitespace
2017-05-25 14:26:49 -04:00
f1917a6bc1
delete old Makefile.am
2017-05-25 14:10:29 -04:00
b9736ad2f2
merge from sa the ajax file to apply the sorting.
2017-05-25 14:08:04 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
4347ee1258
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 10:41:40 -04:00
13265a8f4f
undo StorageAreas contents
2017-05-23 10:41:21 -04:00
75dc774a08
Continue to support non-USE_DEEP_STORAGE option
2017-05-22 21:21:49 -04:00
Isaac Connor
digital-gnome
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Andrew Bauer
Pliable Pixels
APHW2 MFGENG
Steve Gilvarry
ralimi
peruchi
Jørgen Edelbo