Commit Graph

5184 Commits

Author SHA1 Message Date
Andrew Bauer 0c872c292f Merge pull request #1201 from ZoneMinder/fix_zmaudit_monitors_starting_with_a_digit
Skip directories that have non-digits in them
2015-12-31 07:15:33 -06:00
Andrew Bauer e6e8a75b64 Update zoneminder.f23.spec 2015-12-27 11:48:53 -06:00
Isaac Connor 66a828b4d4 Merge pull request #1202 from SteveGilvarry/MissingRTDTheme
Missing rtd theme
2015-12-23 14:05:36 -05:00
SteveGilvarry abda4411e9 Revert to Default Theme, RTD will use their own and local builds default sphinx theme 2015-12-23 19:34:31 +11:00
SteveGilvarry 6e567e2878 Merge remote-tracking branch 'upstream/master' 2015-12-23 19:29:14 +11:00
Isaac Connor 39bcb20dac Skip directories that have non-digits in them 2015-12-22 12:59:37 -05:00
Isaac Connor b33c0764fe update to new cgi-bin path 2015-12-21 12:59:52 -05:00
Isaac Connor 48bccc7963 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-12-21 12:55:50 -05:00
Steve Gilvarry 55cd097e5f Merge pull request #1200 from pliablepixels/documentation
Updated mobile app info
2015-12-21 08:54:29 +11:00
arjunrc 6ccf36bc77 updated mobile app info 2015-12-20 14:55:48 -05:00
Isaac Connor f4debc203d Only run zmupdate.pl if the mysql db is located here 2015-12-20 12:23:40 -05:00
Isaac Connor 9743bad13f Add a valid config if a person is using mod_fcgid instead of mod_php 2015-12-20 12:21:18 -05:00
Isaac Connor 4ef35c8c70 No need for a cgi-bin link 2015-12-20 11:23:01 -05:00
Isaac Connor 9c2707deba update paths to /usr/share/zoneminder/www and /usr/lib/zoneminder/cgi-bin 2015-12-20 11:22:12 -05:00
Isaac Connor 37212dcf2e Merge pull request #1196 from pliablepixels/api-more-security
Api more security
2015-12-20 10:22:40 -05:00
SteveGilvarry 9acc0c34ed Merge remote-tracking branch 'upstream/master' 2015-12-20 14:09:26 +11:00
arjunrc 6e606aa74b removed issue # 2015-12-19 19:04:27 -05:00
arjunrc 38b4785557 PP - Gone,flitted away, Taken the starts from the night and sun, From the day! Gone, and a cloud in my heart. - Tennyson 2015-12-19 18:36:38 -05: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 c4461c328e initial user role support 2015-12-19 17:45:03 -05:00
arjunrc b4fdaa9b4d initial user role support 2015-12-19 17:44:46 -05:00
arjunrc e812398fb9 initial user role support 2015-12-19 17:44:39 -05:00
arjunrc f56688e7c2 initial user role support 2015-12-19 17:44:16 -05:00
arjunrc 028c9b956c check for opt_use_api, also pull in user roles support 2015-12-19 17:44:02 -05:00
arjunrc 27b1b37d5b added opt_use_api 2015-12-19 17:43:36 -05: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