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

7708 Commits

Author SHA1 Message Date
Isaac Connor 11b160b7d1 document code blocks 2016-11-03 16:44:03 -04:00
Isaac Connor dbd7d7d095 fix crash when not compiled with sws_resample 2016-11-03 16:43:48 -04:00
Isaac Connor 53166fabf5 Merge branch 'master' into storageareas 2016-11-03 14:59:06 -04:00
Isaac Connor cb69d1a693 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2016-11-03 14:57:29 -04:00
Kyle Johnson bd47439056 Merge pull request #1639 from connortechnology/cookie_scale 
store the scale value for watch and event views in a cookie, differen…
 2016-11-03 12:35:15 -06:00
Isaac Connor 099cca210b fix monitorId to MonitorId 2016-11-03 14:34:17 -04:00
Isaac Connor 6d57b326fa change logic of sending file contents to handle an off by one and be more readable 2016-11-03 11:42:42 -04:00
Isaac Connor 9d76c9cf6a fix fclose 2016-11-03 11:23:50 -04:00
Isaac Connor a87f5e1592 fix sending full content when we should be 2016-11-03 11:23:10 -04:00
Isaac Connor 0ea8461192 remove extra s 2016-11-03 09:43:38 -04:00
Isaac Connor 2f22eb5a8c fix error when only 1 monitor is listed 2016-11-03 09:41:54 -04:00
Andy Bauer 1bdcd39a50 add quotes to handle values with spaces 2016-10-31 20:37:58 -05:00
Andrew Bauer 9f84aaa537 surround variables w/quotes to process data with spaces 2016-10-31 08:46:05 -05:00
Steve Gilvarry d504043a9e Update ru_ru.php 
Remote extra line
 2016-11-01 00:32:46 +11:00
Isaac Connor ca69a79bed fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist. 2016-10-27 17:05:33 -04:00
Isaac Connor a7c1231b46 fix WatchScale -> EventScale 2016-10-26 14:53:24 -04:00
Isaac Connor 340b172dc4 Merge branch 'add_scale_to_frame_view' into storageareas 2016-10-26 14:46:50 -04:00
Isaac Connor fb96b262d7 Merge ../ZoneMinder.master into storageareas 2016-10-26 14:46:39 -04:00
Isaac Connor 6a16db0361 get rid of extra line feed 2016-10-26 14:45:13 -04:00
Isaac Connor 42783b68f9 float the scale control right, add css for other skins 2016-10-26 14:43:23 -04:00
Isaac Connor 4defad1352 Merge branch 'add_scale_to_frame_view' into storageareas 2016-10-26 14:04:43 -04:00
Isaac Connor d9a31f7fb6 Merge branch 'master' into storageareas 2016-10-26 13:39:31 -04:00
Isaac Connor c74cc54ac0 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2016-10-26 13:34:30 -04:00
Isaac Connor 98cde11e86 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2016-10-26 13:34:28 -04:00
Isaac Connor cf0e4935f1 cleanups, more debugging 
Also, when adding a monitor, a user who is restricted to monitors can't create one, add an error essage about it instead of failing silently.
 2016-10-21 12:43:23 -04:00
Isaac Connor f9ac601194 fix getOutputHelperStream -> getHelperStream 2016-10-21 12:41:37 -04:00
Isaac Connor 7b1395a4ea set default for StorageId to '0' since it can't be NULL anymore 2016-10-20 14:06:09 -04:00
Isaac Connor f153e9b8fb MontageReview should only be visisble to people who can view events. Fix running state 2016-10-20 13:38:12 -04:00
Isaac Connor ea27e07276 add indexes for Monitors(ServerId) and Servers(Name) 2016-10-20 13:19:41 -04:00
Isaac Connor 4fc85fd89c add indexes for Monitors(ServerId) and Servers(Name) 2016-10-20 13:18:33 -04:00
Isaac Connor 67e14bd12f move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me. 2016-10-20 13:16:50 -04:00
Isaac Connor cb88b984c7 fix capt -> capture and some suspicious sprintf formatting and double quotes to single quotes 2016-10-20 12:01:25 -04:00
Isaac Connor 5ee8a1c0a7 deprecate the contents of getImageSrc since it is now in Event.php 2016-10-20 11:52:01 -04:00
Isaac Connor fc540786a5 Move login by auth hash out of actions.php and into index.php. Double quotes to single quotes and google code style changes in indx.php 2016-10-20 11:51:42 -04:00
Isaac Connor c795dd7568 double quotes to single quotes, remove some includes, slight efficiency gains and better error reporting when the .mp4 doesn't exist. 2016-10-20 11:50:13 -04:00
Isaac Connor 017085aee7 Use proper rounding instead of sprintf based rounding for fps 2016-10-20 11:49:35 -04:00
Isaac Connor 1422f9d679 Merge pull request #1657 from knnniggett/fast_delete 
change fast_delete to off
 2016-10-20 10:18:30 -04:00
Andrew Bauer 191efed8e3 change fast_delete to off - fixes #1597 2016-10-19 14:10:28 -05:00
Steve Gilvarry b723e08b17 Merge pull request #1646 from connortechnology/fix_zm_image_memleak 
move jpeg context freeing to a Deinitialise function instead of ~Image
 2016-10-20 05:33:01 +11:00
Steve Gilvarry 3994de1b91 Merge pull request #1583 from zhuykovkb/fix_wrong_doc_root 
fixed wrong doc root
 2016-10-20 05:31:21 +11:00
Steve Gilvarry 0409ae5582 Merge pull request #1652 from connortechnology/fix_popup 
handle when window.open fails
 2016-10-20 05:17:44 +11:00
Steve Gilvarry 11cc73f55d Merge pull request #1651 from connortechnology/fix_disable_monitor 
Fix logic when disabling a monitor
 2016-10-20 05:16:22 +11:00
Steve Gilvarry c78a543e8e Merge pull request #1475 from connortechnology/htmlselect 
introduce htmlselect as an alternative to buildselect
 2016-10-20 05:05:59 +11:00
Isaac Connor 8a6105ee5b Merge pull request #1656 from pliablepixels/169-tz 
added TimeZone get API
 2016-10-18 16:08:55 -04:00
Pliable Pixels 192d0dbb45 added TimeZone get API 2016-10-18 14:07:31 -04:00
Isaac Connor de9c5a3bed add in missing break 2016-10-18 10:20:42 -04:00
Isaac Connor 573c712fc2 Merge ../ZoneMinder.connortechnology into storageareas 2016-10-18 09:50:34 -04:00
Isaac Connor 420d141bc7 split the reading of max fps and alarm max fps to remove an extra atof and make them more understandable 2016-10-18 09:50:01 -04:00
Isaac Connor 85faa7321c reorder if logic to handle first page load before AuthHash has ever been set. 2016-10-17 13:12:13 -04:00
Isaac Connor b731cd1a4c Merge ../ZoneMinder.connortechnology into storageareas 2016-10-12 16:17:51 -04:00