Andrew Bauer
|
2c0d322924
|
remove zmf.cpp to fix merge conflict
|
2017-05-10 08:07:08 -05:00 |
|
Andrew Bauer
|
c4f471d967
|
Merge branch 'master' of https://github.com/abishai/ZoneMinder into abishai-master
|
2017-05-10 08:06:48 -05:00 |
Isaac Connor
|
ed6a2f3636
|
Merge pull request #1755 from connortechnology/update_do_debian_release
Update do debian release
|
2017-05-10 09:06:17 -04:00 |
|
Isaac Connor
|
f832dd30ea
|
Merge pull request #1817 from mnoorenberghe/eslint
Add eslint configuration files extending Google's rules
|
2017-05-10 09:04:51 -04:00 |
|
Isaac Connor
|
de24ba7120
|
Merge pull request #1779 from vajonam/1778-add-subtituteTags-for-exec
add the ability to add substitued tags to the commandline
|
2017-05-10 09:00:36 -04:00 |
|
Andrew Bauer
|
38297434d9
|
Merge branch 'IDDQDesnik-Ru_Translation'
|
2017-05-10 07:59:52 -05:00 |
Isaac Connor
|
a5f71a917e
|
Merge branch 'master' into update_do_debian_release
|
2017-05-10 08:59:09 -04:00 |
|
Andrew Bauer
|
3e550e1461
|
remove "Actual" key from ru lang file since that word is too common.
|
2017-05-10 07:59:04 -05:00 |
|
Andrew Bauer
|
ef6a3b63af
|
Merge branch 'Ru_Translation' of https://github.com/IDDQDesnik/ZoneMinder into IDDQDesnik-Ru_Translation
|
2017-05-10 07:58:31 -05:00 |
|
Isaac Connor
|
ec85d9a6a7
|
if zm.conf exists, rename to zm.conf.new
|
2017-05-10 08:57:47 -04:00 |
Andrew Bauer
|
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 |
|
Andrew Bauer
|
62d6509708
|
Merge pull request #1818 from SteveGilvarry/743-Swap_to_PNG
Swap to PNG
|
2017-05-10 07:55:07 -05:00 |
|
Andrew Bauer
|
021c136640
|
Merge branch 'mastertheknife-armv7_neon'
|
2017-05-10 07:47:04 -05:00 |
|
Andrew Bauer
|
ccc2cc832f
|
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-armv7_neon
|
2017-05-10 07:45:58 -05:00 |
|
Andrew Bauer
|
e6c60737e9
|
Merge pull request #1756 from SteveGilvarry/zmf_goodbye
Remove zmf
|
2017-05-10 07:07:22 -05:00 |
|
Andrew Bauer
|
747583e9f4
|
Merge pull request #1810 from mastertheknife/ssse3_improvements
Minor zm_image SSSE3 improvements
|
2017-05-10 07:06:33 -05:00 |
|
Andrew Bauer
|
7e430e29b2
|
Delete version.enc
extraneous file
|
2017-05-09 18:46:59 -05:00 |
|
Isaac Connor
|
3215f2e702
|
merge latest updates
|
2017-05-09 16:57:28 -04:00 |
|
Isaac Connor
|
e3a05d7cfc
|
prompt when invalid command line option is given.
|
2017-05-09 16:57:02 -04:00 |
Andy Bauer
|
12fc011a29
|
1.30.4 release
|
2017-05-09 09:54:48 -05:00 |
|
Isaac Connor
|
ede35f49bb
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-05-08 22:18:20 -04:00 |
|
Isaac Connor
|
e5be2c7b51
|
default to ZoneMinder fork and each the type of build
|
2017-05-08 22:18:16 -04:00 |
|
Isaac Connor
|
fc52766606
|
Merge branch 'master' into storageareas
|
2017-05-08 22:17:37 -04:00 |
|
Isaac Connor
|
5607af0027
|
Merge pull request #1873 from connortechnology/master
update ubuntu builds with dependencies on php-apcu and php-apc and php-apcu-bc
|
2017-05-08 21:37:52 -04:00 |
|
Isaac Connor
|
62f9465452
|
add php-apc and apcu
|
2017-05-08 21:36:42 -04:00 |
|
Isaac Connor
|
ff368f2b6f
|
add php-apc and apcu
|
2017-05-08 21:35:49 -04:00 |
|
Isaac Connor
|
25baac4e24
|
Merge branch 'release-1.30.3'
|
2017-05-08 21:32:59 -04:00 |
|
Isaac Connor
|
a7b377bf35
|
delete merge conflict files
|
2017-05-08 21:30:31 -04:00 |
|
Isaac Connor
|
c510092356
|
delete merge conflict files
|
2017-05-08 21:30:28 -04:00 |
|
Isaac Connor
|
e0256c1a67
|
add local version of js files
|
2017-05-08 21:06:25 -04:00 |
|
Andrew Bauer
|
31b52197a2
|
Update zoneminder.spec
change rpm package requirements relating to php-pecl-apcu
|
2017-05-08 10:35:32 -05:00 |
|
Andrew Bauer
|
fd35ac37c5
|
Update zoneminder.spec
fix %autosetup parameters
|
2017-05-08 10:18:21 -05:00 |
|
Isaac Connor
|
9ac20999b3
|
rough in
|
2017-05-05 21:11:23 -04:00 |
|
Isaac Connor
|
82bdc208ac
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-05-05 17:53:13 -04:00 |
|
Isaac Connor
|
e45316dcd1
|
add debugging
|
2017-05-05 17:53:03 -04:00 |
|
Isaac Connor
|
c33b8a8780
|
fix SQL query that gets the event
|
2017-05-05 17:52:56 -04:00 |
|
Isaac Connor
|
4e7ce479b4
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-05-05 17:28:47 -04:00 |
|
Isaac Connor
|
7be2ee0e1b
|
add back videoEvent
|
2017-05-05 17:19:02 -04:00 |
|
Isaac Connor
|
0f5142fa19
|
bring back video popup
|
2017-05-05 17:18:48 -04:00 |
|
Isaac Connor
|
bde887fc9c
|
remove unneeded ;'s
|
2017-05-05 17:17:55 -04:00 |
|
Isaac Connor
|
fe532ac945
|
make args not required
|
2017-05-05 17:17:39 -04:00 |
Isaac Connor
|
6dcad09c65
|
this was never commited and got lost. Merge it's content into zm_update-1.31.0.sql
|
2017-05-05 16:53:49 -04:00 |
|
Isaac Connor
|
cb6d7c7c61
|
further allow NULL updates
|
2017-05-05 16:53:38 -04:00 |
|
Isaac Connor
|
1b0a03c723
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-05-05 16:52:38 -04:00 |
|
Isaac Connor
|
1cd01be0b0
|
blah
|
2017-05-05 16:52:30 -04:00 |
Isaac Connor
|
fd90de5952
|
if no AuthHashGEneratedAt then generate one instead of outputting an error
|
2017-05-05 16:47:50 -04:00 |
|
Isaac Connor
|
deb1cf653a
|
fix dimensions of ptz box
|
2017-05-05 16:47:21 -04:00 |
|
Isaac Connor
|
f66b606e34
|
use isset
|
2017-05-05 16:40:05 -04:00 |
|
Isaac Connor
|
92854f5cba
|
more debug
|
2017-05-05 16:37:30 -04:00 |
|
Isaac Connor
|
cb99d709c5
|
add debug
|
2017-05-05 16:37:12 -04:00 |