Skip to content

Commit 4a57bc5

Browse files
author
markzegarelli
authored
Merge branch 'master' into thomas/wootric_rebrand_destination
2 parents 6ebdf1a + 9e53f4e commit 4a57bc5

File tree

22 files changed

+191
-68
lines changed

22 files changed

+191
-68
lines changed

.env.example

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
##
2+
# Rename this file .env
3+
##
4+
15
CONTEXT=development
26
PLATFORM_API_TOKEN=generate a token from your Segment workspace
37
PAPI_TOKEN=generate a token from your Segment workspace
48
ALGOLIA_APP_ID=
5-
ALGOLIA_SEARCH_KEY=
9+
ALGOLIA_SEARCH_KEY=

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"scripts": {
1414
"develop": "bundle exec jekyll clean && webpack --mode production && JEKYLL_ENV=testing bundle exec jekyll build --trace -V",
1515
"develop-inc": "webpack --mode production && JEKYLL_ENV=testing bundle exec jekyll build --trace -V -I",
16-
"build": "bundle exec jekyll clean && webpack --mode production && JEKYLL_ENV=production bundle exec jekyll build --trace -V"
16+
"build": "bundle exec jekyll clean && webpack --mode production && bundle exec jekyll build --trace -V"
1717
},
1818
"devDependencies": {
1919
"@babel/cli": "^7.15.7",

src/_data/sidenav/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,8 @@ sections:
263263
title: Overview
264264
- path: /personas/audiences/account-audiences
265265
title: Account-Level Audiences
266+
- path: /personas/audiences/organization/
267+
title: Organizing Audiences
266268
- section_title: Journeys
267269
slug: /personas/journeys
268270
section:
@@ -286,6 +288,8 @@ sections:
286288
title: Personas and Warehouses
287289
- path: /personas/profile-api
288290
title: Profile API
291+
- path: /personas/debugger
292+
title: Personas Space Debugger
289293
- path: /personas/personas-gdpr
290294
title: Personas and GDPR
291295
- path: /personas/faqs

src/_includes/components/deploy-preview.html

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/_includes/content/functions/runtime.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@ The following dependencies are installed in the function environment by default.
1515
- [`@google-cloud/functions v1.1.0`](https://www.npmjs.com/package/@google-cloud/functions) exposed as `google.cloud.functions`
1616
- [`@google-cloud/pubsub v2.6.0`](https://www.npmjs.com/package/@google-cloud/pubsub) exposed as `google.cloud.pubsub`
1717
- [`@google-cloud/storage v5.3.0`](https://www.npmjs.com/package/@google-cloud/storage) exposed as `google.cloud.storage`
18+
- [`form-data v2.4.0`](https://www.npmjs.com/package/form-data) exposed as `FormData`
1819
- [`jsonwebtoken v8.5.1`](https://www.npmjs.com/package/jsonwebtoken) exposed as `jsonwebtoken`
1920
- [`lodash v4.17.15`](https://www.npmjs.com/package/lodash) exposed as `_`
2021
- [`moment v2.26.0`](https://www.npmjs.com/package/moment/v/2.26.0) exposed as `moment`
2122
- [`node-fetch v2.6.0`](https://www.npmjs.com/package/node-fetch) exposed as `fetch`
2223
- [`oauth v0.9.15`](https://www.npmjs.com/package/oauth) exposed as `OAuth`
24+
- [`@sendgrid/client v7.4.7`](https://www.npmjs.com/package/@sendgrid/client) exposed as `sendgrid.client`
25+
- [`@sendgrid/mail v7.4.7`](https://www.npmjs.com/package/@sendgrid/mail) exposed as `sendgrid.mail`
2326
- [`stripe v8.115.0`](https://www.npmjs.com/package/stripe) exposed as `stripe`
27+
- [`twilio v3.68.0`](https://www.npmjs.com/package/twilio) exposed as `twilio`
2428
- [`xml v1.0.1`](https://www.npmjs.com/package/xml) exposed as `xml`
2529
- [`xml2js v0.4.23`](https://www.npmjs.com/package/xml2js) exposed as `xml2js`
2630

src/_includes/navbar/logo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<a id="home-btn" class="logo flex" href="{{ site.baseurl }}/">
2-
{%if site.env.CONTEXT == "development-internal"%}
2+
{%if site.env.ENVIRONMENT == "development-internal"%}
33
<svg width="136" height="29" viewBox="0 0 136 29" fill="none" xmlns="http://www.w3.org/2000/svg">
44
<g clip-path="url(#clip0)">
55
<path d="M35.01 14.53V7.46H36.088C38.44 7.46 39.42 8.762 39.42 10.918V11.03C39.42 13.242 38.342 14.53 36.102 14.53H35.01ZM33.148 16H36.158C39.672 16 41.366 13.928 41.366 11.016V10.89C41.366 7.978 39.672 5.99 36.186 5.99H33.148V16ZM46.278 14.824C44.99 14.824 44.248 13.886 44.248 12.388V12.276C44.248 10.764 45.018 9.854 46.278 9.854C47.538 9.854 48.294 10.778 48.294 12.29V12.388C48.294 13.886 47.538 14.824 46.278 14.824ZM46.264 16.14C48.42 16.14 50.03 14.656 50.03 12.374V12.262C50.03 10.022 48.42 8.524 46.278 8.524C44.122 8.524 42.512 10.036 42.512 12.304V12.416C42.512 14.642 44.108 16.14 46.264 16.14ZM54.767 16.14C56.755 16.14 58.029 14.95 58.155 13.27H56.6C56.502 14.306 55.732 14.838 54.836 14.838C53.59 14.838 52.806 13.998 52.806 12.402V12.29C52.806 10.778 53.632 9.882 54.794 9.882C55.69 9.882 56.334 10.288 56.474 11.268H58.112C57.916 9.252 56.39 8.524 54.766 8.524C52.722 8.524 51.07 9.994 51.07 12.318V12.43C51.07 14.768 52.666 16.14 54.766 16.14H54.767ZM62.063 16.14C63.253 16.14 64.023 15.566 64.388 14.852V16H66.082V8.678H64.388V13.032C64.388 14.194 63.589 14.782 62.679 14.782C61.699 14.782 61.237 14.278 61.237 13.172V8.678H59.543V13.368C59.543 15.314 60.621 16.14 62.063 16.14ZM68.09 16H69.784V11.618C69.784 10.498 70.554 9.938 71.394 9.938C72.22 9.938 72.696 10.4 72.696 11.478V16H74.39V11.618C74.39 10.498 75.16 9.938 76 9.938C76.84 9.938 77.302 10.4 77.302 11.478V16H78.996V11.366C78.996 9.35 77.904 8.524 76.56 8.524C75.65 8.524 74.642 8.93 74.082 9.84C73.718 8.93 72.962 8.524 72.01 8.524C70.932 8.524 70.134 9.112 69.784 9.798V8.678H68.09V16ZM84.162 16.14C86.038 16.14 87.284 15.3 87.522 13.76H85.884C85.758 14.474 85.226 14.88 84.204 14.88C82.944 14.88 82.244 14.096 82.188 12.71H87.55V12.22C87.55 9.602 85.912 8.524 84.092 8.524C82.006 8.524 80.452 10.036 80.452 12.304V12.416C80.452 14.726 82.006 16.14 84.162 16.14V16.14ZM82.216 11.576C82.384 10.442 83.07 9.756 84.092 9.756C85.142 9.756 85.786 10.316 85.87 11.576H82.216V11.576ZM89.063 16H90.757V11.688C90.757 10.526 91.527 9.938 92.479 9.938C93.487 9.938 93.935 10.442 93.935 11.548V16H95.629V11.394C95.629 9.378 94.593 8.524 93.123 8.524C91.919 8.524 91.107 9.126 90.757 9.84V8.678H89.063V16ZM100.072 16.126C100.59 16.126 100.954 16.042 101.22 15.944V14.6C100.982 14.698 100.73 14.74 100.394 14.74C99.862 14.74 99.554 14.446 99.554 13.802V9.952H101.164V8.678H99.554V7.068H97.86V8.678H96.88V9.952H97.86V13.956C97.86 15.342 98.616 16.126 100.072 16.126ZM104.735 16.14C105.855 16.14 106.499 15.734 106.975 15.104V16H108.641V11.198C108.641 9.196 107.353 8.524 105.715 8.524C104.077 8.524 102.719 9.238 102.579 10.946H104.217C104.301 10.218 104.735 9.798 105.617 9.798C106.611 9.798 106.947 10.288 106.947 11.268V11.646H106.037C103.937 11.646 102.285 12.262 102.285 13.97C102.285 15.496 103.391 16.14 104.735 16.14V16.14ZM105.141 14.922C104.301 14.922 103.965 14.516 103.965 13.9C103.965 13.004 104.791 12.71 106.079 12.71H106.947V13.438C106.947 14.376 106.177 14.922 105.141 14.922ZM113.074 16.126C113.592 16.126 113.956 16.042 114.222 15.944V14.6C113.984 14.698 113.732 14.74 113.396 14.74C112.864 14.74 112.556 14.446 112.556 13.802V9.952H114.166V8.678H112.556V7.068H110.862V8.678H109.882V9.952H110.862V13.956C110.862 15.342 111.618 16.126 113.074 16.126ZM115.792 16H117.486V8.678H115.792V16ZM116.618 7.474C117.178 7.474 117.626 7.054 117.626 6.508C117.626 5.948 117.178 5.528 116.618 5.528C116.058 5.528 115.61 5.948 115.61 6.508C115.61 7.054 116.058 7.474 116.618 7.474V7.474ZM122.827 14.824C121.539 14.824 120.797 13.886 120.797 12.388V12.276C120.797 10.764 121.567 9.854 122.827 9.854C124.087 9.854 124.843 10.778 124.843 12.29V12.388C124.843 13.886 124.087 14.824 122.827 14.824ZM122.813 16.14C124.969 16.14 126.579 14.656 126.579 12.374V12.262C126.579 10.022 124.969 8.524 122.827 8.524C120.671 8.524 119.061 10.036 119.061 12.304V12.416C119.061 14.642 120.657 16.14 122.813 16.14ZM128.11 16H129.804V11.688C129.804 10.526 130.574 9.938 131.526 9.938C132.534 9.938 132.982 10.442 132.982 11.548V16H134.676V11.394C134.676 9.378 133.64 8.524 132.17 8.524C130.966 8.524 130.154 9.126 129.804 9.84V8.678H128.11V16V16Z" fill="#101840"/>

src/_layouts/default.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{%- assign description = currentIntegration.description -%}
2323
{%- assign priority = 4 -%}
2424
{%- endif -%}
25-
<!-- {{site.env.CONTEXT}} -->
25+
<!-- {{site.env.ENVIRONMENT}} -->
2626
<html lang="{{ page.lang | default: site.lang | default: "en" }}">
2727
<head>
2828
<base href="{{ basehref }}" />
@@ -234,7 +234,7 @@
234234
// analytics.identify();
235235
}}();
236236
</script>
237-
{%- if site.env.CONTEXT == "development" -%}
237+
{%- if site.env.ENVIRONMENT == "development-internal" -%}
238238
<script src="{{ "./assets/docs.delay.js" | relative_url}}"></script>
239239

240240
{%- endif -%}

src/connections/destinations/add-destination.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,11 @@ You can add multiple instances of a destination using the Segment Config API. Se
122122
### Multi-instance destinations and Device-mode
123123

124124
- **You can connect a source to up to 25 instances of a destination if all of the instances use cloud-mode.** Destinations using cloud-mode receive data directly from the Segment servers.
125-
- **Mobile sources, and the legacy Project source, can connect to multiple instances of cloud-mode only destinations.** See the list of [cloud-mode only destinations](#cloud-mode-only). Mobile and Project sources cannot connect to multiple instances of [cloud-mode and device-mode destinations](#cloud-mode-and-device-mode).
125+
- **Mobile sources, and the legacy Project source, can connect to multiple instances of cloud-mode only destinations.** Mobile and Project sources cannot connect to multiple instances of cloud-mode and device-mode destinations.
126126
- **Warning**: If you bundle one instance of a destination in a mobile source but have other instances of that destination connected to that source you might see unexpected and inconsistent data.
127127
- **Non-mobile sources can only connect to one *device-mode* instance of a destination, in addition to up to 25 cloud-mode instances.** A web browser sending to a destination in device-mode sends data directly from the user’s browser (instead of through the Segment servers), by bundling a copy of destination’s code with the Segment SDK. Segment can’t bundle multiple copies of the destination SDK and so it can’t send data to multiple instances of the destination from the browser.
128128
- **You cannot connect a source to more than one instance of a destination that operates in device-mode only**. These destinations can only accept data from code directly on the user’s device, and Segment cannot include duplicates of that code for a single source.
129129

130-
For more information see [the compatible destination lists below](#multi-instance-compatible-destinations).
131-
132-
133130

134131
### Other multi-instance destination considerations
135132

src/connections/destinations/catalog/onesignal-new/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ redirect_from: '/connections/destinations/catalog/onesignal/'
99
This destination is maintained by OneSignal. For any issues with the destination, [contact the OneSignal Support team](mailto:[email protected]).
1010

1111
> info ""
12-
> The OneSignal Destination is available to customers on OneSignal Professional and Enterprise plans.
12+
> The OneSignal Destination is available to customers on OneSignal Growth, Professional and Enterprise plans.
1313
1414
## Getting Started
1515

src/connections/sources/catalog/libraries/server/node/index.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,8 @@ The second argument to the `Analytics` constructor is an optional dictionary of
330330
```javascript
331331
var analytics = new Analytics('YOUR_WRITE_KEY', {
332332
flushAt: 20,
333-
flushInterval: 10000
333+
flushInterval: 10000,
334+
enable: false
334335
});
335336
```
336337

@@ -343,6 +344,10 @@ var analytics = new Analytics('YOUR_WRITE_KEY', {
343344
<td>`flushInterval` _Number_</td>
344345
<td>The number of milliseconds to wait before flushing the queue automatically.</td>
345346
</tr>
347+
<tr>
348+
<td>`enable` _Boolean_</td>
349+
<td>Enable (default) or disable flush. Useful when writing tests and you do not want to send data to Segment Servers.</td>
350+
</tr>
346351
</table>
347352

348353

0 commit comments

Comments
 (0)