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
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
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
336f45219b
fix object caching
2019-08-15 16:04:56 -04:00
68052368f7
use backticks on table and column names. Use data-on-change-this in group dropdown
2019-08-15 16:04:37 -04:00
1103928ed7
only call check_timezone on console for efficiency in all other requests
2019-08-15 15:16:20 -04:00
f09941ed48
timezone errors shouldn't be fatal
2019-08-15 15:16:02 -04:00
81dadc17dc
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-14 16:18:31 -04:00
c7b6db9be7
Put backticks around all columns and tables in sql to deal with mysql 8
2019-08-14 16:18:21 -04:00
e390195ebb
Merge branch 'storageareas'
2019-08-13 15:34:38 -04:00
ed9175b4ad
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2019-08-13 15:34:11 -04:00
74e414eb00
Clean up ugly hack in CopyTo. Do not modify the object resulting in cached crap
2019-08-13 15:33:38 -04:00
4140d51e9f
database.php cleanup. remove dbFetchMonitor and dbFetchGroup. Their usage has been replaced with the Object::find_one usage. Also more quoting of table and colume names to fix #2659
2019-08-13 11:45:50 -04:00
29fc63dd15
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-11 20:21:50 -04:00
c1984ad7cb
Fix problem calculating mem_size using an int from ImageSize. With camera resolutions going up, width*height*colour could exceed 32bits. So use a guarnteed 53bit type, which fixes the memsize calculations. Fixes #2682
2019-08-11 20:21:37 -04:00
d75d64280d
Update zoneminder.spec
2019-08-11 15:03:15 -05:00
5b62c91cc2
Improve some debugging to try to diagnose recent segfault report
2019-08-10 14:46:05 -04:00
0cdb43e165
make dump_video_frame a define instead of a function, fix linesize
2019-08-10 14:45:45 -04:00
38a09bbd18
Don't auto-add default storage area to header. If someone wants to see it's space in the header they can add it to storage areas
2019-08-08 15:34:07 -04:00
3368f94c1a
Add code to handleDelay to cancel identical delayed actions. Fixes #2619 ( #2681 )
2019-08-08 14:38:27 -04:00
2e9d72ed63
spacing and extra ()
2019-08-08 14:11:24 -04:00
5f77634aca
Update Group object to use shared code in Object.php. Should fix #2659
2019-08-08 13:51:56 -04:00
702cb65d2a
Merge branch 'storageareas'
2019-08-08 13:38:36 -04:00
45b970fb09
fix spacing
2019-08-08 13:34:28 -04:00
df285006d2
change sortHeader to include eid if it is in the request
2019-08-08 13:34:10 -04:00
d3ba0ce129
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-08-08 13:16:40 -04:00
a9de537e01
Merge branch 'master' into storageareas
2019-08-08 09:27:27 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Andrew Bauer