aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'develop' into masterLibravatar Stefan Malzner2017-10-27
|\
| * Merge branch 'develop' into orderingJumpFixLibravatar Stefan Malzner2017-10-27
| |\
| | * Merge branch 'develop' into patch-1Libravatar 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 branch 'develop' into developLibravatar Stefan Malzner2017-10-27
| | | |\ \ \
| | | | * \ \ Merge branch 'develop' into pr-translate-JapaneseLibravatar Stefan Malzner2017-10-27
| | | | |\ \ \
| | | | | * \ \ Merge branch 'develop' into developLibravatar Stefan Malzner2017-10-27
| | | | | |\ \ \
| | | | | | * \ \ Merge branch 'develop' into translation/zh-HantLibravatar 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
| |\ \ \ | | | |/ | | |/|
| * | | 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
|\ \ \
| * | | 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
|/
* 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
|\
| * Merge branch 'develop' into masterLibravatar Stefan Malzner2017-10-24
| |\
| * | updates to nl-BE locale based on Woordenlijst and Van DaleLibravatar cpeetersburg2017-10-24
* | | Merge branch 'develop' of github.com:meetfranz/franz into developLibravatar Stefan Malzner2017-10-24
|\ \ \ | | |/ | |/|
| * | Merge branch 'develop' into feature/zoomin-aliasLibravatar Stefan Malzner2017-10-24
| |\ \
| * | | fix(Shortcut): Add ctrl+= alias for zoom inLibravatar Stefan2017-10-24
* | | | add nl-BELibravatar Stefan Malzner2017-10-24
|\ \ \ \ | | |_|/ | |/| |
| * | | Couply minor typosLibravatar Steve Guns2017-10-22
| * | | Removed nl-NL since someone already translated that and updated languages listLibravatar Steve Guns2017-10-22
| * | | nl-BE and nl-NL translations addedLibravatar Steve Guns2017-10-22
* | | | fix indentationLibravatar Stefan Malzner2017-10-24
| |_|/ |/| |
* | | fix(Windows): Fix multiple system tray icons when opening/closing FranzLibravatar Stefan2017-10-24
| |/ |/|
* | Add API notice to users who run the app in dev modeLibravatar Stefan Malzner2017-10-24
* | Add `warning` styles to infoboxLibravatar Stefan Malzner2017-10-24