9148d3f7c4
Merge branch 'zone_point_buttons' into storageareas
2018-10-24 12:44:21 -04:00
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
ca8770bd5a
Merge branch 'fix_rce' into storageareas
2018-10-24 10:17:16 -04:00
559f34a838
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:33:09 -04:00
069f67a10f
Break some long lines
2018-10-20 14:32:58 -04:00
c9c46aa12d
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:32:25 -04:00
f5eca2da1e
No longer need to add thisUrl to monitorUrl
2018-10-20 11:37:36 -04:00
3723f7acb3
comment out redundatn code increasing load on server
2018-10-19 15:02:10 -04:00
98579fc02a
Merge branch 'master' into storageareas
2018-10-19 11:27:43 -04:00
e7ec2faccd
monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url
2018-10-18 20:33:50 -04:00
b0078fb1d9
whitespace, get rid of redundant ajax startup
2018-10-16 17:20:10 -04:00
c2af380e29
Merge branch 'master' into storageareas
2018-10-16 11:39:26 -04:00
1b9b2811b3
remove ? from streamCmdParms. Mootools adds it in so this gives us a double ?
2018-10-16 11:39:16 -04:00
2881d2af3f
Merge branch 'master' into storageareas
2018-10-10 14:13:27 -04:00
a46c9a8a7a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-10 14:03:35 -04:00
63a5211789
use url instead of server_url in Monitor object
2018-10-10 14:03:27 -04:00
48e805c09f
Make header flips perisisent based on cookie
2018-10-10 13:11:27 -04:00
229315fc92
Merge branch 'add_archive_filter_to_montagereview' into storageareas
2018-10-09 11:10:27 -04:00
217d1e44ba
Rough in an archived status filter in montagereview.
2018-10-09 11:06:54 -04:00
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
c481fc868f
be more robust when curFrames is empty.
2018-09-28 11:25:19 -04:00
9c437b0303
Merge branch 'add_export_to_filter' into storageareas
2018-09-25 14:35:19 -04:00
520d1bb7bf
Merge branch 'master' into storageareas
2018-09-20 09:08:29 -04:00
6181e52c47
gracefully handle non-existence of imageFeed
2018-09-20 09:07:28 -04:00
870300ed93
remove debug line
2018-09-14 16:19:41 -04:00
34c7ee32ee
Merge branch 'master' into storageareas
2018-09-14 15:13:57 -04:00
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
60b952ab86
Merge branch 'master' into storageareas
2018-09-13 16:20:36 -04:00
c66dd25ebb
implement collapsible headers ( #2203 )
2018-09-11 17:39:40 -04:00
eef928a742
fix find_all => find
2018-09-11 14:31:03 -04:00
8608fc97be
fix trms=>terms
2018-09-10 15:11:57 -04:00
0ee261fae3
get rid of code that hid the close/back button on events if there was no history.
2018-09-10 15:11:41 -04:00
978e332e3a
Merge branch 'master' into storageareas
2018-09-09 16:36:31 -04:00
534aebb21f
When loading previous and subsequent log lines, merge the fields in the filters instead of replacing
2018-09-09 16:36:09 -04:00
d5cab088d6
Merge branch 'master' into add_export_to_filter
2018-09-05 10:33:10 -04:00
2858564155
Merge branch 'master' into storageareas
2018-08-31 16:06:13 -04:00
9ec415b30a
Just reload the event view instead of dynamically updating the stream. Fixes #2196
2018-08-31 15:56:21 -04:00
799b34eee8
handle xhr errors like when auth is no longer valid. Do a page refresh when this happens
2018-08-31 10:34:54 -04:00
4e32089a48
Merge branch 'master' into storageareas
2018-08-30 14:51:27 -04:00
8f0fb0843a
Add Privacy Statement ( #2194 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* create and load default.php
* fix typos
* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
d768f5f7fc
Merge branch 'master' into storageareas
2018-08-13 15:35:55 -04:00
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
2018-08-13 15:33:43 -04:00
026390ccd8
Merge branch 'master' into storageareas
2018-08-13 15:26:29 -04:00
56f4d768c2
Add Privacy Statement ( #2176 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* push privacy text to all language files
2018-08-13 15:23:44 -04:00
b85f74bb99
when selecting auto, we need to remove the width & height css key
2018-07-31 16:55:54 -04:00
b20d61e0df
fix onclick when editing layout
2018-07-31 16:47:25 -04:00
37779ff51d
use a window.location.assign instead of creating a popup to export
2018-07-17 08:26:19 -04:00
05f0338219
use a unique connection key for downloads
2018-07-12 14:07:19 -04:00
ce22f207e3
Merge branch 'master' into add_export_to_filter
2018-07-12 11:40:32 -04:00
8a936cdcc9
Merge branch 'master' into add_export_to_filter
2018-07-11 16:43:02 -04:00
Isaac Connor
Isaac Connor
Andrew Bauer