Skip to content

Commit df08d7c

Browse files
author
Vulcalien
authored
Merge branch 'gnome-terminator:master' into background-images
2 parents 99249bb + 6d225c7 commit df08d7c

43 files changed

Lines changed: 5075 additions & 1817 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- '3.9'
2121

2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v4
2424

2525
- name: Set up Python ${{ matrix.python }}
2626
uses: actions/setup-python@v1

AUTHORS

Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ This list is generated from the GIT log.
55
* Aaron Faanes <dafrito@gmail.com>
66
* Adrian A <a.adrian.tech@googlemail.com>
77
* Alexey Sokolov <sokolov@google.com>
8-
* Andrea Corbellini <corbellini.andrea@gmail.com>
98
* Andre Hilsendeger <Andre.Hilsendeger@gmail.com>
9+
* Andrea Corbellini <corbellini.andrea@gmail.com>
1010
* Andrew Felske <knopper67@archlinux.us>
1111
* Antonio Terceiro <asa@terceiro.xyz>
1212
* Antonio Terceiro <terceiro@debian.org>
@@ -25,15 +25,14 @@ This list is generated from the GIT log.
2525
* David Caro Estévez <david.caro.estevez@gmail.com>
2626
* David Levanon <dvdlevanon@gmail.com>
2727
* David Sowder <github.com@david.sowder.com>
28-
* dkmvs <67212386+dkmvs@users.noreply.github.com>
28+
* Dennis Benzinger | SAP Hybris <dennis.benzinger@sap.com>
2929
* Dmitry Soldatov <grapescan@gmail.com>
3030
* Douglas Bacon <douglaswbacon@gmail.com>
3131
* Edoardo Batini <eodbat@gmail.com>
3232
* Elliot Murphy <elliot@elliotmurphy.com>
3333
* Emilien Klein <emilien@klein.st>
3434
* Emilio Pozuelo Monfort <pochu@debian.org>
3535
* Emmanuel Bretelle <chantra@debuntu.org>
36-
* evandrocoan <evandrocoan@hotmail.com>
3736
* Felix Mölder <56774350+Brambleberry4@users.noreply.github.com>
3837
* Fernando Basso <fernandobasso.br@gmail.com>
3938
* Filip Kilibarda <filipcsc@gmail.com>
@@ -46,51 +45,82 @@ This list is generated from the GIT log.
4645
* Ivar Smolin <okul@ivotingcentre.ee>
4746
* Jakub Vaněk <vanek.jakub4@seznam.cz>
4847
* Jamu Kakar <jkakar@kakar.ca>
48+
* Jay W <git.jaydoubleu@gmail.com>
4949
* Jean-Sebastien Trottier <strottie@cisco.com>
5050
* Joe Peled <joe.peled@vimeo.com>
5151
* Jonas L <jooola@users.noreply.github.com>
52-
* José Augusto <joseaugusto.881@outlook.com>
5352
* Jose Augusto <jose.augusto@chiligum.com.br>
5453
* Jose I. Monreal <jmonreal@gmail.com>
55-
* judgedreads <pearce@millerdedmon.com>
54+
* José Augusto <joseaugusto.881@outlook.com>
5655
* Juliano Fischer Naves <julianofischer@gmail.com>
5756
* Julien Nicoulaud <julien.nicoulaud@gmail.com>
5857
* Julien Thewys <jth@openerp.com>
58+
* Kacper Kowalski <kacper.s.kowalski@gmail.com>
5959
* Kees Cook <kees@outflux.net>
60+
* Kian-Meng Ang <kianmeng@cpan.org>
6061
* Leandro Thimóteo <leandro.s.thimoteo@gmail.com>
6162
* Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
6263
* Mackenzie Morgan <maco.m@ubuntu.com>
64+
* Mark Timarev <marktimarev@gmail.com>
6365
* Markus Frosch <markus@lazyfrosch.de>
6466
* Markus Korn <thekorn@gmx.de>
6567
* Matt Rose <mattrose@folkwolf.net>
66-
* milotype <43657314+milotype@users.noreply.github.com>
68+
* Matthew Rose <mattrose@folkwolf.net>
69+
* Mihai Babiac <mihai.babiac@gmail.com>
70+
* MuhammadJivani <masad@peekaboo.guru>
6771
* Nathan Handler <nhandler@ubuntu.com>
6872
* Nathaniel M. Beaver <nathanielmbeaver@gmail.com>
6973
* Nathaniel Morck Beaver <nathanielmbeaver@gmail.com>
7074
* Neal Fultz <nfultz@neal-1015pe>
7175
* Nicolas Valcárcel <nvalcarcel@ubuntu.com>
7276
* Pavel Khlebovich <pas.anddev@gmail.com>
77+
* Paweł Kotiuk <45544416+pktiuk@users.noreply.github.com>
78+
* Paweł Kotiuk <kotiuk@zohomail.eu>
7379
* Peter B. Jørgensen <peterbjorgensen@gmail.com>
7480
* Peter Bjørn Jørgensen <peterbjorgensen@gmail.com>
7581
* Peter Lind <peter.e.lind@gmail.com>
7682
* Phi <phi@kernel-tools.com>
77-
* planet36 <planet36@users.noreply.github.com>
7883
* Przemek Wesolek <jest@luna>
79-
* Roberto Aguilar <roberto.c.aguilar@gmail.com>
80-
* robertoetcheverryr <yggdrasil.raiker@gmail.com>
8184
* R the Troublemaker <5971066+br0kenbuild@users.noreply.github.com>
85+
* Rafael Kitover <rkitover@gmail.com>
86+
* Roberto Aguilar <roberto.c.aguilar@gmail.com>
8287
* Ryan Fonnesbeck <fonz@fonzinc.com>
83-
* shiraeeshi <shiraeeshi@mail.ru>
8488
* Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
8589
* Simeon Simeonov <sgs@pichove.org>
8690
* Stephen Boddy <stephen.j.boddy@gmail.com>
87-
* thebigs <TheBigS@users.noreply.github.com>
91+
* StephenPeringer <StephenPeringer@users.noreply.github.com>
8892
* Thomas Hurst <tom@hur.st>
8993
* Thomas Meire <blackskad@gmail.com>
94+
* Tobias Farrenkopf <tf@emptyset.de>
95+
* Tom Yan <tom.ty89@gmail.com>
9096
* Tomek Sabała <sabala.tomek@gmail.com>
9197
* Tony Baker <frd91gt@gmail.com>
92-
* waldner <waldner@katamail.com>
98+
* Vishweshwar Saran Singh Deo <vssdeo@gmail.com>
99+
* Vojtech Duchon (Ext) <vojtech.duchon@gmail.com>
100+
* Vulcalien <vulcalien+github@gmail.com>
101+
* Vulcalien <vulcalien@gmail.com>
93102
* Yousof <yousofebneddin@yahoo.com>
103+
* Yusuf Güngör <yusuf.gungor@hepsiburada.com>
104+
* amaan khan <khanamaan827@gmail.com>
105+
* caprinux <123jinkai@gmail.com>
106+
* coder <none@non.no>
107+
* dkmvs <67212386+dkmvs@users.noreply.github.com>
108+
* evandrocoan <evandrocoan@hotmail.com>
109+
* flaviosteimacher <39162591+flaviosteimacher@users.noreply.github.com>
110+
* judgedreads <pearce@millerdedmon.com>
111+
* kocho1984 <eblebleo2@gmail.com>
112+
* milotype <43657314+milotype@users.noreply.github.com>
113+
* nicbn <contact@nicbn.com>
114+
* nojhan <nojhan@nojhan.net>
115+
* ozzdemir <oguz.ozdemir@ieee.metu.edu.tr>
116+
* planet36 <planet36@users.noreply.github.com>
117+
* robertoetcheverryr <yggdrasil.raiker@gmail.com>
118+
* sabriunal <libreajans@gmail.com>
119+
* shiraeeshi <shiraeeshi@mail.ru>
120+
* thebigs <TheBigS@users.noreply.github.com>
121+
* transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
122+
* waldner <waldner@katamail.com>
123+
* xuezhixin <xuezhixin@uniontech.com>
94124

