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
ecf5cfc767
Merge branch 'storageareas' into zma_to_thread
2017-12-14 13:41:41 -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
bcdadc67bf
Merge branch 'storageareas' into zma_to_thread
2017-12-12 15:29:19 -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
49908c11da
Merge branch 'storageareas' into zma_to_thread
2017-12-11 13:51:32 -05: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
011c7e1540
revert to /1000000 tb
2017-12-08 14:22:38 -05:00
6b9007c6a7
Merge branch 'storageareas' into zma_to_thread
2017-12-08 13:46:16 -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
90820ab92a
Merge branch 'storageareas' into zma_to_thread
2017-12-07 10:37:04 -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
933cdedaa6
Merge branch 'storageareas' into zma_to_thread
2017-12-06 11:58:29 -05: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
5deb69207b
Merge branch 'storageareas' into zma_to_thread
2017-12-04 22:11:46 -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
a27374b827
Merge branch 'storageareas' into zma_to_thread
2017-12-04 17:11:46 -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
588f63b053
Merge branch 'storageareas' into zma_to_thread
2017-12-04 17:07:16 -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
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
3f62d1e24d
Montagereview filter respect groups setting
2017-12-04 14:35:33 -05:00
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
9aa94bd3ab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-03 16:05:43 -05:00
9ca19b003f
Add download button to montagereview
2017-12-03 14:42:09 -05:00
4f5677eb3b
Remove time limit from archive download for exceptionally large files
2017-12-03 14:42:08 -05:00
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
bab308ffa8
Merge branch 'storageareas' into zma_to_thread
2017-12-03 12:43:31 -05:00
7a188a84f7
Add montagereview filter passing
...
montagereview now accepts any appropriate filters
2017-12-02 12:29:55 -05:00
6d6b4366de
Fix MontageReview filters
2017-12-02 12:29:54 -05:00
1c201b0efe
Fix timeline filters
2017-12-02 12:28:06 -05:00
66d6e1a4a4
Add header to watch
2017-12-02 12:28:06 -05:00
11629076f6
Fix Timeline view, add list link
2017-12-02 12:28:06 -05:00
539172b769
remove top margin from header
2017-12-02 12:28:06 -05:00
898c9e7473
Add bottom border to dark and classic header
2017-12-02 12:28:06 -05:00
58159963fa
Fix back on timeline view
2017-12-02 12:28:05 -05:00
064ce99eac
Scalecontrol in wrong place
2017-12-02 12:28:05 -05:00
bf5c928e38
Event view compress header
...
Combine all three lines of event view to 2.
2017-12-02 12:28:05 -05:00
50d5a8991d
Events header
...
Moved all non-event links to the header
2017-12-02 12:28:05 -05:00
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
e6568d01a3
Remove timeline popup
2017-12-02 12:28:05 -05:00
9d1bbfab42
Remove unused code from event
2017-12-02 12:28:05 -05:00
725814d41d
Remove unused code from events
2017-12-02 12:28:05 -05:00
7a5dfb71dc
Remove no longer used max from events
2017-12-02 12:28:05 -05:00
1636cf6e90
Tighten up headers
2017-12-02 12:28:05 -05:00
b3ef499e46
remove event popup
2017-12-02 12:28:04 -05:00
f02cd2e615
Remove watch popup
2017-12-02 12:28:04 -05:00
1289269e6f
Change filter to work without popup
2017-12-02 12:28:04 -05:00
adc1b924da
Remove events popup
2017-12-02 12:25:53 -05:00
e34b8abaca
Cleanup events view header
2017-12-02 12:25:53 -05:00
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
53f886edc4
Make navbar refresh not change header links
2017-12-01 22:15:29 -05:00
4a9c31a15d
wip
2017-12-01 15:42:19 -08:00
e64497c16a
Merge pull request #54 from digital-gnome/storageareas-uifixes
...
Storageareas uifixes
2017-12-01 16:30:29 -05:00
1bbcf239d7
Fix timeline by adding StartDateTime
2017-12-01 16:25:03 -05:00
ca3d6546bd
sorty by name when listing monitors by name
2017-12-01 12:30:21 -08:00
5e953cefea
fix old cookie causing errors loading layouts
2017-12-01 12:30:07 -08:00
967368ce07
testing
2017-11-30 22:18:33 -05:00
0a995aea78
Add navbar refresh to all pages that use it
2017-11-30 16:33:46 -05:00
f2efc80f22
works?
2017-11-30 14:37:36 -05:00
83a37732ce
Fix montage view jumping
...
Need to override bootstrap styling
2017-11-30 09:48:02 -05:00
f8c3e5573e
Change dark theme buttons to match original colors
2017-11-28 21:39:31 -05:00
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
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
07b0bf81c1
More cleanup
2017-11-28 12:30:00 -05:00
e166703be0
Cleanup css
...
Remove repeated block, move eventVideo to the same location in all files
2017-11-28 12:11:07 -05:00
1e50df741f
fix some memleaks
2017-11-28 09:50:09 -05:00
dfb69a2c5b
Merge branch 'tesla' into storageareas
2017-11-28 06:29:42 -05:00
9f57c819cd
Merge branch 'tesla' into zma_to_thread
2017-11-27 14:57:38 -05:00
00c5590a71
add Monitor count to servers
2017-11-27 11:56:48 -08:00
106351a9f3
don't get zma status
2017-11-27 11:57:42 -05:00
81c46073a7
remove some brackets
2017-11-27 11:57:08 -05:00
digital-gnome
Isaac Connor
Isaac Connor
Isaac Connor
Pliable Pixels
kimmeld
Isaac Connor
APHW2 MFGENG