Skip to content

Commit

Permalink
merge / fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
steventheworker committed Apr 22, 2024
2 parents b36e183 + 758b3e8 commit 15ba97d
Show file tree
Hide file tree
Showing 83 changed files with 5,824 additions and 402 deletions.
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github: lwouis
patreon: lwouis
191 changes: 163 additions & 28 deletions alt-tab-macos.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2,715 changes: 2,697 additions & 18 deletions appcast.xml

Large diffs are not rendered by default.

82 changes: 82 additions & 0 deletions docs/Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,87 @@
# Release notes

# [6.68.0](https://github.com/lwouis/alt-tab-macos/compare/v6.67.0...v6.68.0) (2024-04-03)


### Bug Fixes

* preview.app window may not show when opening many docs ([31b5a3d](https://github.com/lwouis/alt-tab-macos/commit/31b5a3d)), closes [#3276](https://github.com/lwouis/alt-tab-macos/issues/3276)
* preview.app windows would sometimes not show (closes [#3275](https://github.com/lwouis/alt-tab-macos/issues/3275)) ([785cf9c](https://github.com/lwouis/alt-tab-macos/commit/785cf9c))


### Features

* improve ar/nb/nn/pl/tr/uk localizations ([67a6d81](https://github.com/lwouis/alt-tab-macos/commit/67a6d81))
* new thai and norwegian localizations (closes [#3260](https://github.com/lwouis/alt-tab-macos/issues/3260)) ([d9aa319](https://github.com/lwouis/alt-tab-macos/commit/d9aa319))

# [6.67.0](https://github.com/lwouis/alt-tab-macos/compare/v6.66.0...v6.67.0) (2024-03-15)


### Features

* add icelandic localization ([7df1432](https://github.com/lwouis/alt-tab-macos/commit/7df1432))
* improve ru/cn localizations ([c9fe54e](https://github.com/lwouis/alt-tab-macos/commit/c9fe54e))
* support autocad non-native windows ([#3219](https://github.com/lwouis/alt-tab-macos/issues/3219)) ([bbaef6c](https://github.com/lwouis/alt-tab-macos/commit/bbaef6c))

# [6.66.0](https://github.com/lwouis/alt-tab-macos/compare/v6.65.0...v6.66.0) (2024-03-03)


### Bug Fixes

* alttab would crash after menubar icon was actioned with voiceover ([f7fdf3f](https://github.com/lwouis/alt-tab-macos/commit/f7fdf3f)), closes [#3211](https://github.com/lwouis/alt-tab-macos/issues/3211)


### Features

* improved ca/de/es/ko/nl/sv/vi/zh localizations ([f4ad2ea](https://github.com/lwouis/alt-tab-macos/commit/f4ad2ea))

# [6.65.0](https://github.com/lwouis/alt-tab-macos/compare/v6.64.0...v6.65.0) (2024-01-29)


### Features

* update da/de/es/sv localizations ([c88426e](https://github.com/lwouis/alt-tab-macos/commit/c88426e))
* users can check status of required system permissions ([70ee681](https://github.com/lwouis/alt-tab-macos/commit/70ee681))

# [6.64.0](https://github.com/lwouis/alt-tab-macos/compare/v6.63.0...v6.64.0) (2023-10-24)


### Bug Fixes

* don't absorb key up events after summon (closes [#2914](https://github.com/lwouis/alt-tab-macos/issues/2914)) ([3b0194d](https://github.com/lwouis/alt-tab-macos/commit/3b0194d))
* stop vim keys preference disabling on launch (closes [#2919](https://github.com/lwouis/alt-tab-macos/issues/2919)) ([53692ff](https://github.com/lwouis/alt-tab-macos/commit/53692ff))


### Features

* improve fr,de localizations ([c4ae549](https://github.com/lwouis/alt-tab-macos/commit/c4ae549))

# [6.63.0](https://github.com/lwouis/alt-tab-macos/compare/v6.62.0...v6.63.0) (2023-10-20)


### Bug Fixes

* never screenshot windows if thumbnails are hidden ([5e7f44b](https://github.com/lwouis/alt-tab-macos/commit/5e7f44b))


### Features

* improve ca/ko/ku localizations ([865570f](https://github.com/lwouis/alt-tab-macos/commit/865570f))

# [6.62.0](https://github.com/lwouis/alt-tab-macos/compare/v6.61.0...v6.62.0) (2023-10-10)


### Bug Fixes

* better crossover windows detection ([3f64463](https://github.com/lwouis/alt-tab-macos/commit/3f64463))


### Features

* add tamil and croatian localizations ([e542da8](https://github.com/lwouis/alt-tab-macos/commit/e542da8))
* add vim key window navigation (closes [#1229](https://github.com/lwouis/alt-tab-macos/issues/1229)) ([5cf7f99](https://github.com/lwouis/alt-tab-macos/commit/5cf7f99))
* improve bg,es,he,hi,ko,uk,cn localizations ([31fb795](https://github.com/lwouis/alt-tab-macos/commit/31fb795))

# [6.61.0](https://github.com/lwouis/alt-tab-macos/compare/v6.60.0...v6.61.0) (2023-07-12)


Expand Down
64 changes: 56 additions & 8 deletions docs/Contributors.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,49 @@
# Contributors

They helped [develop the app](https://github.com/steventheworker/alt-tab-macos/graphs/contributors):
They helped [develop the app](https://github.com/lwouis/alt-tab-macos/graphs/contributors):

* [adamnemecek](https://github.com/adamnemecek)
* [AfzalivE](https://github.com/AfzalivE)
* [akx](https://github.com/akx)
* [ayroblu](https://github.com/ayroblu)
* [Calinou](https://github.com/Calinou)
* [damonpam](https://github.com/damonpam)
* [decodism](https://github.com/decodism)
* [gcbw](https://github.com/gcbw)
* [gingerr](https://github.com/gingerr)
* [GrzegorzKazana](https://github.com/GrzegorzKazana)
* [hughlilly](https://github.com/hughlilly)
* [i0ntempest](https://github.com/i0ntempest)
* [karbassi](https://github.com/karbassi)
* [L1cardo](https://github.com/L1cardo)
* [lwouis](https://github.com/lwouis)
* [metacodes](https://github.com/metacodes)
* [mnin](https://github.com/mnin)
* [MrPaschenko](https://github.com/MrPaschenko)
* [nella17](https://github.com/nella17)
* [notlmn](https://github.com/notlmn)
* [phungtuanhoang1996](https://github.com/phungtuanhoang1996)
* [rbnis](https://github.com/rbnis)
* [Rjevski](https://github.com/Rjevski)
* [ryenus](https://github.com/ryenus)
* [samdenty](https://github.com/samdenty)
* [skolj](https://github.com/skolj)
* [xanathar](https://github.com/xanathar)
* [xconverge](https://github.com/xconverge)
* [zacharee](https://github.com/zacharee)

They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):

* 73
* Aamirsuleman
* Aarni Koskela
* Abdulelah
* Abdur-Rahman Bilal
* Aden Aziz
* Admin
* Albert Abdilim
* Alex
* Alexander Kilian
* Ali Gokmen
* Ali. tas103
* Allen Guan
Expand All @@ -20,28 +52,36 @@ They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):
* Anurag Roy
* anushree b
* Arman
* Artem Stankov
* Arthur
* Ash
* blanorama
* bluefirex
* bovirus
* caduellery
* Caner İlhan
* catcore
* Christian Keilmann
* Chun Fei Lung
* codecantata
* Cong Tri
* Dan
* Dan84
* Darius Rosendahl
* Darko
* David R
* David Süle
* Didier Deschrijver
* Dmytro
* Dzhuneyt
* EDUARDO
* edu_sombra
* Eliezer Shpigelman
* Emil Pedersen
* Eric WANTZ
* Ersagun Kuruca
* Eukarya
* Eyelly wu
* fabifabulousity
* Filipe
* Frangarciasalomon
* Frank
Expand All @@ -57,7 +97,9 @@ They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):
* Hjörtur Hjartarson
* Hokuto Kato
* Huandngoc
* Huynh Sang
* Ialiendeg
* Ida Bomholt Dyrholm Jacobsen
* Igor Aradski
* Indexerrowaty
* isametry
Expand All @@ -74,14 +116,16 @@ They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):
* Jules Beckers
* Julian Nowaczyk
* Julio
* Jungwan Woo
* Kagurazaka Tsuki
* kal
* kant
* Kevinsevinche
* Kinyagulovrr
* Klara
* Kristófer Fannar Björnsson
* Kushnee5
* Kuuchi
* Lakshman Kolappan
* Lcwhhh
* Lester
* Loïc
Expand All @@ -90,15 +134,17 @@ They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):
* lwouis
* Maplevantablack
* Marc Pla
* Marcus Billman
* Marekscholle
* Marko McLion
* Martin Mitka
* Martin. mitka
* Martinjnilsen
* Masayoshi Motojima
* Masih
* Max
* Maximilian Falk
* MaximilianFreitag
* Meriç Bağlayan
* Michael
* Milos M
* Mohammad Al Zouabi
Expand All @@ -115,7 +161,6 @@ They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):
* Pehovorka
* Peterkim0620
* Petr Kolář
* Philippe Ménendès
* Piotr Budny
* ponchik
* Quentin. douarre
Expand All @@ -129,11 +174,14 @@ They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):
* Ron Nuss
* sawtooth
* Selcuk Dursun
* Sergey
* Seyedparsa Mirtaheri
* Shameem Reza
* SheNeVmerla
* Shivam Bansal
* shlomo
* Sippawit Thammawiset
* Sjur Moshagen
* Stan Smits
* stas
* Stefan
Expand All @@ -143,7 +191,6 @@ They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):
* Tomoa Nozawa
* Umutakkaya1996
* Vadym
* Vegard
* Vijayant Saini
* Vincent Orback
* Vlad
Expand All @@ -152,11 +199,12 @@ They helped [localize the app](https://poeditor.com/join/project/8AOEZ0eAZE):
* Whatsmine-HaoshuaiXu
* Wilhelm Wolfgang Gärtner
* Wowpapa3232
* Yamada Keisuke
* Yash
* wtwt0119!!
* Yossi Zahn
* ysaito
* Yukai
* yumechan
* Yusuf Caliskan
* 橙梓
* Ивайло
* Андрій Кирбаба
12 changes: 6 additions & 6 deletions docs/Introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ permalink: /

# Introduction

[![Screenshot](public/demo/frontpage.jpg)](public/demo/frontpage.jpg)
[<img src="public/demo/frontpage.jpg" alt="Screenshot" width="1440" height="900" style="width:100%; height:auto;" />](public/demo/frontpage.jpg)

**AltTab** brings the power of Windows’s "alt-tab" window switcher to macOS.

Expand Down Expand Up @@ -38,7 +38,7 @@ Alternatively, you can use [homebrew](https://brew.sh/):

## Localization

AltTab is available in: Bahasa Indonesia, Català, Dansk, Deutsch, Eesti keel, English, Español, Français, Galego, Italiano, Kurdî, Lëtzebuergesch, Limba română, Magyar, Nederlands, Norsk, Oʻzbekcha, Polski, Português, Português (Brasil), Shqip, Slovenčina, Slovenščina, Suomi, Svenska, Tiếng Việt, Türkçe, Čeština, Ελληνικά, Български, Русский язык, Српски / Srpski, українська мова, עִבְרִית ,العربية ,فارسی, हिन्दी, বাংলা, 日本語, 简体中文, 繁體中文, 한국어
AltTab is available in: Bahasa Indonesia, Català, Dansk, Deutsch, Eesti keel, English, Español, Français, Galego, Hrvatski, Italiano, Kurdî, Lëtzebuergesch, Limba română, Magyar, Nederlands, Norsk, Oʻzbekcha, Polski, Português, Português (Brasil), Shqip, Slovenčina, Slovenščina, Suomi, Svenska, Tiếng Việt, Türkçe, Čeština, Ελληνικά, Български, Русский, Српски / Srpski, Українська, עִבְרִית ,العربية ,فارسی, हिन्दी, বাংলা, தமிழ், ภาษาไทย, 日本語, 简体中文, 繁體中文, 한국어

[Contribute your own language easily!](https://poeditor.com/join/project/8AOEZ0eAZE)

Expand All @@ -51,9 +51,9 @@ AltTab is available in: Bahasa Indonesia, Català, Dansk, Deutsch, Eesti keel, E

Change the shortcut keys, switch to a Windows theme and more, using the Preferences window:

| [![Screenshot1](public/demo/preferences-appearance.jpg)](public/demo/preferences-appearance.jpg) | [![Screenshot 2](public/demo/preferences-controls.jpg)](public/demo/preferences-controls.jpg) |
| [![Screenshot3](public/demo/preferences-blacklist.jpg)](public/demo/preferences-blacklist.jpg) | [![Screenshot 4](public/demo/preferences-policies.jpg)](public/demo/preferences-policies.jpg) |
| [![Screenshot5](public/demo/preferences-general.jpg)](public/demo/preferences-general.jpg) | |
| [<img loading="lazy" src="public/demo/preferences-appearance.jpg" alt="Screenshot1" width="1064" height="1280" style="width:100%; height:auto;" />](public/demo/preferences-appearance.jpg) | [<img loading="lazy" src="public/demo/preferences-controls.jpg" alt="Screenshot 2" width="1081" height="1280" style="width:100%; height:auto;" />](public/demo/preferences-controls.jpg) |
| [<img loading="lazy" src="public/demo/preferences-blacklist.jpg" alt="Screenshot3" width="1280" height="1161" style="width:100%; height:auto;" />](public/demo/preferences-blacklist.jpg) | [<img loading="lazy" src="public/demo/preferences-policies.jpg" alt="Screenshot 4" width="1280" height="786" style="width:100%; height:auto;" />](public/demo/preferences-policies.jpg) |
| [<img loading="lazy" src="public/demo/preferences-general.jpg" alt="Screenshot5" width="1280" height="640" style="width:100%; height:auto;" />](public/demo/preferences-general.jpg) | |

## Alternatives

Expand All @@ -76,7 +76,7 @@ There are also related apps which don’t really overlap in functionality, but t

| 1 row | 2 rows | Windows theme |
|-------|---------|-------|
| [![Screenshot](public/demo/1-row.jpg)](public/demo/1-row.jpg) | [![Screenshot](public/demo/2-rows.jpg)](public/demo/2-rows.jpg) | [![Screenshot](public/demo/windows-theme.jpg)](public/demo/windows-theme.jpg) |
| [<img loading="lazy" src="public/demo/1-row.jpg" alt="Screenshot" width="1440" height="900" style="width:100%; height:auto;" />](public/demo/1-row.jpg) | [<img loading="lazy" src="public/demo/2-rows.jpg" alt="Screenshot" width="1440" height="900" style="width:100%; height:auto;" />](public/demo/2-rows.jpg) | [<img loading="lazy" src="public/demo/windows-theme.jpg" alt="Screenshot" width="1440" height="900" style="width:100%; height:auto;" />](public/demo/windows-theme.jpg) |

## License

Expand Down
6 changes: 6 additions & 0 deletions docs/Support.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Support this project

There are 2 ways to support this project:

* [Patreon](https://www.patreon.com/lwouis/membership)
* [GitHub Sponsors](https://github.com/sponsors/lwouis)
3 changes: 2 additions & 1 deletion docs/_includes/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ nav {
word-break: break-word;

img {
max-width: 100%;
width: 100%;
height: auto;
}

code, pre, tt {
Expand Down
18 changes: 7 additions & 11 deletions docs/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@

<header>
<div>
<a href="{{ site.baseurl }}"><img src="{{ site.baseurl }}public/android-chrome-256x256.png" width="100"
height="100"/></a>
<a href="{{ site.baseurl }}"><img src="{{ site.baseurl }}public/android-chrome-256x256.png" width="100" height="100"/></a>
<div>
<h1><a href="{{ site.baseurl }}">{{ site.title }}</a></h1>
<p>{{ site.github.project_tagline }}</p>
Expand All @@ -48,15 +47,12 @@ <h1><a href="{{ site.baseurl }}">{{ site.title }}</a></h1>
<nav>
<ul>
<li><a class="rainbow" href="{{ site.github.latest_release.assets[0].browser_download_url }}">Download</a></li>
<li><a class="{% if page.name == 'Introduction.md' %}active{% endif %}" href="{{ site.baseurl }}"><span>Introduction</span></a>
</li>
<li><a class="{% if page.name == 'Changelog.md' %}active{% endif %}" href="{{ site.baseurl }}changelog"><span>Release notes</span></a>
</li>
<li><a class="{% if page.name == 'Contributing.md' %}active{% endif %}"
href="{{ site.baseurl }}contributing"><span>Contributing</span></a></li>
<li><a class="{% if page.name == 'Thanks.md' %}active{% endif %}"
href="{{ site.baseurl }}thanks"><span>Thanks</span></a></li>
<li><a href="{{ site.github.repository_url }}"><span>GitHub project</span></a></li>
<li><a class="{% if page.name == 'Introduction.md' %}active{% endif %}" href="{{ site.baseurl }}"><span>Introduction</span></a></li>
<li><a class="{% if page.name == 'Changelog.md' %}active{% endif %}" href="{{ site.baseurl }}changelog"><span>Release notes</span></a></li>
<li><a class="{% if page.name == 'Contributing.md' %}active{% endif %}" href="{{ site.baseurl }}contributing"><span>Contributing</span></a></li>
<li><a class="{% if page.name == 'Thanks.md' %}active{% endif %}" href="{{ site.baseurl }}thanks"><span>Thanks</span></a></li>
<li><a href="{{ site.github.repository_url }}"><span>GitHub</span></a></li>
<li><a class="{% if page.name == 'Support.md' %}active{% endif %}" href="{{ site.baseurl }}support"><span>Support this project ❤️</span></a></li>
</ul>
</nav>

Expand Down
Loading

0 comments on commit 15ba97d

Please sign in to comment.