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

7440 Commits

Author SHA1 Message Date
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 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
Isaac Connor f8cb0a5e21 Merge branch 'master' into add_was_alarmed 2017-06-09 10:46:01 -04:00
Isaac Connor b16d84911b merge fixes from storageareas 2017-06-09 10:38:20 -04:00
Isaac Connor 0e4485c013 Merge ../ZoneMinder.connortechnology 2017-06-08 14:03:52 -04:00
Isaac Connor c6a1518548 remark out call to set progressBarWidth, but that should never change and it uses a var that isn't global barWidth 2017-06-08 14:03:07 -04:00
Isaac Connor cac5819331 update call to getStreamSrc to use ->getStreamSrc. Also remove extraneous canView(Event) 2017-06-08 14:02:27 -04:00
Isaac Connor 2c1f576da4 Don't need to check for values in args, beacuse we set one above 2017-06-08 14:01:44 -04:00
Isaac Connor 405078686a update getStreamSrc to take a hash instead of an array of thing=thing 2017-06-08 14:01:22 -04:00
Isaac Connor d7b291f933 add more debug 2017-06-08 13:44:22 -04:00
Isaac Connor 81c2216eb6 spaces/quotes 2017-06-08 13:37:26 -04:00
Isaac Connor 84fd80b242 undo cake log path changes 2017-06-08 12:21:51 -04:00
Isaac Connor f67584ebf9 remove references to incomplete icon work 2017-06-08 08:39:49 -04:00
Isaac Connor 86b3b10d5a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-07 15:28:35 -04:00
Isaac Connor c55814647c fix spacing, braces, quotes 2017-06-07 15:28:31 -04:00
Ravaka Razafimanantsoa 214d9898a3 Enchancing Dockerfile and docker execution (#1898) 
* Enchancing Dockerfile and docker execution

* Setting database if does not exist\nSolving SQL problem when adding monitor

* Sharing events and images

* Dockerfile a little bit more flexible

* Setting better start command
 2017-06-06 20:22:37 -04:00
Isaac Connor a9ebcd6e8a set email address to send complaints to 2017-06-06 16:03:10 -04:00
Isaac Connor 070f0d5d62 don't init converted_input_samples 2017-06-06 15:57:42 -04:00
Isaac Connor 1ab5e0e374 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-06 15:36:10 -04:00
Isaac Connor 7d97267dd2 fix compile on old ffmpeg 2017-06-06 15:35:17 -04:00
Andy Bauer 0892be3970 further consolidation of ZM_TARGET_DISTRO 2017-06-06 11:59:56 -05:00
Andy Bauer 54312fa994 consolidate ZM_TARGET_DISTRO parameters 2017-06-06 11:56:53 -05:00
Andrew Bauer 831bec3398 Merge pull request #1901 from jedelbo/1900-update_danish-translation 
Update danish translation file
 2017-06-05 15:57:09 -05:00
Andrew Bauer 2bc6f1627e Add support for conf.d subfolder (#1902) 
* cmake changes to support conf.d

* php changes to support conf.d

* perl changes to support conf.d

* C changes to support conf.d

* add conf.d support to rpmspecfile

* fix typo

* specify ZM_CONFIG_SUBDIR in relevant target distros

* put back my config_file perl definition

* remove quotes from ZM macros

* fix snprintf

* add README to conf.d folder

* adjust rpm specfile

* remove custom permissions from README in rpmspecfile

* modify rpm README documentation to reflect conf.d support

* set ZM_CONFIG_SUBDIR in debian rules file
 2017-06-05 16:39:19 -04:00
Isaac Connor 523f3f4fca Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder 2017-06-05 16:29:35 -04:00
Isaac Connor bedc1d3e13 fix spacing 2017-06-05 16:29:04 -04:00
Andy Bauer a1940935d5 build system - track the version file rather than git tag 2017-06-05 12:04:29 -05:00
Isaac Connor a9183a1599 more quotes 2017-06-05 09:40:19 -04:00
Isaac Connor 837c6ba137 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-05 09:20:36 -04:00
Isaac Connor 457a3273b1 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-05 09:05:28 -04:00
Isaac Connor 187bec40ec Fix #1906 2017-06-05 09:05:17 -04:00