Isaac Connor
|
f153e9b8fb
|
MontageReview should only be visisble to people who can view events. Fix running state
|
2016-10-20 13:38:12 -04:00 |
|
Isaac Connor
|
67e14bd12f
|
move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me.
|
2016-10-20 13:16:50 -04:00 |
|
Isaac Connor
|
4bb9709cb2
|
use object methods of Event
|
2016-10-12 15:39:53 -04:00 |
|
Isaac Connor
|
dcf6a39bf6
|
split Event and Monitor into objects and use properties from appropriate object
|
2016-10-12 15:39:32 -04:00 |
|
Isaac Connor
|
5b8b9c5345
|
merge update
|
2016-10-12 09:24:10 -04:00 |
|
Isaac Connor
|
b4f065eb75
|
Convert event view to use Objects
|
2016-10-12 09:17:57 -04:00 |
|
Isaac Connor
|
0903ef294f
|
quick for to make MontageReview work
|
2016-10-11 17:35:28 -04:00 |
|
Isaac Connor
|
7c8b99af23
|
fix bracket problems
|
2016-10-11 12:43:13 -04:00 |
|
Isaac Connor
|
743e8c59f9
|
google code style and double to single quotes
|
2016-10-11 12:11:59 -04:00 |
Jeff Vogt
|
3801d9e43e
|
Disabled autocorrect, autocapitalize, spellcheck on username field for login form
|
2016-10-10 11:27:36 -07:00 |
|
Isaac Connor
|
96b5af9021
|
Merge branch 'fix_onvif' into storageareas
|
2016-10-04 15:00:28 -04:00 |
|
Isaac Connor
|
ac24865647
|
add NoDetectProfiles instead of reusing NoDetectedCameras
|
2016-10-04 14:33:51 -04:00 |
|
Isaac Connor
|
09c5e3012a
|
username and password don't actually have to be specified
|
2016-10-04 14:09:32 -04:00 |
|
Isaac Connor
|
21a94a6200
|
better error message
|
2016-10-04 10:29:37 -04:00 |
|
Isaac Connor
|
cf9fa78ca3
|
work on fixing event view
|
2016-09-29 09:28:48 -04:00 |
Isaac Connor
|
09f7c9ddf9
|
Merge pull request #1633 from bhaal2/storageareas
Storageareas
|
2016-09-28 09:43:00 -04:00 |
|
Isaac Connor
|
994f1d566e
|
fix [
|
2016-09-28 09:09:01 -04:00 |
|
Isaac Connor
|
02a196d98b
|
add missing ]
|
2016-09-28 08:30:22 -04:00 |
|
Isaac Connor
|
6840031ee3
|
fix auth timeout and user session[username] when checking auth hash for speedup
|
2016-09-27 11:51:55 -04:00 |
|
Isaac Connor
|
e04266600e
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-27 11:04:12 -04:00 |
|
Isaac Connor
|
4ce531099c
|
add an auth field to request=stream results to give the client a new auth hash to use
|
2016-09-27 11:03:12 -04:00 |
|
Isaac Connor
|
167214cb01
|
Merge branch 'cookie_scale' into storageareas
|
2016-09-27 10:05:16 -04:00 |
|
Isaac Connor
|
6c3a3d3d50
|
store the scale value for watch and event views in a cookie, differentiated by monitorId.
|
2016-09-27 09:46:04 -04:00 |
|
Isaac Connor
|
0580ef0c88
|
whitespace changes
|
2016-09-26 20:09:09 -04:00 |
bhaal2
|
b9b1dd144c
|
@connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well.
|
2016-09-21 21:41:22 +10:00 |
|
Isaac Connor
|
33ab9d3098
|
instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields
|
2016-09-20 12:19:44 -04:00 |
|
Isaac Connor
|
5f46b8f942
|
Merge pull request #1621 from connortechnology/fix_1620
ptzControl expects a monitor object instead of a dbrow array.
|
2016-09-15 10:18:26 -04:00 |
|
Isaac Connor
|
37c559ba3d
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-09-14 12:49:55 -04:00 |
|
Isaac Connor
|
cf45feea66
|
quiet the logs on initial view load
|
2016-09-14 12:49:47 -04:00 |
|
bhaal2
|
17555bf623
|
Added extra argument 'id' to deleteFilter function to send to delete action for deleting a filter.
|
2016-09-15 01:57:31 +10:00 |
|
bhaal2
|
67f2ddc404
|
Changed filter list order back to Name
Added extra argument 'Id' to delete button onClick call
|
2016-09-15 01:55:58 +10:00 |
|
bhaal2
|
cd626a54ee
|
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
|
2016-09-15 01:29:44 +10:00 |
|
bhaal2
|
99a212803a
|
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
|
2016-09-15 01:29:35 +10:00 |
|
bhaal2
|
cd0e6ba285
|
StorageId now defaults to 0 and database column now set to NOT NULL. Changed default Id in php to match
|
2016-09-14 23:56:05 +10:00 |
|
bhaal2
|
33fc47c4b1
|
StorageId now defaults to 0 (NOT NULL) in the Monitors table, updates to filter.php set the default Id for the default storage area to 0
|
2016-09-14 23:53:52 +10:00 |
|
Isaac Connor
|
2b4bad86cb
|
Merge branch 'master' into storageareas
|
2016-09-13 10:21:10 -04:00 |
|
Isaac Connor
|
a80881bb98
|
Merge branch 'fix_1620' into storageareas
|
2016-09-13 10:03:02 -04:00 |
|
Isaac Connor
|
54db9f2e3a
|
ptzControl expects a monitor object instead of a dbrow array.
|
2016-09-12 21:36:03 -04:00 |
Steve Gilvarry
|
563f4a9d46
|
Merge pull request #1505 from ZoneMinder/fix_filter_actions
Confirmed check box status is now retained after save and changing filters.
|
2016-09-11 14:13:51 +10:00 |
corax
|
070051d06a
|
Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9'
For easy pull-requesting
|
2016-09-09 14:20:03 +02:00 |
|
corax
|
b10c79b4f7
|
Add translation for 'Montage Review'
|
2016-09-09 13:26:19 +02:00 |
|
corax
|
6b18184e4a
|
Remove confusing link to web console
|
2016-09-09 12:38:30 +02:00 |
|
corax
|
4dc6fc03b3
|
Add a missing translate()-call
|
2016-09-09 12:35:34 +02:00 |
|
Isaac Connor
|
10abe98e91
|
merge from packet queue. add monitorId to livestream div lookup
|
2016-09-01 10:15:12 -04:00 |
|
Isaac Connor
|
5f07911a63
|
fix spacing
|
2016-08-31 10:09:42 -04:00 |
Andrew Bauer
|
ea34f3d69a
|
Merge pull request #1576 from ZoneMinder/show_other_zones
include polygons for the other zones.
|
2016-08-15 20:36:16 -05:00 |
|
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 |
|
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
|
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 |
|
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 |