15ba7d2a35
fixes
2017-10-02 11:25:51 -04:00
c35face630
LengthTypo
2017-10-02 10:52:55 -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
6a0da487eb
add Parent Group selection to Group Edit
2017-09-28 12:37:15 -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
d69b16df24
add group filter to montagereview
2017-09-26 11:28:19 -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
fef503f90c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-23 13:42:44 -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
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
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
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
c60939e824
fix absolute path to index.php in console.js
2017-08-11 09:08: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
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
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
457d909c88
fix quotes
2017-07-21 10:54:33 -04: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
1a8638f3dd
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-07-14 11:50:01 -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
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
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
7533d09631
increase log query time minimum to 2 seconds. 1 is too frequent.
2017-07-06 11:42:35 -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
3233105d2c
implement a way to tell a popup to close
2017-07-06 10:48:06 -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
8c19b129d7
more wip
2017-07-04 12:33:01 -04:00
f87a89a5ce
more fixes
2017-07-04 11:51:23 -04:00
6fc1581b9e
use a monitor object instead of just a db array.
2017-06-28 20:33:53 -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
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
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
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
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
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
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
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
c71a4fd690
fix spacing
2017-06-05 15:36:37 -04:00
08d505360d
spacing
2017-06-05 15:22:32 -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
e47adcf6cc
the tfoot has to come after the tbody
2017-06-01 09:36:00 -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
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
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
e9adc3bc5b
restore SA version
2017-05-30 13:14:27 -04:00
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -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
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
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
13265a8f4f
undo StorageAreas contents
2017-05-23 10:41:21 -04:00
d988b9b6d5
improve efficiency of progress bar updating/drawing. Add some debug
2017-05-19 12:25:26 -04:00
641384f38d
spacing
2017-05-19 12:24:59 -04:00
f4008e2c6a
Merge branch 'master' into storageareas
2017-05-19 11:20:33 -04:00
9e3af977e2
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 11:09:08 -04:00
c64391c98d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 11:00:37 -04:00
29b43cfd0a
Whitespace, google style, localized video.js ( #1890 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
* merge whitespace and brace changes from sa branch
* merge localized versions of js files
* merge localized versions of js files
* merge code to load video.js etc on Event view
* Merge updates from sa branch
* Update frmo SA. Use Monitor object, still hide Controls by default.
2017-05-19 10:23:51 -04:00
75ca52dba5
fix width of plus and minus buttons in filters
2017-05-19 10:18:52 -04:00
94f7194e4f
Update frmo SA. Use Monitor object, still hide Controls by default.
2017-05-18 21:48:21 -04:00
319712a4c1
Merge updates from sa branch
2017-05-18 15:16:59 -04:00
377cc94acb
Merge more changes to make video storage ui's work ( #1889 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
* merge whitespace and brace changes from sa branch
* merge localized versions of js files
* merge localized versions of js files
* merge code to load video.js etc on Event view
2017-05-18 15:11:26 -04:00
f851daca68
merge code to load video.js etc on Event view
2017-05-18 15:10:13 -04:00
5500d7bbc0
merge localized versions of js files
2017-05-18 15:05:57 -04:00
bf3db69cbe
merge localized versions of js files
2017-05-18 15:05:10 -04:00
bc1a2dcb21
whitespace & braces
2017-05-18 14:55:53 -04:00
57d07aef22
merge whitespace and brace changes from sa branch
2017-05-18 14:44:06 -04:00
44c07c4e7a
put back proper sql
2017-05-18 14:42:55 -04:00
84a224d712
put back the AS E
2017-05-18 14:39:58 -04:00
4763ace165
Merge branch 'master' into storageareas
2017-05-18 14:24:09 -04:00
da33cbe1f9
fix
2017-05-18 14:09:46 -04:00
158741a7d8
fix whitespace
2017-05-18 14:07:56 -04:00
319ad7fede
fix whitespace
2017-05-18 14:07:51 -04:00
8b0f319834
fix whitespace
2017-05-18 14:06:13 -04:00
9fd9a75669
fix whitespace, braces, simplify sql
2017-05-18 14:04:24 -04:00
29bcab9204
fix Debug to Logger::Debug
2017-05-18 13:54:06 -04:00
d1c61a252f
fix whitspace/braces
2017-05-18 13:50:56 -04:00
96051a0071
we switched to .png instead of .gif
2017-05-18 13:50:46 -04:00
e15fdf9ac3
We switched to png's now
2017-05-18 13:18:07 -04:00
3ec4e1bfe7
fix merge
2017-05-18 12:59:09 -04:00
f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
200f92b1ad
make zmexport not rely on symlinks in the webroot ( #1888 )
...
* make zmexport not rely on symlinks in the webroot
* add archive view
2017-05-17 11:30:39 -04:00
c859f7291c
Feature h264 videostorage ( #1882 )
...
* Moved writing of configure options from Controller to Model. Fixes #191 .
* Initial commit for saving events as videos :)
* Add zm_video.cpp to autotools
* Add zm_video.h to autotools
* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
* Fix serve memory leak
* Few minor code improvements
* Added the ability to override preset, tune, profile and few other improvements
* Correctly write SPS & PPS from x264 encoder headers
* Remove unnessecary SPS & PPS writing code
* Imported missing files from master to feature-h264-videostorage
* Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)
* Updates to make gcc happy
* Add html5 video control to timeline and event to support mkv playback
* Add zm_videostore.cpp to CMakeLists.txt
* Remove Modern Branch for now
* Fix minor bug
* Option handled added in master, removing duplicate declaration
* Add CaptureandRecord from zm_camera.h
* Putting placeholder in for CaptureAndRecord function
* Removed duplicate code and brackets
* add digest auth file for cmake
Conflicts:
src/CMakeLists.txt
* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"
This reverts commit d9bbcdf3a9
2017-05-15 22:02:48 -04:00
68aea50ca9
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-15 16:19:57 -04:00
e737d90120
If AuthHash not set, return '' instead of php producing a warning
2017-05-12 09:05:14 -04:00
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
f832dd30ea
Merge pull request #1817 from mnoorenberghe/eslint
...
Add eslint configuration files extending Google's rules
2017-05-10 09:04:51 -04:00
06009f3b16
Merge pull request #1661 from connortechnology/add_scale_to_frame_view
...
Add scale to frame view
2017-05-10 07:56:36 -05:00
62d6509708
Merge pull request #1818 from SteveGilvarry/743-Swap_to_PNG
...
Swap to PNG
2017-05-10 07:55:07 -05:00
e0256c1a67
add local version of js files
2017-05-08 21:06:25 -04:00
9ac20999b3
rough in
2017-05-05 21:11:23 -04:00
7be2ee0e1b
add back videoEvent
2017-05-05 17:19:02 -04:00
0f5142fa19
bring back video popup
2017-05-05 17:18:48 -04:00
bde887fc9c
remove unneeded ;'s
2017-05-05 17:17:55 -04:00
deb1cf653a
fix dimensions of ptz box
2017-05-05 16:47:21 -04:00
cb99d709c5
add debug
2017-05-05 16:37:12 -04:00
64193c3368
turn status ajax calls to gets instead of posts
2017-05-05 16:18:12 -04:00
19b2de6d28
add a Download MP4 button
2017-05-05 15:13:25 -04:00
355eb1beef
when mouseover the thumbnail, stream the video
2017-05-05 14:25:25 -04:00
3b6cf74ed3
add auth_hash to ajax calls
2017-05-05 11:53:40 -04:00
9482114f95
add db connections to the header
2017-04-28 14:17:09 -04:00
20c699366e
scale is a percentage, so use the rescale function
2017-04-28 11:10:43 -04:00
df7161a4ea
merge some stuff I did in vueip
2017-04-28 10:54:20 -04:00
dce39bb2a9
Merge branch 'master' into storageareas
2017-04-26 15:58:17 -04:00
1a565a47f2
fix skin path in export_functions
2017-04-26 12:17:01 -05:00
5a2ef571ef
fix scaling, zones now work. Add a Show/Hide Zones at the top
2017-04-24 14:47:30 -04:00
83ba74ad66
work in progress, rough in adding the svg zones to montage
2017-04-24 11:11:54 -04:00
ef6c675c6a
work in progress, rough in adding the svg zones to montage
2017-04-24 11:11:44 -04:00
c8855c03fc
don't use a submodule for video.js
2017-04-20 10:50:42 -04:00
035b464b97
Revert "don't use external hosted video.js or moment.js"
...
This reverts commit fb2f8022a7
2017-04-20 10:45:51 -04:00
dd4b93f130
add submodule video.js, using release tag v5.18.4
2017-04-20 10:35:32 -04:00
fb2f8022a7
don't use external hosted video.js or moment.js
2017-04-20 10:12:47 -04:00
3db38eb474
limit points to the limits of the monitor
2017-04-19 16:12:12 -04:00
dd4ea635e8
remove rotate, as the video file itself has the rotate set
2017-04-19 13:12:15 -04:00
71a9763c32
add a comment
2017-04-19 10:02:31 -04:00
f1f54205fb
Merge branch 'remove_BOM' into storageareas
2017-04-16 09:28:35 -04:00
5e0012569f
use dos2unix to remove BOM
2017-04-16 09:22:37 -04:00
f97e074393
braces fixes
2017-04-12 16:16:56 -04:00
d039227f79
Merge branch 'master' into storageareas
2017-04-12 13:51:10 -04:00
92a2d6f4f2
hide the video, let's stick with jpeg's, which will be auto-generated
2017-04-07 13:20:28 -04:00
8f51331472
fix timeline view by using view=image instead of direct path
2017-04-07 13:20:04 -04:00
2b9a0f96d3
remove and break over multiple lines
2017-04-05 16:10:06 -04:00
d611840750
whitespace, handle NaN in limitArea
2017-04-05 16:09:40 -04:00
c5ff45922f
fix zone edit height
2017-04-05 16:09:06 -04:00
a10d52a3e1
Merge pull request #1844 from connortechnology/fix_1812
...
fix Monitors filtering SQL
2017-04-03 20:06:39 -05:00
58d119d9ed
Merge branch 'fix_1762' into storageareas
2017-03-31 13:38:59 -04:00
514c83d3e9
whitespace and add a test for ->Triggers being an array
2017-03-31 12:01:37 -04:00
d3f6ab3d29
fix Monitors filtering SQL
2017-03-30 13:06:54 -04:00
56476a7774
uppercase SQL
2017-03-30 13:05:10 -04:00
4f2dcdacb4
update, remove styles and fix the sql for limiting monitors
2017-03-30 13:04:16 -04:00
dd4550406f
remove styles from montagereview and stick them in a view-specific css
2017-03-30 13:03:46 -04:00
7e3b27a130
Test for Controllable as well as ControlId
2017-03-30 10:49:02 -04:00
5ea77f0781
Make zones a link to zones_overview
2017-03-30 10:45:55 -04:00
4d2fb6b7f8
don't need to reload when deleting. The row will no longer be in there
2017-03-27 13:13:48 -04:00
7b63461517
attempt to support redirecting to the given url instead of just refreshing
2017-03-27 13:13:08 -04:00
8ef7a708bd
updates in filters, try to get the new filter loaded when saving with a new name
2017-03-27 13:12:37 -04:00
7360619941
Merge branch 'master' into storageareas
2017-03-24 11:53:45 -04:00
eaca58bb7c
Merge pull request #1815 from mnoorenberghe/postlogin
...
Properly escape postLoginQuery. Fixes #1797
2017-03-21 10:27:13 -04:00
badbf1c74c
Merge pull request #1816 from mnoorenberghe/flat_window_sizes
...
Increase default window sizes for the flat theme. Fixes #1059
2017-03-20 13:10:13 -04:00
70246ce55a
whitespace corrections and ensure that options[width] and options[height] are defined
2017-03-20 12:10:28 -04:00
2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
a16ea554a3
Swap to PNG
2017-03-18 22:34:13 +11:00
c7955cd1b6
Add eslint configuration files extending Google's rules
2017-03-18 00:02:17 -07:00
91ad6afffb
Increase default window sizes for the flat theme. Fixes #1059
...
Used the computed height of <html> and rounded up the nearest multiple of 5.
2017-03-17 22:24:42 -07:00
ea5342abd2
Properly escape postLoginQuery. Fixes #1797
2017-03-17 21:05:28 -07:00
8834109812
code style and whitespace changes
2017-03-17 09:59:23 -04:00
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04:00
9681a444b4
Merge pull request #1765 from SteveGilvarry/ffmpeg_url
...
Align Method description to what it is actually doing
2017-03-16 09:32:30 -05:00
5bccd92b68
fix scoping of scale var
2017-03-16 09:53:53 -04:00
9f99d34807
fix calls to getStreamHTML
2017-03-13 14:22:33 -04:00
14c4a156c6
set img.src='' first so that Chrome closes the old stream.
2017-03-06 20:21:12 -05:00
4df12ae370
Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height
2017-03-06 17:30:00 -05:00
d3f7451736
Merge branch 'storageareas' into montage_width_height
2017-03-06 16:56:18 -05:00
4fc0aead70
wip
2017-03-01 15:26:40 -05:00
c3a52272d8
implement changeWidth, changeHeight and alter getStreamHTML to take an array of options
2017-02-27 20:56:14 -05:00
a0dd36d869
add width and height scale dropdowns
2017-02-27 16:40:40 -05:00
186e5ba866
Merge branch 'master' into storageareas
2017-02-21 09:48:00 -05:00
11b90e6011
fix usage of wrong key
2017-02-17 12:37:58 -05:00
980b088d57
google style and add label tags around Scale
2017-02-17 09:19:54 -05:00
aeedfe8d74
fix some whitespacing
2017-02-14 09:11:54 -05:00
9716c4ef89
Add Option help
2017-02-05 18:43:47 +11:00
c72704bf0b
Change descriptions for ffmpeg methods and put TCP first.
2017-02-05 15:34:06 +11:00
e3edbf40cf
make url full width
2017-02-02 12:16:40 -05:00
7b73eb350f
update to current.
2017-02-02 12:15:16 -05:00
d8c79cb750
fixup header and sidebar layout
2017-02-02 11:31:16 -05:00
7d451e1e41
float the scale control right, add css for other skins
2017-01-31 11:13:16 -05:00
4a4f62f0a7
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2017-01-31 11:13:16 -05:00
568160e5aa
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2017-01-31 11:13:15 -05:00
6f6eacaa72
fixup classic and dark skins
2017-01-30 21:45:48 -05:00
89022fff0c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-01-30 21:16:26 -05:00
f3378207c0
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
2017-01-30 21:16:21 -05:00
ad2e00166a
use isset
2017-01-30 19:53:08 -05:00
4543b3e1b1
include jquery-ui instead of using a cdn version
2017-01-30 19:17:14 -05:00
19aed3f860
dont check ZM_DIR_EVENTS if it already exists in storageareas
2017-01-30 17:29:15 -05:00
129acb5b8e
only show mark column if you have the Monitor Edit ability
2017-01-24 09:30:56 -05:00
7cd2f6c69e
use glyphicon for sort
2017-01-23 21:51:17 -05:00
fdd71a826a
implement dragndrop sorting
2017-01-23 10:12:57 -05:00
35148008b6
make img an inline-block so that it continues having space, even when is a broken link
2017-01-18 21:14:15 -05:00
9c8b229c74
Fix cutnpaste error
2017-01-14 17:08:13 -05:00
899b1b82b9
Merge branch 'filter_by_runstate' into storageareas
2017-01-14 17:07:20 -05:00
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
2436e40f5d
Merge branch 'master' into storageareas
2017-01-11 10:34:27 -05:00
7ef7a36f39
fix conditional logic in controlcap.js
2017-01-10 17:53:05 -06:00
fea5fa1b59
fix xtell should be -1 for move left
2017-01-10 12:35:02 -05:00
7ef0c2c9d3
fix deleting filters. We don't need to set fid anymore
2017-01-09 14:58:55 -05:00
cc724a5542
add a question mark to delete confirmation
2017-01-09 14:53:13 -05:00
84183c819c
Merge branch 'master' into storageareas
2017-01-03 09:53:09 -05:00
b4bddee337
Merge branch 'master' into improve_filter
2017-01-03 08:49:56 -05:00
0a90dbac9f
require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path.
2017-01-02 10:35:51 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
2dda2d9e1e
remove unneeded, empty files
2016-12-26 09:49:14 -06:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
0f4b78b180
increase height of bandwidth popup
2016-12-21 10:46:42 -05:00
f92edc3456
refresh stream url when changing scale
2016-12-21 10:40:47 -05:00
02a2fdf58f
Merge branch 'remove_emptys' into storageareas
2016-12-20 16:40:42 -05:00
38c0cedecc
remove the use of empty which on php < 5.5 only supports variables.
2016-12-20 16:37:42 -05:00
752f0eb40b
Merge branch 'master' into improve_filter
2016-12-20 11:43:02 -05:00
708f52beda
Merge branch 'disk_space_in_events' into storageareas
2016-12-13 13:36:18 -05:00
a9548d3f6b
Add a config entry to turn event disk space on/off
2016-12-13 13:34:56 -05:00
30ec67d4c3
Merge branch 'master' into disk_space_in_events
2016-12-13 13:28:32 -05:00
857b4e8345
Merge branch 'master' into improve_filter
2016-12-06 11:58:41 -05:00
2adb17ad90
fix type
2016-11-29 15:25:24 -05:00
9312eed17f
Merge branch 'master' into disk_space_in_events
2016-11-22 10:58:24 -05:00
02cd3e8cba
Merge branch 'master' into small_fixes
2016-11-22 10:52:07 -05:00
6bf921a858
Add thumbnanils to the frames view. Also add a content-disposition header and some url mangling to help browsers give a useful filename when doing Save Image As
2016-11-21 12:28:15 -05:00
4fe6b6f8b7
set a min width so that small images or fps updates don't cause a reflow
2016-11-21 11:39:31 -05:00
c360e27b02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-11-17 13:13:47 -05:00
bb6b0c2d49
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter
2016-11-17 12:16:49 -05:00
4eb5ff7aff
Fix Undefined index: loginFailed. Resolves #1684
2016-11-16 19:42:04 -07:00
2bd080a6a6
Merge branch 'master' into storageareas
2016-11-15 08:41:00 -05:00
8f71971209
Show error message upon unsuccessful login. Fixes #1648 ( #1680 )
...
* Add additional post-cmake files to .gitignore
* Add bootstrap 3.3.7
* Load bootstrap css
* Restyle login page, move recaptcha js to <head>
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
* Update doctype to HTML5, add meta tags for mobile browsers
* Move inline Login css to css file
* Remove extra php tag in functions.php
* Show error message upon unsuccessful login. Fixes #1648
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
* Only load bootstrap css in specific views.
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
* Test for invalid login via session variable.
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
* Fix a few typos in login inputs
* Add new fonts directory to web CMakeLists
2016-11-14 21:24:43 -05:00
3b7723ee8f
Merge branch 'master' into storageareas
2016-11-11 22:40:00 -05:00
49d8e35e56
Show available PATH_MAP percent on console ( #1675 )
...
* Add PATH_SWAP percent to console
* add changes to console.php
* use ZM_PATH_MAP instead of ZM_PATH_SWAP
* show the folder name PATH_MAP points to
* use a dash as the delimiter instead of fwd slash
2016-11-11 08:47:08 -05:00
65fe07e7aa
Fix a few typos in login inputs
2016-11-10 23:36:28 -07:00
95d00f70a3
Test for invalid login via session variable.
...
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
2016-11-10 23:29:12 -07:00
3916b02a74
Only load bootstrap css in specific views.
...
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
2016-11-10 23:07:52 -07:00
0800a69a57
Show error message upon unsuccessful login. Fixes #1648
...
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
2016-11-10 22:51:32 -07:00
97fb53e95c
Remove extra php tag in functions.php
2016-11-10 21:49:57 -07:00
227b196a2e
Move inline Login css to css file
2016-11-10 21:48:42 -07:00
3e3956f45d
Update doctype to HTML5, add meta tags for mobile browsers
2016-11-10 21:47:53 -07:00
eacf6cd415
Restyle login page, move recaptcha js to <head>
...
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
2016-11-10 21:46:55 -07:00
Isaac Connor
digital-gnome
Isaac Connor
Andrew Bauer
ralimi
peruchi
Isaac Connor
Isaac Connor
Andrew Bauer
SteveGilvarry
Matthew Noorenberghe
Isaac Connor
Manojav Sridhar
Isaac Connor
Andy Bauer
Kyle Johnson