Isaac Connor
|
a8248c3f32
|
Merge pull request #1018 from knnniggett/new_group_permission
New User Permission "Groups"
|
2015-08-16 16:39:39 -04:00 |
Pliable Pixels
|
e6061d53b3
|
Clarified mysql sleep is only needed for ubuntu 14.x and below
|
2015-08-16 15:13:28 -04:00 |
|
Pliable Pixels
|
2232b6b68b
|
Updated API to add security notes
|
2015-08-16 15:05:15 -04:00 |
|
Pliable Pixels
|
1c82f57ba3
|
Made content same as github README.md contributing
|
2015-08-16 14:49:44 -04:00 |
Andrew Bauer
|
32f6c92b02
|
replace php short open tag
|
2015-08-16 12:29:03 -05:00 |
|
Pliable Pixels
|
762e3eddc9
|
Updated mobile with correct info
|
2015-08-16 13:26:05 -04:00 |
Isaac Connor
|
8e491475d1
|
typos and whitespace fixes
|
2015-08-16 12:45:45 -04:00 |
|
Isaac Connor
|
4f07279d25
|
include server.php in autotools build
|
2015-08-16 12:25:23 -04:00 |
|
Isaac Connor
|
7d8bdd73f9
|
add api dir to autotools build
|
2015-08-16 12:23:32 -04:00 |
|
PliablePixels
|
71e19f48e8
|
Content update
|
2015-08-16 05:34:00 -04:00 |
|
Andrew Bauer
|
5b2155f551
|
define Groups permission for the default user
|
2015-08-15 16:47:07 -05:00 |
|
Andrew Bauer
|
461f81089b
|
change table name from monitors to users
|
2015-08-15 15:42:00 -05:00 |
|
PliablePixels
|
199795a67d
|
new content
|
2015-08-15 16:05:02 -04:00 |
|
Andrew Bauer
|
36c7d7f9c2
|
Add Group Edit permission to the default admin account
|
2015-08-15 14:58:41 -05:00 |
|
Andrew Bauer
|
0dc35553ef
|
modify group delete action
|
2015-08-15 14:03:11 -05:00 |
|
Andrew Bauer
|
c53bb7f56f
|
change edit permission from system to groups
|
2015-08-15 13:45:43 -05:00 |
|
Andrew Bauer
|
1d688be1a1
|
propagate canEditGroup permission
|
2015-08-15 13:22:13 -05:00 |
|
Andrew Bauer
|
c051f3482b
|
add Groups to options again
|
2015-08-15 12:37:25 -05:00 |
|
Andrew Bauer
|
1d97e9d1f9
|
Add Groups column to options
|
2015-08-15 12:24:48 -05:00 |
|
Andrew Bauer
|
c828a3df33
|
typo
|
2015-08-15 12:13:35 -05:00 |
|
Andrew Bauer
|
85e2b165b1
|
bump version to 1.28.101
|
2015-08-15 12:01:57 -05:00 |
|
Andrew Bauer
|
936aa00a5e
|
add sql bits
|
2015-08-15 12:00:48 -05:00 |
|
Andrew Bauer
|
2770e752b4
|
create new permission group "Groups" in php
|
2015-08-15 11:56:51 -05:00 |
|
PliablePixels
|
53d3050e78
|
content updates
|
2015-08-15 11:57:03 -04:00 |
|
PliablePixels
|
f77d0eda22
|
content updates
|
2015-08-15 11:56:08 -04:00 |
|
PliablePixels
|
58f86c03fa
|
For future use
|
2015-08-14 20:28:31 -04:00 |
|
PliablePixels
|
71b82ac84a
|
ZM Developer notes for review in red
|
2015-08-14 20:28:03 -04:00 |
|
PliablePixels
|
1ccc127d72
|
Template for a custom style for future use
|
2015-08-14 20:27:44 -04:00 |
|
PliablePixels
|
7e24cbebd1
|
Completed ubuntu package install instructions
|
2015-08-14 20:00:11 -04:00 |
|
PliablePixels
|
cd6c2a5763
|
Updated screenshot
|
2015-08-14 19:59:47 -04:00 |
|
PliablePixels
|
2ea8d68fa7
|
content updated
|
2015-08-14 11:53:23 -04:00 |
|
PliablePixels
|
69c7e0f556
|
content updated
|
2015-08-14 11:19:16 -04:00 |
|
PliablePixels
|
38caa4df3c
|
content updated
|
2015-08-14 10:28:28 -04:00 |
|
PliablePixels
|
10d8d4ea93
|
content updates
|
2015-08-14 09:29:09 -04:00 |
|
PliablePixels
|
ce704bf596
|
content update
|
2015-08-14 09:20:59 -04:00 |
|
PliablePixels
|
35580cf787
|
Fixed heading hierarchy of API so they all don't show in master TOC
|
2015-08-14 08:56:28 -04:00 |
|
PliablePixels
|
2b09afdcd0
|
FAQ is now the same as Wiki FAQ with sphinx format conversion
|
2015-08-14 08:55:38 -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 |