Skip to content

Commit b531c4e

Browse files
authored
Merge pull request #51 from Aetherinox/main
v1.6.4: Merge stable and beta branches
2 parents 73b0259 + 6f6d708 commit b531c4e

File tree

24 files changed

+474
-155
lines changed

24 files changed

+474
-155
lines changed

.github/changelog-configuration.json

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"categories": [
33
{
4-
"title": "\n\n<br>\n\n#### 🚀 Features",
5-
"labels": [ "kind/feature", "feature", "feat" ]
4+
"title": "\n\n<br>\n\n#### 🪛 Continuous integration",
5+
"labels": [ "kind/ci", "ci" ]
66
},
77
{
8-
"title": "\n\n<br>\n\nn#### ✨ Optimizations",
9-
"labels": [ "kind/perf", "optimization", "perf", "optimize" ]
8+
"title": "\n\n<br>\n\n#### 🚀 Features",
9+
"labels": [ "kind/feature", "feature", "feat" ]
1010
},
1111
{
1212
"title": "\n\n<br>\n\n#### 🐛 Bugfixes",
@@ -17,16 +17,8 @@
1717
"labels": [ "kind/chore", "change", "chore" ]
1818
},
1919
{
20-
"title": "\n\n<br>\n\n#### ✏️ Docs",
21-
"labels": [ "kind/docs", "doc", "docs", "wiki" ]
22-
},
23-
{
24-
"title": "\n\n<br>\n\n#### 🧪 Tests",
25-
"labels": [ "kind/test", "test" ]
26-
},
27-
{
28-
"title": "\n\n<br>\n\n#### 📦 Build & Dependencies",
29-
"labels": [ "kind/build", "build", "dependency", "package" ]
20+
"title": "\n\n<br>\n\nn#### ✨ Optimizations",
21+
"labels": [ "kind/perf", "optimization", "perf", "optimize" ]
3022
},
3123
{
3224
"title": "\n\n<br>\n\n#### 🚨 Security ",
@@ -47,6 +39,18 @@
4739
{
4840
"title": "\n\n<br>\n\n#### ⛔ Removed",
4941
"labels": [ "kind/remove", "remove" ]
42+
},
43+
{
44+
"title": "\n\n<br>\n\n#### 📦 Build & Dependencies",
45+
"labels": [ "kind/build", "build", "dependency", "dep", "package" ]
46+
},
47+
{
48+
"title": "\n\n<br>\n\n#### ✏️ Docs",
49+
"labels": [ "kind/docs", "doc", "docs", "wiki" ]
50+
},
51+
{
52+
"title": "\n\n<br>\n\n#### 🧪 Tests & Demo Vault",
53+
"labels": [ "kind/test", "test", "tests", "vault" ]
5054
}
5155
],
5256
"sort": "ASC",
@@ -65,11 +69,11 @@
6569
],
6670
"label_extractor": [
6771
{
68-
"pattern": "^(build|ci|change|chore|doc|docs|wiki||remove|deprecate|security|dependency|package|feat|feature|fix|bug|perf|optimize|optimization|refactor|revert|style|test):(.*)",
72+
"pattern": "^(build|ci|change|chore|doc|docs|wiki|remove|deprecate|security|dependency|dep|package|feat|feature|fix|bug|perf|optimize|optimization|refactor|revert|style|test|tests|vault):(.*)",
6973
"target": "$1"
7074
},
7175
{
72-
"pattern": "^(build|ci|change|chore|doc|docs|wiki||remove|deprecate|security|dependency|package|feat|feature|fix|bug|perf|optimize|optimization|refactor|revert|style|test){1}(\\([\\w\\-\\.]+\\))?(!)?:(.*)",
76+
"pattern": "^(build|ci|change|chore|doc|docs|wiki|remove|deprecate|security|dependency|dep|package|feat|feature|fix|bug|perf|optimize|optimization|refactor|revert|style|test|tests|vault){1}(\\([\\w\\-\\.]+\\))?(!)?:(.*)",
7377
"target": "$1"
7478
}
7579
],

