6608cb4e35
use frame delta to determine how much to sleep
2019-01-15 11:25:22 -05:00
84c812725e
spacing, improve debug. WHen looking for starting keyframe in packetqueue, use <= instead of <.
2019-01-14 14:00:45 -05:00
f726666f54
Merge branch 'master' into h265
2019-01-14 12:36:11 -05:00
0e06bdd1f2
zmcuston.conf => zmcustom.conf
2019-01-14 11:41:44 -05:00
c834fbe462
the filter action should singular filter, not filters
2019-01-13 14:52:39 -05:00
ee2b9b011a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-11 13:55:17 -05:00
a282b487d1
load Help from Config as it is not longer always loaded into ram.
2019-01-11 13:55:03 -05:00
208d8f28de
update debian to 1.32.x ( #2407 )
...
Hello,
the ZM_PATH config has cost me several hours to fix. I would like to add this little snipped to help others avoid this pitfall.
Best regards
Marc
2019-01-11 12:14:42 -05:00
730ced60d8
specify which input we are setting standard on. Not sure it is required, but the api docs do it
2019-01-10 12:08:51 -05:00
b373577589
fix function view after actions cleanup
2019-01-10 12:08:25 -05:00
4a82f460b2
add some parenthesis to make logic at more clear if not more correct. Potentially fix #2405
2019-01-09 16:39:53 -05:00
1d54216e80
spacing
2019-01-09 16:23:58 -05:00
941ce6e97f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-09 12:37:54 -05:00
c1e4fbac6a
extend input path and options to the full width of the popup
2019-01-09 12:37:42 -05:00
9811679cc0
Merge pull request #2401 from connortechnology/vlc_logging
...
add a logging callback to the libvlc camera
2019-01-08 13:49:51 -06:00
2d03583b78
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-08 13:12:42 -05:00
ffa37d8c10
Fix margins on replayControl
2019-01-08 13:12:35 -05:00
a5de51478e
The termination callback should be private
2019-01-08 13:12:22 -05:00
ae1f00f2a1
add a logging callback to the libvlc camera
2019-01-08 13:06:19 -05:00
dd4bd42066
Merge pull request #2396 from connortechnology/fix_2383
...
disable delete button when event is archived.
2019-01-07 18:40:05 -06:00
3f5a2a2aa6
disable delete button when event is archived.
2019-01-07 15:56:23 -05:00
b8bf91bec6
include libswresample-ffmpeg1 in depends
2019-01-07 09:20:58 -05:00
b4f8500cb5
Merge branch 'split_actions'
2019-01-05 18:33:04 -05:00
3f10553464
Fix include path to Monitors.php
2019-01-05 18:32:53 -05:00
e34a5e972a
fix missing }
2019-01-05 11:12:26 -05:00
e6ba8e58ef
Fix #2391 by defining monitor variable ( #2392 )
2019-01-05 10:20:34 -05:00
7336cdaf0d
Update ISSUE_TEMPLATE.md
2019-01-05 08:29:58 -06:00
16f272e3e0
Update issue templates
2019-01-05 08:21:52 -06:00
986961d1d4
Create issue-close-app.yml
2019-01-05 08:14:39 -06:00
4678456fe5
Merge pull request #2385 from connortechnology/split_actions
...
Split actions.php into individual files per view
2019-01-04 17:33:57 -06:00
5b5905c83a
We always use markEids[] now
2019-01-04 16:29:16 -05:00
de0ef6ce43
Merge branch 'master' into split_actions
2019-01-04 15:55:54 -05:00
e72e4e7ce4
Spacing, remove some html4 stuff, clean up duplicated hidden form elements.
2019-01-04 15:52:36 -05:00
dea64320f0
Fix a + that should be a .
2019-01-04 15:52:14 -05:00
0e20666992
fix eventdetail actions being in events
2019-01-04 15:43:31 -05:00
e2f32ab091
Upgrade config saving
2019-01-04 09:43:36 -05:00
7ec96655c3
fix missing ! when testing for permission on editing config
2019-01-04 09:37:26 -05:00
5b9bf48945
Merge branch 'master' into split_actions
2019-01-04 09:35:54 -05:00
46adcbb66b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-01-04 09:34:51 -05:00
edeaa07c12
Fix no quotes around Id
2019-01-04 09:34:42 -05:00
6cad852e11
fix path to MontageLayout
2019-01-04 09:34:18 -05:00
dbe9817bc8
Split actions.php into individual files per view
2019-01-04 09:26:34 -05:00
151c7677d8
add WebSite type to enum ( #2382 )
...
* add WebSite type to enum
* add website enum to update script
* update enum
* bump the version
2019-01-03 17:06:44 -05:00
5e5c8083f4
Merge pull request #2380 from techrockedge/master
...
add Foscam R2C ptz script
2019-01-03 16:00:57 -06:00
92aa29d8d0
Update zm_create.sql.in
2019-01-03 16:00:30 -06:00
c0e54a9874
Delete zm_create.sql
2019-01-03 15:59:28 -06:00
571daec8fc
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
...
refresh with master
2019-01-03 15:02:57 -05:00
af7d4b1af6
added Control line to zm_create.sql.in
2019-01-03 14:58:17 -05:00
07d745cf55
added Control line to zm_create.sql.in
2019-01-03 14:46:23 -05:00
561a881114
added Control line to zm_create.sql
2019-01-03 14:35:01 -05:00
Isaac Connor
kobold81
Andrew Bauer
David Beitey
Andrew Bauer
techrockedge