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

	Commit message (Expand)	Author	Age
*	Merge branch 'develop' into master	Stefan Malzner	2017-10-29
\|\
\| *	Merge pull request #164 from dnlup/italian-translation	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 pull request #152 from meetfranz/chore/travis-setup	Stefan Malzner	2017-10-27
\| \|\ \
\| \| * \	Merge branch 'develop' into chore/travis-setup	Stefan Malzner	2017-10-27
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #141 from DBozhinovski/master	Stefan Malzner	2017-10-27
\| \|\ \ \
\| \| * \ \	Merge branch 'develop' into master	Stefan Malzner	2017-10-27
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Merge branch 'develop' into master	Stefan Malzner	2017-10-27
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge pull request #137 from GustavoKatel/orderingJumpFix	Stefan Malzner	2017-10-27
\| \|\ \ \ \
\| \| * \ \ \	Merge branch 'develop' into orderingJumpFix	Stefan Malzner	2017-10-27
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #139 from Jensderond/patch-1	Stefan Malzner	2017-10-27
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge branch 'develop' into patch-1	Stefan Malzner	2017-10-27
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #134 from atakangktepe/fix_tray	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 pull request #123 from phmigotto/develop	Stefan Malzner	2017-10-27
\| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'develop' into develop	Stefan Malzner	2017-10-27
\| \| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #119 from koma-private/pr-translate-Japanese	Stefan Malzner	2017-10-27
\| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch 'develop' into pr-translate-Japanese	Stefan Malzner	2017-10-27
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #114 from Guillerman/develop	Stefan Malzner	2017-10-27
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'develop' into develop	Stefan Malzner	2017-10-27
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into develop	Stefan Malzner	2017-10-27
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #132 from YWJamesLin/translation/zh-Hant	Stefan Malzner	2017-10-27
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into translation/zh-Hant	Stefan Malzner	2017-10-27
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #112 from haveneersrobin/master	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
\| \| \| \| \|\ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #128 from DBozhinovski/master	Stefan Malzner	2017-10-26
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|