|  Luke Barnard | e5dd37d2d6 | v0.12.0-rc.1 | 2017-08-16 10:39:57 +01:00 | 
				
					
						|  Michael Telatynski | a6d5158830 | electron support for mouse forward/back buttons in Windows Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-08-03 15:03:50 +01:00 | 
				
					
						|  Richard van der Hoff | cc56ef3abd | Attempt to flush the rageshake logs on close ... so that we get to see what happened in the last 30s. | 2017-06-22 18:25:19 +01:00 | 
				
					
						|  Michael Telatynski | 0788826a71 | Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
#	electron_app/src/tray.js | 2017-06-22 15:04:33 +01:00 | 
				
					
						|  David Baker | 8b65b96adf | Merge branch 'master' into develop | 2017-06-22 12:08:14 +01:00 | 
				
					
						|  David Baker | 27d83ba440 | v0.11.4 | 2017-06-22 12:01:05 +01:00 | 
				
					
						|  David Baker | 7d3f75ef87 | Merge pull request #4355 from vector-im/t3chguy/electron/windows_icon_instability explicit convert to nativeImage to stabilise trayIcon on Windows [Electron] | 2017-06-21 15:04:36 +01:00 | 
				
					
						|  Michael Telatynski | 67a9b6502b | Merge branch 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff | 2017-06-20 14:33:09 +01:00 | 
				
					
						|  Michael Telatynski | fe1b0b5cd8 | Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff | 2017-06-20 14:32:19 +01:00 | 
				
					
						|  Michael Telatynski | 499b1c2e70 | add missing semicolon | 2017-06-20 14:05:17 +01:00 | 
				
					
						|  David Baker | eda3f20b26 | v0.11.3 | 2017-06-20 13:13:28 +01:00 | 
				
					
						|  David Baker | 3e279746d5 | v0.11.2 | 2017-06-19 13:19:09 +01:00 | 
				
					
						|  Michael Telatynski | 78068bfaa0 | explicit convert to nativeImage to stabilise on Windows Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-06-19 11:58:44 +01:00 | 
				
					
						|  David Baker | 97611cfd27 | v0.11.2-rc.2 | 2017-06-16 13:30:49 +01:00 | 
				
					
						|  David Baker | e045b35c86 | v0.11.2-rc.1 | 2017-06-15 17:20:22 +01:00 | 
				
					
						|  David Baker | 9325eef650 | v0.11.1 | 2017-06-14 11:20:05 +01:00 | 
				
					
						|  David Baker | b8e0cbaf5a | v0.11.0 | 2017-06-12 16:02:51 +01:00 | 
				
					
						|  Michael Telatynski | b6d2ba2019 | store window ref globally so when splitting files its easier to access. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-06-12 13:50:45 +01:00 | 
				
					
						|  Michael Telatynski | deb7ed660c | Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff | 2017-06-11 23:13:49 +01:00 | 
				
					
						|  Michael Telatynski | a520f0bfed | move all logic, make bar more generic pass through actual errors
and tidy
needs testing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-06-11 19:19:17 +01:00 | 
				
					
						|  Michael Telatynski | c4fd139586 | get rid of pointless interval and timeout on linux Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-06-11 16:46:47 +01:00 | 
				
					
						|  Michael Telatynski | 4c8ff0955d | move electron update logic into own file, tidy tidy tidy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-06-11 16:44:36 +01:00 | 
				
					
						|  David Baker | f335656c7d | v0.11.0-rc.2 | 2017-06-09 22:18:01 +01:00 | 
				
					
						|  David Baker | b98497f386 | v0.11.0-rc.1 | 2017-06-09 20:30:24 +01:00 | 
				
					
						|  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 | f24c6de245 | provide react devtools in electron dev builds Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-06-04 15:30:44 +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 | 
				
					
						|  Michael Telatynski | 25a0af6ddb | to make the windows volume mixer not explode as it can't resize icons. I hate Windows.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-06-04 11:05:28 +01:00 | 
				
					
						|  Michael Telatynski | efc68c078e | basic manual update stuff + update check bar Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-06-03 15:59:12 +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 | 
				
					
						|  Matthew Hodgson | 21cf79bc54 | Merge pull request #4030 from vector-im/t3chguy/electron_profiles basic electron profile support | 2017-06-01 01:33:01 +01:00 | 
				
					
						|  Michael Telatynski | 5762323bd1 | Merge branch 'develop' into t3chguy/electron_profiles | 2017-06-01 00:01:53 +01:00 | 
				
					
						|  Michael Telatynski | 33ee42f821 | use loudNotification for flashFrame, resetting on count=0 or focus win32 check is optional just there so we're not attaching pointless handlers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-06-01 00:00:00 +01:00 | 
				
					
						|  Matthew Hodgson | 448c10736a | Merge pull request #4012 from vector-im/t3chguy/electron_settings auto-launch support [Electron] | 2017-05-30 23:59:15 +01:00 | 
				
					
						|  Michael Telatynski | 53b7b6cb14 | Merge branch 't3chguy/electron_settings' of github.com:vector-im/riot-web into t3chguy/electron_settings | 2017-05-30 12:34:05 +01:00 | 
				
					
						|  Michael Telatynski | c54e2a30b6 | explicitly hide because setApplicationMenu on Linux otherwise shows... https://github.com/electron/electron/issues/9621
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-05-30 12:33:32 +01:00 | 
				
					
						|  Michael Telatynski | db602f2bc0 | Merge branch 'develop' into t3chguy/electron_profiles | 2017-05-30 11:00:51 +01:00 | 
				
					
						|  Michael Telatynski | b27600adbe | Improve for Mac - Tested on 10.10.5 | 2017-05-30 10:53:01 +01:00 | 
				
					
						|  Michael Telatynski | 9c25aab509 | Fix bad merge (3993 before 4021 broke things) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-05-29 22:12:36 +01:00 | 
				
					
						|  Michael Telatynski | 1d2bd68200 | Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_settings | 2017-05-29 22:12:06 +01:00 | 
				
					
						|  Michael Telatynski | 8a59acb5c3 | explicit protocol in configs, otherwise breaks in Electron when it tries file://
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-05-29 19:32:44 +01:00 | 
				
					
						|  Michael Telatynski | 28d929f901 | correct electron config to not point at personal piwik Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-05-28 13:10:13 +01:00 | 
				
					
						|  Michael Telatynski | c2c417b207 | add piwik config to riot.im electron build config Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | 2017-05-28 13:07:56 +01:00 |