Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4837d6275a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code 
							
						 
						
							2019-09-18 17:25:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nzws✨ 
								
							 
						 
						
							
							
							
							
								
							
							
								7bfef64877 
								
							 
						 
						
							
							
								
								Fix eslint error of import/no-extraneous-dependencies ( #11884 )  
							
							... 
							
							
							
							* Fix eslint error of import/no-extraneous-dependencies
- Add history dependency
* refactoring code 
							
						 
						
							2019-09-18 15:41:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								266f26f23b 
								
							 
						 
						
							
							
								
								Fix “load more” adding older toots/notifications to pending items ( #11883 )  
							
							
							
						 
						
							2019-09-18 11:27:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								dabb03467e 
								
							 
						 
						
							
							
								
								Check existence of timeline state in community timeline ( #11880 )  
							
							
							
						 
						
							2019-09-18 04:02:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1da97e86a4 
								
							 
						 
						
							
							
								
								Fix composer dropdown toggle buttons (threaded mode and local-only) not working  
							
							
							
						 
						
							2019-09-18 00:11:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4cc3570f49 
								
							 
						 
						
							
							
								
								Fix boost confirmation modal for description-less media not working  
							
							
							
						 
						
							2019-09-17 21:46:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4e39d575dc 
								
							 
						 
						
							
							
								
								Fix web UI allowing uploads past status limit via drag & drop ( #11863 )  
							
							... 
							
							
							
							Fix  #11659  
						
							2019-09-16 20:42:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								57c7ce5e7f 
								
							 
						 
						
							
							
								
								Change timelines to add new items to pending items when scrolled down ( #11867 )  
							
							
							
						 
						
							2019-09-16 19:39:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								df8b1b3547 
								
							 
						 
						
							
							
								
								Fix poll options checkboxes/radio buttons not being vertically centered ( #11833 )  
							
							
							
						 
						
							2019-09-16 16:12:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								7f7f8cac37 
								
							 
						 
						
							
							
								
								Fix “slow mode” issues ( #11859 )  
							
							... 
							
							
							
							* Fix weird scroll-jumping behavior with pending items
* Treat pending items as unread items
* Fix scroll position being altered because of the “X new items” button 
							
						 
						
							2019-09-16 15:45:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								722d8cdc36 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #11799 )  
							
							... 
							
							
							
							* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Kazakh)
[ci skip]
* New translations simple_form.en.yml (Asturian)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations simple_form.en.yml (Albanian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Croatian)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Estonian)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations activerecord.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations devise.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations doorkeeper.en.yml (Breton)
[ci skip]
* New translations devise.en.yml (Breton)
[ci skip]
* New translations simple_form.en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations activerecord.en.yml (Breton)
[ci skip]
* New translations devise.en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations activerecord.en.yml (Asturian)
[ci skip]
* New translations devise.en.yml (Russian)
[ci skip]
* New translations activerecord.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations devise.en.yml (Norwegian)
[ci skip]
* New translations activerecord.en.yml (Norwegian)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations devise.en.yml (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Ukrainian)
[ci skip]
* New translations activerecord.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations devise.en.yml (Slovak)
[ci skip]
* New translations activerecord.en.yml (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations activerecord.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations activerecord.en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Georgian)
[ci skip]
* New translations activerecord.en.yml (Georgian)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations devise.en.yml (Croatian)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations devise.en.yml (Bulgarian)
[ci skip]
* New translations activerecord.en.yml (Bulgarian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations devise.en.yml (Indonesian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations devise.en.yml (Ido)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations devise.en.yml (Hebrew)
[ci skip]
* New translations activerecord.en.yml (Hebrew)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations 
							
						 
						
							2019-09-16 15:11:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ba7a1f9f75 
								
							 
						 
						
							
							
								
								Fix expiring polls not being displayed as such in the WebUI ( #11835 )  
							
							... 
							
							
							
							* Fix expiring polls not being displayed as such in the WebUI
* Reset expiration state and timer when a poll changes
* Refactor timer logic in `_setupTimer`, only set expiration if props have changed
* Refactor and do not use deprecated React lifecycles 
							
						 
						
							2019-09-16 14:32:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								20f209452e 
								
							 
						 
						
							
							
								
								Fix media description button being disabled at 420 characters instead of 1500 ( #11836 )  
							
							
							
						 
						
							2019-09-14 00:52:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								caa2fc89b3 
								
							 
						 
						
							
							
								
								[Glitch] Add timeline read markers API  
							
							... 
							
							
							
							Port 89989b6255 
							
						 
						
							2019-09-13 20:28:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c5836cc5de 
								
							 
						 
						
							
							
								
								Fix profile fields overflowing page width ( #11828 )  
							
							... 
							
							
							
							Fix  #11720  
						
							2019-09-13 19:15:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								47bfd278c1 
								
							 
						 
						
							
							
								
								[Glitch] Change max length of media descriptions from 420 to 1500 characters  
							
							... 
							
							
							
							Port 9301574423 
							
						 
						
							2019-09-13 18:38:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								7de74d2e1b 
								
							 
						 
						
							
							
								
								[Glitch] Fix display of long poll options  
							
							... 
							
							
							
							Port f8e09ac4a8 
							
						 
						
							2019-09-13 18:36:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f369837caa 
								
							 
						 
						
							
							
								
								[Glitch] Fix unused CSS  
							
							... 
							
							
							
							Port 8352a0f352 
							
						 
						
							2019-09-13 18:36:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d3da04be54 
								
							 
						 
						
							
							
								
								[Glitch] Add batch actions and categories to admin UI for custom emojis  
							
							... 
							
							
							
							Port SCSS changes from 25fb124ee6 
							
						 
						
							2019-09-13 18:35:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6251d7dd76 
								
							 
						 
						
							
							
								
								[Glitch] Add account bio to account admin view  
							
							... 
							
							
							
							Port SCSS changes from fef7f3b6d5 
							
						 
						
							2019-09-13 18:34:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8dfd8dcbb0 
								
							 
						 
						
							
							
								
								[Glitch] Add batch approve/reject for pending hashtags in admin UI  
							
							... 
							
							
							
							Port SCSS changes from 7799c7c75f 
							
						 
						
							2019-09-13 18:34:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2e38d889a3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme) 
							
						 
						
							2019-09-13 18:13:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								f8e09ac4a8 
								
							 
						 
						
							
							
								
								Fix display of long poll options ( #11717 )  
							
							
							
						 
						
							2019-09-13 16:04:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8352a0f352 
								
							 
						 
						
							
							
								
								Fix unused CSS ( #11824 )  
							
							... 
							
							
							
							Fix  #11689  
						
							2019-09-13 16:00:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9301574423 
								
							 
						 
						
							
							
								
								Change max length of media descriptions from 420 to 1500 characters ( #11819 )  
							
							... 
							
							
							
							Fix  #11658  
						
							2019-09-13 16:00:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ad91a0578b 
								
							 
						 
						
							
							
								
								Fix scroll position resetting when opening media modals in web UI ( #11815 )  
							
							
							
						 
						
							2019-09-12 20:14:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a55f075ab6 
								
							 
						 
						
							
							
								
								Add missing locale file for ga and add rake task to check for it ( #11813 )  
							
							... 
							
							
							
							* Add missing locale file for ga and add rake task to check for it
* Update lib/tasks/repo.rake
Co-Authored-By: Yamagishi Kazutoshi <ykzts@desire.sh>
* Fix check-i18n build 
							
						 
						
							2019-09-12 04:58:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a503e791f4 
								
							 
						 
						
							
							
								
								Fix flavour screenshot styling in vanilla flavour  
							
							
							
						 
						
							2019-09-10 22:38:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8605a25800 
								
							 
						 
						
							
							
								
								Fix wrong icons from last refactoring  
							
							... 
							
							
							
							Fix regressions from 6b45aa450b 
							
						 
						
							2019-09-10 14:56:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								853de72d60 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #11626 )  
							
							... 
							
							
							
							* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations activerecord.en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations devise.en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations activerecord.en.yml (Bulgarian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations activerecord.en.yml (German)
[ci skip]
* New translations devise.en.yml (German)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations 
							
						 
						
							2019-09-10 12:43:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								25fb124ee6 
								
							 
						 
						
							
							
								
								Add batch actions and categories to admin UI for custom emojis ( #11793 )  
							
							
							
						 
						
							2019-09-09 22:44:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9b0b130299 
								
							 
						 
						
							
							
								
								Use the Icon component instead of directly using i tag  
							
							
							
						 
						
							2019-09-09 19:00:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								6b45aa450b 
								
							 
						 
						
							
							
								
								Use upstream's Icon component  
							
							... 
							
							
							
							Rework the codebase to avoid unnecessary differences with upstream 
							
						 
						
							2019-09-09 19:00:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								080bdf6949 
								
							 
						 
						
							
							
								
								Move “export” before decorators  
							
							... 
							
							
							
							As this is what upstream does.
See also https://github.com/tc39/proposal-decorators/issues/69  
							
						 
						
							2019-09-09 18:36:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								fef7f3b6d5 
								
							 
						 
						
							
							
								
								Add account bio to account admin view ( #11473 )  
							
							... 
							
							
							
							* Add account bio to account admin view
* Change styling to make bio fields / content more readable 
							
						 
						
							2019-09-09 14:15:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7799c7c75f 
								
							 
						 
						
							
							
								
								Add batch approve/reject for pending hashtags in admin UI ( #11791 )  
							
							
							
						 
						
							2019-09-09 12:50:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rey Tucker 
								
							 
						 
						
							
							
							
							
								
							
							
								aa6ef7acd0 
								
							 
						 
						
							
							
								
								glitch: fix webpack build failure in columns_area.js ( #1212 )  
							
							... 
							
							
							
							Fixes  #1212  by copying what works in the mainline flavor. 
						
							2019-09-09 09:56:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								89989b6255 
								
							 
						 
						
							
							
								
								Add timeline read markers API ( #11762 )  
							
							... 
							
							
							
							Fix  #4093  
						
							2019-09-06 13:55:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0e090952d2 
								
							 
						 
						
							
							
								
								[Glitch] Fix line breaks in hashtag autosuggestions in web UI  
							
							... 
							
							
							
							Port f6cd27f41f 
							
						 
						
							2019-09-05 14:14:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mostafa Ahangarha 
								
							 
						 
						
							
							
							
							
								
							
							
								1eef666521 
								
							 
						 
						
							
							
								
								[Glitch] Exclude URLs from text analysis  
							
							... 
							
							
							
							Port 6899564a76 
							
						 
						
							2019-09-05 14:13:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f0806c8de1 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong sum of usage in hashtag component in web UI  
							
							... 
							
							
							
							Port b5651654f7 
							
						 
						
							2019-09-05 14:12:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2e2795a887 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong pluralization in hashtag component in web UI  
							
							... 
							
							
							
							Port 17df40e74e 
							
						 
						
							2019-09-05 14:11:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c79b11e5 
								
							 
						 
						
							
							
								
								[Glitch] Change hashtag component in web UI to show numbers for 2 last days  
							
							... 
							
							
							
							Port 8d61ef6dda 
							
						 
						
							2019-09-05 14:02:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8f54a3efe0 
								
							 
						 
						
							
							
								
								[Glitch] Fix uncached media in web UI not being clickable  
							
							... 
							
							
							
							Port acf168f1a2 
							
						 
						
							2019-09-05 14:02:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								a3186bbf67 
								
							 
						 
						
							
							
								
								[Glitch] Integrate translation strings for the Profile Directory.  
							
							... 
							
							
							
							Port 80fe7fa415 
							
						 
						
							2019-09-05 13:55:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								27072dc7b0 
								
							 
						 
						
							
							
								
								[Glitch] Fix Mastodon logo style on hover on public pages' footer  
							
							... 
							
							
							
							Port 06f49d9cf2 
							
						 
						
							2019-09-05 13:53:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								0ce0028b61 
								
							 
						 
						
							
							
								
								[Glitch] Fix height of dashboard counters  
							
							... 
							
							
							
							Port c5e4f4e0c1 
							
						 
						
							2019-09-05 13:52:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								dc41c64d81 
								
							 
						 
						
							
							
								
								[Glitch] Fix custom emoji animation on hover in WebUI directory bios  
							
							... 
							
							
							
							Port 1443f2bd3c 
							
						 
						
							2019-09-05 13:52:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8ecdf54a75 
								
							 
						 
						
							
							
								
								[Glitch] Add "not available" label on unknown media attachments  
							
							... 
							
							
							
							Port 59d873e1e5 
							
						 
						
							2019-09-05 13:06:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								eac7c66d2a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-09-05 11:36:41 +02:00