27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
aa0a831223
Update Host.php ( #2062 )
...
Remove whitespace causing problems with session authentication
2018-03-13 22:28:38 -04:00
16a2c173cb
fix Column 'Method' cannot be null
2018-03-10 20:29:25 -06:00
0df59c26b8
fix typo
...
Fix unable to enable camera
2018-03-10 19:48:53 -06:00
d1837a96b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-09 07:25:28 -05:00
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
0654c7e3b2
Adding group handling in API
2018-03-04 23:01:52 -08:00
1c740de5dc
Add Return False to Event Back
2018-03-04 13:37:30 +11:00
db8ab28845
Add return false to window.history.back
...
Adding this makes it work in Safari
2018-03-04 08:37:21 +11:00
ed4dac761a
Merge pull request #2049 from ZoneMinder/fix_2044
...
Fix 2044
2018-03-03 12:49:57 -06:00
3fc7ebee6c
Merge ../ZoneMinder.master into storageareas
2018-03-03 09:32:23 -08:00
2864876d28
fix spacing, add code comment
2018-03-03 09:25:04 -08:00
c53b6ffbb0
rework montagereview to load data faster and leave event and frame data in json objects
2018-03-02 18:26:50 -08:00
3e77a85549
url to css/spinner.css should be relative
...
fixes http 404 not found errors for this css file
2018-03-02 17:19:10 -06:00
7e628bc3fd
add showing groups under Monitor Name on console
2018-03-01 19:23:46 -08:00
9a157bf4ca
add Type, MaxFPS, AlarmMaxFPS to field defaults
2018-03-01 19:23:27 -08:00
debe4607bc
add Parent and Parents functions
2018-03-01 19:23:03 -08:00
c5eec7e2fd
hide save button on successful form completion so we don't get a duplicate submit
2018-02-27 15:10:45 -08:00
83fad681b3
use button tags and hide the button content after click
2018-02-27 11:49:13 -08:00
c50627fd88
GroupIds needs to be an array
2018-02-27 11:21:04 -08:00
0312dc3c2d
Add Group saving to Monitor saving
2018-02-27 11:20:52 -08:00
67cc7dcf7c
Add a GroupIds function to return the groups
2018-02-27 11:20:41 -08:00
6a6eb87686
fix defaults
2018-02-26 18:00:02 -08:00
793e87c26d
Apply chosen style to group and linked monitors dropdown
2018-02-26 17:58:20 -08:00
735e36c2a8
split htmlSelect into htmlOptions
2018-02-26 17:08:30 -08:00
944298428a
break out get_groups_dropdown to call a function called get_dropdown_options to populate thje options
2018-02-26 16:10:10 -08:00
92c34f6043
add Groups to monitor edit
2018-02-26 16:09:36 -08:00
9d1a8b1e18
Add the danger css tag to cpuload > 5, freeram < 10% and freeswap < 10%
2018-02-26 10:39:45 -08:00
bfbefc4c32
Use our new Control object to do the saving instead of a generic function
2018-02-26 07:31:48 -08:00
c6f632325e
create an object for Controls entries, with appropriate defaults
2018-02-26 07:31:22 -08:00
464b588f08
add a case for toggle, which are booleans and default them to false
2018-02-26 07:29:49 -08:00
9480adcc31
include authentication info when building the link to mp4
2018-02-22 13:05:53 -05:00
c5081d1e4e
drop session before executing filter
2018-02-21 13:54:06 -05:00
7d88e25ef9
simplify thumbnail/snapshot usage a bit
2018-02-19 17:25:49 -05:00
505e726636
turn off debug
2018-02-14 13:51:49 -05:00
eeb7190812
fix rand replacing in image url
2018-02-14 13:16:30 -05:00
4c1abf93ba
fixup navbarreloader wrt auth_hash
2018-02-14 13:16:14 -05:00
002f22f685
generateAuthHash is already called earlier in index.php, so it will always be up to date. Just include it in the response.
2018-02-14 13:15:22 -05:00
45bf4544ca
rename SetImageSource to getImageSource which is what it actually does
2018-02-14 11:58:47 -05:00
a09bf3b097
slightly improve auth debugging
2018-02-14 11:58:00 -05:00
2774fded57
add debugging and put NavBarHTML back in message
2018-02-14 11:57:45 -05:00
4df8cdc685
add auth_hash updating to the navbar reload.
2018-02-14 10:44:48 -05:00
c7a43a53f0
Sort the event records
2018-02-13 11:28:06 -05:00
535cdf6485
When there isn't an event for the given moment, play the previous one. If still no events found, popup live
2018-02-13 11:27:55 -05:00
9fa28106e5
return proper hostname when not using multiple servers
2018-02-12 14:44:58 -05:00
ad1b9699f1
Remove CssFileExtra
2018-02-11 14:18:40 -05:00
7abe7d6fe3
fix centering in buttons
2018-02-11 14:18:26 -05:00
a35ba812b7
fix merging conditions
2018-02-09 07:57:52 -08:00
08c359fdbc
add some margin to minTime and maxtime
2018-02-09 07:31:30 -08:00
63a214869e
rework montagereview to be more performant.
2018-02-09 07:31:19 -08:00
6518311022
Use Status and CaptureFPS and AnalysisFPS to do status coloration
2018-02-09 07:31:03 -08:00
4b51fed500
Rework order of filters. Put Monitors at the end. recalc selected_monitor_ids
2018-02-09 07:30:53 -08:00
6ee133bf6b
give some left margin on labels
2018-02-09 07:30:43 -08:00
c454d5355d
adjust column width on console
2018-02-09 07:30:32 -08:00
cb9eef8563
show No streams found if none were found
2018-02-09 07:30:12 -08:00
6b6fdc7cee
Log the sql before running it
2018-02-09 07:29:10 -08:00
6e240f669c
fix filtering
2018-02-08 14:25:58 -08:00
894467cdef
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-02-08 10:51:49 -08:00
b8b2edf847
close the datetime inputs
2018-02-08 10:50:33 -08:00
2a00cf852a
Set a type on the buttons so that they act right
2018-02-08 10:50:22 -08:00
1ed8af8aac
upgrade jquery-ui to 1.12.1
2018-02-08 13:19:16 -05:00
4777808cf0
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-02-08 13:15:41 -05:00
95cfdb327d
further separate addBtn and cloneBtn, fixes
2018-02-08 13:15:27 -05:00
cdfc7f1808
give the buttons div an id and move the styling into the css
2018-02-08 09:30:48 -08:00
4240dc4bde
spacing, add a test for minTime being after maxTime
2018-02-08 09:30:26 -08:00
d857c2c98a
increase download popup height
2018-02-08 09:29:54 -08:00
c47c81b810
title is translated, so we can't use it to determine which page we are on, so use view
2018-02-08 09:29:42 -08:00
16604e3ee4
fix including jquery in export
2018-02-08 09:29:12 -08:00
f987bde6df
fix styles on montagereview. Mostly remove borders and make timelineDiv 100%
2018-02-08 09:28:52 -08:00
cfe53c0ffe
Explicitly set the danger class on each line because they can get out of sync when using the All toggle
2018-02-08 09:57:11 -05:00
babae4629a
Update and fix console buttons. Use a separate button for clone
2018-02-08 09:47:16 -05:00
f6bb3017ef
Use absolute patch to point-g.png. Makes the assumption that /zm always works.
2018-02-08 07:49:52 -05:00
a4c59e3e50
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-02-07 09:07:57 -05:00
dec82ecf5c
Fix for when specifying page 1 and no pages
2018-02-07 09:07:51 -05:00
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
058b2be9a7
fix chosen sprites
2018-02-02 13:26:44 -05:00
93996402d9
turn off debug
2018-02-02 13:24:07 -05:00
515af57c56
Fix some styles on filter edit
2018-02-02 13:24:01 -05:00
dee843d7da
add All and remove default from Storage dropdown options
2018-02-02 12:48:49 -05:00
060e6893cc
fix Storage dropdown population and don't clear value on line type change
2018-02-02 12:48:22 -05:00
e8ace6d4dd
include base version of jquery-ui-theme
2018-02-02 12:47:51 -05:00
b0f755b5fc
put unarchive, archive, delete in a transaction for speed
2018-02-02 12:14:01 -05:00
68521aa0d4
spacing, remove debug lines
2018-02-02 10:27:50 -05:00
929e49c301
early return if there is no rows returned. Improve debug when there is a row but the specified column isn't present
2018-02-02 10:27:30 -05:00
26ac1fd695
Include soap version in list of onvif cameras
2018-02-01 11:32:13 -05:00
212882efb9
db errors should NOT BE FATAL!
2018-02-01 11:31:25 -05:00
a610d564d1
tweak timeouts
2018-01-31 15:51:12 -05:00
b390633f70
Fix authHash generation
2018-01-31 14:58:01 -05:00
132fff1931
An ok json return with no status is possible now
2018-01-31 14:35:48 -05:00
018523134e
use ZM_BASE_PROTOCOL when loading plugins. https can't load http content
2018-01-31 14:35:23 -05:00
7c3efc02cd
put back old add monitor popup
2018-01-31 11:56:57 -05:00
b1f2b677c3
remove path from source
2018-01-30 10:09:12 -05:00
7ec71868a6
Switch CakePHP-Enum-Behavior to my fixed version
2018-01-29 21:25:40 -05:00
b9a98d34bf
strip query and scheme from source
2018-01-29 19:03:16 -05:00
a60da6811b
revert adding custom port for status updates. It breaks in the non-multiserver case.
2018-01-29 15:17:22 -05:00
6acb555c52
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-01-29 10:42:23 -08:00
d19b8bc5cf
add default value for ServerId in new Storage Object
2018-01-29 10:41:59 -08:00
06673019f9
add default values for zmstats, zmaudit, zmtrigger in new Server
2018-01-29 10:41:43 -08:00
31b7deb101
Return NULL on error in dbQuery
2018-01-29 10:41:24 -08:00
c9e32fb344
Check for successful Monitor db Insertion
2018-01-29 10:41:09 -08:00
e638817cb9
Check for ServerId exists in MonitorObject
2018-01-29 10:40:50 -08:00
8979f14314
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-29 11:29:33 -05:00
a76fcb331c
Remove debugging. Treat can't get semaphore as a non-error
2018-01-29 08:25:46 -08:00
73d84c6b08
fix typo
2018-01-29 07:53:48 -08:00
4751920423
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-29 07:49:38 -08:00
35cda5cf17
Merge sjc04p1fviap02:ZoneMinder into storageareas
2018-01-29 07:45:55 -08:00
a490c0e5bf
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-01-29 07:45:37 -08:00
a782ef1db7
Add debug tests for loading all events
2018-01-29 07:45:28 -08:00
e672841a8d
Add remote server port to monitor url
2018-01-29 07:42:43 -08:00
bfbd033971
Fix getting stream status updates when # of files open is > 1024.
2018-01-29 07:41:29 -08:00
03122b9015
add onFailure logger, and change link to chain so that responses don't just disappear
2018-01-29 07:38:02 -08:00
fc4edefd81
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-29 07:35:24 -08:00
dc6842bfbd
Add remote server port to monitor url
2018-01-29 07:32:40 -08:00
b793e6659b
add onFailure logger, and change link to chain so that responses don't just disappear
2018-01-29 07:32:02 -08:00
984d3a2dd1
add Monitor Name to the response listing the available camera feeds
2018-01-29 07:30:46 -08:00
0b2d752ea4
Use chosen on the MonitorIds select.
2018-01-29 10:29:59 -05:00
8c4a786114
Move status fields out of the object fields
2018-01-29 10:27:46 -05:00
b1b8b42f2b
Fix getting stream status updates when # of files open is > 1024.
2018-01-29 07:21:31 -08:00
2dcb0d183f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-28 18:07:33 -08:00
f2b335c7b2
SORT auto server selection in ascending order
2018-01-28 18:07:01 -08:00
51d5fd38aa
scan the board for the names of the camera inputs
2018-01-28 18:06:13 -08:00
c59751713b
fix redirect
2018-01-28 17:31:00 -05:00
0d734a880c
add hack to ensure that next and previous operate on time
2018-01-28 17:30:49 -05:00
8a4b17fb50
turn into a url instead of boolean. Use it to refresh the options page on change so that changes are instantly noticable
2018-01-28 15:13:57 -05:00
5d4fde88d9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-27 12:17:13 -08:00
bc6d8623a6
add a semaphore around the socket creation and retention. I think concurrent processes are messing with the sockets.
2018-01-27 15:03:22 -05:00
456f29fcba
Rename column Id OF Monitor_Statuses to simplify JOINS.
2018-01-26 13:39:37 -05:00
dc46f23af0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-26 10:17:54 -08:00
bb9d640c01
use instead of ['request'] to fix behaviour when request has been emptied due to failed auth
2018-01-26 12:56:38 -05:00
348fdafa4e
Update submofule
2018-01-26 11:34:45 -05:00
475c465b0d
define
2018-01-26 10:39:12 -05:00
d001ce467e
use get for status JSON requests
2018-01-26 10:31:55 -05:00
a0892b1ffc
Whitespace
2018-01-26 10:30:59 -05:00
1503c586d2
When there is an error saving, add the invalidFields() info to the error message. Only restart the daemon on success.
2018-01-26 10:30:29 -05:00
1e3cf9bbf8
handle no streams better
2018-01-25 09:14:21 -08:00
320f5c2083
Turn off error reporting in output
2018-01-25 09:13:44 -08:00
2ea2f46ec8
braes
2018-01-25 09:13:31 -08:00
703cd332df
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-25 08:43:53 -08:00
356015a492
Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla
2018-01-25 08:42:08 -08:00
42a27c2ca9
Fix Servers dropdown
2018-01-25 08:41:54 -08:00
7165f3cfd8
Add server auto-selection
2018-01-25 08:41:42 -08:00
57bae7cf17
Fix filtering
2018-01-25 09:14:09 -05:00
c35c9c4083
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-25 08:46:38 -05:00
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
fb50f6f996
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-24 17:14:42 -08:00
cc34a3c566
change button type
2018-01-24 23:08:12 +01:00
e4c28150fe
cleanup, code style, quotes. Include jquery source instead of trying to link to it
2018-01-24 23:07:57 +01:00
5865bbfb12
turn off debugging
2018-01-24 23:07:21 +01:00
a331bfc494
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-24 22:50:15 +01:00
e364a541d4
Whitespace and use ZM_DIR_EXPORT instead of ZM_DIR_TMP
2018-01-24 22:21:43 +01:00
50fc4a2d94
Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table.
2018-01-24 11:51:11 -05:00
a271f1776d
Fix #80 don't escape NULL value when building SQL
2018-01-24 10:35:22 -05:00
c7ecd580c1
Fix #81 by testing for non-numeric characters in LIMIT. Change type of input to number, making it harder to enter non-numeric characters
2018-01-24 10:27:01 -05:00
9f89ccfa32
revert issue with AUTH_HASH_LOGINS
2018-01-24 07:46:56 -05:00
ea4937b75e
put back missing s
2018-01-23 17:47:24 -05:00
d9252e2d47
Merge branch 'storageareas' into tesla
2018-01-23 13:29:37 -08:00
fdf1ef795f
Add default value for newStorage['StorageId']
2018-01-23 13:28:46 -08:00
0742217599
Only populate monitorNames if query is valid
2018-01-23 13:28:29 -08:00
933259f9a5
fix bracket
2018-01-23 13:16:21 -08:00
447a0975c7
fix bracket
2018-01-23 13:15:48 -08:00
c85bb6e614
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-23 09:44:28 -08:00
de08e3114e
more and less debug
2018-01-23 18:16:37 +01:00
8bd1e4cec6
Only show groups filter if there are groups
2018-01-23 18:15:59 +01:00
1b23f7b564
turn off debug
2018-01-23 17:34:49 +01:00
b22f20cb93
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-23 15:40:07 +01:00
994766fd50
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-22 13:25:38 -08:00
8fe0e1bdc0
fix Debug => Logger::Debug
2018-01-22 15:58:01 -05:00
13bfbe4f4b
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-22 20:07:11 +01:00
8a27ea3a04
Always populate the monitorNames object, and check for duplicate names when saving an existing Monitor as well as new monitors
2018-01-22 11:42:52 -05:00
97595051ce
whitespace
2018-01-22 11:42:19 -05:00
924fa80ea6
When renaming a monitor, take change of storage area into account when creating dirs and symlinks
2018-01-22 11:42:07 -05:00
c04fcfb239
Need a few more pixels of width to fit all preset buttons
2018-01-22 15:50:18 +01:00
06c9266c62
use snapshot.jpg more
2018-01-22 03:27:01 +01:00
181a94de82
test for existence of port in url_parts
2018-01-21 11:10:34 -05:00
bd2da456f4
handle non-multi-server case when restarting monitors via API
2018-01-19 21:09:33 -05:00
9b7fee03c7
Add Server auto-selection
2018-01-19 11:00:46 -08:00
e26747b5cc
show port when it's not the standard port
2018-01-19 12:15:26 -05:00
773ed11742
use Object methods to restart zmc and zma. restart them on save of existing Monitor
2018-01-19 08:17:53 -08:00
d1dbf4cc31
Turn off debug
2018-01-19 08:17:33 -08:00
3abd873c34
Turn off debug
2018-01-19 08:17:17 -08:00
0f3cf33565
Move unparse_url from add_monitors to functions to make it generally available
2018-01-19 08:16:52 -08:00
2720b254ff
Add Triggers to Monitors field to quiet error
2018-01-19 08:16:41 -08:00
d586faf7fb
Fix restarting Monitor
2018-01-19 08:16:28 -08:00
95f054c1e6
Show entire path for ffmpeg monitors. Strip out username/password though
2018-01-18 12:40:41 -08:00
484a361af8
use Object methods to restart zmc and zma. restart them on save of existing Monitor
2018-01-18 12:40:10 -08:00
30b0d2c5b1
Turn off debug
2018-01-18 12:39:50 -08:00
c08cbdb9dd
Turn off debug
2018-01-18 12:39:39 -08:00
f9d8c349e1
Move unparse_url from add_monitors to functions to make it generally available
2018-01-18 12:39:08 -08:00
04eef58883
Add Triggers to Monitors field to quiet error
2018-01-18 12:38:48 -08:00
cdfa565579
Fix restarting Monitor
2018-01-18 12:38:26 -08:00
ecd5e01b92
Show port when using Remote Method and Port is non-standard
2018-01-18 10:21:05 -08:00
55fa86c7be
Add a few more extensions to the list of files to include in export
2018-01-17 16:57:38 -05:00
ace66cf977
show port in source column
2018-01-17 13:33:22 -08:00
494d080740
show port in source column
2018-01-17 13:27:44 -08:00
4fecdbd0fa
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-17 12:28:33 -08:00
212bfd4a2c
add Monitor to info shown on event
2018-01-17 12:20:15 -08:00
93623f3fd8
fix filtering by monitor in montagereview
2018-01-17 11:59:54 -08:00
1fbb5bc0f8
Fix zmaudit.pl => zmaudit, etc.
2018-01-17 14:22:04 -05:00
fe7c54bc26
Fix Debug
2018-01-16 17:54:37 -05:00
7b452f6937
Fix Debug -> Logger::Debug
2018-01-16 11:15:59 -08:00
e78a40b45f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-16 11:02:20 -08:00
27ebf1a4aa
Comment out debug code
2018-01-16 14:02:04 -05:00
a8dde207e1
Warning should be a debug
2018-01-16 12:33:50 -05:00
9c184bcb42
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-16 08:50:13 -08:00
9f42871c86
Fix Zone Triggers, bump version
2018-01-16 11:49:17 -05:00
b09bb528a5
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-16 08:42:41 -08:00
004fdbad9b
We don't need to update ZoneCount manually anymore
2018-01-16 09:31:23 -05:00
9284e26512
get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot.
2018-01-13 15:15:14 -05:00
bfa31297be
Merge branch 'storageareas' into tesla
2018-01-12 11:26:19 -08:00
4b37c6fc42
Change the Group dropdown to a single indented dropdown, and use chosen on it
2018-01-12 11:25:15 -08:00
c139f7a1bf
we don't need the group setting in the url
2018-01-12 11:24:52 -08:00
5f8756d7ad
Set Tesla defaults for new monitors
2018-01-12 08:11:37 -08:00
ff9f43b5a1
put back code to switch to add_monitors
2018-01-12 08:11:25 -08:00
95c3c26eda
cleanup old Add Monitr button
2018-01-12 08:11:07 -08:00
e2ac13d03e
pretty up the add_monitors interface a bit, add some instructions
2018-01-12 08:10:46 -08:00
3c55557c77
Handle to val in a filter term
2018-01-11 22:53:53 +01:00
666005fb5d
fix single event replay by fixing the reference to player which should be vid
2018-01-11 14:42:00 -05:00
b013da6b95
Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.
2018-01-11 13:14:11 -05:00
6a36db0b6d
move flat skin to base.
2018-01-11 12:24:53 -05:00
3ba6760f1b
increase logout popup size
2018-01-11 10:58:06 -05:00
3b81cb9eed
Replace ZoneMinder with ZM_WEB_TITLE
2018-01-11 10:57:43 -05:00
b1e8963da9
add header to the login page
2018-01-11 10:57:29 -05:00
399907a9f0
Always load a base css style. Only show navbar contents when logged in, so we can use it on the login page
2018-01-11 10:57:07 -05:00
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05:00
64f9118e46
remove debug line
2018-01-10 13:47:03 -05:00
4442c571fb
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-10 13:15:20 -05:00
156bdbd089
Add zmstats, zmaudit, zmtrigger flags to Server object listing/editing
2018-01-10 12:59:27 -05:00
4047d0ffc8
add No Server as an option is Server filter
2018-01-09 07:13:03 -08:00
36ab7b01e8
Merge pull request #2018 from connortechnology/robots
...
add a robots.txt to the docroot to tell bots to not scrape our ZM install
2018-01-04 20:42:15 -06:00
10133073de
Check for SaveJPEGs being set to snapshot instead of hitting the fs to check for a snapshot file
2018-01-04 12:31:20 -05:00
a33cba9989
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-01-02 09:17:16 -08:00
1b1b93f811
use CakePHP-Enum-Behavior to add support for ENUMs to the Monitor model. This should fix #48
2018-01-01 14:43:02 -05:00
109a24ed4d
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-01-01 10:37:24 -08:00
1cd69c69b9
add defining ZM_SERVER_ID after loading config
2018-01-01 13:10:39 -05:00
b219f76588
add togglebuttons to select all checbox
2017-12-23 12:58:48 -08:00
cc3b65b5fd
add default value for ServerId in Storage
2017-12-23 12:07:13 -08:00
74269fea73
make montagereview load event images from the server that the storage is located on
2017-12-22 12:33:30 -08:00
2c361de9d3
add Server Storage Areas
2017-12-22 11:39:43 -08:00
c6bf502ee7
only show each Storage area if there are less than 4.
2017-12-22 11:39:27 -08:00
0d7fff761c
upgrade find_all to take parameters
2017-12-22 11:38:42 -08:00
bb8e326392
Fix not restarting a monitor if it has moved to a different server
2017-12-22 09:16:56 -08:00
cc8ed75eb9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-22 09:03:11 -08:00
f51259443c
fix disk_used_percentage to use db calculated used size
2017-12-22 09:02:49 -08:00
9dfad4886d
fix saving Monitors
2017-12-22 16:13:00 +01:00
148e21d707
fugro
2017-12-21 21:46:21 -05:00
915ea93348
source remote server when streaming event
2017-12-21 16:53:46 -08:00
efc7b7d85a
Merge pull request #71 from digital-gnome/storageareas-datpickerfixes
...
Fix missing change to StartDateTime
2017-12-20 15:56:17 -05:00
8bfdb73d24
Fix missing change to StartDateTime
...
Fixes filter loading from events if clicked from last hour link.
2017-12-20 15:46:03 -05:00
89d284b4ea
Merge pull request #70 from digital-gnome/storageareas-datpickerfixes
...
Allow nondate values
2017-12-20 15:25:52 -05:00
b4c0f13adf
Allow nondate values
...
Supports -# days/hours/etc
2017-12-20 15:23:14 -05:00
e9141ca3e8
re-init logger after loading config to actually pick up the appropriate values. This stops the error logging of Info to weblog when weblog is actually set to None. Also update quotes
2017-12-20 10:19:24 -05:00
85b7baa131
Fix event Groups associations
2017-12-19 18:09:41 -05:00
e47c8fad88
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-12-19 11:01:42 -05:00
2922a86d23
fixes to new Storage Schemes code
2017-12-19 11:01:03 -05:00
d034ae9ab2
Default value for new brackets
2017-12-18 22:58:38 -05:00
5f4b2ca53f
don't close the session when logging in
2017-12-18 14:35:11 -05:00
46673bafdb
Merge pull request #68 from digital-gnome/montagereview-datepicker
...
Montagereview datepicker
2017-12-18 13:39:58 -05:00
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
c93de992c2
add Scheme to the list of fields
2017-12-18 13:04:57 -05:00
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
a6b136ed40
dark theme fixes
...
Overrides bootstrap input colors for dark theme and more chosen
2017-12-18 09:50:08 -05:00
88a1e3eb4d
Fix bad copy
2017-12-17 22:29:56 -05:00
de6ebfc341
Remove chosen from some filter dropdowns and restyle to match
2017-12-17 22:04:10 -05:00
804339f54f
Limit date range and only reload page after change is done
2017-12-17 16:44:57 -05:00
5d190dedff
Set brackets width and allow blank
2017-12-17 14:25:50 -05:00
bb75e6a6ea
Disallow future dates
2017-12-17 14:24:58 -05:00
173ad4f75a
Add datepicker to montagereview
2017-12-17 09:22:31 -05:00
6ffa96dea3
Add chosen to filters
2017-12-16 23:10:20 -05:00
c8cfb47f9f
More bootstrap in datepicker
2017-12-16 23:10:19 -05:00
9d87f7fe18
Use bootstrap icons in datepicker
2017-12-16 20:10:02 -05:00
a091153929
Use seperate structure and theme jquery ui
2017-12-16 20:04:12 -05:00
b6917d8b71
Fix initial time parsing
2017-12-16 09:08:50 -05:00
d7532b0340
Add dateTime picker to filter
2017-12-15 22:57:42 -05:00
2e56210007
Fix row highlighting
2017-12-15 22:56:49 -05:00
eec174750e
Default for conjunction
2017-12-15 09:06:40 -05:00
c0fcfe6eb6
Combine possible sort inputs to one in sortQuery, output limitQuery
2017-12-15 08:47:08 -05:00
ce0a8c4486
Add sort/limit to filter object on pageload
2017-12-15 08:47:07 -05:00
e192d664fd
WIP pass sort and limit
2017-12-15 08:47:07 -05:00
dee976cf1a
parseRows just needs to recreate the php logic
2017-12-15 08:47:06 -05:00
2cba20ab46
Make form validation not reload page
2017-12-15 08:47:05 -05:00
2ddb380d0d
Remove submitToFilter
2017-12-15 08:47:05 -05:00
db59f06520
Weekday needs to detect start or end as well
2017-12-15 08:47:04 -05:00
86af2269b2
Move arrays out of ifs, pass to js
2017-12-15 08:47:03 -05:00
a2c785f7eb
Move validateForm
2017-12-15 08:47:03 -05:00
04efff699a
Set url when adding terms
...
Saves changes if reloaded or using back button
2017-12-15 08:47:02 -05:00
f8da9a1c1b
Cleanup filter appearance
...
Tighten up fields and reduce jumping when adding terms.
2017-12-15 08:47:01 -05:00
c936e9e2a9
No longer need line
2017-12-15 08:47:00 -05:00
c1cf356974
Montagereview filter passing in wrong block
2017-12-15 08:47:00 -05:00
51b4ddb0e4
Add js for filter handling
2017-12-15 08:46:59 -05:00
d5ec45eed7
Include all DateTime possibilities
2017-12-15 08:46:58 -05:00
d2b9614ce7
Change reset to not reload form
2017-12-15 08:46:57 -05:00
fe6a6bec7c
Use disabled button rather than remove
...
Reduces page jumping
2017-12-15 08:46:57 -05:00
8515e77d67
Add text type to text fields
2017-12-15 08:46:56 -05:00
9eb03a881d
Always have a full line on filter page.
...
This allows javascript to copy easily
2017-12-15 08:46:55 -05:00
ee5552d9f9
Redirect Events when post
...
Fixes broken back due to form resubmit
2017-12-13 22:25:28 -05:00
c87d170972
Pass montagereview filter
2017-12-13 22:25:28 -05:00
8909184e2c
fix
2017-12-13 18:14:14 -05:00
7d7e73977f
use stored session group
2017-12-13 16:51:56 -05:00
046a0dd6e9
need a line break
2017-12-13 16:45:51 -05:00
abad266c5b
introduce chosen to use it to make the filtering dropdowns awesome
2017-12-13 16:15:03 -05:00
4a1a9c48d5
Merge pull request #66 from digital-gnome/storageareas-fixBack
...
Storageareas fix back Redux
2017-12-13 12:40:11 -05:00
0743a283da
Remove back/close if opened in new tab
2017-12-13 12:34:31 -05:00
5f82f75e5d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-12-13 11:21:58 -05:00
e364641d7b
on initial page hit, the cookie might not be set. Use global instead.
2017-12-13 11:21:50 -05:00
27c9752f34
Merge pull request #65 from digital-gnome/storageareas-fixBack
...
Storageareas fix back and montagereview popup
2017-12-13 10:23:50 -05:00
1f7a5f26ab
Fix montagereview event popup
2017-12-13 10:22:15 -05:00
e0c2061954
Fix back if window is opened in new tab.
2017-12-13 10:20:02 -05:00
c509b6fbf4
fix a quotes problem
2017-12-12 15:46:50 -05:00
56ace524ff
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-12-12 11:16:26 -05:00
2643ac9f97
fix a quoting problem that prevented saving config
2017-12-12 11:16:08 -05:00
9bd12d5b9a
set a type on the buttons
2017-12-12 11:15:53 -05:00
9fe7ba25e2
improve the download ui
2017-12-11 14:33:17 -08:00
5bd5f03611
redo buttons as button tags
2017-12-11 12:51:38 -05:00
7108e306cb
add popup sizes for server and storage. Increase height of user edit popup
2017-12-11 12:50:30 -05:00
dd69bc3d7b
Merge branch 'master' into storageareas
2017-12-11 11:39:42 -05:00
1e412af902
Fix float overlap
...
Avoid explicitly setting some heights, add clear float
2017-12-10 09:37:16 -05:00
6974c847e5
Fix controlcss
...
Missing viewCssFileExtra
2017-12-10 09:37:16 -05:00
ef1af9cc15
disable FilterComponent as it doesn't actually do anything. Add Groups join when needed
2017-12-09 14:03:42 -05:00
19e50e2bde
Also have to remove fixed width
2017-12-07 15:20:54 -05:00
08b5c26a15
2019 maxscoreframeid ( #2020 )
...
* added MaxScoreFrameId to address #2019
* consistent quotes
2017-12-07 14:11:06 -05:00
7db790ec7b
Fix dom filling up with comments
2017-12-07 12:54:22 -05:00
7930e1881f
Fix quotes
2017-12-07 11:18:10 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
fb424a7eef
add a robots.txt to the docroot to tell bots to not scrape our ZM install.
2017-12-07 09:32:23 -05:00
1a5d9d5586
Fix monitor sorting ( #2015 )
...
Fixed issue #2014
2017-12-06 15:43:33 -05:00
9a7ee7a1e3
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-06 10:12:09 -08:00
e7a43b2618
fix, don't set the storage path to NULL
2017-12-06 10:11:59 -08:00
43bba23735
Fix filteradd complaining
2017-12-06 10:36:37 -05:00
11a5a47826
Fix missing popups and styles
2017-12-06 09:42:58 -05:00
b8660e95c9
Dark theme options menu fixes
...
Override bootstrap to match dark theme
2017-12-05 21:01:17 -05:00
f47f1a89ea
Fix btn-primary css to match current themes
2017-12-05 21:01:16 -05:00
a64e556047
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-05 15:23:37 -08:00
e0a18143ad
include Group Id in list
2017-12-05 15:20:15 -08:00
d621222ead
fix assignment when should be test
2017-12-05 13:26:21 -08:00
6edb0247ef
Fix popup detection
2017-12-05 13:27:39 -05:00
37cdcb89c4
Fix view button in events view
2017-12-05 12:50:49 -05:00
62cc095c98
always load the storageareas array
2017-12-05 08:31:17 -08:00
6454594633
fix popup detection and add disk usage and storage area to event.
2017-12-05 08:30:58 -08:00
34b708bace
Handle popups that should remain popups
2017-12-05 09:40:03 -05:00
d741cc1a72
fix saving Groups
2017-12-04 22:02:56 -05:00
f7a2db4e49
remove MaxScore from the sorting because it really doesn't make sense to sort by time then maxscore... time is going to be pretty much unique
2017-12-04 21:50:29 -05:00
26c9d1991c
fix populating the monitors select
2017-12-04 21:49:34 -05:00
f8d3c07586
Add h264 event view functionality and new feature alarmCues ( #2012 )
...
* Fix nearEventsQuery
Removed dbEscape from getNearEvents previous event because it only returns 0. Now matches next. Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch. Also added start times to allow for videoJS replaymode.
* Unescape filters
Filters need to be unescaped
* Add initial values to page load
* Add replay modes to videojs
* rough in figuring out a frame in between bulk frames
* Add alarmCues
Add a graphical indication of where alarm frames happened in an event. Similar to what zmNinja shows.
* Add remaining buttons to videojs
Functionality for all buttons on videojs streams. FF/RW buttons show as active when they are active.
* Whitespace and fix Bulkframe calcs
* Fix zms events trying to generate with mp4 code
ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed
* ZMS scrub bar
Move zms scrub bar to bottom of image feed. Make it simpler and more like videojs style.
* Wrap event feeds properly
* Fix dvrControls on watch view
* Add scaleToFit
Add a scaleToFit option to event view
* Add navigation for videoJS streams
Disables nav buttons at beginning and end of events. Handles switching from zms to videojs. If zms crashes changes next event function to reload page instead of ajax.
* Add scaleToFit to watch and frame view
Adds scaleToFit to watch view. Since frame view uses the watch cookie this required changes to frame view
* Add transition to zoom
* Change stills view to match stream
Move stills slider bar to match scrub bar on streams. Allow it to resize, make it larger. Add alarmcues.
* Add Stills for every event
Add stills for every event. Match size to stream size
* Progressbox transitions
2017-12-04 21:26:59 -05:00
fb952179cd
Fix delete filter ( #2010 )
...
Delete filter didn't work because the request does not include 'object'.
2017-12-04 21:26:21 -05:00
03ad4898d9
Fix montage monitors jumping on alert ( #2013 )
...
The alert class from bootstrap was not overriden on monitors in montage.
2017-12-04 21:25:56 -05:00
72a50910e6
Merge pull request #56 from digital-gnome/storageareas-fixMontageReviewFilter
...
Montagereview filter respect groups setting
2017-12-04 17:08:51 -05:00
c72b1f3acf
Fix refreshParent on some popups
...
Some popups wouldn't refresh the parent because after submit the none view page does not include jquery. This angers javascript and prevents the close function from working. Only fire header refresh code if there is a view.
2017-12-04 17:04:53 -05:00
97c9ae02c2
cleanup
2017-12-04 17:02:38 -05:00
0171d532fc
fix the test for DB_DEBUG
2017-12-04 16:50:56 -05:00
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
Isaac Connor
mcdamo
Andrew Bauer
Isaac Connor
tim
Steve Gilvarry
Isaac Connor
Isaac Connor
Isaac Connor
Isaac
digital-gnome
Pliable Pixels
kimmeld