aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
...
| * Merge branch 'main' of https://github.com/zellij-org/zellij into set-data-dira-kenji2021-05-12
| |\ | |/ |/|
* | Merge pull request #497 from a-kenji/fix-default-keybinda-kenji2021-05-12
|\ \ | | | | | | Fix Default Keybind for Tab -> Resize Mode
| * | Fix Default Keybind for Tab -> Resize Modea-kenji2021-05-12
|/ /
* | Merge pull request #495 from a-kenji/fix-simplified-uia-kenji2021-05-12
|\ \ | | | | | | Fix Simplified Ui
| * \ Merge branch 'main' of https://github.com/zellij-org/zellij into ↵a-kenji2021-05-12
| |\ \ | |/ / |/| | | | | fix-simplified-ui
* | | docs(changelog): pasted text fixAram Drevekenin2021-05-12
| | |
* | | fix(ui): handle pasted text properly (#494)Aram Drevekenin2021-05-12
| | | | | | | | | | | | | | | * fix(ui): handle pasted text properly * style(fmt): rustfmt
| * | Fix Simplified Uia-kenji2021-05-12
|/ / | | | | | | | | Propagate the config now, in all the places, as opposed to fallback to a default.
* | docs(changelog): compatibility updateAram Drevekenin2021-05-12
| |
* | fix(compatibility): properly fill viewport with styles when clearing it (#493)Aram Drevekenin2021-05-12
| |
* | Merge pull request #492 from a-kenji/config-loading-tweaka-kenji2021-05-12
|\ \ | | | | | | Slight rework of config loading.
| * | Slight rework of config loading.a-kenji2021-05-12
|/ / | | | | | | Merges the cli and file configuration
* | docs(changelog): Add Option for Simplified Layouta-kenji2021-05-11
| |
* | Merge pull request #479 from a-kenji/simple-font-uia-kenji2021-05-11
|\ \ | | | | | | Add Option for Simplified Layout
| * | !fixup Add Option for Simplified Layouta-kenji2021-05-10
| | | | | | | | | | | | * fix test
| * | fixup! Merge branch 'main' of https://github.com/zellij-org/zellij into ↵a-kenji2021-05-10
| |\ \ | | | | | | | | | | | | simple-font-ui
| * | | fixup! Add Option for Simplified Layouta-kenji2021-05-10
| | | | | | | | | | | | | | | | * merge structop and serde structs
| * | | Pokea-kenji2021-05-10
| | | |
| * | | fixup! Add Option for Simplified Layouta-kenji2021-05-10
| | | | | | | | | | | | | | | | * Add to Changelog
| * | | fixup! Add Option for Simplified Layouta-kenji2021-05-10
| | | |
| * | | Add Option for Simplified Layouta-kenji2021-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * the simplified layout omits the Nerdfonts characters that are not found in every Fontset * add an optional config option to opt into the simplified ui `simplified_ui: bool` * add a config flag that allows opting into the simplified ui `zellij options --simplified-ui` * move the `clean` flag to the `setup` subcommand
* | | | Merge pull request #488 from a-kenji/darwin-config-dira-kenji2021-05-11
|\ \ \ \ | | | | | | | | | | Change Ordering of the Default Config Directories
| * | | | Change Ordering of the Default Config Directoriesa-kenji2021-05-11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * since darwin doesn't have distinct data and config directories, assumptions that we had were invalid * now the `HOME` config directory is loaded before the system config directory, in this case populating the data directory doesn't invalidate possible user configuration, because the configuration directory now exists
* | | | chore(version): bump development versionAram Drevekenin2021-05-11
| | | |
* | | | Merge pull request #487 from a-kenji/mac-configa-kenji2021-05-11
|\ \ \ \ | | | | | | | | | | Fix Max Config Directory
| * \ \ \ Merge branch 'main' into mac-configa-kenji2021-05-11
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | docs(changelog): update compatibility fixesAram Drevekenin2021-05-11
| | | | |
* | | | | Terminal compatibility: various behaviour fixes (#486)Aram Drevekenin2021-05-11
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | * fix(compatibility): various behaviour fixes * style(fmt): rustfmt * style(fmt): thanks clippy for teaching me about matches!
| * | | Fix Max Config Directorya-kenji2021-05-11
|/ / / | | | | | | | | | | | | | | | closes #485 * fixes a regression on the config directory handling on mac
* | | Merge pull request #480 from a-kenji/dump-config-exita-kenji2021-05-10
|\ \ \ | | | | | | | | Fix exit code on `dump-default-config`
| * \ \ Merge branch 'main' into dump-config-exita-kenji2021-05-10
| |\ \ \ | |/ / / |/| | |
* | | | docs(changelog): Switch tabs in normal mode #471Kunal Mohan2021-05-10
| | | |
* | | | Merge pull request #471 from dantepippi/switch-tabs-464Kunal Mohan2021-05-10
|\ \ \ \ | | | | | | | | | | Switching Tabs if there's no pane in the direction
| * | | | After rebaseDante Pippi2021-05-09
| | | | |
| * | | | New behavior for h and lDante Pippi2021-05-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New behavior for h and l, will change tabs if there are no available panes in the direction. cargo clippy Ensuring atomicity for the MoveFocusOrTab - Blocking the input thread for the action MoveFocusOrTab - Using "unreachable" macro in match arm to make it clear that the directions Up and Down should not be used with the action MoveFocusOrTab Adding tests
| | * | | Fix exit code on `dump-default-config`a-kenji2021-05-10
| |/ / / |/| | |
* | | | improve bug report template (#466)matu3ba2021-05-10
|/ / / | | | | | | | | | Give copy-paste commands and give example of typical information and density. Refer to common sense of the issue author.
* | | Merge pull request #473 from zellij-org/bus-business-with-extra-merge-funKyle Sutherland-Cash2021-05-09
|\ \ \ | |/ / |/| | Refactoring sender/receiver stuff - post-merge
| * | And format...Kyle Sutherland-Cash2021-05-09
| | |
| * | Bit more module tidy upKyle Sutherland-Cash2021-05-09
| | |
| * | Revert accidental rename of ToggleActiveSyncTabKyle Sutherland-Cash2021-05-09
| | |
| * | cargo fmtKyle Sutherland-Cash2021-05-08
| | |
| * | Markups from self-reviewKyle Sutherland-Cash2021-05-08
| | |
| * | First round of merging against server-client and color stuffKyle Sutherland-Cash2021-05-08
|/ /
* | README: shortening + add explanation (#470)matu3ba2021-05-07
| | | | | | | | | | | | | | | | | | * README: shortening + add explanation explain debug build command for bug reports * docs(readme): capitalize Co-authored-by: Aram Drevekenin <aram@poor.dev>
* | docs(changelog): sync command migrationAram Drevekenin2021-05-07
| |
* | Moving the sync command to the Tab mode (#412)dantepippi2021-05-07
| | | | | | | | | | | | | | | | * Moving the sync command to the Tab mode * Fixing bug related to plugin panes and sync mode When sync mode was enabled the input from a plugin pane was being incorrectly ignored.
* | docs(changelog): terminal aifxAram Drevekenin2021-05-07
| |
* | fix(compatibility): upgrade vte to support csi subparameters (#469)Aram Drevekenin2021-05-07
| | | | | | | | | | * fix(compatibility): upgrade vte to support csi subparameters * style(fmt): rustfmt and clippy
* | docs(issue): update issue template to new folder locationAram Drevekenin2021-05-07
| |