Isaac Connor
|
e4d51e1819
|
Merge branch 'master' into multi-server
|
2015-09-28 10:04:23 -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
|
cc85640761
|
Merge branch 'zmwatch_debug' into multi-server
|
2015-09-24 10:01:41 -04:00 |
|
Isaac Connor
|
e6e8043579
|
Merge branch 'master' into multi-server
|
2015-09-24 10:01:34 -04:00 |
|
Isaac Connor
|
e4b0e74f69
|
merge master
|
2015-09-24 10:01:27 -04: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
|
b25958df14
|
add a check for StateId
|
2015-09-17 16:07:04 -04:00 |
|
Isaac Connor
|
ba1100fc03
|
continue conversion from array to class of Monitor
|
2015-09-17 16:06:47 -04:00 |
|
Isaac Connor
|
4c2545a5ca
|
Merge branch 'master' into multi-server
|
2015-09-17 15:39:26 -04:00 |
|
Isaac Connor
|
3008974c89
|
add Hostname to Servers
|
2015-09-17 15:39:04 -04:00 |
|
Isaac Connor
|
aac45e54b8
|
monitor array to class
|
2015-09-17 15:35:38 -04:00 |
|
Isaac Connor
|
c415399043
|
add Hostname to Server
|
2015-09-17 15:35:27 -04:00 |
|
Isaac Connor
|
366c4ec676
|
monitor array to class
|
2015-09-17 15:35:09 -04:00 |
|
Isaac Connor
|
4a65ae1d2a
|
fix error in display of Server
|
2015-09-17 15:34:48 -04:00 |
|
Isaac Connor
|
01718aaffb
|
consturctor just takes an id
|
2015-09-17 15:34:26 -04:00 |
|
Isaac Connor
|
13327b7651
|
Load Controls if appropriate
|
2015-09-17 15:34:09 -04:00 |
|
Isaac Connor
|
52cdb8a05a
|
add Monitor class
|
2015-09-17 15:29:36 -04: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 |
|
Isaac Connor
|
ac5f42efcf
|
add a class for Server objects
|
2015-09-16 15:16:07 -04:00 |
|
Isaac Connor
|
a8ba32db64
|
add Server.php to autoconf build
|
2015-09-16 14:51:59 -04:00 |
|
Isaac Connor
|
0f181b72d1
|
include Server object and display the server column
|
2015-09-16 14:51:23 -04:00 |
|
Isaac Connor
|
e172911088
|
include Server object and fix Server dropdown
|
2015-09-16 14:51:05 -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
|
73badd1c2d
|
check for value of ZM_SERVER_NAME and ZM_SERVER_HOST and include it in the error message
|
2015-09-16 11:12:04 -04:00 |
|
Isaac Connor
|
681718e908
|
init to avoid error message
|
2015-09-16 11:07:08 -04:00 |
|
Isaac Connor
|
b8f2b1e0a0
|
Merge branch 'mmap_fd_gt_3' into multi-server
|
2015-09-16 11:01:06 -04:00 |