24f1ec8abb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3398  from matrix-org/jryans/is-input-tweak  
							
							... 
							
							
							
							Stop setting IS input field on account change 
							
						 
						
							2019-09-09 10:28:00 +01:00  
				
					
						
							
							
								 
						
							
							
								1422b1d73e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3403  from matrix-org/bwindels/cider-italics  
							
							... 
							
							
							
							New composer: use underscore for italics so it doesn't collide with bold when toggling 
							
						 
						
							2019-09-09 08:06:51 +00:00  
				
					
						
							
							
								 
						
							
							
								d8dbe28015 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3404  from matrix-org/t3chguy/react16_10  
							
							... 
							
							
							
							Switch to createReactClass: views/elements & views/groups. React 16 :D 
							
						 
						
							2019-09-06 18:49:11 +01:00  
				
					
						
							
							
								 
						
							
							
								6dbc9ee893 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3405  from matrix-org/t3chguy/react16_11  
							
							... 
							
							
							
							Switch to createReactClass: *everything else*. React 16 :D 
							
						 
						
							2019-09-06 18:46:24 +01:00  
				
					
						
							
							
								 
						
							
							
								b243004a6c 
								
							
								 
							
						 
						
							
							
								
								Switch to createReactClass: *everything else*. React 16 :D  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-09-06 18:38:11 +01:00  
				
					
						
							
							
								 
						
							
							
								d5db67be38 
								
							
								 
							
						 
						
							
							
								
								Switch to createReactClass: views/elements & views/groups. React 16 :D  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-09-06 18:35:52 +01:00  
				
					
						
							
							
								 
						
							
							
								13258132e7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3400  from matrix-org/t3chguy/react16_9  
							
							... 
							
							
							
							Switch to createReactClass: views/rooms and test/components. React 16 :D 
							
						 
						
							2019-09-06 18:18:32 +01:00  
				
					
						
							
							
								 
						
							
							
								48247e66be 
								
							
								 
							
						 
						
							
							
								
								use underscore for italics so it doesn't collide with bold when toggling  
							
							
							
						 
						
							2019-09-06 17:52:37 +02:00  
				
					
						
							
							
								 
						
							
							
								fe482258ac 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3402  from matrix-org/bwindels/cider-toggle-inline-formatting  
							
							... 
							
							
							
							New composer: support toggling inline formatting 
							
						 
						
							2019-09-06 14:42:16 +00:00  
				
					
						
							
							
								 
						
							
							
								14fff3be9a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3399  from matrix-org/bwindels/fix-formatbar-edit-position  
							
							... 
							
							
							
							Fix format bar not appearing in edit composer 
							
						 
						
							2019-09-06 14:28:23 +00:00  
				
					
						
							
							
								 
						
							
							
								26bd694c6a 
								
							
								 
							
						 
						
							
							
								
								support toggling inline formatting  
							
							
							
						 
						
							2019-09-06 16:25:55 +02:00  
				
					
						
							
							
								 
						
							
							
								70ff2bc9cd 
								
							
								 
							
						 
						
							
							
								
								Switch to createReactClass: views/rooms and test/components. React 16 :D  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-09-06 15:04:46 +01:00  
				
					
						
							
							
								 
						
							
							
								4e98721ba9 
								
							
								 
							
						 
						
							
							
								
								take bounding box for positioning calculation  
							
							
							
						 
						
							2019-09-06 15:56:46 +02:00  
				
					
						
							
							
								 
						
							
							
								7759a9f20e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3397  from matrix-org/t3chguy/react16_8  
							
							... 
							
							
							
							Correct case of propTypes property in ES6 React Components. React 16 
							
						 
						
							2019-09-06 14:54:50 +01:00  
				
					
						
							
							
								 
						
							
							
								5fddb20d86 
								
							
								 
							
						 
						
							
							
								
								Stop setting IS input field on account change  
							
							... 
							
							
							
							This stops setting a value in the IS input on account change. While it may have
