Skip to content

Commit 8d0d398

Browse files
committed
Merge branch 'master' into DOC-178_ajs-2-ga
2 parents 9c2b50b + 40041aa commit 8d0d398

File tree

24 files changed

+330
-501
lines changed

24 files changed

+330
-501
lines changed

js/feedback/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ export default function() {
3232
const tooltips = tippy(buttons)
3333
const defaultSettings = {
3434
interactive: true,
35-
placement: 'bottom',
36-
boundary: 'viewport',
35+
flip: true,
36+
placement: 'bottom-end',
37+
boundary: '.docs',
3738
trigger: 'manual',
3839
onMount: (tooltip) => {
3940
const sendButton = document.querySelector(SEND_SELECTOR)

scripts/env.sh

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,30 @@ else
7070
echo " ✔ Yarn already installed"
7171
fi
7272

73-
brew install ruby
73+
# May 2021 - replacing the brew instructions with an rvm command
74+
# rvm helps keep the system ruby separate from the jekyll one
75+
# we'll need to periodically update this with the latest version of ruby we use
76+
# brew install ruby
77+
78+
curl -sSL https://get.rvm.io | bash -s stable
79+
rvm install 2.7
80+
rvm --default use 2.7
81+
7482

7583
which -s bundler
7684
if [[ $? != 0 ]] ; then
77-
gem install -n /usr/local/bin bundler:2.1.2
78-
gem install bundler:2.1.2 --user-install
85+
gem install bundler:2.2.2
7986
echo " ✔ Bundler installed"
8087
else
8188
echo " ✔ Bundler already installed"
8289
fi
8390

84-
echo " Updating your Gem installation. Please enter your password to sudo."
85-
sudo gem update --system -n /usr/local/bin
86-
echo "Gem version " $(gem --version) "installed"
91+
echo " Installing gems for the docs repo."
92+
bundle install
93+
94+
#echo " Updating your Gem installation. Please enter your password to sudo."
95+
#sudo gem update --system -n /usr/local/bin
96+
#echo "Gem version " $(gem --version) "installed"
8797

8898
# can't get this working because comparing version strings is complicated.
8999
# which -s gem

scripts/ignore.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,23 @@ log=$(env -i git log -1 --pretty=%B)
88

99
# ignore for simple typo fixes
1010
if echo "$log" | grep -q 'typo'; then
11+
echo "Build ignored because 'typo' is in the commit message."
1112
exit
1213
# ignore link / url updates
1314
elif echo "$log" | grep -q 'link'; then
15+
echo "Build ignored because 'link' is in the commit message."
1416
exit
1517
# ignore when the ignore tag is explicitly added
1618
elif echo "$log" | grep -q 'netlify\-ignore'; then
19+
echo "Build ignored because it was requested."
1720
exit
1821
# ignore dependabot updates
1922
elif echo "$log" | grep -q 'dependabot'; then
23+
echo "Ignoring dependabot update"
2024
exit
2125
# ignore when master is merged into a branch
2226
elif echo "$log" | grep -q 'Merge branch \SMaster\S'; then
27+
echo "Build ignored because it's only an update from the main branch."
2328
exit
2429
else
2530
exit 1

src/_data/catalog/destination_categories.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
2-
# destination categories last updated 2021-05-07
2+
# destination categories last updated 2021-05-18
33
items:
44
- display_name: Email Marketing
55
slug: email-marketing

src/_data/catalog/destinations.yml

Lines changed: 72 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
2-
# destination data last updated 2021-05-14
2+
# destination data last updated 2021-05-18
33
items:
44
- display_name: ActiveCampaign
55
slug: activecampaign
@@ -3698,6 +3698,7 @@ items:
36983698
- eu
36993699
- us06
37003700
- us08
3701+
- us05
37013702
description: 'Choose your Appboy Gateway (ie. US 01, US 02, EU 01, etc.).'
37023703
settings: []
37033704
- name: automaticallyDisplayMessages
@@ -11118,6 +11119,60 @@ items:
1111811119
regexp: ''
1111911120
description: The name of your workspace
1112011121
settings: []
11122+
- display_name: HeadsUp AI
11123+
slug: headsup-ai
11124+
name: catalog/destinations/headsup-ai
11125+
url: connections/destinations/catalog/headsup-ai
11126+
description: Determine User Health Scores
11127+
hidden: false
11128+
status: PUBLIC_BETA
11129+
previous_names:
11130+
- HeadsUp AI
11131+
logo:
11132+
url: >-
11133+
https://public-segment-devcenter-production.s3.amazonaws.com/1c80a592-0ede-451d-9aa8-a017601606ea.svg
11134+
mark:
11135+
url: >-
11136+
https://public-segment-devcenter-production.s3.amazonaws.com/7618c303-890b-42ed-b3fe-c70130fdd629.svg
11137+
categories:
11138+
- Analytics
11139+
- CRM
11140+
- Customer Success
11141+
methods:
11142+
alias: false
11143+
group: true
11144+
identify: true
11145+
page_view: true
11146+
track: true
11147+
components: []
11148+
platforms:
11149+
browser: true
11150+
server: true
11151+
mobile: true
11152+
browserUnbundlingSupported: false
11153+
browserUnbundlingPublic: false
11154+
connection_modes:
11155+
device:
11156+
web: false
11157+
mobile: false
11158+
server: false
11159+
cloud:
11160+
web: false
11161+
mobile: false
11162+
server: false
11163+
summary: No connection mode information available.
11164+
cmode_type: none
11165+
case: '0'
11166+
settings:
11167+
- name: apiKey
11168+
display_name: API Key
11169+
type: STRING
11170+
deprecated: false
11171+
required: true
11172+
string_validators:
11173+
regexp: '^.{8,}$'
11174+
description: You can find your API key within the HeadsUp onboarding flow.
11175+
settings: []
1112111176
- display_name: Heap
1112211177
slug: heap
1112311178
name: catalog/destinations/heap
@@ -14549,13 +14604,6 @@ items:
1454914604
required: false
1455014605
description: Map your Segment properties to the Marketo Activity Fields
1455114606
settings:
14552-
- name: primaryKey
14553-
display_name: Set as Primary Key
14554-
type: BOOLEAN
14555-
deprecated: false
14556-
required: false
14557-
description: Mark this property as the Primary field in Marketo.
14558-
settings: []
1455914607
- name: segmentProperty
1456014608
display_name: Segment Property Name
1456114609
type: STRING
@@ -14591,6 +14639,13 @@ items:
1459114639
- date
1459214640
description: Enter the Marketo Field type.
1459314641
settings: []
14642+
- name: primaryKey
14643+
display_name: Set as Primary Key
14644+
type: BOOLEAN
14645+
deprecated: false
14646+
required: false
14647+
description: Mark this property as the Primary field in Marketo.
14648+
settings: []
1459414649
- name: event
1459514650
display_name: Segment Event Name
1459614651
type: STRING
@@ -19136,6 +19191,15 @@ items:
1913619191
required: false
1913719192
description: Map your Segment properties to Responsys Columns
1913819193
settings:
19194+
- name: columns
19195+
display_name: Segment Property Name
19196+
type: STRING
19197+
deprecated: false
19198+
required: true
19199+
string_validators:
19200+
regexp: ''
19201+
description: Enter the Segment Property Name.
19202+
settings: []
1913919203
- name: fieldName
1914019204
display_name: Responsys Column Name
1914119205
type: STRING
@@ -19169,15 +19233,6 @@ items:
1916919233
required: false
1917019234
description: Mark this property as a Primary Key in Responsys.
1917119235
settings: []
19172-
- name: columns
19173-
display_name: Segment Property Name
19174-
type: STRING
19175-
deprecated: false
19176-
required: true
19177-
string_validators:
19178-
regexp: ''
19179-
description: Enter the Segment Property Name.
19180-
settings: []
1918119236
- name: mapEmail
1918219237
display_name: Map Email
1918319238
type: BOOLEAN

src/_data/catalog/overrides.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
items:
2+
- slug: hubspot
3+
components:
4+
- type: WEB
5+
- type: CLOUD
6+
connection_modes:
7+
device:
8+
web: true
9+
mobile: false
10+
server: false
11+
cloud:
12+
web: false
13+
mobile: true
14+
server: true
15+
summary: >-
16+
accepts data from any Segment mobile or server source in cloud mode.
17+
It does not accept data from a web source, and does not offer device-mode connections.
18+
cmode_type: mixed
19+
case: '6'
20+
- slug: iterable
21+
components:
22+
- type: WEB
23+
- type: CLOUD
24+
connection_modes:
25+
device:
26+
web: false
27+
mobile: false
28+
server: false
29+
cloud:
30+
web: true
31+
mobile: true
32+
server: true
33+
summary: >-
34+
accepts cloud-mode data from all Segment source types. It does not offer device-mode connections.
35+
cmode_type: mixed
36+
case: '5'

src/_data/catalog/source_categories.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
2-
# source cateogries last updated 2021-05-14
2+
# source cateogries last updated 2021-05-18
33
items:
44
- display_name: Server
55
slug: server

src/_data/catalog/sources.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
2-
# sources last updated 2021-05-14
2+
# sources last updated 2021-05-18
33
items:
44
- display_name: .NET
55
slug: net

src/_includes/content/connection-modes.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<!-- in the file we're pulling from the API, "name" corresponds with the path to the yml blob for a specific destination.-->
22
{% assign currentSlug = page.url | split: "/" | last %}
3+
{% if page.cmode-override %}
4+
{% assign currentIntegration = site.data.catalog.overrides.items | where: "slug", currentSlug | first %}
5+
{% else %}
36
{% assign currentIntegration = site.data.catalog.destinations.items | where: "slug", currentSlug | first %}
7+
{% endif %}
8+
49
{% assign connectionModes = currentIntegration.connection_modes %}
510

611
{% if currentIntegration.components.size > 0 %}
@@ -10,7 +15,6 @@ components -> how do we send data
1015
platforms -> what data do we recognize-->
1116

1217

13-
1418
Before you start, make sure {{ currentIntegration.display_name }} supports the source type and connection mode you've chosen to implement. You can learn more about [connection modes here](https://segment.com/docs/connections/destinations/#connection-modes).
1519

1620
<table>

src/_includes/content/destination-dossier.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ <h4>{{ destinationInfo.display_name }} quick info </h4>
2626
{% endif %}
2727

2828
{% unless destinationInfo.connection_modes.case == "0"%}
29+
{% if page.cmode-override %}
30+
{% assign destinationInfo = site.data.catalog.overrides.items % | where: "slug", thisDestination | first %}
31+
{% endif %}
2932
<p>
3033
{{ destinationInfo.display_name }} {{ destinationInfo.connection_modes.summary }} {% if destinationInfo.connection_modes.case == "mixed" %} {{destinationInfo.display_name}} accepts device-mode data from {% if destinationInfo.connection_modes.device.mobile and destinationInfo.connection_modes.device.web %} mobile and web{% elsif destinationInfo.connection_modes.device.mobile %} mobile{% elsif destinationInfo.connection_modes.device.web %} web{% endif %} sources.{% endif %} {% if destinationInfo.browserUnbundlingSupported %} You can change the {{destinationInfo.display_name}} connection mode for Analytics.js sources from the destination settings in the Segment web app.
3134
{% endif %}

0 commit comments

Comments
 (0)