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

7589 Commits

Author SHA1 Message Date
bhaal2 01ae4de123 Modified so deleting a filter is done by table Id instead of Name 2016-09-15 01:59:31 +10:00
bhaal2 17555bf623 Added extra argument 'id' to deleteFilter function to send to delete action for deleting a filter. 2016-09-15 01:57:31 +10:00
bhaal2 67f2ddc404 Changed filter list order back to Name 
Added extra argument 'Id' to delete button onClick call
 2016-09-15 01:55:58 +10:00
bhaal2 cd626a54ee Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters. 2016-09-15 01:29:44 +10:00
bhaal2 99a212803a Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters. 2016-09-15 01:29:35 +10:00
bhaal2 0d83fc5be7 Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters. 2016-09-15 01:27:59 +10:00
Isaac Connor a0eaea00a5 fix relative paths to jquery and bootstrap fixes #1618 2016-09-14 10:06:15 -04:00
Isaac Connor f222048195 Merge pull request #1624 from bhaal2/storageareas 
Storageareas
 2016-09-14 10:02:30 -04:00
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
bhaal2 33fc47c4b1 StorageId now defaults to 0 (NOT NULL) in the Monitors table, updates to filter.php set the default Id for the default storage area to 0 2016-09-14 23:53:52 +10:00
Isaac Connor 85b2ba73ab change the behaviour of StorageID. Now it will NOT NULL default 0 and a value of 0 means use ZM_EVENTS_PATH 2016-09-14 09:31:57 -04:00
Isaac Connor 07c12d0fae insert NULLs for StorageId when creating event if no Storage Area is defined for the monitor 2016-09-14 09:16:17 -04:00
Isaac Connor ef8d8bd1e5 try inserting NUll for StorageId when creating event 2016-09-14 09:02:32 -04:00
Isaac Connor f82cd461b2 more debug 2016-09-13 12:01:02 -04:00
Isaac Connor 0bc50810de only add the development h3 if it has contents, otherwise it pushes the header size down 2016-09-13 10:25:49 -04:00
Isaac Connor a6b23f50d5 Merge branch 'feature-h264-videostorage' into storageareas 2016-09-13 10:21:14 -04:00
Isaac Connor 2b4bad86cb Merge branch 'master' into storageareas 2016-09-13 10:21:10 -04:00
Isaac Connor 59b28e8346 deprecate the z_frame_rate stuff which is deprecated in ffmpeg 2016-09-13 10:15:47 -04:00
Isaac Connor 3dfe1185ff add ffmpeg as option to libav-tols 2016-09-13 10:11:50 -04:00
Isaac Connor a80881bb98 Merge branch 'fix_1620' into storageareas 2016-09-13 10:03:02 -04:00
Isaac Connor 88d86afd85 Merge ../ZoneMinder.master into storageareas 2016-09-13 10:02:53 -04:00
Isaac Connor 2bc5742aec Merge branch 'feature-h264-videostorage' into storageareas 2016-09-13 09:53:39 -04:00
Isaac Connor 39e06b929f add braces and only call closeEvent if there is an event 2016-09-13 09:36:45 -04:00
Isaac Connor 44591432dd Merge pull request #1622 from SteveGilvarry/zmu_record 
Fix for ZMU killing recording
 2016-09-13 09:30:38 -04:00
Steve Gilvarry fc060135fe Move our recording flag deeper into closeevent 2016-09-13 22:58:38 +10:00
Isaac Connor 54db9f2e3a ptzControl expects a monitor object instead of a dbrow array. 2016-09-12 21:36:03 -04:00
Isaac Connor d0fb2acfaa rename videowriterprefs to videowriter. Use an enum to for videowriter values to make code easier to read. Add some comments 2016-09-12 21:35:14 -04:00
Isaac Connor 6366d137bc add more debug code 2016-09-12 21:34:18 -04:00
Steve Gilvarry 54375d7653 Merge pull request #1587 from knnniggett/travis-zmonvif-off 
don't build the onvif libraries in travis
 2016-09-11 14:14:33 +10:00
Steve Gilvarry 563f4a9d46 Merge pull request #1505 from ZoneMinder/fix_filter_actions 
Confirmed check box status is now retained after save and changing filters.
 2016-09-11 14:13:51 +10:00
Isaac Connor 4ee1f38dd0 move storing packet to videostore up before decoding. move packet allocation inside the while that it needs to be in. 2016-09-09 14:38:16 -04:00
Isaac Connor 15569d4f33 whitespace, commenting, cleanup some Type castings, init zones[i] to null, because it might not get assigned a Zone object. 2016-09-09 10:07:13 -04:00
Isaac Connor 4cfd5cfbb9 deprecate safepkt, not sure why it was needed 2016-09-09 10:05:54 -04:00
Isaac Connor caaaffbb5d change sematics of pop to return the packet* instead of boolean. Free packets in clearQueue 2016-09-09 10:05:29 -04:00
Isaac Connor c6607ea5fe change sematics of pop to return the packet* instead of boolean. Free packets in clearQueue 2016-09-09 10:05:24 -04:00
Isaac Connor 5e7404d448 define zm_av_unref_packet 2016-09-09 10:04:54 -04:00
Isaac Connor 8148e35ec6 rework to dynamically allocate packet instead of putting it on the stack. Plus packet freeing cleanups 2016-09-09 10:04:42 -04:00
Andrew Bauer e35ef3ce83 Merge pull request #1617 from coracis/master 
Update German translation
 2016-09-09 08:55:19 -05:00
Andrew Bauer 321deb5506 Merge pull request #1599 from sabbath88/master 
add some more translation
 2016-09-09 08:40:05 -05:00
Isaac Connor 3a06ba7a65 Turn off instantiating a default zone before even loading the zones. Implement the use of Camera->setMonitor so that the camera object doesn't have to load it later. 2016-09-09 09:15:04 -04:00
corax 070051d06a Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9' 
For easy pull-requesting
 2016-09-09 14:20:03 +02:00
corax 6fab2e97b1 Update German translation of Buffer 2016-09-09 13:32:20 +02:00
corax b10c79b4f7 Add translation for 'Montage Review' 2016-09-09 13:26:19 +02:00
corax 6b18184e4a Remove confusing link to web console 2016-09-09 12:38:30 +02:00
corax 4dc6fc03b3 Add a missing translate()-call 2016-09-09 12:35:34 +02:00
corax 430ecd8e32 Fix some too direct translations into German 2016-09-09 11:51:53 +02:00
corax d017138550 Fix a 'false friend' in German translation 2016-09-09 11:25:12 +02:00
Isaac Connor 5fb1c45c4e Merge ../ZoneMinder.connortechnology into storageareas 2016-09-08 11:34:36 -04:00
Isaac Connor 7b0a14ee72 change doulbe quotes to single quotes. Detect if we can't chdir into the monitor dir. 2016-09-08 11:06:02 -04:00
Isaac Connor 6e9cb06290 Merge branch 'storageareas' into packetqueue 2016-09-08 09:40:52 -04:00