Isaac Connor
|
d837b42836
|
fix ffmpeg warnings. We have to copy parameters from the context to the stream AFTER we open the codec
|
2018-12-03 10:33:53 -05:00 |
Andrew Bauer
|
dbb51e9857
|
add generic nginx config file
|
2018-12-02 09:40:15 -06:00 |
|
Andrew Bauer
|
e327ad100e
|
fix WebSite camera startup issue
|
2018-12-01 17:03:50 -06:00 |
|
Andrew Bauer
|
cae6ffd5a3
|
use HTTP_HOST instead of SERVER_NAME
|
2018-12-01 13:27:08 -06:00 |
|
Andrew Bauer
|
76e0782d97
|
rpm pkg - update nginx config
|
2018-12-01 09:58:12 -06:00 |
|
Isaac Connor
|
6ad54aad93
|
add libswscale5 to depends for ubuntu cosmic
|
2018-11-30 14:53:31 -05:00 |
|
Isaac Connor
|
9bb4f1804e
|
Merge branch 'server_path_prefix'
|
2018-11-30 14:46:20 -05:00 |
|
Isaac Connor
|
8c626c984b
|
Need to pass port through all Url functions
|
2018-11-30 14:45:58 -05:00 |
|
Isaac Connor
|
6830849576
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-30 10:48:32 -05:00 |
|
Isaac Connor
|
f9139f2d98
|
Use the word skipped instead of aborted
|
2018-11-30 10:48:20 -05:00 |
Andrew Bauer
|
279255d979
|
rpm pkg - update README
|
2018-11-30 08:58:42 -06:00 |
|
Andrew Bauer
|
bfff07bb3e
|
rpm packaging - takes too long to set perms on events
|
2018-11-30 08:53:58 -06:00 |
|
Isaac Connor
|
945770c819
|
Merge branch 'server_path_prefix'
|
2018-11-29 15:53:35 -05:00 |
|
Isaac Connor
|
3bd5774ea1
|
Default to PathToIndex should have the index.php in it
|
2018-11-29 15:53:19 -05:00 |
|
Isaac Connor
|
17551eacee
|
Merge branch 'server_path_prefix'
|
2018-11-29 14:27:32 -05:00 |
|
Isaac Connor
|
1c17f334d3
|
fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well
|
2018-11-29 14:26:30 -05:00 |
|
Isaac Connor
|
d83fb2e985
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-29 14:08:03 -05:00 |
|
Isaac Connor
|
5e0d742e26
|
Use history.go(-1) which works on safari
|
2018-11-29 14:04:35 -05:00 |
|
Andrew Bauer
|
79f804e94b
|
update rpm README
|
2018-11-29 10:43:22 -06:00 |
|
Andrew Bauer
|
9f6a603d59
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2018-11-29 10:36:54 -06:00 |
|
Andrew Bauer
|
a74a9ae292
|
Merge pull request #2328 from pliablepixels/login-auth-relay
returns user=&pass= in credentials for auth_relay plain and none #2327
|
2018-11-29 09:59:09 -06:00 |
|
Andrew Bauer
|
5a88cbcddb
|
Merge pull request #2329 from connortechnology/fix_2319
Fix rate resetting
|
2018-11-29 09:57:13 -06:00 |
|
Andrew Bauer
|
be07e4413f
|
Merge pull request #2152 from connortechnology/server_path_prefix
Server path prefix
|
2018-11-29 09:56:25 -06:00 |
|
Isaac Connor
|
5496f6afac
|
add cosmic and disco to ubuntu builds
|
2018-11-29 10:48:16 -05:00 |
|
Isaac Connor
|
392fa04918
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-29 10:45:37 -05:00 |
|
Isaac Connor
|
45a9f9158d
|
spelling mistakes
|
2018-11-29 10:45:30 -05:00 |
|
Isaac Connor
|
605397b565
|
Fix rate resetting by storing it in a cookie and using that on initial event load. Fixes #2319
|
2018-11-29 09:43:21 -05:00 |
Pliable Pixels
|
e6b8a7bc66
|
resolves #2327
|
2018-11-29 09:21:10 -05:00 |
|
Isaac Connor
|
1e915e9567
|
Merge branch 'master' into server_path_prefix
|
2018-11-28 10:45:36 -05:00 |
Isaac Connor
|
81f345a9cd
|
Add dh-systemd and dh-apache2 to build depends
|
2018-11-28 10:08:27 -05:00 |
|
Isaac Connor
|
a89dd83565
|
Update to use object instead of db row
|
2018-11-28 09:55:34 -05:00 |
|
Isaac Connor
|
cd13dda294
|
fix use of instead of
|
2018-11-28 09:54:22 -05:00 |
|
Isaac Connor
|
2b48b09ef5
|
Add entries for PathToIndex and PathToZMS
|
2018-11-28 09:53:35 -05:00 |
Elmar Pruesse
|
9c1578e14e
|
Add description for Stream Replay Image Buffer (#2325)
* Add description for Stream Replay Image Buffer
I hope this is even correct.
* Update definemonitor.rst
|
2018-11-27 21:49:58 -05:00 |
|
Elmar Pruesse
|
94d8e043ce
|
Fix unreadable input text when OS theme dark (#2324)
* Update skin.css
* Update skin.css
|
2018-11-27 18:25:05 -05:00 |
|
Isaac Connor
|
f8b2ff5c77
|
rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()
|
2018-11-27 17:35:25 -05:00 |
|
Isaac Connor
|
8404f0ef64
|
When forcing an alarm, print out the event id
|
2018-11-26 16:21:32 -05:00 |
|
Isaac Connor
|
251ccc0ba9
|
remove extra ()
|
2018-11-26 16:20:52 -05:00 |
|
Isaac Connor
|
10ce55c396
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-26 16:20:22 -05:00 |
|
Isaac Connor
|
17c1933913
|
remove an extra l
|
2018-11-26 16:20:15 -05:00 |
|
Isaac Connor
|
b3703a5eed
|
Check in db a second time for the event. Long running zmaudits can find an event in the fs that was created after we loaded all the db events.
|
2018-11-26 15:16:10 -05:00 |
Andrew Bauer
|
8301f5d039
|
add missing sql update text
|
2018-11-25 15:42:35 -06:00 |
|
Andrew Bauer
|
94944abd98
|
Fix triggers to sum event counts properly (#2323)
* rpm - update README
* update triggers to su mevent counts properly
* fix merge error
* merge content of triggers.sql with 1.32.3 sql update
* populate day, week, month summary tables with existing
* populate archive summary table with existing
* fix typo
* remove startime column from query
* my machine is possessed
|
2018-11-25 10:26:51 -05:00 |
|
Andrew Bauer
|
0b02996a3f
|
Update zoneminder.spec
|
2018-11-23 17:11:33 -06:00 |
|
Andrew Bauer
|
4e2e0c1393
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2018-11-23 16:28:00 -06:00 |
|
Andrew Bauer
|
5b211d2509
|
Merge pull request #2322 from connortechnology/fix_2317
fix #2317
|
2018-11-23 14:48:37 -06:00 |
|
Isaac Connor
|
6128d2a4d9
|
fix #2317 by updating the url encoding of a filter to match events for that monitor
|
2018-11-23 15:34:23 -05:00 |
|
Isaac Connor
|
c5f7fb7b18
|
Merge branch 'master' into server_path_prefix
|
2018-11-22 10:04:33 -05:00 |
|
Andrew Bauer
|
7ca5fa2ff8
|
rpm - update README's again
|
2018-11-21 07:58:12 -06:00 |
|
Andrew Bauer
|
daf813e877
|
spelling
|
2018-11-21 07:44:35 -06:00 |