461f81089b
change table name from monitors to users
2015-08-15 15:42:00 -05:00
199795a67d
new content
2015-08-15 16:05:02 -04: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
53d3050e78
content updates
2015-08-15 11:57:03 -04:00
f77d0eda22
content updates
2015-08-15 11:56:08 -04:00
58f86c03fa
For future use
2015-08-14 20:28:31 -04:00
71b82ac84a
ZM Developer notes for review in red
2015-08-14 20:28:03 -04:00
1ccc127d72
Template for a custom style for future use
2015-08-14 20:27:44 -04:00
7e24cbebd1
Completed ubuntu package install instructions
2015-08-14 20:00:11 -04:00
cd6c2a5763
Updated screenshot
2015-08-14 19:59:47 -04:00
2ea8d68fa7
content updated
2015-08-14 11:53:23 -04:00
69c7e0f556
content updated
2015-08-14 11:19:16 -04:00
38caa4df3c
content updated
2015-08-14 10:28:28 -04:00
10d8d4ea93
content updates
2015-08-14 09:29:09 -04:00
ce704bf596
content update
2015-08-14 09:20:59 -04:00
35580cf787
Fixed heading hierarchy of API so they all don't show in master TOC
2015-08-14 08:56:28 -04:00
2b09afdcd0
FAQ is now the same as Wiki FAQ with sphinx format conversion
2015-08-14 08:55:38 -04: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
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
Andrew Bauer
PliablePixels
Isaac Connor
Andrew Bauer
Pliable Pixels
SteveGilvarry
Robin Daermann
Linwood-F