84fdcf1fff 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop  
							
							
							
						 
						
							2017-05-26 20:00:29 +00:00  
				
					
						
							
							
								 
						
							
							
								de07654f2d 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (Russian)  
							
							... 
							
							
							
							Currently translated at 90.8% (109 of 120 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/  
							
						 
						
							2017-05-26 20:00:27 +00:00  
				
					
						
							
							
								 
						
							
							
								3815872cf7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4041  from turt2live/patch-1  
							
							... 
							
							
							
							Update translating.md: Minor suggestions 
							
						 
						
							2017-05-26 20:12:56 +01:00  
				
					
						
							
							
								 
						
							
							
								8ddf4ced64 
								
							
								 
							
						 
						
							
							
								
								Update translating.md: Minor suggestions  
							
							... 
							
							
							
							Primarily spelling, wording, and grammar. A little bit of formatting too. 
							
						 
						
							2017-05-26 13:09:40 -06:00  
				
					
						
							
							
								 
						
							
							
								cd9d3ea248 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of git://github.com/vector-im/riot-web into develop  
							
							
							
						 
						
							2017-05-26 18:52:19 +00:00  
				
					
						
							
							
								 
						
							
							
								963c90c833 
								
							
								 
							
						 
						
							
							
								
								switch to develop deps...  
							
							
							
						 
						
							2017-05-26 19:51:04 +01:00  
				
					
						
							
							
								 
						
							
							
								d626542baf 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (German)  
							
							... 
							
							
							
							Currently translated at 100.0% (120 of 120 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/  
							
						 
						
							2017-05-26 18:47:45 +00:00  
				
					
						
							
							
								 
						
							
							
								10d2caf5d6 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into develop  
							
							
							
						 
						
							2017-05-26 18:43:09 +00:00  
				
					
						
							
							
								 
						
							
							
								2819799843 
								
							
								 
							
						 
						
							
							
								
								Translated using Weblate (German)  
							
							... 
							
							
							
							Currently translated at 97.5% (117 of 120 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/  
							
						 
						
							2017-05-26 18:43:08 +00:00  
				
					
						
							
							
								 
						
							
							
								09adfbd6d6 
								
							
								 
							
						 
						
							
							
								
								remove stale i18n instructions  
							
							
							
						 
						
							2017-05-26 19:39:05 +01:00  
				
					
						
							
							
								 
						
							
							
								1bcdf31afc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3993  from vector-im/t3chguy/tidy_electron_files  
							
							... 
							
							
							
							tidy electron files, they weren't pwetty 
							
						 
						
							2017-05-26 18:52:41 +01:00  
				
					
						
							
							
								 
						
							
							
								ff5adeff2c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/tidy_electron_files  
							
							
							
						 
						
							2017-05-26 18:50:48 +01:00  
				
					
						
							
							
								 
						
							
							
								445a55c7ca 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3992  from vector-im/t3chguy/electron_call_sleep  
							
							... 
							
							
							
							Prevent Power Save when in call (Electron) 
							
						 
						
							2017-05-26 18:44:53 +01:00  
				
					
						
							
							
								 
						
							
							
								d313f4c7b6 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/MTRNord/riot-web/pull/70/  
							
							
							
						 
						
							2017-05-26 18:44:08 +01:00  
				
					
						
							
							
								 
						
							
							
								5e0457c32d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4035  from vector-im/dbkr/translations  
							
							... 
							
							
							
							Translations! 
							
						 
						
							2017-05-26 18:39:07 +01:00  
				
					
						
							
							
								 
						
							
							
								9156a871f5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3961  from Kieran-Gould/kieran-gould/12hourtimestamp  
							
							... 
							
							
							
							Kieran gould/12hourtimestamp 
							
						 
						
							2017-05-26 18:23:11 +01:00  
				
					
						
							
							
								 
						
							
							
								e26422ef10 
								
							
								 
							
						 
						
							
							
								
								fix a typo  
							
							
							
						 
						
							2017-05-26 18:22:53 +01:00  
				
					
						
							
							
								 
						
							
							
								d3875ec794 
								
							
								 
							
						 
						
							
							
								
								Oops, include file extension in language list  
							
							
							
						 
						
							2017-05-26 17:11:11 +01:00  
				
					
						
							
							
								 
						
							
							
								4fcaccbc7f 
								
							
								 
							
						 
						
							
							
								
								Merge  https://github.com/MTRNord/riot-web/pull/69  
							
							
							
						 
						
							2017-05-26 16:56:49 +01:00  
				
					
						
							
							
								 
						
							
							
								6c3c4fc547 
								
							
								 
							
						 
						
							
							
								
								Language generation and file structure  
							
							... 
							
							
							
							* Move language files to strings/ subdir to be consistent with
   react-sdk
 * Only copy static list of languages (to avoid including
   languages that are only a few percent translated)
 * Make copy-res script work with watch mode
 * Other general cleanups like only write each language file once,
   rather than n times. 
							
						 
						
							2017-05-26 16:48:21 +01:00  
				
					
						
							
							
								 
						
							
							
								e07f9a8bc9 
								
							
								 
							
						 
						
							
							
								
								Pass through i18n keys in karma tests  
							
							
							
						 
						
							2017-05-26 15:29:58 +01:00  
				
					
						
							
							
								 
						
							
							
								0db118f766 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4033  from vector-im/dbkr/dont_put_src_in_resolve_root  
							
							... 
							
							
							
							Don't include src in the test resolve root 
							
						 
						
							2017-05-26 14:09:17 +01:00  
				
					
						
							
							
								 
						
							
							
								0ab9486829 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'dbkr/dont_put_src_in_resolve_root' into dbkr/translations  
							
							
							
						 
						
							2017-05-26 14:02:44 +01:00  
				
					
						
							
							
								 
						
							
							
								9c7731e141 
								
							
								 
							
						 
						
							
							
								
								Don't include src in the test resolve root  
							
							... 
							
							
							
							As https://github.com/matrix-org/matrix-react-sdk/pull/931  
							
						 
						
							2017-05-26 14:02:03 +01:00  
				
					
						
							
							
								 
						
							
							
								ee2a49ad41 
								
							
								 
							
						 
						
							
							
								
								Punctuation in translation strings  
							
							
							
						 
						
							2017-05-26 13:46:01 +01:00  
				
					
						
							
							
								 
						
							
							
								8ad189c79d 
								
							
								 
							
						 
						
							
							
								
								Remove unused _t import  
							
							
							
						 
						
							2017-05-26 13:45:46 +01:00  
				
					
						
							
							
								 
						
							
							
								92579cf463 
								
							
								 
							
						 
						
							
							
								
								Array literal  
							
							
							
						 
						
							2017-05-26 13:36:58 +01:00  
				
					
						
							
							
								 
						
							
							
								d688eade43 
								
							
								 
							
						 
						
							
							
								
								Remove commented use strict  
							
							... 
							
							
							
							It's even less use in a comment 
							
						 
						
							2017-05-26 13:34:18 +01:00  
				
					
						
							
							
								 
						
							
							
								82b2741ed9 
								
							
								 
							
						 
						
							
							
								
								Move english custom server text to en file  
							
							... 
							
							
							
							As it is in English and not German 
							
						 
						
							2017-05-26 13:33:00 +01:00  
				
					
						
							
							
								 
						
							
							
								810fb42458 
								
							
								 
							
						 
						
							
							
								
								Fix indenting  
							
							
							
						 
						
							2017-05-26 13:25:46 +01:00  
				
					
						
							
							
								 
						
							
							
								5356eab159 
								
							
								 
							
						 
						
							
							
								
								Correct docs  
							
							... 
							
							
							
							Change array.push guideline to not using _t at class-load time
which was probably the actual problem. Update guidelines to
include punctuation. 
							
						 
						
							2017-05-26 13:16:36 +01:00  
				
					
						
							
							
								 
						
							
							
								bde501a9ce 
								
							
								 
							
						 
						
							
							
								
								Languages on config file is no longer a thing  
							
							
							
						 
						
							2017-05-26 13:10:57 +01:00  
				
					
						
							
							
								 
						
							
							
								2982174028 
								
							
								 
							
						 
						
							
							
								
								No need for repeated OKs anymore  
							
							
							
						 
						
							2017-05-25 18:21:40 +01:00  
				
					
						
							
							
								 
						
							
							
								c15a66d1d4 
								
							
								 
							
						 
						
							
							
								
								Fix up notification settings strings  
							
							
							
						 
						
							2017-05-25 17:21:41 +01:00  
				
					
						
							
							
								 
						
							
							
								003238c1e7 
								
							
								 
							
						 
						
							
							
								
								Update for new API in react-sdk  
							
							... 
							
							
							
							We now get multiple languages from the browser as there may be
a whole preference list 
							
						 
						
							2017-05-25 16:47:12 +01:00  
				
					
						
							
							
								 
						
							
							
								5ccab395d7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4021  from vector-im/t3chguy/electron_context_menus  
							
							... 
							
							
							
							add moar context menus [Electron] 
							
						 
						
							2017-05-25 13:49:23 +01:00  
				
					
						
							
							
								 
						
							
							
								dd1c9a4477 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4022  from vector-im/t3chguy/patch-2  
							
							... 
							
							
							
							Add `Chat` to Linux app categories 
							
						 
						
							2017-05-25 13:35:50 +01:00  
				
					
						
							
							
								 
						
							
							
								9cd04509bf 
								
							
								 
							
						 
						
							
							
								
								Add `Chat` to Linux app categories  
							
							... 
							
							
							
							most dists inc Arch have Chat and IRCClient,
though the latter isn't exactly correct so missing it 
							
						 
						
							2017-05-25 13:22:01 +01:00  
				
					
						
							
							
								 
						
							
							
								727e267853 
								
							
								 
							
						 
						
							
							
								
								we don't really need a webContents like that, so pass if needed  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-25 12:47:36 +01:00  
				
					
						
							
							
								 
						
							
							
								c4c78c9b3e 
								
							
								 
							
						 
						
							
							
								
								split webContents context handling into own file, as main was growing  
							
							... 
							
							
							
							add handlers for editable fields, with Cut Copy Paste Undo Redo etc
add Copy Image feature to all images, working on not only the download
buttons now
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-25 12:42:53 +01:00  
				
					
						
							
							
								 
						
							
							
								7636212bed 
								
							
								 
							
						 
						
							
							
								
								Remove refs to counterpart  
							
							... 
							
							
							
							and remove extCounterpart which is unnecessary now we just use a
single counterpart instance 
							
						 
						
							2017-05-25 12:08:47 +01:00  
				
					
						
							
							
								 
						
							
							
								b95da4a40c 
								
							
								 
							
						 
						
							
							
								
								No longer need counterpart  
							
							... 
							
							
							
							We now use stock counterpart, but indirectly via react-sdk so no
need to depend on it directly. 
							
						 
						
							2017-05-25 11:40:31 +01:00  
				
					
						
							
							
								 
						
							
							
								ee85eb961a 
								
							
								 
							
						 
						
							
							
								
								Bulk change counterpart imports  
							
							... 
							
							
							
							to use react-sdk wrapper function, rather than using counterpart
directly. 
							
						 
						
							2017-05-25 11:39:56 +01:00  
				
					
						
							
							
								 
						
							
							
								aaf948017a 
								
							
								 
							
						 
						
							
							
								
								Make language dropdown a more sensible width  
							
							
							
						 
						
							2017-05-24 14:37:12 +01:00  
				
					
						
							
							
								 
						
							
							
								d4aa428321 
								
							
								 
							
						 
						
							
							
								
								Move translation status image to i18n section  
							
							
							
						 
						
							2017-05-24 14:23:34 +01:00  
				
					
						
							
							
								 
						
							
							
								d5425b62a1 
								
							
								 
							
						 
						
							
							
								
								Don't inject languages into the config  
							
							... 
							
							
							
							If we're defaulting this it should really be by the component
itself or with the other defaukts in SdkConfig, but we've decided
to leave out support for reading languages from the config file as
it's only useful for a Riot admin to restrict the choice of
languages available to users which is of debateable use. 
							
						 
						
							2017-05-24 11:27:06 +01:00  
				
					
						
							
							
								 
						
							
							
								c63e429c76 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_call_sleep  
							
							
							
						 
						
							2017-05-24 10:56:36 +01:00  
				
					
						
							
							
								 
						
							
							
								ff1567ed2a 
								
							
								 
							
						 
						
							
							
								
								Remove spurious import  
							
							
							
						 
						
							2017-05-23 17:09:09 +01:00  
				
					
						
							
							
								 
						
							
							
								af6cc7bf9c 
								
							
								 
							
						 
						
							
							
								
								I don't really see why this is necessary  
							
							
							
						 
						
							2017-05-23 17:06:49 +01:00  
				
					
						
							
							
								 
						
							
							
								caca5cc00b 
								
							
								 
							
						 
						
							
							
								
								Remove c+ped UserSettingsStore functions  
							
							... 
							
							
							
							as they don't seem to be necessary 
							
						 
						
							2017-05-23 17:06:02 +01:00