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

	Commit message (Collapse)	Author	Age
*	implemented check for at least one email address	haraldox	2018-01-19
\| \| \| \|	realized by leveraging `disabled` attribute of submit button
*	fix invite screen [object Object] value	haraldox	2018-01-19
\| \| \| \|	mobx-react-form expects nested `fields` property in array
*	Merge pull request #587 from meetfranz/feature/remove-miner	Stefan Malzner	2018-01-17
\|\ \| \| \| \|	[PR] Remove mining feature to get access to premium features
\| *	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
\| \|\ \ \| \| \| \| \| \| \| \|	[PR] translation update
\| \| * \|	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
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/i18n/languages.js
\| \| * \| \|	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
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[PR] Feature/icon upload
\| * \| \| \|	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
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[PR] Improve external link handling
\| * \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Bug fixes
\| * \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Service cache cleanup
\| * \ \ \ \ \ \	Merge branch 'service-cache-cleanup' of https://github.com/dannyqiu/franz ↵	Stefan Malzner	2018-01-04
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into feature/service-cache-cleanup
\| \| * \ \ \ \ \ \	Merge branch 'develop' into service-cache-cleanup	Stefan Malzner	2018-01-03
\| \| \|\ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'develop' into service-cache-cleanup	Stefan Malzner	2018-01-03
\| \| \|\ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #533 from meetfranz/feature/ux-service-search	Stefan Malzner	2018-01-03
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feat(Services): Improve user experience of service search
\| * \| \| \| \| \| \| \| \|	feat(Services): Improve user experience of service search	Stefan Malzner	2018-01-03
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #506 from meetfranz/feature/reactivate-franz	Stefan Malzner	2018-01-02
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix service reload after waking machine up
\| * \| \| \| \| \| \| \| \|	Fix linting issues pt 2	Stefan Malzner	2017-12-26
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix linting issue	Stefan Malzner	2017-12-24
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix(App): Fix service reload after waking machine up	Stefan Malzner	2017-12-24
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #502 from meetfranz/feature/reload-service-root	Stefan Malzner	2018-01-02
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[PR] Reload service root
\| * \| \| \| \| \| \| \| \|	fix(Service): Ctrl/Cmd+R now navigates back to the service root	Stefan Malzner	2017-12-23
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	fix(Service): Fix indirect message badge being displayed when badge is disabled	Stefan Malzner	2018-01-02
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fix indirect message badge being displayed when disabled	Stefan Malzner	2017-12-22
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	setBadge debugging	Stefan Malzner	2017-12-22
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	fix(App): prevent drag event from bubbling (@melodywei861016)	Stefan Malzner	2018-01-02
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	prevent drag event from bubbling