61d7db6eb6 
								
							
								 
							
						 
						
							
							
								
								Correct text alignment on room directory search  
							
							... 
							
							
							
							Seemed to only be broken on firefox 
							
						 
						
							2016-10-26 10:35:46 +01:00  
				
					
						
							
							
								 
						
							
							
								9310d92605 
								
							
								 
							
						 
						
							
							
								
								document integrations config in README  
							
							
							
						 
						
							2016-10-21 14:59:13 +01:00  
				
					
						
							
							
								 
						
							
							
								8a2f57d234 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2491  from vector-im/rav/riot  
							
							... 
							
							
							
							s/vector/riot/ in the readme 
							
						 
						
							2016-10-20 17:06:14 +01:00  
				
					
						
							
							
								 
						
							
							
								d72323bfc5 
								
							
								 
							
						 
						
							
							
								
								typo  
							
							
							
						 
						
							2016-10-20 17:05:44 +01:00  
				
					
						
							
							
								 
						
							
							
								dfd0356609 
								
							
								 
							
						 
						
							
							
								
								s/vector/riot/ in the readme  
							
							... 
							
							
							
							Also remove the outdated "E2E" section
Fixes https://github.com/vector-im/vector-web/issues/2457  
							
						 
						
							2016-10-20 16:54:30 +01:00  
				
					
						
							
							
								 
						
							
							
								20a7aa03ed 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2480  from vector-im/dbkr/babelrc2  
							
							... 
							
							
							
							Switch to babel 6, again 
							
						 
						
							2016-10-17 17:22:49 +01:00  
				
					
						
							
							
								 
						
							
							
								e02e0219a7 
								
							
								 
							
						 
						
							
							
								
								Add plugin that makes babel 6 not break everything  
							
							
							
						 
						
							2016-10-17 16:28:14 +01:00  
				
					
						
							
							
								 
						
							
							
								d04201d069 
								
							
								 
							
						 
						
							
							
								
								Replace stage & es2017 with specific plugins  
							
							... 
							
							
							
							Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh. 
							
						 
						
							2016-10-17 16:28:14 +01:00  
				
					
						
							
							
								 
						
							
							
								82de2ca4ec 
								
							
								 
							
						 
						
							
							
								
								Remove transform-runtime  
							
							... 
							
							
							
							We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead. 
							
						 
						
							2016-10-17 16:28:14 +01:00  
				
					
						
							
							
								 
						
							
							
								18450058d7 
								
							
								 
							
						 
						
							
							
								
								Remove presets from karma.conf  
							
							... 
							
							
							
							seemt o be picked up from .babelrc 
							
						 
						
							2016-10-17 16:28:14 +01:00  
				
					
						
							
							
								 
						
							
							
								f20b2593bc 
								
							
								 
							
						 
						
							
							
								
								move babelcheck.js to scripts/  
							
							
							
						 
						
							2016-10-17 16:28:14 +01:00  
				
					
						
							
							
								 
						
							
							
								4d51a5de7e 
								
							
								 
							
						 
						
							
							
								
								shebang  
							
							
							
						 
						
							2016-10-17 16:28:14 +01:00  
				
					
						
							
							
								 
						
							
							
								8e0b61ca35 
								
							
								 
							
						 
						
							
							
								
								Reminder to restore links + stage2, not stage 0  
							
							
							
						 
						
							2016-10-17 16:28:13 +01:00  
				
					
						
							
							
								 
						
							
							
								61a543a694 
								
							
								 
							
						 
						
							
							
								
								Add babelcheck.js  
							
							... 
							
							
							
							As per 4bea0c0818 
							
						 
						
							2016-10-17 16:28:13 +01:00  
				
					
						
							
							
								 
						
							
							
								5608e97719 
								
							
								 
							
						 
						
							
							
								
								Remove babel-polyfill  
							
							... 
							
							
							
							Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...) 
							
						 
						
							2016-10-17 16:28:13 +01:00  
				
					
						
							
							
								 
						
							
							
								d6f27add66 
								
							
								 
							
						 
						
							
							
								
								Upgrade to babel6 and enable some presets.  
							
							
							
						 
						
							2016-10-17 16:28:13 +01:00  
				
					
						
							
							
								 
						
							
							
								740ab7e479 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2472  from vector-im/revert-2461-aviraldg-babelrc  
							
							... 
							
							
							
							Revert "Switch to babel 6" 
							
						 
						
							2016-10-14 18:51:02 +01:00  
				
					
						
							
							
								 
						
							
							
								ea09a25563 
								
							
								 
							
						 
						
							
							
								
								Revert "Switch to babel 6"  
							
							
							
						 
						
							2016-10-14 18:50:22 +01:00  
				
					
						
							
							
								 
						
							
							
								5a08c62f1b 
								
							
								 
							
						 
						
							
							
								
								Use the default integrations URLs in the sample  
							
							... 
							
							
							
							localhost is not a sensible default 
							
						 
						
							2016-10-14 18:21:26 +01:00  
				
					
						
							
							
								 
						
							
							
								be1d7781c5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2461  from vector-im/aviraldg-babelrc  
							
							... 
							
							
							
							Switch to babel 6 
							
						 
						
							2016-10-14 18:19:43 +01:00  
				
					
						
							
							
								 
						
							
							
								40ac80a3e9 
								
							
								 
							
						 
						
							
							
								
								Replace stage & es2017 with specific plugins  
							
							... 
							
							
							
							Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh. 
							
						 
						
							2016-10-14 18:03:22 +01:00  
				
					
						
							
							
								 
						
							
							
								5f747e1a90 
								
							
								 
							
						 
						
							
							
								
								Remove transform-runtime  
							
							... 
							
							
							
							We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead. 
							
						 
						
							2016-10-13 10:57:10 +01:00  
				
					
						
							
							
								 
						
							
							
								0c3537ac1a 
								
							
								 
							
						 
						
							
							
								
								Remove presets from karma.conf  
							
							... 
							
							
							
							seemt o be picked up from .babelrc 
							
						 
						
							2016-10-13 09:51:10 +01:00  
				
					
						
							
							
								 
						
							
							
								e6caf9ece4 
								
							
								 
							
						 
						
							
							
								
								move babelcheck.js to scripts/  
							
							
							
						 
						
							2016-10-13 09:50:40 +01:00  
				
					
						
							
							
								 
						
							
							
								34c60c69d8 
								
							
								 
							
						 
						
							
							
								
								shebang  
							
							
							
						 
						
							2016-10-13 09:41:09 +01:00  
				
					
						
							
							
								 
						
							
							
								5ff915476a 
								
							
								 
							
						 
						
							
							
								
								Reminder to restore links + stage2, not stage 0  
							
							
							
						 
						
							2016-10-12 18:08:52 +01:00  
				
					
						
							
							
								 
						
							
							
								e5d2ebc57c 
								
							
								 
							
						 
						
							
							
								
								Add babelcheck.js  
							
							... 
							
							
							
							As per 4bea0c0818 
							
						 
						
							2016-10-12 17:46:11 +01:00  
				
					
						
							
							
								 
						
							
							
								64815b1b0b 
								
							
								 
							
						 
						
							
							
								
								Remove babel-polyfill  
							
							... 
							
							
							
							Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...) 
							
						 
						
							2016-10-12 17:23:01 +01:00  
				
					
						
							
							
								 
						
							
							
								59120d3019 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'babelrc' of  https://github.com/aviraldg/vector-web  into aviraldg-babelrc  
							
							
							
						 
						
							2016-10-12 17:17:10 +01:00  
				
					
						
							
							
								 
						
							
							
								9245ab01f1 
								
							
								 
							
						 
						
							
							
								
								js-sdk & react-sdk develop  
							
							
							
						 
						
							2016-10-12 11:52:18 +01:00  
				
					
						
							
							
								 
						
							
							
								59fe9279d1 
								
							
								 
							
						 
						
							
							
								
								0.8.3  
							
							
							
						 
						
							2016-10-12 11:49:58 +01:00  
				
					
						
							
							
								 
						
							
							
								046c9ef920 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v0.8.3  
							
							
							
						 
						
							2016-10-12 11:49:57 +01:00  
				
					
						
							
							
								 
						
							
							
								bca22f26c5 
								
							
								 
							
						 
						
							
							
								
								js-sdk & react-sdk release versions  
							
							
							
						 
						
							2016-10-12 11:49:21 +01:00  
				
					
						
							
							
								 
						
							
							
								2b68b88b14 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2453  from vector-im/rav/center_images_in_dialog_buttons  
							
							... 
							
							
							
							Centre images in dialog buttons 
							
						 
						
							2016-10-11 19:09:46 +01:00  
				
					
						
							
							
								 
						
							
							
								97cedfc712 
								
							
								 
							
						 
						
							
							
								
								Centre images in dialog buttons  
							
							... 
							
							
							
							Some dialogs put a spinner in the button... need to line them up. 
							
						 
						
							2016-10-11 17:50:49 +01:00  
				
					
						
							
							
								 
						
							
							
								86cb3e9376 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2448  from aviraldg/fix-quote  
							
							... 
							
							
							
							Only show quote option if RTE is enabled 
							
						 
						
							2016-10-11 14:39:42 +01:00  
				
					
						
							
							
								 
						
							
							
								42993a78ed 
								
							
								 
							
						 
						
							
							
								
								Only show quote option if RTE is enabled  
							
							
							
						 
						
							2016-10-11 19:07:15 +05:30  
				
					
						
							
							
								 
						
							
							
								2a5ca9d3df 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2443  from vector-im/dbkr/matrix_network_join_button  
							
							... 
							
							
							
							Fix join button for 'matrix' networks 
							
						 
						
							2016-10-10 11:40:32 +01:00  
				
					
						
							
							
								 
						
							
							
								323bd79d0e 
								
							
								 
							
						 
						
							
							
								
								Fix join button for 'matrix' networks  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/vector-web/issues/2435  
							
						 
						
							2016-10-10 11:21:20 +01:00  
				
					
						
							
							
								 
						
							
							
								60adbffacf 
								
							
								 
							
						 
						
							
							
								
								try to fix the create room label  
							
							
							
						 
						
							2016-10-10 02:38:38 +01:00  
				
					
						
							
							
								 
						
							
							
								f827a2963e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2422  from vector-im/dbkr/fix_no_freenode_rooms  
							
							... 
							
							
							
							Don't stop paginating if no rooms match 
							
						 
						
							2016-10-06 10:39:45 +01:00  
				
					
						
							
							
								 
						
							
							
								5e293c0f45 
								
							
								 
							
						 
						
							
							
								
								Don't stop paginating if no rooms match  
							
							... 
							
							
							
							Always show the scrollpanel otherwise we stop paginating if there
