aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Merge branch 'develop' into masterLibravatar Stefan Malzner2017-10-27
|\
| * Merge pull request #137 from GustavoKatel/orderingJumpFixLibravatar Stefan Malzner2017-10-27
| |\
| | * Merge branch 'develop' into orderingJumpFixLibravatar Stefan Malzner2017-10-27
| | |\ | | |/ | |/|
| * | Merge pull request #139 from Jensderond/patch-1Libravatar Stefan Malzner2017-10-27
| |\ \
| | * \ Merge branch 'develop' into patch-1Libravatar Stefan Malzner2017-10-27
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #134 from atakangktepe/fix_trayLibravatar Stefan Malzner2017-10-27
| |\ \ \
| | * \ \ Merge branch 'develop' into fix_trayLibravatar Stefan Malzner2017-10-27
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'develop' into fix_trayLibravatar Stefan Malzner2017-10-27
| | |\ \ \
| | * | | | Removed mainWindow parameter from Tray classLibravatar Atakan Goktepe2017-10-27
| | * | | | Fixed 'Show Franz' button in trayLibravatar Atakan Goktepe2017-10-26
| | | | * | Merge branch 'develop' into patch-1Libravatar Stefan Malzner2017-10-27
| | | | |\ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #123 from phmigotto/developLibravatar Stefan Malzner2017-10-27
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' into developLibravatar Stefan Malzner2017-10-27
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #119 from koma-private/pr-translate-JapaneseLibravatar Stefan Malzner2017-10-27
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into pr-translate-JapaneseLibravatar Stefan Malzner2017-10-27
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #114 from Guillerman/developLibravatar Stefan Malzner2017-10-27
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' into developLibravatar Stefan Malzner2017-10-27
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'develop' into developLibravatar Stefan Malzner2017-10-27
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #132 from YWJamesLin/translation/zh-HantLibravatar Stefan Malzner2017-10-27
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Merge branch 'develop' into translation/zh-HantLibravatar Stefan Malzner2017-10-27
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #112 from haveneersrobin/masterLibravatar Stefan Malzner2017-10-27
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' into masterLibravatar Stefan Malzner2017-10-26
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Changed sentence to more commonly used expressionLibravatar Robin Haveneers2017-10-25
| | * | | | | | | | Fixed spelling mistake and swapped wordLibravatar Robin Haveneers2017-10-25
| | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Merge branch 'develop' into translation/zh-HantLibravatar James Lin2017-10-27
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | | * | | | | | [add] translation (zh-Hant)Libravatar ywjameslin2017-10-26
| | | | * | | | | Merge branch 'develop' into developLibravatar Stefan Malzner2017-10-26
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | | | * | | | | [translation] SpanishLibravatar Guillerman2017-10-25
| | | |/ / / / /
| | | | * | | | Merge branch 'develop' into pr-translate-JapaneseLibravatar Stefan Malzner2017-10-26
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | | | * | | | Fix translationLibravatar koma2017-10-25
| | | |/ / / / | | |/| | | |
| | | | * | | Update TabBarSortableList.jsLibravatar Peter Migotto2017-10-26
| | | | * | | Update en-US.jsonLibravatar Peter Migotto2017-10-26
| | | | * | | Added "sidebar.addservice"Libravatar Peter Migotto2017-10-26
| | | | * | | Fixes hover on "Add new service" not showing translationLibravatar Peter Migotto2017-10-26
| | | | * | | Added "enableSystemTray" line and minor fixesLibravatar Peter Migotto2017-10-25
| | | |/ / /
| | | | * | [translation] Update Dutch (nl-NL)Libravatar Jens2017-10-27
| | | | * | Update translationsLibravatar Jens2017-10-26
| | | |/ / | | |/| |
| | | | * Merge branch 'develop' into orderingJumpFixLibravatar Stefan Malzner2017-10-26
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge pull request #128 from DBozhinovski/masterLibravatar Stefan Malzner2017-10-26
| |\ \ \ \ | | |_|/ / | |/| | |
| | | | * Bugfix: When reordering make sure the new indexes are applied correctlyLibravatar Gustavo Sampaio2017-10-26
| | |_|/ | |/| |
* | | | Removes unused intl in tabbar; Adds nl translation for addNewServiceLibravatar Darko Bozhinovski2017-10-27
* | | | Merge branch 'master' of github.com:meetfranz/franzLibravatar Darko Bozhinovski2017-10-27
|\ \ \ \
| * \ \ \ Merge pull request #142 from fechnert/fix_german_translationLibravatar Stefan Malzner2017-10-27
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Rename "Taskleiste" to "Systemleiste", Fix #138Libravatar Tim Fechner2017-10-27
| |/ / /
* | | / Adds intl support for addNewService (sans translations)Libravatar Darko Bozhinovski2017-10-27
| |_|/ |/| |
* | | Fixes #111 on mainlineLibravatar Darko Bozhinovski2017-10-26
|/ /
* | Merge pull request #108 from meetfranz/developLibravatar Stefan Malzner2017-10-25
|\|
| * Bump version to 5.0.0-beta.11v5.0.0-beta.11Libravatar Stefan Malzner2017-10-25
| * Don't apply app.makeSingleInstance on macOSLibravatar Stefan Malzner2017-10-24
| * Merge branch 'develop' of github.com:meetfranz/franz into developLibravatar Stefan Malzner2017-10-24
| |\