Skip to content

Commit

Permalink
Merge branch 'main' into update-mac-icon
Browse files Browse the repository at this point in the history
  • Loading branch information
iLynxcat authored Nov 7, 2024
2 parents 67ac39d + 792837b commit e675bd2
Show file tree
Hide file tree
Showing 13 changed files with 181 additions and 140 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/archive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
submodules: true
- name: Create zip including submodules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: 'CLA Assistant'
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
# Beta Release
uses: cla-assistant/github-action@v2.4.0
uses: cla-assistant/github-action@v2.6.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# the below token should have repo scope and must be manually added by you in the repository's secret
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lockfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
pull-requests: write
steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
- name: NPM Lockfile Changes
uses: codepunkt/npm-lockfile-changes@b40543471c36394409466fdb277a73a0856d7891
with:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/tauri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
submodules: true
- name: Setup node
uses: actions/[email protected].3
uses: actions/[email protected].4
with:
node-version: 20.12.2
cache: 'npm'
Expand All @@ -24,7 +24,7 @@ jobs:
- name: Install tauri dependencies
run: npm ci
- name: Build desktop app with Tauri
uses: tauri-apps/[email protected].9
uses: tauri-apps/[email protected].14
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
Expand Down Expand Up @@ -63,11 +63,11 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
submodules: true
- name: Setup node
uses: actions/[email protected].3
uses: actions/[email protected].4
with:
node-version: 20.12.2
cache: 'npm'
Expand All @@ -82,7 +82,7 @@ jobs:
- name: Install tauri dependencies
run: npm ci
- name: Build desktop app with Tauri
uses: tauri-apps/[email protected].9
uses: tauri-apps/[email protected].14
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
Expand Down Expand Up @@ -115,11 +115,11 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
submodules: true
- name: Setup node
uses: actions/[email protected].3
uses: actions/[email protected].4
with:
node-version: 20.12.2
cache: 'npm'
Expand All @@ -132,7 +132,7 @@ jobs:
- name: Install tauri dependencies
run: npm ci
- name: Build desktop app with Tauri
uses: tauri-apps/[email protected].9
uses: tauri-apps/[email protected].14
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
- name: Install dependencies
run: npm ci
- name: Run release.json
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- name: Checkout repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
submodules: true
- name: Setup node
uses: actions/[email protected].3
uses: actions/[email protected].4
with:
node-version: 20.12.2
cache: 'npm'
Expand All @@ -35,6 +35,6 @@ jobs:
- name: Install tauri dependencies
run: npm ci
- name: Build desktop app with Tauri
uses: tauri-apps/[email protected].9
uses: tauri-apps/[email protected].14
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Installers for macOS, Windows and Linux can be downloaded from [Github releases]
Operating System | Download
---|---
Windows | <a href='https://github.com/cinnyapp/cinny-desktop/releases/latest/download/Cinny_desktop-x86_64.msi'>Get it on Windows</a>
macOS | <a href='https://github.com/cinnyapp/cinny-desktop/releases/latest/download/Cinny_desktop-x86_64.dmg'>Get it on macOS</a>
macOS | <a href='https://github.com/cinnyapp/cinny-desktop/releases/latest/download/Cinny_desktop-universal.dmg'>Get it on macOS</a>
Linux | <a href='https://github.com/cinnyapp/cinny-desktop/releases/latest/download/Cinny_desktop-x86_64.AppImage'>Get it on Linux</a> · <a href='https://flathub.org/apps/details/in.cinny.Cinny'>Flatpak</a>

