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
a6b136ed40
dark theme fixes
...
Overrides bootstrap input colors for dark theme and more chosen
2017-12-18 09:50:08 -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
c8cfb47f9f
More bootstrap in datepicker
2017-12-16 23:10:19 -05:00
digital-gnome
9d87f7fe18
Use bootstrap icons in datepicker
2017-12-16 20:10:02 -05:00
digital-gnome
a091153929
Use seperate structure and theme jquery ui
2017-12-16 20:04:12 -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
2e56210007
Fix row highlighting
2017-12-15 22:56:49 -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
e192d664fd
WIP pass sort and limit
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
f8da9a1c1b
Cleanup filter appearance
...
Tighten up fields and reduce jumping when adding terms.
2017-12-15 08:47:01 -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
7108e306cb
add popup sizes for server and storage. Increase height of user edit popup
2017-12-11 12:50:30 -05:00
digital-gnome
1e412af902
Fix float overlap
...
Avoid explicitly setting some heights, add clear float
2017-12-10 09:37:16 -05:00
digital-gnome
6974c847e5
Fix controlcss
...
Missing viewCssFileExtra
2017-12-10 09:37:16 -05:00
Isaac Connor
ef1af9cc15
disable FilterComponent as it doesn't actually do anything. Add Groups join when needed
2017-12-09 14:03:42 -05:00
digital-gnome
19e50e2bde
Also have to remove fixed width
2017-12-07 15:20:54 -05:00
digital-gnome
7db790ec7b
Fix dom filling up with comments
2017-12-07 12:54:22 -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
9a7ee7a1e3
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-06 10:12:09 -08:00
Isaac Connor
e7a43b2618
fix, don't set the storage path to NULL
2017-12-06 10:11:59 -08:00
digital-gnome
43bba23735
Fix filteradd complaining
2017-12-06 10:36:37 -05:00
digital-gnome
11a5a47826
Fix missing popups and styles
2017-12-06 09:42:58 -05:00
digital-gnome
b8660e95c9
Dark theme options menu fixes
...
Override bootstrap to match dark theme
2017-12-05 21:01:17 -05:00
digital-gnome
f47f1a89ea
Fix btn-primary css to match current themes
2017-12-05 21:01:16 -05: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
digital-gnome
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
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
digital-gnome
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
Isaac Connor
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
digital-gnome
ab08769adb
Add nice to archive commands
...
Archiving could hammer io/cpu on the server. Big archives would cause problems.
2017-12-04 14:48:17 -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
1c201b0efe
Fix timeline filters
2017-12-02 12:28:06 -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
539172b769
remove top margin from header
2017-12-02 12:28:06 -05:00
digital-gnome
898c9e7473
Add bottom border to dark and classic header
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
8772d1e99a
Timeline header to flex
...
Moved flex override to timeline.css rather than set in in skin file.
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
1636cf6e90
Tighten up headers
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
digital-gnome
53f886edc4
Make navbar refresh not change header links
2017-12-01 22:15:29 -05:00
Isaac Connor
e64497c16a
Merge pull request #54 from digital-gnome/storageareas-uifixes
...
Storageareas uifixes
2017-12-01 16:30:29 -05:00
digital-gnome
1bbcf239d7
Fix timeline by adding StartDateTime
2017-12-01 16:25:03 -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
digital-gnome
83a37732ce
Fix montage view jumping
...
Need to override bootstrap styling
2017-11-30 09:48:02 -05:00
digital-gnome
f8c3e5573e
Change dark theme buttons to match original colors
2017-11-28 21:39:31 -05:00
digital-gnome
3cdb965c4a
Fix dark theme console
...
Hover was using the mostly white from classic and flat. Added the striped look from classic and flat.
2017-11-28 21:27: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
digital-gnome
07b0bf81c1
More cleanup
2017-11-28 12:30:00 -05:00
digital-gnome
e166703be0
Cleanup css
...
Remove repeated block, move eventVideo to the same location in all files
2017-11-28 12:11:07 -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
a81c35d377
Cleanup unused code event.css
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
abba086d08
Progressbox transition
2017-11-26 19:08:07 -05:00
digital-gnome
b01fed111a
Add zoom transition
2017-11-26 19:08:06 -05:00
digital-gnome
ac3dbfbc23
Fix Typo
2017-11-26 19:08:06 -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
f52306ff56
Fix scales to only use fixed width/height on montage
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
7e3328fbb8
add styles to the html5 button element
2017-11-24 09:36:45 -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