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 |
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 |