Isaac Connor
8a5c989cac
fix warning when editing users after a monitor has been deleted
2018-09-18 08:52:43 -04:00
Isaac Connor
7f98277571
Merge updated Monitor.php that does caching
2018-09-15 09:52:08 -04:00
Isaac Connor
b0c555599c
Merge updated objects from sa. Implements caching of objects and fixes logged errors when using the default storage group. Fixes #2209
2018-09-15 09:42:59 -04:00
Isaac Connor
5dc852132e
Add defaults to Server, getting rid of error log when loading the default non existent storage area
2018-09-15 09:39:40 -04:00
Isaac Connor
246b50be9c
add caching to Server
2018-09-15 09:39:04 -04:00
Isaac Connor
02403c4c30
add caching to Monitor
2018-09-15 09:38:52 -04:00
Isaac Connor
27bc9d0a50
fix $limit should be $options['limit']
2018-09-15 09:38:36 -04:00
Isaac Connor
1db59283e3
use find_one when loading Monitor to take advantage of caching
2018-09-15 09:38:09 -04:00
Isaac Connor
2b66b28689
fix $limit should be $options['limit']
2018-09-15 09:37:44 -04:00
Isaac Connor
fa55cec12c
fix error when scale is auto
2018-09-14 16:57:28 -04:00
Isaac Connor
328b804465
spacing and quotes
2018-09-14 16:20:00 -04:00
Isaac Connor
870300ed93
remove debug line
2018-09-14 16:19:41 -04:00
Isaac Connor
77edb8f74b
Add test for auto scale and don't rescale. Use find_one when loading StorageArea so as to use caching
2018-09-14 16:19:29 -04:00
Isaac Connor
34c7ee32ee
Merge branch 'master' into storageareas
2018-09-14 15:13:57 -04:00
Isaac Connor
f1442eba90
once we have found a match for our origin, break out of loop
2018-09-14 14:56:26 -04:00
Isaac Connor
d9b1d3ec11
fix CORS Headers when we are coming from a non-standard port. Use a regexp instead of == so that we match regardless of port
2018-09-14 14:52:33 -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
Isaac Connor
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -04:00
Andrew Bauer
b3565fb983
remove file that should not be there
2018-09-12 07:02:57 -05: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
684f48979a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-11 14:30:19 -04:00
Isaac Connor
6fcf65459f
show video tag version if codec set to auto and DefaultVIdeo exists
2018-09-11 08:43:42 -04:00
Isaac Connor
8608fc97be
fix trms=>terms
2018-09-10 15:11:57 -04:00
Isaac Connor
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
Isaac Connor
93bec93d4a
Fix DefaultCodec in monitor
2018-09-10 15:09:27 -04:00
Isaac Connor
884ba078c7
Store codec in session for monitor
2018-09-10 15:09:08 -04:00
Isaac Connor
03f769eacc
Rough in codec specification for Events
2018-09-10 12:22:55 -04:00
Isaac Connor
978e332e3a
Merge branch 'master' into storageareas
2018-09-09 16:36:31 -04:00
Isaac Connor
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
Isaac Connor
5eec7e00c5
Merge branch 'master' into storageareas
2018-09-09 14:09:52 -04:00
Isaac Connor
55dcb161ae
find should always return an array
2018-09-09 13:59:10 -04:00
Isaac Connor
b4f80fbe11
Always return an array from find
2018-09-09 13:56:29 -04:00
Isaac Connor
b8f6617db3
fix another instance of find_all
2018-09-09 12:15:06 -04:00
Isaac Connor
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
Isaac Connor
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
Isaac Connor
40292f3dad
Add Compression flag
2018-09-07 09:08:33 -04:00
Isaac Connor
e21a7a769b
add ExportCompress
2018-09-05 11:13:32 -04:00
Isaac Connor
d5cab088d6
Merge branch 'master' into add_export_to_filter
2018-09-05 10:33:10 -04:00
Isaac Connor
c9b4f14171
fix deleting events
2018-09-04 09:57:32 -04:00
Isaac Connor
8245d193e2
Merge branch 'master' into storageareas
2018-09-04 09:48:47 -04:00
Isaac Connor
f4c2d8adea
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-03 12:29:09 -04:00
Andrew Bauer
e5a2581dcc
optionhelp - support links markdown style ( #2198 )
2018-09-03 09:56:52 -04:00
Isaac Connor
a258ca6f9a
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-08-31 19:13:50 -04:00
Isaac Connor
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
Isaac Connor
14b5fc3660
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-31 18:43:29 -04:00
Isaac Connor
2858564155
Merge branch 'master' into storageareas
2018-08-31 16:06:13 -04:00
Isaac Connor
9ec415b30a
Just reload the event view instead of dynamically updating the stream. Fixes #2196
2018-08-31 15:56:21 -04:00
Isaac Connor
798aab84f3
whitespace changes
2018-08-31 11:58:33 -04:00
Isaac Connor
623d31edae
Don't do csrf for view=image
2018-08-31 11:58:17 -04:00
Isaac Connor
7ee80e7cca
Debug lines should be debug, not warning
2018-08-31 11:58:03 -04:00
Isaac Connor
57d5e28870
clear output buffer before sending image. Adjust filename for saveAs when doing a scaled image. whitespace corrections. More Debug output
2018-08-31 11:57:47 -04:00
Isaac Connor
0823b28712
whitespace changes. Make Privacy test an else so that PRIVACY checks don't happen if not logged in
2018-08-31 10:37:11 -04:00
Isaac Connor
4b30ea7877
cleanup, whitespace
2018-08-31 10:35:23 -04:00
Isaac Connor
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
Isaac Connor
b1fe80a0bd
Add JSON/MaybeXS to dependencies, replacing JSON/Any
2018-08-30 18:30:33 -04:00
Isaac Connor
df3da6dd93
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-08-30 14:53:39 -04:00
Isaac Connor
4e32089a48
Merge branch 'master' into storageareas
2018-08-30 14:51:27 -04:00
Andrew Bauer
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
Isaac Connor
b7c86ef3d4
remove escapes that mess up the quoting
2018-08-30 12:26:18 -04:00
Isaac Connor
d3e089e3ce
remove an escape that messed up the quoting
2018-08-30 11:18:48 -04:00
Isaac Connor
42c6d90339
Merge branch 'storageareas' into zma_to_thread
2018-08-25 09:58:51 -04:00
Isaac Connor
f2d4739838
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-24 17:11:39 -04:00
Isaac Connor
4be2a0501c
Merge branch 'master' into storageareas
2018-08-22 17:22:54 -04:00
Isaac Connor
21d193294f
Log errors shouldn't be fatal
2018-08-22 17:22:40 -04:00
Isaac Connor
24f8d63b69
comment out a debug line
2018-08-20 11:13:38 -04:00
Isaac Connor
871e3807e6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-17 12:57:27 -04:00
Isaac Connor
40cd27e68a
when refreshing because ajax failed, reload the current view, not just index.php
2018-08-15 17:21:54 -04:00
Isaac Connor
d768f5f7fc
Merge branch 'master' into storageareas
2018-08-13 15:35:55 -04:00
Isaac Connor
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
.
2018-08-13 15:33:43 -04:00
Isaac Connor
026390ccd8
Merge branch 'master' into storageareas
2018-08-13 15:26:29 -04:00
Andrew Bauer
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
Isaac Connor
3ab542199c
Merge branch 'master' into storageareas
2018-08-13 11:17:04 -04:00
Isaac Connor
94401b6765
create ZM_PATH_SOCKS if it doesn't exist
2018-08-11 13:35:57 -04:00
Andrew Bauer
3dc424282b
Support quoting config variables ( #2175 )
...
* allow handling of quotes in config files
* copy paste error
* surround zm_arptool in quotes
2018-08-11 12:56:16 -04:00
Isaac Connor
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
Isaac Connor
cf5eab4dbc
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-08-09 12:50:08 -04:00
Isaac Connor
3962c52288
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-09 11:23:37 -04:00
Isaac Connor
2ad4b17d36
Merge branch 'master' into storageareas
2018-08-08 16:24:55 -04:00
Isaac Connor
037abd4916
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-08 15:11:42 -04:00
Isaac Connor
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
Isaac Connor
23ddc83ad4
fix_2167 ( #2168 )
...
* Populate a global from the session on every request. Use the object instead of using allowedMonitors in session.
* fix when gets loaded.
* use for auth, and add Monitor Edit checks to Zone add/delete/edit
* add back the ZM_OPT_USE_AUTH test for being logged in in AppController
* Update permissions code to use
* change quotes
* Update permission code to use
* Use instal of session for systemPermission
* deprecate montiorPermision in session
* use instead of session streamPermission
* move login code back into AppController. Has to be done for every request
* deprecate eventPermission, controlPermission and systemPermission in session.
* handle auth params in query string as well as post
* exit on HUP to free up memory.
* add missing global user
* system should be System
2018-08-08 09:59:46 -04:00
Isaac Connor
af7c81bda1
Merge branch 'fix_2167' into storageareas
2018-08-03 11:02:56 -04:00
Isaac Connor
683789eb41
Merge branch 'master' into storageareas
2018-08-03 10:27:48 -04:00
Isaac Connor
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
Isaac Connor
e935570a40
Merge branch 'fix_2167' into storageareas
2018-08-02 18:08:54 -04:00
Isaac Connor
50c7eec0ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-02 05:25:53 -04:00
Isaac Connor
2c1a3348af
handle auth params in query string as well as post
2018-08-01 12:40:12 -04:00
Isaac Connor
5b878d5e89
deprecate eventPermission, controlPermission and systemPermission in session.
2018-08-01 12:10:43 -04:00
Isaac Connor
434c1508bc
Merge branch 'master' into fix_2167
2018-08-01 10:01:51 -04:00
Isaac Connor
1534934b20
move login code back into AppController. Has to be done for every request
2018-08-01 10:01:35 -04:00
Isaac Connor
b85f74bb99
when selecting auto, we need to remove the width & height css key
2018-07-31 16:55:54 -04:00
Isaac Connor
c934295bf9
we shall always pass width & height as pixels without units.
2018-07-31 16:55:13 -04:00
Isaac Connor
b20d61e0df
fix onclick when editing layout
2018-07-31 16:47:25 -04:00
Isaac Connor
d50e95fe9b
redirect to montage instead of montagereview
2018-07-31 16:46:36 -04:00
Isaac Connor
588ca2cf62
Merge branch 'master' into storageareas
2018-07-31 10:52:24 -04:00
Isaac Connor
886391a547
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-31 10:16:05 -04:00
Isaac Connor
363e1dda97
Add some more Monitor defaults, mainly Refresh which gets called in watch.js.php
2018-07-31 10:15:26 -04:00
Roman Dissertori
48b91c5544
Bugfix in Control and added new Camera ( #2171 )
...
* fixed control typos
missing word "s" for "Controls" Table for database queries
* added Dericam P2 camera Control
* fixed missing CanReset column
* Update DericamP2.pm
* added some more missing controls
CanSleep, CanWake
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update zm_create.sql.in
2018-07-28 09:26:02 -04:00
Isaac Connor
bb4861bb8c
Merge branch 'storageareas' into add_export_to_filter
2018-07-25 17:08:20 -04:00
Isaac Connor
6c1371fac7
Merge branch 'master' into add_export_to_filter
2018-07-25 17:06:49 -04:00
Isaac Connor
2ff47e04da
the updated video-js.css puts the fonts into a font dir.
2018-07-25 17:04:42 -04:00
Isaac Connor
00bdfdcb16
increase height of function popup so that dropdown options fit in it
2018-07-25 09:39:24 -04:00
Isaac Connor
6ab1c3ced8
proper case table header
2018-07-25 09:39:08 -04:00
Isaac Connor
c095b9cd33
Merge branch 'master' into fix_2167
2018-07-24 16:48:29 -04:00
Isaac Connor
c6aae346b9
use instead of session streamPermission
2018-07-24 16:43:07 -04:00
Isaac Connor
3a676cd569
deprecate montiorPermision in session
2018-07-24 16:42:36 -04:00
Isaac Connor
8098051268
Use instal of session for systemPermission
2018-07-24 16:42:16 -04:00
Isaac Connor
dc57a3c91c
fix spacing/quotes/google code style
2018-07-24 16:41:09 -04:00
Isaac Connor
98f279addb
Update permission code to use
2018-07-24 12:02:35 -04:00
Isaac Connor
ba0ab50545
change quotes
2018-07-24 12:02:18 -04:00
Isaac Connor
00cfb100db
Update permissions code to use
2018-07-24 12:02:03 -04:00
Isaac Connor
3255a2829f
add back the ZM_OPT_USE_AUTH test for being logged in in AppController
2018-07-24 12:01:40 -04:00
Isaac Connor
08d3f98e5e
use for auth, and add Monitor Edit checks to Zone add/delete/edit
2018-07-24 11:49:40 -04:00
Isaac Connor
caa8adae5e
fix when gets loaded.
2018-07-24 10:40:18 -04:00
Isaac Connor
8c35d4d1b0
Populate a global from the session on every request. Use the object instead of using allowedMonitors in session.
2018-07-24 10:32:37 -04:00
Isaac Connor
965ffda01e
Add button types. fix extra px in slideheight
2018-07-17 15:32:30 -04:00
Pliable Pixels
997aa6aa55
fixed getCredentials not working if called directly
2018-07-17 13:57:20 -04:00
Isaac Connor
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
Isaac Connor
a12c7d90ab
Merge branch 'master' into add_export_to_filter
2018-07-17 08:26:58 -04:00
Isaac Connor
37779ff51d
use a window.location.assign instead of creating a popup to export
2018-07-17 08:26:19 -04:00
Isaac Connor
683e8716f2
add type=button to button to prevent them from submitting
2018-07-17 08:25:15 -04:00
Isaac Connor
a41ce9c9fe
default to exporting all event data
2018-07-17 08:24:19 -04:00
Pliable Pixels
0ff9002adf
2156 api login ( #2157 )
...
* error can be due to bad user or password
* added login/logout and related private functions
* handle case when userLogin fails, current code returns PHP error for and API throw is not called
* formatting
* converted login params to POST, removed user=&pass= for other APIs
* formatting
* add auth check back but leave out login/out
* fixes to make it work across zmN, postman and curl
* added back enabled check
2018-07-15 21:17:35 -04:00
Isaac Connor
0d75586fac
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-12 15:05:13 -04:00
Isaac Connor
43827953cd
test for existence of HTTP_X_FORWARDED_PROTO
2018-07-12 15:04:54 -04:00
Isaac Connor
05f0338219
use a unique connection key for downloads
2018-07-12 14:07:19 -04:00
Isaac Connor
43cee7c383
make export work and fix links to jquery.js
2018-07-12 14:07:03 -04:00
Isaac Connor
95e4341d28
test for existence of DiskSpace in array
2018-07-12 14:05:43 -04:00
Isaac Connor
e05604e4b3
Alter code style, spacing
2018-07-12 14:05:23 -04:00
Isaac Connor
82115ed2d3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-12 11:44:26 -04:00
Isaac Connor
4aa289cd66
fix reCaptcha failure still allowing login
2018-07-12 11:44:20 -04:00
Isaac Connor
ce22f207e3
Merge branch 'master' into add_export_to_filter
2018-07-12 11:40:32 -04:00
Isaac Connor
903127fe85
Merge branch 'storageareas'
2018-07-12 11:39:33 -04:00
Isaac Connor
eb610cd3a1
rewrite the HTTP_X_FORWARDED_PROTO test to just make it part of the if instead of modifying SERVER['HTTPS']
2018-07-12 11:38:58 -04:00
Isaac Connor
2767e7cca3
remove unneeded packaging files from chosen.
2018-07-12 11:35:02 -04:00
Isaac Connor
87f68e4a5b
Merge branch 'master' into storageareas
2018-07-12 10:47:18 -04:00
Isaac Connor
dd4392bf12
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-07-12 10:11:18 -04:00
Mike Brown
6a5ff83848
Adding support for HTTP_X_FORWARDED_PROTO
2018-07-11 21:01:37 -05:00
Isaac Connor
0acad44b4a
test for existence of Storage path before trying things like disk_total_space which will fill the html output with php errors.
2018-07-11 17:21:44 -04:00
Isaac Connor
8a936cdcc9
Merge branch 'master' into add_export_to_filter
2018-07-11 16:43:02 -04:00
Isaac Connor
410b1ad810
Merge branch 'master' into cycle_width
2018-07-11 15:49:44 -04:00
Isaac Connor
856608d720
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-11 15:48:27 -04:00
Isaac Connor
05615c5cf4
We should not use a hard path in cache bust
2018-07-11 15:48:01 -04:00
Dmitry Smirnov
7db1fabbe1
Removed "chosen" web site; "prism.js" is not distributable. ( #2154 )
2018-07-11 15:46:43 -04:00
Isaac Connor
115e554d94
Remove erroneous t and convert tabs to spaces
2018-07-11 15:46:11 -04:00
Andrew Bauer
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
Isaac Connor
fe5ebe094d
More work just using auth.php instead of cake code. Don't reload the User object
2018-07-11 11:45:49 -04:00
Isaac Connor
b8691e4654
Don't need global cookies. Only open session if needed in userLogin
2018-07-11 11:45:19 -04:00
Isaac Connor
c6ded845d0
Return the user db row ifrom userLogin instead of assuming it will be accessed as a global. Add is_session_started function and use it to detect when we need to start/stop the session in generateAuthHash
2018-07-11 10:34:45 -04:00
Isaac Connor
4f80ca6871
Use userLogin function from auth.php instead of cake code.
2018-07-11 10:33:49 -04:00
Isaac Connor
983e3c45be
Fix spacing and quotes
2018-07-11 09:54:25 -04:00
Isaac Connor
f10509690b
add username and passwordHash to Session so that generateAuthHash works
2018-07-11 09:54:15 -04:00
Isaac Connor
f56d751661
join multiple echos into 1
2018-07-10 13:47:30 -04:00
Isaac Connor
21438d17ac
Fix authenticating User
2018-07-10 13:19:51 -04:00
Isaac Connor
930d929427
Merge branch 'storageareas' into api_auth
2018-07-10 12:46:30 -04:00
Isaac Connor
d9f5d5fe4c
Merge branch 'master' into storageareas
2018-07-10 12:46:09 -04:00
Isaac Connor
e6a9422636
Add entry for StorageArea
2018-07-10 12:26:25 -04:00
Isaac Connor
a0992baa16
Add entry for SignalCheckPoints
2018-07-10 12:25:36 -04:00
Isaac Connor
d05ad12b48
We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148
2018-07-10 11:54:30 -04:00
Isaac Connor
46a496aefa
rework monitorprobe to be more logical, and not use Fatal.
2018-07-10 11:54:16 -04:00
Isaac Connor
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
Isaac Connor
13055bdda6
rework monitorprobe to be more logical, and not use Fatal.
2018-07-10 11:49:02 -04:00
Isaac Connor
d3034670a0
Merge branch 'master' into storageareas
2018-07-10 11:03:33 -04:00
Isaac Connor
a26ab59c30
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-10 11:01:47 -04:00
Isaac Connor
831fe57025
Spacing and google code style
2018-07-10 11:00:52 -04:00
Isaac Connor
77fbfccee0
fix #2149
2018-07-10 10:31:43 -04:00
Isaac Connor
8db6561030
Add missing ;
2018-07-09 13:08:20 -04:00
Isaac Connor
3ecf0055b5
spacing
2018-07-09 13:07:16 -04:00
Isaac Connor
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
65564fa480
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-09 12:39:08 -04:00
Isaac Connor
12a673169f
spacing
2018-07-09 12:33:37 -04:00
Isaac Connor
ba8dc2059d
spacing
2018-07-09 12:33:21 -04:00
Isaac Connor
afa31842b5
spacing
2018-07-09 12:28:39 -04:00
Isaac Connor
9561401a44
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-09 12:02:14 -04:00
Isaac Connor
62946578c6
Use to determine export filename
2018-07-09 12:02:05 -04:00
Isaac Connor
e29ed9bc54
add Export button to Filter
2018-07-09 12:01:40 -04:00
Isaac Connor
4c916e880b
Pass event_ids when reloading after export generation.
2018-07-09 12:01:25 -04:00
Isaac Connor
4de7ae8edc
Pass event_ids when reloading after export generation.
2018-07-09 12:01:09 -04:00
Isaac Connor
5ea2edb2ee
Convert export from a popup to a full page.
2018-07-09 12:00:10 -04:00
Isaac Connor
8ca35fa5ab
add Export button to Filter
2018-07-09 11:59:44 -04:00
Isaac Connor
24a5b78f4c
Convert export from a popup to a full page. Add loading events by filter.
2018-07-09 11:59:08 -04:00
Isaac Connor
e85c16aba6
Cleanups, add video viewing
2018-07-09 11:58:30 -04:00
Isaac Connor
fd5cf07bfb
Make server name and hostname full width.
2018-07-09 10:48:14 -04:00
Isaac Connor
639f916156
spacing
2018-07-09 09:59:03 -04:00
Isaac Connor
2c0a119186
Merge ../ZoneMinder.master into add_export_to_filter
2018-07-09 09:56:21 -04:00
Isaac Connor
6cf336cc33
Always use a /zm in urls to zm assets
2018-07-09 09:47:20 -04:00
Isaac Connor
4a4e845e9c
Fix stupid code that defaulted minTimeSecs to 2010 instead of the first event
2018-07-08 16:24:53 -04:00
Isaac Connor
ade8d078df
Define minTimeSecs and maxTimeSecs
2018-07-08 15:28:55 -04:00
Isaac Connor
2be217aaaf
Merge ../ZoneMinder.master into add_export_to_filter
2018-07-08 15:21:42 -04:00
Isaac Connor
26b2887d6b
Add Export Matches
2018-07-08 15:21:07 -04:00
Isaac Connor
d8a4acf319
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-08 15:08:54 -04:00
Isaac Connor
d257b53e82
Add missing ) to frame sql when no min/max time specified
2018-07-08 15:08:49 -04:00
Dmitry Smirnov
b5ca671103
Misc JS hygiene ( #2150 )
...
* fixed "jquery-ui.js" symlink.
* Bootstrap source, matching minified version.
Also origin URL.
* moment.js: added missing source and URL of origin.
* video-js: replaced bad case of source-less minified binary.
Original file was not identical to https://github.com/videojs/video.js/blob/v4.11.4/dist/video-js/video-js.min.css
i.e. it was modified in unknown way without sources. Very bad.
* jQuery: renamed URL file for consistency
* mootools-core-compat.js: replaced original with unknown modifications; renamed; added origin URL.
* mootools-more: rename file to properly reflect version.
This is a default build without any options.
* prism.js.FIXME: note about outdated source-less file.
2018-07-07 10:30:16 -04:00
Andrew Bauer
f5dce7e863
Merge pull request #2145 from onlyjob/arp_regex
...
fix regex to match IP and first numbers of MAC in the `arp -a` output (Closes : #2144 )
2018-07-07 08:24:47 -05:00
Andrew Bauer
015013f247
Center WEB_CONSOLE_BANNER
...
Center WEB_CONSOLE_BANNER under the server stats
2018-07-06 15:59:10 -05:00
Dmitry Smirnov
dcb9999398
fix regex to match IP and first numbers of MAC in the `arp -a` output ( Closes : #2144 );
...
fixes probing of network cameras.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2018-07-06 16:16:36 +10:00
Andrew Bauer
084f1ab1d6
Add missing reloadWebSite js function
...
Somehow this went missing when the new website monitor type was merged
2018-07-05 08:43:21 -05:00
Isaac Connor
cf4a1c73fd
Always us /zm in cache_bust
2018-07-04 14:46:22 -04:00