Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								770820e6fa
								
							
								
							
						 | 
						
							
							
								
								Fix a bunch of lint complaints
							
							
							
							
							
						 | 
						
							2017-01-24 22:41:52 +00:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								72492fd909
								
							
								
							
						 | 
						
							
							
								
								Fix broken merge
							
							
							
							
							
							
							
							I messed up the merge in 6dd46d5. 
							
						 | 
						
							2017-01-24 20:55:10 +00:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								6dd46d532a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux
							
							
							
							
							
						 | 
						
							2017-01-24 20:47:24 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								937f13d578
								
							
								
							
						 | 
						
							
							
								
								fix a bunch of dark-theme buttons
							
							
							
							
							
						 | 
						
							2017-01-20 21:00:22 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								18d4d3392a
								
							
								
							
						 | 
						
							
							
								
								Fix a bunch of linting errors
							
							
							
							
							
							
							
							eslint --fix and a few manual ones 
							
						 | 
						
							2017-01-20 14:22:27 +00:00 | 
						
					
				
					
						
							
							
								 
								Jani Mustonen
							
						 | 
						
							
							
							
							
								
							
								959163f2ef
								
							
								
							
						 | 
						
							
							
								
								Proper accessible buttons
							
							
							
							
							
						 | 
						
							2017-01-13 19:36:41 +02:00 | 
						
					
				
					
						
							
							
								 
								Jani Mustonen
							
						 | 
						
							
							
							
							
								
							
								8d79716421
								
							
								
							
						 | 
						
							
							
								
								Turned the links to buttons to comply with MDN's recommendations
							
							
							
							
							
						 | 
						
							2017-01-13 19:36:40 +02:00 | 
						
					
				
					
						
							
							
								 
								Jani Mustonen
							
						 | 
						
							
							
							
							
								
							
								ad072cc179
								
							
								
							
						 | 
						
							
							
								
								Turned buttons from divs to links. Makes it possible for screen readers and hotkeys to recognize the buttons.
							
							
							
							
							
						 | 
						
							2017-01-13 19:36:40 +02:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								a2eb0a9cf0
								
							
								
							
						 | 
						
							
							
								
								Fix CPU spin on joining rooms
							
							
							
							
							
							
							
							Ratelimit roomheader's updates and move some other things into
