Isaac Connor
|
19d46c2d09
|
Merge branch 'master' into storageareas
|
2016-08-15 10:45:50 -04:00 |
|
Isaac Connor
|
a0bc30d3fe
|
fix the order of analyse/capture being passed
|
2016-08-12 15:40:47 -04:00 |
|
Isaac Connor
|
9106675842
|
pass capture or analyse to getImageSrc
|
2016-08-12 15:17:13 -04:00 |
|
Isaac Connor
|
bc4923b555
|
use instead of for the frame object and pass to getImageSrc which expects an array
|
2016-08-12 13:50:18 -04:00 |
|
Isaac Connor
|
cc06a84a0e
|
increase size of onvifprobe popup
|
2016-08-09 13:09:47 -04:00 |
|
Isaac Connor
|
2451768295
|
Merge branch 'master' into storageareas
|
2016-08-08 18:08:46 -04:00 |
Andrew Bauer
|
24d471f452
|
Merge pull request #1503 from ZoneMinder/id_on_console
add option to show monitor ID on console
|
2016-08-06 10:59:03 -05:00 |
|
Isaac Connor
|
6a0c6cd4f2
|
Merge branch 'show_other_zones' into storageareas
|
2016-08-02 13:54:01 -04:00 |
|
Isaac Connor
|
8093470a2e
|
make only the editing polygon have a border. Set default for Type when creating a new zone
|
2016-08-02 12:19:55 -04:00 |
|
Isaac Connor
|
b522371080
|
include polygons for the other zones.
|
2016-08-02 12:02:07 -04:00 |
|
Isaac Connor
|
4c1c95e3a5
|
only include the state if canEdit(system) otherwise it gives an auth error
|
2016-07-22 16:04:42 -04:00 |
|
Isaac Connor
|
32f9b2755e
|
add more height to the logout popup
|
2016-07-22 16:04:18 -04:00 |
|
Isaac Connor
|
9262d9d14e
|
remove debug messages on css changing
|
2016-07-22 16:02:55 -04:00 |
|
Isaac Connor
|
3504c1d8f5
|
Add Id to the title for each monitor
|
2016-07-21 15:02:01 -04:00 |
|
Isaac Connor
|
8c8461a88e
|
Update to use Event object and object based createListThumbnail function
|
2016-07-20 15:20:51 -04:00 |
|
Isaac Connor
|
bce7369984
|
Merge branch 'disk_space_in_events' into storageareas
|
2016-07-19 17:36:15 -04:00 |
|
Isaac Connor
|
cd43d1fa7a
|
Rough in Event disk space reporting
|
2016-07-19 17:34:01 -04:00 |
|
Isaac Connor
|
4caa20821a
|
fix
|
2016-07-14 11:57:06 -04:00 |
|
Isaac Connor
|
eb0ddc4e32
|
update and use Monitor object to generate the stream html. Also introduce a mode parameter to getStreamHTML to specify stills
|
2016-07-14 11:55:27 -04:00 |
|
Isaac Connor
|
b6c02b563b
|
turn off host validation
|
2016-07-14 10:22:09 -04:00 |
|
Isaac Connor
|
410e154b7f
|
code style
|
2016-07-12 10:29:40 -04:00 |
|
Andy Bauer
|
19265b631a
|
custom banner text on web console
|
2016-07-09 13:11:30 -05:00 |
|
Isaac Connor
|
6ab2b33e95
|
fix merge
|
2016-06-27 09:10:35 -04:00 |
Isaac Connor
|
6e4c8fa224
|
need to set the Id when duping
|
2016-06-24 10:31:15 -04:00 |
|
Isaac Connor
|
d732d9a49a
|
fix merge
|
2016-06-24 10:02:20 -04:00 |
|
Isaac Connor
|
e29a0ebe71
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-06-21 13:48:32 -04:00 |
|
Isaac Connor
|
6a8db582ff
|
whitespacing updates
|
2016-06-21 12:21:18 -04:00 |
|
Isaac Connor
|
31a5252afa
|
apply btn and btn-primary styles to remaining buttons on console
|
2016-06-21 09:22:32 -04:00 |
|
Isaac Connor
|
1d1cedce95
|
use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode
|
2016-06-20 12:40:33 -04:00 |
|
Isaac Connor
|
26bba58c56
|
Merge branch 'master' into feature-h264-videostorage
|
2016-06-17 11:09:47 -04:00 |
|
Isaac Connor
|
3914e0b394
|
:Merge branch 'fix_zone_edit' into storageareas
|
2016-06-16 12:04:18 -04:00 |
|
Isaac Connor
|
0c82e82ae2
|
Don't update x in updateY and don't update y in updateX as they are not defined.
|
2016-06-16 12:00:00 -04:00 |
Isaac Connor
|
8e7665d397
|
use getStreamHTML instead of duplicated code
|
2016-06-14 12:40:18 -04:00 |
|
Isaac Connor
|
d5d48bef8a
|
clean out unused variables and don't scale the popup window. The contents of it won't be scaled.
|
2016-06-14 12:39:51 -04:00 |
|
Isaac Connor
|
bfa46e26ee
|
Use monitor Id instead of the array index. Id is unique, so just use it.
|
2016-06-14 12:39:15 -04:00 |
|
Isaac Connor
|
abad7cbf9f
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-06-13 09:43:03 -04:00 |
|
Isaac Connor
|
83ac4cd061
|
change the input handler from onchange to oninput. Disable form submit when hitting enter
|
2016-06-13 09:40:04 -04:00 |
|
Isaac Connor
|
632ec38d7d
|
Put back in neccessary callt o updateArea
|
2016-06-12 16:10:24 -04:00 |
|
Isaac Connor
|
4f2e0edb44
|
remove unnecssary updateAreas
remove unnecessary updateZoneImage
|
2016-06-07 21:23:30 -04:00 |
|
Isaac Connor
|
c3043c1487
|
cleanups, remove unneccessary updateArea calls
|
2016-06-07 21:22:22 -04:00 |
|
Isaac Connor
|
b2dfdea66e
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-06-07 11:45:50 -04:00 |
|
Isaac Connor
|
593fe2b0c5
|
update area when points move
|
2016-06-07 11:40:53 -04:00 |
|
Isaac Connor
|
bb6adc3012
|
fix missing space
|
2016-06-07 09:37:05 -04:00 |
|
Isaac Connor
|
f0ec2a65ee
|
Merge branch 'fix_errors_when_event_not_found' into storageareas
|
2016-06-03 10:47:47 -04:00 |
|
Isaac Connor
|
380b86614f
|
put quotes around integer values that will be empty strings if the event is not found
|
2016-06-03 10:46:21 -04:00 |
|
Isaac Connor
|
b8c406f969
|
Merge branch 'master' into storageareas
|
2016-06-03 09:32:55 -04:00 |
|
Isaac Connor
|
060988c05c
|
set margin and padding on montage.alert and imageFeed.alert because bootstrap declares a generic .alert style with large margins and padding
|
2016-05-31 16:02:37 -04:00 |
|
Andrew Bauer
|
a57a3d3186
|
Merge pull request #1501 from ZoneMinder/fix_zone_edit
Fix zone edit
|
2016-05-31 10:33:31 -05:00 |
|
Isaac Connor
|
1add5a954a
|
Merge branch 'fix_filter_actions' into storageareas
|
2016-05-29 11:37:08 -04:00 |
|
Isaac Connor
|
9f6f5100fe
|
also copy Name from the request on update and only show delete button if it has a name
|
2016-05-29 11:32:18 -04:00 |
|
Isaac Connor
|
7725109917
|
Merge branch 'fix_filter_actions' into storageareas
|
2016-05-27 12:47:32 -04:00 |
|
Isaac Connor
|
101c93d422
|
When the filter is not being loaded, copy the auto fields in the request params into the dbFilter object
|
2016-05-27 12:45:36 -04:00 |
|
Isaac Connor
|
c4e5299943
|
sync up auto to Auto
|
2016-05-27 12:45:04 -04:00 |
|
Isaac Connor
|
c25b680799
|
Merge branch 'fix_filter_actions' into storageareas
|
2016-05-27 11:12:18 -04:00 |
|
Isaac Connor
|
65e33d6c19
|
synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter
|
2016-05-27 11:11:30 -04:00 |
|
Isaac Connor
|
d52a6f9a95
|
Merge branch 'improve_filter' into storageareas
|
2016-05-27 09:57:05 -04:00 |
|
Isaac Connor
|
3058dd9463
|
Merge branch 'id_on_console' into storageareas
|
2016-05-26 12:19:33 -04:00 |
|
Isaac Connor
|
f461bc1e80
|
get rid of extra )
|
2016-05-26 12:18:58 -04:00 |
|
Isaac Connor
|
05709f3084
|
Merge branch 'id_on_console' into storageareas
|
2016-05-26 11:17:41 -04:00 |
|
Isaac Connor
|
f969186abb
|
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
|
2016-05-26 11:15:13 -04:00 |
Andrew Bauer
|
730abc9789
|
make zones unclickable when zm is not running
|
2016-05-26 09:35:36 -05:00 |
|
Andrew Bauer
|
1972c4116b
|
Merge pull request #1486 from connortechnology/update_image_view
Update image view
|
2016-05-26 09:05:14 -05:00 |
|
Isaac Connor
|
7a08d4620f
|
Merge branch 'master' into storageareas
|
2016-05-25 10:17:46 -04:00 |
|
Andrew Bauer
|
575f8ec265
|
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
Hide rtspdescribe
|
2016-05-25 08:44:17 -05:00 |
|
Isaac Connor
|
8f1596d683
|
use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr
|
2016-05-25 09:08:28 -04:00 |
Isaac Connor
|
7cfa2a5eaa
|
Replace the server attribute with a server entry, populated with a dropdown.Makes things more friendly and less error-prone
|
2016-05-24 16:46:34 -04:00 |
|
Isaac Connor
|
8fabeb78d3
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-05-24 15:55:49 -04:00 |
|
Isaac Connor
|
a8e407172a
|
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
|
2016-05-24 15:50:22 -04:00 |
|
Isaac Connor
|
89f58daf89
|
Merge branch 'master' into fix_zone_edit
|
2016-05-24 15:30:56 -04:00 |
|
Andrew Bauer
|
0052bb080c
|
unlink only if file exists
|
2016-05-24 12:13:17 -05:00 |
|
Isaac Connor
|
00abd36af8
|
fix the other case of the wrong case of rtsp
|
2016-05-24 12:19:31 -04:00 |
|
Isaac Connor
|
056eed6df9
|
fix to show RTSP describe option when switching back to rtsp
|
2016-05-24 12:15:59 -04:00 |
|
Isaac Connor
|
bc49aa6aa6
|
add missing ; and remove extra )
|
2016-05-24 09:34:36 -04:00 |
|
Isaac Connor
|
5eac0559e2
|
Merge branch 'master' into hide_rtspdescribe
|
2016-05-24 09:32:41 -04:00 |
|
Isaac Connor
|
fff54e4086
|
update export to use event object, which automatically fixes storage path issues. Include mp4's in the list of video files to include
|
2016-05-18 09:02:14 -04:00 |
|
Isaac Connor
|
20c4d07a00
|
Merge branch 'master' into hide_rtspdescribe
|
2016-05-16 14:40:04 -04:00 |
|
Isaac Connor
|
5e419e85d7
|
move logger down, as thisURL gets set in the skin.js and comment out overlay.js
|
2016-05-16 14:37:35 -04:00 |
|
Isaac Connor
|
e28cb5b412
|
fix body padding
|
2016-05-16 13:29:13 -04:00 |
|
Isaac Connor
|
9601b30972
|
Add Width, Height and alt to frame
|
2016-05-16 13:26:44 -04:00 |
|
Isaac Connor
|
e4566f2e8e
|
Merge branch 'update_image_view' into storageareas
|
2016-05-16 12:23:19 -04:00 |
|
Isaac Connor
|
df8964c1f9
|
use eid= & fid= instead of path to frame image. The use of view=image also provides more security.
|
2016-05-16 10:33:21 -04:00 |
|
Isaac Connor
|
9a1b0b79b9
|
don't use a dropdown for montage, etc
|
2016-05-13 11:43:38 -04:00 |
|
Isaac Connor
|
a61dade6df
|
Merge branch 'fix_montage_server_refs' into storageareas
|
2016-05-13 11:11:27 -04:00 |
|
Isaac Connor
|
3ed6014f61
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-13 11:11:19 -04:00 |
|
Isaac Connor
|
8cb2692bbb
|
pass in the server url into the monitor object to use instead of the portal url
|
2016-05-13 11:09:12 -04:00 |
|
Isaac Connor
|
e301eaf6e4
|
use instead of $ to reference jquery
|
2016-05-13 11:08:04 -04:00 |
|
Isaac Connor
|
85f950d80a
|
put jquery into no conflict mode so it doesn't overwite mootools use of $
|
2016-05-13 09:45:24 -04:00 |
|
Isaac Connor
|
1ce2e597cf
|
fix body top padding
|
2016-05-12 20:00:37 -04:00 |
|
Isaac Connor
|
2144cb7de6
|
fix body padding only for console and options
|
2016-05-12 10:45:13 -04:00 |
|
Isaac Connor
|
e9d8b7925a
|
Merge branch 'db_reconnect' into storageareas
|
2016-05-10 11:13:09 -04:00 |
|
Isaac Connor
|
2af96237b3
|
increase filter save popup height
|
2016-05-10 10:02:07 -04:00 |
|
Isaac Connor
|
e4171855bb
|
add padding for nabar to body
|
2016-05-07 18:12:31 -04:00 |
|
Isaac Connor
|
ae40dc8b1b
|
revert to fixed navbar
|
2016-05-07 18:11:58 -04:00 |
|
Isaac Connor
|
51e6372362
|
remove extra hidden fields
|
2016-05-06 18:20:05 -04:00 |
|
Isaac Connor
|
dcdefac48a
|
fix styles in header, move footer back into header
|
2016-05-06 16:08:32 -04:00 |
|
Isaac Connor
|
7219e0624b
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:56:07 -04:00 |
|
Isaac Connor
|
9756f59a2c
|
still trying to fix eventcounts
|
2016-05-06 15:56:01 -04:00 |
|
Isaac Connor
|
97a1d5a648
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:53:48 -04:00 |
|
Isaac Connor
|
52b4e98e5a
|
fixes
|
2016-05-06 15:53:19 -04:00 |
|
Isaac Connor
|
fc191dfaa5
|
fixes
|
2016-05-06 15:52:07 -04:00 |
|
Isaac Connor
|
38877f802c
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:47:48 -04:00 |
|
Isaac Connor
|
905b69a394
|
fix too many {
|
2016-05-06 15:47:29 -04:00 |
|
Isaac Connor
|
7c3a7a6fda
|
fix i to monitor_i in for loop
|
2016-05-06 15:46:47 -04:00 |
|
Isaac Connor
|
38e02db9cf
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:46:00 -04:00 |
|
Isaac Connor
|
daf10c1b84
|
make displayMonitors global
|
2016-05-06 15:44:35 -04:00 |
|
Isaac Connor
|
f8d7f9906d
|
fixup merging of Event data into the monitor array
|
2016-05-06 15:44:23 -04:00 |
|
Isaac Connor
|
2ccefdb23c
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:30:25 -04:00 |
|
Isaac Connor
|
f4df9e053d
|
port sidebar css over from classic to flat
|
2016-05-06 15:30:10 -04:00 |
|
Isaac Connor
|
fb1b8000ec
|
fix the use of when specifying a skin
|
2016-05-06 15:24:20 -04:00 |
|
Isaac Connor
|
02b5cd6b6c
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:17:10 -04:00 |
|
Isaac Connor
|
5d8eeb5b56
|
deprecate header, just the getNavBarHTML function
|
2016-05-06 15:16:48 -04:00 |
|
Isaac Connor
|
da97dfd9cf
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 14:59:10 -04:00 |
|
Isaac Connor
|
ed5cb2f3ed
|
fix global language problems
|
2016-05-06 14:58:41 -04:00 |
|
Isaac Connor
|
99d9f98244
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 14:40:08 -04:00 |
|
Isaac Connor
|
956b971719
|
put back maxWidtha nd maxHeight
|
2016-05-06 14:39:48 -04:00 |
|
Isaac Connor
|
b3b63ec1d9
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 14:38:17 -04:00 |
|
Isaac Connor
|
829202b42a
|
move more eventcounting stuff to console.php.
|
2016-05-06 14:38:08 -04:00 |
|
Isaac Connor
|
b67ea65fcb
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 14:34:02 -04:00 |
|
Isaac Connor
|
297f27af8c
|
fix missing {
|
2016-05-06 14:33:56 -04:00 |
|
Isaac Connor
|
f1e22f9265
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 14:32:57 -04:00 |
|
Isaac Connor
|
7acf6cb694
|
fix colon to semi colon
|
2016-05-06 14:32:52 -04:00 |
|
Isaac Connor
|
01397b6695
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 14:31:27 -04:00 |
|
Isaac Connor
|
1d673a0b8c
|
move header into a function in functions.php. Move event population into console.php
|
2016-05-06 14:30:32 -04:00 |
|
Isaac Connor
|
7df2685223
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 12:51:40 -04:00 |
|
Isaac Connor
|
e87a35b04d
|
Merge branch 'always_show_ptz' into storageareas
|
2016-05-06 12:51:15 -04:00 |
|
Isaac Connor
|
c9f1614e32
|
If the camera has no centering control, don't make it look like it does. This also removes a logged error
|
2016-05-06 12:51:03 -04:00 |
|
Isaac Connor
|
d5f1519829
|
Can't externally reference .js.php, they have to be inline js
|
2016-05-06 12:40:23 -04:00 |
|
Isaac Connor
|
b333b8ebee
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 12:06:47 -04:00 |
|
Isaac Connor
|
ee015ee674
|
whitespace/codestyle. Also remove duplicate form iput runState which I think is left over from it being a popup
|
2016-05-06 12:06:13 -04:00 |
|
Isaac Connor
|
44e5b566b8
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 11:56:24 -04:00 |
|
Isaac Connor
|
8405db4750
|
Move running=daemonCheck from header to index.php so that it is defined early and can be used everywhere
|
2016-05-06 11:56:03 -04:00 |
|
Isaac Connor
|
b3b9eaa7d5
|
better code for deprecate sequpdownarrays
|
2016-05-06 11:44:13 -04:00 |
|
Isaac Connor
|
be4f155160
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 11:42:46 -04:00 |
|
Isaac Connor
|
4784f8b630
|
deprecate the seqUp and seqDown arrays
|
2016-05-06 11:36:11 -04:00 |
|
Isaac Connor
|
4b838dc66c
|
deprecate minSequence and maxSequence
|
2016-05-06 11:29:49 -04:00 |
|
Isaac Connor
|
b0e977f8ed
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 11:26:53 -04:00 |
|
Isaac Connor
|
55567b66e9
|
deprecate minSequence and maxSequence use
|
2016-05-06 11:04:35 -04:00 |
|
Isaac Connor
|
b0a057724a
|
document minSequence use
|
2016-05-06 11:04:22 -04:00 |
|
Isaac Connor
|
49dc917b2e
|
Merge isaac:ZoneMinder.p1 into storageareas
|
2016-05-05 15:24:14 -04:00 |
|
Isaac Connor
|
27b928839c
|
deprecate view=image-ffmpeg
|
2016-05-05 15:04:11 -04:00 |
|
Isaac Connor
|
d342b11e64
|
remove servers references from header, they go in console
|
2016-05-04 09:07:29 -04:00 |
|
Isaac Connor
|
36f94dddec
|
cleanup merge problems
|
2016-05-03 14:46:22 -04:00 |
|
Isaac Connor
|
d25e75f485
|
Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console
|
2016-05-03 14:39:59 -04:00 |
|
Isaac Connor
|
c3628a8dfd
|
Merge branch 'updated-console' into storageareas
|
2016-05-03 14:34:58 -04:00 |
|
Isaac Connor
|
4defe92911
|
Merge branch 'master' into updated-console
|
2016-05-03 14:22:37 -04:00 |
Kyle Johnson
|
36da4aed88
|
Push monitor view back to before I messed with it
|
2016-05-03 13:55:38 -04:00 |
|
Kyle Johnson
|
b92c9f9be4
|
Add state modal to options view
|
2016-05-03 13:55:38 -04:00 |
|
Kyle Johnson
|
3271d17a3a
|
Remove header from log view
|
2016-05-03 13:55:38 -04:00 |
|
Kyle Johnson
|
bfda50b693
|
Also don't load additional JS to Log view
Another issue with mootools & jquery conflicts
|
2016-05-03 13:55:38 -04:00 |
|
Kyle Johnson
|
dcd6449a9b
|
Don't include extra js libraries for monitor view.
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
|
2016-05-03 13:55:38 -04:00 |