Skip to content

Commit

Permalink
Merge branch 'develop' into feature/1897-psk
Browse files Browse the repository at this point in the history
  • Loading branch information
EmiM committed Oct 18, 2023
2 parents e1abeb9 + d58b32c commit b1d41bd
Show file tree
Hide file tree
Showing 106 changed files with 44,215 additions and 38,362 deletions.
Binary file not shown.
34 changes: 34 additions & 0 deletions .github/workflows/e2e-android.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: E2E Android

on:
push:
paths:
- packages/mobile/**

jobs:
detox-android:
timeout-minutes: 10
runs-on: [self-hosted, macOS, ARM64, android]

steps:
- uses: actions/checkout@v4

- name: Install dependencies
run: |
npm i
npm run lerna bootstrap --scope @quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle
- name: Pull binaries
run: |
git lfs install
git lfs pull
- name: Build Detox
run: |
cd packages/mobile
detox build -c android.emu.debug.ci
- name: Run basic tests
run: |
cd packages/mobile
detox test starter -c android.emu.debug.ci
6 changes: 3 additions & 3 deletions .github/workflows/e2e-ios.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: E2E iOS

on:
pull_request:
push:
paths:
- packages/mobile/**

jobs:
detox:
detox-ios:
timeout-minutes: 10
runs-on: [self-hosted, macOS, ARM64]
runs-on: [self-hosted, macOS, ARM64, iOS]

steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/mobile-deploy-android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
build-android:
# needs: detox-android
runs-on: ${{ matrix.os }}
if: |
startsWith(github.ref, 'refs/tags/@quiet/mobile')
Expand Down Expand Up @@ -41,13 +42,13 @@ jobs:

- name: "Create gradle configuration directory"
run: mkdir -p $HOME/.gradle

- name: "Prepare ndk configuration"
run: |
printf "\
NDK_PATH=${{ steps.setup-ndk.outputs.ndk-path }}\n\
" > $HOME/.gradle/gradle.properties
- name: "Prepare signing configuration"
run: |
printf "\
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/mobile-deploy-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
build-ios:
# needs: detox-ios
runs-on: ${{ matrix.os }}
if: |
startsWith(github.ref, 'refs/tags/@quiet/mobile')
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
[unreleased]

[Unreleased]
* Fixed mobile bugs - joining by QR code and not showing username taken screen for user who has unique name

* Shorter dots-placeholder for invite link

* Removed registration attempts selector and corresponding usage.

* Revert adjusting bootstrap scripts for developing on Windows

Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Encrypted p2p team chat with no servers, just Tor.
<br />
<!-- <a href="https://tryquiet.org"><strong>tryquiet.org »</strong></a> -->
<a href="https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.4"><strong>Downloads</strong></a> |
<a href="https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.5"><strong>Downloads</strong></a> |
<a href="#how-it-works"><strong>How it Works</strong></a> |
<a href="#features"><strong>Features</strong></a> |
<a href="https://github.com/TryQuiet/monorepo/wiki/Threat-Model"><strong>Threat Model</strong></a> |
Expand Down Expand Up @@ -52,7 +52,7 @@ See our [FAQ](https://github.com/TryQuiet/monorepo/wiki/Quiet-FAQ) for answers t

## Getting started

To try Quiet, download the [latest release](https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.4) for your platform (.dmg for macOS, .exe for Windows, etc.) and install it in the normal way. Then create a community and open the community's settings to invite members.
To try Quiet, download the [latest release](https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.5) for your platform (.dmg for macOS, .exe for Windows, etc.) and install it in the normal way. Then create a community and open the community's settings to invite members.

If you'd like to help develop Quiet, see [Contributing to Quiet](#contributing-to-quiet).

Expand All @@ -68,11 +68,12 @@ If you'd like to help develop Quiet, see [Contributing to Quiet](#contributing-t
* **Keyboard Controls** - Navigate channels without using the mouse.
* **Desktop Apps** - Desktop apps for Mac, Windows, and Linux.
* **Android App** - A fully peer-to-peer Android app with working notifications.
* **iOS App** - A fully peer-to-peer iOS app (TestFlight) without notifications.
* **No email or phone number required** - Unlike Slack, Discord, WhatsApp, Telegram, and Signal, no email or phone number is required to create or join a community.

## Planned (but still-missing) features

* **iOS App** - Join communities and sync messages on iOS, with no central server.
* **iOS Notifications** - Receive notifications on iOS, with help from a service Apple requires to be centralized.
* **Direct Messages** - Send and receive direct messages that are encrypted to the recipient and unreadable by other community members.
* **Mentions** - Send @ mentions that notify other users.
* **Removal** - Remove users from your community.
Expand All @@ -87,7 +88,7 @@ If you'd like to help develop Quiet, see [Contributing to Quiet](#contributing-t
## Post-1.0 Features

* **Large Communities** - Create a community with 1000 members or more (right now ~30-100 members is the limit.)
* **Moderation** - Appoint moderators who can hide messages and shadowban or remove users.
* **Moderation** - Appoint moderators who can hide messages and silence or remove users.
* **Spam and Denial-of-Service Protection** - Settings to automatically remove users who send disruptive messages.
* **Search** - Robust message search.
* **Threads** - Reply to messages in threads.
Expand Down
Loading

0 comments on commit b1d41bd

Please sign in to comment.