16 Commits (96e3c43570f65e47a6a48d876837cf10238a0e99)

Author	SHA1	Message	Date
David Baker	968e21a67d	Merge branch 'master' into develop	2017-06-06 17:48:32 +01:00
David Baker	951b63898b	v0.10.2	2017-06-06 17:43:57 +01:00
David Baker	3d51156b7e	Temporarily revert	2017-06-06 17:43:34 +01:00
David Baker	d648dc867e	v0.10.2	2017-06-06 17:41:57 +01:00
Matthew Hodgson	7b9ae0157a	Merge pull request #4183 from vector-im/t3chguy/electron_logo_windows_weirdness ... to make the windows volume mixer not explode as it can't resize icons.	2017-06-04 22:58:17 +01:00
Michael Telatynski	1e5a742602	this actually fixes things, still not happy with it, introduces more delay ... (not noticeably more than the existing delay) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-04 14:27:19 +01:00
Matthew Hodgson	a4526097ce	v0.10.1	2017-06-02 22:46:25 +01:00
David Baker	4bbf950b3d	v0.10.0	2017-06-02 14:36:39 +01:00
Matthew Hodgson	774c410eda	v0.10.0-rc.2	2017-06-02 01:20:34 +01:00
Matthew Hodgson	3bab49ba86	v0.10.0-rc.1	2017-06-01 02:48:53 +01:00
Michael Telatynski	5762323bd1	Merge branch 'develop' into t3chguy/electron_profiles	2017-06-01 00:01:53 +01:00
Michael Telatynski	0fb6a305a3	uber basic multi-profile support for electron app ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-26 09:48:32 +01:00
Michael Telatynski	a98792b05e	auto-launch support, ux =checkbox in UserSettings[Electron] ... settings are sorta generic, probably reusable for proxy settings Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-24 15:52:08 +01:00
David Baker	5c4e3cec08	v0.9.10	2017-05-22 11:40:10 +01:00
David Baker	029dfe5ed0	v0.9.10-rc.1	2017-05-19 10:41:22 +01:00
Michael Telatynski	c607b1bc89	npm is "smart" enough to try and install our electron wrapper as a module ... instead of the actual electron package. With no way to ignore directories. I'd like to think of this as temporary, until I get to rip apart riot-web and riot-electron Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-10 13:36:27 +01:00