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

	Commit message (Expand)	Author	Age
*	Merge pull request #654 from meetfranz/feature/invite-button	Stefan Malzner	2018-02-12
\|\
\| *	feat(App) Feature Invite Friends in Settings	haraldox	2018-02-08
\| *	REMOVE presentational stuff from smart container	haraldox	2018-02-08
\| *	[MINOR] ADD blank line	haraldox	2018-02-06
\| *	[MINOR] house cleaning	haraldox	2018-02-06
\| *	Merge branch 'develop' into feature/invite-button	haraldox	2018-02-06
\| \|\
\| * \|	[MINOR] REMOVE unnecessary var	haraldox	2018-02-06
\| * \|	REMOVE invite button from Account Dashboard	haraldox	2018-02-03
\| * \|	fix defaultProps	haraldox	2018-02-02
\| * \|	fix linting errors	haraldox	2018-02-02
\| * \|	finished embedded invite functionality	haraldox	2018-02-02
\| * \|	got server callback and infobox working	haraldox	2018-02-02
\| * \|	[WIP] started work on infobox	haraldox	2018-01-30
\| * \|	[MINOR] fix indentation	haraldox	2018-01-30
\| * \|	ADDED embedded invite screen in settings	haraldox	2018-01-30
\| * \|	ADDED invite button on settings navigation	haraldox	2018-01-30
\| * \|	Merge branch 'fix-invite-screen' into feature/invite-button	haraldox	2018-01-30
\| * \|	Merge branch 'develop' into feature/invite-button	haraldox	2018-01-30
\| \|\ \
\| * \ \	Merge branch 'fix-invite-screen' into feature/invite-button	haraldox	2018-01-29
\| \|\ \ \
\| * \| \| \|	return to account screen from invite screen	haraldox	2018-01-22
\| * \| \| \|	ADDED invite button in Account Settings	haraldox	2018-01-21
\| * \| \| \|	allow arbitrary routes in dev mode	haraldox	2018-01-19
* \| \| \| \|	Merge pull request #668 from meetfranz/fix/import-screen-toggles	Stefan Malzner	2018-02-08
\|\ \ \ \ \
\| * \| \| \| \|	[MINOR] remove commented code	haraldox	2018-02-08
\| * \| \| \| \|	Merge branch 'develop' into fix/import-screen-toggles	haraldox	2018-02-08
\| \|\ \ \ \ \
\| * \| \| \| \| \|	fix linting errors	haraldox	2018-02-08
\| * \| \| \| \| \|	Merge branch 'develop' into fix/import-screen-toggles	haraldox	2018-02-08
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	fix(App) Bugfix Fix toggle buttons shown during import	haraldox	2018-02-08
\| * \| \| \| \| \| \|	fix linting errors	haraldox	2018-02-06
\| * \| \| \| \| \| \|	Merge branch 'develop' into fix/import-screen-toggles	haraldox	2018-02-06
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	FIX import screen toggles	haraldox	2018-02-06
* \| \| \| \| \| \| \| \|	Merge pull request #631 from meetfranz/move-subscription-folders	Stefan Malzner	2018-02-08
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' into move-subscription-folders	Stefan Malzner	2018-02-02
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' into move-subscription-folders	haraldox	2018-01-30
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Revert "Revert "fix property change due to mobx-react-form update""	haraldox	2018-01-30
\| * \| \| \| \| \| \| \|	fix import path	haraldox	2018-01-19
\| * \| \| \| \| \| \| \|	Revert "fix property change due to mobx-react-form update"	haraldox	2018-01-19
\| * \| \| \| \| \| \| \|	change directory structure for subscription	haraldox	2018-01-19
* \| \| \| \| \| \| \| \|	[MINOR] fix linting errors	haraldox	2018-02-08
\| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	fix(App): Bugfix Fix memory leak in recipe polling loop	haraldox	2018-02-07
\| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	fix `isDevMode` import	haraldox	2018-02-06
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	[MINOR] isDevMode check in UserStore	haraldox	2018-02-06
* \| \| \| \| \|	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
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|