Andrew Bauer
|
d5df996bca
|
deploy animated thumbnails on watch view
|
2020-12-02 19:44:12 -06:00 |
Isaac Connor
|
76eea525b7
|
Merge pull request #3085 from hax0kartik/Font
Font
|
2020-12-02 16:16:21 -05:00 |
Isaac Connor
|
1c10cc492b
|
Fix StartTime to StartDateTime
|
2020-12-02 13:15:32 -05:00 |
Andrew Bauer
|
aac47ed361
|
fixes to export functions
|
2020-12-02 12:02:24 -06:00 |
Andrew Bauer
|
f13533cab7
|
convert export functions to jquery
|
2020-12-02 10:53:55 -06:00 |
Andrew Bauer
|
70689acf8d
|
remove data-mobile-responsive, use table-responsive-sm instead
|
2020-12-02 07:47:57 -06:00 |
Andrew Bauer
|
347c64eb7d
|
remove warning
|
2020-12-01 13:30:57 -06:00 |
Andrew Bauer
|
6da826d79c
|
fix typo
|
2020-12-01 13:29:43 -06:00 |
Isaac Connor
|
8397ec3b9d
|
Merge branch 'release-1.34'
|
2020-12-01 14:28:10 -05:00 |
Isaac Connor
|
48775e2230
|
Fix Clear Log by using minTime and maxTime as timestamps. Fix export including unselected filters. Can't just serialize the form asit may contain fields in teh querystring so you get an array of values instead of a single value
|
2020-12-01 14:24:41 -05:00 |
Isaac Connor
|
baeb1dbd5b
|
Take an optional debug param in dbQuery
|
2020-12-01 14:07:23 -05:00 |
Isaac Connor
|
ae7a706526
|
Handle minTime and maxTime being specified as either a timstamp or a datetime. Remove duplicated query building code. Reduce ram requirements when exporting logs.
|
2020-12-01 14:04:51 -05:00 |
Andrew Bauer
|
051e361958
|
eslint
|
2020-12-01 12:19:01 -06:00 |
Andrew Bauer
|
b0da7f5920
|
fix navbar bandwidth dropdown
|
2020-12-01 10:27:08 -06:00 |
Andrew Bauer
|
93f11bbc82
|
set responsive breakpoint for small screens on watch & events views
|
2020-12-01 09:50:32 -06:00 |
Andrew Bauer
|
f12c8f453e
|
after deleting an event, call streamNext rather than reload
|
2020-12-01 09:30:06 -06:00 |
Andrew Bauer
|
23fcd1f2c5
|
modernize the event playback view
|
2020-12-01 09:07:42 -06:00 |
Andrew Bauer
|
ac01e0638a
|
Update skin.css
|
2020-11-30 10:19:12 -06:00 |
Andrew Bauer
|
ee9f98d7e6
|
make modal content more readable on dark skin
|
2020-11-30 10:06:35 -06:00 |
Isaac Connor
|
836cd2d58d
|
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font
|
2020-11-30 09:45:39 -05:00 |
Isaac Connor
|
67dac2651b
|
Log an error with path when can't open video
|
2020-11-29 17:06:07 -05:00 |
hax0kartik
|
528699f942
|
Use ctzll + new font format for improving drawing speed
|
2020-11-28 18:46:20 +05:30 |
Isaac Connor
|
d68b922632
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-27 13:30:31 -05:00 |
Isaac Connor
|
8c56ac80c5
|
Make Name,Path,Url in storage modal 100%
|
2020-11-27 13:30:24 -05:00 |
Isaac Connor
|
80c4e2fa57
|
Fix table not being 100%. Use appropriate bootstrap style labels for radios
|
2020-11-27 13:29:57 -05:00 |
Andrew Bauer
|
a67fb0bb16
|
eslint
|
2020-11-26 19:28:25 -06:00 |
Andrew Bauer
|
8d8054bc0f
|
deploy bstable to watch view
|
2020-11-26 17:00:05 -06:00 |
Andrew Bauer
|
08dabf1a4f
|
don't add "zoom" class when thumb animation is off
|
2020-11-25 13:29:14 -06:00 |
Andrew Bauer
|
28614ce703
|
change where we check for web_animate_thumbs
|
2020-11-25 13:16:11 -06:00 |
Andrew Bauer
|
ff4b0e6309
|
add option to disable thumb animation
|
2020-11-25 13:03:16 -06:00 |
Isaac Connor
|
cf08010ebe
|
Fix redirect on zone editing
|
2020-11-18 13:04:56 -05:00 |
Isaac Connor
|
5bf5d58ac1
|
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
|
2020-11-16 11:32:50 -05:00 |
Andrew Bauer
|
a2b5271835
|
fix copy/paste typo
|
2020-11-14 17:34:59 -06:00 |
Andrew Bauer
|
0ffb5e153c
|
modify FilterTerm to support Frames view searches
|
2020-11-14 17:33:18 -06:00 |
Andrew Bauer
|
f3756def08
|
deploy server side pagination for frames view
|
2020-11-14 14:45:22 -06:00 |
Andrew Bauer
|
9aa6fea6a3
|
frames view server pagination WIP
|
2020-11-14 14:19:28 -06:00 |
Andrew Bauer
|
f88d721ae3
|
fix issue with events view and ALL pagination
|
2020-11-14 10:27:33 -06:00 |
Isaac Connor
|
f32d10a1ab
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-13 17:16:13 -05:00 |
Isaac Connor
|
66f7cc55dc
|
Spacing code comments, quotes
|
2020-11-13 17:05:23 -05:00 |
Andrew Bauer
|
52e747791d
|
rough in frames server pagination backend
|
2020-11-13 12:34:01 -06:00 |
Isaac Connor
|
a581cb9de1
|
Make various text input options be 90%
|
2020-11-13 10:18:35 -05:00 |
Isaac Connor
|
70ebd570e0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-13 09:52:10 -05:00 |
Isaac Connor
|
3cf31435a7
|
fix next/prev buttons by correcting the sort_field when it is StartTime or EndTime
|
2020-11-13 09:51:54 -05:00 |
Andrew Bauer
|
c0225a35aa
|
use different variable assignment for clarity
|
2020-11-13 07:24:17 -06:00 |
Andrew Bauer
|
a15c8ea7d8
|
Merge pull request #3072 from ZoneMinder/iconnor_ajax_event_changes
Rework code to use Filter methods to generate advanced search
|
2020-11-13 07:10:08 -06:00 |
Isaac Connor
|
95f8aad19b
|
Fix detection of filter['id']
|
2020-11-11 17:39:55 -05:00 |
Isaac Connor
|
fe733fe1e6
|
Must use & instead of & in filter redirect
|
2020-11-11 17:39:37 -05:00 |
Isaac Connor
|
73e8c04b6f
|
Fix encoding of = in filter['Id']. Fixes redirect after saving
|
2020-11-11 17:39:20 -05:00 |
Isaac Connor
|
52c7cc5869
|
reorganize code. Remove Server caching as it is done in Object.php.
|
2020-11-11 11:49:44 -05:00 |
Isaac Connor
|
b4aacde5bf
|
Remove debug. Auth is pretty solid these days
|
2020-11-10 13:15:46 -05:00 |
Isaac Connor
|
5b10fff2a0
|
Use cached objects when using new instead of only find_one
|
2020-11-10 13:14:36 -05:00 |
Isaac Connor
|
f2630b8fbc
|
Merge branch 'master' into move_event_totals_to_monitor_status
|
2020-11-06 14:17:23 -05:00 |
Isaac Connor
|
59403dc11b
|
Move event stat totals to Monitor_Status.
|
2020-11-06 14:00:18 -05:00 |
Isaac Connor
|
6ed006bc60
|
rename StartTime and EndTime to StartDateTime and EndDateTime in the named query params
|
2020-11-06 12:25:04 -05:00 |
Isaac Connor
|
402b559b2c
|
Add StartTime and EndTime virtual fields for backwards compatability
|
2020-11-06 11:15:12 -05:00 |
Isaac Connor
|
68cdd2123d
|
Merge branch 'release-1.34'
|
2020-11-05 13:55:15 -05:00 |
Isaac Connor
|
746882ba85
|
Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070
|
2020-11-05 13:45:02 -05:00 |
Isaac Connor
|
7b8ee6af9f
|
Rework code to use Filter methods to generate advanced search functionality. Reduces sql queries to 1 or 2, using count() to populate [total] and [totalNotFiltered]. Does pagination using array_splice instead of SQL queries. Will use more ram, but reduces db load.
|
2020-11-05 12:20:49 -05:00 |
Isaac Connor
|
ee89eb45e6
|
Fix EndTime to EndDateTime
|
2020-11-04 18:39:02 -05:00 |
Isaac Connor
|
e085e08caa
|
Fix missed StartTime to StartDateTime
|
2020-11-04 18:27:51 -05:00 |
Isaac Connor
|
130588eb8f
|
fix typos
|
2020-11-04 18:22:50 -05:00 |
Isaac Connor
|
d37bce4e0e
|
Fix missed StartTime to StartDateTime
|
2020-11-04 18:20:59 -05:00 |
Isaac Connor
|
289612a826
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-11-04 18:10:55 -05:00 |
Isaac Connor
|
b17fa8f9c1
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:58:03 -05:00 |
Isaac Connor
|
ce99a9456b
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:56:44 -05:00 |
Isaac Connor
|
68ad1cf1f7
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:56:37 -05:00 |
Isaac Connor
|
786e2fec92
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:56:27 -05:00 |
Isaac Connor
|
af9e279f9e
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:55:27 -05:00 |
Isaac Connor
|
d75e93249c
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:54:12 -05:00 |
Isaac Connor
|
9d22de98a3
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:53:45 -05:00 |
Isaac Connor
|
9e6a9cad80
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:53:17 -05:00 |
Isaac Connor
|
8029f59eac
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:52:50 -05:00 |
Isaac Connor
|
2d33dd5386
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:52:32 -05:00 |
Isaac Connor
|
0d404ac66f
|
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
|
2020-11-04 13:50:45 -05:00 |
Isaac Connor
|
4731041a40
|
FS Storage DiskSpace isn't implemented.
|
2020-11-04 12:42:04 -05:00 |
Isaac Connor
|
e67532ef76
|
implement is_valid_attr. Fix incorrect EventDiskspace vs FS DiskSpace. FS DiskSpace isn't implemented. DiskPercent is.
|
2020-11-04 12:40:43 -05:00 |
Isaac Connor
|
387b2b1fc2
|
add attr validation to addTerm. Add addTerms
|
2020-11-04 12:39:42 -05:00 |
Isaac Connor
|
af399bb174
|
Reqiure Id to have a value not just be set
|
2020-11-04 09:18:41 -05:00 |
Isaac Connor
|
2c899bd3c5
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-03 12:11:58 -05:00 |
Isaac Connor
|
6112db627c
|
Even if we found the filter in the db, if it is present in the query string, update the object with the new values
|
2020-11-03 11:59:28 -05:00 |
Isaac Connor
|
b2385ccecc
|
colour match a:link to navbar colour. This has the effect of brightening up all links.
|
2020-11-03 11:53:15 -05:00 |
Isaac Connor
|
dda1decfb1
|
When redirecting after execute, redirect to the full filter querystring, as it may not have an Id and may have additional changes
|
2020-11-03 11:45:22 -05:00 |
Isaac Connor
|
f7c9a0e03d
|
Must urlencode [Id]=
|
2020-11-03 11:44:54 -05:00 |
Isaac Connor
|
3b785cfde0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-02 16:31:53 -05:00 |
Andrew Bauer
|
736c2e4cf5
|
Merge pull request #3068 from ZoneMinder/fix_endtime
Test for EndTime value before using strftime on it.
|
2020-11-02 15:21:43 -06:00 |
Isaac Connor
|
0f74e24bfc
|
Join Monitors as M as well in total and totalNotFiltered queries
|
2020-11-02 15:50:38 -05:00 |
Isaac Connor
|
bd1d4f954b
|
Test for EndTime value before using strftime on it.
|
2020-11-02 15:45:05 -05:00 |
Andrew Bauer
|
96a9a73320
|
roll back events.php
|
2020-11-02 14:33:40 -06:00 |
Isaac Connor
|
7650e0bf51
|
cleanup my totalNotFiltered code. Join Monitors as well as they can be referenced by the filter
|
2020-11-02 12:43:45 -05:00 |
Isaac Connor
|
492e65c2fd
|
Add missing PathToAPI
|
2020-11-02 12:42:30 -05:00 |
Isaac Connor
|
73e6d5a9d0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-01 18:44:15 -05:00 |
Matt N
|
6e3eb922e0
|
Use relative symlinks for monitor event directories
This way the link continues to work from backups and after the user moves ZM data to a new directory.
|
2020-11-01 14:55:08 -08:00 |
Andrew Bauer
|
3d795be864
|
remove the thumbnail col if WEB_LIST_THUMBS is off
|
2020-11-01 15:46:43 -06:00 |
Isaac Connor
|
787953559d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-01 16:11:10 -05:00 |
Andrew Bauer
|
824f38c746
|
hide settings buttons rather than disable for non Local monitors
|
2020-11-01 08:05:53 -06:00 |
Isaac Connor
|
30e0e49ee7
|
Fix total rows when using search
|
2020-10-31 14:09:47 -04:00 |
Andrew Bauer
|
5047c28157
|
attempt to fix totalnotfiltered
|
2020-10-31 11:26:29 -05:00 |
Isaac Connor
|
41e88fad6e
|
translate \n to <br/>. Fixes #3064
|
2020-10-29 15:08:14 -04:00 |
Isaac Connor
|
75ec13871d
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-10-29 09:40:49 -04:00 |
Isaac Connor
|
97f4d9e7a2
|
Make the event count and diskspace in the storage row be a link to events for that storage area.
|
2020-10-29 09:40:14 -04:00 |