Pliable Pixels
a68cc79437
using MIT licensed ion-icons, its smaller than FA, replaced some text with icons
2018-03-24 18:25:39 -04:00
Pliable Pixels
0b31cc4d3d
2nd level header tweak
2018-03-24 17:34:46 -04:00
Pliable Pixels
b8f6c2277f
clone icons
2018-03-24 10:21:59 -04:00
Pliable Pixels
140217bef6
icons, muted colors, text tightening
2018-03-24 09:59:39 -04:00
Isaac Connor
0bb1c5ce71
load groups when duping a monitor
2018-03-23 13:35:45 -07:00
Isaac Connor
85c757d2b1
Include group in parents list display
2018-03-23 13:35:02 -07:00
Isaac Connor
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
Steve Gilvarry
1c740de5dc
Add Return False to Event Back
2018-03-04 13:37:30 +11:00
Steve Gilvarry
db8ab28845
Add return false to window.history.back
...
Adding this makes it work in Safari
2018-03-04 08:37:21 +11:00
Isaac Connor
c53b6ffbb0
rework montagereview to load data faster and leave event and frame data in json objects
2018-03-02 18:26:50 -08:00
Andrew Bauer
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
Isaac Connor
7e628bc3fd
add showing groups under Monitor Name on console
2018-03-01 19:23:46 -08:00
Isaac Connor
c5eec7e2fd
hide save button on successful form completion so we don't get a duplicate submit
2018-02-27 15:10:45 -08:00
Isaac Connor
83fad681b3
use button tags and hide the button content after click
2018-02-27 11:49:13 -08:00
Isaac Connor
c50627fd88
GroupIds needs to be an array
2018-02-27 11:21:04 -08:00
Isaac Connor
6a6eb87686
fix defaults
2018-02-26 18:00:02 -08:00
Isaac Connor
793e87c26d
Apply chosen style to group and linked monitors dropdown
2018-02-26 17:58:20 -08:00
Isaac Connor
92c34f6043
add Groups to monitor edit
2018-02-26 16:09:36 -08:00
Isaac Connor
9d1a8b1e18
Add the danger css tag to cpuload > 5, freeram < 10% and freeswap < 10%
2018-02-26 10:39:45 -08:00
Isaac Connor
7d88e25ef9
simplify thumbnail/snapshot usage a bit
2018-02-19 17:25:49 -05:00
Isaac Connor
eeb7190812
fix rand replacing in image url
2018-02-14 13:16:30 -05:00
Isaac Connor
45bf4544ca
rename SetImageSource to getImageSource which is what it actually does
2018-02-14 11:58:47 -05:00
Isaac Connor
c7a43a53f0
Sort the event records
2018-02-13 11:28:06 -05:00
Isaac Connor
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
Isaac Connor
a35ba812b7
fix merging conditions
2018-02-09 07:57:52 -08:00
Isaac Connor
63a214869e
rework montagereview to be more performant.
2018-02-09 07:31:19 -08:00
Isaac Connor
6518311022
Use Status and CaptureFPS and AnalysisFPS to do status coloration
2018-02-09 07:31:03 -08:00
Isaac Connor
4b51fed500
Rework order of filters. Put Monitors at the end. recalc selected_monitor_ids
2018-02-09 07:30:53 -08:00
Isaac Connor
cb9eef8563
show No streams found if none were found
2018-02-09 07:30:12 -08:00
Isaac Connor
6e240f669c
fix filtering
2018-02-08 14:25:58 -08:00
Isaac Connor
894467cdef
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-02-08 10:51:49 -08:00
Isaac Connor
b8b2edf847
close the datetime inputs
2018-02-08 10:50:33 -08:00
Isaac Connor
2a00cf852a
Set a type on the buttons so that they act right
2018-02-08 10:50:22 -08:00
Isaac Connor
4777808cf0
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-02-08 13:15:41 -05:00
Isaac Connor
95cfdb327d
further separate addBtn and cloneBtn, fixes
2018-02-08 13:15:27 -05:00
Isaac Connor
cdfc7f1808
give the buttons div an id and move the styling into the css
2018-02-08 09:30:48 -08:00
Isaac Connor
4240dc4bde
spacing, add a test for minTime being after maxTime
2018-02-08 09:30:26 -08:00
Isaac Connor
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
Isaac Connor
babae4629a
Update and fix console buttons. Use a separate button for clone
2018-02-08 09:47:16 -05:00
Isaac Connor
a4c59e3e50
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-02-07 09:07:57 -05:00
Isaac Connor
dec82ecf5c
Fix for when specifying page 1 and no pages
2018-02-07 09:07:51 -05:00
Isaac Connor
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
Isaac Connor
dee843d7da
add All and remove default from Storage dropdown options
2018-02-02 12:48:49 -05:00
Isaac Connor
060e6893cc
fix Storage dropdown population and don't clear value on line type change
2018-02-02 12:48:22 -05:00
Isaac Connor
26ac1fd695
Include soap version in list of onvif cameras
2018-02-01 11:32:13 -05:00
Isaac Connor
132fff1931
An ok json return with no status is possible now
2018-01-31 14:35:48 -05:00
Isaac Connor
7c3efc02cd
put back old add monitor popup
2018-01-31 11:56:57 -05:00
Isaac Connor
b1f2b677c3
remove path from source
2018-01-30 10:09:12 -05:00
Isaac Connor
b9a98d34bf
strip query and scheme from source
2018-01-29 19:03:16 -05:00
Isaac Connor
a60da6811b
revert adding custom port for status updates. It breaks in the non-multiserver case.
2018-01-29 15:17:22 -05:00
Isaac Connor
6acb555c52
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-01-29 10:42:23 -08:00
Isaac Connor
d19b8bc5cf
add default value for ServerId in new Storage Object
2018-01-29 10:41:59 -08:00
Isaac Connor
06673019f9
add default values for zmstats, zmaudit, zmtrigger in new Server
2018-01-29 10:41:43 -08:00
Isaac Connor
8979f14314
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-29 11:29:33 -05:00
Isaac Connor
a76fcb331c
Remove debugging. Treat can't get semaphore as a non-error
2018-01-29 08:25:46 -08:00
Isaac Connor
4751920423
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-29 07:49:38 -08:00
Isaac Connor
35cda5cf17
Merge sjc04p1fviap02:ZoneMinder into storageareas
2018-01-29 07:45:55 -08:00
Isaac Connor
a490c0e5bf
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-01-29 07:45:37 -08:00
Isaac Connor
a782ef1db7
Add debug tests for loading all events
2018-01-29 07:45:28 -08:00
Isaac Connor
e672841a8d
Add remote server port to monitor url
2018-01-29 07:42:43 -08:00
Isaac Connor
03122b9015
add onFailure logger, and change link to chain so that responses don't just disappear
2018-01-29 07:38:02 -08:00
Isaac Connor
dc6842bfbd
Add remote server port to monitor url
2018-01-29 07:32:40 -08:00
Isaac Connor
b793e6659b
add onFailure logger, and change link to chain so that responses don't just disappear
2018-01-29 07:32:02 -08:00
Isaac Connor
984d3a2dd1
add Monitor Name to the response listing the available camera feeds
2018-01-29 07:30:46 -08:00
Isaac Connor
0b2d752ea4
Use chosen on the MonitorIds select.
2018-01-29 10:29:59 -05:00
Isaac Connor
2dcb0d183f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-28 18:07:33 -08:00
Isaac Connor
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
Isaac Connor
5d4fde88d9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-27 12:17:13 -08:00
Isaac Connor
456f29fcba
Rename column Id OF Monitor_Statuses to simplify JOINS.
2018-01-26 13:39:37 -05:00
Isaac Connor
dc46f23af0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-26 10:17:54 -08:00
Isaac Connor
d001ce467e
use get for status JSON requests
2018-01-26 10:31:55 -05:00
Isaac Connor
1e3cf9bbf8
handle no streams better
2018-01-25 09:14:21 -08:00
Isaac Connor
703cd332df
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-25 08:43:53 -08:00
Isaac Connor
356015a492
Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla
2018-01-25 08:42:08 -08:00
Isaac Connor
42a27c2ca9
Fix Servers dropdown
2018-01-25 08:41:54 -08:00
Isaac Connor
57bae7cf17
Fix filtering
2018-01-25 09:14:09 -05:00
Isaac Connor
fb50f6f996
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-24 17:14:42 -08:00
Isaac
cc34a3c566
change button type
2018-01-24 23:08:12 +01:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
ea4937b75e
put back missing s
2018-01-23 17:47:24 -05:00
Isaac Connor
d9252e2d47
Merge branch 'storageareas' into tesla
2018-01-23 13:29:37 -08:00
Isaac Connor
fdf1ef795f
Add default value for newStorage['StorageId']
2018-01-23 13:28:46 -08:00
Isaac Connor
0742217599
Only populate monitorNames if query is valid
2018-01-23 13:28:29 -08:00
Isaac Connor
c85bb6e614
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-23 09:44:28 -08:00
Isaac
de08e3114e
more and less debug
2018-01-23 18:16:37 +01:00
Isaac
8bd1e4cec6
Only show groups filter if there are groups
2018-01-23 18:15:59 +01:00
Isaac Connor
994766fd50
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-22 13:25:38 -08:00
Isaac Connor
8fe0e1bdc0
fix Debug => Logger::Debug
2018-01-22 15:58:01 -05:00
Isaac Connor
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
Isaac
06c9266c62
use snapshot.jpg more
2018-01-22 03:27:01 +01:00
Isaac Connor
181a94de82
test for existence of port in url_parts
2018-01-21 11:10:34 -05:00
Isaac Connor
e26747b5cc
show port when it's not the standard port
2018-01-19 12:15:26 -05:00
Isaac Connor
95f054c1e6
Show entire path for ffmpeg monitors. Strip out username/password though
2018-01-18 12:40:41 -08:00
Isaac Connor
ecd5e01b92
Show port when using Remote Method and Port is non-standard
2018-01-18 10:21:05 -08:00
Isaac Connor
ace66cf977
show port in source column
2018-01-17 13:33:22 -08:00
Isaac Connor
494d080740
show port in source column
2018-01-17 13:27:44 -08:00
Isaac Connor
4fecdbd0fa
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-17 12:28:33 -08:00
Isaac Connor
212bfd4a2c
add Monitor to info shown on event
2018-01-17 12:20:15 -08:00
Isaac Connor
93623f3fd8
fix filtering by monitor in montagereview
2018-01-17 11:59:54 -08:00
Isaac Connor
1fbb5bc0f8
Fix zmaudit.pl => zmaudit, etc.
2018-01-17 14:22:04 -05:00
Isaac Connor
e78a40b45f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-16 11:02:20 -08:00
Isaac Connor
27ebf1a4aa
Comment out debug code
2018-01-16 14:02:04 -05:00
Isaac Connor
b09bb528a5
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-16 08:42:41 -08:00
Isaac Connor
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
Isaac Connor
bfa31297be
Merge branch 'storageareas' into tesla
2018-01-12 11:26:19 -08:00
Isaac Connor
4b37c6fc42
Change the Group dropdown to a single indented dropdown, and use chosen on it
2018-01-12 11:25:15 -08:00
Isaac Connor
c139f7a1bf
we don't need the group setting in the url
2018-01-12 11:24:52 -08:00
Isaac Connor
5f8756d7ad
Set Tesla defaults for new monitors
2018-01-12 08:11:37 -08:00
Isaac Connor
ff9f43b5a1
put back code to switch to add_monitors
2018-01-12 08:11:25 -08:00
Isaac Connor
95c3c26eda
cleanup old Add Monitr button
2018-01-12 08:11:07 -08:00
Isaac Connor
e2ac13d03e
pretty up the add_monitors interface a bit, add some instructions
2018-01-12 08:10:46 -08:00
Isaac Connor
666005fb5d
fix single event replay by fixing the reference to player which should be vid
2018-01-11 14:42:00 -05:00
Isaac Connor
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
Isaac Connor
3b81cb9eed
Replace ZoneMinder with ZM_WEB_TITLE
2018-01-11 10:57:43 -05:00
Isaac Connor
b1e8963da9
add header to the login page
2018-01-11 10:57:29 -05:00
Isaac Connor
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05:00
Isaac Connor
64f9118e46
remove debug line
2018-01-10 13:47:03 -05:00
Isaac Connor
4442c571fb
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-01-10 13:15:20 -05:00
Isaac Connor
156bdbd089
Add zmstats, zmaudit, zmtrigger flags to Server object listing/editing
2018-01-10 12:59:27 -05:00
Isaac Connor
4047d0ffc8
add No Server as an option is Server filter
2018-01-09 07:13:03 -08:00
Isaac Connor
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
Isaac Connor
b219f76588
add togglebuttons to select all checbox
2017-12-23 12:58:48 -08:00
Isaac Connor
cc3b65b5fd
add default value for ServerId in Storage
2017-12-23 12:07:13 -08:00
Isaac Connor
74269fea73
make montagereview load event images from the server that the storage is located on
2017-12-22 12:33:30 -08:00
Isaac Connor
2c361de9d3
add Server Storage Areas
2017-12-22 11:39:43 -08:00
Isaac Connor
148e21d707
fugro
2017-12-21 21:46:21 -05:00
digital-gnome
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
digital-gnome
b4c0f13adf
Allow nondate values
...
Supports -# days/hours/etc
2017-12-20 15:23:14 -05:00
digital-gnome
d034ae9ab2
Default value for new brackets
2017-12-18 22:58:38 -05:00
Isaac Connor
46673bafdb
Merge pull request #68 from digital-gnome/montagereview-datepicker
...
Montagereview datepicker
2017-12-18 13:39:58 -05:00
Isaac Connor
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
Isaac Connor
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
digital-gnome
88a1e3eb4d
Fix bad copy
2017-12-17 22:29:56 -05:00
digital-gnome
de6ebfc341
Remove chosen from some filter dropdowns and restyle to match
2017-12-17 22:04:10 -05:00
digital-gnome
804339f54f
Limit date range and only reload page after change is done
2017-12-17 16:44:57 -05:00
digital-gnome
5d190dedff
Set brackets width and allow blank
2017-12-17 14:25:50 -05:00
digital-gnome
bb75e6a6ea
Disallow future dates
2017-12-17 14:24:58 -05:00
digital-gnome
173ad4f75a
Add datepicker to montagereview
2017-12-17 09:22:31 -05:00
digital-gnome
6ffa96dea3
Add chosen to filters
2017-12-16 23:10:20 -05:00
digital-gnome
b6917d8b71
Fix initial time parsing
2017-12-16 09:08:50 -05:00
digital-gnome
d7532b0340
Add dateTime picker to filter
2017-12-15 22:57:42 -05:00
digital-gnome
eec174750e
Default for conjunction
2017-12-15 09:06:40 -05:00
digital-gnome
c0fcfe6eb6
Combine possible sort inputs to one in sortQuery, output limitQuery
2017-12-15 08:47:08 -05:00
digital-gnome
ce0a8c4486
Add sort/limit to filter object on pageload
2017-12-15 08:47:07 -05:00
digital-gnome
dee976cf1a
parseRows just needs to recreate the php logic
2017-12-15 08:47:06 -05:00
digital-gnome
2cba20ab46
Make form validation not reload page
2017-12-15 08:47:05 -05:00
digital-gnome
2ddb380d0d
Remove submitToFilter
2017-12-15 08:47:05 -05:00
digital-gnome
db59f06520
Weekday needs to detect start or end as well
2017-12-15 08:47:04 -05:00
digital-gnome
86af2269b2
Move arrays out of ifs, pass to js
2017-12-15 08:47:03 -05:00
digital-gnome
a2c785f7eb
Move validateForm
2017-12-15 08:47:03 -05:00
digital-gnome
04efff699a
Set url when adding terms
...
Saves changes if reloaded or using back button
2017-12-15 08:47:02 -05:00
digital-gnome
c936e9e2a9
No longer need line
2017-12-15 08:47:00 -05:00
digital-gnome
c1cf356974
Montagereview filter passing in wrong block
2017-12-15 08:47:00 -05:00
digital-gnome
51b4ddb0e4
Add js for filter handling
2017-12-15 08:46:59 -05:00
digital-gnome
d5ec45eed7
Include all DateTime possibilities
2017-12-15 08:46:58 -05:00
digital-gnome
d2b9614ce7
Change reset to not reload form
2017-12-15 08:46:57 -05:00
digital-gnome
fe6a6bec7c
Use disabled button rather than remove
...
Reduces page jumping
2017-12-15 08:46:57 -05:00
digital-gnome
8515e77d67
Add text type to text fields
2017-12-15 08:46:56 -05:00
digital-gnome
9eb03a881d
Always have a full line on filter page.
...
This allows javascript to copy easily
2017-12-15 08:46:55 -05:00
digital-gnome
ee5552d9f9
Redirect Events when post
...
Fixes broken back due to form resubmit
2017-12-13 22:25:28 -05:00
digital-gnome
c87d170972
Pass montagereview filter
2017-12-13 22:25:28 -05:00
Isaac Connor
8909184e2c
fix
2017-12-13 18:14:14 -05:00
Isaac Connor
046a0dd6e9
need a line break
2017-12-13 16:45:51 -05:00
Isaac Connor
abad266c5b
introduce chosen to use it to make the filtering dropdowns awesome
2017-12-13 16:15:03 -05:00
Isaac Connor
4a1a9c48d5
Merge pull request #66 from digital-gnome/storageareas-fixBack
...
Storageareas fix back Redux
2017-12-13 12:40:11 -05:00
digital-gnome
0743a283da
Remove back/close if opened in new tab
2017-12-13 12:34:31 -05:00
Isaac Connor
27c9752f34
Merge pull request #65 from digital-gnome/storageareas-fixBack
...
Storageareas fix back and montagereview popup
2017-12-13 10:23:50 -05:00
digital-gnome
1f7a5f26ab
Fix montagereview event popup
2017-12-13 10:22:15 -05:00
digital-gnome
e0c2061954
Fix back if window is opened in new tab.
2017-12-13 10:20:02 -05:00
Isaac Connor
56ace524ff
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-12-12 11:16:26 -05:00
Isaac Connor
9bd12d5b9a
set a type on the buttons
2017-12-12 11:15:53 -05:00
Isaac Connor
9fe7ba25e2
improve the download ui
2017-12-11 14:33:17 -08:00
Isaac Connor
5bd5f03611
redo buttons as button tags
2017-12-11 12:51:38 -05:00
Isaac Connor
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
kimmeld
1a5d9d5586
Fix monitor sorting ( #2015 )
...
Fixed issue #2014
2017-12-06 15:43:33 -05:00
Isaac Connor
e7a43b2618
fix, don't set the storage path to NULL
2017-12-06 10:11:59 -08:00
Isaac Connor
a64e556047
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-05 15:23:37 -08:00
Isaac Connor
e0a18143ad
include Group Id in list
2017-12-05 15:20:15 -08:00
Isaac Connor
d621222ead
fix assignment when should be test
2017-12-05 13:26:21 -08:00
digital-gnome
6edb0247ef
Fix popup detection
2017-12-05 13:27:39 -05:00
digital-gnome
37cdcb89c4
Fix view button in events view
2017-12-05 12:50:49 -05:00
Isaac Connor
62cc095c98
always load the storageareas array
2017-12-05 08:31:17 -08:00
Isaac Connor
6454594633
fix popup detection and add disk usage and storage area to event.
2017-12-05 08:30:58 -08:00
digital-gnome
34b708bace
Handle popups that should remain popups
2017-12-05 09:40:03 -05:00
Isaac Connor
26c9d1991c
fix populating the monitors select
2017-12-04 21:49:34 -05:00
digital-gnome
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
Isaac Connor
72a50910e6
Merge pull request #56 from digital-gnome/storageareas-fixMontageReviewFilter
...
Montagereview filter respect groups setting
2017-12-04 17:08:51 -05:00
Isaac Connor
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
digital-gnome
3f62d1e24d
Montagereview filter respect groups setting
2017-12-04 14:35:33 -05:00
Isaac Connor
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
Isaac Connor
9aa94bd3ab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-03 16:05:43 -05:00
digital-gnome
9ca19b003f
Add download button to montagereview
2017-12-03 14:42:09 -05:00
digital-gnome
3e7c573da5
Add download video option to events view
...
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
digital-gnome
7a188a84f7
Add montagereview filter passing
...
montagereview now accepts any appropriate filters
2017-12-02 12:29:55 -05:00
digital-gnome
6d6b4366de
Fix MontageReview filters
2017-12-02 12:29:54 -05:00
digital-gnome
66d6e1a4a4
Add header to watch
2017-12-02 12:28:06 -05:00
digital-gnome
11629076f6
Fix Timeline view, add list link
2017-12-02 12:28:06 -05:00
digital-gnome
58159963fa
Fix back on timeline view
2017-12-02 12:28:05 -05:00
digital-gnome
064ce99eac
Scalecontrol in wrong place
2017-12-02 12:28:05 -05:00
digital-gnome
bf5c928e38
Event view compress header
...
Combine all three lines of event view to 2.
2017-12-02 12:28:05 -05:00
digital-gnome
50d5a8991d
Events header
...
Moved all non-event links to the header
2017-12-02 12:28:05 -05:00
digital-gnome
e6568d01a3
Remove timeline popup
2017-12-02 12:28:05 -05:00
digital-gnome
9d1bbfab42
Remove unused code from event
2017-12-02 12:28:05 -05:00
digital-gnome
725814d41d
Remove unused code from events
2017-12-02 12:28:05 -05:00
digital-gnome
7a5dfb71dc
Remove no longer used max from events
2017-12-02 12:28:05 -05:00
digital-gnome
b3ef499e46
remove event popup
2017-12-02 12:28:04 -05:00
digital-gnome
f02cd2e615
Remove watch popup
2017-12-02 12:28:04 -05:00
digital-gnome
1289269e6f
Change filter to work without popup
2017-12-02 12:28:04 -05:00
digital-gnome
adc1b924da
Remove events popup
2017-12-02 12:25:53 -05:00
digital-gnome
e34b8abaca
Cleanup events view header
2017-12-02 12:25:53 -05:00
Isaac Connor
9d5447aa6a
Merge pull request #55 from digital-gnome/storageareas-updateNavbar
...
Add navbar refresh to all pages that use it
2017-12-02 10:44:01 -05:00
Isaac Connor
e64497c16a
Merge pull request #54 from digital-gnome/storageareas-uifixes
...
Storageareas uifixes
2017-12-01 16:30:29 -05:00
Isaac Connor
ca3d6546bd
sorty by name when listing monitors by name
2017-12-01 12:30:21 -08:00
Isaac Connor
5e953cefea
fix old cookie causing errors loading layouts
2017-12-01 12:30:07 -08:00
digital-gnome
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
Isaac Connor
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
Isaac Connor
dfb69a2c5b
Merge branch 'tesla' into storageareas
2017-11-28 06:29:42 -05:00
Isaac Connor
00c5590a71
add Monitor count to servers
2017-11-27 11:56:48 -08:00
digital-gnome
c92b3a9408
Converge stills view and stream view
...
Make the stills view look more like stream view. Moved slider up to be like a scrub bar, added alarmcues.
2017-11-26 19:08:07 -05:00
digital-gnome
18dc515ba4
stills view loads image when slider used
...
Stills view now loads the selected image if an image is being viewed and the slider is used.
2017-11-26 19:08:07 -05:00
digital-gnome
136f0e90f5
Fix autoscale on stills view
...
Switching from stills view and changing the window would make stream view go crazy. Changed to autoscale on switch
2017-11-26 19:08:07 -05:00
digital-gnome
b506466a70
Change alarmcues to accept arbitrary containing element
2017-11-26 19:08:07 -05:00
digital-gnome
b5db885a31
Add scaleToFit to frame view
...
Changes navigation to use flexbox because absolute positioning was messing with scaletofit. Also makes frame view respect scale choice
2017-11-26 19:08:06 -05:00
digital-gnome
55699a9b9b
Change scaleToFit to choose what to fit
...
Adds 4th input to choose what element is the last thing to fit.
2017-11-26 19:08:06 -05:00
digital-gnome
68e54400e2
Add scaleToFit to watch view
2017-11-26 19:08:06 -05:00
digital-gnome
3920420aa9
Convert scaleToFit to shared function
2017-11-26 19:08:06 -05:00
Isaac Connor
428d923874
make StatusFIlter do something
2017-11-26 17:39:49 -05:00
Isaac Connor
39e490e5e5
fix monitor dropdown
2017-11-26 17:32:41 -05:00
Isaac Connor
4fbdacef05
fix event counts
2017-11-26 17:03:36 -05:00
Isaac Connor
d6bc727c9c
use htmlSelect to create the Colours dropdown, which fixes a problem caused when I inverted the Colours array
2017-11-26 11:12:00 -05:00
Isaac Connor
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
Isaac Connor
a9f0f3813a
Merge branch 'tesla' into storageareas
2017-11-24 09:31:00 -05:00
Isaac Connor
900fbe1e0f
update save to a button tag, and add a saveas functionality
2017-11-23 08:26:55 -08:00
Isaac Connor
2a669896c2
Merge branch 'tesla' into storageareas
2017-11-23 08:42:53 -05:00
Isaac Connor
9d6b417b60
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
2017-11-22 17:03:37 -08:00
Isaac Connor
02ec4bdebb
use StartDateTime instead of DateTime in filters, and get rid of Filters button at bottom
2017-11-22 13:49:46 -08:00
Isaac Connor
3c55daaf36
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
2017-11-22 12:10:54 -08:00
Isaac Connor
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
Isaac Connor
121e64a8c6
turn on MOnitors dropdown in filters, an debug
2017-11-22 11:40:07 -08:00
Isaac Connor
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
Isaac Connor
11449b77a9
add debugging. increase concurrency of request queue
2017-11-22 11:46:24 -05:00
Isaac Connor
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
Isaac Connor
8b49a475d4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-11-21 19:55:48 -05:00
Isaac Connor
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
Isaac Connor
6eb542f0e2
Merge branch 'storageareas' into LookandFeel
2017-11-20 20:19:27 -05:00
Isaac Connor
12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
...
Minor UI fixes
2017-11-20 20:15:32 -05:00
digital-gnome
b655689f47
Fix cache_bust
...
Cache busting was preventing changing css due to leaving symlinks behind. Adding the css name to each symlink prevents the need for a forced refresh since mtime is the same on unchanged files but filename does not change between css sets.
2017-11-20 12:27:20 -05:00
digital-gnome
c7ecb71810
Fix progressbar on short events
...
Fixes rounding errors at the end of events due to zms only returning integers. Especially noticable on short events.
2017-11-17 22:29:10 -05:00
Isaac Connor
e0f6a7caa9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-17 14:31:03 -05:00