Isaac Connor
|
375e4a3e9c
|
More filter UI fixes
|
2017-06-20 10:45:16 -04:00 |
|
Isaac Connor
|
2e60864e99
|
always stop and start zm on upgrade, not just if doing a db update
|
2017-06-20 09:44:18 -04:00 |
|
Isaac Connor
|
f78e720db3
|
add /etc/zm and /etc/zm/conf.d to install dirs
|
2017-06-20 09:41:35 -04:00 |
|
Isaac Connor
|
42a022d15b
|
always stop and start zoneminder on upgrade
|
2017-06-20 09:41:02 -04:00 |
|
Isaac Connor
|
25acf1756c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-06-20 09:10:26 -04:00 |
|
Isaac Connor
|
5bdfb8ae4e
|
add a question mark to delete confirm message and just submit the form
|
2017-06-20 09:09:21 -04:00 |
|
Isaac Connor
|
5df4494c6c
|
make Filters a main window view instead of a popup
|
2017-06-20 09:08:57 -04:00 |
|
Isaac Connor
|
93f81daa8d
|
Fix saving logic
|
2017-06-20 09:08:25 -04:00 |
|
Isaac Connor
|
dc96ca72a8
|
Fix AutoDetail=>AutoDelete, add Id to defaults and remove debugging
|
2017-06-20 09:08:15 -04:00 |
|
Isaac Connor
|
db68d3e0a2
|
use restart instead of start
|
2017-06-19 13:57:00 -04:00 |
Isaac Connor
|
f8cc5b00c1
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-06-19 13:40:40 -04:00 |
|
Isaac Connor
|
be8be3b0fd
|
Put back Lost Storageareas code
|
2017-06-19 13:40:32 -04:00 |
|
Isaac Connor
|
965b306ebc
|
continue redoing filters
|
2017-06-19 13:24:02 -04:00 |
|
Isaac Connor
|
1d9e0b7d69
|
fix saving filters
|
2017-06-19 10:18:44 -04:00 |
Andrew Bauer
|
6945bbda7c
|
Merge pull request #1925 from doctormo/patch-1
Fix spelling mistake in link
|
2017-06-18 07:25:25 -05:00 |
Martin Owens
|
6cc6055bd3
|
Fix spelling mistake in link
|
2017-06-17 21:50:41 -04:00 |
|
Isaac Connor
|
75c11431e6
|
deprecate filtersavepopup
|
2017-06-16 11:10:25 -04:00 |
|
Isaac Connor
|
3225891843
|
update/fix filter behaviour
|
2017-06-15 15:45:43 -04:00 |
|
Isaac Connor
|
91a070b835
|
Merge branch 'master' into storageareas
|
2017-06-15 13:13:08 -04:00 |
|
Isaac Connor
|
8527e5f1de
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-15 13:03:09 -04:00 |
|
Isaac Connor
|
119f8fc86c
|
Fix version checks to fix build on yaketty
|
2017-06-15 13:02:54 -04:00 |
|
Isaac Connor
|
734f099b4a
|
remove content from changelog
|
2017-06-15 12:15:15 -04:00 |
|
Isaac Connor
|
8145f2bc4c
|
whitespace
|
2017-06-15 12:13:40 -04:00 |
|
Andrew Bauer
|
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 |
|
Isaac Connor
|
1f14870b38
|
updates, fix merge problems
|
2017-06-14 15:35:35 -04:00 |
|
Isaac Connor
|
2b5139033c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-14 15:09:28 -04:00 |
|
Isaac Connor
|
e2139920a8
|
change some more quotes
|
2017-06-14 15:09:21 -04:00 |
|
Isaac Connor
|
5fad7a8470
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-14 13:32:06 -04:00 |
|
Andrew Bauer
|
b17a4d8994
|
Create startpackpack.sh
quiet gdebi output
|
2017-06-14 12:28:56 -05:00 |
|
Andrew Bauer
|
f91e171526
|
Create startpackpack.sh
increase travis build log output, filter out ONVIF
|
2017-06-14 12:06:55 -05:00 |
|
Isaac Connor
|
8a82da5b99
|
fix test for Yy for uploading to ppa
|
2017-06-14 11:26:35 -04:00 |
|
Isaac Connor
|
b886a2daa2
|
Merge branch 'master' into storageareas
|
2017-06-14 11:25:02 -04:00 |
|
Isaac Connor
|
3dc9594461
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-14 11:24:54 -04:00 |
|
Isaac Connor
|
07a2d49a41
|
Merge branch 'log_no_truncate'
|
2017-06-14 11:23:39 -04:00 |
|
Isaac Connor
|
a4b3f6b41a
|
fix form of delete used
|
2017-06-14 10:54:21 -04:00 |
|
Isaac Connor
|
b51d885f66
|
fix build on old ffmpeg
|
2017-06-14 10:36:08 -04:00 |
|
Isaac Connor
|
9f301e3c51
|
Merge branch 'log_no_truncate' into storageareas
|
2017-06-14 10:18:27 -04:00 |
|
Isaac Connor
|
1361b8952f
|
change mode of opening log files to append instead of overwrite
|
2017-06-14 10:15:08 -04:00 |
|
Isaac Connor
|
4219bcd1ca
|
add the missing .map file for bootstrap
|
2017-06-14 09:36:49 -04:00 |
|
Isaac Connor
|
ce6a6a41a8
|
fix gif->png and the path for arrow-s-u and arrow-s-d
|
2017-06-14 09:34:03 -04:00 |
|
Isaac Connor
|
f0d80ddfd4
|
fix runstate merge
|
2017-06-13 21:18:09 -04:00 |
|
Isaac Connor
|
7a67a5e475
|
fix merge
|
2017-06-13 21:15:58 -04:00 |
|
Isaac Connor
|
085d239a6e
|
Merge branch 'master' into storageareas
|
2017-06-13 18:02:28 -04:00 |
|
Isaac Connor
|
dd70eb3e5f
|
more deprecation fixes
|
2017-06-13 17:06:50 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
3c053b36ef
|
introduce zm_dump_codecpar and zm_dump_codec to be used for debugging
|
2017-06-13 16:51:51 -04:00 |
|
Andrew Bauer
|
417421b1d8
|
move include <sys/uio.h> outside defined(BSD) block (#1919)
|
2017-06-13 15:39:12 -04:00 |
|
Andrew Bauer
|
df304b417a
|
Update zmupdate.pl.in
|
2017-06-13 11:08:58 -05:00 |
|
Andrew Bauer
|
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 |
|
Andrew Bauer
|
c11a219b9f
|
Merge pull request #1896 from connortechnology/dragndrop_monitor_sorting
Dragndrop monitor sorting
|
2017-06-12 20:49:51 -05:00 |