Isaac Connor
|
70246ce55a
|
whitespace corrections and ensure that options[width] and options[height] are defined
|
2017-03-20 12:10:28 -04:00 |
|
Isaac Connor
|
8834109812
|
code style and whitespace changes
|
2017-03-17 09:59:23 -04:00 |
|
Isaac Connor
|
d9c665b021
|
Merge branch 'fix_crash_with_invalid_zones' into storageareas
|
2017-03-17 09:35:11 -04:00 |
Andrew Bauer
|
9681a444b4
|
Merge pull request #1765 from SteveGilvarry/ffmpeg_url
Align Method description to what it is actually doing
|
2017-03-16 09:32:30 -05:00 |
|
Isaac Connor
|
5bccd92b68
|
fix scoping of scale var
|
2017-03-16 09:53:53 -04:00 |
Isaac Connor
|
9f99d34807
|
fix calls to getStreamHTML
|
2017-03-13 14:22:33 -04:00 |
|
Isaac Connor
|
14c4a156c6
|
set img.src='' first so that Chrome closes the old stream.
|
2017-03-06 20:21:12 -05:00 |
|
Isaac Connor
|
4df12ae370
|
Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height
|
2017-03-06 17:30:00 -05:00 |
|
Isaac Connor
|
d3f7451736
|
Merge branch 'storageareas' into montage_width_height
|
2017-03-06 16:56:18 -05:00 |
|
Isaac Connor
|
4fc0aead70
|
wip
|
2017-03-01 15:26:40 -05:00 |
Isaac Connor
|
c3a52272d8
|
implement changeWidth, changeHeight and alter getStreamHTML to take an array of options
|
2017-02-27 20:56:14 -05:00 |
|
Isaac Connor
|
a0dd36d869
|
add width and height scale dropdowns
|
2017-02-27 16:40:40 -05:00 |
|
Isaac Connor
|
186e5ba866
|
Merge branch 'master' into storageareas
|
2017-02-21 09:48:00 -05:00 |
Manojav Sridhar
|
11b90e6011
|
fix usage of wrong key
|
2017-02-17 12:37:58 -05:00 |
|
Isaac Connor
|
980b088d57
|
google style and add label tags around Scale
|
2017-02-17 09:19:54 -05:00 |
|
Isaac Connor
|
aeedfe8d74
|
fix some whitespacing
|
2017-02-14 09:11:54 -05:00 |
SteveGilvarry
|
9716c4ef89
|
Add Option help
|
2017-02-05 18:43:47 +11:00 |
|
SteveGilvarry
|
c72704bf0b
|
Change descriptions for ffmpeg methods and put TCP first.
|
2017-02-05 15:34:06 +11:00 |
|
Isaac Connor
|
e3edbf40cf
|
make url full width
|
2017-02-02 12:16:40 -05:00 |
|
Isaac Connor
|
7b73eb350f
|
update to current.
|
2017-02-02 12:15:16 -05:00 |
|
Isaac Connor
|
d8c79cb750
|
fixup header and sidebar layout
|
2017-02-02 11:31:16 -05:00 |
|
Isaac Connor
|
6f6eacaa72
|
fixup classic and dark skins
|
2017-01-30 21:45:48 -05:00 |
|
Isaac Connor
|
89022fff0c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-01-30 21:16:26 -05:00 |
|
Isaac Connor
|
f3378207c0
|
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
|
2017-01-30 21:16:21 -05:00 |
|
Isaac Connor
|
ad2e00166a
|
use isset
|
2017-01-30 19:53:08 -05:00 |
|
Isaac Connor
|
4543b3e1b1
|
include jquery-ui instead of using a cdn version
|
2017-01-30 19:17:14 -05:00 |
|
Isaac Connor
|
19aed3f860
|
dont check ZM_DIR_EVENTS if it already exists in storageareas
|
2017-01-30 17:29:15 -05:00 |
|
Isaac Connor
|
129acb5b8e
|
only show mark column if you have the Monitor Edit ability
|
2017-01-24 09:30:56 -05:00 |
|
Isaac Connor
|
7cd2f6c69e
|
use glyphicon for sort
|
2017-01-23 21:51:17 -05:00 |
|
Isaac Connor
|
fdd71a826a
|
implement dragndrop sorting
|
2017-01-23 10:12:57 -05:00 |
|
Isaac Connor
|
35148008b6
|
make img an inline-block so that it continues having space, even when is a broken link
|
2017-01-18 21:14:15 -05:00 |
|
Isaac Connor
|
899b1b82b9
|
Merge branch 'filter_by_runstate' into storageareas
|
2017-01-14 17:07:20 -05:00 |
|
Isaac Connor
|
242e5a56d8
|
rough in the ability to filter on RunState
|
2017-01-14 16:55:28 -05:00 |
|
Isaac Connor
|
2436e40f5d
|
Merge branch 'master' into storageareas
|
2017-01-11 10:34:27 -05:00 |
Andy Bauer
|
7ef7a36f39
|
fix conditional logic in controlcap.js
|
2017-01-10 17:53:05 -06:00 |
|
Isaac Connor
|
fea5fa1b59
|
fix xtell should be -1 for move left
|
2017-01-10 12:35:02 -05:00 |
|
Isaac Connor
|
7ef0c2c9d3
|
fix deleting filters. We don't need to set fid anymore
|
2017-01-09 14:58:55 -05:00 |
|
Isaac Connor
|
cc724a5542
|
add a question mark to delete confirmation
|
2017-01-09 14:53:13 -05:00 |
|
Isaac Connor
|
84183c819c
|
Merge branch 'master' into storageareas
|
2017-01-03 09:53:09 -05:00 |
|
Isaac Connor
|
0a90dbac9f
|
require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path.
|
2017-01-02 10:35:51 -05:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
|
Andy Bauer
|
2dda2d9e1e
|
remove unneeded, empty files
|
2016-12-26 09:49:14 -06:00 |
|
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
|
Isaac Connor
|
0f4b78b180
|
increase height of bandwidth popup
|
2016-12-21 10:46:42 -05:00 |
|
Isaac Connor
|
f92edc3456
|
refresh stream url when changing scale
|
2016-12-21 10:40:47 -05:00 |
|
Isaac Connor
|
02a2fdf58f
|
Merge branch 'remove_emptys' into storageareas
|
2016-12-20 16:40:42 -05:00 |
|
Isaac Connor
|
38c0cedecc
|
remove the use of empty which on php < 5.5 only supports variables.
|
2016-12-20 16:37:42 -05:00 |
|
Isaac Connor
|
708f52beda
|
Merge branch 'disk_space_in_events' into storageareas
|
2016-12-13 13:36:18 -05:00 |
|
Isaac Connor
|
a9548d3f6b
|
Add a config entry to turn event disk space on/off
|
2016-12-13 13:34:56 -05:00 |
|
Isaac Connor
|
30ec67d4c3
|
Merge branch 'master' into disk_space_in_events
|
2016-12-13 13:28:32 -05:00 |