3366d3bbae 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #859  from matrix-org/dbkr/left_panel_for_newbies_2  
							
							... 
							
							
							
							Make left panel better for new users (mk II) 
							
						 
						
							2017-05-08 10:37:55 +01:00  
				
					
						
							
							
								 
						
							
							
								ceb71a4ef6 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #866  from t3chguy/warn_on_unload  
							
							... 
							
							
							
							Explicitly save composer content onUnload 
							
						 
						
							2017-05-07 20:07:09 +01:00  
				
					
						
							
							
								 
						
							
							
								a141350670 
								
							
								 
							
						 
						
							
							
								
								Explicitly save composer content onUnload  
							
							... 
							
							
							
							small oversight, caught by Matthew
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-07 20:01:55 +01:00  
				
					
						
							
							
								 
						
							
							
								f056360f70 
								
							
								 
							
						 
						
							
							
								
								merge master post release  
							
							
							
						 
						
							2017-05-07 20:01:11 +01:00  
				
					
						
							
							
								 
						
							
							
								5900c879ce 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #851  from t3chguy/warn_on_unload  
							
							... 
							
							
							
							Warn on unload 
							
						 
						
							2017-05-07 18:17:18 +01:00  
				
					
						
							
							
								 
						
							
							
								2b2b43a7f3 
								
							
								 
							
						 
						
							
							
								
								Content in Composer is not lost on unload so it should be fine  
							
							... 
							
							
							
							to scare the user thinking they have lost all of their content
even though when they come back they can cry with joy :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-07 18:16:10 +01:00  
				
					
						
							
							
								 
						
							
							
								2b71123ddc 
								
							
								 
							
						 
						
							
							
								
								suppress null member rejoins again  
							
							... 
							
							
							
							reverts f5fe4b2433https://github.com/vector-im/riot-web/issues/3788  
							
						 
						
							2017-05-06 01:45:37 +01:00  
				
					
						
							
							
								 
						
							
							
								1a0ea29995 
								
							
								 
							
						 
						
							
							
								
								Remove redundant role elements  
							
							
							
						 
						
							2017-05-05 17:51:14 +01:00  
				
					
						
							
							
								 
						
							
							
								4fc4ae1e99 
								
							
								 
							
						 
						
							
							
								
								Size is a string, import react  
							
							... 
							
							
							
							React gets put in by the JSX transpile 
							
						 
						
							2017-05-05 14:56:26 +01:00  
				
					
						
							
							
								 
						
							
							
								28e0a32d6c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #862  from matrix-org/rav/log_device_id  
							
							... 
							
							
							
							Log deviceid at login 
							
						 
						
							2017-05-05 14:52:49 +01:00  
				
					
						
							
							
								 
						
							
							
								4a5821e199 
								
							
								 
							
						 
						
							
							
								
								Separate classes for the different buttons  
							
							... 
							
							
							
							Also rename RoleButton to ActionButton because it's not being
given a Role any more. 
							
						 
						
							2017-05-05 14:25:18 +01:00  
				
					
						
							
							
								 
						
							
							
								e00605571b 
								
							
								 
							
						 
						
							
							
								
								Fix the spinner to actually appear  
							
							... 
							
							
							
							We started with clientSyncState being null, which it remained
until the SYNCING event was emitted. We need to set
clientSyncState's initial value correctly. 
							
						 
						
							2017-05-05 10:48:54 +01:00  
				
					
						
							
							
								 
						
							
							
								f86ca5bc97 
								
							
								 
							
						 
						
							
							
								
								Hide empty tips if collapsed  
							
							
							
						 
						
							2017-05-04 18:08:04 +01:00  
				
					
						
							
							
								 
						
							
							
								bfceaa827b 
								
							
								 
							
						 
						
							
							
								
								Log deviceid at login  
							
							... 
							
							
							
							- to help understand rageshakes 
							
						 
						
							2017-05-04 18:04:47 +01:00  
				
					
						
							
							
								 
						
							
							
								8d4663f437 
								
							
								 
							
						 
						
							
							
								
								Fix lint in Lifecycle.js  
							
							
							
						 
						
							2017-05-04 18:03:35 +01:00  
				
					
						
							
							
								 
						
							
							
								8e3851b380 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #860  from t3chguy/patch-4  
							
							... 
							
							
							
							Guests can't send RR so no point trying 
							
						 
						
							2017-05-04 17:53:59 +01:00  
				
					
						
							
							
								 
						
							
							
								6e30134403 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #861  from matrix-org/dbkr/remove_babelcheck  
							
							... 
							
							
							
							Remove babelcheck 
							
						 
						
							2017-05-04 17:45:37 +01:00  
				
					
						
							
							
								 
						
							
							
								f76b9b4489 
								
							
								 
							
						 
						
							
							
								
								remove link to issue  
							
							... 
							
							
							
							not very useful 
							
						 
						
							2017-05-04 17:25:23 +01:00  
				
					
						
							
							
								 
						
							
							
								7918ff2fc2 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #857  from t3chguy/t3chguy/settings_versions_improvements  
							
							... 
							
							
							
							T3chguy/settings versions improvements 
							
						 
						
							2017-05-04 16:56:45 +01:00  
				
					
						
							
							
								 
						
							
							
								396b38512c 
								
							
								 
							
						 
						
							
							
								
								Remove babelcheck  
							
							... 
							
							
							
							Nobody is likley to be upgrading from babel 5 any more, so this