rate limited functions. 
							
						 | 
						
							2016-10-26 13:09:53 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								ca5204c3f8
								
							
								
							
						 | 
						
							
							
								
								fix collapsed tooltip - https://github.com/vector-im/vector-web/issues/2381
							
							
							
							
							
						 | 
						
							2016-09-30 00:17:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								eb6a4f97ba
								
							
								
							
						 | 
						
							
							
								
								make it work
							
							
							
							
							
						 | 
						
							2016-09-13 19:00:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								32b1b6f58a
								
							
								
							
						 | 
						
							
							
								
								WIP
							
							
							
							
							
						 | 
						
							2016-09-13 13:12:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								3b52081092
								
							
								
							
						 | 
						
							
							
								
								wip for collapsable RHS
							
							
							
							
							
						 | 
						
							2016-09-13 12:18:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								3704e2c648
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #402 from matrix-org/wmwragg/room-tag-menu
							
							
							
							
							
							
							
							Wmwragg/room tag menu 
							
						 | 
						
							2016-08-11 08:59:32 -05:00 | 
						
					
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 | 
						
							
							
							
							
								
							
								4c1dcb924b
								
							
								
							
						 | 
						
							
							
								
								reskindex and use sdk.getComponent for EmojiText
							
							
							
							
							
						 | 
						
							2016-08-11 07:55:12 +05:30 | 
						
					
				
					
						
							
							
								 
								wmwragg
							
						 | 
						
							
							
							
							
								
							
								e2d3631e7c
								
							
								
							
						 | 
						
							
							
								
								Menu colour now changeable, and leave room item hooked up
							
							
							
							
							
						 | 
						
							2016-08-10 16:34:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 | 
						
							
							
							
							
								
							
								09e8a45cde
								
							
								
							
						 | 
						
							
							
								
								Add EmojiText component for emoji replacement.
							
							
							
							
							
						 | 
						
							2016-08-10 00:31:51 +05:30 | 
						
					
				
					
						
							
							
								 
								wmwragg
							
						 | 
						
							
							
							
							
								
							
								fd5d28768a
								
							
								
							
						 | 
						
							
							
								
								Simplification of the css
							
							
							
							
							
						 | 
						
							2016-07-14 12:05:00 +01:00 | 
						
					
				
					
						
							
							
								 
								wmwragg
							
						 | 
						
							
							
							
							
								
							
								f6302fc990
								
							
								
							
						 | 
						
							
							
								
								Updated the search button, and simplified the leave css
							
							
							
							
							
						 | 
						
							2016-07-14 11:43:33 +01:00 | 
						
					
				
					
						
							
							
								 
								wmwragg
							
						 | 
						
							
							
							
							
								
							
								936a38a9f4
								
							
								
							
						 | 
						
							
							
								
								Updated and moved the room header settings icon
							
							
							
							
							
						 | 
						
							2016-07-13 16:02:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Aviral Dasgupta
							
						 | 
						
							
							
							
							
								
							
								020f1f4320
								
							
								
							
						 | 
						
							
							
								
								feat: emojify ALL THE THINGS!
							
							
							
							
							
						 | 
						
							2016-07-05 10:16:17 +05:30 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								336d91dadb
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #272 from matrix-org/rav/fix_roomname
							
							
							
							
							
							
							
							Make sure that we update the room name 
							
						 | 
						
							2016-04-17 18:12:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								009781dac7
								
							
								
							
						 | 
						
							
							
								
								prep for RightPanel full collapse
							
							
							
							
							
						 | 
						
							2016-04-15 18:45:40 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								8680afe46f
								
							
								
							
						 | 
						
							
							
								
								Make sure that we update the room name
							
							
							
							
							
							
							
							It turns out that RoomState.events is fired before Room.name is updated; make
sure that we pick up the latter and do the update. 
							
						 | 
						
							2016-04-15 10:01:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								3a2d5c4ba5
								
							
								
							
						 | 
						
							
							
								
								spinner on saving room settings
							
							
							
							
							
						 | 
						
							2016-04-12 18:01:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								0d261c37c2
								
							
								
							
						 | 
						
							
							
								
								Update room header when room state changes
							
							
							
							
							
							
							
							Force an update so that we see the latest state.