.github/workflows/documentation.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ jobs:
4040
permissions:
4141
contents: write
4242
pages: write
43-
43+
environment:
44+
name: Orion
45+
4446
steps:
4547
- name: "Checkout"
4648
uses: actions/checkout@v4
@@ -73,5 +75,5 @@ jobs:
7375
- name: Deploy
7476
uses: peaceiris/actions-gh-pages@v3
7577
with:
76-
personal_token: ${{ secrets.ADMINSERV_TOKEN }}
78+
personal_token: ${{ secrets.ADMINSERV_TOKEN_CL }}
7779
publish_dir: ./docs/site

.github/workflows/pr-issues-status.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -557,9 +557,9 @@ jobs:
557557
558558
<sub>I am a bot reaching out to you with an automated response.</sub>
559559
560-
stale-issue-label: 'Status Stale'
561-
close-issue-label: 'Status ↯ Autoclosed'
562-
exempt-issue-labels: 'feature,Type Feature,bug,Type Bug'
560+
stale-issue-label: 'Status 𐄂 Stale'
561+
close-issue-label: 'Status 𐄂 '
562+
exempt-issue-labels: 'feature,Type Feature,bug,Type Bug'
563563
days-before-stale: 30
564564
days-before-close: 7
565565
days-before-pr-stale: -1

.github/workflows/release-npm.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ jobs:
169169
tag: ${{ env.PACKAGE_VERSION }}
170170
tag_exists_error: false
171171
message: "Latest release"
172+
gpg_private_key: ${{ secrets.ADMINSERV_GPG_KEY_ASC }}
173+
gpg_passphrase: ${{ secrets.ADMINSERV_GPG_PASSPHRASE }}
172174

173175
# ---------------------------------------------------------------------------------------
174176
# [ Tag ]: Confirm

README.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,32 +47,32 @@ The following is an outline of what Gistr can do for you:
4747
<br />
4848