been marginally useful if you have the form open and change on a different
device, it also seems to pick up changes on the current device, leading to
strange UX locally.
Fixes https://github.com/vector-im/riot-web/issues/10756 
Fixes https://github.com/vector-im/riot-web/issues/10757  
							
						 
						
							2019-09-06 14:33:40 +01:00  
				
					
						
							
							
								 
						
							
							
								4db8ef4d89 
								
							
								 
							
						 
						
							
							
								
								Correct case of propTypes property in ES6 React Components. React 16  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-09-06 14:27:33 +01:00  
				
					
						
							
							
								 
						
							
							
								4876f4c469 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3396  from matrix-org/bwindels/fix-formatbar-merge-error  
							
							... 
							
							
							
							Fix error on load in composer 
							
						 
						
							2019-09-06 10:05:19 +00:00  
				
					
						
							
							
								 
						
							
							
								dd1c01068f 
								
							
								 
							
						 
						
							
							
								
								fix rename that didn't make it through rebasing  
							
							
							
						 
						
							2019-09-06 11:58:27 +02:00  
				
					
						
							
							
								 
						
							
							
								5014b606db 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3391  from matrix-org/bwindels/cider-format-history  
							
							... 
							
							
							
							New composer: ensure undo history is persisted before applying formatting 
							
						 
						
							2019-09-06 09:28:18 +00:00  
				
					
						
							
							
								 
						
							
							
								df4762871a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3392  from matrix-org/bwindels/cider-paste-plain  
							
							... 
							
							
							
							New composer: fix pasting from word processors 
							
						 
						
							2019-09-06 09:22:37 +00:00  
				
					
						
							
							
								 
						
							
							
								6b104f6344 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3393  from matrix-org/bwindels/cider-fix-lastcaret  
							
							... 
							
							
							
							New composer: fix needing to push arrow-up twice after sending first message after switching to a room 
							
						 
						
							2019-09-06 09:22:10 +00:00  
				
					
						
							
							
								 
						
							
							
								9dac91a70d 
								
							
								 
							
						 
						
							
							
								
								ensure step before formatting is persisted in undo history  
							
							
							
						 
						
							2019-09-06 11:20:24 +02:00  
				
					
						
							
							
								 
						
							
							
								8820546f49 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3390  from matrix-org/bwindels/selection-color  
							
							... 
							
							
							
							Remove accent color as selection color 
							
						 
						
							2019-09-06 09:12:42 +00:00  
				
					
						
							
							
								 
						
							
							
								0252c7ae37 
								
							
								 
							
						 
						
							
							
								
								force pasting as plain text in new composer  
							
							
							
						 
						
							2019-09-06 11:10:41 +02:00  
				
					
						
							
							
								 
						
							
							
								556ccf45dc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3389  from matrix-org/bwindels/cider-format-shortcuts  
							
							... 
							
							
							
							New composer: formatting keyboard shortcuts 
							
						 
						
							2019-09-06 09:09:47 +00:00  
				
					
						
							
							
								 
						
							
							
								2596281a7c 
								
							
								 
							
						 
						
							
							
								
								update last caret from update callback instead of input event  
							
							... 
							
							
							
							many editor updates are not caused by an input event, so
