Isaac Connor
|
0adc14da4e
|
fix links to Filter and Devices
|
2017-07-12 11:17:07 -04:00 |
|
Isaac Connor
|
fed4dae7e5
|
fix width and height in options
|
2017-07-11 19:13:29 -04:00 |
|
Isaac Connor
|
148d7066f9
|
Merge branch 'master' into storageareas
|
2017-07-11 16:15:02 -04:00 |
|
Isaac Connor
|
dfd1c2844a
|
remove storageId
|
2017-07-11 11:28:15 -04:00 |
|
Isaac Connor
|
0eb7bfabf2
|
put the ajax query back to a post
|
2017-07-07 12:15:09 -04:00 |
|
Isaac Connor
|
90882edc31
|
make montage images be display: block; This makes the layout not jump around when a camera feed dies
|
2017-07-07 10:05:20 -04:00 |
|
Isaac Connor
|
2dd8b5df1f
|
in dark and flat, the buttons use a larger font. The fixed size is not appropriate
|
2017-07-07 09:59:41 -04:00 |
|
Isaac Connor
|
39745e49d4
|
I think we switch to border-box model or something, anyways, the box that the pantilt buttons go in needs to be 100px not 96px
|
2017-07-07 09:51:51 -04:00 |
Andrew Bauer
|
4128f5861f
|
Merge pull request #1940 from connortechnology/montagereview_rework
Montagereview rework
|
2017-07-07 08:34:01 -05:00 |
|
Isaac Connor
|
21881235f9
|
merge changeWidth and changeHeight
|
2017-07-07 09:31:53 -04:00 |
|
Isaac Connor
|
d3ec50aa69
|
various fixes plus use global db functions in logger
|
2017-07-06 17:45:23 -04:00 |
|
Isaac Connor
|
50adec45c5
|
Strip non 7-bit ascii chars from log message
|
2017-07-06 11:45:17 -04:00 |
|
Isaac Connor
|
7533d09631
|
increase log query time minimum to 2 seconds. 1 is too frequent.
|
2017-07-06 11:42:35 -04:00 |
|
Isaac Connor
|
c2a042c0e7
|
replace with $)REQUEST so that logs can be query using a GET. Strip non-asci8bit chars from log message
|
2017-07-06 11:42:04 -04:00 |
|
Isaac Connor
|
c372787882
|
fix typo
|
2017-07-06 10:50:56 -04:00 |
|
Isaac Connor
|
4aba4178da
|
fix spacing
|
2017-07-06 10:50:07 -04:00 |
|
Isaac Connor
|
e892841d7e
|
Fix typo
|
2017-07-06 10:49:54 -04:00 |
|
Isaac Connor
|
cf0944f0ad
|
spacing and quotes
|
2017-07-06 10:49:36 -04:00 |
|
Isaac Connor
|
48d1174dd6
|
hide buttons when using videojs
|
2017-07-06 10:49:27 -04:00 |
|
Isaac Connor
|
48373f0d8b
|
fix filters on console. filter object now has terms under a Query array
|
2017-07-06 10:49:10 -04:00 |
|
Isaac Connor
|
5f03faa77e
|
view=frame needs more vertical space
|
2017-07-06 10:48:52 -04:00 |
|
Isaac Connor
|
874dc79948
|
tell eventdetail popup to close on save
|
2017-07-06 10:48:33 -04:00 |
|
Isaac Connor
|
3233105d2c
|
implement a way to tell a popup to close
|
2017-07-06 10:48:06 -04:00 |
|
Isaac Connor
|
9b4fb05d5b
|
Fix parseFilter because terms is now under Query
|
2017-07-06 10:47:47 -04:00 |
|
Isaac Connor
|
d892b94819
|
spacing
|
2017-07-06 09:38:30 -04:00 |
|
Isaac Connor
|
c3c6459052
|
Merge branch 'montagereview_rework' into storageareas
|
2017-07-05 15:34:02 -04:00 |
|
Isaac Connor
|
6b2e23e1a5
|
Merge branch 'montagereview_rework' of ../ZoneMinder.master into montagereview_rework
|
2017-07-05 14:27:46 -04:00 |
|
Isaac Connor
|
1e21beb1cd
|
use instead of document.getElementById
|
2017-07-05 14:25:44 -04:00 |
|
Isaac Connor
|
d61dfcd410
|
scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc.
|
2017-07-05 14:23:01 -04:00 |
|
Isaac Connor
|
720748a731
|
code cleanup mostly. scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc.
|
2017-07-05 14:22:44 -04:00 |
|
Isaac Connor
|
0b4a2b41cc
|
fix scale on initial montage load. Replace calls to functions.php/getStreamSrc with object based call
|
2017-07-05 14:20:50 -04:00 |
|
Isaac Connor
|
3068987308
|
Merge branch 'master' into montagereview_rework
|
2017-07-05 13:53:00 -04:00 |
|
Isaac Connor
|
8c19b129d7
|
more wip
|
2017-07-04 12:33:01 -04:00 |
|
Isaac Connor
|
f87a89a5ce
|
more fixes
|
2017-07-04 11:51:23 -04:00 |
|
Isaac Connor
|
d7950bd732
|
Merge branch 'master' into knnniggett-configfiles
|
2017-07-03 21:53:47 -04:00 |
|
Isaac Connor
|
a263de144b
|
fixup defaults for Filter
|
2017-06-29 15:00:17 -04:00 |
|
Isaac Connor
|
621d2e0e41
|
remove debug code
|
2017-06-28 15:18:12 -04:00 |
|
Isaac Connor
|
8b1459a510
|
fixes for cambozola on ie, and fixes to setting fixed widths
|
2017-06-28 15:17:55 -04:00 |
|
Isaac Connor
|
ed4da1e8bc
|
change to single quotes
|
2017-06-28 14:27:09 -04:00 |
|
Isaac Connor
|
90696331a9
|
Merge branch 'master' into storageareas
|
2017-06-26 21:58:11 -04:00 |
|
Isaac Connor
|
f782aeccd9
|
fix view is view_video, not action=niew_video
|
2017-06-26 21:09:54 -04:00 |
|
Isaac Connor
|
3a113899ed
|
whitespace and braces fixing
|
2017-06-26 14:29:45 -04:00 |
|
Isaac Connor
|
c1b8105c0e
|
only include csrf if it's going to be used. This fixes view_video using up all ram sending a video file
|
2017-06-26 14:23:54 -04:00 |
|
Isaac Connor
|
d97d156efb
|
Don't do csrf for view_video
|
2017-06-26 11:48:26 -04:00 |
|
Isaac Connor
|
b5565bb16a
|
fix filters, refreshparent in wrong block
|
2017-06-23 09:04:46 -04:00 |
|
Isaac Connor
|
892f3a06c7
|
wip
|
2017-06-23 08:32:09 -04:00 |
|
Isaac Connor
|
76f63686cb
|
Merge branch 'fix_event_viewing' into storageareas
|
2017-06-22 09:24:31 -04:00 |
|
Isaac Connor
|
5e75588bfb
|
Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause
|
2017-06-21 17:14:02 -04:00 |
|
Isaac Connor
|
c7026a1b65
|
requests should be csrf'd. view_video does not need to be
|
2017-06-20 10:56:59 -04:00 |
|
Isaac Connor
|
1932fa7f81
|
don't do CSRF for requests, and when not auth, clear the request so that we don't do it.
|
2017-06-20 10:52:16 -04:00 |