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
|
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 |