Merge branch 'main' of https://github.com/zellij-org/zellij into defa…

…ult-mode-368

* If starting in the locked mode after the merge,
the locked mode seems to need 2 actions to go to
the normal mode - after that everything works
as expected.

- This is not intended.

.github/workflows/rust.yml

@@ -16,10 +16,18 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/cache@v2
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
     - name: Add WASM target
       run: rustup target add wasm32-wasi
     - name: Install cargo-make
-      run: cargo install --debug cargo-make
+      run: test -x "${HOME}/.cargo/bin/cargo-make" || cargo install --debug cargo-make
     - name: Build
       run: cargo make build
     - name: Test
@@ -31,8 +39,16 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/cache@v2
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
     - name: Install cargo-make
-      run: cargo install --debug cargo-make
+      run: test -x "${HOME}/.cargo/bin/cargo-make" || cargo install --debug cargo-make
     - name: Check Format
       run: cargo make check-format
 
@@ -42,7 +58,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/cache@v2
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
     - name: Install cargo-make
-      run: cargo install --debug cargo-make
+      run: test -x "${HOME}/.cargo/bin/cargo-make" || cargo install --debug cargo-make
     - name: Check Lints
       run: cargo make clippy -D clippy::all

.gitignore

@@ -3,4 +3,5 @@
 .vscode
 .vim
 .DS_Store 
-/assets/man/zellij.1
+/assets/man/zellij.1
+**/target

CHANGELOG.md

@@ -5,7 +5,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
+* Remove unused imports (https://github.com/zellij-org/zellij/pull/504)
+* More Infrastructure changes for the upcoming session detach feature: run server and client in separate processes (https://github.com/zellij-org/zellij/pull/499)
+* Restructuring cargo workspace: Separate client, server and utils into separate crates (https://github.com/zellij-org/zellij/pull/515)
+* Terminal compatibility: handle most OSC sequences (https://github.com/zellij-org/zellij/pull/517)
+* Split `layout` flag into `layout` and `layout-path` (https://github.com/zellij-org/zellij/pull/514)
+* Fix behaviour of the `clean` flag (https://github.com/zellij-org/zellij/pull/519)
+* Make distinction clearer between certain configuration flags (https://github.com/zellij-org/zellij/pull/529)
+* Resource usage and performance improvements (https://github.com/zellij-org/zellij/pull/523)
+* Feature: Detachable/Persistent sessions (https://github.com/zellij-org/zellij/pull/531)
+
+## [0.11.0] - 2021-05-15
+
+This version is mostly an installation hotfix.
+
 * Add `check` flag to `setup` subcommand, move `generate-completions` subcommand to `setup` flag (https://github.com/zellij-org/zellij/pull/503)
+* Change the asset installation from an opt-in to an opt-out (https://github.com/zellij-org/zellij/pull/512)
 
 ## [0.10.0] - 2021-05-14
 * Change Switch default config loading order of `HOME` and system (https://github.com/zellij-org/zellij/pull/488)

CONTRIBUTING.md

@@ -18,9 +18,6 @@ To build Zellij, we're using cargo-make – you can install it by running `cargo
 install --force cargo-make`. To edit a manpage mandown crate (`cargo install
 mandown`) is used and the work is done on a markdown file in docs/MANPAGE.md.
 
-Zellij has a hard dependency on a package from `x11` most likely called
-`libX11`, or similarly on your system.
-
 Here are some of the commands currently supported by the build system:
 
 ```sh
@@ -44,8 +41,8 @@ cargo make publish
 cargo make manpage
 ```
 
-To run `install` or `publish`, you'll need `binaryen --version` > 97, for it's
-command `wasm-opt`.
+To run `install` or `publish`, you'll need the package `binaryen` in the
+version `wasm-opt --version` > 97, for it's command `wasm-opt`.
 
 ## Looking for something to work on?