Isaac Connor
|
582cbe7567
|
Merge branch 'master' into multi-server
|
2015-10-15 09:01:19 -04:00 |
Isaac Connor
|
6570a8d855
|
fix Server->Hostname()
|
2015-10-02 18:22:19 +00:00 |
Andrew Bauer
|
13aab8a1be
|
Merge pull request #1113 from baffo32/1112-detect-missing-content
Fatal if content dirs are unwritable
|
2015-10-14 06:49:33 -05:00 |
baffo32
|
da8e9dd81b
|
Remove reference to php.ini from timezone error
|
2015-10-13 16:55:38 -04:00 |
|
baffo32
|
250c3c31e1
|
Revised source-install specific recommendation.
|
2015-10-13 16:45:31 -04:00 |
|
baffo32
|
362b190641
|
Fatal if content dirs are unwritable
|
2015-10-12 16:16:22 -04:00 |
|
baffo32
|
4a280a73d1
|
Use Fatal function to report bad timezone
|
2015-10-12 15:43:24 -04:00 |
|
baffo32
|
d20478a15f
|
Detect invalid timezones
|
2015-10-12 13:22:30 -04:00 |
|
baffo32
|
7190b532dd
|
Fatal error if date.timezone is unset
|
2015-10-12 13:07:07 -04:00 |
|
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
|
e12640ec73
|
Merge branch 'no_overwrite_zm_conf' into multi-server
|
2015-10-02 15:34:14 +00:00 |
|
Isaac Connor
|
00ef849908
|
fix line testing for Hostname
|
2015-10-02 15:29:17 +00: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
|
ea87ffe66f
|
merge master, bump version to 1.28.108
|
2015-10-01 11:52:49 -04:00 |
Pliable Pixels
|
d9355064e7
|
fixed orange display for monitor mode
|
2015-10-01 11:35:38 -04:00 |
Kyle Johnson
|
9c7a15daf7
|
use deleteAll() vs. delete() when deleting an Event's Frames
|
2015-09-30 13:53:23 -06:00 |
|
Kyle Johnson
|
1937814c82
|
Update API Frame Model to new Primary Key. Fixes #663
|
2015-09-29 14:39:24 -06: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
|
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 |
|
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 |
|
Isaac Connor
|
e4b0e74f69
|
merge master
|
2015-09-24 10:01:27 -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 |
Dmitry Smirnov
|
333e7ec67b
|
header typo corrections
|
2015-09-19 17:39:54 +10: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
|
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
|
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 |