Isaac Connor
|
b50172fc2e
|
introduce a Frame object. Alter the image view to take just an fid, in which case it is the unique primary key Id of the Frame.
|
2016-04-25 14:59:55 -04:00 |
|
Isaac Connor
|
85798932ee
|
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
|
2016-04-25 14:10:26 -04:00 |
|
Isaac Connor
|
26a45d5fa9
|
Don't rotate dimensions when constructing the monitor because they are already rotated
|
2016-04-25 13:55:28 -04:00 |
Steve Gilvarry
|
4ca61b7bd8
|
Removed 180 lines of commented out code that has been hanging around
in here for a long time.
|
2016-04-25 22:12:49 +10:00 |
|
Isaac Connor
|
2ff01b6bcb
|
remove unneeded global
|
2016-04-22 13:36:12 -04:00 |
|
Isaac Connor
|
30b746c603
|
Add missing ()'s
|
2016-04-22 13:35:40 -04:00 |
|
Isaac Connor
|
6a31966781
|
shift to match debian
|
2016-04-22 13:35:20 -04:00 |
Andrew Bauer
|
1072327dd1
|
remove extra quote
|
2016-04-21 08:01:13 -05:00 |
|
Andrew Bauer
|
41a68bdc6d
|
Merge branch 'dreaddy-1128_ssmtp_mail_option'
|
2016-04-21 07:27:39 -05:00 |
|
Andrew Bauer
|
3a9ab7f685
|
Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option
|
2016-04-21 07:27:19 -05:00 |
|
Isaac Connor
|
8b96872efe
|
shoudl be php-mysql for php7
|
2016-04-20 15:04:50 -04:00 |
|
Isaac Connor
|
e218e91e24
|
add php7 versions for 1604
|
2016-04-20 14:58:18 -04:00 |
|
Isaac Connor
|
c626baae14
|
Merge branch 'fix_grant' into storageareas
|
2016-04-20 14:39:06 -04:00 |
|
Isaac Connor
|
02a56b811b
|
Don't be recursive when chowning /var/cache/zoneminder
|
2016-04-20 14:38:51 -04:00 |
|
Isaac Connor
|
b88e3880e0
|
Merge branch 'better_zmvideo' into storageareas
|
2016-04-20 14:21:46 -04:00 |
|
Isaac Connor
|
c7fee31c85
|
use --filter instead of -f because -f is ambiguous
|
2016-04-20 14:21:37 -04:00 |
Andrew Bauer
|
81757a0465
|
Merge pull request #1418 from pliablepixels/1417-clone-monitor
Clone feature added
|
2016-04-20 13:02:10 -05:00 |
|
Isaac Connor
|
67f38d07df
|
Merge branch 'master' into better_zmvideo
|
2016-04-20 12:04:15 -04:00 |
Isaac Connor
|
0ae2b0a012
|
Merge pull request #1427 from connortechnology/storageareas
Storageareas
|
2016-04-20 11:58:55 -04:00 |
|
Isaac Connor
|
44f32f46b7
|
deprecate zmdbFetchOne in favor of zmDbRow
|
2016-04-20 11:56:58 -04:00 |
|
Isaac Connor
|
2fcdee87d9
|
Merge branch 'storageareas' into valgrind
|
2016-04-20 10:01:30 -04:00 |
|
Isaac Connor
|
0da0896757
|
Merge branch 'master' into storageareas
|
2016-04-20 10:01:06 -04:00 |
|
Isaac Connor
|
e52e880553
|
rework open event check to not use group by
|
2016-04-20 10:00:13 -04:00 |
|
Isaac Connor
|
71d79fac99
|
Merge ../ZoneMinder.SteveGilvarry into valgrind
|
2016-04-20 09:59:08 -04:00 |
|
Isaac Connor
|
d2870f0692
|
move the mysql_free_result, looks like we can't free it until we free the row
|
2016-04-20 09:44:11 -04:00 |
Isaac Connor
|
060df90ff3
|
bump versions
|
2016-04-20 09:38:07 -04:00 |
|
Isaac Connor
|
bb15915ce5
|
Use EventPrefix, not Prefix
|
2016-04-19 15:23:36 -04:00 |
|
Isaac Connor
|
588dbc0c3c
|
Don't JOIN MOnitors to get event prefix. Use {->MonitorID} instead
|
2016-04-19 15:22:46 -04:00 |
|
Isaac Connor
|
d9646d6ceb
|
Populate a Monitors hash with the Monitors data so we don't have to use in JOINs later
|
2016-04-19 15:19:37 -04:00 |
|
Isaac Connor
|
5a3978f9e8
|
Merge pull request #1422 from abishai/master
suppress warnings of killall for FreeBSD
|
2016-04-19 14:40:37 -04:00 |
|
Isaac Connor
|
ba3f9d1b9a
|
Merge branch 'master' into storageareas
|
2016-04-19 12:03:21 -04:00 |
|
Isaac Connor
|
b2d02a64f4
|
reload stream after error
|
2016-04-19 12:02:58 -04:00 |
|
Isaac Connor
|
7e1a80658b
|
Merge branch 'master' into storageareas
|
2016-04-17 09:30:33 -04:00 |
|
Isaac Connor
|
e255fcc603
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-04-17 09:30:17 -04:00 |
|
Isaac Connor
|
d424a297c4
|
need php5-gd
|
2016-04-17 09:29:55 -04:00 |
|
Isaac Connor
|
bc99e4c476
|
whitespace changes
|
2016-04-17 09:29:14 -04:00 |
|
Isaac Connor
|
98fa65310b
|
whitespace changes
|
2016-04-17 09:29:00 -04:00 |
|
Isaac Connor
|
d6f640907f
|
add avformat_network_init
|
2016-04-17 09:28:43 -04:00 |
root
|
72bf8ac2b8
|
up the debug level for Have Keyframe
|
2016-04-16 15:13:36 -04:00 |
|
root
|
479ea17ed5
|
fix event menubars
|
2016-04-16 15:13:18 -04:00 |
abi
|
7058b0862a
|
suppressed warnings of killall for FreeBSD
|
2016-04-16 16:39:58 +03:00 |
|
Isaac Connor
|
50f2747bb4
|
remove the if(pages>1) so that the if > line always happens
|
2016-04-15 16:11:53 -04:00 |
|
Isaac Connor
|
111b1a1566
|
add back lastKeyframePkt
|
2016-04-15 15:23:22 -04:00 |
|
Isaac Connor
|
db52a61b01
|
More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash
|
2016-04-15 15:22:58 -04:00 |
|
Isaac Connor
|
f1e69463b6
|
More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash
|
2016-04-15 15:22:47 -04:00 |
|
Isaac Connor
|
4b4add49bd
|
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
|
2016-04-15 13:18:35 -04:00 |
|
Isaac Connor
|
ccb5ea766d
|
add the toggle for RecordAudio so that the checkbox works to turn off Audio
|
2016-04-15 13:16:52 -04:00 |
|
Isaac Connor
|
3f27f4893c
|
Merge branch 'fix_grant' into storageareas
|
2016-04-15 12:55:13 -04:00 |
|
Isaac Connor
|
b57abb4e54
|
revert
|
2016-04-15 12:50:51 -04:00 |
|
Isaac Connor
|
1e8450ecbf
|
av_set_parameters was deprecated a long time ago
|
2016-04-15 12:50:05 -04:00 |