4949
**Functionality**:
50-
- Gistr now includes an integrated browser feture which allows you to embed any website into your notes, including Github and Opengist.
51-
- This can be used for embedding gists containing mermaid graphs
52-
- Feature allows you to not only view the website in your notes, but also sign into websites such as Github / Opengist and make edits.
53-
- Can be activated with `raw` property
54-
- `raw` property supports the ability to specify additional properties:
55-
- `zoom`
56-
- `height`
57-
- `css`
50+
- Two modes for embedding: **Codeblock mode** and **Website mode**.
51+
- (**Website Mode**): Embed any website into your Obsidian notes. Fully functioning browser with ability to sign in to accounts and navigate.
52+
- Can be used for Github / Gist mermaid graphs
53+
- Activated with [raw](https://aetherinox.github.io/obsidian-gistr/usage/properties/#raw) property
54+
- [raw](https://aetherinox.github.io/obsidian-gistr/usage/properties/#raw) property supports the ability to specify additional properties:
55+
- [zoom](https://aetherinox.github.io/obsidian-gistr/usage/properties/#property-zoom): change the size of the website
56+
- [height](https://aetherinox.github.io/obsidian-gistr/usage/properties/#property-height): change the height of the website frame
57+
- [css](https://aetherinox.github.io/obsidian-gistr/usage/properties/#property-css): override existing CSS on the embedded website
5858
- Save notes from Obsidian as public or secret gists
59-
- Choose when you want to save a gist, or enable autosave to track changes
60-
- Requires Github [Personal Access Token](https://github.com/settings/tokens?type=beta) (free). Open Gistr settings in Obsidian to configure.
61-
- Line numbering
62-
- Open embedded Github Gist or Opengist snippets from your notes in your browser
63-
- Filter out specific snippets from a gist which contain multiple files
59+
- Manual and autosave settings available
60+
- Requires Github [Personal Access Token](https://github.com/settings/tokens?type=beta) (free).
61+
- [Click here to read setup instructions](https://aetherinox.github.io/obsidian-gistr/settings/github/)
62+
- Line numbering & syntax highlighting
63+
- Open embedded Github Gist or Opengist snippets from your notes in your device browser
64+
- Filter out gists that contain more than one file
6465
- Enable / Disable text wrapping and horizontal scrollbar
65-
- Auto-refresh any edits to your settings in reading mode
66-
- Complete customization, including changing the keyword that triggers a codeblock to show gists.
66+
- Fast performance and caching
67+
- Complete customization for almost every aspect of the plugin and the sites you embed
6768

6869
<br />
6970

7071
**Themes**:
71-
- Includes **Light** & **Dark** mode for both services
72-
- Ability to customize individual colors
73-
- CSS stylesheet override
72+
- Includes **Light** & **Dark** themes for Github and Opengist
73+
- Customize individual colors through Gistr settings, or use CSS stylesheet override
7474
- Thin and customizable scrollbar
75-
- Force theme on each individual gist paste
75+
- Force amy theme on each individual gist paste
7676

7777
<br />
7878

docs/docs/changelog.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,31 @@ tags:
77

88
![Version](https://img.shields.io/github/v/tag/Aetherinox/obsidian-gistr?logo=GitHub&label=version&color=ba5225) ![Downloads](https://img.shields.io/github/downloads/Aetherinox/obsidian-gistr/total) ![Repo Size](https://img.shields.io/github/repo-size/Aetherinox/obsidian-gistr?label=size&color=59702a) ![Last Commit)](https://img.shields.io/github/last-commit/Aetherinox/obsidian-gistr?color=b43bcc)
99

10+
### <!-- md:version stable- --> 1.6.4 <small>April 02, 2024</small> { id="1.6.4" }
11+
12+
- `feat`: add `gistr-web` codeblock as alternative to `raw: true`
13+
- `change`: remove spacer from documentation button in Gistr settings
14+
- `chore`: clean up developer prints
15+
- `chore`: give integrated browser unique id as to not conflict with other plugins
16+
- `fix`: report latest version in settings tab with alternative vars
17+
- `fix`: update checker getting stuck when it cannot contact the github branch
18+
- `tests`: bump demo vault 1.6.4
19+
- `dep`: update @types/node 20.11.30 -> 20.12.3
20+
- `build`: bump version v1.6.4
21+
1022
### <!-- md:version stable- --> 1.6.3 <small>April 01, 2024</small> { id="1.6.3" }
1123

1224
- `feat`: added property `css` for **raw mode**
13-
- `change`: added documentation link to Gistr settings support tab
25+
- `change`: added documentation button to Gistr settings support tab
1426
- `change`: uuid for gists now generated by in-house method instead of nanoid
27+
- `refactor`: major clean up of code, old dependency remnants, and tidy up code
28+
- `perf`: further enhanced performance times and how caching is managed for codeblocks embedded in a note
29+
- `change`: prep-work for next major release and new features coming out, including Github repo support
1530
- `dep`: update rollup 3.29.3 -> 4.13.2
1631
- `dep`: added `@rollup/plugin-replace`
1732
- `remove`: `rollup-plugin-define`
1833
- `remove`: `nanoid`
34+
- `build`: github bot @AdminServ now verified
1935

2036
### <!-- md:version stable- --> 1.6.2 <small>March 31, 2024</small> { id="1.6.2" }
2137

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "gistr",
33
"name": "Gistr",
4-
"version": "1.6.2",
4+
"version": "1.6.4",
55
"minAppVersion": "1.0.0",
66
"description": "Integrate Opengist and Github gists into your notes, allowing you to create, update, and share between your notes and gist services",
77
"author": "Aetherinox",

package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gistr",
3-
"version": "1.6.2",
3+
"version": "1.6.4",
44
"description": "Integrate Opengist and Github gists into your notes, allowing you to create, update, and share between your notes and gist services",
55
"main": "main.js",
66
"repository": {
@@ -35,7 +35,7 @@
3535
"@rollup/plugin-terser": "^0.4.4",
3636
"@rollup/plugin-typescript": "^11.1.6",
3737
"@types/chrome": "^0.0.263",
38-
"@types/node": "^20.11.30",
38+
"@types/node": "^20.12.3",
3939
"@types/semver": "^7.5.8",
4040
"@types/uuid": "^9.0.8",
4141
"electron": "^29.1.6",

src/api/Constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ export const GithubCSS =
4141
export const LeafButton_Refresh =
4242
{
4343
id: "GISTR",
44-
icon: 'gistr-github-refresh',
45-
name: "Refresh Gistr Codeblocks",
44+
icon: 'gistr-plugin-refresh',
45+
name: "Refresh Gistr Plugin",
4646
}

0 commit comments

Comments
 (0)