Isaac Connor
|
dd7f399959
|
Merge branch 'remove_local_zm_conf_override' into storageareas
|
2016-04-04 16:13:44 -04:00 |
|
Isaac Connor
|
6c92c0e3f7
|
Merge branch 'reload_stream_on_scale' into storageareas
|
2016-04-04 16:13:35 -04:00 |
|
Isaac Connor
|
98fce7c3c6
|
Merge branch 'reload_stream_on_error' into storageareas
|
2016-04-04 16:13:26 -04:00 |
|
Isaac Connor
|
bc9760ce79
|
Merge branch 'master' into storageareas
|
2016-04-04 16:13:17 -04:00 |
|
Isaac Connor
|
397eb1a01b
|
increase the size of the Pid field in Logs to accomodate FreeBSD
|
2016-04-04 15:14:42 -04:00 |
|
Isaac Connor
|
ed74168710
|
increase the size of the Pid field in Logs to accomodate FreeBSD
|
2016-04-04 15:14:14 -04:00 |
|
Isaac Connor
|
123a1a898a
|
try to reload the image stream on error.
|
2016-04-04 15:04:09 -04:00 |
|
Isaac Connor
|
0b13f9d76f
|
reload stream on scale change
|
2016-04-04 14:58:07 -04:00 |
|
Isaac Connor
|
5f3e7134fb
|
split power out of the Panel box so that I can style it better
|
2016-04-04 13:22:26 -04:00 |
|
Isaac Connor
|
f91ff4503a
|
rework the ptz controls to take up less vertical space, also don't set width of buttons
|
2016-04-04 13:20:04 -04:00 |
|
Isaac Connor
|
02eb36040a
|
fix bad code
|
2016-04-04 12:01:37 -04:00 |
|
Isaac Connor
|
faa75bbe39
|
fix wrong brace and needs quotes
|
2016-04-04 12:00:29 -04:00 |
|
Isaac Connor
|
b3fed1767b
|
Add Concurrent value to the PurgeWhenFull Filter. Default to false
|
2016-04-04 11:57:11 -04:00 |
|
Isaac Connor
|
b3f0f5d0e8
|
Merge branch 'updated-console' into storageareas
|
2016-04-04 11:51:07 -04:00 |
|
Isaac Connor
|
197ae67313
|
Merge branch 'always_show_ptz' into storageareas
|
2016-04-04 11:47:29 -04:00 |
|
Isaac Connor
|
3e20e5f21c
|
fix ptz control box size
|
2016-04-04 11:40:01 -04:00 |
|
Isaac Connor
|
9dfe71ceb8
|
Always show events and always show ptz controls. Also clean out some commented out cruft
|
2016-04-04 11:39:12 -04:00 |
|
Isaac Connor
|
2233747fcb
|
add a missing t
|
2016-04-04 11:38:16 -04:00 |
Isaac Connor
|
43e4052dd9
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-04 11:36:03 -04:00 |
|
Isaac Connor
|
dd153d8efb
|
add header.php to autotools build
|
2016-04-04 11:35:51 -04:00 |
|
Isaac Connor
|
a31660c1f6
|
Remove the code looks for zm.conf in the current dir.
|
2016-04-04 10:45:58 -04:00 |
|
Isaac Connor
|
de8f9570e6
|
Merge branch 'master' into iconnor_video
|
2016-04-04 10:17:18 -04:00 |
|
Isaac Connor
|
c8fa0a9b4f
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-04 10:14:15 -04:00 |
|
Isaac Connor
|
03b1ced568
|
tabs to spaces and use 2space indenting
|
2016-04-04 10:11:48 -04:00 |
|
Isaac Connor
|
9276eea491
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-04-04 09:38:06 -04:00 |
Isaac Connor
|
46ac2301a7
|
Merge pull request #1376 from laerciomotta/patch-1
Improve test multiserver restart cam.
|
2016-04-04 09:29:36 -04:00 |
Kyle Johnson
|
33d6d311b0
|
Include Chart.js
|
2016-04-02 00:48:58 -04:00 |
|
Kyle Johnson
|
315fb3e857
|
Add sidebar and top nav to Monitors popup view
|
2016-04-01 15:52:52 -04:00 |
|
Isaac Connor
|
9287cd0e0a
|
undo code style changes and whitespace changes
|
2016-04-01 15:47:40 -04:00 |
|
Isaac Connor
|
b3c7002eca
|
install view_video as well
|
2016-04-01 15:44:37 -04:00 |
|
Isaac Connor
|
96aa20fb79
|
value should be lower case when checking for rtsp
|
2016-04-01 15:43:59 -04:00 |
|
Isaac Connor
|
8a2605578a
|
fix type in htmlSelect
|
2016-04-01 15:43:40 -04:00 |
|
Isaac Connor
|
d71eaa66ec
|
use view_video.php as a short-term fix for viewing video
|
2016-04-01 15:43:31 -04:00 |
|
Isaac Connor
|
89598da5c1
|
undo code style changes and whitespace changes
|
2016-04-01 15:30:30 -04:00 |
|
Isaac Connor
|
58c39f930e
|
revert some structure changes
|
2016-04-01 14:57:48 -04:00 |
|
Kyle Johnson
|
f59ed9cf0d
|
clean up options a bit more
|
2016-04-01 14:39:15 -04:00 |
|
Isaac Connor
|
f4fc129ecf
|
revert some structure changes
|
2016-04-01 14:15:31 -04:00 |
|
Isaac Connor
|
86c888d079
|
revert some structure changes
|
2016-04-01 14:14:02 -04:00 |
|
Isaac Connor
|
210873e5ae
|
put test back, they got lost
|
2016-04-01 14:09:08 -04:00 |
|
Isaac Connor
|
fb3bd1182d
|
put this back, it got lost again
|
2016-04-01 14:08:25 -04:00 |
|
Isaac Connor
|
5f6d140de5
|
Load all event fields, so we know we have them deeper in the code.
|
2016-04-01 14:07:27 -04:00 |
|
Isaac Connor
|
9493e99587
|
Add video file to event data.
|
2016-04-01 14:06:31 -04:00 |
|
Isaac Connor
|
03cae9d2f2
|
Add video file to event data.
|
2016-04-01 14:06:28 -04:00 |
|
Kyle Johnson
|
92e0552f8e
|
Add side tab list to options page, and style it.
|
2016-04-01 14:02:19 -04:00 |
|
Kyle Johnson
|
8c5d309feb
|
Add header to log view
|
2016-04-01 13:44:37 -04:00 |
|
Kyle Johnson
|
fa3425f2b0
|
Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console
|
2016-04-01 13:43:26 -04:00 |
|
Isaac Connor
|
ca96481036
|
fix thumbnail generation from video file
|
2016-04-01 13:02:31 -04:00 |
|
Isaac Connor
|
cbebdfe670
|
add Time function to get unixtime from StartTime
|
2016-04-01 13:00:59 -04:00 |
|
Isaac Connor
|
82b32578ec
|
Merge branch 'master' into iconnor_video
|
2016-04-01 12:54:09 -04:00 |
|
Isaac Connor
|
6ebd71f980
|
instead of loading and looking at current recording settings, check to see if the images exist. If not, generate them from the video file
|
2016-04-01 12:51:09 -04:00 |