ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,484 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

7484 Commits

Author SHA1 Message Date
Isaac Connor b8ad9aa897 Merge branch 'master' into osx-port 2017-06-15 16:41:41 -04:00
Isaac Connor bf95708fe7 Merge branch 'master' of github.com:/zoneminder/ZoneMinder 2017-06-15 16:41:11 -04:00
Isaac Connor 1efeb592c6 add FindMysql 2017-06-15 16:41:02 -04:00
Isaac Connor 46cd62b003 use FindMySQL 2017-06-15 16:05: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
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 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 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 4d109f9680 assume that mysql include path is setup to not require the mysql/ part 2017-06-14 11:07:49 -04:00
Isaac Connor 36ab99223b add my cmake config, some macports commands to install 2017-06-14 11:07:17 -04:00
Isaac Connor a79d760e3a since cmake won't detect pcre.h, include it unconditionally 2017-06-14 11:05:13 -04:00
Isaac Connor 510d0e27c4 use FindMySQL to do a better job of finding it. 2017-06-14 11:03:59 -04:00
Isaac Connor b9eee3230e add apple-specific way of getting the thread id, and move missing phread_mutex_timedlock to the .cpp where it should be. 2017-06-14 10:58:09 -04:00
Isaac Connor fe8b0105d2 add apple-specific way of getting the thread id 2017-06-14 10:57:40 -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 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 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
Andrew Bauer 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
Isaac Connor b59e870fd4 Merge branch 'master' into osx-port 2017-06-12 14:21:12 -04:00
Andrew Bauer 4ba9205ba9 Merge pull request #1917 from MarkosVakondios/1915-dockerfile_will_not_build 
1915 Typo fix
 2017-06-12 06:38:43 -05:00
markos 15a6c3c775 1915 Typo fix 2017-06-11 20:07:28 +03:00
Andrew Bauer 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
markos 2b5f86397d Fix for 1915-Dockerfile will not build 2017-06-11 11:27:16 +03:00
Andrew Bauer fae69a86a9 Merge pull request #1912 from knnniggett/minimizetravislog 
minimize Travis log output
 2017-06-09 13:38:21 -05:00
Andrew Bauer 34f1d10bd8 Merge branch 'master' into minimizetravislog 2017-06-09 13:23:04 -05:00
Isaac Connor 781d49dfb1 fix merge 2017-06-09 14:19:31 -04:00
Andrew Bauer 281ce91245 use tail not cat 2017-06-09 13:14:46 -05:00
Andrew Bauer 143f1ef448 use cat -n 2017-06-09 13:06:37 -05:00
Andrew Bauer 62429a55a8 why did git decide to delete these synlinks??? 2017-06-09 12:58:15 -05:00
Andrew Bauer 07d9d35e39 minimize Travis log output 2017-06-09 12:52:00 -05:00
Isaac Connor 7e3b101d7f Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder 2017-06-09 11:45:48 -04:00
Isaac Connor 162cc05a33 when debug is turned on, fflush after every line. Debug logging is almost useless when debugging a crash without this. 2017-06-09 11:05:44 -04:00
Isaac Connor ccfa2da00b Merge ../ZoneMinder.connortechnology 2017-06-09 10:46:46 -04:00