ferdium-app - Mirror of https://github.com/ferdium/ferdium-app

	Commit message (Expand)	Author	Age
*	Reset setting status when navigating away from services screen	Danny Qiu	2017-10-29
*	Merge branch 'develop' into master	Stefan Malzner	2017-10-29
\|\
\| *	Merge branch 'develop' into italian-translation	Stefan Malzner	2017-10-29
\| \|\
\| * \|	fix(lint): Fix missing trailing comma	dnlup	2017-10-28
\| * \|	feat(locales): Add italian translation	dnlup	2017-10-28
* \| \|	Add missing trailing comma	Raino	2017-10-27
* \| \|	Fix merge conflict and add missing translation	Raino	2017-10-27
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'develop' into master	Stefan Malzner	2017-10-27
\| \|\ \
\| \| * \	Merge branch 'develop' into orderingJumpFix	Stefan Malzner	2017-10-27
\| \| \|\ \
\| \| \| * \	Merge branch 'develop' into patch-1	Stefan Malzner	2017-10-27
\| \| \| \|\ \
\| \| \| \| * \	Merge branch 'develop' into fix_tray	Stefan Malzner	2017-10-27
\| \| \| \| \|\ \
\| \| \| \| * \ \	Merge branch 'develop' into fix_tray	Stefan Malzner	2017-10-27
\| \| \| \| \|\ \ \
\| \| \| \| * \| \| \|	Removed mainWindow parameter from Tray class	Atakan Goktepe	2017-10-27
\| \| \| \| * \| \| \|	Fixed 'Show Franz' button in tray	Atakan Goktepe	2017-10-26
\| \| \| * \| \| \| \|	Merge branch 'develop' into patch-1	Stefan Malzner	2017-10-27
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \|_\|/ / \| \| \| \| \|/\| \| \|
\| \| \| \| * \| \| \|	Merge branch 'develop' into develop	Stefan Malzner	2017-10-27
\| \| \| \| \|\ \ \ \
\| \| \| \| \| * \ \ \	Merge branch 'develop' into pr-translate-Japanese	Stefan Malzner	2017-10-27
\| \| \| \| \| \|\ \ \ \
\| \| \| \| \| \| * \ \ \	Merge branch 'develop' into develop	Stefan Malzner	2017-10-27
\| \| \| \| \| \| \|\ \ \ \
\| \| \| \| \| \| \| * \ \ \	Merge branch 'develop' into translation/zh-Hant	Stefan Malzner	2017-10-27
\| \| \| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \|/ / \| \| \| \| \| \| \| \| \|/\| \|
\| \| \| \| \| \| \| \| * \| \|	Merge branch 'develop' into master	Stefan Malzner	2017-10-26
\| \| \| \| \| \| \| \| \|\ \ \
\| \| \| \| \| \| \| \| * \| \| \|	Changed sentence to more commonly used expression	Robin Haveneers	2017-10-25
\| \| \| \| \| \| \| \| * \| \| \|	Fixed spelling mistake and swapped word	Robin Haveneers	2017-10-25
\| \| \| \| \| \| \| \| \| \|/ / \| \| \| \| \| \| \| \| \|/\| \|
\| \| \| \| \| \| \| * \| \| \|	Merge branch 'develop' into translation/zh-Hant	James Lin	2017-10-27
\| \| \| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \|/ / \| \| \| \| \| \| \| \| \|/\| \|
\| \| \| \| \| \| \| * \| \| \|	[add] translation (zh-Hant)	ywjameslin	2017-10-26
\| \| \| \| \| \| \| \| \|/ / \| \| \| \| \| \| \| \|/\| \|
\| \| \| \| \| \| * \| \| \|	Merge branch 'develop' into develop	Stefan Malzner	2017-10-26
\| \| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \|/ / \| \| \| \| \| \| \| \|/\| \|
\| \| \| \| \| \| * \| \| \|	[translation] Spanish	Guillerman	2017-10-25
\| \| \| \| \| \| \| \|/ / \| \| \| \| \| \| \|/\| \|
\| \| \| \| \| * \| \| \|	Merge branch 'develop' into pr-translate-Japanese	Stefan Malzner	2017-10-26
\| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \|/ / \| \| \| \| \| \| \|/\| \|
\| \| \| \| \| * \| \| \|	Fix translation	koma	2017-10-25
\| \| \| \| \| \| \|/ / \| \| \| \| \| \|/\| \|
\| \| \| \| * \| \| \|	Update TabBarSortableList.js	Peter Migotto	2017-10-26
\| \| \| \| * \| \| \|	Update en-US.json	Peter Migotto	2017-10-26
\| \| \| \| * \| \| \|	Added "sidebar.addservice"	Peter Migotto	2017-10-26
\| \| \| \| * \| \| \|	Fixes hover on "Add new service" not showing translation	Peter Migotto	2017-10-26
\| \| \| \| * \| \| \|	Added "enableSystemTray" line and minor fixes	Peter Migotto	2017-10-25
\| \| \| \| \|/ / /
\| \| \| * \| \| \|	[translation] Update Dutch (nl-NL)	Jens	2017-10-27
\| \| \| * \| \| \|	Update translations	Jens	2017-10-26
\| \| \| \|/ / /
\| \| * \| \| \|	Merge branch 'develop' into orderingJumpFix	Stefan Malzner	2017-10-26
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| * \| \| \|	Bugfix: When reordering make sure the new indexes are applied correctly	Gustavo Sampaio	2017-10-26
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Removes unused intl in tabbar; Adds nl translation for addNewService	Darko Bozhinovski	2017-10-27
\| * \| \| \|	Merge branch 'master' of github.com:meetfranz/franz	Darko Bozhinovski	2017-10-27
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Adds intl support for addNewService (sans translations)	Darko Bozhinovski	2017-10-27
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	Fixes #111 on mainline	Darko Bozhinovski	2017-10-26
\| \| \|/ \| \|/\|
* \| \|	[translation] Add norwegian translations	Raino	2017-10-27
\| \|/ \|/\|
* \|	Rename "Taskleiste" to "Systemleiste", Fix #138	Tim Fechner	2017-10-27
\|/
*	Don't apply app.makeSingleInstance on macOS	Stefan Malzner	2017-10-24
*	Merge branch 'develop' of github.com:meetfranz/franz into develop	Stefan Malzner	2017-10-24
\|\
\| *	Merge branch 'develop' into master	Stefan Malzner	2017-10-24
\| \|\
\| * \|	updates to nl-BE locale based on Woordenlijst and Van Dale	cpeetersburg	2017-10-24
* \| \|	Merge branch 'develop' of github.com:meetfranz/franz into develop	Stefan Malzner	2017-10-24
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'develop' into feature/zoomin-alias	Stefan Malzner	2017-10-24
\| \|\ \
\| * \| \|	fix(Shortcut): Add ctrl+= alias for zoom in	Stefan	2017-10-24