95125
## Other contributors
96126

@@ -112,5 +142,7 @@ People that contributed to Terminator in other ways.
112142
* Maxim Derkach
113143
* Mats Henrikson
114144
* Nizar Kerkeni
145+
* "Data"
115146
* Cristian Grada
147+
* "zhuqin"
116148
* and many others.

CHANGELOG.legacy.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ terminator 1.90:
151151
* Preselect the current layout when opening Prefs window, and also
152152
save config after using the layout 'Save' button (Steve Boddy)
153153
* Set some default shortcuts based on my preference (Steve Boddy)
154-
* Add high contast icons, make the main window icon loading work
154+
* Add high contrast icons, make the main window icon loading work
155155
better, and respect the theme changes (Steve Boddy, LP#305579)
156156
* Additional windows icon loading works better, and respect the
157157
theme changes (LP#305579)
158158
* Adjust the config section name to InactivityWatch for
159159
InactivityWatch class
160160
* Add a new setting for ActivityWatch to set the time between
161-
activty notifications
161+
activity notifications
162162
* BIG update to translations, due to additions and changes.
163163
* Make the random default group names translatable
164164
* Add and improve the mnemonics in the group menu
@@ -170,7 +170,7 @@ terminator 1.90:
170170
* A few changes to doc strings to make the autodoc prettier
171171
* Added help shortcut, by default F1 to open the local manual
172172
* Added button to About tab (in Prefs window) to launch manual
173-
* Small tweak to setup.py to seperate build and install, and
173+
* Small tweak to setup.py to separate build and install, and
174174
always attempt to install manual by default.
175175
* Sort entries in config file, so they don't jump around every
176176
time config is saved for easier troubleshooting
@@ -258,7 +258,7 @@ terminator 1.90:
258258
terminator class
259259
* Fix the scroll up/down key bindings to use gtk3 method
260260
* Fix getting the handle size (gtk2->gtk3 diff)
261-
* Fix scrollbar doubleclick rebalancing (LP#1423686)
261+
* Fix scrollbar double-click rebalancing (LP#1423686)
262262
* Fix allocations (no longer an attribute) when balancing
263263
(gtk2->gtk3 diff)
264264
* Fix allocations not having the x,y position just w,h (gtk3 bug?
@@ -351,7 +351,7 @@ terminator 1.90:
351351
(Egmont Koblinger, LP#1518108)
352352
* Fix copy on selection to work on already open terminals (Egmont
353353
Koblinger, LP#1518109)
354-
* Fix unwanted seperator size change, and increase granularity of
354+
* Fix unwanted separator size change, and increase granularity of
355355
dim/transparent sliders (Egmont Koblinger, LP#1518114)
356356
* Fix cwd when new term spawned from a symlinked directory (Egmont
357357
Koblinger, LP#1518554)

0 commit comments

Comments
 (0)