Commit Graph

14052 Commits

Author SHA1 Message Date
Isaac Connor 5b02bc76f4 Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly 2019-11-05 10:07:42 -05:00
Isaac Connor 5603fd70f8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-04 12:04:37 -05:00
Isaac Connor d218d2ee9f If the default server case, don't add the Url component. So this will return just the path, using whatever servername/port combo is currently in use. Fixes #2750 2019-11-04 12:04:23 -05:00
Isaac Connor 4e16e9052a
Merge pull request #2749 from pliablepixels/monitor_add_validation
add model validation so that we don't create empty monitors
2019-11-02 10:16:41 -04:00
Isaac Connor 9d8a230252 Prevent deletion of entire events directory when monitor has empty name 2019-11-02 10:12:43 -04:00
Pliable Pixels 16a6938710 add model validation so that we don't create empty monitors 2019-11-02 08:30:25 -04:00
Isaac Connor 54c11bc0d1 define monitor_options as an empty array instead of php implicitly dealing with it 2019-11-01 13:42:01 -04:00
Isaac Connor a20517a6db spacing 2019-11-01 13:41:37 -04:00
Isaac Connor 18c13c4bad Make chosen dropdowns 100% width on monitor edit 2019-11-01 13:40:55 -04:00
Isaac Connor eea4cf0924 add ParentGroup to language 2019-11-01 13:40:20 -04:00
Isaac Connor 968c28395d close group popup when saving 2019-11-01 13:39:40 -04:00
Isaac Connor 9a3bee28d2 add logging and handling of oninput and oninput-this 2019-11-01 13:38:09 -04:00
Isaac Connor 3653ad5ce3 update group editing, solving inline javascript problems and removing cruft 2019-11-01 13:37:52 -04:00
Isaac Connor 46991f04e6 better debugging when fail to sws_scale 2019-11-01 09:24:22 -04:00
Isaac Connor 8f327f23bd
Merge pull request #2746 from connortechnology/fix_2745
Fix 2745
2019-10-30 16:59:20 -04:00
Isaac Connor e0d085d187 CHeck for existence of snapshot.jpg or alarm.jpg instead of hitting the database. 2019-10-30 16:57:45 -04:00
Isaac Connor 21df2c6ac7 Always write snapshot.jpg and alarm.jpg instead of only when using video storage 2019-10-30 16:25:09 -04:00
Isaac Connor 3906999872 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-30 09:31:12 -04:00
Isaac Connor 276be8fa37 spacing and quotes 2019-10-30 09:26:17 -04:00
Isaac Connor 15d30b45c3 spacing and quotes 2019-10-30 09:25:55 -04:00
Isaac Connor e4256ddd90 Can't use tainting as SOAP::WDSL::Factory::Transport will fail 2019-10-30 09:22:00 -04:00
Isaac Connor 6ae220f756 improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript 2019-10-29 18:06:32 -04:00
Isaac Connor daf71aa492 improvements to layout on zones and zone 2019-10-29 18:06:03 -04:00
Isaac Connor 988b2183c3 use new ViewWIdth and ViewHeight functions to generate video stream. 2019-10-29 17:42:48 -04:00
Isaac Connor eb2269ea52 improve zone saving testing for value before doing math 2019-10-29 17:42:23 -04:00
Isaac Connor f2300f2e8c Add isPortrait and isLandscape functions. Rename Width and Height to ViewWidth and ViewHeight to return the rotated dimensions suitable for viewing 2019-10-29 17:39:12 -04:00
Isaac Connor 1e6abd7bbc enhance description of zmaudit, zmfilter 2019-10-23 14:45:25 -04:00
Isaac Connor 4f8c4e8abd Update schematic to remove zmf 2019-10-23 12:21:06 -04:00
Isaac Connor 9fdfb5944e Update schematic to remove zmf 2019-10-23 12:20:18 -04:00
Isaac Connor 4ceebcbfc2 remove zmf which no longer exists and add documentation for Event.pm, Filter.pm and the Control directory. Fixes #2732 2019-10-23 12:04:18 -04:00
Isaac Connor 417123019c fix crumbs 2019-10-23 09:52:36 -04:00
Isaac Connor 77118d55b2 add 4CIF aspect ratio padding. Fixes #2738 2019-10-23 09:50:49 -04:00
Isaac Connor 35ae81d985 dynamically allocate next_dts and use it in write_packet to store the next dts value. write_interleaved_packet destroys the passed in packet so we need to store next_dts before writing out the packet. 2019-10-23 09:25:16 -04:00
Isaac Connor 76fd32b427 more debug, and ensure that pts != AV_NOPTS_VALUE 2019-10-22 10:01:24 -04:00
Isaac Connor 66fa57d967 remove wheezy. It is EOL 2019-10-21 14:03:49 -04:00
Isaac Connor d036613776 Fix Server() not returning a ServerObject if not found when ServerId is null or 0 2019-10-21 13:45:27 -04:00
Isaac Connor 91651652c7 Only report an error for not finding the server if ServerId had a value 2019-10-21 13:41:32 -04:00
Isaac Connor 12dfcae81f remove debug 2019-10-21 13:19:20 -04:00
Isaac Connor 5c715ec96b fix use of printMsg in Netcat 2019-10-21 13:18:50 -04:00
Isaac Connor a486aafa48 spacing 2019-10-21 13:18:30 -04:00
Isaac Connor 3244c8ab5b spacing, quotes, remove debug 2019-10-21 13:18:09 -04:00
Isaac Connor 6c6b5076d6 Add eoan and wheezy 2019-10-21 11:39:15 -04:00
Isaac Connor 370f93c56a toto => to 2019-10-21 10:27:41 -04:00
Isaac Connor 4261550678 Change default css theme to base 2019-10-21 09:39:34 -04:00
Isaac Connor dfe2f55ebe More debugging to figure out #2720 2019-10-20 13:50:24 -04:00
Isaac Connor d9d91c4a8d Fix #2728 by resetting the frame size before reading from the fifo 2019-10-20 13:32:16 -04:00
Isaac Connor 2bf9852404 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-20 11:44:22 -04:00
Isaac Connor bf69e053b4 Add SNAPTSHOT=CURRENT to build with the commit # in the version string 2019-10-20 11:44:19 -04:00
Isaac Connor 943f054c1a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-10-20 11:42:34 -04:00
Isaac Connor c240767727 Add eoan to distros 2019-10-20 11:41:55 -04:00