daa46f14c4 
					 
					
						
						
							
							French translation cleanup ( #2223 )  
						
						... 
						
						
						
						* Alphabetically order translation keys
* Fix some missing gender neutral translations in french
* Add a comment to remind contributors to order translations by key 
						
						
					 
					
						2017-04-20 17:19:05 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1ada494bb2 
					 
					
						
						
							
							Admin settings controller refactor, add specs, cleanup ( #2225 )  
						
						... 
						
						
						
						* Add render_views for admin/settings spec
* Add coverage for admin/settings#update
* Add coverage for admin/settings typecasting open_registrations setting
* Simplify how admin/settings finds the value for updating
* Rely on activerecord to not update a value that hasnt changed
* Add coverage for non-existent setting
* Use a constant for boolean settings 
						
						
					 
					
						2017-04-20 17:18:09 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4df26b2621 
					 
					
						
						
							
							it may be mentions_status_id_index is duplicated of index_mentions_on_status_id index. ( #2224 )  
						
						
						
						
					 
					
						2017-04-20 17:13:06 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						556f68ab15 
					 
					
						
						
							
							Make Docker image buildable on ARM ( #2065 )  
						
						... 
						
						
						
						* after yarn upgrade
* after manually removing node-gyp as top level dependency 
						
						
					 
					
						2017-04-20 13:29:38 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fdb2689a14 
					 
					
						
						
							
							Fix PropTypes warning in OnboardingModal ( #2191 )  
						
						
						
						
					 
					
						2017-04-20 13:22:54 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						598d3defd5 
					 
					
						
						
							
							Use default locale for html lang in layouts ( #2212 )  
						
						
						
						
					 
					
						2017-04-20 13:09:31 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7f8044d913 
					 
					
						
						
							
							Link to profile/feed/salmon from admin/accounts show page ( #2186 )  
						
						
						
						
					 
					
						2017-04-20 04:00:02 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						66b39ccaed 
					 
					
						
						
							
							Removes timestamp from URLs. ( #2185 )  
						
						
						
						
					 
					
						2017-04-20 03:54:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cae2a26ee3 
					 
					
						
						
							
							Fix   #2120  - Use Status#as_tag_timeline on public hashtag page ( #2182 )  
						
						... 
						
						
						
						* Fix  #2120  - Use Status#as_tag_timeline on public hashtag page
* Update tags_controller.rb 
						
						
					 
					
						2017-04-20 03:54:02 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b79ba3db8a 
					 
					
						
						
							
							Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none ( #2180 )  
						
						
						
						
					 
					
						2017-04-20 03:12:14 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						59a77923b3 
					 
					
						
						
							
							Add static gif for upload testing ( #2168 )  
						
						
						
						
					 
					
						2017-04-19 23:47:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2e4afccd9d 
					 
					
						
						
							
							Fix   #2108  - Fix gif uploads ( #2171 )  
						
						... 
						
						
						
						* Fix  #2108  - Fix gif uploads
Add specs for media attachment gifv conversion
* Add ffmpeg to travis
* Make travis install ffmpeg, not libav
* Switch travis to trusty 
						
						
					 
					
						2017-04-19 23:21:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0876a06e45 
					 
					
						
						
							
							Updated note about 'none' SMTP authentication method in .env.production.sample ( #2167 )  
						
						
						
						
					 
					
						2017-04-19 23:16:43 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						43caf1fa5f 
					 
					
						
						
							
							Add some Spanish translatoins ( #2170 )  
						
						
						
						
					 
					
						2017-04-19 22:19:41 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2c0d756ad9 
					 
					
						
						
							
							Extract error messages to locale file ( #2162 )  
						
						
						
						
					 
					
						2017-04-19 22:19:32 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f06cba3f60 
					 
					
						
						
							
							Dutch language strings: a few important fixes ( #2163 )  
						
						
						
						
					 
					
						2017-04-19 22:19:19 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						09dad88853 
					 
					
						
						
							
							Fixed hungarian translation ( #2158 )  
						
						
						
						
					 
					
						2017-04-19 19:21:44 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7832425fdd 
					 
					
						
						
							
							Fix css for toot button when uploading images ( #2161 )  
						
						
						
						
					 
					
						2017-04-19 19:21:23 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						abe16a7026 
					 
					
						
						
							
							fix broken style when follower has long description ( #2159 )  
						
						
						
						
					 
					
						2017-04-19 19:20:51 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						baabbce672 
					 
					
						
						
							
							Fix double-escaping of display names in <title> ( #2155 )  
						
						
						
						
					 
					
						2017-04-19 17:46:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1d47910d3b 
					 
					
						
						
							
							Fix possibility of unrightful webfinger redirect ( #2147 )  
						
						... 
						
						
						
						* Fix possibility of unrightful webfinger redirect
* Add more tests for FollowRemoteAccountService 
						
						
					 
					
						2017-04-19 17:28:35 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						708bdd53f1 
					 
					
						
						
							
							Remove unused view files in accounts/ ( #2153 )  
						
						
						
						
					 
					
						2017-04-19 17:19:23 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2510119f19 
					 
					
						
						
							
							Add meta tags for OGP to following & follow page ( #2052 )  
						
						... 
						
						
						
						* Add meta tags for OGP to following & follow page
* simplify render helper
* Follow up #2133 
* og:type is only accounts/show
* revert accounts/{following,followers} 
						
						
					 
					
						2017-04-19 17:17:32 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fe1ddc3b96 
					 
					
						
						
							
							fix Japanese search result translation ( #2149 )  
						
						... 
						
						
						
						add 'result' mean, '件' only mean count unit. 
						
						
					 
					
						2017-04-19 16:41:30 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a3486e0543 
					 
					
						
						
							
							Completed Italian translation ( #2151 )  
						
						... 
						
						
						
						* Added it.jsx
* Update index.jsx
* Update mastodon.jsx 
						
						
					 
					
						2017-04-19 16:40:45 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						30183c0a74 
					 
					
						
						
							
							fix search text 'zero' ( #2150 )  
						
						
						
						
					 
					
						2017-04-19 16:40:24 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						15a4fc5dcc 
					 
					
						
						
							
							Automatically change the size of textarea ( #2128 )  
						
						
						
						
					 
					
						2017-04-19 15:39:46 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a8e1afc30a 
					 
					
						
						
							
							Simplify render in controllers ( #2144 )  
						
						
						
						
					 
					
						2017-04-19 15:37:42 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bfbc2ca0d8 
					 
					
						
						
							
							Attachment list for uncached attachments ( #2110 )  
						
						... 
						
						
						
						* For undownloaded attachments, set type :unknown, display them as a list in the web UI
* Fix case when attachment type is set explicitly 
						
						
					 
					
						2017-04-19 15:37:18 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5ce8a1811a 
					 
					
						
						
							
							Replace User.count -> User.confirmed.count ( #2127 )  
						
						
						
						
					 
					
						2017-04-19 14:58:27 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dca0ffa1a1 
					 
					
						
						
							
							Remove unnecessary word from Japanese locale ( #2143 )  
						
						
						
						
					 
					
						2017-04-19 14:54:47 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						70891a99a9 
					 
					
						
						
							
							Fix html escape characters in the URL ( #2138 )  
						
						... 
						
						
						
						* fix character escaping in URL
* add tests
* put a comma after the last item
* add HTML escape test 
						
						
					 
					
						2017-04-19 14:52:18 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3572f4423f 
					 
					
						
						
							
							enable to scroll the setting's page sidebar ( #1347 )  
						
						... 
						
						
						
						* enable to scroll the setting's page sidebar
add scroll:auto and use margin instead of padding for the bottom
* Update admin.scss
* Update admin.scss
* Update admin.scss 
						
						
					 
					
						2017-04-19 14:30:23 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						23eea5c5ae 
					 
					
						
						
							
							Install Yarn dependencies during setup ( #1169 )  
						
						... 
						
						
						
						Previously the `bin/setup` script only installed the Ruby dependencies
via Bundler. This is not sufficient to get the test suite to pass. We
also need the JavaScript dependencies.
This commit installs the JavaScript dependencies as part of the
`bin/setup` script via Yarn.
This allows for a successful
    bin/setup && bundle exec rake
on a fresh clone of the repo. 
						
						
					 
					
						2017-04-19 14:29:23 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						35bdacba7a 
					 
					
						
						
							
							capistrano: link robots.txt ( #1576 )  
						
						... 
						
						
						
						Related to #1533 . 
						
						
					 
					
						2017-04-19 14:28:23 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						97012487ed 
					 
					
						
						
							
							Do not show link preview card if toot has a spoiler ( #1617 )  
						
						... 
						
						
						
						* Do not show link preview card if toot has a spoiler
* == to === 
						
						
					 
					
						2017-04-19 14:28:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9a7ea7c870 
					 
					
						
						
							
							Moves from hamburger icon to asterisk. ( #2116 )  
						
						
						
						
					 
					
						2017-04-19 14:21:14 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1ac41c873a 
					 
					
						
						
							
							Improve visibility of mute, block, report menu in Japanese ( #2131 )  
						
						
						
						
					 
					
						2017-04-19 14:21:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6c83fec971 
					 
					
						
						
							
							Make configuarable s3_permissions for paperclip ( #2139 )  
						
						
						
						
					 
					
						2017-04-19 14:20:36 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2bb54d5c57 
					 
					
						
						
							
							Update title text for "reply all" button ( #2118 )  
						
						
						
						
					 
					
						2017-04-19 14:20:04 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8b8e140c71 
					 
					
						
						
							
							Change to switch signature version for Amazon S3 ( #2124 )  
						
						
						
						
					 
					
						2017-04-19 14:18:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8bac0350d1 
					 
					
						
						
							
							Restful refactor of accounts/ routes ( #2133 )  
						
						... 
						
						
						
						* Add routing specs for accounts followers and following actions
* Use more restful route naming for public account follow pages
Moves two actions:
- accounts#followers to accounts/follower_accounts#index
- accounts#following to accounts/following_accounts#index
Adds routing spec to ensure prior URLs are preserved. 
						
						
					 
					
						2017-04-19 13:52:37 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c0b30c56db 
					 
					
						
						
							
							Update ja.yml (follow for  #2118 ) ( #2137 )  
						
						... 
						
						
						
						* Update ja.yml (follow for #2118 )
* typo fix 
						
						
					 
					
						2017-04-19 13:44:07 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0a850a8edb 
					 
					
						
						
							
							update simple_form.ja.yml (follow for  #1991 ) ( #2113 )  
						
						
						
						
					 
					
						2017-04-19 03:55:19 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						71f5cf12d2 
					 
					
						
						
							
							update ja.yml (follow for  #2106 ) ( #2109 )  
						
						
						
						
					 
					
						2017-04-19 00:52:30 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9d8bf4ea42 
					 
					
						
						
							
							Update fr.yml ( #2107 )  
						
						... 
						
						
						
						Just updated some values.
Best regards,
cyweo 
						
						
					 
					
						2017-04-19 00:52:19 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						96268e76e6 
					 
					
						
						
							
							Fix wording on admin instances view, fix typos in language detector spec ( #2106 )  
						
						
						
						
					 
					
						2017-04-18 23:39:51 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c6a4ab3b92 
					 
					
						
						
							
							Remove unused fonts ( #2103 )  
						
						
						
						
					 
					
						2017-04-18 23:34:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e09ab2c0bd 
					 
					
						
						
							
							Fix   #1642 ,  fix   #1912  - Dictate content-type file extension ( #2078 )  
						
						... 
						
						
						
						* Fix  #1642 , fix  #1912  - Previous change (#1718 ) did not modify how original file was saved on upload
* Fix for when file is missing 
						
						
					 
					
						2017-04-18 23:15:44 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6bd1019235 
					 
					
						
						
							
							Add more tests for AtomSerializer ( #2096 )  
						
						
						
						
					 
					
						2017-04-18 22:30:17 +02:00