Commit Graph

161 Commits

Author SHA1 Message Date
Isaac Connor c9ad6e661a Merge branch 'master' of https://github.com/dukess/ZoneMinder into dukess-master 2013-09-18 12:57:26 -04:00
Serguei S. Dukachev ed9f647dd7 Update actions.php
SQL-ERR 'Incorrect integer value: '' for column 'Enabled' at row 1', statement was 'update Monitors set Function = 'Monitor', Enabled = '' where Id = '2''
2013-09-13 03:48:01 -07:00
Richard Kojedzinszky 0f5c90bbe4 Rewritten the query to allow mysql to use indexes
On a system with heavy logging, without this the login procedure took
too long.
2013-09-12 22:46:26 +02:00
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Kyle Johnson d47aaec775 Merge pull request #92 from knnniggett/patch-9
Update getBrowser() to match IE10
2013-09-03 06:38:13 -07:00
Kyle Johnson 2f92689d7e Resolving CVE-2013-0232 - this should fix #93. 2013-08-30 21:53:19 -04:00
Andy de51926434 Update getBrowser() to match IE10
Updates the preg_match expression to match Internet Explorer 10. The previous pattern would not detect IE10, and hence zoneminder would not attempt to stream via Cambozola, which leaves IE10 users looking at a broken link.

NOTE: There is another file in the zoneminder source tree, AssetDispatcher.php, that also uses the same pattern match expression.  It is part of the Cake folder, which I am not familiar with.  Please advise if we should edit that file as well.
2013-08-29 17:41:20 -05:00
nagyrobi 60ea6a387d Update lang.php
Add the ability to set up the Date and time formats by the language files, according to that language's regionals.
The patch allows to set up a global default, in case the language file doesn't contain the date and time definitions.

Here we look if the constants are already defined or not, if they are not, define them to the original defaults.
2013-08-16 12:05:33 +02:00
Isaac Connor 3a8481a591 cleanup 2013-05-10 14:02:22 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00