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

5161 Commits

Author SHA1 Message Date
SteveGilvarry 9acc0c34ed Merge remote-tracking branch 'upstream/master' 2015-12-20 14:09:26 +11:00
Steve Gilvarry 66ec7d74fd Merge pull request #1194 from pliablepixels/documentation 
All checks out fine on my RTD instance so merging
 2015-12-20 09:53:14 +11:00
arjunrc cbea550d70 custom theming for ZM 2015-12-19 16:53:47 -05:00
arjunrc c4bdb127ce fixed custom style breaking rtd theme 2015-12-19 16:53:30 -05:00
Andrew Bauer 88ae78ed3c Merge pull request #1190 from SteveGilvarry/libvlc_segfault 
Fixes #1179 Libvlc Live555 Segmentation Fault
 2015-12-19 15:44:28 -06:00
arjunrc 2763c3d92e deleted 2015-12-19 13:40:21 -05:00
arjunrc 3fe64f8ce6 rtd theme 2015-12-19 13:38:54 -05:00
SteveGilvarry def5d5552a Merge remote-tracking branch 'upstream/master' 2015-12-20 01:56:55 +11:00
Steve Gilvarry 28d7e3d59c Merge pull request #1033 from knnniggett/maxfps 
add warning and help text for maxfps fields
 2015-12-20 01:50:48 +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
Steve Gilvarry ff4a1743b2 Merge pull request #1193 from pliablepixels/documentation 
Documentation updated for ubuntu
 2015-12-19 14:12:15 +11:00
Steve Gilvarry e3d634e53e Merge pull request #1182 from ZoneMinder/one_eighth 
add a 1/8th scale option, which is useful for 1920x1080 streams
 2015-12-19 14:07:18 +11:00
SteveGilvarry 01dd4ac67a Merge remote-tracking branch 'upstream/master' 2015-12-19 13:49:52 +11:00
arjunrc b444061cc6 removed -master from ppa - when 1.29 releases it will be stable 2015-12-18 15:11:05 -05:00
arjunrc 511421bff1 rewrite 2015-12-18 15:08:56 -05:00
arjunrc 9e2b1ba3cb remove hardcoded version 2015-12-18 15:08:40 -05:00
Isaac Connor 983d87f69b increase height and width of groups window to fit buttons in 2015-12-18 13:34:44 -05:00
Isaac Connor ca45ac23fa increase height of group edit window 2015-12-18 13:30:42 -05:00
SteveGilvarry af76d19646 Add a constrained namespace implementation around Authenticator class to prevent conflict with libvlc live555. 2015-12-18 01:47:10 +11:00
SteveGilvarry 8f272137e6 Merge remote-tracking branch 'upstream/master' 2015-12-17 09:23:40 +11:00
Isaac Connor 53dec9f26d check for setting of __REQUEST['object'] to silence php NOTICE 2015-12-09 10:43:23 -05:00
Isaac Connor ac23efebef Merge pull request #1184 from ZoneMinder/TV-IP862_new_firmware 
Add code to detect the change in REALM from older to newer firmware
 2015-12-09 10:36:27 -05:00
Isaac Connor 7c298c58ed Add code to detect the change in REALM from older to newer firmware 2015-12-08 16:20:38 -05:00
Isaac Connor d6b2e1959f add a 1/8th scale option, which is useful for 1920x1080 streams 2015-12-08 08:40:44 -05:00
Isaac Connor cb14a12325 Merge pull request #1176 from SteveGilvarry/zmupdate_fix 
Partial fix for #1167
 2015-12-07 09:53:41 -05:00
SteveGilvarry 709cf07fa9 Merge remote-tracking branch 'upstream/master' 2015-12-05 16:07:45 +11:00
Andrew Bauer ec60e6e18f Merge pull request #1180 from ZoneMinder/zms_socket_lock 
Zms socket lock
 2015-12-04 15:48:49 -06:00
Isaac Connor 0fc68e2e91 delete lock when we are done with it 2015-12-04 16:38:24 -05:00
Isaac Connor be36301779 use exclusive lock, add includes 2015-12-04 16:35:27 -05:00
Isaac Connor e637915823 add a lock around the socket creating/deleting. 2015-12-04 15:39:37 -05:00
Isaac Connor 11a808556b Merge pull request #1178 from knnniggett/submodulecheck 
Check for the presence of CrudControllerTrait.php instead of .git
 2015-12-04 13:09:03 -05:00
Andrew Bauer 1957c5672f Check for the presence of CrudControllerTrait.php instead of .git 2015-12-04 12:03:18 -06:00
SteveGilvarry 5390605797 Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version 2015-12-03 10:23:19 +11:00
SteveGilvarry f4d0581eb5 Merge branch 'master' of https://github.com/SteveGilvarry/ZoneMinder 2015-12-03 09:59:28 +11:00
Steve Gilvarry d9e8f74298 Merge pull request #1173 from knnniggett/submodule 
Error on missing submodules
 2015-11-29 13:22:30 +11:00
Isaac Connor c2a7e0c587 fix size of monitor popup in flat skin 2015-11-25 15:39:46 -05:00
Andrew Bauer 91f700a7cd Update CMakeLists.txt 2015-11-23 10:10:56 -06:00
Isaac Connor 7d97ecb9c9 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-11-23 10:40:08 -05:00
Isaac Connor 4126f1f072 Merge pull request #1168 from knnniggett/swap_path 
fix mem alloc fault in zm_monitor.cpp
 2015-11-21 22:13:47 -05:00
Andy Bauer dabe32a593 Error on missing submodules 2015-11-21 18:21:18 -06:00
Steve Gilvarry 3112fe6279 Merge remote-tracking branch 'ZoneMinder/master' 2015-11-22 10:13:42 +11:00
Andy Bauer cbfdc5d88d rpm packaging updates 2015-11-21 15:23:13 -06:00
Andy Bauer e65f91d404 update rpm documentation 2015-11-21 15:18:43 -06:00
Andrew Bauer a9609d2a43 fix mem alloc fault in zm_monitor.cpp 2015-11-21 12:17:23 -06:00
Isaac Connor 37b041b561 add index to recommended default permissions on zmuser 2015-11-20 16:00:57 -05:00
Steve Gilvarry f01b0e84e8 Merge remote-tracking branch 'ZoneMinder/master' 2015-11-18 23:15:38 +11:00
Andy Bauer 9052274d0d Update rpm documentation to reference index permission 2015-11-17 12:20:51 -06:00
Kyle Johnson c0216f74cb Merge pull request #1164 from abishai/master 
compat for php 5.4.  Fixes #1163
 2015-11-16 09:28:03 -07:00
Kyle Johnson 5add10289b Merge pull request #1136 from pliablepixels/1135-events-API-prev-next 
added prev/next event ids
 2015-11-16 09:23:36 -07:00
Isaac Connor 7f5958d873 remove comma that shouldn't be there 2015-11-16 11:01:41 -05:00