Commit Graph

2353 Commits

Author SHA1 Message Date
stan 0c91ea7d50 Fixed path to css
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2534 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:38:21 +00:00
stan ccfc7acbae Correct path to control functions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2533 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:37:59 +00:00
stan aa26ab7b18 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2532 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-16 08:35:59 +00:00
stan 9137a61831 Remove LearnState from Events table
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2531 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:32:22 +00:00
stan b83c3a46d2 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2530 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-16 08:29:34 +00:00
stan aed786dd0e Fixed unquoted array indexes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2529 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 21:24:31 +00:00
stan 4f67ddd94a Fixed language selection
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2528 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 21:24:14 +00:00
stan 0c4b4ba445 Merged in changes from Axis MPEG
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2527 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 21:20:46 +00:00
stan 55fb3418ac Updated with config
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2524 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:05:40 +00:00
stan 95ac7dadb3 Fixed headerControl div positioning
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2523 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:04:45 +00:00
stan 33f161fede Removed redundant MONTAGE_WIDTH/HEIGHT
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2522 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:04:09 +00:00
stan f7c46aa838 Fixed OLANG issues
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2521 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:03:42 +00:00
stan c58b322a6e Merged in mpeg_encode removal
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2520 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 15:56:52 +00:00
stan b2f616ff21 Merged in mmap changes. Revision 2323:2515
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2516 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 15:21:16 +00:00
stan ee44d4b274 Updated debug format
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2513 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:43:47 +00:00
stan 8cd38d5206 Added in ffmpeg header location checking.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2512 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:43:34 +00:00
stan d7818cd913 Remove learn state bit.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2511 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:42:51 +00:00
stan 81065ba6dd Removed learn state bits
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2510 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:42:20 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00
stan f2cd98f99b Updates
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2507 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:37:06 +00:00
stan 5621a3f283 Added retry on timeouts
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2505 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:31:47 +00:00
stan f0bed4568b Changed enum to not override FILE
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2504 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:31:15 +00:00
stan fe53ca7a07 Bug 482 - Now handles new ffmpeg header locations.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2437 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-06-18 15:42:53 +00:00
stan ba2bf22ea7 Bug 465 - Now supports transitions to/from TAPE state in determining alarms
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2392 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-21 14:02:43 +00:00
stan c617a8436c Bug 434 - Added delete functionality back into DVR events view plus enhanced events scrolloing etc to support.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2391 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-21 13:52:05 +00:00
stan 44943e21e9 Bug 477 - Switched device height and widths to be correct.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2388 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 14:02:53 +00:00
stan 2cba5c3ecc Bug 66 - Fixed 'prev' link in watch view.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2387 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 14:01:20 +00:00
stan d2c3591925 Changed 100's to SCALE_BASE where appropriate
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2386 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 13:35:20 +00:00
stan 2549d98d1f Bug 476 - Added pagination at bottom of events list as well as top.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2385 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-04-15 13:34:46 +00:00
stan 132772f5d3 Updated for version 1.23.3
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2358 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-13 13:44:52 +00:00
stan 799ee78675 Bug 471 - Compiler warnings, sorted out types and general format tidying
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2357 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-13 13:36:12 +00:00
stan 4c452c22c3 Bug 470 - Fixed some anachronistic control script references
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2344 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:43:48 +00:00
stan 002978a761 Indentation changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2343 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:43:18 +00:00
stan 3f2a6bff1b Bug 461 - Updated Ross script
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2342 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:38:59 +00:00
stan 5335397f58 Bug 469 - Filter queries were urlencoded twice.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2341 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:37:52 +00:00
stan 72c8bd107c But 468 - Fixed format of PurgeWhenFull filter.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2340 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:33:51 +00:00
stan af51ed3db0 Test check-in
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2322 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-25 10:01:02 +00:00
stan c411eaf614 Bug 466 - Change old format PwF filters.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2320 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-24 19:03:39 +00:00
stan 5c3cefa09f Bug 466 - PurgeWhenFull filter now in correct format
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2319 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-24 18:58:15 +00:00
stan cc8344d165 Further escaping
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2318 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-24 18:30:16 +00:00
stan ad3e6fecb5 Added escaping to gnutls/openssl error message
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2317 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-24 18:23:05 +00:00
stan 6e70d0db30 Added more helpful mess to gnutls/openssl fail messages
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2316 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-24 18:14:30 +00:00
stan bbacc97d8d Bug 464 - Fixed bogus PxF filter, and added to CVS.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2315 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-24 18:03:10 +00:00
stan 5ea3f88b18 Bug 463 - Moved xhtml header emission into each file to avoid inadvertent prepending of video downloads. Also autogenerate mime-type.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2314 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-20 23:11:25 +00:00
stan 6acbc11296 Added POSIX lib call for strftime
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2313 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-16 18:39:59 +00:00
stan 6078e93c09 Updated for version 1.23.2
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2312 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 23:57:00 +00:00
stan 0c8b6320bc Updated config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2311 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 23:47:25 +00:00
stan 9c5f73dd10 Bug 462 - Now supports gnutls and openssl
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2310 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 23:44:44 +00:00
stan a426ed3d05 Bug 449 - Fixed typo in config name
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2309 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 23:44:06 +00:00
stan 630f74b5ce Bug 454 - Ensure that the correct version is stored in the DB so upgrades can be automatic.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2308 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 23:01:07 +00:00