965b306ebc
continue redoing filters
2017-06-19 13:24:02 -04:00
1d9e0b7d69
fix saving filters
2017-06-19 10:18:44 -04:00
6945bbda7c
Merge pull request #1925 from doctormo/patch-1
...
Fix spelling mistake in link
2017-06-18 07:25:25 -05:00
6cc6055bd3
Fix spelling mistake in link
2017-06-17 21:50:41 -04:00
75c11431e6
deprecate filtersavepopup
2017-06-16 11:10:25 -04:00
3225891843
update/fix filter behaviour
2017-06-15 15:45:43 -04:00
91a070b835
Merge branch 'master' into storageareas
2017-06-15 13:13:08 -04:00
8527e5f1de
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-15 13:03:09 -04:00
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
734f099b4a
remove content from changelog
2017-06-15 12:15:15 -04:00
8145f2bc4c
whitespace
2017-06-15 12:13:40 -04:00
108be3b05f
Merge pull request #1922 from connortechnology/log_no_truncate
...
change mode of opening log files to append instead of overwrite
2017-06-14 19:02:15 -05:00
1f14870b38
updates, fix merge problems
2017-06-14 15:35:35 -04:00
2b5139033c
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-14 15:09:28 -04:00
e2139920a8
change some more quotes
2017-06-14 15:09:21 -04:00
5fad7a8470
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-14 13:32:06 -04:00
b17a4d8994
Create startpackpack.sh
...
quiet gdebi output
2017-06-14 12:28:56 -05:00
f91e171526
Create startpackpack.sh
...
increase travis build log output, filter out ONVIF
2017-06-14 12:06:55 -05:00
8a82da5b99
fix test for Yy for uploading to ppa
2017-06-14 11:26:35 -04:00
b886a2daa2
Merge branch 'master' into storageareas
2017-06-14 11:25:02 -04:00
3dc9594461
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-14 11:24:54 -04:00
07a2d49a41
Merge branch 'log_no_truncate'
2017-06-14 11:23:39 -04:00
a4b3f6b41a
fix form of delete used
2017-06-14 10:54:21 -04:00
b51d885f66
fix build on old ffmpeg
2017-06-14 10:36:08 -04:00
9f301e3c51
Merge branch 'log_no_truncate' into storageareas
2017-06-14 10:18:27 -04:00
1361b8952f
change mode of opening log files to append instead of overwrite
2017-06-14 10:15:08 -04:00
4219bcd1ca
add the missing .map file for bootstrap
2017-06-14 09:36:49 -04:00
ce6a6a41a8
fix gif->png and the path for arrow-s-u and arrow-s-d
2017-06-14 09:34:03 -04:00
f0d80ddfd4
fix runstate merge
2017-06-13 21:18:09 -04:00
7a67a5e475
fix merge
2017-06-13 21:15:58 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
dd70eb3e5f
more deprecation fixes
2017-06-13 17:06:50 -04:00
42100d9a33
introduce current_event in videostore_data so we know which event we are writing a video file for. Also, GetLastEventId so that non-friends can find out the event id of the current event.
2017-06-13 17:05:37 -04:00
3c053b36ef
introduce zm_dump_codecpar and zm_dump_codec to be used for debugging
2017-06-13 16:51:51 -04:00
417421b1d8
move include <sys/uio.h> outside defined(BSD) block ( #1919 )
2017-06-13 15:39:12 -04:00
df304b417a
Update zmupdate.pl.in
2017-06-13 11:08:58 -05:00
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
c11a219b9f
Merge pull request #1896 from connortechnology/dragndrop_monitor_sorting
...
Dragndrop monitor sorting
2017-06-12 20:49:51 -05:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
4ba9205ba9
Merge pull request #1917 from MarkosVakondios/1915-dockerfile_will_not_build
...
1915 Typo fix
2017-06-12 06:38:43 -05:00
15a6c3c775
1915 Typo fix
2017-06-11 20:07:28 +03:00
c67f40e684
Merge pull request #1916 from MarkosVakondios/1915-dockerfile_will_not_build
...
Fix for 1915-Dockerfile will not build
2017-06-11 07:55:05 -05:00
2b5f86397d
Fix for 1915-Dockerfile will not build
2017-06-11 11:27:16 +03:00
617cdd5fd3
revert wip config backup
2017-06-09 15:28:01 -04:00
fae69a86a9
Merge pull request #1912 from knnniggett/minimizetravislog
...
minimize Travis log output
2017-06-09 13:38:21 -05:00
809d20dcd0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-06-09 14:25:11 -04:00
34f1d10bd8
Merge branch 'master' into minimizetravislog
2017-06-09 13:23:04 -05:00
05d0e0ed71
Merge branch 'master' into storageareas
2017-06-09 14:20:49 -04:00
781d49dfb1
fix merge
2017-06-09 14:19:31 -04:00
281ce91245
use tail not cat
2017-06-09 13:14:46 -05:00
Isaac Connor
Andrew Bauer
Martin Owens
Isaac Connor
markos
Andrew Bauer