can go away now. 
							
						 
						
							2017-05-04 16:50:47 +01:00  
				
					
						
							
							
								 
						
							
							
								da4c2f8b31 
								
							
								 
							
						 
						
							
							
								
								Guests can't send RR  
							
							... 
							
							
							
							so they shouldn't try
lets not hit the HS quite as much 
							
						 
						
							2017-05-04 16:42:41 +01:00  
				
					
						
							
							
								 
						
							
							
								c8b0a15902 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #852  from t3chguy/max-len  
							
							... 
							
							
							
							Change max-len 90->120 
							
						 
						
							2017-05-04 16:24:20 +01:00  
				
					
						
							
							
								 
						
							
							
								3c6e301f7f 
								
							
								 
							
						 
						
							
							
								
								Improve regex to ignore trailing -dirty and for rc tags  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-04 16:22:39 +01:00  
				
					
						
							
							
								 
						
							
							
								909cdb6e9a 
								
							
								 
							
						 
						
							
							
								
								Depend on prop-types module  
							
							... 
							
							
							
							So we can start writing code compatible with new React 
							
						 
						
							2017-05-04 16:22:06 +01:00  
				
					
						
							
							
								 
						
							
							
								2edfc3e598 
								
							
								 
							
						 
						
							
							
								
								remove commented out code as per review  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-04 15:51:31 +01:00  
				
					
						
							
							
								 
						
							
							
								cb478f1194 
								
							
								 
							
						 
						
							
							
								
								no idea why those got in there...  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-04 15:50:52 +01:00  
				
					
						
							
							
								 
						
							
							
								72df43d22b 
								
							
								 
							
						 
						
							
							
								
								Year  
							
							
							
						 
						
							2017-05-04 15:46:24 +01:00  
				
					
						
							
							
								 
						
							
							
								306ea58578 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2  
							
							
							
						 
						
							2017-05-04 15:45:05 +01:00  
				
					
						
							
							
								 
						
							
							
								6a1d0fbab5 
								
							
								 
							
						 
						
							
							
								
								Make bottom left menu buttons use RoleButton too  
							
							
							
						 
						
							2017-05-04 15:38:09 +01:00  
				
					
						
							
							
								 
						
							
							
								0998adb366 
								
							
								 
							
						 
						
							
							
								
								What year is it? Who's the president?  
							
							
							
						 
						
							2017-05-04 15:02:21 +01:00  
				
					
						
							
							
								 
						
							
							
								d5b49a11d7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #829  from matrix-org/luke/fix-people-section-disappearing  
							
							... 
							
							
							
							Remove DM-guessing code 
							
						 
						
							2017-05-04 14:15:28 +01:00  
				
					
						
							
							
								 
						
							
							
								e1c99430cb 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2  
							
							
							
						 
						
							2017-05-04 14:04:22 +01:00  
				
					
						
							
							
								 
						
							
							
								ce119a6364 
								
							
								 
							
						 
						
							
							
								
								Add buttons to room sub list headers  
							
							
							
						 
						
							2017-05-04 13:55:52 +01:00  
				
					
						
							
							
								 
						
							
							
								694fc26a55 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #855  from matrix-org/luke/fix-jump-to-rm-in-mels  
							
							... 
							
							
							
							Fix jumping to an unread event when in MELS 
							
						 
						
							2017-05-04 13:03:30 +01:00  
				
					
						
							
							
								 
						
							
							
								6d9a1f047d 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							
							
						 
						
							2017-05-04 13:03:04 +01:00  
				
					
						
							
							
								 
						
							
							
								bfa3123f9b 
								
							
								 
							
						 
						
							
							
								
								Combine data-scroll-token and -contained-scroll-tokens  
							
							... 
							
							
							
							- Instead of using one attribute, use one that might just contain one token
 - Use the first token when tracking a child
 - Mandate that no commas can be in individual tokens 
							
						 
						
							2017-05-04 10:00:13 +01:00  
				
					
						
							
							
								 
						
							
							
								9d92f93fcb 
								
							
								 
							
						 
						
							
							
								
								consolidate call onPageUnload handler into RoomView  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-03 16:39:19 +01:00  
				
					
						
							
							
								 
						
							
							
								356d29939c 
								
							
								 
							
						 
						
							
							
								
								also warn when quitting mid-call  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-03 16:25:27 +01:00  
				
					
						
							
							
								 
						
							
							
								b6fd771b9a 
								
							
								 
							
						 
						
							
							
								
								move implementation to MessageComposer to it applies to any future composers  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-03 16:21:35 +01:00  
				
					
						
							
							
								 
						
							
							
								74b2c86f93 
								
							
								 
							
						 
						
							
							
								
								tidy up UserSettings  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-02 21:17:12 +01:00  
				
					
						
							
							
								 
						
							
							
								76e98d4267 
								
							
								 
							
						 
						
							
							
								
								improve version hyperlinking  
							
							... 
							
							
							
							removed redundant v prefix (key already says version)
