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

	Commit message (Collapse)	Author	Age
*	Merge branch 'feature/titlebar' into feature/i18n-universal	haraldox	2018-03-02
\|\
\| *	Merge branch 'feature/titlebar' of github.com:meetfranz/franz into ↵	Stefan Malzner	2018-02-23
\| \|\ \| \| \| \| \| \| \| \| \|	feature/titlebar
\| \| *	[MINOR] switch to win32 testing on all platforms	haraldox	2018-02-23
\| \| \|
\| \| *	complete titlebar for Windows & Linux	haraldox	2018-02-23
\| \| \|
\| \| *	Merge branch 'fix/copy-paste' into feature/titlebar	haraldox	2018-02-22
\| \| \|\
\| \| * \|	override platform in code and simulate different environment	haraldox	2018-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[MINOR] REFACTOR rename `FRANZ_PLATFORM` to `OS_PLATFORM` [MINOR] FIX propTypes for `electron-react-titlebar`
\| * \| \|	fix .css import	Stefan Malzner	2018-02-23
\| \|/ /
\| * \|	remove electron frame for Windows testing on macOS	haraldox	2018-02-21
\| \| \|
\| * \|	[MINOR] rename `template` to `currentTemplate`	haraldox	2018-02-21
\| \| \|
\| * \|	fix observable template	haraldox	2018-02-21
\| \| \|
\| * \|	fix CSS conflicts	haraldox	2018-02-20
\| \| \| \| \| \| \| \| \| \| \| \|	override `reset.scss` with `title-bar.scss`
\| * \|	choose platform with environment variable `FRANZ_PLATFORM`	haraldox	2018-02-20
\| \| \|
\| * \|	[WIP] incorporate electron-react-titlebar	haraldox	2018-02-20
\| \| \|
* \| \|	internationalize validation messages	haraldox	2018-03-02
\| \| \|
* \| \|	fix linting errors	haraldox	2018-03-01
\| \| \|
* \| \|	ADD Franz-wide internationalization	haraldox	2018-03-01
\| \| \|
* \| \|	Update changelog	Stefan Malzner	2018-02-23
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Bump to beta 16	Stefan Malzner	2018-02-23
\| \| \|
* \| \|	Merge pull request #724 from meetfranz/fix/copy-paste	Stefan Malzner	2018-02-23
\|\ \ \ \| \| \|/ \| \|/\|	fix copy & paste
\| * \|	fix accelerator for Windows	haraldox	2018-02-22
\| \| \|
* \| \|	Merge pull request #725 from meetfranz/i18n	Stefan Malzner	2018-02-23
\|\ \ \ \| \| \| \| \| \| \| \|	Automatic i18n update (i18n.meetfranz.com)
\| * \| \|	Automatic i18n update (i18n.meetfranz.com)	FranzBot	2018-02-23
\| \| \| \|
* \| \| \|	Merge pull request #721 from meetfranz/i18n	Stefan Malzner	2018-02-22
\|\\| \| \| \| \|_\|/ \|/\| \|	I18n
\| * \|	Automatic i18n update (i18n.meetfranz.com)	FranzBot	2018-02-22
\| \| \|
\| * \|	Automatic i18n update (i18n.meetfranz.com)	FranzBot	2018-02-19
\| \| \|
\| * \|	Merge branch 'i18n' of github.com:meetfranz/franz into i18n	Stefan Malzner	2018-02-19
\| \|\ \
\| \| * \|	Automatic i18n update (i18n.meetfranz.com)	FranzBot	2018-02-19
\| \| \| \|
\| * \| \|	Merge branch 'develop' into i18n	Stefan Malzner	2018-02-19
\| \|\ \ \ \| \|/ / / \|/\| / / \| \|/ /
* \| \|	fix(Linux): Fix window restore on notification click (@closingin)	Stefan Malzner	2018-02-19
\|\ \ \ \| \| \| \| \| \| \| \|	Correctly restore window when clicking on a notification
\| * \| \|	Restore windows behavior for notifications and add linux support	Rémi Weislinger	2018-02-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue #645
\| * \| \|	Fix bug with notifications click changing window's state	Rémi Weislinger	2018-02-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue #645
* \| \| \|	readd @2x icons	Stefan Malzner	2018-02-19
\| \| \| \|
* \| \| \|	Merge pull request #700 from meetfranz/feature/linux-icons	Stefan Malzner	2018-02-19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Invert Linux tray icon color
\| * \| \| \|	replace icons with high-res icons	Stefan Malzner	2018-02-19
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' into feature/linux-icons	Stefan Malzner	2018-02-19
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	fix(App): Fix issues with disabling launch app on startup	Stefan Malzner	2018-02-16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Refactor settingsStore to use mobx-localstorage
\| * \| \| \| \|	fix sideeffect of app not launching itself after first launch	Stefan Malzner	2018-02-16
\| \| \| \| \| \|
\| * \| \| \| \|	further request cleanup	Stefan Malzner	2018-02-15
\| \| \| \| \| \|
\| * \| \| \| \|	fix linting issues	Stefan Malzner	2018-02-15
\| \| \| \| \| \|
\| * \| \| \| \|	remove debug logs	Stefan Malzner	2018-02-15
\| \| \| \| \| \|
\| * \| \| \| \|	remove unnecessary observable	Stefan Malzner	2018-02-15
\| \| \| \| \| \|
\| * \| \| \| \|	Replace localAPI requests with mobx-localstorage	Stefan Malzner	2018-02-15
\| \| \| \| \| \|
\| * \| \| \| \|	replace localStorage with mobx-localstorage	Stefan Malzner	2018-02-15
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'fix/copy-paste' into develop	haraldox	2018-02-16
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	trying to get to the bottom of this	haraldox	2018-02-16
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix/sleep' into develop	haraldox	2018-02-16
\|\ \ \ \ \
\| * \| \| \| \|	reload Franz instead of all services on sleep resume	haraldox	2018-02-16
\| \|/ / / /
* \| \| \| \|	inverted welcome button "Create a free account"	haraldox	2018-02-16
\| \| \| \| \|
* \| \| \| \|	fix teamId & customUrl validation for hosted option	haraldox	2018-02-16
\| \| \| \| \|
* \| \| \| \|	fix validation for side-by-side teamId & customURL	haraldox	2018-02-16
\|/ / / /