Isaac Connor
|
c8c34d3f95
|
Merge branch 'master' into storageareas
|
2018-12-11 10:21:22 -05:00 |
|
Isaac Connor
|
1e8c4276bb
|
fix #2319 some more. This is fixing rate sticking across gapless events and reload
|
2018-12-10 17:32:17 -05:00 |
|
Isaac Connor
|
a9290759a5
|
Merge branch 'fix_ios9' into storageareas
|
2018-12-03 16:25:34 -05:00 |
|
Isaac Connor
|
18ce7c9ea0
|
Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead.
|
2018-12-03 15:17:16 -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
|
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
|
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
|
3be31020b7
|
Automatically add width to frames view when thumbnails are turned on.
|
2018-11-14 15:54:01 -05: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
|
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
|
3723f7acb3
|
comment out redundatn code increasing load on server
|
2018-10-19 15:02:10 -04:00 |
|
Isaac Connor
|
98579fc02a
|
Merge branch 'master' into storageareas
|
2018-10-19 11:27:43 -04:00 |
|
Isaac Connor
|
e7ec2faccd
|
monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url
|
2018-10-18 20:33:50 -04:00 |
|
Isaac Connor
|
b0078fb1d9
|
whitespace, get rid of redundant ajax startup
|
2018-10-16 17:20:10 -04:00 |
|
Isaac Connor
|
c2af380e29
|
Merge branch 'master' into storageareas
|
2018-10-16 11:39:26 -04:00 |
|
Isaac Connor
|
1b9b2811b3
|
remove ? from streamCmdParms. Mootools adds it in so this gives us a double ?
|
2018-10-16 11:39:16 -04:00 |
|
Isaac Connor
|
2881d2af3f
|
Merge branch 'master' into storageareas
|
2018-10-10 14:13:27 -04:00 |
|
Isaac Connor
|
a46c9a8a7a
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-10 14:03:35 -04:00 |
|
Isaac Connor
|
63a5211789
|
use url instead of server_url in Monitor object
|
2018-10-10 14:03:27 -04:00 |
|
Isaac Connor
|
48e805c09f
|
Make header flips perisisent based on cookie
|
2018-10-10 13:11:27 -04:00 |
|
Isaac Connor
|
229315fc92
|
Merge branch 'add_archive_filter_to_montagereview' into storageareas
|
2018-10-09 11:10:27 -04:00 |
|
Isaac Connor
|
217d1e44ba
|
Rough in an archived status filter in montagereview.
|
2018-10-09 11:06:54 -04:00 |
|
Isaac Connor
|
33bd30fbbd
|
Merge branch 'master' into storageareas
|
2018-09-28 13:40:18 -04:00 |
|
Isaac Connor
|
c481fc868f
|
be more robust when curFrames is empty.
|
2018-09-28 11:25:19 -04:00 |
|
Isaac Connor
|
9c437b0303
|
Merge branch 'add_export_to_filter' into storageareas
|
2018-09-25 14:35:19 -04:00 |
|
Isaac Connor
|
520d1bb7bf
|
Merge branch 'master' into storageareas
|
2018-09-20 09:08:29 -04:00 |
|
Isaac Connor
|
6181e52c47
|
gracefully handle non-existence of imageFeed
|
2018-09-20 09:07:28 -04:00 |
|
Isaac Connor
|
870300ed93
|
remove debug line
|
2018-09-14 16:19:41 -04:00 |
|
Isaac Connor
|
34c7ee32ee
|
Merge branch 'master' into storageareas
|
2018-09-14 15:13:57 -04:00 |
|
Isaac Connor
|
b5b71edbf6
|
Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80
|
2018-09-14 14:26:45 -04:00 |
|
Isaac Connor
|
60b952ab86
|
Merge branch 'master' into storageareas
|
2018-09-13 16:20:36 -04:00 |
|
Andrew Bauer
|
c66dd25ebb
|
implement collapsible headers (#2203)
|
2018-09-11 17:39:40 -04:00 |
|
Isaac Connor
|
eef928a742
|
fix find_all => find
|
2018-09-11 14:31:03 -04:00 |
|
Isaac Connor
|
8608fc97be
|
fix trms=>terms
|
2018-09-10 15:11:57 -04:00 |