ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,030 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

3030 Commits

Author SHA1 Message Date
Kyle Johnson 3af0600917 Limited the number of fields returned when searching for associated events and zones 2013-05-04 22:41:27 -04:00
Kyle Johnson d681654e56 Moved events queries from the Monitors controller to the Monitors model 2013-05-04 19:42:37 -04:00
Kyle Johnson a56ae4ed42 Display last events per hour, day, week, month per monitor 2013-05-04 19:22:48 -04:00
Kyle Johnson 20b024ef02 Added queries for last events per hour, day, week and month 2013-05-04 19:22:09 -04:00
Kyle Johnson c42ae4a91d Moved the Html and Form helpers to the common AppController 2013-05-03 07:34:45 -04:00
Kyle Johnson cff58441fc Fixed some indents 2013-05-02 21:31:05 -04:00
Isaac Connor 7cf5475542 Merge ../ZoneMinder-kfir into kfir-proper 
Conflicts:
	configure
	src/Makefile.am
	src/Makefile.in
 2013-05-02 21:28:51 -04:00
Kyle Johnson 2cc0620edc Added zone count to monitor index 2013-05-02 21:27:55 -04:00
Kyle Johnson 2c04d0774f Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
Kyle Johnson b7d993839b Added Zone model, as well as Monitor and Zone model association 2013-05-02 09:01:27 -04:00
Kyle Johnson 12642e6c45 Added additional table columns as well as total event count per monitor 2013-05-02 08:56:51 -04:00
Kyle Johnson e782fbe38d Defined associations between the Monitor and Event models 2013-05-02 08:55:59 -04:00
Kyle Johnson e2751c0597 Initial ability to edit limited options of existing monitors 2013-05-01 21:03:25 -04:00
Kyle Johnson 6bc6610542 Added Monitors view view 2013-05-01 20:57:10 -04:00
Kyle Johnson 1be91f67e3 Added Function and Source columns 2013-05-01 18:46:01 -04:00
Kyle Johnson 055d8f8d0b Initial commit of MVC for Monitors 2013-05-01 18:41:59 -04:00
Kyle Johnson a5e2f29a4b Specified the specific table name for the Event model 2013-05-01 18:21:46 -04:00
Kyle Johnson a16054b33f Removed an HTML comment and changed the heading from 1 to 2. 2013-05-01 08:24:42 -03:00
Kyle Johnson 31902af09a Update README.md 2013-05-01 08:04:57 -03:00
Kyle Johnson 5354ec12e1 Merge branch 'modern' into develop 2013-05-01 07:03:10 -04:00
Kyle Johnson 9d5243ccab Initial commit of Event Model, View and Controller with basic support for drilling into an event 2013-05-01 07:02:12 -04:00
Kyle Johnson 8322dc390f Initial commit of CakePHP 2.3.4 2013-05-01 06:58:31 -04:00
Kyle Johnson 1ed6462354 Removed all of the old web files 2013-05-01 06:52:43 -04:00
Isaac Connor e37a49b511 add the debian directory with stuff to build a debian package 2013-04-29 16:46:56 -04:00
Isaac Connor 044af38cdb match up #if's regarding gnutls-openssl 2013-04-29 16:44:37 -04:00
Isaac Connor c0e634d856 add a check for gnutls-openssl which is required to add the -lgnutls-openssl to the compile line to make it compile 2013-04-29 16:43:49 -04:00
Isaac Connor ce61512a0d gnutls changes from ubuntu package 2013-04-29 15:32:55 -04:00
Isaac Connor 0913287ee1 gnutls changes from ubuntu package 2013-04-29 15:32:16 -04:00
Isaac Connor 36f25c7ffb add -fno-inline from ubuntu package 2013-04-29 15:31:55 -04:00
Isaac Connor ca4e6b455e look for script in installed bath, not build location 2013-04-29 13:46:37 -04:00
Isaac Connor 1c3f6a9637 fix typos 2013-04-29 13:45:27 -04:00
Isaac Connor 0967797933 add unistd.h to fix compile 2013-04-29 13:44:21 -04:00
Isaac Connor 6db183a5ba add mathetmatics.h to fix compile 2013-04-29 13:43:48 -04:00
Isaac Connor bd5e2da5c7 fix for kernel3.5 2013-04-29 13:29:51 -04:00
Isaac Connor 84370b7fd8 add unistd.h include to fix compile 2013-04-29 12:51:46 -04:00
Isaac Connor d458c145a3 Add Brian Rudy's script to control SkyIPCam cameras. 2013-04-29 12:04:12 -04:00
nextime 8bf1824159 Ok, this time it will work? 2013-04-27 02:17:11 +02:00
nextime 7cb43d0efc Fix a wrong macro.. 2013-04-27 01:10:51 +02:00
nextime 6af58aca09 Fix CodecID changes in recent libav libraries 2013-04-27 00:59:34 +02:00
Kyle Johnson 4d508d8be2 Copied COPYING to LICENSE 2013-04-12 19:11:17 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
Kfir Itzhak 0ef29743f2 Merged the deinterlacing code, although only four field is optimized so far, and is still not working perfectly. 
1) Fixed compile errors that may occur when compiling with gcc 4.7 or newer.
2) Modified the check for libavcodec to work correctly with the latest versions of ffmpeg.
 2012-07-17 12:23:13 +03:00
Kfir Itzhak ed2e3a8ce0 Fixed few compiler errors (unknown registers and such) and modified zm_create.sql to include the new field. 2012-07-17 10:36:21 +03:00
Kfir Itzhak 0fe55a18bf Something useable :) 
1) Added optimized versions of four field deinterlacing, including SSSE3 ones.
2) Removed the "Very Soft" and "Very Hard" options.
3) Deinterlacing happens before any rotation to the image.
 2012-07-15 17:30:37 +03:00
Kfir Itzhak a6c7acd02a Some more progress on the deinterlacing code. 2012-07-13 20:11:16 +03:00
Kfir Itzhak f27b424503 Much more progress! 
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
 2012-07-13 20:11:16 +03:00
Kfir Itzhak 8f0ec42ba2 First work on adding built-in deinterlacing to ZM. 2012-07-13 20:11:16 +03:00
stan 4996dd0a51 Recreated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:46:18 +00:00
stan f9022778f7 Fixed template instantiation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3661 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:45:54 +00:00
stan 8dd2bbfc17 Support gnutls md5 generation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3660 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:00:20 +00:00