Isaac Connor
|
330327ded0
|
Improve code readability. Use a define for header size
|
2020-12-03 16:21:18 -05:00 |
|
Isaac Connor
|
fc9c87cf9f
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-12-03 14:28:13 -05:00 |
|
Isaac Connor
|
5a489b3e99
|
Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081
|
2020-12-03 14:28:03 -05:00 |
|
Isaac Connor
|
6e64114ac3
|
Skip row locking in UpdateDiskSpace if the filter is already locking rows
|
2020-12-03 14:26:51 -05:00 |
Andrew Bauer
|
e93de2a3a4
|
partial jquery convesion of watch.js
|
2020-12-03 13:12:01 -06:00 |
|
Isaac Connor
|
cfd4c17953
|
Include invalid font path in the error message
|
2020-12-03 13:35:12 -05:00 |
|
Isaac Connor
|
7ef34bce7b
|
Include new fonts dir in install
|
2020-12-03 13:30:51 -05:00 |
|
Isaac Connor
|
1c45019eeb
|
Bump version to 1.35.15
|
2020-12-03 13:16:42 -05:00 |
|
Isaac Connor
|
05bd6e1c56
|
Fix editing groups causing a new Group to be added. You have to tell cakephp which Group you are saving. Also fix the resulting output to be the saved group, not a list of monitors. Fixes #3088
|
2020-12-03 13:14:19 -05:00 |
|
Isaac Connor
|
8ddde0d377
|
Update stock PurgeWhenFull and UpdateDiskSpace filters to add EndTime terms. Add FOREIGN KEYS to Groups_Monitors and Groups.ParentId
|
2020-12-03 13:11:24 -05:00 |
|
Isaac Connor
|
b5e4d242ba
|
Add zm_update-1.35.15.sql that will attempt to add EndTime term to stock filters.
|
2020-12-03 11:23:25 -05:00 |
|
Isaac Connor
|
6877054fea
|
Parse tree dumping should be debug not warning
|
2020-12-03 11:17:41 -05:00 |
|
Isaac Connor
|
c8aac87f74
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-12-03 10:26:27 -05:00 |
|
Isaac Connor
|
19122d0824
|
Fix bandwidth dropdown clicking
|
2020-12-03 10:25:59 -05:00 |
|
Andrew Bauer
|
ce4d9cd657
|
put back manual refresh button on watch view
|
2020-12-03 08:38:28 -06:00 |
|
Andrew Bauer
|
74fe47c4c5
|
don't autorefresh watch view table
|
2020-12-03 08:31:52 -06:00 |
|
Andrew Bauer
|
dd0cac35fe
|
include filterquery in watch view event list ajax
|
2020-12-03 07:53:09 -06:00 |
|
Andrew Bauer
|
a38c392266
|
eslint
|
2020-12-03 07:22:32 -06:00 |
|
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 |
hax0kartik
|
59d5860560
|
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into Font
|
2020-12-02 09:45:16 +05:30 |
|
hax0kartik
|
1ec13f3d06
|
Free font->data only when font itself is valid
|
2020-12-02 09:44:49 +05:30 |
|
Kartik
|
db9883389f
|
Merge pull request #1 from connortechnology/font
Font
|
2020-12-02 04:46:24 +05:30 |
|
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 |
|
Isaac Connor
|
ff2981b9b3
|
code style. Remove unused members. Make WriteFrameImage const
|
2020-12-01 09:53:51 -05:00 |
|
Isaac Connor
|
3c11b4f151
|
Add CMakeLists so that fonts get installed
|
2020-12-01 09:35:24 -05:00 |
|
Isaac Connor
|
d1c3864778
|
Use the ZM_FONTDIR substitution instead of hardcoding a path
|
2020-12-01 09:21:54 -05:00 |
|
Isaac Connor
|
7326af95a9
|
Add ZM_FONTDIR as a place to store fonts for timestamping
|
2020-12-01 09:21:25 -05: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 |
|
hax0kartik
|
d290ffc1b3
|
Set individual rgb components instead of memset which is wrong
|
2020-11-30 17:57:59 +05:30 |
|
Isaac Connor
|
67dac2651b
|
Log an error with path when can't open video
|
2020-11-29 17:06:07 -05:00 |
|
Isaac Connor
|
159edbfce9
|
Fix video file having wrong id
|
2020-11-29 16:25:33 -05:00 |
|
hax0kartik
|
32e2563643
|
Free font data when destructor is called
|
2020-11-29 10:53:20 +05:30 |
|
hax0kartik
|
890a52605f
|
Satisfy cpplint
|
2020-11-29 10:25:06 +05:30 |