Skip to content

Commit

Permalink
Merge branch 'gnome-terminator:master' into background-images
Browse files Browse the repository at this point in the history
  • Loading branch information
Vulcalien authored Oct 9, 2023
2 parents 99249bb + 6d225c7 commit df08d7c
Show file tree
Hide file tree
Showing 43 changed files with 5,075 additions and 1,817 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- '3.9'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v1
Expand Down
56 changes: 44 additions & 12 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ This list is generated from the GIT log.
* Aaron Faanes <dafrito@gmail.com>
* Adrian A <a.adrian.tech@googlemail.com>
* Alexey Sokolov <sokolov@google.com>
* Andrea Corbellini <corbellini.andrea@gmail.com>
* Andre Hilsendeger <Andre.Hilsendeger@gmail.com>
* Andrea Corbellini <corbellini.andrea@gmail.com>
* Andrew Felske <knopper67@archlinux.us>
* Antonio Terceiro <asa@terceiro.xyz>
* Antonio Terceiro <terceiro@debian.org>
Expand All @@ -25,15 +25,14 @@ This list is generated from the GIT log.
* David Caro Estévez <david.caro.estevez@gmail.com>
* David Levanon <dvdlevanon@gmail.com>
* David Sowder <github.com@david.sowder.com>
* dkmvs <67212386+dkmvs@users.noreply.github.com>
* Dennis Benzinger | SAP Hybris <dennis.benzinger@sap.com>
* Dmitry Soldatov <grapescan@gmail.com>
* Douglas Bacon <douglaswbacon@gmail.com>
* Edoardo Batini <eodbat@gmail.com>
* Elliot Murphy <elliot@elliotmurphy.com>
* Emilien Klein <emilien@klein.st>
* Emilio Pozuelo Monfort <pochu@debian.org>
* Emmanuel Bretelle <chantra@debuntu.org>
* evandrocoan <evandrocoan@hotmail.com>
* Felix Mölder <56774350+Brambleberry4@users.noreply.github.com>
* Fernando Basso <fernandobasso.br@gmail.com>
* Filip Kilibarda <filipcsc@gmail.com>
Expand All @@ -46,51 +45,82 @@ This list is generated from the GIT log.
* Ivar Smolin <okul@ivotingcentre.ee>
* Jakub Vaněk <vanek.jakub4@seznam.cz>
* Jamu Kakar <jkakar@kakar.ca>
* Jay W <git.jaydoubleu@gmail.com>
* Jean-Sebastien Trottier <strottie@cisco.com>
* Joe Peled <joe.peled@vimeo.com>
* Jonas L <jooola@users.noreply.github.com>
* José Augusto <joseaugusto.881@outlook.com>
* Jose Augusto <jose.augusto@chiligum.com.br>
* Jose I. Monreal <jmonreal@gmail.com>
* judgedreads <pearce@millerdedmon.com>
* José Augusto <joseaugusto.881@outlook.com>
* Juliano Fischer Naves <julianofischer@gmail.com>
* Julien Nicoulaud <julien.nicoulaud@gmail.com>
* Julien Thewys <jth@openerp.com>
* Kacper Kowalski <kacper.s.kowalski@gmail.com>
* Kees Cook <kees@outflux.net>
* Kian-Meng Ang <kianmeng@cpan.org>
* Leandro Thimóteo <leandro.s.thimoteo@gmail.com>
* Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
* Mackenzie Morgan <maco.m@ubuntu.com>
* Mark Timarev <marktimarev@gmail.com>
* Markus Frosch <markus@lazyfrosch.de>
* Markus Korn <thekorn@gmx.de>
* Matt Rose <mattrose@folkwolf.net>
* milotype <43657314+milotype@users.noreply.github.com>
* Matthew Rose <mattrose@folkwolf.net>
* Mihai Babiac <mihai.babiac@gmail.com>
* MuhammadJivani <masad@peekaboo.guru>
* Nathan Handler <nhandler@ubuntu.com>
* Nathaniel M. Beaver <nathanielmbeaver@gmail.com>
* Nathaniel Morck Beaver <nathanielmbeaver@gmail.com>
* Neal Fultz <nfultz@neal-1015pe>
* Nicolas Valcárcel <nvalcarcel@ubuntu.com>
* Pavel Khlebovich <pas.anddev@gmail.com>
* Paweł Kotiuk <45544416+pktiuk@users.noreply.github.com>
* Paweł Kotiuk <kotiuk@zohomail.eu>
* Peter B. Jørgensen <peterbjorgensen@gmail.com>
* Peter Bjørn Jørgensen <peterbjorgensen@gmail.com>
* Peter Lind <peter.e.lind@gmail.com>
* Phi <phi@kernel-tools.com>
* planet36 <planet36@users.noreply.github.com>
* Przemek Wesolek <jest@luna>
* Roberto Aguilar <roberto.c.aguilar@gmail.com>
* robertoetcheverryr <yggdrasil.raiker@gmail.com>
* R the Troublemaker <5971066+br0kenbuild@users.noreply.github.com>
* Rafael Kitover <rkitover@gmail.com>
* Roberto Aguilar <roberto.c.aguilar@gmail.com>
* Ryan Fonnesbeck <fonz@fonzinc.com>
* shiraeeshi <shiraeeshi@mail.ru>
* Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
* Simeon Simeonov <sgs@pichove.org>
* Stephen Boddy <stephen.j.boddy@gmail.com>
* thebigs <TheBigS@users.noreply.github.com>
* StephenPeringer <StephenPeringer@users.noreply.github.com>
* Thomas Hurst <tom@hur.st>
* Thomas Meire <blackskad@gmail.com>
* Tobias Farrenkopf <tf@emptyset.de>
* Tom Yan <tom.ty89@gmail.com>
* Tomek Sabała <sabala.tomek@gmail.com>
* Tony Baker <frd91gt@gmail.com>
* waldner <waldner@katamail.com>
* Vishweshwar Saran Singh Deo <vssdeo@gmail.com>
* Vojtech Duchon (Ext) <vojtech.duchon@gmail.com>
* Vulcalien <vulcalien+github@gmail.com>
* Vulcalien <vulcalien@gmail.com>
* Yousof <yousofebneddin@yahoo.com>
* Yusuf Güngör <yusuf.gungor@hepsiburada.com>
* amaan khan <khanamaan827@gmail.com>
* caprinux <123jinkai@gmail.com>
* coder <none@non.no>
* dkmvs <67212386+dkmvs@users.noreply.github.com>
* evandrocoan <evandrocoan@hotmail.com>
* flaviosteimacher <39162591+flaviosteimacher@users.noreply.github.com>
* judgedreads <pearce@millerdedmon.com>
* kocho1984 <eblebleo2@gmail.com>
* milotype <43657314+milotype@users.noreply.github.com>
* nicbn <contact@nicbn.com>
* nojhan <nojhan@nojhan.net>
* ozzdemir <oguz.ozdemir@ieee.metu.edu.tr>
* planet36 <planet36@users.noreply.github.com>
* robertoetcheverryr <yggdrasil.raiker@gmail.com>
* sabriunal <libreajans@gmail.com>
* shiraeeshi <shiraeeshi@mail.ru>
* thebigs <TheBigS@users.noreply.github.com>
* transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
* waldner <waldner@katamail.com>
* xuezhixin <xuezhixin@uniontech.com>

