Isaac Connor
|
822cb7bf1a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-22 11:37:19 -04:00 |
|
Isaac Connor
|
615b9f6ee6
|
code style cleanup. A new feature is that if ->processes == 'web' we won't include it in the c++ header defines. We can use this to shrink ram use and startup time of c++ processes a bit
|
2020-08-22 11:37:12 -04:00 |
|
Isaac Connor
|
08aee63f66
|
Don't need a variable can just pass the define
|
2020-08-22 11:36:07 -04:00 |
|
Isaac Connor
|
9f9b771d3f
|
remove dead code
|
2020-08-22 10:58:16 -04:00 |
Andrew Bauer
|
5d09ae91ab
|
move div tag into $imgHTML
|
2020-08-22 07:14:47 -05:00 |
|
Andrew Bauer
|
8ea7b783b5
|
generate thumbnails when monitor is connected
|
2020-08-21 21:18:55 -05:00 |
|
Andrew Bauer
|
c8e40eb5b3
|
don't generate tumbnails when not running
|
2020-08-21 21:14:16 -05:00 |
|
Andrew Bauer
|
39d538d5cf
|
add missig }
|
2020-08-21 20:57:05 -05:00 |
|
Andrew Bauer
|
73a01855f8
|
rough in thumbnail animation
|
2020-08-21 20:44:20 -05:00 |
|
Andrew Bauer
|
79fa257a4a
|
rough in tumbnail animation to web console
|
2020-08-21 20:43:36 -05:00 |
|
Isaac Connor
|
ac0976324f
|
Fix case of filterQuery. Fixes #3017
|
2020-08-21 11:22:47 -04:00 |
|
Isaac Connor
|
fe425302ad
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-21 10:46:13 -04:00 |
|
Isaac Connor
|
63ef15d247
|
spacing and quotes
|
2020-08-21 10:46:10 -04:00 |
|
Isaac Connor
|
b589c3abd9
|
glob sorts since perl 5.6.0
|
2020-08-21 10:45:32 -04:00 |
|
Isaac Connor
|
80a6608733
|
Make values in conf.d files override values in db. Also handle the fact that they would already be defined in this case.
|
2020-08-21 10:36:49 -04:00 |
|
Andrew Bauer
|
9357017a39
|
add export fx to tables
|
2020-08-21 07:11:57 -05:00 |
|
Isaac Connor
|
46aaddeac5
|
Sort loading of conf.d config files. Also ignore db Config table entries that have already been defined in conf.d files so that they take precedence.
|
2020-08-20 20:44:28 -04:00 |
|
Andrew Bauer
|
bec77c9ce3
|
change pointer when over frames table
|
2020-08-20 10:39:55 -05:00 |
|
Andrew Bauer
|
de4d144cd4
|
fix scale dropdown in frame view
|
2020-08-20 10:16:28 -05:00 |
|
Andrew Bauer
|
72d95275c3
|
add navbar for frame view
|
2020-08-20 09:19:04 -05:00 |
|
Andrew Bauer
|
247ace7fa2
|
process clicks per cell in frames
|
2020-08-20 09:13:11 -05:00 |
|
Andrew Bauer
|
7175fa3d86
|
no padding on frames outermost div
|
2020-08-20 08:19:53 -05:00 |
|
Andrew Bauer
|
c9de30d427
|
click any row to load frame
|
2020-08-19 17:54:39 -05:00 |
|
Andrew Bauer
|
b2a632a3f8
|
reinit thumbnail ani on click events
|
2020-08-19 16:16:27 -05:00 |
|
Andrew Bauer
|
8f70ae192d
|
enable thumbnail zoom on frames view
|
2020-08-19 15:42:35 -05:00 |
|
Andrew Bauer
|
a903a885b6
|
whitepsace
|
2020-08-19 14:07:00 -05:00 |
|
Andrew Bauer
|
842efc1574
|
remove <a> tags from col headers
|
2020-08-19 12:31:13 -05:00 |
|
Andrew Bauer
|
74b0ad2cb3
|
get rid of horizontal scrollbar in frames
|
2020-08-19 12:20:57 -05:00 |
|
Andrew Bauer
|
f317bf1722
|
fix copy/paste typo
|
2020-08-19 12:07:31 -05:00 |
|
Andrew Bauer
|
e38a532b78
|
rough new frames view
|
2020-08-19 12:04:08 -05:00 |
|
Andrew Bauer
|
ad9b9d91cc
|
disable the back button when new page
|
2020-08-18 16:57:03 -05:00 |
|
Andrew Bauer
|
610ec2f78c
|
Update .travis.yml
|
2020-08-18 16:29:10 -05:00 |
|
Andrew Bauer
|
e189e99353
|
Update zoneminder.spec
|
2020-08-18 15:37:37 -05:00 |
|
Andrew Bauer
|
de075a2733
|
fix typo
|
2020-08-18 15:13:45 -05:00 |
|
Andrew Bauer
|
3664a9b42c
|
set the pagination list
|
2020-08-18 15:12:07 -05:00 |
|
Andrew Bauer
|
1e41bd0823
|
whitespace
|
2020-08-18 13:48:18 -05:00 |
|
Andrew Bauer
|
6eb7b6d51c
|
set the right toolbar btn class to match
|
2020-08-18 13:13:32 -05:00 |
|
Andrew Bauer
|
df02d84a56
|
don't go back if not referred
|
2020-08-18 13:08:17 -05:00 |
|
Andrew Bauer
|
2c9caeb348
|
whitespace
|
2020-08-18 12:40:27 -05:00 |
|
Isaac Connor
|
2d5522df14
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-18 13:25:21 -04:00 |
|
Isaac Connor
|
c837a17aea
|
Add a warning about missing EndTime term on UpdateDiskSpace
|
2020-08-18 13:25:18 -04:00 |
|
Andrew Bauer
|
bf63500b08
|
fix thumbnail animation after user event
|
2020-08-18 12:00:20 -05:00 |
|
Andrew Bauer
|
a0bc60ceda
|
change not enabling ffmpeg msg to debug
|
2020-08-18 10:34:07 -05:00 |
|
Isaac Connor
|
e6d6ee1b67
|
Merge branch 'filter_warnings'
|
2020-08-18 11:17:46 -04:00 |
|
Isaac Connor
|
16efa9dbb2
|
Add extra checks for Deleting without an Archived State term and Running in the background without any actions.
|
2020-08-18 11:17:22 -04:00 |
|
Andrew Bauer
|
ccda2b3707
|
EPIPE sets zm_terminate so no need to check
|
2020-08-18 09:37:21 -05:00 |
|
Andrew Bauer
|
62d687adfa
|
dont warn or error for EPIPE errno's
|
2020-08-18 09:30:06 -05:00 |
|
Andrew Bauer
|
1627b1d0d1
|
privacy view page formatting
|
2020-08-18 09:08:26 -05:00 |
|
Andrew Bauer
|
287c585d3d
|
use translated text for delete confirmation
|
2020-08-18 08:26:45 -05:00 |
|
Andrew Bauer
|
b32bcab91f
|
add a delete confirmation modal
|
2020-08-18 08:06:58 -05:00 |