30da6440d0 
					 
					
						
						
							
							Merge branch 'master' of github.com:tootsuite/mastodon  
						
						... 
						
						
						
						It's just an upstream merge 
						
						
					 
					
						2017-04-02 17:04:31 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f4b5fe9caf 
					 
					
						
						
							
							Fix word-break in account profiles  
						
						... 
						
						
						
						word-break:break-all is a surefire way to break things. It should be set
to normal.
This merge just set it back to what it should be.
Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected
errors. 
						
						
					 
					
						2017-04-02 16:54:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4b7dca4713 
					 
					
						
						
							
							Fix wording "show reblogs" -> "show boosts", order reports chronologically in  
						
						... 
						
						
						
						admin UI 
						
						
					 
					
						2017-04-02 16:45:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d6b965cf08 
					 
					
						
						
							
							Fix issue with feed merge-in code as well  
						
						
						
						
					 
					
						2017-04-02 15:58:25 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e809caa0e1 
					 
					
						
						
							
							Fix feed regeneration bug  
						
						
						
						
					 
					
						2017-04-02 15:46:31 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						34aff3e269 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/maximeborges/mastodon  into maximeborges-master  
						
						
						
						
					 
					
						2017-04-02 12:36:26 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3ed75efc31 
					 
					
						
						
							
							Add fr locale for community_timeline in fr.jsx  
						
						
						
						
					 
					
						2017-04-01 23:45:53 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						433cb198fa 
					 
					
						
						
							
							Fix landing page sign up form ignoring username field  
						
						
						
						
					 
					
						2017-04-02 04:13:22 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ae43978433 
					 
					
						
						
							
							improve video button visibililty  
						
						
						
						
					 
					
						2017-04-01 21:02:30 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a8c2e44fee 
					 
					
						
						
							
							Fix broken reference  
						
						
						
						
					 
					
						2017-04-01 22:29:20 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						808017ff18 
					 
					
						
						
							
							Paperclip will complain on its own if this variable is missing  
						
						
						
						
					 
					
						2017-04-01 22:16:26 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						60ebfa182f 
					 
					
						
						
							
							Made modal system more generic  
						
						
						
						
					 
					
						2017-04-01 22:11:28 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f693ab69f3 
					 
					
						
						
							
							Fix word-break in profile's note on profile page and profile component  
						
						
						
						
					 
					
						2017-04-01 20:17:28 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						13dfd8d109 
					 
					
						
						
							
							Improve mobile tabs a little  
						
						
						
						
					 
					
						2017-04-01 15:17:35 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d93d6f5124 
					 
					
						
						
							
							Fix reworked search  
						
						
						
						
					 
					
						2017-03-31 22:45:56 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b4046c5957 
					 
					
						
						
							
							Rework search  
						
						
						
						
					 
					
						2017-03-31 21:11:09 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f20f6b25b9 
					 
					
						
						
							
							Merge branch 'master' into patch-2  
						
						
						
						
					 
					
						2017-03-31 10:34:14 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						680f9efe9c 
					 
					
						
						
							
							Fix web UI profile clickable area overlapping with follow button area  
						
						
						
						
					 
					
						2017-03-31 14:23:44 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bde5c0eaf9 
					 
					
						
						
							
							Fix some views still not using counter caches  
						
						
						
						
					 
					
						2017-03-31 14:02:07 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5e26295e06 
					 
					
						
						
							
							Fix   #700  - hide spoilers on static pages  
						
						
						
						
					 
					
						2017-03-31 13:54:36 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3ac4455160 
					 
					
						
						
							
							:active and :focus states same as :hover for buttons  
						
						
						
						
					 
					
						2017-03-31 12:08:51 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bf61bc1b96 
					 
					
						
						
							
							Fix drag & drop overlay flickering  
						
						
						
						
					 
					
						2017-03-31 11:48:25 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e8875c6046 
					 
					
						
						
							
							Import feature for following/blocking lists (addresses  #62 ,  #177 ,  #201 ,  #454 )  
						
						
						
						
					 
					
						2017-03-30 19:42:33 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						de22c202f5 
					 
					
						
						
							
							Add counter caches for a large performance increase on API requests  
						
						
						
						
					 
					
						2017-03-30 15:06:59 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						333e44c3fc 
					 
					
						
						
							
							Improve emojis - use SVGs where possible  
						
						
						
						
					 
					
						2017-03-29 22:27:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bb7006bda1 
					 
					
						
						
							
							Hide drag & drop area on drop event regardless of success  
						
						
						
						
					 
					
						2017-03-28 14:17:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						139fc994e2 
					 
					
						
						
							
							Fix   #408  - link @ names in bios  
						
						
						
						
					 
					
						2017-03-28 14:16:08 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1c6b02f936 
					 
					
						
						
							
							Fix   #690  - Webfinger should handle new shortform profile URLs now (nice)  
						
						
						
						
					 
					
						2017-03-28 11:25:43 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						76188d61f2 
					 
					
						
						
							
							Clarify post privacy warning  
						
						... 
						
						
						
						I was informed that the current warning if you @ a remote server in a private post is inadequate. These are suggested changes to better inform users. 
						
						
					 
					
						2017-03-26 12:49:14 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c334541011 
					 
					
						
						
							
							Add tooltip to privacy dropdown  
						
						
						
						
					 
					
						2017-03-26 13:30:57 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f864fee116 
					 
					
						
						
							
							Fix up some localizations  
						
						
						
						
					 
					
						2017-03-26 13:22:38 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						efbbd42216 
					 
					
						
						
							
							Fix style issue  
						
						
						
						
					 
					
						2017-03-26 13:13:41 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dddb2eb84f 
					 
					
						
						
							
							Merge branch 'feature/language_zh-cn' of  https://github.com/leopku/mastodon  into leopku-feature/language_zh-cn  
						
						
						
						
					 
					
						2017-03-26 13:10:04 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6ec6fe259a 
					 
					
						
						
							
							Compose form layout fixes  
						
						
						
						
					 
					
						2017-03-26 13:08:15 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d5d5afff9c 
					 
					
						
						
							
							🌐  add simplified chinese language  
						
						
						
						
					 
					
						2017-03-26 14:13:18 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5f7c997654 
					 
					
						
						
							
							Change to using variables  
						
						... 
						
						
						
						Thanks garg 
						
						
					 
					
						2017-03-25 20:42:49 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2b7e3d56c8 
					 
					
						
						
							
							Increase color contrast  
						
						... 
						
						
						
						Privacy descriptions were very difficult to reason. This is the minimal level of color contrast to be WCAG AA compliant. 
						
						
					 
					
						2017-03-25 20:02:36 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c66dc0d114 
					 
					
						
						
							
							Clarify privacy options  
						
						... 
						
						
						
						Descriptions of differences between scope are more clear 
						
						
					 
					
						2017-03-25 19:59:38 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1fd88e3bad 
					 
					
						
						
							
							Fix up visual indicators for compose form privacy  
						
						
						
						
					 
					
						2017-03-25 20:24:30 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b8f9de8636 
					 
					
						
						
							
							Improve sign up page on small screens  
						
						
						
						
					 
					
						2017-03-25 20:13:34 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a9303e7062 
					 
					
						
						
							
							When replying to status with content warning, prefill content warning  
						
						
						
						
					 
					
						2017-03-25 19:30:56 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ad1af951fb 
					 
					
						
						
							
							Temporary spacing fix  
						
						
						
						
					 
					
						2017-03-25 19:27:31 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bd1ceb1daa 
					 
					
						
						
							
							Privacy dropdown i18n  
						
						
						
						
					 
					
						2017-03-25 19:22:24 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						99ca63a543 
					 
					
						
						
							
							Fix public profile pagination links  
						
						
						
						
					 
					
						2017-03-25 19:16:17 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d8c5a83827 
					 
					
						
						
							
							Redesigned compose form  
						
						
						
						
					 
					
						2017-03-25 19:14:12 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9bf4c34919 
					 
					
						
						
							
							Fix   #675  - return created_at in notifications API  
						
						
						
						
					 
					
						2017-03-24 03:55:45 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d7c6c6dbe1 
					 
					
						
						
							
							Fancier drag & drop indicator, emoji icon for emoji, upload progress ( fix   #295 )  
						
						
						
						
					 
					
						2017-03-24 03:55:45 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d6ed2eb512 
					 
					
						
						
							
							Prettier account and stream entry URLs  
						
						
						
						
					 
					
						2017-03-22 19:55:14 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						33fac87e81 
					 
					
						
						
							
							Shorter timeout on FetchAtomService  
						
						
						
						
					 
					
						2017-03-22 17:41:52 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5aa3df017b 
					 
					
						
						
							
							Fix full-text search query quotation, improve tag search performance with an index,  
						
						... 
						
						
						
						add ability to open status by URL from search (fix  #53 ) 
						
						
					 
					
						2017-03-22 17:36:34 +01:00