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

	Commit message (Expand)	Author	Age
*	Merge branch 'develop' into fix_tray	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
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #128 from DBozhinovski/master	Stefan Malzner	2017-10-26
\| \|\ \
\| \| * \|	Fixes #111 on mainline	Darko Bozhinovski	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
\| \| \|/
* \| \|	Removed mainWindow parameter from Tray class	Atakan Goktepe	2017-10-27
* \| \|	Fixed 'Show Franz' button in tray	Atakan Goktepe	2017-10-26
\| \|/ \|/\|
* \|	Merge pull request #108 from meetfranz/develop	Stefan Malzner	2017-10-25
\|\\|
\| *	Bump version to 5.0.0-beta.11v5.0.0-beta.11	Stefan Malzner	2017-10-25
\| *	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 pull request #103 from cpeetersburg/master	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 pull request #100 from meetfranz/feature/zoomin-alias	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
\| * \| \|	add nl-BE	Stefan Malzner	2017-10-24
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #58 from Blizzke/nl-BE	Stefan Malzner	2017-10-22
\|\ \ \ \
\| * \| \| \|	Couply minor typos	Steve Guns	2017-10-22
\| * \| \| \|	Removed nl-NL since someone already translated that and updated languages list	Steve Guns	2017-10-22
\| * \| \| \|	nl-BE and nl-NL translations added	Steve Guns	2017-10-22
\|/ / / /
\| * / /	fix indentation	Stefan Malzner	2017-10-24
\| \|/ /
\| * \|	Merge pull request #99 from meetfranz/feature/win-multiple-tray-icons	Stefan Malzner	2017-10-24
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	fix(Windows): Fix multiple system tray icons when opening/closing Franz	Stefan	2017-10-24
\| \|/
\| *	Merge pull request #98 from meetfranz/feature/dev-mode-notice	Stefan Malzner	2017-10-24
\| \|\
\| \| *	Add API notice to users who run the app in dev mode	Stefan Malzner	2017-10-24
\| \| *	Add `warning` styles to infobox	Stefan Malzner	2017-10-24
\| \|/
\| *	Merge pull request #94 from meetfranz/feature/recipe-manager	Stefan Malzner	2017-10-24
\| \|\
\| \| *	Merge branch 'develop' into feature/recipe-manager	Stefan Malzner	2017-10-24
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #97 from meetfranz/feature/payment-url	Stefan Malzner	2017-10-24
\| \|\ \
\| \| * \	Merge branch 'develop' into feature/payment-url	Stefan Malzner	2017-10-24
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	fix(Payment): Fix wrong URL encoding with umlauts in parameters	Stefan Malzner	2017-10-24
\| \| \| *	Merge branch 'develop' into feature/recipe-manager	Stefan Malzner	2017-10-24
\| \| \| \|\ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge pull request #93 from ShiiFu/develop	Stefan Malzner	2017-10-24
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Fix French translation	Damien Leroy	2017-10-24
\| \|/ /
\| \| *	Fix recipe update loop	Stefan Malzner	2017-10-24
\| \| *	Improve recipe bulk download	Stefan Malzner	2017-10-24
\| \| *	replace tar.gz dependency (deprecated) with tar	Stefan	2017-10-24
\| \|/
\| *	Merge pull request #80 from apo-mak/develop	Stefan Malzner	2017-10-24
\| \|\
\| \| *	[translation] Greek	apo-mak	2017-10-23
\| \|/
\| *	Merge branch 'develop' of github.com:meetfranz/franz into develop	Stefan Malzner	2017-10-23
\| \|\
\| \| *	Merge pull request #78 from meetfranz/feature/single-instance-window	Stefan Malzner	2017-10-23
\| \| \|\
\| \| \| *	Merge branch 'develop' into feature/single-instance-window	Stefan Malzner	2017-10-23
\| \| \| \|\ \| \| \| \|/ \| \| \|/\|
\| \| \| *	fix(App): Force Franz to use single window	Stefan Malzner	2017-10-23
\| * \| \|	update to electron 1.7.6	Stefan Malzner	2017-10-23
\| * \| \|	Change $ to € in subscription component	Stefan Malzner	2017-10-23