Isaac Connor
|
dcf6a39bf6
|
split Event and Monitor into objects and use properties from appropriate object
|
2016-10-12 15:39:32 -04:00 |
|
Isaac Connor
|
c2911ae756
|
better debug in deletePath
|
2016-10-12 15:38:59 -04:00 |
|
Isaac Connor
|
3baa64aa52
|
add caller info to log when a bad argument is passed to event constructor
|
2016-10-12 15:38:40 -04:00 |
|
Isaac Connor
|
bf4bbf8b8d
|
use object methods for event deletion. Main benefit is error message when deleting
|
2016-10-12 15:36:40 -04:00 |
|
Isaac Connor
|
ba7d935a85
|
fix border size of text below the image in montage when alerted.
|
2016-10-12 12:19:04 -04:00 |
|
Isaac Connor
|
5b8b9c5345
|
merge update
|
2016-10-12 09:24:10 -04:00 |
|
Isaac Connor
|
b4f065eb75
|
Convert event view to use Objects
|
2016-10-12 09:17:57 -04:00 |
|
Isaac Connor
|
b00588b6ff
|
add back montagereview
|
2016-10-11 17:35:41 -04:00 |
|
Isaac Connor
|
0903ef294f
|
quick for to make MontageReview work
|
2016-10-11 17:35:28 -04:00 |
|
Isaac Connor
|
0358476ac0
|
Merge branch 'fix_popup' into storageareas
|
2016-10-11 12:19:38 -04:00 |
|
Isaac Connor
|
743e8c59f9
|
google code style and double to single quotes
|
2016-10-11 12:11:59 -04:00 |
|
Isaac Connor
|
0c956d6728
|
fix logic when disabling a monitor
|
2016-10-11 12:11:33 -04:00 |
|
Isaac Connor
|
ded1e0ea73
|
handle when window.open fails
|
2016-10-11 11:48:29 -04:00 |
|
Isaac Connor
|
96b5af9021
|
Merge branch 'fix_onvif' into storageareas
|
2016-10-04 15:00:28 -04:00 |
|
Isaac Connor
|
ac24865647
|
add NoDetectProfiles instead of reusing NoDetectedCameras
|
2016-10-04 14:33:51 -04:00 |
|
Isaac Connor
|
6814bcc791
|
add NoDetectProfiles instead of reusing NoDetectedCameras
|
2016-10-04 14:33:38 -04:00 |
|
Isaac Connor
|
09c5e3012a
|
username and password don't actually have to be specified
|
2016-10-04 14:09:32 -04:00 |
|
Isaac Connor
|
21a94a6200
|
better error message
|
2016-10-04 10:29:37 -04:00 |
|
Isaac Connor
|
68936b9af9
|
code style, replace with '
|
2016-10-03 21:58:57 -04:00 |
|
Isaac Connor
|
d4be5b06ea
|
Only generate auth hash when logged in.
|
2016-10-03 21:22:16 -04:00 |
|
Isaac Connor
|
f4418260e7
|
Should only generate an auth hash if we are logged in.
|
2016-10-03 21:18:13 -04:00 |
|
Isaac Connor
|
16bee2ef55
|
only generate auth hash if we are logged in
|
2016-10-02 14:13:54 -04:00 |
|
Isaac Connor
|
0ab84abe5b
|
Since we are returning a hash called user, it should really contain all data for that user.
|
2016-09-29 10:43:07 -04:00 |
|
Isaac Connor
|
404bbb79f0
|
must return the generated hash
|
2016-09-29 10:11:37 -04:00 |
|
Isaac Connor
|
8bc7b9562f
|
introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for
|
2016-09-29 10:04:53 -04:00 |
|
Isaac Connor
|
cf9fa78ca3
|
work on fixing event view
|
2016-09-29 09:28:48 -04:00 |
|
Isaac Connor
|
07ae6b6aa2
|
commit authhash to session
|
2016-09-28 11:49:00 -04:00 |
Isaac Connor
|
09f7c9ddf9
|
Merge pull request #1633 from bhaal2/storageareas
Storageareas
|
2016-09-28 09:43:00 -04:00 |
|
Isaac Connor
|
994f1d566e
|
fix [
|
2016-09-28 09:09:01 -04:00 |
|
Isaac Connor
|
9bf48d27b1
|
implement caching the authhash in the session
|
2016-09-28 09:08:49 -04:00 |
|
Isaac Connor
|
1ae23b49bf
|
generateAuthHash early when session is active, it will get cached in session
|
2016-09-28 09:08:36 -04:00 |
|
Isaac Connor
|
02a196d98b
|
add missing ]
|
2016-09-28 08:30:22 -04:00 |
|
Isaac Connor
|
e217ca17cd
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-27 11:57:53 -04:00 |
|
Isaac Connor
|
303a2c6c5f
|
re-open session if neccessary to save AuthHashGeneratedAt
|
2016-09-27 11:56:31 -04:00 |
|
Isaac Connor
|
6840031ee3
|
fix auth timeout and user session[username] when checking auth hash for speedup
|
2016-09-27 11:51:55 -04:00 |
|
Isaac Connor
|
e04266600e
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-27 11:04:12 -04:00 |
|
Isaac Connor
|
4ce531099c
|
add an auth field to request=stream results to give the client a new auth hash to use
|
2016-09-27 11:03:12 -04:00 |
|
Isaac Connor
|
167214cb01
|
Merge branch 'cookie_scale' into storageareas
|
2016-09-27 10:05:16 -04:00 |
|
Isaac Connor
|
6c3a3d3d50
|
store the scale value for watch and event views in a cookie, differentiated by monitorId.
|
2016-09-27 09:46:04 -04:00 |
|
Isaac Connor
|
0580ef0c88
|
whitespace changes
|
2016-09-26 20:09:09 -04:00 |
|
Isaac Connor
|
3dcc1c3697
|
fix php outputting extra newlines after content
|
2016-09-22 10:37:32 -04:00 |
|
Isaac Connor
|
d96febd967
|
when ZM_DIR_EVENTS is relative, append ZM_PATH_WEB
|
2016-09-21 16:00:23 -04:00 |
|
Isaac Connor
|
091459004c
|
ServerId can be 0
|
2016-09-21 10:30:31 -04:00 |
bhaal2
|
b9b1dd144c
|
@connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well.
|
2016-09-21 21:41:22 +10:00 |
|
Isaac Connor
|
364a80fb94
|
don't output jpeg header unless there is some kind of success
|
2016-09-20 15:55:28 -04:00 |
|
Isaac Connor
|
33ab9d3098
|
instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields
|
2016-09-20 12:19:44 -04:00 |
|
Isaac Connor
|
5ce2e95fb7
|
replace getDiskPercent call with code to show percent for all storageareas
|
2016-09-20 12:18:50 -04:00 |
|
Isaac Connor
|
fb610ba87d
|
fix getDiskPercent to take a StorageArea as a param and use it's disk_usage_percent function. When parsing filter, DiskPercent requires a storagearea now, so look for it in the terms
|
2016-09-20 12:18:20 -04:00 |
|
Isaac Connor
|
1add270b72
|
fixup saving Filters and executing them
|
2016-09-20 12:17:19 -04:00 |
|
Isaac Connor
|
f06723a178
|
add disk_usage_percent and fix whitespace
|
2016-09-20 12:16:49 -04:00 |