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

	Commit message (Expand)	Author	Age
*	UPDATE electron version	haraldox	2018-02-06
*	Merge pull request #630 from meetfranz/fix-invite-screen	Stefan Malzner	2018-01-30
\|\
\| *	fix linting errors	haraldox	2018-01-30
\| *	Merge branch 'develop' into fix-invite-screen	haraldox	2018-01-30
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #599 from meetfranz/fix-form-validation	Harry	2018-01-30
\|\ \
\| * \	Merge branch 'develop' into fix-form-validation	Stefan Malzner	2018-01-22
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #584 from meetfranz/fix-service-tooltips-initialization	Stefan Malzner	2018-01-22
\|\ \ \
\| * \ \	Merge branch 'develop' into fix-service-tooltips-initialization	Stefan Malzner	2018-01-17
\| \|\ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	fix linting issue	haraldox	2018-01-17
\| * \| \|	Merge branch 'develop' into fix-service-tooltips-initialization	haraldox	2018-01-17
\| * \| \|	Fix #32 service tooltips not initialized properly	haraldox	2018-01-16
\| * \| \|	Merge branch 'feature/remove-miner' into develop	haraldox	2018-01-16
\| \|\ \ \
\| \| \| * \|	fix property change due to mobx-react-form update	haraldox	2018-01-19
\| \|_\|/ / \|/\| \| \|
\| \| \| *	Revert "alternative UX implementation of check for email address count > 0"	haraldox	2018-01-30
\| \| \| *	alternative UX implementation of check for email address count > 0	haraldox	2018-01-19
\| \| \| *	implemented check for at least one email address	haraldox	2018-01-19
\| \| \| *	fix invite screen [object Object] value	haraldox	2018-01-19
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #587 from meetfranz/feature/remove-miner	Stefan Malzner	2018-01-17
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix linting issues	Stefan Malzner	2018-01-17
\| * \|	Merge branch 'develop' into feature/remove-miner	Stefan Malzner	2018-01-17
\| \|\ \ \| \|/ / \|/\| / \| \|/
* \|	Merge branch 'develop' of github.com:meetfranz/franz into develop	Stefan Malzner	2018-01-10
\|\ \
\| * \	Merge pull request #417 from meetfranz/i18n	Stefan Malzner	2018-01-10
\| \|\ \
\| \| * \|	Automatic i18n update (i18n.meetfranz.com)	FranzBot	2018-01-10
\| \| * \|	Automatic i18n update (i18n.meetfranz.com)	FranzBot	2018-01-08
\| \| * \|	Merge branch 'develop' into i18n	Stefan Malzner	2018-01-08
\| \| \|\ \
\| \| * \| \|	Sort languages by name	Stefan Malzner	2017-12-07
\| \| * \| \|	fix(Translations): Use the native language name for translations	Stefan Malzner	2017-12-07
\| \| * \| \|	feat(Translations): Added Chinese (Taiwan), Croatian, Greek, Serbian, Turkish	Stefan Malzner	2017-12-07
\| \| * \| \|	Automatic i18n update (i18n.meetfranz.com)	FranzBot	2017-12-07
\| \| * \| \|	Add dummies for new languages	Stefan Malzner	2017-12-07
\| \| * \| \|	Automatic i18n update (i18n.meetfranz.com)	FranzBot	2017-12-07
* \| \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Stefan Malzner	2018-01-10
\|\ \ \ \ \
\| * \| \| \| \|	Fix link to service request form	Stefan Malzner	2018-01-10
* \| \| \| \| \|	Update changelog	Stefan Malzner	2018-01-10
* \| \| \| \| \|	Bump version to beta 15	Stefan Malzner	2018-01-10
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Fix issue with custom icon on service creation	Stefan Malzner	2018-01-10
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Add color to service icons	Stefan Malzner	2018-01-07
* \| \| \|	Merge pull request #525 from meetfranz/feature/icon-upload	Stefan Malzner	2018-01-06
\|\ \ \ \
\| * \| \| \|	fix displaying old icon while uploading new icon	Stefan Malzner	2018-01-06
\| * \| \| \|	Fix issue when deleting and reuploading an icon	Stefan Malzner	2018-01-05
\| * \| \| \|	feat(Service): Add custom service icon upload	Stefan Malzner	2018-01-02
\| * \| \| \|	First working draft of icon upload	Stefan Malzner	2017-12-27
\| * \| \| \|	Merge branch 'develop' into feature/icon-upload	Stefan Malzner	2017-12-24
\| \|\ \ \ \
\| * \| \| \| \|	[wip] add icon upload	Stefan Malzner	2017-11-12
* \| \| \| \| \|	Merge pull request #541 from meetfranz/feature/external-links	Stefan Malzner	2018-01-05
\|\ \ \ \ \ \
\| * \| \| \| \| \|	feat(Services): Improve handling of external links	Stefan Malzner	2018-01-05
\| * \| \| \| \| \|	Improve annoying livereload reload behaviour for main/webview processes	Stefan Malzner	2018-01-05
* \| \| \| \| \| \|	Merge pull request #518 from dannyqiu/bug-fixes	Stefan Malzner	2018-01-05
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' into bug-fixes	Stefan Malzner	2018-01-04
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #517 from dannyqiu/service-cache-cleanup	Stefan Malzner	2018-01-04
\|\ \ \ \ \ \ \