## Other contributors

Expand All @@ -112,5 +142,7 @@ People that contributed to Terminator in other ways.
* Maxim Derkach
* Mats Henrikson
* Nizar Kerkeni
* "Data"
* Cristian Grada
* "zhuqin"
* and many others.
10 changes: 5 additions & 5 deletions CHANGELOG.legacy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,14 @@ terminator 1.90:
* Preselect the current layout when opening Prefs window, and also
save config after using the layout 'Save' button (Steve Boddy)
* Set some default shortcuts based on my preference (Steve Boddy)
* Add high contast icons, make the main window icon loading work
* Add high contrast icons, make the main window icon loading work
better, and respect the theme changes (Steve Boddy, LP#305579)
* Additional windows icon loading works better, and respect the
theme changes (LP#305579)
* Adjust the config section name to InactivityWatch for
InactivityWatch class
* Add a new setting for ActivityWatch to set the time between
activty notifications
activity notifications
* BIG update to translations, due to additions and changes.
* Make the random default group names translatable
* Add and improve the mnemonics in the group menu
Expand All @@ -170,7 +170,7 @@ terminator 1.90:
* A few changes to doc strings to make the autodoc prettier
* Added help shortcut, by default F1 to open the local manual
* Added button to About tab (in Prefs window) to launch manual
* Small tweak to setup.py to seperate build and install, and
* Small tweak to setup.py to separate build and install, and
always attempt to install manual by default.
* Sort entries in config file, so they don't jump around every
time config is saved for easier troubleshooting
Expand Down Expand Up @@ -258,7 +258,7 @@ terminator 1.90:
terminator class
* Fix the scroll up/down key bindings to use gtk3 method
* Fix getting the handle size (gtk2->gtk3 diff)
* Fix scrollbar doubleclick rebalancing (LP#1423686)
* Fix scrollbar double-click rebalancing (LP#1423686)
* Fix allocations (no longer an attribute) when balancing
(gtk2->gtk3 diff)
* Fix allocations not having the x,y position just w,h (gtk3 bug?
Expand Down Expand Up @@ -351,7 +351,7 @@ terminator 1.90:
(Egmont Koblinger, LP#1518108)
* Fix copy on selection to work on already open terminals (Egmont
Koblinger, LP#1518109)
* Fix unwanted seperator size change, and increase granularity of
* Fix unwanted separator size change, and increase granularity of
dim/transparent sliders (Egmont Koblinger, LP#1518114)
* Fix cwd when new term spawned from a symlinked directory (Egmont
Koblinger, LP#1518554)
Expand Down
Loading

0 comments on commit df08d7c

Please sign in to comment.