Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9d2739d74d 
								
							 
						 
						
							
							
								
								Add a setting to automatically unfold all content warnings  
							
							
							
						 
						
							2018-08-31 18:35:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								130bdb5ee8 
								
							 
						 
						
							
							
								
								[Glitch] Show compose form on delete & redraft when in mobile layout  
							
							... 
							
							
							
							Port 025fbb8285 
							
						 
						
							2018-08-31 18:33:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								0f1db47a7e 
								
							 
						 
						
							
							
								
								Fix search results on compose box  
							
							
							
						 
						
							2018-08-31 18:33:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b4f548fa18 
								
							 
						 
						
							
							
								
								Fix account header showing on search page  
							
							
							
						 
						
							2018-08-31 18:33:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4a686ddf8a 
								
							 
						 
						
							
							
								
								[Glitch] On the mobile UI, move the search column to the right  
							
							... 
							
							
							
							Port 20bb90ced6 
							
						 
						
							2018-08-31 18:33:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4686b3fa76 
								
							 
						 
						
							
							
								
								[Glitch] Hide search from Compose on mobile devices  
							
							... 
							
							
							
							Port 0893b16695 
							
						 
						
							2018-08-31 18:33:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								37a00d4c1d 
								
							 
						 
						
							
							
								
								[Glitch] Add search item to tab bar for mobile devices  
							
							... 
							
							
							
							Port c9cbb8de70 
							
						 
						
							2018-08-31 18:33:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								76a3f373e3 
								
							 
						 
						
							
							
								
								[Glitch] Use withRouter for TabsBar  
							
							... 
							
							
							
							Port 61e6275781 
							
						 
						
							2018-08-31 18:33:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5f035a2a1a 
								
							 
						 
						
							
							
								
								[Glitch] Move "compose" on mobile to floating action button  
							
							... 
							
							
							
							Port e72db6d9dd 
							
						 
						
							2018-08-31 18:33:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								70c308c4aa 
								
							 
						 
						
							
							
								
								[Glitch] When search enabled, display hint in search popout  
							
							... 
							
							
							
							Port 7901f9f63e 
							
						 
						
							2018-08-31 18:33:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5d647197ec 
								
							 
						 
						
							
							
								
								Add bookmarks to archive takeout  
							
							
							
						 
						
							2018-08-30 16:29:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c20b27a9f4 
								
							 
						 
						
							
							
								
								Restrict querySelectorAll to the upload form component  
							
							
							
						 
						
							2018-08-30 13:20:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1544ac4e27 
								
							 
						 
						
							
							
								
								Add confirmation dialog when posting media without description  
							
							... 
							
							
							
							Fixes  #211  
						
							2018-08-30 13:20:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5ce6727669 
								
							 
						 
						
							
							
								
								[Glitch] Reduce padding of profile metadata boxes to allow more text  
							
							... 
							
							
							
							Port 9463bba5fb 
							
						 
						
							2018-08-29 19:28:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								171e54eb46 
								
							 
						 
						
							
							
								
								Add opt-in feature to have the spoilers field always on ( fixes   #634 )  
							
							
							
						 
						
							2018-08-29 14:29:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b479f08c5 
								
							 
						 
						
							
							
								
								Merge pull request  #690  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-08-29 14:23:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c24491a8df 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-08-29 13:57:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									caasi Huang 
								
							 
						 
						
							
							
							
							
								
							
							
								702a926299 
								
							 
						 
						
							
							
								
								Replace '貼' with '嘟' for 'toot' ( #8421 )  
							
							... 
							
							
							
							Replace '貼' with '嘟' so the web front-end looks more consistent. 
							
						 
						
							2018-08-29 18:05:22 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Satsuki Yanagi 
								
							 
						 
						
							
							
							
							
								
							
							
								ad94e1d50a 
								
							 
						 
						
							
							
								
								Add ffmpeg buildpack for scalingo ( #8500 )  
							
							... 
							
							
							
							* Add ffmpeg buildpack for scalingo.
* Add environment variable to install ffprobe
Note: For existing applications, admins needs to add 'WITH_FFPROBE=true' to environment variable. 
							
						 
						
							2018-08-29 01:21:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sundevour 
								
							 
						 
						
							
							
							
							
								
							
							
								4bfd786550 
								
							 
						 
						
							
							
								
								formatter spec fixes & clarification ( #8481 )  
							
							... 
							
							
							
							updates some "context" and "it" lines to have clearer explanations
updates "context" lines to properly describe function input, and "it" lines to describe results 
							
						 
						
							2018-08-29 01:20:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								9463bba5fb 
								
							 
						 
						
							
							
								
								Reduce padding of profile metadata boxes to allow more text ( #8491 )  
							
							
							
						 
						
							2018-08-29 01:20:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakub Mendyk 
								
							 
						 
						
							
							
							
							
								
							
							
								ceed1ebe5b 
								
							 
						 
						
							
							
								
								Fix followers/follows layout issues from  #8418  ( #8505 )  
							
							... 
							
							
							
							* Add alwaysShowScrollbar prop to ScrollableList
* Fix followers/follows layout issues from #8418  
							
						 
						
							2018-08-29 01:19:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Drew Schuster 
								
							 
						 
						
							
							
							
							
								
							
							
								648d6d7247 
								
							 
						 
						
							
							
								
								Delete .gitkeep file since the app/javascript/mastodon directory is no longer empty ( #8510 )  
							
							
							
						 
						
							2018-08-29 08:10:04 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c4b3479173 
								
							 
						 
						
							
							
								
								Fix CSP with S3/SWIFT hosts  
							
							
							
						 
						
							2018-08-28 22:10:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4a9e3f80e8 
								
							 
						 
						
							
							
								
								[Glitch] Add CSS class to replies  
							
							... 
							
							
							
							Port 2bbec9f4da 
							
						 
						
							2018-08-28 19:52:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3b09597556 
								
							 
						 
						
							
							
								
								[Glitch] Preserve hashtag casing in web UI hashtag history  
							
							... 
							
							
							
							Port f9b23a5d62 
							
						 
						
							2018-08-28 19:52:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								24b6811a6e 
								
							 
						 
						
							
							
								
								[Glitch] Implement tag auto-completion by history  
							
							... 
							
							
							
							Port 460e380d38 
							
						 
						
							2018-08-28 19:52:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e3246cd13b 
								
							 
						 
						
							
							
								
								Preserve hashtag casing in threaded mode  
							
							... 
							
							
							
							Inspired by f9b23a5d62 
							
						 
						
							2018-08-28 19:52:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								14563f5167 
								
							 
						 
						
							
							
								
								Merge pull request  #684  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-08-28 19:51:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								43d132039b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-08-28 17:24:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3fe5029fbe 
								
							 
						 
						
							
							
								
								Adjust CSP to fix image resizing  
							
							
							
						 
						
							2018-08-28 16:58:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5e1767173f 
								
							 
						 
						
							
							
								
								Display pending message on admin relays UI ( #8494 )  
							
							... 
							
							
							
							* Add missing specs for relay accept/reject
* Display pending message on admin relays UI 
							
						 
						
							2018-08-28 05:39:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								937cd03a9a 
								
							 
						 
						
							
							
								
								[Glitch] Add missing video descriptions  
							
							... 
							
							
							
							Port ac092d03e7 
							
						 
						
							2018-08-27 20:21:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3106c81b1e 
								
							 
						 
						
							
							
								
								[Glitch] Wait until relationship is loaded before showing follow button  
							
							... 
							
							
							
							Port cd049454be 
							
						 
						
							2018-08-27 20:21:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8852fff3a4 
								
							 
						 
						
							
							
								
								Merge pull request  #675  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-08-27 20:20:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maciek Baron 
								
							 
						 
						
							
							
							
							
								
							
							
								2bbec9f4da 
								
							 
						 
						
							
							
								
								Add CSS class to replies ( #8473 )  
							
							
							
						 
						
							2018-08-27 13:07:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								53b7bb9d04 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml 
							
						 
						
							2018-08-27 18:09:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									M Somerville 
								
							 
						 
						
							
							
							
							
								
							
							
								81697997a3 
								
							 
						 
						
							
							
								
								Include MOV in upload button tooltip. ( #8480 )  
							
							
							
						 
						
							2018-08-27 13:05:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renato "Lond" Cerqueira 
								
							 
						 
						
							
							
							
							
								
							
							
								efdfea3f3c 
								
							 
						 
						
							
							
								
								Weblate translations (2018-08-27) ( #8483 )  
							
							... 
							
							
							
							* Translated using Weblate (French)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Danish)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Corsican)
Currently translated at 99.7% (682 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ 
* Translated using Weblate (Danish)
Currently translated at 86.1% (589 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (French)
Currently translated at 99.4% (680 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Japanese)
Currently translated at 99.7% (682 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ 
* Translated using Weblate (French)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 99.7% (682 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 98.6% (675 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 99.8% (683 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Arabic)
Currently translated at 0.1% (1 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Polish)
Currently translated at 98.9% (677 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ 
* Translated using Weblate (Polish)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ 
* Translated using Weblate (Polish)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ 
* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused 
							
						 
						
							2018-08-27 13:03:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									M Somerville 
								
							 
						 
						
							
							
							
							
								
							
							
								b31449cd77 
								
							 
						 
						
							
							
								
								Better singulars of account followers/toots. ( #8471 )  
							
							
							
						 
						
							2018-08-26 21:30:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakub Mendyk 
								
							 
						 
						
							
							
							
							
								
							
							
								f3a12ddfd0 
								
							 
						 
						
							
							
								
								Make Api::V1::MutesController paginate properly ( #8472 )  
							
							... 
							
							
							
							Fixes  #8463  
						
							2018-08-26 21:30:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								b534249a8d 
								
							 
						 
						
							
							
								
								Add more hotkeys to legend ( #8469 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-08-26 20:22:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cabdbb7f9c 
								
							 
						 
						
							
							
								
								Add CLI task for rotating keys ( #8466 )  
							
							... 
							
							
							
							* If an Update is signed with known key, skip re-following procedure
Because it means the remote actor did *not* lose their database
* Add CLI method for rotating keys
    bin/tootctl accounts rotate [USERNAME]
Generates a new RSA key per account and sends out an Update activity
signed with the old key.
* Key rotation: Space out Update fan-outs every 5 minutes per 1000 accounts
* Skip suspended accounts in key rotation 
							
						 
						
							2018-08-26 20:21:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8adf485c0f 
								
							 
						 
						
							
							
								
								Bump interactions count when a follow happens ( #8468 )  
							
							
							
						 
						
							2018-08-26 20:02:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c597249124 
								
							 
						 
						
							
							
								
								Add thor to Gemfile directly ( #8467 )  
							
							... 
							
							
							
							It's a common dependency, but just in case 
							
						 
						
							2018-08-26 20:02:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Quint Guvernator 
								
							 
						 
						
							
							
							
							
								
							
							
								da13fa5021 
								
							 
						 
						
							
							
								
								Fix low-hanging rubocop gripes ( #8458 )  
							
							... 
							
							
							
							* rubocop: quit being so picky
* rubocop: miscellany
* rubocop: prefer present to blank 
							
						 
						
							2018-08-26 19:22:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af934b9071 
								
							 
						 
						
							
							
								
								Merge pull request  #674  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-08-26 19:12:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								be20eb4b2f 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-08-26 18:21:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a791bac153 
								
							 
						 
						
							
							
								
								Add aria-label to notifications ( #8460 )  
							
							... 
							
							
							
							Fix  #8192  
						
							2018-08-26 17:53:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b9c3788485 
								
							 
						 
						
							
							
								
								Fix NUM_DAYS in rake mastodon:media:remove_remote and print warning ( #8462 )  
							
							... 
							
							
							
							Remove old deprecated rake tasks 
							
						 
						
							2018-08-26 17:19:47 +02:00