Isaac Connor
|
eac9170b33
|
Merge branch 'master' into storageareas
|
2018-11-30 15:06:09 -05:00 |
|
Isaac Connor
|
6ad54aad93
|
add libswscale5 to depends for ubuntu cosmic
|
2018-11-30 14:53:31 -05:00 |
|
Isaac Connor
|
7d90a56561
|
Merge branch 'master' into storageareas
|
2018-11-30 14:46:42 -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
|
fe45e83bb4
|
Fix PathToIndex
|
2018-11-29 15:54:25 -05:00 |
|
Isaac Connor
|
4cf7ff7fe4
|
Merge branch 'server_path_prefix' into storageareas
|
2018-11-29 15:53:58 -05: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
|
af2bb992e9
|
Merge branch 'server_path_prefix' into storageareas
|
2018-11-29 14:33:46 -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 |
|
Isaac Connor
|
e8622b68dc
|
whitespace, delete dead code
|
2018-11-29 13:17:41 -05:00 |
|
Isaac Connor
|
9cbc3352b9
|
Implement an error count. Return -1 when it gets over 100 so that the camera will be reopened.
|
2018-11-29 13:09:29 -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
|
af501128f2
|
fix invalid use of %s. Pass the buffer as the format string instead of a ... param
|
2018-11-29 10:54:01 -05:00 |
|
Isaac Connor
|
21c3ecb74a
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-11-29 10:52:25 -05:00 |
|
Isaac Connor
|
df0b600431
|
Merge branch 'master' into storageareas
|
2018-11-29 10:49:06 -05: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
|
a3047dbac6
|
fix submodules
|
2018-11-29 10:32:22 -05:00 |
|
Isaac Connor
|
d4acc9e205
|
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
|
2018-11-29 10:24:58 -05:00 |
|
Isaac Connor
|
1a85e282e2
|
use find_one instead of new. We seem to be comparing against unfound event objects
|
2018-11-29 10:09:49 -05:00 |
|
Isaac Connor
|
c0a9fae01f
|
Merge branch 'fix_2319' into storageareas
|
2018-11-29 09:57:41 -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
|
4625f7c879
|
Merge branch 'master' into storageareas
|
2018-11-28 10:46:49 -05:00 |
|
Isaac Connor
|
1e915e9567
|
Merge branch 'master' into server_path_prefix
|
2018-11-28 10:45:36 -05:00 |
|
Isaac Connor
|
57acb2aac6
|
Merge branch 'server_path_prefix' into storageareas
|
2018-11-28 10:41:11 -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 |
|
Isaac Connor
|
f5328265ef
|
fix missing daemons definition
|
2018-11-28 09:12:22 -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
|
6de704922c
|
Set scheme to '' if undefined to quiet warnings
|
2018-11-27 17:01:49 -05:00 |
|
Isaac Connor
|
8404f0ef64
|
When forcing an alarm, print out the event id
|
2018-11-26 16:21:32 -05:00 |