7029e9ac74 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1912  from matrix-org/luke/kill-mimage-fixupheight  
							
							... 
							
							
							
							Implement slightly magical CSS soln. to thumbnail sizing 
							
						 
						
							2018-06-14 11:17:15 +01:00  
				
					
						
							
							
								 
						
							
							
								742a2d0111 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1962  from matrix-org/t3chguy/codeblock_notice  
							
							... 
							
							
							
							move css rule to be more generic; remove overriden rule 
							
						 
						
							2018-06-14 10:57:58 +01:00  
				
					
						
							
							
								 
						
							
							
								5804040a9b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1959  from matrix-org/t3chguy/faded_encrypting_padlock  
							
							... 
							
							
							
							fix message appears unencrypted while encrypting and not_sent 
							
						 
						
							2018-06-14 10:49:14 +01:00  
				
					
						
							
							
								 
						
							
							
								a257dc27c5 
								
									
								
							
								 
							
						 
						
							
							
								
								move css rule to be more generic; remove overriden rule  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-06-13 19:08:24 +01:00  
				
					
						
							
							
								 
						
							
							
								5cc2361737 
								
									
								
							
								 
							
						 
						
							
							
								
								change not_sent e2e lock to match colour of text  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-06-13 15:52:50 +01:00  
				
					
						
							
							
								 
						
							
							
								d4b2f06a63 
								
									
								
							
								 
							
						 
						
							
							
								
								fix message appears unencrypted while in flight  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-06-13 13:51:04 +01:00  
				
					
						
							
							
								 
						
							
							
								22bec0d67d 
								
									
								
							
								 
							
						 
						
							
							
								
								allow CreateRoom to scale properly horizontally  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-06-13 09:13:32 +01:00  
				
					
						
							
							
								 
						
							
							
								2120858e5f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into luke/kill-mimage-fixupheight  
							
							
							
						 
						
							2018-06-11 14:24:40 +01:00  
				
					
						
							
							
								 
						
							
							
								53396ff38d 
								
							
								 
							
						 
						
							
							
								
								Show timestamp of pinned messages on hover  
							
							... 
							
							
							
							Addresses part of https://github.com/vector-im/riot-web/issues/5405 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2018-05-26 19:46:11 -06:00  
				
					
						
							
							
								 
						
							
							
								033c41a2a8 
								
							
								 
							
						 
						
							
							
								
								Align pinned message contents and reduce image size  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/5421 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2018-05-26 18:40:48 -06:00  
				
					
						
							
							
								 
						
							
							
								62f4cfe734 
								
							
								 
							
						 
						
							
							
								
								Don't affect avatars in pinned message contents  
							
							... 
							
							
							
							This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2018-05-26 18:21:24 -06:00  
				
					
						
							
							
								 
						
							
							
								ed9e4d82c9 
								
							
								 
							
						 
						
							
							
								
								Reduce the text size on the 'Jump to pinned message' button  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/6329 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2018-05-26 18:16:19 -06:00  
				
					
						
							
							
								 
						
							
							
								b2c26e6984 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1920  from matrix-org/rxl881/refreshWidget  
							
							... 
							
							
							
							Add a "reload widget" button. 
							
						 
						
							2018-05-24 18:11:22 +01:00  
				
					
						
							
							
								 
						
							
							
								6288e9bc08 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1923  from matrix-org/rxl881/devTools  
							
							... 
							
							
							
							Make devTools styling more consistent and easier to edit event data. 
							
						 
						
							2018-05-24 18:10:59 +01:00  
				
					
						
							
							
								 
						
							
							
								dca1217a45 
								
							
								 
							
						 
						
							
							
								
								Change wording and appearance of Deactivate Account dialog  
							
							
							
						 
						
							2018-05-24 11:50:45 +01:00  
				
					
						
							
							
								 
						
							
							
								7da51f2bd4 
								
							
								 
							
						 
						
							
							
								
								Remove max-width restriction (no longer makes sense).  
							
							
							
						 
						
							2018-05-23 18:40:48 +01:00  
				
					
						
							
							
								 
						
							
							
								7db31835b4 
								
							
								 
							
						 
						
							
							
								
								Remove unused / misspelt class.  
							
							
							
						 
						
							2018-05-23 18:24:52 +01:00  
				
					
						
							
							
								 
						
							
							
								2a9859c7b6 
								
							
								 
							
						 
						
							
							
								
								Styling for consistency.  
							
							
							
						 
						
							2018-05-23 17:40:15 +01:00  
				
					
						
							
							
								 
						
							
							
								9f9cde12ce 
								
							
								 
							
						 
						
							
							
								
								Make devTools styling more consistent and easier to edit event data.  
							
							
							
						 
						
							2018-05-23 17:18:33 +01:00  
				
					
						
							
							
								 
						
							
							
								6df3371c6c 
								
							
								 
							
						 
						
							
							
								
								Add a "reload widget" button.  
							
							
							
						 
						
							2018-05-22 19:14:54 +01:00  
				
					
						
							
							
								 
						
							
							
								836dc8b0ef 
								
							
								 
							
						 
						
							
							
								
								Factor out all shared logic between MStickerBody and MImageBody  
							
							... 
							
							
							
							The benefits of this:
 - One code path for determining spinner/placeholder and it's position
   for loading images/stickers. This includes spinner used in e2e
   decryption of images.
 - Very small definition for MStickerBody, only overriding the minimal
   differences is has from MImageBody.
The disadvantages:
 - Slightly more complicated MImageBody, but hopefully not less
   readable. 
							
						 
						
							2018-05-21 16:59:13 +01:00  
				
					
						
							
							
								 
						
							
							
								015093b371 
								
							
								 
							
						 
						
							
							
								
								Move inline style to stylesheet  
							
							
							
						 
						
							2018-05-18 11:34:41 +01:00  
				
					
						
							
							
								 
						
							
							
								6699c4faed 
								
							
								 
							
						 
						
							
							
								
								Spelling/grammar  
							
							
							
						 
						
							2018-05-18 11:29:30 +01:00  
				
					
						
							
							
								 
						
							
							
								7e7e2a7473 
								
							
								 
							
						 
						
							
							
								
								Add more comments to explain thumbnail sizing  
							
							
							
						 
						
							2018-05-18 10:27:22 +01:00  
				
					
						
							
							
								 
						
							
							
								b28ed6075b 
								
							
								 
							
						 
						
							
							
								
								Implement slightly hacky CSS soln. to thumbnail sizing  
							
							... 
							
							
							
							As the slightly nicer alternative to fixupHeight being applied once
we actually have a timelineWidth.
The niceness comes from not needing timelineWidth, which means we can
implement at render time with CSS. (Despite still calculating aspect
ratios when we render.) 
							
						 
						
							2018-05-17 18:15:34 +01:00  
				
					
						
							
							
								 
						
							
							
								21ec34d4ba 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1882  from matrix-org/t3chguy/m.relates_to  
							
							... 
							
							
							
							Remove margins when in a ReplyThread to stop them taking so much space 
							
						 
						
							2018-05-14 11:22:06 +01:00  
				
					
						
							
							
								 
						
							
							
								6500797d2a 
								
							
								 
							
						 
						
							
							
								
								Use correct CSS selector in message composer  
							
							... 
							
							
							
							to stop any last div from having its right-padding removed 
							
						 
						
							2018-05-11 14:49:50 +01:00  
				
					
						
							
							
								 
						
							
							
								0c1846630c 
								
							
								 
							
						 
						
							
							
								
								Improve appearance of short-lived app loading spinner  
							
							... 
							
							
							
							by hiding it for 500ms - thereby only showing it if the loading is