links to most applicable version/tag
tag-commit -> commit
commit1-commit2-commit3 -> commit1
(v)x.y.z -> tag<x.y.z>
commit -> commit
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-05-02 21:12:58 +01:00  
				
					
						
							
							
								 
						
							
							
								f4bb76922d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #856  from matrix-org/luke/fix-phone-number-invalid-feedback  
							
							... 
							
							
							
							Validate phone number on login 
							
						 
						
							2017-05-02 19:45:27 +01:00  
				
					
						
							
							
								 
						
							
							
								af137f8867 
								
							
								 
							
						 
						
							
							
								
								Validate phone number on login  
							
							... 
							
							
							
							To prevent confusion when accidently inputting mxid or email. Fixes https://github.com/vector-im/riot-web/issues/3637  
							
						 
						
							2017-05-02 18:30:46 +01:00  
				
					
						
							
							
								 
						
							
							
								4febc63aee 
								
							
								 
							
						 
						
							
							
								
								Add comment to _scrollToToken  
							
							
							
						 
						
							2017-05-02 17:41:09 +01:00  
				
					
						
							
							
								 
						
							
							
								fe83a99ab7 
								
							
								 
							
						 
						
							
							
								
								Update ScrollPanel docs  
							
							
							
						 
						
							2017-05-02 17:36:59 +01:00  
				
					
						
							
							
								 
						
							
							
								3f25928380 
								
							
								 
							
						 
						
							
							
								
								Fix jumping to an unread event when in MELS  
							
							... 
							
							
							
							This adds the `data-contained-scroll-tokens` API to elements in `ScrollPanel` which allows arbitrary containers of elements with scroll tokens to declare their contained scroll tokens. When jumping to a scroll token inside a container, the `ScrollPanel` will act as if it is scrolling to the container itself, not the child.
MELS has been modified such that it exposes the scroll tokens of all events that exist within it.This means "Jump to unread message" will work if the unread event is within a MELS (which is any member event, because even individual member events surrounded by other events are put inside a MELS). 
							
						 
						
							2017-05-02 16:34:39 +01:00  
				
					
						
							
							
								 
						
							
							
								4f72450847 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #827  from t3chguy/develop  
							
							... 
							
							
							
							Failed to enable HTML5 Notifications Error Dialogs 
							
						 
						
							2017-04-30 13:40:27 +01:00  
				
					
						
							
							
								 
						
							
							
								e11dd23026 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #854  from t3chguy/patch-2  
							
							... 
							
							
							
							Pin filesize ver to fix break upstream 
							
						 
						
							2017-04-30 13:08:56 +01:00  
				
					
						
							
							
								 
						
							
							
								c8fb18dc93 
								
							
								 
							
						 
						
							
							
								
								Pin filesize ver to fix break upstream  
							
							... 
							
							
							
							https://travis-ci.org/vector-im/riot-web/builds/227340622 
https://github.com/avoidwork/filesize.js/issues/87 
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us 
						
							2017-04-30 13:00:47 +01:00  
				
					
						
							
							
								 
						
							
							
								86a5ff42e9 
								
							
								 
							
						 
						
							
							
								
								Change max-len 90->120  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2017-04-29 14:23:08 +01:00