672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -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
4be2a0501c
Merge branch 'master' into storageareas
2018-08-22 17:22:54 -04:00
40cd27e68a
when refreshing because ajax failed, reload the current view, not just index.php
2018-08-15 17:21:54 -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
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
2ad4b17d36
Merge branch 'master' into storageareas
2018-08-08 16:24:55 -04:00
d87a41b629
Set button types so that they do things in all browsers.Fix Delete button when translated
2018-08-08 15:11:30 -04:00
683789eb41
Merge branch 'master' into storageareas
2018-08-03 10:27:48 -04:00
b72d520e02
implement the ability to pass a disabled option to htmlSelect. Use it to disable the h264 passthrough option for non-ffmpeg monitors. Instead of disappearing it.
2018-08-03 10:02:42 -04:00
b85f74bb99
when selecting auto, we need to remove the width & height css key
2018-07-31 16:55:54 -04:00
c934295bf9
we shall always pass width & height as pixels without units.
2018-07-31 16:55:13 -04:00
b20d61e0df
fix onclick when editing layout
2018-07-31 16:47:25 -04:00
588ca2cf62
Merge branch 'master' into storageareas
2018-07-31 10:52:24 -04:00
2ff47e04da
the updated video-js.css puts the fonts into a font dir.
2018-07-25 17:04:42 -04:00
00bdfdcb16
increase height of function popup so that dropdown options fit in it
2018-07-25 09:39:24 -04:00
6ab1c3ced8
proper case table header
2018-07-25 09:39:08 -04:00
dc57a3c91c
fix spacing/quotes/google code style
2018-07-24 16:41:09 -04:00
965ffda01e
Add button types. fix extra px in slideheight
2018-07-17 15:32:30 -04:00
8a43f4400e
Merge branch 'add_export_to_filter' of github.com:connortechnology/ZoneMinder into add_export_to_filter
2018-07-17 08:27:23 -04:00
37779ff51d
use a window.location.assign instead of creating a popup to export
2018-07-17 08:26:19 -04:00
683e8716f2
add type=button to button to prevent them from submitting
2018-07-17 08:25:15 -04:00
a41ce9c9fe
default to exporting all event data
2018-07-17 08:24:19 -04:00
05f0338219
use a unique connection key for downloads
2018-07-12 14:07:19 -04:00
43cee7c383
make export work and fix links to jquery.js
2018-07-12 14:07:03 -04:00
ce22f207e3
Merge branch 'master' into add_export_to_filter
2018-07-12 11:40:32 -04:00
903127fe85
Merge branch 'storageareas'
2018-07-12 11:39:33 -04:00
2767e7cca3
remove unneeded packaging files from chosen.
2018-07-12 11:35:02 -04:00
87f68e4a5b
Merge branch 'master' into storageareas
2018-07-12 10:47:18 -04:00
8a936cdcc9
Merge branch 'master' into add_export_to_filter
2018-07-11 16:43:02 -04:00
410b1ad810
Merge branch 'master' into cycle_width
2018-07-11 15:49:44 -04:00
7db1fabbe1
Removed "chosen" web site; "prism.js" is not distributable. ( #2154 )
2018-07-11 15:46:43 -04:00
115e554d94
Remove erroneous t and convert tabs to spaces
2018-07-11 15:46:11 -04:00
18c3618e28
Arp tool ( #2155 )
...
* let cmake set path to arp
* declare cameras array
* fix probeV4L function
* typo
* fix another typo - my machine is possessed.
* update redhat, debian, ubuntu build dependencies
2018-07-11 15:43:59 -04:00
f56d751661
join multiple echos into 1
2018-07-10 13:47:30 -04:00
7ed316d3a5
We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148
2018-07-10 11:49:45 -04:00
13055bdda6
rework monitorprobe to be more logical, and not use Fatal.
2018-07-10 11:49:02 -04:00
d3034670a0
Merge branch 'master' into storageareas
2018-07-10 11:03:33 -04:00
a26ab59c30
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-10 11:01:47 -04:00
831fe57025
Spacing and google code style
2018-07-10 11:00:52 -04:00
77fbfccee0
fix #2149
2018-07-10 10:31:43 -04:00
8db6561030
Add missing ;
2018-07-09 13:08:20 -04:00
0824f740ae
Make video 100% width in cycle. Also fix monitors filtering by putting it in a form
2018-07-09 12:50:57 -04:00
Isaac Connor
Isaac Connor
Andrew Bauer
Dmitry Smirnov
Isaac Connor