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

12155 Commits

Author SHA1 Message Date
Isaac Connor 6691b5fb52 Include CORS headers when there is a Server defined, instead of requiring there to be more than 1 2018-10-29 12:50:50 -04:00
Isaac Connor d85a02be63 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-29 11:13:44 -04:00
Isaac Connor 9a2d58adce We don't store all the permissions in the session anymore. We just use the global user object 2018-10-29 11:03:03 -04:00
Isaac Connor 95a6d0666a Improve behaviour and reduce extra logging when db goes away 2018-10-29 09:59:26 -04:00
Andrew Bauer 32e4b3ce25
Merge pull request #2278 from mnoorenberghe/patch-2 
Document /api/monitors/daemonStatus/
 2018-10-29 08:56:12 -05:00
Matt N 0d1f8aaf03
Document /api/monitors/daemonStatus/ 2018-10-28 17:15:39 -07:00
Isaac Connor aaeb30a72f Move license down to perldocs at bottom. Remove unecessary line feeds and spaces 2018-10-28 17:50:22 -04:00
Isaac Connor 33235a19ba Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2018-10-28 15:11:32 -04:00
Isaac Connor 9e999294df Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2018-10-28 15:09:32 -04:00
Isaac Connor 91d83a89fa include semaphore function replacements 2018-10-25 15:40:12 -04:00
Isaac Connor 3f34593c82 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-25 11:24:42 -04:00
Isaac Connor 349693e27d Add a missing comma 2018-10-25 11:24:23 -04:00
Isaac Connor d025adab6d Need to load Config Categories in options save 2018-10-25 09:13:07 -04:00
Damir Merdan d0080684b8 Bosnian translation (#2266) 
* Zoneminder bosnian translation

Hi,

this is a bosnian translation for zoneminder, but it can be used as croatian and serbian translation too

* Delete BA_ba.php

* Bosnian translation

80% translated, tested on my Zoneminder v1.30.4 installation and is looking good. ZmNinja also translated into Bosnian lagnuage.
 2018-10-24 13:52:32 -04:00
Isaac Connor ed50856d40 Merge branch 'master' into storageareas 2018-10-24 13:45:54 -04:00
Isaac Connor bca2b30518 Add a test for channel layout and correct it if not set 2018-10-24 13:45:33 -04:00
Isaac Connor c48ce09068 Turn back on ffmpeg debug logging 2018-10-24 13:11:09 -04:00
Isaac Connor 9148d3f7c4 Merge branch 'zone_point_buttons' into storageareas 2018-10-24 12:44:21 -04:00
Isaac Connor 15f89c4b50 Turn ffmpeg logging back on 2018-10-24 12:44:14 -04:00
Isaac Connor 9cf31eafa0 Use a button element instead of an anchor tag for plus and minus point buttons. Cleanup dead code 2018-10-24 12:43:43 -04:00
Isaac Connor 875bc3caf9 Merge branch 'master' into storageareas 2018-10-24 10:17:27 -04:00
Isaac Connor ca8770bd5a Merge branch 'fix_rce' into storageareas 2018-10-24 10:17:16 -04:00
Isaac Connor 6488122862 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-24 10:03:11 -04:00
Isaac Connor 115141bf9f add caching to Group::find 2018-10-24 10:02:42 -04:00
Isaac Connor 2024df4393 use json_encode/decode instead of serialize/unserialize to pass onvif probe results around. Also clean up some code/ add some missing things. Fixes #2271 and #2272 2018-10-24 09:49:56 -04:00
raTmole 18850d8779 API getVersion Fix -> Undefined variable: eTagMatches... (#2268) 
see https://github.com/cakephp/cakephp/issues/12536
 2018-10-23 07:58:07 -04:00
Isaac Connor 86b0e4ea18 fix auth_hash. Should use generateAuthHash instead of accessing session directly 2018-10-22 18:32:39 -04:00
Isaac Connor 9938346752 Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder 2018-10-22 16:14:36 -04:00
Isaac Connor 7b69bc4292 Merge branch 'master' of github.com:/connortechnology/ZoneMinder 2018-10-22 16:13:55 -04:00
Isaac Connor f4ddc0fe9b ob_clcean and flush break outputting the image 2018-10-22 16:13:12 -04:00
Isaac Connor ccd64b0fae Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-22 14:21:34 -04:00
Isaac Connor 7e4c54fec0 Use proper buttons and remove extra bootstrap styles from buttons so that they aren't all jammed together 2018-10-22 13:54:27 -04:00
Isaac Connor 0f14df64e2 google code style and whitespace 2018-10-22 10:41:27 -04:00
Isaac Connor 559f34a838 User Monitor->Url() instead of Monitor->Server->Url() which will append port # 2018-10-20 14:33:09 -04:00
Isaac Connor 069f67a10f Break some long lines 2018-10-20 14:32:58 -04:00
Isaac Connor c9c46aa12d User Monitor->Url() instead of Monitor->Server->Url() which will append port # 2018-10-20 14:32:25 -04:00
Isaac Connor f5eca2da1e No longer need to add thisUrl to monitorUrl 2018-10-20 11:37:36 -04:00
Isaac Connor 3237a10d0a Merge branch 'master' of github.com:zoneminder/ZoneMinder 2018-10-20 11:36:45 -04:00
Isaac Connor 8878397622 fix spacing 2018-10-20 11:36:25 -04:00
Isaac Connor c47b4a5a04 Merge branch 'improve_config_efficiency' into storageareas 2018-10-19 15:03:00 -04:00
Isaac Connor 530a53f138 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-19 15:02:31 -04:00
Isaac Connor 3723f7acb3 comment out redundatn code increasing load on server 2018-10-19 15:02:10 -04:00
Isaac Connor 4c7fe8741b Load the complete config info only for options 2018-10-19 15:00:47 -04:00
Isaac Connor e30b100e8e Don't load & process categories in initial config loading 2018-10-19 15:00:30 -04:00
Isaac Connor 17a5519dd6
Include the remoteAddr in the session authhash cache, so that a change of ip won't allow the same useless auth hash. (#2264) 2018-10-19 13:39:37 -04:00
Isaac Connor 98579fc02a Merge branch 'master' into storageareas 2018-10-19 11:27:43 -04:00
Isaac Connor f9b1453705 Include SERVER_PORT when not doing multi-server or multi-port but are running on a port other than 80. 2018-10-19 10:59:16 -04:00
Isaac Connor 23fd5db5c8 fix #2265 extra graphics in url 2018-10-19 10:06:51 -04:00
Isaac Connor e7ec2faccd monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url 2018-10-18 20:33:50 -04:00
Isaac Connor 4fdac25ae1 remove blank last line 2018-10-18 09:20:15 -04:00