Decoded public key:
Expand Down
2 changes: 1 addition & 1 deletion cinny
Submodule cinny updated 78 files
+4 −4 .github/workflows/build-pull-request.yml
+1 −1 .github/workflows/cla.yml
+2 −2 .github/workflows/docker-pr.yml
+1 −1 .github/workflows/lockfile.yml
+2 −2 .github/workflows/netlify-dev.yml
+4 −4 .github/workflows/prod-deploy.yml
+1 −2 .npmrc
+128 −0 CODE_OF_CONDUCT.md
+1 −0 contrib/nginx/cinny.domain.tld.conf
+8 −4 docker-nginx.conf
+6 −1 netlify.toml
+3,271 −329 package-lock.json
+8 −3 package.json
+7 −0 public/locales/de.json
+7 −0 public/locales/en.json
+4 −1 src/app/components/editor/Elements.tsx
+4 −1 src/app/components/editor/autocomplete/EmoticonAutocomplete.tsx
+6 −1 src/app/components/editor/autocomplete/UserMentionAutocomplete.tsx
+2 −2 src/app/components/editor/output.ts
+61 −53 src/app/components/emoji-board/EmojiBoard.tsx
+5 −2 src/app/components/event-readers/EventReaders.tsx
+4 −2 src/app/components/image-viewer/ImageViewer.tsx
+5 −3 src/app/components/message/Reaction.tsx
+19 −0 src/app/components/message/Reply.css.ts
+48 −31 src/app/components/message/Reply.tsx
+15 −5 src/app/components/message/content/AudioContent.tsx
+32 −17 src/app/components/message/content/FileContent.tsx
+13 −5 src/app/components/message/content/ImageContent.tsx
+17 −8 src/app/components/message/content/ThumbnailContent.tsx
+17 −5 src/app/components/message/content/VideoContent.tsx
+0 −23 src/app/components/message/content/util.ts
+5 −3 src/app/components/room-card/RoomCard.tsx
+4 −2 src/app/components/room-intro/RoomIntro.tsx
+4 −1 src/app/components/url-preview/UrlPreviewCard.tsx
+4 −1 src/app/features/lobby/LobbyHeader.tsx
+4 −1 src/app/features/lobby/LobbyHero.tsx
+6 −3 src/app/features/lobby/RoomItem.tsx
+6 −3 src/app/features/lobby/SpaceItem.tsx
+15 −12 src/app/features/message-search/SearchResultGroup.tsx
+3 −1 src/app/features/room-nav/RoomNavItem.tsx
+10 −7 src/app/features/room/MembersDrawer.tsx
+1 −2 src/app/features/room/Room.tsx
+28 −18 src/app/features/room/RoomInput.tsx
+26 −37 src/app/features/room/RoomTimeline.tsx
+4 −2 src/app/features/room/RoomViewHeader.tsx
+47 −45 src/app/features/room/message/Message.tsx
+3 −0 src/app/features/room/message/Reactions.tsx
+9 −4 src/app/features/room/reaction-viewer/ReactionViewer.tsx
+11 −0 src/app/hooks/useMediaAuthentication.ts
+1 −0 src/app/hooks/useMentionClickHandler.ts
+5 −11 src/app/hooks/useParsedLoginFlows.ts
+31 −0 src/app/i18n.ts
+129 −91 src/app/molecules/image-pack/ImagePack.jsx
+11 −1 src/app/organisms/invite-user/InviteUser.jsx
+20 −4 src/app/organisms/profile-editor/ProfileEditor.jsx
+5 −1 src/app/organisms/profile-viewer/ProfileViewer.jsx
+1 −1 src/app/pages/auth/AuthFooter.tsx
+65 −45 src/app/pages/auth/SSOLogin.tsx
+1 −3 src/app/pages/auth/login/Login.tsx
+1 −4 src/app/pages/auth/register/Register.tsx
+5 −2 src/app/pages/client/ClientNonUIFeatures.tsx
+1 −1 src/app/pages/client/WelcomePage.tsx
+3 −1 src/app/pages/client/inbox/Invites.tsx
+15 −9 src/app/pages/client/inbox/Notifications.tsx
+21 −17 src/app/pages/client/sidebar/SpaceTabs.tsx
+4 −2 src/app/pages/client/sidebar/UserTab.tsx
+23 −6 src/app/plugins/react-custom-html-parser.tsx
+3 −1 src/app/state/room/roomInputDrafts.ts
+37 −0 src/app/utils/matrix.ts
+28 −13 src/app/utils/room.ts
+1 −5 src/client/action/room.js
+1 −1 src/client/initMatrix.ts
+1 −1 src/client/state/cons.js
+7 −7 src/config.css.ts
+24 −0 src/index.tsx
+52 −0 src/sw.ts
+2 −1 tsconfig.json
+23 −4 vite.config.js
92 changes: 46 additions & 46 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cinny",
"version": "4.1.0",
"version": "4.2.2",
"description": "Yet another matrix client",
"main": "index.js",
"engines": {
Expand All @@ -18,7 +18,7 @@
},
"devDependencies": {
"@actions/github": "6.0.0",
"@tauri-apps/cli": "1.6.0",
"@tauri-apps/cli": "1.6.2",
"node-fetch": "3.3.2"
}
}
Loading

0 comments on commit e675bd2

Please sign in to comment.