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

4794 Commits

Author SHA1 Message Date
Isaac Connor 99d674ef78 remove code that put a * next to the server name. It was copied from the user list and indicated the logged in user. 2015-08-16 12:22:31 -04:00
Isaac Connor b3240bbc8f set name=action on submit tag, and remove stuff that we don't want right now 2015-08-16 12:21:52 -04:00
Isaac Connor c0517b11ae Merge branch 'master' into multi-server 2015-08-16 10:52:51 -04:00
Isaac Connor 9117e2949a add server.php. 2015-08-16 10:52:47 -04:00
Isaac Connor 28bbcbb2d9 Merge pull request #1016 from knnniggett/score 
Fix issue with score values less than 0
 2015-08-14 08:51:47 -04:00
Andrew Bauer 5b0288e5f5 use frame_type instead of score in conditional 2015-08-14 07:03:08 -05:00
Andrew Bauer 19174adfa1 add frame_type to debug message 2015-08-13 20:47:14 -05:00
Andrew Bauer b69fd1e86d configure apache to follow symlinks so it find nph-zms 2015-08-13 20:23:52 -05:00
Andrew Bauer 14dabb095c set scroe to zero if less than zero 2015-08-13 18:06:20 -05:00
Andrew Bauer 415521477c Merge pull request #1012 from pliablepixels/patch-1 
Explained a caveat  with using relative times
 2015-08-13 14:29:45 -05:00
Pliable Pixels 6f3ee49d4a Explained a caveat with using relative times 2015-08-13 15:17:48 -04:00
Andrew Bauer e10bcc55a7 Update README.md 
spelling
 2015-08-13 08:40:16 -05:00
Andrew Bauer 66ec84fdea Merge pull request #1008 from pliablepixels/993-API-Auth 
Included logic to not enforce authentication in API layer if ZM auth is off
 2015-08-11 14:51:02 -05:00
Pliable Pixels a64f7c0036 Included logic to not enforce authentication in API layer if ZM_OPT_USE_AUTH is disabled 
If ZM auth is off, API won't work. Changed this to make sure API disables auth if ZM disables auth
 2015-08-11 14:47:49 -04:00
Andrew Bauer dff624a42c Merge pull request #985 from ZoneMinder/fix_state_load 
fix #948 1
 2015-08-11 10:45:16 -05:00
Andrew Bauer 882bf76750 Merge pull request #986 from ZoneMinder/fix_948_3 
quiet error when no Servers in Servers table
 2015-08-11 10:45:04 -05:00
Isaac Connor 495d7ad374 Merge pull request #1001 from Linwood-F/1000-add-scale-feature-to-image-php 
Add scale as optional feature to image.php
 2015-08-11 11:37:40 -04:00
Andrew Bauer fcc1f9705f Merge pull request #1007 from SteveGilvarry/update_ffmpeg_travis 
Update to ffmpeg 2.7.2 in travis build
 2015-08-11 07:35:36 -05:00
SteveGilvarry 68351c29b9 Update to ffmpeg 2.7.2 in travis build 2015-08-11 22:12:45 +10:00
Isaac Connor 3e5170678e Merge pull request #1006 from pliablepixels/993-API-Auth 
I was using the wrong field to check for portal authentication
 2015-08-10 15:58:50 -04:00
Pliable Pixels f7025aaa26 I was using the wrong field to check for portal authentication 
Should be user.Username instead of username
 2015-08-10 15:55:44 -04:00
Andrew Bauer af5fd5890b Fix redalert.wav symlinks 2015-08-10 08:13:37 -05:00
Isaac Connor b6eae38c05 Merge pull request #1003 from Linwood-F/1002-demote-auth-message-to-debug 
Demote user auth info message to debug
 2015-08-10 08:46:19 -04:00
Linwood-F c4599cdeda Fix bug report on 100% scale 2 2015-08-09 20:30:42 -04:00
Linwood-F 938a2e7de2 Fix bug report on 100% scale 2015-08-09 20:14:33 -04:00
Linwood-F 4fedb5fce0 Fix typo in last commit 2015-08-09 18:41:12 -04:00
Linwood-F 6da8da9d8d Add ability to do either height or width or both 2015-08-09 18:19:12 -04:00
Linwood-F 6aca6c8d26 Demote user auth info message to debug 2015-08-09 12:16:01 -04:00
Linwood-F 34c2902570 Add scale as optional feature to image.php 2015-08-09 12:02:13 -04:00
Andrew Bauer 95ca7d8256 Merge pull request #996 from pliablepixels/995-Events-count-per-API 
995 events count per api (bumps up # of events reported per API call)
 2015-08-07 15:42:50 -05:00
Pliable Pixels 2b0a975fef Bumped up # of events per API to 100 instead of 25 2015-08-07 16:25:48 -04:00
Pliable Pixels 38799050ef APIs will be served only if user is logged into the ZM portal 2015-08-07 16:14:02 -04:00
Isaac Connor 485cf88120 Merge pull request #990 from schrorg/dark-css 
Implemented #989 (highlight current row in tables) for dark CSS
 2015-08-05 09:50:36 -04:00
Robin Daermann 37e01b504b Implemented #989 (highlight current row in tables) for dark CSS 2015-08-05 14:36:07 +02:00
Isaac Connor 2e1a145eb0 Merge pull request #989 from onlyjob/CSS 
CSS[skins/classic]: highlight current row in tables.
 2015-08-04 21:15:09 -04:00
Dmitry Smirnov c4f78d634c CSS[skins/classic]: highlight current row in tables. 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-08-05 10:43:02 +10:00
Isaac Connor 4c8d7d7f62 quiet error when no Servers in Servers table 2015-08-04 11:48:04 -04:00
Isaac Connor e178e1b1d6 fix #948 1 2015-08-04 11:37:11 -04:00
Isaac Connor d9ee08a27b Merge pull request #983 from Linwood-F/982-demote-terminating-logger-msg-to-debug 
Change from info to debug
 2015-08-04 10:12:08 -04:00
Isaac Connor a36bee3767 Merge pull request #984 from Linwood-F/507-shared-data-for-purpose-query-warning 
Remove shared data warning for purpose query only
 2015-08-04 10:09:59 -04:00
Linwood-F 546b0dd353 Remove shared data warning for purpose query only 2015-08-03 20:37:17 -04:00
Linwood-F 2538514d18 Change from info to debug 2015-08-03 18:39:14 -04:00
Andrew Bauer 09d2162f1b Merge pull request #980 from ZoneMinder/fix_image_dimensions_check 
Fix image dimensions check
 2015-07-31 09:40:18 -05:00
Isaac Connor abd4ee6ca8 Merge branch 'master' into fix_image_dimensions_check 2015-07-31 10:30:31 -04:00
Isaac Connor 46b9bd5d1c change the captured image size to camera image size check to be a > instead of !=. As long as we have enough buffer space, it doesn't matter if the captured image is smaller than what we defined. 2015-07-31 10:29:53 -04:00
Andrew Bauer 2dcc118deb Merge pull request #967 from schrorg/dark-css 
Dark CSS for classic theme
 2015-07-30 07:18:42 -05:00
Robin Daermann 651cffd3b5 Small color corrections in tabList 2015-07-27 10:07:01 +02:00
Robin Daermann 14ebd937c7 Added missing javascript file to Makefile.am 2015-07-27 09:53:59 +02:00
Robin Daermann 57843cc0c8 Added new Makefiles to configure.ac for dark CSS 2015-07-27 09:53:59 +02:00
Robin Daermann 5588406570 Add dark CSS for classic view 2015-07-27 09:53:59 +02:00