5b0288e5f5
use frame_type instead of score in conditional
2015-08-14 07:03:08 -05:00
19174adfa1
add frame_type to debug message
2015-08-13 20:47:14 -05:00
b69fd1e86d
configure apache to follow symlinks so it find nph-zms
2015-08-13 20:23:52 -05:00
14dabb095c
set scroe to zero if less than zero
2015-08-13 18:06:20 -05:00
415521477c
Merge pull request #1012 from pliablepixels/patch-1
...
Explained a caveat with using relative times
2015-08-13 14:29:45 -05:00
6f3ee49d4a
Explained a caveat with using relative times
2015-08-13 15:17:48 -04:00
e10bcc55a7
Update README.md
...
spelling
2015-08-13 08:40:16 -05:00
95087beeb9
use return value of stat instead of just checking errno. This has the added benefit of catching other errors when stating
2015-08-12 11:00:41 -04:00
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
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
dff624a42c
Merge pull request #985 from ZoneMinder/fix_state_load
...
fix #948 1
2015-08-11 10:45:16 -05:00
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
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
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
68351c29b9
Update to ffmpeg 2.7.2 in travis build
2015-08-11 22:12:45 +10:00
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
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
3368d4f474
Removed untranslated "Font size" from language files, corrected white
...
space and make font size a const int
2015-08-10 15:35:19 +02:00
078e18e6c5
Add label size to monitor options (frontend part)
...
This commit adds the option "Font size" to monitor options in the
timestamp panel. Includes translations of "Font size" for german
(de_de), french (fr_fr) and spanish (es_es). All other language files
contain the english text.
2015-08-10 15:35:19 +02:00
7f3a07f21b
Add label size to monitor options (database and backend part)
...
This commit bumps version to 1.28.101 because of database schema change
2015-08-10 15:35:18 +02:00
af5fd5890b
Fix redalert.wav symlinks
2015-08-10 08:13:37 -05:00
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
c4599cdeda
Fix bug report on 100% scale 2
2015-08-09 20:30:42 -04:00
938a2e7de2
Fix bug report on 100% scale
2015-08-09 20:14:33 -04:00
4fedb5fce0
Fix typo in last commit
2015-08-09 18:41:12 -04:00
6da8da9d8d
Add ability to do either height or width or both
2015-08-09 18:19:12 -04:00
3b5638e54d
Fix omitted reference to gif file
2015-08-09 13:12:45 -04:00
6425df76c7
Switch to the standard routine in web functions include for auth
2015-08-09 13:10:43 -04:00
7a76cb3df1
Add security for those using authorization
2015-08-09 12:24:04 -04:00
6aca6c8d26
Demote user auth info message to debug
2015-08-09 12:16:01 -04:00
34c2902570
Add scale as optional feature to image.php
2015-08-09 12:02:13 -04:00
9d7dc0d81b
Safari compatibility changes
2015-08-07 23:27:26 -04:00
bf655b6656
Corrections from askers testing.
2015-08-07 22:26:03 -04:00
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
2b0a975fef
Bumped up # of events per API to 100 instead of 25
2015-08-07 16:25:48 -04:00
38799050ef
APIs will be served only if user is logged into the ZM portal
2015-08-07 16:14:02 -04:00
3ce365ea8c
Tweaks to live display to remove sliders in fit mode and general fixes
2015-08-06 15:42:04 -04:00
5a0d0ca5a3
Made large font selectable by a constant
2015-08-06 17:42:52 +02:00
c733fec476
First (working) steps for adding large timestamp to images
2015-08-06 14:43:10 +02:00
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
37e01b504b
Implemented #989 (highlight current row in tables) for dark CSS
2015-08-05 14:36:07 +02:00
2e1a145eb0
Merge pull request #989 from onlyjob/CSS
...
CSS[skins/classic]: highlight current row in tables.
2015-08-04 21:15:09 -04:00
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
4c8d7d7f62
quiet error when no Servers in Servers table
2015-08-04 11:48:04 -04:00
e178e1b1d6
fix #948 1
2015-08-04 11:37:11 -04:00
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
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
278434ec3f
Fix regression in last commit where ALL not working
2015-08-03 22:00:00 -04:00
546b0dd353
Remove shared data warning for purpose query only
2015-08-03 20:37:17 -04:00
2538514d18
Change from info to debug
2015-08-03 18:39:14 -04:00
Andrew Bauer
Andrew Bauer
Pliable Pixels
Isaac Connor
Isaac Connor
SteveGilvarry
Robin Daermann
Linwood-F
Pliable Pixels
Dmitry Smirnov