Skip to content

Commit 570564a

Browse files
committed
conflict in changelog corrected
2 parents 0fe05f9 + 10b021c commit 570564a

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
66
### Added
77

88
- Added support for billing-api.
9+
- New `highest_available` option for `customer_monitoring_level` in agent-api `login` method.
910

1011
### Bugfixes
1112
- Fix `customer_monitoring_level` parameter in `login` method in agent-api v3.3/v3.4/v3.5 classes.

livechat/agent/rtm/api/v34.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ def login(self,
750750
the application's name and version.
751751
away (bool): When True, the connection is set to the away state.
752752
Defaults to False.
753-
customer_monitoring_level (str): Possible values: my, chatting, invited, online.
753+
customer_monitoring_level (str): Possible values are: `my`, `chatting`, `invited`, `online` and `highest_available`.
754754
Defaults to my if login creates the first session;
755755
otherwise it preserves the current customer_monitoring_level.
756756
pushes (dict): Use case: when you want to receive only specific pushes.

livechat/agent/rtm/api/v35.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ def login(self,
750750
the application's name and version.
751751
away (bool): When True, the connection is set to the away state.
752752
Defaults to False.
753-
customer_monitoring_level (str): Possible values: my, chatting, invited, online.
753+
customer_monitoring_level (str): Possible values are: `my`, `chatting`, `invited`, `online` and `highest_available`.
754754
Defaults to my if login creates the first session;
755755
otherwise it preserves the current customer_monitoring_level.
756756
pushes (dict): Use case: when you want to receive only specific pushes.

livechat/agent/rtm/api/v36.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ def login(self,
722722
the application's name and version.
723723
away (bool): When True, the connection is set to the away state.
724724
Defaults to False.
725-
customer_monitoring_level (str): Possible values: my, chatting, invited, online.
725+
customer_monitoring_level (str): Possible values are: `my`, `chatting`, `invited`, `online` and `highest_available`.
726726
Defaults to my if login creates the first session;
727727
otherwise it preserves the current customer_monitoring_level.
728728
pushes (dict): Use case: when you want to receive only specific pushes.

0 commit comments

Comments
 (0)