02eb222f17
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-09-09 17:09:26 -04:00
097ce5e778
add const to cast
2019-09-09 17:09:01 -04:00
99df250f1b
Merge branch 'master' of github.com:connortechnology/ZoneMinder
2019-09-09 17:07:31 -04:00
792af28c54
return a value from write_packet
2019-09-09 16:55:22 -04:00
d5aa95e45f
cpplint fixes
2019-09-09 16:13:32 -04:00
922273410b
correct dist for debian
2019-09-09 10:04:57 -04:00
8103156436
when deleting multiple events, each event has to be it's own transaction due to locking
2019-09-09 09:16:52 -04:00
f1cffa6fe1
Add more debian based distros to packpack builds
2019-09-09 08:22:58 -04:00
d5d4d9d19b
ret should be a heap var, not a member of the object. Somehow this also seems to fix crashing on debian buster. I assume the compiler is confused
2019-09-08 16:10:57 -04:00
8215fe1c0f
Some versions off avcodec libs have pkt_pts and pkt_dts but they have been deprecated and weren't of any use anyways
2019-09-08 16:10:20 -04:00
056449590a
Update Monitor object, using Object methods for saving monitors
2019-09-08 12:26:11 -04:00
e6351109b2
Now that we are using our fork of packpack, no longer need to patch it
2019-09-06 12:00:50 -04:00
c58cb38233
Add some debug echos, fix zmfilter command line and remove -1 from changelog version, as packpack version wont' have it.
2019-09-06 11:25:21 -04:00
6bd2267483
Fix installing default filters failing due to missing values for AutoCopy and AutoCopyTo
2019-09-06 10:55:34 -04:00
4634cb63e5
Use ZoneMinder's fork of packpack. Use isaac@zoneminder.com instead of personal email. set DISTRO in changelog
2019-09-06 09:31:08 -04:00
bce1a48b66
Fix another Monitorid. Fixes #2699
2019-09-05 10:31:22 -04:00
6f59d63e08
Add missing AutoCopy and AutoCopyTo in db creation
2019-09-05 09:55:58 -04:00
25198e0eb0
move session_close to after auth so that whatever we do with the session in auth gets saved
2019-09-04 17:53:59 -04:00
eea1732675
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-09-04 13:39:21 -04:00
6b83a62fad
allow for StorageId to be 0
2019-09-04 13:35:46 -04:00
3bafbf69be
Merge pull request #2698 from connortechnology/fix_auth_persistence_by_regenerating_cookie
...
Fix auth timing out due to cookie timing out and getting deleted.
2019-09-04 12:20:47 -04:00
2993e52652
Fix auth timing out due to cookie timing out and getting deleted.
2019-09-04 12:14:32 -04:00
f568e0da30
Fix event->id() to event->Id()
2019-09-04 10:11:16 -04:00
a57c5196f3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-09-04 10:07:31 -04:00
dde655950f
Use locking when deleting an event
2019-09-04 10:07:17 -04:00
26670c2df2
Add lock function to write lock an object
2019-09-04 10:07:08 -04:00
f390a0ca03
Merge pull request #2697 from ZoneMinder/cake-debug-off
...
In production mode, debug should be 0
2019-09-04 09:59:39 -04:00
be99f6a4d6
In production mode, debug should be 0
2019-09-04 08:47:09 -04:00
2f7596f179
Merge pull request #2696 from connortechnology/freebsd_arm
...
fixes #2694
2019-09-03 13:33:26 -04:00
f46662a062
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-09-03 12:55:51 -04:00
16f0ad4f59
Fix Monitorid => MonitorId
2019-09-03 12:55:45 -04:00
571082ff95
StorageId clears Path
2019-09-03 12:55:31 -04:00
85e0a086b3
fixes #2694
2019-09-03 11:55:37 -04:00
4cbe4fc5f0
Fix token auth sessions ( #2695 )
...
* 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
* have to add authhash to session on login
* restore username&password login for all urls
* fix
* fixes
* Load use from session when it exists
2019-09-03 11:44:58 -04:00
92bc1791f5
fix accidentally removed code
2019-09-03 11:33:13 -04:00
50aa0108e5
Add authhash to session
2019-09-03 11:33:02 -04:00
a384e978c8
don't load user from session if we have already gotten it from elsewhere
2019-09-03 11:19:42 -04:00
b84d005d8f
Load use from session when it exists
2019-09-03 10:54:34 -04:00
d1ac88d301
Now you can have a subpath under the S3 bucket
2019-08-29 17:55:39 -04:00
ab0a939550
Turn off event dir creation on S3. It's not neccessary. Allow s3fs:// at the beginning of the S3 url
2019-08-29 11:27:58 -04:00
99a2ddba63
Add listing of Secondary Storage area in events list
2019-08-29 11:27:06 -04:00
6b9e8bec69
Add logging of delete events
2019-08-29 11:26:32 -04:00
ef5497cba8
If we have an ajax request, don't do actions.
2019-08-29 11:26:14 -04:00
a4b057fa2b
Upgrade Event object to use the common Object methods. Add deleting files from Secondary storage
2019-08-29 11:25:37 -04:00
93d642304e
Add debug line for aws credentials
2019-08-29 09:42:20 -04:00
c80ef0e0ab
spacing
2019-08-28 12:20:03 -04:00
bd3395ac98
introduce VideoStore::write_packet to refactor out duplicated code. Add the ability to receive multiple packets from audio encoder per input packet
2019-08-28 12:19:54 -04:00
efb8711c02
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-28 11:43:59 -04:00
307fad72be
Default to using V4 Signature
2019-08-28 11:43:46 -04:00
42edad1e8c
Tweaks to the ubuntu installation instructions ( #2688 )
...
* Tweaks to the ubuntu installation instructions
I recently walked a new user through the Ubuntu installation, and noticed some
things that were confusing to him that would be easy to fix.
* Use release names as well as numbers
2019-08-28 10:53:24 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Pliable Pixels
Arnout Engelen