Isaac Connor
|
e53bd1292e
|
increase events list width to accomodate thumbnails
|
2016-05-02 14:30:54 -04:00 |
|
Isaac Connor
|
550fdc9295
|
change thumbnail path to specify eid and fid instead of path to the jpg.
|
2016-05-02 13:42:15 -04:00 |
|
Isaac Connor
|
b38aa60209
|
fix height of function popup
|
2016-05-02 11:56:42 -04:00 |
|
Isaac Connor
|
9d6a7541c8
|
add Id column to storage areas
|
2016-05-02 10:40:42 -04:00 |
Isaac Connor
|
0044161b9c
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-04-29 10:46:37 -04:00 |
|
Isaac Connor
|
be5f0cd4a9
|
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
|
2016-04-29 10:44:46 -04:00 |
|
Isaac Connor
|
59406fd03a
|
Merge branch 'master' into storageareas
|
2016-04-28 09:24:36 -04:00 |
Steve Gilvarry
|
ac5fdb8956
|
Merge pull request #1421 from connortechnology/fix_events_pagination
remove the if(pages>1) so that the if > line always happens
|
2016-04-28 21:43:54 +10:00 |
|
Isaac Connor
|
010f748016
|
fix clone merge
|
2016-04-26 15:02:34 -04:00 |
|
Isaac Connor
|
0adbaafd98
|
Merge branch 'master' into storageareas
|
2016-04-26 13:10:37 -04:00 |
Andrew Bauer
|
fe9cb4b7ec
|
Merge pull request #1442 from ZoneMinder/fix_rotate
Fix rotate
|
2016-04-26 09:54:01 -05:00 |
|
Isaac Connor
|
851e8f46ff
|
redo fix_rotate
|
2016-04-25 15:57:39 -04:00 |
|
Isaac Connor
|
b50172fc2e
|
introduce a Frame object. Alter the image view to take just an fid, in which case it is the unique primary key Id of the Frame.
|
2016-04-25 14:59:55 -04:00 |
|
Isaac Connor
|
85798932ee
|
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
|
2016-04-25 14:10:26 -04:00 |
|
Isaac Connor
|
2ff01b6bcb
|
remove unneeded global
|
2016-04-22 13:36:12 -04:00 |
|
Isaac Connor
|
30b746c603
|
Add missing ()'s
|
2016-04-22 13:35:40 -04:00 |
|
Andrew Bauer
|
81757a0465
|
Merge pull request #1418 from pliablepixels/1417-clone-monitor
Clone feature added
|
2016-04-20 13:02:10 -05:00 |
|
Isaac Connor
|
ba3f9d1b9a
|
Merge branch 'master' into storageareas
|
2016-04-19 12:03:21 -04:00 |
|
Isaac Connor
|
b2d02a64f4
|
reload stream after error
|
2016-04-19 12:02:58 -04:00 |
|
Isaac Connor
|
bc99e4c476
|
whitespace changes
|
2016-04-17 09:29:14 -04:00 |
root
|
479ea17ed5
|
fix event menubars
|
2016-04-16 15:13:18 -04:00 |
|
Isaac Connor
|
50f2747bb4
|
remove the if(pages>1) so that the if > line always happens
|
2016-04-15 16:11:53 -04:00 |
|
Isaac Connor
|
b57abb4e54
|
revert
|
2016-04-15 12:50:51 -04:00 |
arjunrc
|
804ac1de81
|
Clone feature added
|
2016-04-14 13:53:10 -04:00 |
|
Isaac Connor
|
6ca40966a1
|
remove teh dropdown-ness of the montage options
|
2016-04-12 08:52:26 -04:00 |
|
Isaac Connor
|
61bd60184a
|
Merge branch 'random_fixes' into storageareas
|
2016-04-11 11:28:24 -04:00 |
Isaac Connor
|
851a81eff7
|
Merge pull request #1406 from ZoneMinder/svg_zones
replace the static zone image with a stream, and use SVG to draw the zones
|
2016-04-11 11:14:11 -04:00 |
|
Andy Bauer
|
39a30ff51b
|
refresh parent when cancel is clicked
|
2016-04-10 15:59:13 -05:00 |
|
Andy Bauer
|
e5bf2d245c
|
quit the stream in zones.php when zone.php is called
|
2016-04-10 15:33:55 -05:00 |
|
Andy Bauer
|
fbb2a527e6
|
remove setButtonState. it is not needed.
|
2016-04-10 07:55:45 -05:00 |
|
Andy Bauer
|
988d611d03
|
remove unused code
|
2016-04-09 21:37:00 -05:00 |
|
Andy Bauer
|
e7d35d16bc
|
add monitor alarm state and fps to zone edit view
|
2016-04-09 21:34:30 -05:00 |
|
Isaac Connor
|
78c6e14e0c
|
Merge branch 'master' into storageareas
|
2016-04-09 14:52:28 -04:00 |
|
Isaac Connor
|
0c8e0ac220
|
change quotes to prevent php7 complaint
|
2016-04-09 11:24:59 -04:00 |
|
Isaac Connor
|
6d27a857aa
|
put a zones class on the svg
|
2016-04-08 14:38:50 -04:00 |
|
Isaac Connor
|
c73e768f1f
|
put in the onclick for the zone to open the edit page
|
2016-04-08 14:25:19 -04:00 |
|
Isaac Connor
|
b10c6ee093
|
fix Monitor capitalisation
|
2016-04-08 14:23:44 -04:00 |
|
Isaac Connor
|
758a0341ce
|
convert monitor to object
|
2016-04-08 14:09:59 -04:00 |
|
Isaac Connor
|
498bceae0a
|
remove styles for svg circles
|
2016-04-08 13:44:20 -04:00 |
|
Isaac Connor
|
22f207602b
|
add css for the svg zones
|
2016-04-08 13:43:00 -04:00 |
|
Isaac Connor
|
f749ff47ea
|
convert to monitor object
|
2016-04-08 13:40:32 -04:00 |
|
Isaac Connor
|
0ce85137dc
|
remove points. Don't need them here
|
2016-04-08 13:39:31 -04:00 |
|
Isaac Connor
|
56a91ed4b2
|
rename monitor object from Monitor to monitor. Remove points in zone list.
|
2016-04-08 13:37:29 -04:00 |
|
Isaac Connor
|
8735f1ac73
|
convert to monitor object
|
2016-04-08 13:37:01 -04:00 |
|
Isaac Connor
|
11981efad2
|
add this back
|
2016-04-08 13:20:26 -04:00 |
|
Isaac Connor
|
6bb95beb9a
|
Merge branch 'svg_zones' into storageareas
|
2016-04-08 13:20:01 -04:00 |
|
Isaac Connor
|
34bfbb4708
|
blah
|
2016-04-08 13:18:13 -04:00 |
|
Isaac Connor
|
f20945bf84
|
update zone points in SVG
|
2016-04-08 13:13:10 -04:00 |
|
Isaac Connor
|
7da6e1e5a1
|
use stream for image, add SVG polygon
|
2016-04-08 12:36:09 -04:00 |
|
Isaac Connor
|
256df08af4
|
update SVG polygon points on point update
|
2016-04-08 12:32:26 -04:00 |