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

154 Commits

Author SHA1 Message Date
bhaal2 cd0e6ba285 StorageId now defaults to 0 and database column now set to NOT NULL. Changed default Id in php to match 2016-09-14 23:56:05 +10:00
Isaac Connor 2b4bad86cb Merge branch 'master' into storageareas 2016-09-13 10:21:10 -04:00
corax 4dc6fc03b3 Add a missing translate()-call 2016-09-09 12:35:34 +02:00
Isaac Connor 6e4c8fa224 need to set the Id when duping 2016-06-24 10:31:15 -04:00
Isaac Connor d732d9a49a fix merge 2016-06-24 10:02:20 -04:00
Isaac Connor e29a0ebe71 Merge branch 'feature-h264-videostorage' into storageareas 2016-06-21 13:48:32 -04:00
Isaac Connor 26bba58c56 Merge branch 'master' into feature-h264-videostorage 2016-06-17 11:09:47 -04:00
Isaac Connor 7a08d4620f Merge branch 'master' into storageareas 2016-05-25 10:17:46 -04:00
Isaac Connor 8f1596d683 use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr 2016-05-25 09:08:28 -04:00
Isaac Connor 00abd36af8 fix the other case of the wrong case of rtsp 2016-05-24 12:19:31 -04:00
Isaac Connor 056eed6df9 fix to show RTSP describe option when switching back to rtsp 2016-05-24 12:15:59 -04:00
Isaac Connor bc49aa6aa6 add missing ; and remove extra ) 2016-05-24 09:34:36 -04:00
Isaac Connor 20c4d07a00 Merge branch 'master' into hide_rtspdescribe 2016-05-16 14:40:04 -04:00
Steve Gilvarry da157f5a1a Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-04-30 22:27:10 +10:00
Isaac Connor 0adbaafd98 Merge branch 'master' into storageareas 2016-04-26 13:10:37 -04:00
arjunrc 804ac1de81 Clone feature added 2016-04-14 13:53:10 -04:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor 6c8e8368e1 rtsp should be lower case 2016-04-04 16:56:54 -04:00
Isaac Connor 96aa20fb79 value should be lower case when checking for rtsp 2016-04-01 15:43:59 -04:00
Isaac Connor 6816a4c75b Merge branch 'iconnor_video' into storageareas 2016-04-01 11:35:38 -04:00
Isaac Connor 3140905d02 whitespace and structure changes to match google coding style. Use new htmlSelect function to build the select dropdowns. Use a monitor object instead of a newMonitor array 2016-04-01 10:35:34 -04:00
Isaac Connor abcf48b65c Merge branch 'master' into feature-h264-videostorage 2016-04-01 08:53:45 -04:00
Isaac Connor e7ee464a17 Add a RecordAudio setting to the Storage Tab 2016-03-31 15:50:44 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
Isaac Connor ea49dc20d1 Merge branch 'master' into storageareas 2016-03-30 10:58:07 -04:00
Robin Daermann c8c0586c66 Trim monitor names 2016-03-29 11:40:14 +02:00
Isaac Connor 86dbe4fa15 define default for StorageId to prevent error message 2016-03-03 09:22:53 -05:00
Isaac Connor 131d0daefe fix syntax 2016-02-19 11:47:18 -05:00
Isaac Connor 5da8df45a7 Merge branch 'hide_rtspdescribe' into storageareas 2016-02-12 13:53:09 -05:00
Isaac Connor 5f217b48e0 When Protocol is HTTP, hide the RTSPDescribe line. Make it appear when Protocol is changed to RTSP 2016-02-12 13:52:59 -05:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11:00
Isaac Connor dfd7986c01 Merge branch 'master' into multi-server 
Conflicts:
	distros/debian_cmake/links
	distros/ubuntu1504_cmake/zoneminder.postinst
 2015-12-21 12:57:45 -05:00
Isaac Connor ca07b951cb Merge branch 'master' into newpointone 
Conflicts:
	docs/installationguide/ubuntu.rst
 2015-12-21 12:41:25 -05:00
SteveGilvarry e28e3c2b75 Merge branch 'master' into feature-h264-videostorage 2015-12-20 14:13:30 +11:00
Andy Bauer e5f243a9f8 Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps 2015-12-19 08:16:20 -06:00
Isaac Connor 14dc447145 add a Storage Area dropdown to set where this monitor will storage it's events 2015-12-15 11:13:00 -05:00
Isaac Connor 14cde582cf Merge branch 'multi-server' into multiserverplusstorage 
Conflicts:
	src/zm_monitor.h
 2015-12-14 16:55:26 -05:00
Isaac Connor b2b1afa8ad Merge master 2015-12-14 15:49:32 -05:00
SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_remote_camera_rtsp.h
	web/skins/classic/views/monitor.php
 2015-10-23 22:07:22 +11:00
Isaac Connor 2237391876 white spacing, and fix loading of Server objects in monitor 2015-10-15 09:28:35 -04:00
Isaac Connor e172911088 include Server object and fix Server dropdown 2015-09-16 14:51:05 -04:00
Isaac Connor 681718e908 init to avoid error message 2015-09-16 11:07:08 -04:00
Andrew Bauer a995d72ebd add warning and help text for maxfps fields 2015-08-22 12:36:49 -05:00
Andrew Bauer 2fbf79674b Add RTSP Describe checkbox to web console 2015-08-21 10:32:50 -05:00
Andrew Bauer fe3595bfa1 Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_update-1.28.101.sql
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 20:20:53 -05:00
Andrew Bauer 68adcc9e67 Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 14:07:38 -05:00
Linwood-F 987db68452 Fix extra image copy; fix options unset of exif toggle 2015-08-18 14:39:55 -04:00
Linwood-F 99c8af4a17 Bring up to date with master (mostly) 2015-08-17 22:52:51 -04:00
Robin Daermann 299c629a20 Merge remote-tracking branch 'upstream/master' into large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-17 13:42:36 +02:00
Andrew Bauer c17de4a00f add Exif checkbox to monitor 2015-08-16 17:56:03 -05:00