Commit Graph

5627 Commits

Author SHA1 Message Date
Kyle Johnson 356fadbff8 Add index to Frames table for people updating 2015-10-22 11:36:55 -06:00
Kyle Johnson 746e695448 Add index to Frames table upon new creation 2015-10-22 11:25:32 -06:00
Isaac Connor d0e5dd62b5 Merge pull request #1103 from seebaer1976/patch-6
Update preinst
2015-10-16 12:06:44 -04:00
Isaac Connor 2237391876 white spacing, and fix loading of Server objects in monitor 2015-10-15 09:28:35 -04:00
Isaac Connor 582cbe7567 Merge branch 'master' into multi-server 2015-10-15 09:01:19 -04:00
seebaer1976 7ebf3de8a2 Update preinst
korrektur
2015-10-09 18:13:13 +02:00
Isaac Connor 8db4c22192 Merge pull request #1100 from seebaer1976/patch-2
Update links
2015-10-09 09:23:32 -04:00
Isaac Connor 729e9536d7 Merge pull request #1101 from seebaer1976/patch-4
Update rules
2015-10-09 09:23:13 -04:00
Isaac Connor 79078f8308 Merge pull request #1102 from seebaer1976/patch-5
Update apache.conf
2015-10-09 09:22:55 -04:00
Isaac Connor 6c51f568a1 Merge pull request #1099 from seebaer1976/patch-3
Update preinst
2015-10-09 09:22:36 -04:00
seebaer1976 b17819d181 Update apache.conf
Update links
2015-10-09 13:50:15 +02:00
seebaer1976 b042152694 Update rules
update links
2015-10-09 13:48:26 +02:00
seebaer1976 4284f8b089 Update preinst
Update links
2015-10-09 13:45:19 +02:00
seebaer1976 23a6000380 Update links
Update links
2015-10-09 13:41:02 +02:00
Isaac Connor 1367de292e Fix error message when no ZM_SERVER_NAME or ZM_SERVER_HOST set 2015-10-07 08:57:50 -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 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 8e75330031 Merge branch 'master' into multi-server 2015-10-02 14:24:24 -04:00
Isaac Connor ac8bfc71dc fix specifying ServerId 2015-10-02 18:22:48 +00:00
Isaac Connor 6570a8d855 fix Server->Hostname() 2015-10-02 18:22:19 +00:00
Isaac Connor da764a605b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-10-02 13:37:56 -04: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
Andrew Bauer ee96793fb3 Merge pull request #1111 from baffo32/1110-fatal-unset-timezone
Fatal error if date.timezone is unset
2015-10-14 06:48:51 -05:00
baffo32 da8e9dd81b Remove reference to php.ini from timezone error 2015-10-13 16:55:38 -04:00
baffo32 ec12d448e4 Generalization date.timezone installation step 2015-10-13 16:52:39 -04:00
baffo32 250c3c31e1 Revised source-install specific recommendation. 2015-10-13 16:45:31 -04:00
Andrew Bauer acaa0091b4 Merge pull request #1095 from ZoneMinder/fix_zmaudit
Fix zmaudit
2015-10-13 07:22:21 -05:00
Andrew Bauer d6667100b4 Merge pull request #1084 from ZoneMinder/tz
Tz
2015-10-13 07:19:45 -05: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 24454253af Add date.timezone step to INSTALL 2015-10-12 15:25:30 -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
Andrew Bauer 8f2e073735 Merge pull request #1107 from baffo32/1106-zm-conf-new
Fix faulty zm.conf.new install line
2015-10-12 06:53:29 -05:00
baffo32 eecfb80292 Fix faulty zm.conf.new install line 2015-10-11 22:41:57 -04:00
Isaac Connor 79d8e4b74f Merge branch 'master' into fix_zmaudit 2015-10-06 09:30:32 -04:00
Isaac Connor 4a506368dc Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field 2015-10-06 09:30:10 -04:00
Isaac Connor 2be61906a4 add checks for execinfo library 2015-10-02 13:37:50 -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