Fixes https://github.com/vector-im/vector-web/issues/1299 
							
						 | 
						
							2016-03-29 16:31:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								6422f7ecc8
								
							
								
							
						 | 
						
							
							
								
								Factor out separate RoomNameEditor and RoomTopicEditor components
							
							
							
							
							
						 | 
						
							2016-03-29 15:21:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Richard van der Hoff
							
						 | 
						
							
							
							
							
								
							
								70133ae661
								
							
								
							
						 | 
						
							
							
								
								Factor out SimpleRoomHeader
							
							
							
							
							
							
							
							Start cleaning up RoomHeader by factoring out a separate SimpleRoomHeader. 
							
						 | 
						
							2016-03-29 12:51:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								5bdcb64464
								
							
								
							
						 | 
						
							
							
								
								fix NPE
							
							
							
							
							
						 | 
						
							2016-03-21 00:51:45 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								31ed7b9dd7
								
							
								
							
						 | 
						
							
							
								
								fix state caching bugs in RoomHeader
							
							
							
							
							
						 | 
						
							2016-03-21 00:39:33 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								86807b631d
								
							
								
							
						 | 
						
							
							
								
								don't reset RoomHeader every time the props change due to RoomView re-rendering during edits
							
							
							
							
							
						 | 
						
							2016-03-18 19:16:55 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								5b505cd32d
								
							
								
							
						 | 
						
							
							
								
								Remove (broken, as it turns out) permission logic from react sdk and use https://github.com/matrix-org/matrix-js-sdk/pull/94 instead.
							
							
							
							
							
						 | 
						
							2016-03-03 17:58:41 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								45857fa12c
								
							
								
							
						 | 
						
							
							
								
								Remove unused voice & video on-clicks from RoomHeader.
							
							
							
							
							
						 | 
						
							2016-03-02 14:54:38 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								d61f383748
								
							
								
							
						 | 
						
							
							
								
								Oops, actually assign variable
							
							
							
							
							
						 | 
						
							2016-03-02 11:57:05 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								10b1b6443d
								
							
								
							
						 | 
						
							
							
								
								Fix rooms we don't have any info about
							
							
							
							
							
						 | 
						
							2016-03-02 10:59:54 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								9085a2a866
								
							
								
							
						 | 
						
							
							
								
								Pass room metadata from 3pid invite emails all the way through to the relevant components so we can display it.
							
							
							
							
							
						 | 
						
							2016-03-01 18:23:57 +00:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								7ef1ba0b44
								
							
								
							
						 | 
						
							
							
								
								Unbreak RoomHeader
							
							
							
							
							
						 | 
						
							2016-01-22 11:48:26 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								deca90d0a7
								
							
								
							
						 | 
						
							
							
								
								fix up Start Chat behaviour as per Amandine's feedback
							
							
							
							
							
						 | 
						
							2016-01-21 00:16:10 +00:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								2a64d0feb3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into matthew/roomsettings2
							
							
							
							
							
						 | 
						
							2016-01-18 10:49:45 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								5b5bd9aef1
								
							
								
							
						 | 
						
							
							
								
								remove create_room for now. lots of stupid bugfixes across the board.
							
							
							
							
							
						 | 
						
							2016-01-17 03:59:31 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								f476150591
								
							
								
							
						 | 
						
							
							
								
								fix changeavatar to avoid duplicate click on label
							
							
							
							
							
						 | 
						
							2016-01-15 16:33:34 +00:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								d8d79722ac
								
							
								
							
						 | 
						
							
							
								
								Make RoomAvatar use BaseAvatar
							
							
							
							
							
						 | 
						
							2016-01-15 16:13:25 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								0caf5e0cdc
								
							
								
							
						 | 
						
							
							
								
								manage permissions on whether people can actually edit name, topic, avatar etc or not
							
							
							
							
							
						 | 
						
							2016-01-15 15:51:40 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								aefecfc645
								
							
								
							
						 | 
						
							
							
								
								tweak roomheader layout when editing
							
							
							
							
							
						 | 
						
							2016-01-15 15:23:41 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								4a2c2d9656
								
							
								
							
						 | 
						
							
							
								
								fix broken merge and revert some of 243b2e45 and document evil magic numbers
							
							
							
							
							
						 | 
						
							2016-01-15 14:22:17 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								1b7d80a8cd
								
							
								
							
						 | 
						
							
							
								
								s/getImplicitRoomName/getDefaultRoomName/ # as kegan doesn't like the word 'implicit'
							
							
							
							
							
						 | 
						
							2016-01-13 14:04:00 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								bd226609d0
								
							
								
							
						 | 
						
							
							
								
								fix onclick for all of room name
							
							
							
							
							
						 | 
						
							2016-01-11 18:44:36 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								ddd8838b24
								
							
								
							
						 | 
						
							
							
								
								linkify topics
							
							
							
							
							
						 | 
						
							2016-01-11 12:46:12 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								6351258b0e
								
							
								
							
						 | 
						
							
							
								
								use room.getImplicitRoomName() from matthew/roomsettings2 branch of matrix-js-sdk for the placeholder roomname
							
							
							
							
							
						 | 
						
							2016-01-10 20:01:30 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								0cb6094992
								
							
								
							
						 | 
						
							
							
								
								show implicit names as placeholders if available
							
							
							
							
							
						 | 
						
							2016-01-10 18:46:08 +00:00 |