Skip to content

Commit

Permalink
Merge pull request #954 from nextcloud/chore/bye-preview
Browse files Browse the repository at this point in the history
chore: prepare for the first non-preview
  • Loading branch information
ShGKme authored Dec 3, 2024
2 parents ccfac04 + ea15f01 commit bf82831
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 66 deletions.
Binary file added Nextcloud-Talk-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Nextcloud-Talk-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
67 changes: 5 additions & 62 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
- SPDX-License-Identifier: CC0-1.0
-->

# 🖥️ Nextcloud Talk Desktop 💬
# Nextcloud Talk Desktop

[![REUSE status](https://api.reuse.software/badge/github.com/nextcloud/talk-desktop)](https://api.reuse.software/info/github.com/nextcloud/talk-desktop)

> Nextcloud Talk Desktop client based on Nextcloud Talk web application bundling ✨
> Official Nextcloud Talk Desktop client
![Nextcloud Talk](./Nextcloud-Talk-light.png#gh-light-mode-only)
![Nextcloud Talk](./Nextcloud-Talk-dark.png#gh-dark-mode-only)

## 📥 Install

Expand All @@ -32,14 +35,6 @@ All binaries are available on [Nextcloud Releases](https://github.com/nextcloud-
- [Nextcloud Server](https://github.com/nextcloud/server) version 27 or higher.
- [Nextcloud Talk](https://github.com/nextcloud/spreed) version 17 or higher.

## 👾 Drawbacks

- Currently not supported:
- Search ([#30](https://github.com/nextcloud/talk-desktop/issues/30))
- Untrusted certificate on Linux ([#23](https://github.com/nextcloud/talk-desktop/issues/23))
- Works with limitations:
- File Viewer — only images and videos

## 👥 Multi-account

Full multi-account currently [is not currently supported](https://github.com/nextcloud/talk-desktop/issues/7).
Expand Down Expand Up @@ -153,58 +148,6 @@ npm run package:mac:x64
npm run package:windows
```

## ✈️ Release

1. Create `release/vX.Y.Z` branch.
2. Update `CHANGELOG.md`.
1. If a built-in Talk version is to be changed - add a note:
```md
### Build-in Talk update
Built-in Talk in binaries is updated to $(VERSION) Talk changelog: https://github.com/nextcloud/spreed/blob/master/CHANGELOG.md
```
3. Update `package.json`:
- For minor update:
```sh
npm version minor
```
- For patch update:
```sh
npm version patch
```
4. Create **a release PR**.
5. Merge **the release PR**.
6. Create and push **a tag**:
```sh
git tag -a v$(version) -m "Tagging the $(version) release."
git push origin v$(version)
git push releases v$(version)
```
7. **Draft a new release** on GitHub in [nextcloud-releases/talk-desktop](https://github.com/nextcloud-releases/talk-desktop/releases)
1. Add **release title**: `v$(version) - Talk v$(talkVersion)`, e.g. `v0.10.0 - Talk v17.1.0-rc.1`
2. Choose a **tag**
3. Add the respective `CHANGELOG.md` section
4. Use the **Generate release notes** button and wrap put the result into
```md
## What's Changed
<details>
<!-- Generated content -->
</details>
```
8. **Draft a new release** on GitHub in [nextcloud/talk-desktop](https://github.com/nextcloud/talk-desktop/releases)
1. Copy everything from the previous step
2. Add:
```md
> 📥 Download Binaries on https://github.com/nextcloud-releases/talk-desktop/releases/tag/v$(version)
```
9. Package release on each platform separately:
```sh
npm run release:package
```
10. Upload packages to the GitHub Releases on [nextcloud-releases/talk-desktop](https://github.com/nextcloud-releases/talk-desktop/releases/lastest)
11. Publish both releases on GitHub Releases

## 👥 Contribution Guidelines

See: https://github.com/nextcloud/spreed#contribution-guidelines
2 changes: 1 addition & 1 deletion REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ SPDX-FileCopyrightText = "2017 Feandesign https://soundcloud.com/feandesign"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = ["img/talk-icon-**.svg", "img/icons/**", "img/squirrel-install-loading.gif"]
path = ["img/talk-icon-**.svg", "img/icons/**", "img/squirrel-install-loading.gif", "Nextcloud-Talk-light.png", "Nextcloud-Talk-dark.png"]
precedence = "aggregate"
SPDX-FileCopyrightText = "Nextcloud GmbH <https://nextcloud.com/trademarks/>"
SPDX-License-Identifier = "LicenseRef-NextcloudTrademarks"
4 changes: 3 additions & 1 deletion src/authentication/renderer/AuthenticationApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import { appData } from '../../app/AppData.js'
import { MIN_REQUIRED_NEXTCLOUD_VERSION, MIN_REQUIRED_TALK_VERSION } from '../../constants.js'
import { refetchAppData } from '../../app/appData.service.js'

const isPreview = false

const version = window.TALK_DESKTOP.packageInfo.version
const rawServerUrl = ref('')

Expand Down Expand Up @@ -181,7 +183,7 @@ async function login() {
</form>
</div>
<div class="spacer">
<footer class="footer">
<footer v-if="isPreview" class="footer">
Nextcloud Talk Desktop {{ version }}
</footer>
</div>
Expand Down
4 changes: 3 additions & 1 deletion src/talk/renderer/DesktopHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ useUserStatusStore()
useUserStatusHeartbeat()
useAppConfigStore()

const isPreview = false

const user = appData.userMetadata
const OS = window.systemInfo

Expand Down Expand Up @@ -61,7 +63,7 @@ onUnmounted(() => {
tabindex="0"
@click="pushToRoot">
<span class="header__title">Nextcloud Talk</span>
<span class="header__preview-badge">Preview</span>
<span v-if="isPreview" class="header__preview-badge">Preview</span>
</div>

<div class="spacer" />
Expand Down
1 change: 0 additions & 1 deletion src/welcome/welcome.html
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ <h1 class="header">Nextcloud Talk</h1>
<div class="cloud" style="--height: 40px; animation: animateCloud 10s linear infinite; top: 100px; left: 150px"></div>
</div>
<div class="spacer"></div>
<div class="footer">Preview</div>
</div>
</body>
</html>

0 comments on commit bf82831

Please sign in to comment.