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

5048 Commits

Author SHA1 Message Date
Isaac Connor 4e2ed00027 widen zone edit popup to fit the image 2015-09-28 12:54:54 -04:00
Isaac Connor 7d52c0b784 widen events popup to fit the thumbnail 2015-09-28 12:44:58 -04:00
Isaac Connor b53603dee1 Merge pull request #1066 from pliablepixels/1065-recaptcha-ui-fix-when-vars-dont-exist 
fixed recaptcha showing up pre DB update
 2015-09-28 10:00:46 -04:00
Isaac Connor 4baebb4f47 Merge pull request #1070 from pliablepixels/1069-api-restart-monitor-on-edit 
restart monitor when edited via APIs
 2015-09-28 09:58:47 -04:00
Pliable Pixels ee78ae5c49 restart monitor when edited via APIs 2015-09-28 09:31:57 -04:00
Pliable Pixels 727486d8f3 recaptcha now displays translated message if secret is wrong 2015-09-25 11:11:25 -04:00
Pliable Pixels d751c3ad61 recaptcha now displays translated message if secret is wrong 2015-09-25 11:11:15 -04:00
Pliable Pixels e5a6889253 fixed conflict 2015-09-24 15:51:16 -04:00
Pliable Pixels 939bdc90ef Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into 1065-recaptcha-ui-fix-when-vars-dont-exist 2015-09-24 15:45:34 -04:00
Pliable Pixels 23b549a471 recaptcha fixes to avoid lockout 2015-09-24 15:44:35 -04:00
Andrew Bauer 6ce867b090 Merge pull request #1067 from ZoneMinder/zmwatch_debug 
add debug statements for when LastWriteTime is not defined.
 2015-09-24 09:32:39 -05:00
Isaac Connor d754239a51 add debug statements for when LastWriteTime is not defined. 2015-09-24 09:57:58 -04:00
Pliable Pixels 5ca00c2ef5 fixed constant check when not defined 2015-09-24 09:57:53 -04:00
Pliable Pixels ae6fd7daea fixed constant check when not defined 2015-09-24 09:57:43 -04:00
Pliable Pixels 48071d7dfc Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into 1065-recaptcha-ui-fix-when-vars-dont-exist 2015-09-24 09:38:57 -04:00
Pliable Pixels 25ab1f6ddd fixed recaptcha showing up pre DB update 2015-09-23 10:54:24 -04:00
Pliable Pixels 23d5e0e95b fixed recaptcha showing up pre DB update 2015-09-23 10:50:15 -04:00
Isaac Connor fbc4f77491 Merge pull request #1049 from knnniggett/core.php 
remove core.php, modify core.php.default
 2015-09-23 09:07:29 -04:00
Andrew Bauer f13dddb719 Update api.rst 2015-09-22 09:26:09 -05:00
Andrew Bauer fd20be0783 Merge pull request #1062 from pliablepixels/1013-document-migration 
fixed security instructions for curl
 2015-09-22 09:07:10 -05:00
Pliable Pixels 08e04afcd2 fixed security instructions with curl 2015-09-22 07:39:27 -04:00
Andrew Bauer 75e28a527f Create CONTRIBUTING.md 2015-09-21 08:52:32 -05:00
Andrew Bauer 7af5652e55 Update README.md 
spelling
 2015-09-21 06:45:27 -05:00
Andrew Bauer 923aec828f Merge pull request #1058 from onlyjob/typo 
header typo corrections
 2015-09-19 08:01:24 -05:00
Dmitry Smirnov 333e7ec67b header typo corrections 2015-09-19 17:39:54 +10:00
Isaac Connor 676916976b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-09-17 15:16:09 -04:00
Isaac Connor bfba16b87c Fix message if Exif already exists 2015-09-17 15:16:05 -04:00
Isaac Connor c0139e87ad define ZM_BASE_PROTOCOL 2015-09-17 15:14:43 -04:00
Andrew Bauer 4a978034ad Merge pull request #1056 from ZoneMinder/fix_privacy_mask_segfaults 
Fix sgfault caused by the privacy mask stuff
 2015-09-16 10:46:45 -05:00
Andrew Bauer da2efa8616 Merge pull request #1057 from ZoneMinder/mmap_fd_gt_3 
quick fix for #1055: make sure our mmap fd is > 2
 2015-09-16 10:42:52 -05:00
Isaac Connor 6e12febf3d initialize privacy_bitmask and check it before deletep[] to prevent segfault 2015-09-16 10:51:27 -04:00
Isaac Connor 0571ca3025 quick fix for #1055: make sure our mmap fd is > 2 2015-09-16 09:11:22 -04:00
Isaac Connor d3dc214d90 let's keep all the versions up to date 2015-09-16 08:39:54 -04:00
Andrew Bauer e97341ced5 Merge pull request #1054 from knnniggett/cambozola 
link to cambozola pacakge, rather than download during build
 2015-09-14 14:02:10 -05:00
Isaac Connor e88d63cb35 need to check the case of having a / at the end 2015-09-14 14:55:37 -04:00
Andrew Bauer 03172af921 link to cambozola pacakge, rather than download during build 2015-09-14 13:51:48 -05:00
Isaac Connor 3f3c637227 don't need apache patch anymore 2015-09-14 14:36:19 -04:00
Isaac Connor 407ed7ec66 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-09-14 14:14:23 -04:00
Isaac Connor 6e47812669 This patch is no longer needed 2015-09-14 14:14:13 -04:00
Isaac Connor 2fcb5d153f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-09-14 13:43:13 -04:00
Andrew Bauer c8fecee68b Update CMakeLists.txt 
nbtelecom was returning http 403. switching to skylineservers. In the future, I will add jscalendar packages to zmreop as that is better practice.
 2015-09-12 18:03:20 -05:00
Andrew Bauer 0ff14008b3 Update zoneminder.el6.conf.in 
ScriptAlias should point to ZM_CGIDIR instead of ZM_WEBDIR
 2015-09-12 17:49:03 -05:00
Isaac Connor 204f2b1e22 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-09-10 13:20:06 -04:00
Isaac Connor 31ad75dea9 only add -h hostname to mysql command if it is defined. This helps support local unix-socket mysql access 2015-09-10 13:04:52 -04:00
Andrew Bauer ebb6e7158a rpm packaging changes for centos 6 2015-09-08 18:16:19 -05:00
Andrew Bauer 427c71f5e8 Update README.Centos7 2015-09-07 16:54:13 -05:00
Andrew Bauer 41cfadbcb1 Update zoneminder.el7.spec 
typo
 2015-09-07 16:14:58 -05:00
Andrew Bauer febc0155f0 Merge pull request #1052 from knnniggett/rpm_packaging 
redhat rpm packaging modifications
 2015-09-07 15:58:26 -05:00
Andrew Bauer dc9a5b13fe redhat rpm packaging modifications 2015-09-07 15:50:42 -05:00
Andrew Bauer 04fcc253bd Merge pull request #1048 from pliablepixels/1046-google-recaptcha 
Google recaptcha
 2015-09-01 08:18:54 -05:00