Skip to content

Commit 308af10

Browse files
authored
Merge branch 'master' into enduseradmin
2 parents 338bf16 + 9944849 commit 308af10

File tree

677 files changed

+7073
-6683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

677 files changed

+7073
-6683
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44

55
<!--Tell us what you did and why-->
66

7+
### Merge timing
8+
<!-- When should this get merged/published?
9+
- ASAP once approved?
10+
- On a specific date?
11+
- Depending on a specific project?-->
712

813
### Related issues (optional)
914

10-
<!--Refer to related PRs or issues: #1234, or 'Fixes #1234' or 'Closes #1234'.
11-
Or link to full URLs to issues or pull requests in other Github projects -->
15+
<!--Refer to related PRs or issues: #1234 or 'Closes #1234'.
16+
Or paste full URLs to issues or pull requests in other Github projects -->

CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ CODEOWNERS @sanscontext @XavierAgostini @danielstjules @stephment
1818

1919

2020
# Libraries owners
21-
/src/connections/catalog/libraries @osamakhn @bsneed @lubird
21+
/src/connections/catalog/libraries @osamakhn @bsneed @lubird @pooyaj @juliofarah
2222

2323

2424
# Destination owners
25-
/src/connections/destinations @n2parko @danielstjules @benhorowitz
25+
/src/connections/destinations @n2parko @danielstjules @benhorowitz
2626
# temporary removal: @carlosmecha
2727

2828

2929
# Privacy owners
30-
/src/privacy @notfelineit @aliya-dossa
30+
/src/privacy @notfelineit
3131

3232

3333
# Protocols owners

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ See the [Contributor Guide](contributors.md) for more info.
5353

5454
**At minimum you must open a PR so the docs team gets a notification. Do not merge directly to master.**
5555

56-
- **Just fixing a typo**? -> No review needed, you can admin-merge your PR with our blessings.
56+
- **Just fixing a typo**? -> No review needed, but please label it FIX in the PR subject so we know not to worry. You can then admin-merge your PR with our blessings.
5757

5858
- **Delta of <20 words or ~150 characters**? -> Yes, but a minor review. Open a PR and tag @sanscontext, who'll review mostly for formatting and copy issues.
5959

@@ -98,7 +98,7 @@ Once the PR is merged, the docs site rebuilds and the changes are live!
9898

9999
### Draft PRs
100100

101-
If you're doing a substantial change and you're going to want to spend a few weeks on it, use [Github's Draft PRs feature](https://help.github.com/en/articles/about-pull-requests#draft-pull-requests), or add `WIP` to the title of your PR. This lets us know to ignore the PR until you're ready.
101+
If you're doing a substantial change and you're going to want to spend a few weeks on it, use [Github's Draft PRs feature](https://help.github.com/en/articles/about-pull-requests#draft-pull-requests), or add `WIP` to the title of your PR. This lets us know to ignore the PR until you're ready (otherwise Laura will ping you weekly about it!).
102102

103103

104104
## How the docs build works
@@ -134,7 +134,7 @@ The most interesting ones are:
134134

135135
### Images
136136

137-
**All images should be saved locally! No linking to 3rd party-hosted images!** Images are published to our CDN from the build step.
137+
**Save all images locally! No linking to 3rd party-hosted images!** Images are published to our CDN from the build step, and this means they won't go missing if the hosting service dujour goes out of business.
138138

139139
There are no _enforced_ naming conventions at this time. Files that start with an underscore are ignored by Jekyll. Anything you see with `asset` was dowloaded by a script to migrate it out of Contents.io.
140140

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ defaults:
3232
integration_type: source
3333
layout: integration
3434
- scope:
35-
path: "connections/warehouses/catalog"
35+
path: "connections/storage/catalog"
3636
values:
3737
integration_type: warehouse
3838
landing: true

js/headings-anchors/index.js

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import ClipboardJS from 'clipboard'
22
import tippy from 'tippy.js'
33

44
const COMPONENT_SELECTOR = '[data-headings-anchors]'
5-
const HEADINGS_SELECTOR = 'h1, h2, h3, h4'
5+
const HEADINGS_SELECTOR = 'h1, h2, h3, h4, h5'
66

77
export default function () {
88
const components = document.querySelectorAll(COMPONENT_SELECTOR)
@@ -11,30 +11,29 @@ export default function () {
1111
const headings = components[i].querySelectorAll(HEADINGS_SELECTOR)
1212

1313
for (let i = 0; i < headings.length; i++) {
14-
const tooltip = tippy(headings[i], {
15-
content: 'Copied!',
16-
theme: 'dark',
17-
placement: 'top-start',
18-
distance: 5,
19-
trigger: 'manual'
20-
})
21-
22-
const clipboard = new ClipboardJS(headings[i], {
23-
text: () => {
24-
history.replaceState({}, '', '#' + headings[i].getAttribute('id'))
25-
return window.location.href
26-
}
27-
})
28-
29-
clipboard.on('success', function(e) {
30-
tooltip.show()
31-
32-
setTimeout(() => {
33-
tooltip.hide()
34-
}, 700)
35-
36-
e.clearSelection()
37-
})
14+
if (!headings[i].classList.contains('media-thumbnail__heading') && !headings[i].classList.contains('media-icon__heading')) {
15+
const tooltip = tippy(headings[i], {
16+
content: 'Copied!',
17+
theme: 'dark',
18+
placement: 'top-start',
19+
distance: 5,
20+
trigger: 'manual'
21+
})
22+
23+
const clipboard = new ClipboardJS(headings[i], {
24+
text: () => `${window.location.origin}${window.location.pathname}#${headings[i].getAttribute('id')}`
25+
})
26+
27+
clipboard.on('success', function(e) {
28+
tooltip.show()
29+
30+
setTimeout(() => {
31+
tooltip.hide()
32+
}, 700)
33+
34+
e.clearSelection()
35+
})
36+
}
3837
}
3938
}
4039
}

0 commit comments

Comments
 (0)