the last caret wasn't always up to date.
Updating the caret from the update callback ensures that every
time the editor contents is changed, the last caret is updated. 
							
						 
						
							2019-09-06 11:09:01 +02:00  
				
					
						
							
							
								 
						
							
							
								f4938f9d11 
								
							
								 
							
						 
						
							
							
								
								dont format empty ranges  
							
							
							
						 
						
							2019-09-06 10:59:41 +02:00  
				
					
						
							
							
								 
						
							
							
								06143ba7a1 
								
							
								 
							
						 
						
							
							
								
								show keyboard shortcuts in format button tooltip  
							
							
							
						 
						
							2019-09-06 10:59:41 +02:00  
				
					
						
							
							
								 
						
							
							
								bdcea6f21e 
								
							
								 
							
						 
						
							
							
								
								add shortcuts for formatting  
							
							
							
						 
						
							2019-09-06 10:59:41 +02:00  
				
					
						
							
							
								 
						
							
							
								de787c798c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3387  from matrix-org/bwindels/cider-formatbar-tooltips  
							
							... 
							
							
							
							New composer: format bar tooltips 
							
						 
						
							2019-09-06 08:52:00 +00:00  
				
					
						
							
							
								 
						
							
							
								042822c90a 
								
							
								 
							
						 
						
							
							
								
								copyright is solely assigned to matrix foundation now, copy paste error  
							
							
							
						 
						
							2019-09-06 10:39:19 +02:00  
				
					
						
							
							
								 
						
							
							
								d6a493a2b1 
								
							
								 
							
						 
						
							
							
								
								fixup: language strings moved  
							
							
							
						 
						
							2019-09-06 10:39:19 +02:00  
				
					
						
							
							
								 
						
							
							
								b4b9c7d072 
								
							
								 
							
						 
						
							
							
								
								Add tooltip for format buttons  
							
							
							
						 
						
							2019-09-06 10:39:19 +02:00  
				
					
						
							
							
								 
						
							
							
								da29057fd8 
								
							
								 
							
						 
						
							
							
								
								move format bar to own component  
							
							
							
						 
						
							2019-09-06 10:39:19 +02:00  
				
					
						
							
							
								 
						
							
							
								02681d50b9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3386  from matrix-org/bwindels/cider-formatbar  
							
							... 
							
							
							
							New composer: show format bar on selection 
							
						 
						
							2019-09-06 08:38:01 +00:00  
				
					
						
							
							
								 
						
							
							
								92c0c1a4e2 
								
							
								 
							
						 
						
							
							
								
								add comment about positioning the format bar  
							
							
							
						 
						
							2019-09-06 10:29:18 +02:00  
				
					
						
							
							
								 
						
							
							
								d2949babcd 
								
							
								 
							
						 
						
							
							
								
								copyright is solely assigned to matrix foundation now, copy paste error  
							
							
							
						 
						
							2019-09-06 10:29:12 +02:00  
				
					
						
							
							
								 
						
							
							
								124b7135cd 
								
							
								 
							
						 
						
							
							
								
								make sure the update callback gets a caret when calling reset  
							
							
							
						 
						
							2019-09-05 17:54:08 +02:00  
				
					
						
							
							
								 
						
							
							
								46ee52a406 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3388  from matrix-org/jryans/bound-3pids-warning  
							
							... 
							
							
							
							Add new agreed URLs to account data instead of overwriting 
							
						 
						
							2019-09-05 15:02:15 +01:00  
				
					
						
							
							
								 
						
							
							
								39bbf9af24 
								
							
								 
							
						 
						
							
							
								
								remove accent color as selection color  
							
							
							
						 
						
							2019-09-05 15:40:33 +02:00  
				
					
						
							
							
								 
						
							
							
								26eb617bec 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3384  from matrix-org/travis/fix-pl  
							
							... 
							
							
							
							Fix member power levels in room settings 
							
						 
						
							2019-09-05 07:16:52 -06:00  
				
					
						
							
							
								 
						
							
							
								0929a9cc72 
								
							
								 
							
						 
						
							
							
								
								Add new agreed URLs to account data instead of overwriting  
							
							... 
							
							
							
							This changes terms account data storage to always add, rather than setting only
the current set of displayed URLs.
Fixes https://github.com/vector-im/riot-web/issues/10755  
							
						 
						
							2019-09-05 13:38:32 +01:00  
				
					
						
							
							
								 
						
							
							
								4ef9fa53ac 
								
							
								 
							
						 
						
							
							
								
								better i18n  
							
							
							
						 
						
							2019-09-05 11:10:13 +02:00  
				
					
						
							
							
								 
						
							
							
								e3d70f3999 
								
							
								 
							
						 
						
							
							
								
								ensure selection is not lost upon clicking format bar in chrome  
							
							
							
						 
						
							2019-09-05 11:01:44 +02:00  
				
					
						
							
							
								 
						
							
							
								d6adf0fd6d 
								
							
								 
							
						 
						
							
							
								
								Add responsible error handling because we're responsible people  
							
							
							
						 
						
							2019-09-04 11:24:31 -06:00  
				
					
						
							
							
								 
						
							
							
								af535986d2 
								
							
								 
							
						 
						
							
							
								
								fix css lint  
							
							
							
						 
						
							2019-09-04 16:40:34 +02:00  
				
					
						
							
							
								 
						
							
							
								2ea556e0b4 
								
							
								 
							
						 
						
							
							
								
								support update callback setting selection instead of caret  
							
							
							
						 
						
							2019-09-04 16:40:34 +02:00  
				
					
						
							
							
								 
						
							
							
								037ac29c57 
								
							
								 
							
						 
						
							
							
								
								be more forgiving with offset that don't have atNodeEnd=true  
							
							... 
							
							
							
							if index is not found, it means the last position should be returned
if there is any.
We still return -1 for empty documents, as index should always point
to a valid part if positive. 
							
						 
						
							2019-09-04 16:40:34 +02:00  
				
					
						
							
							
								 
						
							
							
								42c37d8293 
								
							
								 
							
						 
						
							
							
								
								fixup: improve quote and code block newline handling  
							
							
							
						 
						
							2019-09-04 16:40:34 +02:00  
				
					
						
							
							
								 
						
							
							
								e0668e8517 
								
							
								 
							
						 
						
							
							
								
								improve algorithm to reduce selection to text node + charactar offset  
							
							... 
							
							
							
							this follows the documentation of {focus|anchor}{Offset|Node} better
and was causing problems for creating ranges from the document selection
when doing ctrl+A in firefox as the anchorNode/Offset was expressed
as childNodes from the editor root. 
							
						 
						
							2019-09-04 16:40:34 +02:00