are no matching rooms in the first request (as per comment).
Fixes no freenode rooms being shown. 
							
						 
						
							2016-10-05 18:06:43 +01:00  
				
					
						
							
							
								 
						
							
							
								cd7adfed0a 
								
							
								 
							
						 
						
							
							
								
								Back to develop react & js sdk  
							
							
							
						 
						
							2016-10-05 16:59:25 +01:00  
				
					
						
							
							
								 
						
							
							
								902bf3a0a6 
								
							
								 
							
						 
						
							
							
								
								0.8.2  
							
							
							
						 
						
							2016-10-05 16:55:45 +01:00  
				
					
						
							
							
								 
						
							
							
								f736e5243c 
								
							
								 
							
						 
						
							
							
								
								Prepare changelog for v0.8.2  
							
							
							
						 
						
							2016-10-05 16:55:44 +01:00  
				
					
						
							
							
								 
						
							
							
								fb2c2ed09a 
								
							
								 
							
						 
						
							
							
								
								Use released version of react-sdk & js-sdk  
							
							
							
						 
						
							2016-10-05 16:54:24 +01:00  
				
					
						
							
							
								 
						
							
							
								ea38968be9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2379  from vector-im/dbkr/join_3p_location  
							
							... 
							
							
							
							Add native joining of 3p networks to room dir 
							
						 
						
							2016-10-05 14:00:21 +01:00  
				
					
						
							
							
								 
						
							
							
								562b047362 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							
							
						 
						
							2016-10-05 13:49:30 +01:00  
				
					
						
							
							
								 
						
							
							
								381c9009fb 
								
							
								 
							
						 
						
							
							
								
								Doc roomDirectory config section  
							
							
							
						 
						
							2016-10-04 16:21:39 +01:00  
				
					
						
							
							
								 
						
							
							
								c0a4574069 
								
							
								 
							
						 
						
							
							
								
								For single instance, allow domain present & match  
							
							
							
						 
						
							2016-10-04 15:30:46 +01:00