99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
3b9bb6053c
Add clarifying comment
2015-08-17 22:10:39 -04:00
9351e1b9d9
Incorporate exif switch
2015-08-17 22:07:41 -04:00
3b3ae0adf5
This will be used from now on when generating master snapshots for ubuntu1504 for a single zoneminder.deb
...
It was taken from the debian official package on August 17th 2015. Various unneeded patches were removed
and the dependencies were change to use the ffmpeg version of av libraries. Also, since ubuntu1504 does not have cakephp 2 available
we cannot use a packaged version of that, so we still need our own copy for the api
2015-08-17 14:03:27 -04:00
75bdc0d2e1
Delete connect
...
deleted rouge file.
2015-08-17 12:33:16 -05:00
3462b0e0ab
content for server edit popup
2015-08-17 12:42:20 -04:00
6bd038cb29
don't add the api to autotools, because the autotools files are not present in there
2015-08-17 12:33:00 -04:00
7eb07dbb65
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-17 12:30:54 -04:00
87bb60d829
Merge pull request #1019 from schrorg/dark-css-fixes
...
Small dark CSS fixes in frames and timeline view
2015-08-17 07:59:23 -05:00
e390200824
Small dark CSS fixes in frames and timeline view
2015-08-17 14:39:41 +02:00
ae9c38cfe8
bump version to 1.28.102
2015-08-16 17:57:31 -05:00
c17de4a00f
add Exif checkbox to monitor
2015-08-16 17:56:03 -05:00
3489d0d734
add Exif column to sql database
2015-08-16 17:43:45 -05:00
59c1b83d4f
create embed_exif flag in Monitor class
2015-08-16 17:42:12 -05:00
a8248c3f32
Merge pull request #1018 from knnniggett/new_group_permission
...
New User Permission "Groups"
2015-08-16 16:39:39 -04:00
32f6c92b02
replace php short open tag
2015-08-16 12:29:03 -05:00
8e491475d1
typos and whitespace fixes
2015-08-16 12:45:45 -04:00
4f07279d25
include server.php in autotools build
2015-08-16 12:25:23 -04:00
7d8bdd73f9
add api dir to autotools build
2015-08-16 12:23:32 -04:00
5b2155f551
define Groups permission for the default user
2015-08-15 16:47:07 -05:00
461f81089b
change table name from monitors to users
2015-08-15 15:42:00 -05:00
36c7d7f9c2
Add Group Edit permission to the default admin account
2015-08-15 14:58:41 -05:00
0dc35553ef
modify group delete action
2015-08-15 14:03:11 -05:00
c53bb7f56f
change edit permission from system to groups
2015-08-15 13:45:43 -05:00
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
c051f3482b
add Groups to options again
2015-08-15 12:37:25 -05:00
1d97e9d1f9
Add Groups column to options
2015-08-15 12:24:48 -05:00
c828a3df33
typo
2015-08-15 12:13:35 -05:00
85e2b165b1
bump version to 1.28.101
2015-08-15 12:01:57 -05:00
936aa00a5e
add sql bits
2015-08-15 12:00:48 -05:00
2770e752b4
create new permission group "Groups" in php
2015-08-15 11:56:51 -05:00
28bbcbb2d9
Merge pull request #1016 from knnniggett/score
...
Fix issue with score values less than 0
2015-08-14 08:51:47 -04:00
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
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
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
Linwood-F
Isaac Connor
Andrew Bauer
Robin Daermann
Andrew Bauer
Isaac Connor
Pliable Pixels
SteveGilvarry