Isaac Connor
|
7d90a56561
|
Merge branch 'master' into storageareas
|
2018-11-30 14:46:42 -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 |
Andrew Bauer
|
5a88cbcddb
|
Merge pull request #2329 from connortechnology/fix_2319
Fix rate resetting
|
2018-11-29 09:57:13 -06: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 |
|
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
|
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
|
f8b2ff5c77
|
rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()
|
2018-11-27 17:35:25 -05:00 |
|
Isaac Connor
|
b5430a1927
|
Merge branch 'fix_2317' into storageareas
|
2018-11-23 15:35:55 -05: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
|
19f3cce41f
|
Dont auto-guess pathPrefix
|
2018-11-23 13:54:14 -05:00 |
|
Isaac Connor
|
7ad19be0d7
|
Merge branch 'server_path_prefix' into storageareas
|
2018-11-23 13:29:01 -05:00 |
|
Isaac Connor
|
dea5db9dd9
|
Merge branch 'zmaudit_check_other_storageareas' into storageareas
|
2018-11-23 11:11:39 -05:00 |
Isaac Connor
|
c5f7fb7b18
|
Merge branch 'master' into server_path_prefix
|
2018-11-22 10:04:33 -05:00 |
|
Isaac Connor
|
d8d9544497
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-17 10:39:52 -05:00 |
|
Isaac Connor
|
87140ecdb5
|
white space and quiet warning
|
2018-11-17 10:39:42 -05:00 |
Andrew Bauer
|
5c2e5d89ed
|
fix gpl mailing address
This makes rpmlint & lintian complain less
|
2018-11-15 19:53:45 -06:00 |
|
Isaac Connor
|
f72651da5a
|
Add auth hash to ajax fps and status calls in zone edit
|
2018-11-15 12:22:35 -05:00 |
|
Isaac Connor
|
d89c0bc737
|
Merge branch 'master' into storageareas
|
2018-11-14 15:55:00 -05:00 |
|
Isaac Connor
|
aa8ac9c31c
|
spaces and quotes
|
2018-11-14 15:54:45 -05:00 |
|
Isaac Connor
|
3a409b26aa
|
Use buttons instead of anchor tags for Prev/Next/FIrst/Last buttons
|
2018-11-14 15:54:34 -05:00 |
|
Isaac Connor
|
3be31020b7
|
Automatically add width to frames view when thumbnails are turned on.
|
2018-11-14 15:54:01 -05:00 |
|
Isaac Connor
|
e8ed1367d7
|
Merge branch 'master' into storageareas
|
2018-11-13 14:22:00 -05:00 |
|
Isaac Connor
|
246765ced9
|
Add tooltip for sorting monitors
|
2018-11-11 16:23:19 -05:00 |
|
Isaac Connor
|
82abd04f36
|
Add type=button to buttons so they don't act like submit buttons
|
2018-11-07 13:19:42 -05:00 |
|
Andrew Bauer
|
a50c2bae35
|
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg
Audio only with ffmpeg
|
2018-11-03 20:39:18 -05:00 |
|
Isaac Connor
|
1dac088000
|
Merge branch 'audio_only_with_ffmpeg' into storageareas
|
2018-10-31 14:48:24 -04:00 |
|
Isaac Connor
|
589b6f3eef
|
add further note about needing h264 passthrough
|
2018-10-31 11:35:06 -04:00 |
|
Isaac Connor
|
69f7d36729
|
Make it clear that audio recording is only for ffmpeg input type
|
2018-10-31 11:34:30 -04:00 |
|
Isaac Connor
|
80cfb02570
|
Merge branch 'warn_colour_when_disabled' into storageareas
|
2018-10-30 12:05:47 -04:00 |
|
Isaac Connor
|
f95379742b
|
Use a warning colour when motion detection is disabled.
|
2018-10-30 12:04:05 -04:00 |
|
Isaac Connor
|
9148d3f7c4
|
Merge branch 'zone_point_buttons' into storageareas
|
2018-10-24 12:44:21 -04:00 |
|
Isaac Connor
|
9cf31eafa0
|
Use a button element instead of an anchor tag for plus and minus point buttons. Cleanup dead code
|
2018-10-24 12:43:43 -04:00 |
|
Isaac Connor
|
ca8770bd5a
|
Merge branch 'fix_rce' into storageareas
|
2018-10-24 10:17:16 -04:00 |
|
Isaac Connor
|
2024df4393
|
use json_encode/decode instead of serialize/unserialize to pass onvif probe results around. Also clean up some code/ add some missing things. Fixes #2271 and #2272
|
2018-10-24 09:49:56 -04:00 |
|
Isaac Connor
|
ccd64b0fae
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-22 14:21:34 -04:00 |
|
Isaac Connor
|
7e4c54fec0
|
Use proper buttons and remove extra bootstrap styles from buttons so that they aren't all jammed together
|
2018-10-22 13:54:27 -04:00 |
|
Isaac Connor
|
559f34a838
|
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
|
2018-10-20 14:33:09 -04:00 |
|
Isaac Connor
|
069f67a10f
|
Break some long lines
|
2018-10-20 14:32:58 -04:00 |
|
Isaac Connor
|
c9c46aa12d
|
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
|
2018-10-20 14:32:25 -04:00 |
|
Isaac Connor
|
f5eca2da1e
|
No longer need to add thisUrl to monitorUrl
|
2018-10-20 11:37:36 -04:00 |
|
Isaac Connor
|
c47b4a5a04
|
Merge branch 'improve_config_efficiency' into storageareas
|
2018-10-19 15:03:00 -04:00 |
|
Isaac Connor
|
3723f7acb3
|
comment out redundatn code increasing load on server
|
2018-10-19 15:02:10 -04:00 |
|
Isaac Connor
|
4c7fe8741b
|
Load the complete config info only for options
|
2018-10-19 15:00:47 -04:00 |