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

5036 Commits

Author SHA1 Message Date
Isaac Connor 1d173a9bf0 Merge pull request #1083 from pliablepixels/1082-monitor-orange 
fixed orange display for monitor mode
 2015-10-06 08:36:35 -04:00
Isaac Connor 1882300a41 Merge pull request #1094 from pliablepixels/1051-zmupdate-versioncompare-problems 
fixed version compare logic
 2015-10-06 08:35:46 -04:00
Pliable Pixels e0e048fe7e fixed version compare logic 2015-10-04 09:10:05 -04:00
Andy Bauer b74abe88c9 minor centos 7 specfile change 2015-10-03 17:07:22 -05:00
Andrew Bauer 1dbea023b8 Update README.md 
remove draft note
 2015-10-03 15:33:04 -05:00
Andrew Bauer 3242cde0bf move zm.conf under /etc/zm for Fedora 2015-10-03 13:38:51 -05:00
Andrew Bauer 4fb2bcb393 Fedora specfile changes 2015-10-03 13:21:58 -05:00
Andrew Bauer e8c4adbcca Use make macros inside Fedora config files rather than hardcode 2015-10-03 12:54:18 -05:00
Andrew Bauer 6861ea00d2 Add Fedora 22 Target Distro 2015-10-03 12:40:34 -05:00
Andrew Bauer 269e9bd475 Configure Fedora packages for HTTPS 2015-10-03 12:35:22 -05:00
Andrew Bauer a79d0fc502 update README.fedora 2015-10-03 11:04:58 -05:00
Andrew Bauer 9fae2bdf67 symlink README.https into Fedora folder 2015-10-03 10:45:41 -05:00
Isaac Connor 24b79e81bc add include for basename on freebsd 2015-10-02 11:00:42 -04:00
Andrew Bauer 67a5d6b213 Merge pull request #1089 from ZoneMinder/fix_warnings 
change types and move things around to remove compile warnings
 2015-10-02 12:29:09 -05:00
Andrew Bauer 48f6c9b9c8 Merge pull request #1090 from ZoneMinder/no_overwrite_zm_conf 
Don't install zm.conf if it already exists
 2015-10-02 12:09:23 -05:00
Isaac Connor 796bad55a3 install zm.conf as zm.conf.new if zm.conf already exists 2015-10-02 12:54:25 -04:00
Isaac Connor fc6a6aeaa3 Don't install zm.conf if it already exists 2015-10-02 11:27:35 -04:00
Isaac Connor cf5473836e set default border on live streams so that when they alarm they don't jump around 2015-10-02 10:04:56 -04:00
Isaac Connor 8125ef0334 change types and move things around to remove compile warnings 2015-10-02 09:49:09 -04:00
Pliable Pixels d9355064e7 fixed orange display for monitor mode 2015-10-01 11:35:38 -04:00
Kyle Johnson b2b52a364a Merge pull request #1080 from ZoneMinder/kylejohnson-patch-1 
use deleteAll() vs. delete() when deleting an Event's Frames
 2015-09-30 14:00:16 -06:00
Kyle Johnson 9c7a15daf7 use deleteAll() vs. delete() when deleting an Event's Frames 2015-09-30 13:53:23 -06:00
Andrew Bauer 8d2de77f18 Merge pull request #1079 from bofhdk/SunEyes_sp-p1802swptz 
Added control script for SunEyes SP-P1802SWPTZ
 2015-09-30 07:35:44 -05:00
Bobby Billingsley ef5d62a6c2 typo fixed 2015-09-30 14:10:13 +02:00
Bobby Billingsley a335afb554 added missing MonitorPresets values 2015-09-30 13:59:41 +02:00
Bobby Billingsley 6fe69f3d28 added missing Controls values 2015-09-30 13:55:14 +02:00
Andrew Bauer 33f3cd50f0 Merge pull request #1075 from ZoneMinder/663-frames-primary-key 
663 frames primary key
 2015-09-30 06:50:39 -05:00
Bobby Billingsley 4eb4bdbfb5 Added control script for SunEyes SP-P1802SWPTZ 
(http://www.amazon.com/SunEyes-SP-P1802SWPTZ-Wireless-Camera-1080P/dp/B00MOTBXK6)
 2015-09-30 13:39:50 +02:00
Kyle Johnson ef3ff6c293 Merge pull request #1078 from ZoneMinder/fix-api-crud-plugin 
Use the 3.0 branch of crud, compatible with cakephp 2.x
 2015-09-29 17:47:01 -06:00
Kyle Johnson 33519db28f Use the 3.0 branch of crud, compatible with cakephp 2.x 2015-09-29 17:22:43 -06:00
Kyle Johnson 1937814c82 Update API Frame Model to new Primary Key. Fixes #663 2015-09-29 14:39:24 -06:00
Kyle Johnson 291dfe0f70 Add db update script for 1.28.107. Fixes #663 2015-09-29 14:38:41 -06:00
Kyle Johnson 679a663861 Change Frame to have a PrimaryKey called ID 2015-09-29 14:30:54 -06:00
Kyle Johnson b94a148559 Bump version 2015-09-29 14:28:54 -06:00
Isaac Connor 07348d4321 don't need apache patch anymore 2015-09-29 08:50:50 -04:00
Isaac Connor d39f57c4ff Merge pull request #1073 from pliablepixels/1072-events-API-delete-fix 
Delete fixes for Events
 2015-09-28 14:46:01 -04:00
Pliable Pixels a00fed480d Delete fixes for Events 2015-09-28 14:41:36 -04:00
Isaac Connor cb18adef5c increase min height of zone edit popup so that buttons are visible 2015-09-28 13:01:07 -04:00
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