1e91f5501e
MOre debug, fix problems with S3 upload
2019-08-26 20:44:59 -04:00
f01bedb33e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-26 18:49:12 -04:00
231c9c3902
move executeFilter to Filter->execute. If no changes have been made, don't make a tempfilter.
2019-08-26 18:48:34 -04:00
39620c01ff
Add rescaling of pkt pts/dts from audio_out_ctx to audio_out_stream
2019-08-26 16:37:32 -04:00
5527685162
Merge branch 'storageareas'
2019-08-26 16:22:10 -04:00
292b530f99
Allow montage review maxdatetime to be less than minDateTime. This allows us to set it first so that the reload does kill us
2019-08-26 16:20:23 -04:00
7768d39eb9
Add auth to streamParms so that multi-server event viewing works
2019-08-26 16:19:44 -04:00
82e8bde406
Fix SaveAs
2019-08-26 16:19:19 -04:00
b07e6da03e
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2019-08-26 16:18:38 -04:00
b26ed9bf62
Yet more debugging. Also, move pts adjustment to before audio encoding
2019-08-26 16:17:45 -04:00
7cab22b450
Use Event->SaveJPEGs instead of Monitor->SaveJPEGs
2019-08-26 15:04:59 -04:00
5f5d5f691a
Add backticks for mysql 8
2019-08-25 12:30:06 -04:00
3e84597900
Backtick escape table and column names for mysql8
2019-08-25 11:36:23 -04:00
c4c6935c6e
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-08-23 18:17:50 -04:00
73ba699dc4
Sort filter fields dropdown
2019-08-23 18:17:45 -04:00
2fe9442257
Fix time_base conversion when flushing audio queue. Add more debugging. COrrect pkt_Duration when resampling audio
2019-08-23 18:17:26 -04:00
e707bd8e72
correct getting frame_id so we get images instead of nodata
2019-08-23 17:59:29 -04:00
7598654740
add auth hash to ajax streams, and use monitorUrl instead of thisUrl to talk to zms
2019-08-23 17:58:40 -04:00
45aa5bd58c
Code style, spacing, quotes and documentation
2019-08-22 08:28:42 -04:00
886a203bf1
Support hwaccel for non-passthrough case as well
2019-08-21 10:11:58 -04:00
01e988ffba
remove some redundant debugs. Improve some messages
2019-08-20 14:09:47 -04:00
4a82ce83a7
quit a bit earlier when stream is broken.
2019-08-20 11:13:38 -04:00
7ef26275bc
use isset to get rid of warnings when eid is not in REQUEST
2019-08-20 10:28:19 -04:00
a064f6c23f
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-20 10:03:55 -04:00
61926d3b85
Only parse the filter if it is valid. Remove unused filterQuery var
2019-08-20 10:03:44 -04:00
84492f29b1
Fix token auth sessions ( #2676 )
...
* If token is present do token based auth and do not do anything with session
* update HostController. Use config constants, don't use sessions
* Remove Session from the components list
* spacing
* Remove Session from App Components list.
* Move APIEnabled check to the api from auth.php
* Rework auth. login using username and password only occurs on login action now. Including auth.php should not touch the session. auth_hash logins no longer touch the session. replace userLogin with a function called validateUser which matches the semantics of validateToken.
* remove debugging
* Add session storage if stateful query param is on, but only for LEGACY_API_AUTH
* fix mUser to username, etc.
* shuffle lines
* use instead of session when generating auth hash.
* Add docs regarding the use of cookies and stateful query param
* Only open/close session if we are clearing a session var
* Use zm_session_start instead of session_start
* Should use zm_session_start instead of session_start
* document that zm_session_start should be called previously to session_regenerate_id
* Don't actually write out the session when generating auth hashes. Means they should never actually persist.
* More backticking of SQL
* add .. to fix #2686
* Use material icons for sort because they look nicer
* fix typo
* have to add authhash to session on login
* restore username&password login for all urls
* fix
* fixes
2019-08-20 09:46:53 -04:00
b344701dea
fixes
2019-08-19 12:15:58 -04:00
3b58da860f
fix
2019-08-19 12:08:41 -04:00
b1132087b8
restore username&password login for all urls
2019-08-19 12:07:38 -04:00
87e7ba0e50
have to add authhash to session on login
2019-08-19 11:38:56 -04:00
bf34d8901e
Merge branch 'master' into fix_token_auth_sessions
2019-08-19 11:13:24 -04:00
ed190340b9
fix typo
2019-08-19 11:12:47 -04:00
ca0b583007
Use material icons for sort because they look nicer
2019-08-19 08:59:15 -04:00
239c68dd7f
add .. to fix #2686
2019-08-19 08:58:52 -04:00
369dd03909
remove errant i
2019-08-18 21:32:19 -04:00
503cf6cd24
More backticking of SQL
2019-08-17 14:37:19 -04:00
d464296637
More backticking of SQL
2019-08-17 14:36:52 -04:00
d39da61b66
Don't actually write out the session when generating auth hashes. Means they should never actually persist.
2019-08-16 15:27:24 -04:00
070b8066f2
document that zm_session_start should be called previously to session_regenerate_id
2019-08-16 15:08:35 -04:00
28155ebd90
Should use zm_session_start instead of session_start
2019-08-16 15:08:10 -04:00
cfeedd39a4
Use zm_session_start instead of session_start
2019-08-16 15:07:20 -04:00
660eddc69d
Only open/close session if we are clearing a session var
2019-08-16 15:06:56 -04:00
ba94e98949
Add docs regarding the use of cookies and stateful query param
2019-08-16 14:24:51 -04:00
3475a11e15
use instead of session when generating auth hash.
2019-08-16 14:13:13 -04:00
51c7f0b73f
shuffle lines
2019-08-16 14:12:52 -04:00
1d0ee227d7
fix mUser to username, etc.
2019-08-16 14:12:37 -04:00
4108495a7d
Add session storage if stateful query param is on, but only for LEGACY_API_AUTH
2019-08-16 14:12:14 -04:00
376b8af889
Make links in donate text actual links
2019-08-16 11:40:38 -04:00
f813741730
Add maxage 7 to logrotate config so that it will clear out all the zms_e logs.
2019-08-16 11:31:27 -04:00
efa264e0c7
Fix playing in reverse. Fix not sending first frame. Fix sql problem with backticks. Not being able to open a frame image is now non-fatal.
2019-08-16 10:24:51 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor