38f504bdcb 
								
							
								 
							
						 
						
							
							
								
								Hide tooltip when badge clicked and collapsed  
							
							
							
						 
						
							2016-07-29 11:10:16 +01:00  
				
					
						
							
							
								 
						
							
							
								5889beacf3 
								
							
								 
							
						 
						
							
							
								
								Mute state now handled correctly  
							
							
							
						 
						
							2016-07-28 17:24:58 +01:00  
				
					
						
							
							
								 
						
							
							
								94350bc780 
								
							
								 
							
						 
						
							
							
								
								Fixed spelling mistake  
							
							
							
						 
						
							2016-07-28 15:51:46 +01:00  
				
					
						
							
							
								 
						
							
							
								bc902a9741 
								
							
								 
							
						 
						
							
							
								
								Tidy up of the contextual menu refactor  
							
							
							
						 
						
							2016-07-28 14:32:59 +01:00  
				
					
						
							
							
								 
						
							
							
								867b14d2ca 
								
							
								 
							
						 
						
							
							
								
								Reposition context menu now that the styling is final  
							
							
							
						 
						
							2016-07-27 18:14:46 +01:00  
				
					
						
							
							
								 
						
							
							
								46a643ac38 
								
							
								 
							
						 
						
							
							
								
								Now the text spaceing is correct need to align cheveron  
							
							
							
						 
						
							2016-07-27 18:10:45 +01:00  
				
					
						
							
							
								 
						
							
							
								8246d9148c 
								
							
								 
							
						 
						
							
							
								
								Initial context menu with all it's elements  
							
							
							
						 
						
							2016-07-27 17:43:48 +01:00  
				
					
						
							
							
								 
						
							
							
								6e7e091117 
								
							
								 
							
						 
						
							
							
								
								Refactor so that chevron and menu can be positioned independantly  
							
							
							
						 
						
							2016-07-27 16:09:07 +01:00  
				
					
						
							
							
								 
						
							
							
								0660b9feff 
								
							
								 
							
						 
						
							
							
								
								Fixes to properly point to the moved components  
							
							
							
						 
						
							2016-07-27 14:49:10 +01:00  
				
					
						
							
							
								 
						
							
							
								3cb3dd96a6 
								
							
								 
							
						 
						
							
							
								
								Added the moved ContextualMenu to the components list  
							
							
							
						 
						
							2016-07-27 14:23:37 +01:00  
				
					
						
							
							
								 
						
							
							
								3df746ef14 
								
							
								 
							
						 
						
							
							
								
								Revert merge up from develop  
							
							
							
						 
						
							2016-07-27 14:16:17 +01:00  
				
					
						
							
							
								 
						
							
							
								6d141d1a7b 
								
							
								 
							
						 
						
							
							
								
								Only allow none guests to access the context menu  
							
							
							
						 
						
							2016-07-27 11:58:40 +01:00  
				
					
						
							
							
								 
						
							
							
								4b26ac58af 
								
							
								 
							
						 
						
							
							
								
								Re-modularised the context menus  
							
							
							
						 
						
							2016-07-27 10:41:24 +01:00  
				
					
						
							
							
								 
						
							
							
								dca4702b7b 
								
							
								 
							
						 
						
							
							
								
								Fixed a bug where the contextual menu was being incorrectly positioned when zoom in on the webpage  
							
							
							
						 
						
							2016-07-27 09:51:50 +01:00  
				
					
						
							
							
								 
						
							
							
								0eb15085e9 
								
							
								 
							
						 
						
							
							
								
								some code tidyup  
							
							
							
						 
						
							2016-07-26 17:25:16 +01:00  
				
					
						
							
							
								 
						
							
							
								477a17b49f 
								
							
								 
							
						 
						
							
							
								
								Removed debug statement  
							
							
							
						 
						
							2016-07-26 10:39:34 +01:00  
				
					
						
							
							
								 
						
							
							
								8f3e93214c 
								
							
								 
							
						 
						
							
							
								
								Drawing cheveron with CSS so it can be styled  
							
							
							
						 
						
							2016-07-25 18:02:30 +01:00  
				
					
						
							
							
								 
						
							
							
								9c9c5ec458 
								
							
								 
							
						 
						
							
							
								
								Menu context dohickey now sticks when menu shown  
							
							
							
						 
						
							2016-07-25 17:18:45 +01:00  
				
					
						
							
							
								 
						
							
							
								a218b4e8a3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu  
							
							... 
							
							
							
							# resolved Conflicts:
#	src/components/views/rooms/RoomTile.js 
							
						 
						
							2016-07-25 17:04:37 +01:00  
				
					
						
							
							
								 
						
							
							
								8b8486a8d0 
								
							
								 
							
						 
						
							
							
								
								Move from +99 to 99+ for more than 99 messages  
							
							
							
						 
						
							2016-07-25 14:39:15 +01:00  
				
					
						
							
							
								 
						
							
							
								a69107f4f1 
								
							
								 
							
						 
						
							
							
								
								Trying to get the context menu dohicky to stick when menu open  
							
							
							
						 
						
							2016-07-25 10:58:43 +01:00  
				
					
						
							
							
								 
						
							
							
								c89904bc25 
								
							
								 
							
						 
						
							
							
								
								Initial unstyled mentions state notifier context menu  
							
							
							
						 
						
							2016-07-22 17:30:31 +01:00  
				
					
						
							
							
								 
						
							
							
								9b318e8f61 
								
							
								 
							
						 
						
							
							
								
								Getting the corrct height for the placing the context menu  
							
							
							
						 
						
							2016-07-22 16:12:20 +01:00  
				
					
						
							
							
								 
						
							
							
								e4dd6c8dbe 
								
							
								 
							
						 
						
							
							
								
								Browser tooltip being used instead of the HTML styled one.  
							
							
							
						 
						
							2016-07-22 15:15:24 +01:00  
				
					
						
							
							
								 
						
							
							
								6984a55b11 
								
							
								 
							
						 
						
							
							
								
								The tooltip now appears even when not collapsed when hover over the avater, to allow the full name to be shown  
							
							
							
						 
						
							2016-07-22 14:58:09 +01:00  
				
					
						
							
							
								 
						
							
							
								ca75d93434 
								
							
								 
							
						 
						
							
							
								
								Tweaked the offset for the tooltip so that it is next to the element it is tipping  
							
							
							
						 
						
							2016-07-22 11:31:26 +01:00  
				
					
						
							
							
								 
						
							
							
								5d4b03c1f4 
								
							
								 
							
						 
						
							
							
								
								Put back clicking on the name to acces the room  
							
							
							
						 
						
							2016-07-22 11:28:11 +01:00  
				
					
						
							
							
								 
						
							
							
								3dd83922f1 
								
							
								 
							
						 
						
							
							
								
								Tooltip positioning tweaked  
							
							
							
						 
						
							2016-07-22 11:12:11 +01:00  
				
					
						
							
							
								 
						
							
							
								922bb0f402 
								
							
								 
							
						 
						
							
							
								
								+99 badge when notifications are greater the 99  
							
							
							
						 
						
							2016-07-21 18:50:07 +01:00  
				
					
						
							
							
								 
						
							
							
								762873350a 
								
							
								 
							
						 
						
							
							
								
								Badge dohickey shown on name hover and badge hover  
							
							
							
						 
						
							2016-07-21 18:20:12 +01:00  
				
					
						
							
							
								 
						
							
							
								4013ea75d0 
								
							
								 
							
						 
						
							
							
								
								Testing out the context menu  
							
							
							
						 
						
							2016-07-21 17:44:31 +01:00  
				
					
						
							
							
								 
						
							
							
								775fc97102 
								
							
								 
							
						 
						
							
							
								
								Slight refactor to better match current code  
							
							
							
						 
						
							2016-07-21 14:33:54 +01:00  
				
					
						
							
							
								 
						
							
							
								8d2ac5dd5b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #359  from matrix-org/dbkr/remove_account_data_listener  
							
							... 
							
							
							
							Add removeListener for account data listener 
							
						 
						
							2016-07-21 14:02:22 +01:00  
				
					
						
							
							
								 
						
							
							
								030652f289 
								
							
								 
							
						 
						
							
							
								
								Add removeLisatener for account data listener  
							
							
							
						 
						
							2016-07-21 13:49:31 +01:00  
				
					
						
							
							
								 
						
							
							
								46a2c74d71 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #358  from matrix-org/rav/device_id_for_register  
							
							... 
							
							
							
							Set the device_id on pre-login MatrixClient 
							
						 
						
							2016-07-21 13:15:39 +01:00  
				
					
						
							
							
								 
						
							
							
								e41df245c3 
								
							
								 
							
						 
						
							
							
								
								Set the device_id on pre-login MatrixClient  
							
							... 
							
							
							
							In order that device_id is set when we register a new user (or, for that
matter, when we register as a guest), we need to make sure that device_id is
set on the temporary MatrixClient which is created before the user is logged
in - ie, that created by replaceUsingUrls.
In order to achieve this, I've basically removed the distinction between
replaceUsingAccessToken and replaceUsingUrls. There is a side-effect in that
the temporary MatrixClient now gets an e2e sessionStore, but I don't think that
is a bad thing. 
							
						 
						
							2016-07-20 20:20:10 +01:00  
				
					
						
							
							
								 
						
							
							
								165b0810cc 
								
							
								 
							
						 
						
							
							
								
								remove debug  
							
							
							
						 
						
							2016-07-20 18:17:09 +01:00  
				
					
						
							
							
								 
						
							
							
								bc87fc575b 
								
							
								 
							
						 
						
							
							
								
								remove debug  
							
							
							
						 
						
							2016-07-20 18:16:54 +01:00  
				
					
						
							
							
								 
						
							
							
								d6415aceca 
								
							
								 
							
						 
						
							
							
								
								handle accountData changes, and errors on toggling URL previews  
							
							
							
						 
						
							2016-07-20 18:14:16 +01:00  
				
					
						
							
							
								 
						
							
							
								9babf3f92f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #357  from matrix-org/wmwragg/mention-state-indicator-round-2  
							
							... 
							
							
							
							Wmwragg/mention state indicator round 2 
							
						 
						
							2016-07-20 18:01:59 +01:00  
				
					
						
							
							
								 
						
							
							
								ffa43ebb96 
								
							
								 
							
						 
						
							
							
								
								badge content when hovered is now kerned via the CSS  
							
							
							
						 
						
							2016-07-20 17:12:41 +01:00  
				
					
						
							
							
								 
						
							
							
								fb964be072 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #356  from matrix-org/matthew/disable-url-previews  
							
							... 
							
							
							
							Support for disabling/enabling URL previews per-user, per-room and per-user-per-room 
							
						 
						
							2016-07-20 16:43:08 +01:00  
				
					
						
							
							
								 
						
							
							
								02e2ade7d9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #336  from matrix-org/dbkr/add_email_fail_if_in_use  
							
							... 
							
							
							
							Use HS proxy API for requestToken on adding email 
							
						 
						
							2016-07-20 14:05:58 +01:00  
				
					
						
							
							
								 
						
							
							
								ae7e51ae17 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #337  from matrix-org/dbkr/password_reset_email_not_found  
							
							... 
							
							
							
							Error if email already in use when resetting pw 
							
						 
						
							2016-07-20 14:00:12 +01:00  
				
					
						
							
							
								 
						
							
							
								3efd805243 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #355  from matrix-org/dbkr/fix_massive_video  
							
							... 
							
							
							
							Fix enourmous video bug 
							
						 
						
							2016-07-20 13:42:03 +01:00  
				
					
						
							
							
								 
						
							
							
								33edb1dea9 
								
							
								 
							
						 
						
							
							
								
								Made the badge always exist, but if no unread mesasges available then has a different class  
							
							
							
						 
						
							2016-07-20 12:47:32 +01:00  
				
					
						
							
							
								 
						
							
							
								1365f18829 
								
							
								 
							
						 
						
							
							
								
								many stupid thinkos and bugfixes; make it work  
							
							
							
						 
						
							2016-07-20 12:03:13 +01:00  
				
					
						
							
							
								 
						
							
							
								d6df3682f2 
								
							
								 
							
						 
						
							
							
								
								Fix enourmous video bug  
							
							
							
						 
						
							2016-07-20 11:58:49 +01:00  
				
					
						
							
							
								 
						
							
							
								2190dcbe1e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #354  from Half-Shot/develop  
							
							... 
							
							
							
							Add support for sending uploaded content as m.video 
							
						 
						
							2016-07-20 11:15:38 +01:00  
				
					
						
							
							
								 
						
							
							
								514bc2cd51 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #341  from matrix-org/dbkr/tab_complete_most_recently_spoke  
							
							... 
							
							
							
							Order tab complete by most recently spoke 
							
						 
						
							2016-07-19 18:02:09 +01:00