Isaac Connor
|
9f5b8bb03b
|
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
|
2013-12-17 14:33:46 -05:00 |
|
Isaac Connor
|
20f1b460ee
|
fix
|
2013-12-17 14:30:56 -05:00 |
|
Isaac Connor
|
3393a63525
|
more updates
|
2013-12-17 12:53:15 -05:00 |
|
Isaac Connor
|
4c348cf159
|
more updates
|
2013-12-17 11:16:20 -05:00 |
|
Isaac Connor
|
ceca805b48
|
more updates
|
2013-12-17 11:07:19 -05:00 |
|
Isaac Connor
|
1c028e5806
|
use parameter passing and remove extra escsaping
|
2013-12-16 16:52:30 -05:00 |
|
Isaac Connor
|
00e2b05130
|
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
|
2013-12-06 15:52:43 -05:00 |
|
Isaac Connor
|
a2a3bda2e1
|
remove unneccessary quoting and escaping
|
2013-12-06 15:51:36 -05:00 |
|
Isaac Connor
|
86b04d0e6f
|
fixup dbFetchMOnitor
|
2013-12-06 14:22:07 -05:00 |
|
Isaac Connor
|
e4ea12a5ca
|
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
|
2013-11-13 10:13:42 -05:00 |
|
Isaac Connor
|
1519db78ce
|
add ServerHost filter
|
2013-11-13 10:13:09 -05:00 |
|
Isaac Connor
|
969918781f
|
more updates, currently the log updates are not enough. Filtering does not work.
|
2013-11-13 10:11:16 -05:00 |
|
Isaac Connor
|
a155082997
|
use parameter passing instead of esacping
|
2013-11-12 15:39:29 -05:00 |
|
Isaac Connor
|
463d8a136f
|
Merge branch 'master' into mysql2PDO
Conflicts:
zm.conf.in
|
2013-11-08 11:22:09 -05:00 |
|
Isaac Connor
|
03809cfa0f
|
improve error reporting
|
2013-11-07 10:58:27 -05:00 |
|
Isaac Connor
|
4c6c415f02
|
fix: wrote dbCon instead of dbConn
|
2013-11-07 10:03:19 -05:00 |
Kfir Itzhak
|
be21a882ab
|
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
Remove ZM_VERSION from zm.conf
|
2013-11-04 12:27:50 -08:00 |
|
Isaac Connor
|
51455b5c85
|
more updates and removal of escaping and quoting
|
2013-11-04 12:43:34 -05:00 |
|
Kfir Itzhak
|
9d5ac7ae8c
|
Fix cmake installing wrong files in an out-of-source build
|
2013-11-04 09:56:40 +02:00 |
Isaac Connor
|
4565068093
|
Merge pull request #233 from fastolfe/zone-marker-overflow
Fix marker-out-of-bounds crash when defining zone points
|
2013-11-03 13:10:07 -08:00 |
|
Isaac Connor
|
7989e8e980
|
Merge branch 'master' into mysql2PDO
|
2013-11-03 16:07:37 -05:00 |
|
Isaac Connor
|
2d0f4dffd1
|
Fix a missing NULL second paramter to dbFetchAll
|
2013-11-03 16:06:31 -05:00 |
|
Isaac Connor
|
6c6da67427
|
Merge branch 'master' into mysql2PDO
|
2013-11-03 15:57:45 -05:00 |
|
Isaac Connor
|
3fa91a30a3
|
allow the value side of config lines potentially be empty.
|
2013-11-03 15:52:37 -05:00 |
|
Isaac Connor
|
59b841958d
|
use parameter passing instead of explicit exscaping
|
2013-11-03 15:40:00 -05:00 |
David Nesting
|
b368d306b9
|
Fix marker-out-of-bounds crash when defining zone points
|
2013-11-02 15:56:42 -07:00 |
|
Isaac Connor
|
93560652f1
|
make sortorder be asc or desc, not something arbitrary which needs to be escaped
other fixes to use parameter passing to PDO instead of escaping them ourselves
|
2013-11-01 12:30:07 -04:00 |
|
Isaac Connor
|
72b80d7417
|
remake this branch off master instead of off mysql2PDO.
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
|
2013-11-01 09:47:28 -04:00 |
|
Kfir Itzhak
|
c2bd7c97ec
|
First attempt at enabling out-of-source building for zm with cmake
|
2013-10-31 18:10:00 +02:00 |
|
Isaac Connor
|
ae51ac5519
|
redo changes to use new dbFetch functions with parameter arrays
|
2013-10-18 14:24:08 -04:00 |
|
Isaac Connor
|
7fdb933d6b
|
rework dbQuery, dbFetchOne to take a parameters array, and use it
|
2013-10-18 14:15:24 -04:00 |
|
Isaac Connor
|
cde89a7144
|
more quoting removal, some slight optimisations
|
2013-10-17 21:03:24 -04:00 |
|
Isaac Connor
|
92591a6835
|
more removal of quotes
|
2013-10-17 17:05:50 -04:00 |
|
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
|
9e2d7cfd24
|
initial convert to PDO with no testing
|
2013-10-16 16:07:58 -04: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 |
Isaac Connor
|
34f84a4097
|
Merge branch 'v1.26.4-beta'
|
2013-10-03 10:14:09 -04:00 |
|
mastertheknife
|
48f11a8064
|
Add cmake to zoneminder
|
2013-09-28 12:59:50 +03:00 |
|
Isaac Connor
|
7e91053761
|
increase the hegiht of the window a bit, the contents are larger
|
2013-09-23 10:03:33 -04:00 |
Knniggett
|
6d00540b5d
|
Improve Chrome browser support & log streaming events
|
2013-09-21 14:52:41 -05:00 |