Commit Graph

2220 Commits

Author SHA1 Message Date
stan d840a3e4f2 Fixed up properties
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2551 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:13:17 +00:00
stan 8b3ceb506b Moved PTZ graphics
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2550 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:06:21 +00:00
stan 1d0d430bb6 Moved favicon to graphics dir
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2549 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:06:07 +00:00
stan e722c6a5a4 Slight hack to get PTZ Protocol instead of remote cam protocol
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2548 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:04:35 +00:00
stan 29f38274e4 Added Axis MPEG config and deprecated some old config
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2547 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:45:50 +00:00
stan 49ffb8bdb7 Added check for pthread library
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2546 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:44:58 +00:00
stan 57fa598fd8 Removed session_write_close calls and fixed monitor action
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2545 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:44:39 +00:00
stan d6f85862ac Fixed path to export functions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2544 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:43:29 +00:00
stan eeea85bf7b Removed spacer gif as not required.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2543 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:43:10 +00:00
stan decaf0ef31 Fixed broken default user reference
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2542 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:42:28 +00:00
stan e7c025712a Fixed path to export functions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2541 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:53 +00:00
stan 5e4a953dcd Adjusted layout
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2540 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:37 +00:00
stan 5c9e835c73 Corrected error in configureButtons function
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2539 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:21 +00:00
stan a04b2b4f85 Corrected comments and added skin path as global js variable
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2538 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:40:53 +00:00
stan bfd67f69fd Fixed to work properly with MPEG cameras and presets
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2537 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:40:21 +00:00
stan 76345804e1 Fixed incorrect use of global
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2536 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:39:34 +00:00
stan f5c2733fb1 Fixed paths to montage css files and store layout as cookie
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2535 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:39:04 +00:00
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