taking a long time. 
							
						 
						
							2018-05-09 16:54:01 +01:00  
				
					
						
							
							
								 
						
							
							
								ee0e6c5913 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove margins when in a ReplyThread to stop them taking so much space  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-05-09 11:53:37 +01:00  
				
					
						
							
							
								 
						
							
							
								f2102e283c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to  
							
							
							
						 
						
							2018-05-02 13:08:38 +01:00  
				
					
						
							
							
								 
						
							
							
								22047d7e72 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1845  from kethinov/hide_encryption_icons  
							
							... 
							
							
							
							Hide inline encryption icons except when hovering over a message 
							
						 
						
							2018-04-30 17:57:22 +01:00  
				
					
						
							
							
								 
						
							
							
								80c67ba35d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1863  from matrix-org/dbkr/bug_report_dialog_basedialog  
							
							... 
							
							
							
							Fix UX issues with bug report dialog 
							
						 
						
							2018-04-30 17:56:19 +01:00  
				
					
						
							
							
								 
						
							
							
								e037cf0063 
								
							
								 
							
						 
						
							
							
								
								namespace CSS better and fix bug  
							
							
							
						 
						
							2018-04-30 12:22:16 -04:00  
				
					
						
							
							
								 
						
							
							
								45c0c0eddd 
								
							
								 
							
						 
						
							
							
								
								add CSS destroyed by stickerpacks  
							
							... 
							
							
							
							fixing mangling from 9fc7435ea2 (diff-be2f1d72c9704840ceddf019c825e825)38efebb8d3 (diff-be2f1d72c9704840ceddf019c825e825)https://github.com/vector-im/riot-web/issues/6492  
							
						 
						
							2018-04-29 04:50:44 +01:00  
				
					
						
							
							
								 
						
							
							
								8538cc1666 
								
							
								 
							
						 
						
							
							
								
								fix regressions introduced by  00b7cc512b 
							
							
							
						 
						
							2018-04-29 04:41:30 +01:00  
				
					
						
							
							
								 
						
							
							
								55566b35a2 
								
							
								 
							
						 
						
							
							
								
								convert attribute to class  
							
							
							
						 
						
							2018-04-28 12:39:25 -04:00  
				
					
						
							
							
								 
						
							
							
								6d9e07580b 
								
							
								 
							
						 
						
							
							
								
								UI fixes in SessionRestoreErrorDialog  
							
							... 
							
							
							
							* Make the 'delete my data' button not the default
 * Make it red
 * Give it a confirmation dialog
 * Remove the 'cancel' button: what does it mean to cancel an error?
   In this case, it tried again and almost certainly got the same error.
 * Remove the top-right 'x' and don't cancel on esc for the same reason.
 * Move 'send bug report' to a button rather than a 'click here' link
 * Add a 'refresh' button which, even if it's no more likely to work,
   will at least look like it's doing something (it's mostly so if you
   don't have a bug report endpoint, there's still a button other
   than the one that deletes all your data). 
							
						 
						
							2018-04-27 12:38:49 +01:00  
				
					
						
							
							
								 
						
							
							
								71acf87c04 
								
									
								
							
								 
							
						 
						
							
							
								
								Add comments to _EventTile.scss  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-04-27 11:13:09 +01:00  
				
					
						
							
							
								 
						
							
							
								ff4909e6ab 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into luke/fix-piwik-page-url-reporting  
							
							
							
						 
						
							2018-04-26 11:03:55 +01:00  
				
					
						
							
							
								 
						
							
							
								e16c50d4be 
								
							
								 
							
						 
						
							
							
								
								Explain that full URL is sent to Piwik  
							
							... 
							
							
							
							Also, redesign analytics modal to be one big table, instead of table +
paragraph. 
							
						 
						
							2018-04-26 10:59:43 +01:00  
				
					
						
							
							
								 
						
							
							
								0f0e89d394 
								
							
								 
							
						 
						
							
							
								
								Add a button to 'pop out' widgets in to their own tab.  
							
							
							
						 
						
							2018-04-25 12:49:30 +01:00  
				
					
						
							
							
								 
						
							
							
								d42fa9d17a 
								
							
								 
							
						 
						
							
							
								
								Hide inline encryption icons except when hovering over a message  
							
							... 
							
							
							
							Closes https://github.com/vector-im/riot-web/issues/2882 
This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707  (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988 )
I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR. 
							
						 
						
							2018-04-22 22:30:37 -04:00  
				
					
						
							
							
								 
						
							
							
								563fc9adc7 
								
									
								
							
								 
							
						 
						
							
							
								
								fix bad copy-paste from other diff  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-04-20 09:37:25 +01:00  
				
					
						
							
							
								 
						
							
							
								06408f843b 
								
									
								
							
								 
							
						 
						
							
							
								
								post BigMerge fixup - merge in stuff from riot-web PR  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2018-04-20 09:23:27 +01:00  
				
					
						
							
							
								 
						
							
							
								6d1563449d 
								
							
								 
							
						 
						
							
							
								
								fix missing NLs  
							
							
							
						 
						
							2018-04-17 16:57:08 +01:00  
				
					
						
							
							
								 
						
							
							
								7b53e36698 
								
							
								 
							
						 
						
							
							
								
								retheming commentary  
							
							
							
						 
						
							2018-04-17 16:55:32 +01:00  
				
					
						
							
							
								 
						
							
							
								46f5c0d205 
								
							
								 
							
						 
						
							
							
								
								finish merging  vector-im/riot-web#5881  into matrix-react-sdk  
							
							
							
						 
						
							2018-04-16 01:13:03 +01:00  
				
					
						
							
							
								 
						
							
							
								32dd7f976f 
								
							
								 
							
						 
						
							
							
								
								merge  vector-im/riot-web#5881  into matrix-react-sdk  
							
							
							
						 
						
							2018-04-16 00:04:04 +01:00  
				
					
						
							
							
								 
						
							
							
								5f3e4444d0 
								
							
								 
							
						 
						
							
							
								
								fix theme paths  
							
							
							
						 
						
							2018-04-13 01:25:34 +01:00  
				
					
						
							
							
								 
						
							
							
								5d03eabb15 
								
							
								 
							
						 
						
							
							
								
								rethemedex  
							
							
							
						 
						
							2018-04-13 00:54:41 +01:00