Commit Graph

3012 Commits

Author SHA1 Message Date
Isaac Connor ef765afa2d Merge branch 'master' into mysql2PDO 2013-10-17 17:02:44 -04:00
Isaac Connor 355c10c3a4 fix error when strict modes is on. 2013-10-17 17:02:17 -04:00
Isaac Connor 60e2703637 fix missing n 2013-10-17 17:01:37 -04:00
Isaac Connor 09fbdc9e35 forget the updates to this file 2013-10-17 16:57:05 -04:00
Isaac Connor 2a45506bff more quoting removal 2013-10-17 16:15:04 -04:00
Isaac Connor 0979830b91 more removal of exra quotes 2013-10-17 15:54:17 -04:00
Isaac Connor 36c4fad644 remove extra quoets since dbEcape does quoting now 2013-10-17 15:35:23 -04:00
Isaac Connor 870a59bed4 fix missing <?php. The missing full size tag makes the file fail when short tags are turned off 2013-10-17 14:23:25 -04:00
Isaac Connor 92d22b5202 Merge branch 'master' into mysql2PDO 2013-10-16 16:58:33 -04:00
Isaac Connor b126c5ae7e fix typo 2013-10-16 16:55:24 -04:00
Isaac Connor cd63b0a2a7 add defaults for ZM_DB_TYPE 2013-10-16 16:10:31 -04:00
Isaac Connor 5eb313b896 add config lline for DB type 2013-10-16 16:08:41 -04:00
Isaac Connor 9e2d7cfd24 initial convert to PDO with no testing 2013-10-16 16:07:58 -04:00
Kyle Johnson 5ead2a4394 Merge pull request #207 from knnniggett/prev_btn
Change Prev Button functionality.  Fixes #32.
2013-10-16 06:40:20 -07:00
Kyle Johnson 7bf4de37de Merge pull request #211 from kylejohnson/master
ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
2013-10-15 13:23:57 -07:00
kjohnson dff5b3aeb0 ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler) 2013-10-14 09:27:01 -04:00
Andrew Bauer 62dbb6e5fb Update README.Fedora
typo
2013-10-14 06:47:29 -05:00
Andy Bauer 32cf3663f3 Update README.Fedora
add "sudo"
2013-10-13 08:22:16 -05:00
Andy Bauer a3dc2b50d3 Update README.CentOS 2013-10-11 06:47:32 -05:00
Andy Bauer b7e69f0104 Update zoneminder.cmake.f19.spec
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
2013-10-10 13:30:38 -05:00
Andy Bauer e16c2502d6 Update zoneminder.f19.spec 2013-10-10 13:29:46 -05:00
Andy Bauer 1e756a1529 Update zoneminder.cmake.el6.spec
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
2013-10-10 13:29:15 -05:00
Andy Bauer 8f512729f3 Update zoneminder.el6.spec
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
2013-10-10 13:28:42 -05:00
Andy Bauer 6f313ad866 Update zoneminder.f19.spec
fix typo
2013-10-10 06:32:45 -05:00
Andy Bauer 4218ef0113 Update README.Fedora 2013-10-09 18:37:48 -05:00
Andy Bauer 78effbab45 Update README.Fedora 2013-10-09 18:36:59 -05:00
Andy Bauer 33f7673656 Update README.Fedora 2013-10-09 18:35:39 -05:00
Andy Bauer 5c7674ca09 Update zoneminder.f19.spec 2013-10-09 18:34:07 -05:00
Andy Bauer 4336b6cdb4 Update zoneminder.f19.spec 2013-10-09 18:23:46 -05:00
Andy Bauer c0878c5e76 Update README.Fedora
Remove mariadb from instructions per the Fedora team.
2013-10-09 17:41:20 -05:00
Andy Bauer dbbf1d9f37 Create zoneminder-1.26.0-defaults.patch 2013-10-09 12:06:14 -05:00
Isaac Connor 1ac731a058 merge Debian build instructions, copy and modify for ubuntu 2013-10-09 11:02:05 -04:00
Isaac Connor c34bc10355 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-10-09 10:56:48 -04:00
Andrew Bauer 79af2adaa0 When loading a new event, always set the current frame id to the first frame rather than the last 2013-10-09 07:32:27 -05:00
Kfir Itzhak fcf969f575 Fix cmake not enabling mmap in zm perl modules correctly this time 2013-10-09 07:08:29 +03:00
Andy Bauer de16858590 Update zoneminder.f19.spec
Remove -msse2 flag from builds other than x86_64
2013-10-08 19:25:47 -05:00
Andy Bauer 8d331452f5 Update zoneminder.el6.spec
Remove -msse2 flag from builds other than x86_64
2013-10-08 19:24:33 -05:00
Kfir Itzhak 378d1456dc Fixed cmake not enabling mmap in perl modules 2013-10-08 18:13:18 +03:00
Kyle Johnson fe7471a854 Bumping version to 1.26.4 2013-10-08 10:23:24 -04:00
Andy Bauer 1c1a644b35 Update zm.conf.in
Update comment for ZM_PATH_BUILD. Is this needed any more?
2013-10-08 07:10:06 -05:00
Andy Bauer 85bca8de6d Update zoneminder.el6.spec 2013-10-07 19:01:08 -05:00
Andy Bauer 545275c4c0 Update zoneminder.f19.spec 2013-10-07 19:00:18 -05:00
Andy Bauer 667d7559df Create zoneminder.cmake.f19.spec 2013-10-07 18:57:00 -05:00
Andy Bauer 1d7660934f Create zoneminder.cmake.el6.spec 2013-10-07 18:31:59 -05:00
Andy Bauer 0cbb818d63 Update README.CentOS
minor text formatting changes
2013-10-07 15:51:35 -05:00
Kfir Itzhak 8b4db0358e Merge pull request #205 from knnniggett/debug
Change frameserver warnings to debug messages
2013-10-07 12:53:07 -07:00
Andrew Bauer 70fb31c2e3 Changed debug levels to 4-6 2013-10-07 14:40:38 -05:00
Andrew Bauer 32bd588a1c Change frameserver warnings to debug level 2 2013-10-07 13:57:14 -05:00
Kfir Itzhak 022ecf4227 Merge pull request #201 from ZoneMinder/signalfixes
Signal improvements and fixes
2013-10-07 08:45:12 -07:00
Andy Bauer 01be7a8aec Update configure.ac
make ZoneMinder lowercase to match the folder with the same name
2013-10-07 09:14:53 -05:00