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 |
|
Pliable Pixels
|
762e3eddc9
|
Updated mobile with correct info
|
2015-08-16 13:26:05 -04:00 |
|
PliablePixels
|
71e19f48e8
|
Content update
|
2015-08-16 05:34:00 -04:00 |
|
PliablePixels
|
199795a67d
|
new content
|
2015-08-15 16:05:02 -04: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 |
Andrew Bauer
|
b69fd1e86d
|
configure apache to follow symlinks so it find nph-zms
|
2015-08-13 20:23:52 -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 |