cbfa4dd1ab 
								
							
								 
							
						 
						
							
							
								
								Get rageshake endpoint from SdkConfig instead of storing in rageshake  
							
							... 
							
							
							
							- in preparation for factoring out the sending of the rageshake 
							
						 
						
							2017-04-11 18:46:48 +01:00  
				
					
						
							
							
								 
						
							
							
								b26c460f13 
								
							
								 
							
						 
						
							
							
								
								shrink the redacted tear  
							
							
							
						 
						
							2017-04-10 23:22:25 +01:00  
				
					
						
							
							
								 
						
							
							
								3fa8460ed7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3598  from vector-im/dbkr/clear_cache_button_electron  
							
							... 
							
							
							
							Make the clear cache button work on desktop 
							
						 
						
							2017-04-10 17:56:49 +01:00  
				
					
						
							
							
								 
						
							
							
								7f6d9a625d 
								
							
								 
							
						 
						
							
							
								
								Make the clear cache button work on desktop  
							
							... 
							
							
							
							Implement reload in Platforms to support
https://github.com/matrix-org/matrix-react-sdk/pull/798 
Fixes https://github.com/vector-im/riot-web/issues/3597  
							
						 
						
							2017-04-10 17:40:09 +01:00  
				
					
						
							
							
								 
						
							
							
								a1cb566761 
								
							
								 
							
						 
						
							
							
								
								Bump electron version  
							
							
							
						 
						
							2017-04-10 16:01:21 +01:00  
				
					
						
							
							
								 
						
							
							
								01a96d92f4 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3596  from vector-im/luke/fix-redacted-bg  
							
							... 
							
							
							
							Redacted events bg: black lozenge -> torn paper 
							
						 
						
							2017-04-10 15:59:41 +01:00  
				
					
						
							
							
								 
						
							
							
								0b1745bceb 
								
							
								 
							
						 
						
							
							
								
								Redacted events bg: black lozenge -> torn paper  
							
							
							
						 
						
							2017-04-10 15:49:40 +01:00  
				
					
						
							
							
								 
						
							
							
								7d203f40cd 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3594  from vector-im/rav/send_app_to_rageshake  
							
							... 
							
							
							
							Add 'app' parameter to rageshake report 
							
						 
						
							2017-04-10 15:25:55 +01:00  
				
					
						
							
							
								 
						
							
							
								b8b74402c1 
								
							
								 
							
						 
						
							
							
								
								Add 'app' parameter to rageshake report  
							
							
							
						 
						
							2017-04-10 15:07:43 +01:00  
				
					
						
							
							
								 
						
							
							
								42e317dab8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3578  from vector-im/dbkr/indexeddb_webworker  
							
							... 
							
							
							
							Add support for indexeddb sync in webworker 
							
						 
						
							2017-04-07 16:17:39 +01:00  
				
					
						
							
							
								 
						
							
							
								ec870039bf 
								
							
								 
							
						 
						
							
							
								
								Don't use endsWith as it'll break on old node  
							
							... 
							
							
							
							It's a lodash template though, so use lodash 
							
						 
						
							2017-04-07 14:57:02 +01:00  
				
					
						
							
							
								 
						
							
							
								b65466bc4f 
								
							
								 
							
						 
						
							
							
								
								Use dedicated indexeddb worker import  
							
							
							
						 
						
							2017-04-07 14:41:41 +01:00  
				
					
						
							
							
								 
						
							
							
								515b57ba12 
								
							
								 
							
						 
						
							
							
								
								Update for rename of worker  
							
							
							
						 
						
							2017-04-07 11:23:14 +01:00  
				
					
						
							
							
								 
						
							
							
								4d4da0d7ca 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3574  from vector-im/luke/feature-clickable-emotes  
							
							... 
							
							
							
							Add CSS to make Emote sender cursor : pointer 
							
						 
						
							2017-04-06 15:56:45 +01:00  
				
					
						
							
							
								 
						
							
							
								778e7dcab0 
								
							
								 
							
						 
						
							
							
								
								Add CSS to make Emote sender cursor : pointer  
							
							
							
						 
						
							2017-04-06 14:11:37 +01:00  
				
					
						
							
							
								 
						
							
							
								fd5e94dfad 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3565  from vector-im/rav/remove_rageshake  
							
							... 
							
							
							
							Remove rageshake server 
							
						 
						
							2017-04-06 12:21:33 +01:00  
				
					
						
							
							
								 
						
							
							
								f187a359e6 
								
							
								 
							
						 
						
							
							
								
								Add support for indexeddb sync in webworker  
							
							
							
						 
						
							2017-04-06 11:15:14 +01:00  
				
					
						
							
							
								 
						
							
							
								579e70e967 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3566  from vector-im/luke/clarify-unread-msg-top-banner  
							
							... 
							
							
							
							Adjust CSS for matrix-org/matrix-react-sdk#789  
							
						 
						
							2017-04-04 16:45:38 +01:00  
				
					
						
							
							
								 
						
							
							
								3407f66e82 
								
							
								 
							
						 
						
							
							
								
								Adjust CSS for  matrix-org/matrix-react-sdk#789  
							
							
							
						 
						
							2017-04-04 16:36:05 +01:00  
				
					
						
							
							
								 
						
							
							
								8707cca7bc 
								
							
								 
							
						 
						
							
							
								
								Remove rageshake server  
							
							... 
							
							
							
							This is now at https://github.com/matrix-org/rageshake  
							
						 
						
							2017-04-04 16:29:12 +01:00  
				
					
						
							
							
								 
						
							
							
								e40c6905dd 
								
							
								 
							
						 
						
							
							
								
								more instructions  
							
							
							
						 
						
							2017-04-01 13:33:24 +01:00  
				
					
						
							
							
								 
						
							
							
								84a0ef9695 
								
							
								 
							
						 
						
							
							
								
								spell out that if you're on develop you need to keep your deps up-to-date  
							
							
							
						 
						
							2017-04-01 13:25:16 +01:00  
				
					
						
							
							
								 
						
							
							
								546e2ab30b 
								
							
								 
							
						 
						
							
							
								
								bump emojione  
							
							
							
						 
						
							2017-04-01 01:28:44 +01:00  
				
					
						
							
							
								 
						
							
							
								6380f1a24a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3537  from vector-im/luke/fix-flaky-tests-maybe  
							
							... 
							
							
							
							Fix tests to reflect recent changes 
							
						 
						
							2017-03-29 17:32:31 +02:00  
				
					
						
							
							
								 
						
							
							
								e40d3852ff 
								
							
								 
							
						 
						
							
							
								
								Fix tests to reflect recent changes  
							
							... 
							
							
							
							This is an attempt to reduce flakiness (see https://github.com/matrix-org/matrix-react-sdk/pull/781  also) 
							
						 
						
							2017-03-29 16:07:11 +01:00  
				
					
						
							
							
								 
						
							
							
								e248a7f029 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3536  from vector-im/luke/fix-people-unstable-ordering  
							
							... 
							
							
							
							Do not assume getTs will return comparable integer 
							
						 
						
							2017-03-29 14:40:50 +01:00  
				
					
						
							
							
								 
						
							
							
								91892ec18b 
								
							
								 
							
						 
						
							
							
								
								Do not assume getTs will return comparable integer  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/3529 . In the worst case, tsOfNewestEvent will return MAX_SAFE_INTEGER, instead of undefined, as may be the case of some events that were redacted and persisted in indexDB before changes were made to how events are redacted locally. (The important change is that events are now not stripped of their `origin_server_ts`). 
							
						 
						
							2017-03-29 14:30:08 +01:00  
				
					
						
							
							
								 
						
							
							
								ff2a9f4b20 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3535  from vector-im/dbkr/rename_perf  
							
							... 
							
							
							
							Rename ReactPerf to Perf 
							
						 
						
							2017-03-29 11:53:57 +02:00  
				
					
						
							
							
								 
						
							
							
								a3040e22d3 
								
							
								 
							
						 
						
							
							
								
								Rename ReactPerf to Perf  
							
							... 
							
							
							
							As this makes it work out of the box with react-perf chrome
extension (which doesn't do a whole lot other than save you having
to remember the commands, but is still quite nice). 
							
						 
						
							2017-03-29 10:38:46 +01:00  
				
					
						
							
							
								 
						
							
							
								2480831e2f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3530  from vector-im/dbkr/email_notifs_only_to_email_addresses  
							
							... 
							
							
							
							Don't show phone number as target for email notifs 
							
						 
						
							2017-03-28 16:40:13 +01:00  
				
					
						
							
							
								 
						
							
							
								c72a49d229 
								
							
								 
							
						 
						
							
							
								
								More equalses  
							
							
							
						 
						
							2017-03-28 16:34:35 +01:00  
				
					
						
							
							
								 
						
							
							
								83b7f94609 
								
							
								 
							
						 
						
							
							
								
								Don't show phone number as target for email notifs  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/3518  
							
						 
						
							2017-03-28 16:24:54 +01:00  
				
					
						
							
							
								 
						
							
							
								8b50ed8006 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3458  from vector-im/luke/fix-people-section2  
							
							... 
							
							
							
							Fix people section again 
							
						 
						
							2017-03-27 15:52:15 +02:00  
				
					
						
							
							
								 
						
							
							
								d696196d72 
								
							
								 
							
						 
						
							
							
								
								fix  https://github.com/vector-im/riot-web/issues/3348  
							
							
							
						 
						
							2017-03-27 12:39:58 +01:00  
				
					
						
							
							
								 
						
							
							
								abc5b2d5f4 
								
							
								 
							
						 
						
							
							
								
								UI delay in UI  
							
							
							
						 
						
							2017-03-27 09:44:33 +01:00  
				
					
						
							
							
								 
						
							
							
								f4134167a0 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3479  from t3chguy/t3chguy/dark-theme-invert-inconsistency-fix  
							
							... 
							
							
							
							dark theme invert inconsistent across browsers 
							
						 
						
							2017-03-25 14:06:01 +00:00  
				
					
						
							
							
								 
						
							
							
								bc67b1c87e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3451  from vector-im/dbkr/add_msisdn  
							
							... 
							
							
							
							CSS for adding phone number in UserSettings 
							
						 
						
							2017-03-24 10:53:25 +00:00  
				
					
						
							
							
								 
						
							
							
								4326d7a182 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn  
							
							
							
						 
						
							2017-03-21 13:45:16 +00:00  
				
					
						
							
							
								 
						
							
							
								8e3a68dbdc 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3426  from vector-im/dbkr/msisdn_signin_2  
							
							... 
							
							
							
							Support for phone number registration/signin, mk2 
							
						 
						
							2017-03-21 13:43:49 +00:00  
				
					
						
							
							
								 
						
							
							
								05148b6e93 
								
							
								 
							
						 
						
							
							
								
								Add contributor to listing  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-03-20 13:31:26 +00:00  
				
					
						
							
							
								 
						
							
							
								89447b7bfc 
								
							
								 
							
						 
						
							
							
								
								Explicitly specify level of inversion to avoid inconsistent defaults with webkit-filter/filter  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-03-20 13:31:00 +00:00  
				
					
						
							
							
								 
						
							
							
								af122172f1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3470  from kfatehi/277-confirmredact  
							
							... 
							
							
							
							Confirm redactions with a dialog 
							
						 
						
							2017-03-19 02:36:01 +00:00  
				
					
						
							
							
								 
						
							
							
								a9ed2e20cb 
								
							
								 
							
						 
						
							
							
								
								Confirm redactions with a dialog  
							
							... 
							
							
							
							Closes  #277 
Closes  #1805 
Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com> 
						
							2017-03-18 18:58:24 -07:00  
				
					
						
							
							
								 
						
							
							
								be02ac3bc6 
								
							
								 
							
						 
						
							
							
								
								Fix people section again  
							
							... 
							
							
							
							- Alter CSS due to removed mx_RoomDropTarget_avatar. The avatar was removed because it didn't particularly add anything and we needed space for "Drop here to tag as direct chat", which is quite long.
 - Use guessAndSetDMRoom as a convenience method for guessing the DM member and setting the state.
 - Do evil hacks to make DNDRoomTile do dragging of RoomTiles to and from the People section. Dragging a DM to and from Rooms/Favourites/Low Priority now works as one would expect. This is still not ideal however because edge cases exist where you have more than one tag set and then you drag a DM from "Favourites" to "Rooms" and the tile ends up in "People". This would require setting multiple tags, and breaks the 1-1 mapping between tags and sections even further. Ultimately the UI needs a rework. 
							
						 
						
							2017-03-17 12:14:44 +00:00  
				
					
						
							
							
								 
						
							
							
								e3e2e3a56c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3453  from vector-im/luke/display-redactions-better  
							
							... 
							
							
							
							Better CSS for redactions 
							
						 
						
							2017-03-16 17:12:11 +00:00  
				
					
						
							
							
								 
						
							
							
								49be954d31 
								
							
								 
							
						 
						
							
							
								
								Better CSS for redactions  
							
							... 
							
							
							
							See https://github.com/vector-im/riot-web/issues/3390 
Also: The "Redact" option in the MessageContextMenu no longer appears for redacted events. 
							
						 
						
							2017-03-16 17:03:16 +00:00  
				
					
						
							
							
								 
						
							
							
								ad306dd999 
								
							
								 
							
						 
						
							
							
								
								CSS for add phone number in UserSettings  
							
							
							
						 
						
							2017-03-16 14:59:13 +00:00  
				
					
						
							
							
								 
						
							
							
								2efcf7023f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3448  from vector-im/luke/fix-room-list-people  
							
							... 
							
							
							
							Fix the people section 
							
						 
						
							2017-03-16 13:19:45 +00:00  
				
					
						
							
							
								 
						
							
							
								f8298b2482 
								
							
								 
							
						 
						
							
							
								
								Fix the people section  
							
							... 
							
							
							
							This does two things:
 - Fixes an incorrect import that was causing Direct Chat toggle to not be editable https://github.com/vector-im/riot-web/issues/3355 
 - Use props.list in RoomSubList when calculating whether to show IncomingCallDialog. Fixes https://github.com/vector-im/riot-web/issues/2956  
							
						 
						
							2017-03-16 11:36:57 +00:00  
				
					
						
							
							
								 
						
							
							
								c4d3d66f31 
								
							
								 
							
						 
						
							
							
								
								Support for phone number registration/signin, mk2  
							
							... 
							
							
							
							Changes from https://github.com/vector-im/riot-web/pull/3381  
							
						 
						
							2017-03-14 14:45:54 +00:00