Isaac Connor
|
e67f247374
|
add ConcurrentFilter translation
|
2016-02-05 11:58:20 -05:00 |
|
Isaac Connor
|
51d814ad46
|
add concurrent to save filter
|
2016-02-05 11:58:05 -05:00 |
|
Isaac Connor
|
d7f350ac34
|
fix parm => name
|
2016-02-05 11:41:54 -05:00 |
|
Isaac Connor
|
009211ae1e
|
exec zmfilter concurrently if the flag is et
|
2016-02-05 11:24:40 -05:00 |
|
Isaac Connor
|
47c2023441
|
Add Concurrent to Filters
|
2016-02-05 11:23:45 -05:00 |
|
Isaac Connor
|
509791188e
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-02-04 12:24:49 -05:00 |
Isaac Connor
|
5fbeb474a8
|
Merge branch 'schrorg-vivotek-ePTZ' into storageareas
|
2016-02-04 12:25:51 -05:00 |
|
Isaac Connor
|
a442ef3be8
|
move the content from 1.28.109 into 1.30.1
|
2016-02-04 12:25:16 -05:00 |
|
Isaac Connor
|
1837cc89ea
|
Merge branch 'schrorg-vivotek-ePTZ' into storageareas
Conflicts:
CMakeLists.txt
configure.ac
version
|
2016-02-04 12:24:07 -05:00 |
|
Isaac Connor
|
1385b0fb9a
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-02-04 12:23:08 -05:00 |
|
Isaac Connor
|
0674fa2d7a
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-02-04 12:21:33 -05:00 |
|
Isaac Connor
|
89cff287cd
|
Merge branch 'master' into storageareas
|
2016-02-04 12:14:16 -05:00 |
|
Isaac Connor
|
d65c9d797b
|
fix merge, update to 1.30.1
|
2016-02-04 12:13:48 -05:00 |
Isaac Connor
|
9ace6c518d
|
Merge pull request #1225 from Simpler1/profiles
Added profiles for Wanscam-HW0025 and IPCC-7210W
|
2016-02-04 11:55:48 -05:00 |
|
Isaac Connor
|
dd4f92fd4c
|
Merge pull request #1243 from knnniggett/do_debian_script
use local user @ hostname.local for author
|
2016-02-04 11:55:14 -05:00 |
|
Isaac Connor
|
d3755611c5
|
Merge pull request #1247 from bodegard/master
Corrected DB update version comments, fixed typos, and skin font modification
|
2016-02-04 11:54:02 -05:00 |
|
Isaac Connor
|
52e16dbdd0
|
Merge pull request #1249 from knnniggett/pelcop
Fix PelcoP checksum calculation
|
2016-02-04 11:52:51 -05:00 |
Andrew Bauer
|
ab7b4ab3e6
|
Merge pull request #1221 from ZoneMinder/rotate_dimensions_when_image_is_rotated
implement Width and Height functions, and test for image rotation and…
|
2016-02-04 10:17:19 -06:00 |
|
Andrew Bauer
|
1c142a48a6
|
Merge pull request #1212 from RBxx/patch-1
Convert ru_ru.php to UTF-8
|
2016-02-04 10:16:24 -06:00 |
|
Andrew Bauer
|
748754a213
|
Merge pull request #1209 from adamreiser/StrictKeyChecking
Strict key checking
|
2016-02-04 10:07:19 -06:00 |
|
Andrew Bauer
|
cbe88d0a3f
|
Merge pull request #1239 from ZoneMinder/trim_when_saving
use trim on values when saving.
|
2016-02-04 08:29:02 -06:00 |
Andrew Bauer
|
7a98acc868
|
update changelog to 1.29.0 release
|
2016-02-03 13:21:10 -06:00 |
|
Andrew Bauer
|
6de2ab504c
|
Explain ZM_SERVER_HOST in multiserver documentation
|
2016-02-03 12:40:30 -06:00 |
|
Isaac Connor
|
08858685c5
|
add find_all function to Storage
|
2016-02-03 09:43:02 -05:00 |
|
Isaac Connor
|
555904c588
|
Add Storage column to console
|
2016-02-03 09:42:50 -05:00 |
|
Andy Bauer
|
5a8989b168
|
Minor RPM packaging changes
|
2016-02-02 11:47:55 -06:00 |
|
Isaac Connor
|
48283191ec
|
Merge branch 'master' into storageareas
|
2016-02-01 15:47:08 -05:00 |
|
Isaac Connor
|
f46b10d399
|
bump release
|
2016-02-01 15:46:45 -05:00 |
|
Isaac Connor
|
cc2c1405ed
|
include Event.php
|
2016-02-01 14:59:06 -05:00 |
|
Isaac Connor
|
4e9e01836f
|
Use Event->Path instead of ZM_DIR_EVENTS
|
2016-02-01 13:41:57 -05:00 |
|
Isaac Connor
|
9543a8a364
|
Add Event.php to autoconf build
|
2016-02-01 13:08:48 -05:00 |
|
Isaac Connor
|
11b206e281
|
fix getPath -> Path
|
2016-02-01 12:52:14 -05:00 |
|
Isaac Connor
|
ff46344175
|
Use Storage Areas in geteventPath
|
2016-02-01 12:51:43 -05:00 |
|
Andrew Bauer
|
a990b23164
|
Update zoneminder.f22.spec
|
2016-01-29 21:25:34 -06:00 |
|
Andrew Bauer
|
fa50327420
|
Update zoneminder.f23.spec
|
2016-01-29 21:24:50 -06:00 |
Kyle Johnson
|
96db6d5f65
|
Merge pull request #1254 from pliablepixels/1253-zms-quit-cmd
1253 zms quit cmd. Fixes #1253
|
2016-01-29 08:47:26 -07:00 |
arjunrc
|
904f584fcb
|
CMD_QUIT definition
|
2016-01-29 10:00:02 -05:00 |
|
arjunrc
|
38bca6b95d
|
added CMD_QUIT to kill zms via command
|
2016-01-29 09:58:57 -05:00 |
|
arjunrc
|
47b2cdbb96
|
added CMD_QUIT to kill zms via command
|
2016-01-29 09:58:50 -05:00 |
|
Andrew Bauer
|
f85ed2d5b4
|
Merge pull request #1252 from ZoneMinder/multi-server
Add Debug/Info lines reporting multi-server status
|
2016-01-28 07:01:39 -06:00 |
|
Isaac Connor
|
f275498790
|
Add Debug for sql used to load other than local monitors
|
2016-01-26 21:00:32 -05:00 |
|
Isaac Connor
|
902065a6c1
|
Add Debug for sql used to load local monitors
|
2016-01-26 20:59:07 -05:00 |
|
Isaac Connor
|
3a0b28f168
|
Add Debug/Info lines reporting multi-server status
|
2016-01-26 20:53:34 -05:00 |
|
Andy Bauer
|
fa168027b3
|
Fix PelcoP checksum calculation
|
2016-01-24 07:45:04 -06:00 |
|
Andrew Bauer
|
50b113cd02
|
Merge pull request #1189 from marcolino7/master
PTZ - Added autostop to Down command on FI8918W
|
2016-01-24 07:40:30 -06:00 |
|
Andrew Bauer
|
2f80f26f92
|
Merge pull request #1232 from ZoneMinder/remove_google_fonts
remove Google open Sans external import
|
2016-01-23 10:24:49 -06:00 |
Brandon Odegard
|
54a11175ff
|
Reduce default size of body font in Flat skin
|
2016-01-22 13:56:41 -06:00 |
|
Brandon Odegard
|
1ca9ace84d
|
Fixed missing semicolons
|
2016-01-22 13:31:02 -06:00 |
Brandon Odegard
|
9c72579c2e
|
Corrected typo in function info
|
2016-01-22 12:12:39 -06:00 |
|
Brandon Odegard
|
029c1efa31
|
Corrected update version comment to 1.28.110
Corrected version comment to indicate database update from 1.28.109 to 1.28.110
|
2016-01-22 10:48:47 -06:00 |