Skip to content

Commit 7790abf

Browse files
hhvrchhvrc
committed
Merge branch 'develop' into fix/mobile-layout-and-scaling
# Conflicts: # src/lib/components/Container.svelte # src/lib/components/PageHeader.svelte # src/routes/(app)/settings/api-tokens/+page.svelte # src/routes/(app)/settings/connections/+page.svelte # src/routes/(app)/settings/sessions/+page.svelte # src/routes/(app)/settings/sessions/data-table-actions.svelte # src/routes/(app)/shares/user/incoming/+page.svelte # src/routes/(app)/shares/user/invites/+page.svelte # src/routes/(app)/shares/user/outgoing/+page.svelte # src/routes/Header.svelte
2 parents c221680 + 46a12af commit 7790abf

590 files changed

Lines changed: 3368 additions & 15100 deletions

File tree

Some content is hidden

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

‎.github/workflows/ci-build.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@ jobs:
2020

2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v6
23+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
24+
with:
25+
submodules: recursive
2426

25-
- uses: pnpm/action-setup@v6
27+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
2628
name: Install pnpm
2729
with:
2830
run_install: false
2931

3032
- name: Install Node.js
31-
uses: actions/setup-node@v6
33+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
3234
with:
3335
node-version-file: .nvmrc
3436
cache: 'pnpm'
@@ -62,7 +64,9 @@ jobs:
6264

6365
steps:
6466
- name: Checkout
65-
uses: actions/checkout@v6
67+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
68+
with:
69+
submodules: recursive
6670

6771
- uses: ./.github/actions/containerize
6872
with:

‎.github/workflows/ci-lint.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v6
22+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
23+
with:
24+
submodules: recursive
2325

24-
- uses: pnpm/action-setup@v6
26+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
2527
name: Install pnpm
2628
with:
2729
run_install: false
2830

2931
- name: Install Node.js
30-
uses: actions/setup-node@v6
32+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
3133
with:
3234
node-version-file: .nvmrc
3335
cache: 'pnpm'

‎.github/workflows/codeql.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,20 @@ jobs:
2626

2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v6
29+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
30+
with:
31+
submodules: recursive
3032

3133
# Initializes the CodeQL tools for scanning.
3234
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@v4
35+
uses: github/codeql-action/init@c35d1b164463ee62a100735382aaaa525c5d3496 # codeql-bundle-v2.25.6
3436
with:
3537
languages: ${{ matrix.language }}
3638

3739
- name: Autobuild
38-
uses: github/codeql-action/autobuild@v4
40+
uses: github/codeql-action/autobuild@c35d1b164463ee62a100735382aaaa525c5d3496 # codeql-bundle-v2.25.6
3941

4042
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@v4
43+
uses: github/codeql-action/analyze@c35d1b164463ee62a100735382aaaa525c5d3496 # codeql-bundle-v2.25.6
4244
with:
4345
category: '/language:${{matrix.language}}'

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ test-results
22
node_modules
33
playwright-report
44

5+
# Turborepo
6+
.turbo
7+
58
# Output
69
.output
710
.vercel

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "packages/svelte-core"]
2+
path = packages/svelte-core
3+
url = git@github.com:OpenShock/svelte-core.git

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.14.0
1+
26.3.1

‎.prettierignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ node_modules
77
/src/lib/api/internal
88
/src/lib/components/ui
99
/static
10+
11+
# Workspace packages (e.g. svelte-core submodule) own their own formatting
12+
/packages
1013
.env
1114
.env.*
1215
!.env.example

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Define versions as build arguments for easy updates
2-
ARG NODE_VERSION=24.14.0
3-
ARG PNPM_VERSION=11.1.2
2+
ARG NODE_VERSION=26.3.1
3+
ARG PNPM_VERSION=11.8.0
44
ARG ALPINE_VERSION=3.23
55

66
FROM node:${NODE_VERSION}-alpine${ALPINE_VERSION}

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
[![Documentation](https://img.shields.io/badge/docs-mkdocs-blue.svg)](https://openshock.org)
44
[![GitHub license](https://img.shields.io/github/license/openshock/frontend.svg)](https://raw.githubusercontent.com/openshock/frontend/master/LICENSE)
5-
[![GitHub Releases](https://img.shields.io/github/release/openshock/frontend.svg)](https://github.com/openshock/frontend/releases)
65
[![GitHub Sponsors](https://img.shields.io/badge/GitHub-Sponsors-ff69b4)](https://github.com/sponsors/openshock)
76
[![Discord](https://img.shields.io/discord/1078124408775901204)](https://discord.gg/openshock)
87

‎components.json‎

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

0 commit comments

Comments
 (0)