aafe91259a 
								
							 
						 
						
							
							
								
								Fetch relationships when opening report modal  
							
							... 
							
							
							
							Relationship with the reported account affect which actions are proposed in
the “thanks” part. Upstream fetches relationships when opening dropdown menus,
but we don't. 
							
						 
						
							2022-02-23 21:12:03 +01:00  
				
					
						
							
							
								 
						
							
								470c0a8002 
								
							 
						 
						
							
							
								
								[Glitch] Change report modal to include category selection in web UI  
							
							... 
							
							
							
							Port a9a43de6d1 
							
						 
						
							2022-02-23 20:25:55 +01:00  
				
					
						
							
							
								 
						
							
								9dd62c95c5 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2022-02-23 20:05:04 +01:00  
				
					
						
							
							
								 
						
							
								a9a43de6d1 
								
							 
						 
						
							
							
								
								Change report modal to include category selection in web UI ( #17565 )  
							
							... 
							
							
							
							* Change report modal to include category selection in web UI
* Various fixes and improvements
- Change thank you text to be different based on category
- Change starting headline to be different for account and status reports
- Change toggle components to have a checkmark when checked
- Fix report dialog being cut off on small screens
- Fix thank you screen offering mute or block if already muted or blocked
- Refactor toggle components in report dialog into one component
* Change wording on final screen
* Change checkboxes to be square when multiple options are possible 
							
						 
						
							2022-02-23 20:03:46 +01:00  
				
					
						
							
							
								 
						
							
								f99943cd74 
								
							 
						 
						
							
							
								
								[Glitch] Add notifications for new sign-ups  
							
							... 
							
							
							
							Port 7b816eb5ae 
							
						 
						
							2022-02-23 19:04:09 +01:00  
				
					
						
							
							
								 
						
							
								3d25fe0426 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr. 
							
						 
						
							2022-02-23 18:13:12 +01:00  
				
					
						
							
							
								 
						
							
								7b816eb5ae 
								
							 
						 
						
							
							
								
								Add notifications for new sign-ups ( #16953 )  
							
							
							
						 
						
							2022-02-23 16:45:22 +01:00  
				
					
						
							
							
								 
						
							
								d21bedc492 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #17593 )  
							
							... 
							
							
							
							* New translations en.json (Catalan)
* New translations en.json (Turkish)
* New translations en.json (Macedonian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Korean)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Lithuanian)
* New translations en.json (Georgian)
* New translations en.json (Slovenian)
* New translations en.json (French)
* New translations en.json (Persian)
* New translations en.json (Occitan)
* New translations en.json (Arabic)
* New translations en.json (Thai)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Norwegian)
* New translations en.json (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Dutch)
* New translations en.json (Romanian)
* New translations en.json (Spanish)
* New translations en.json (Japanese)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Cornish)
* New translations en.json (Silesian)
* New translations en.json (Taigi)
* New translations en.json (Ido)
* New translations en.json (Kabyle)
* New translations en.json (Sanskrit)
* New translations en.json (Sardinian)
* New translations en.json (Corsican)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Serbian (Latin))
* New translations en.json (Asturian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Kannada)
* New translations en.json (Sinhala)
* New translations en.json (Marathi)
* New translations en.json (Breton)
* New translations en.json (Malayalam)
* New translations en.json (Tatar)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Uyghur)
* New translations en.json (Esperanto)
* New translations en.json (Welsh)
* New translations en.json (Telugu)
* New translations en.json (Malay)
* New translations en.json (Hindi)
* New translations en.json (Latvian)
* New translations en.json (Estonian)
* New translations en.json (Kazakh)
* New translations en.json (Croatian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Chinese Traditional)
* New translations en.json (Danish)
* New translations en.json (Thai)
* New translations en.yml (Thai)
* New translations en.json (Korean)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Thai)
* New translations devise.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Galician)
* New translations en.json (Greek)
* New translations en.json (Polish)
* New translations en.json (Hebrew)
* New translations en.json (Icelandic)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Chinese Traditional)
* New translations en.yml (Russian)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Swedish)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Turkish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Albanian)
* New translations en.json (Vietnamese)
* New translations en.json (Latvian)
* New translations en.json (Hungarian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Italian)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations en.json (Finnish)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Spanish)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.yml (Basque)
* New translations en.json (Ukrainian)
* New translations en.yml (Indonesian)
* New translations en.json (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Russian)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.json (Hungarian)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations simple_form.en.yml (Galician)
* New translations en.json (French)
* New translations en.json (Russian)
* New translations activerecord.en.yml (Latvian)
* New translations en.yml (French)
* New translations en.yml (French)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2022-02-23 22:13:09 +09:00  
				
					
						
							
							
								 
						
							
								73f5e4a1d9 
								
							 
						 
						
							
							
								
								Fix various typos ( #17621 )  
							
							... 
							
							
							
							Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,ro` 
							
						 
						
							2022-02-22 20:14:17 +01:00  
				
					
						
							
							
								 
						
							
								5169a9f9d9 
								
							 
						 
						
							
							
								
								[Glitch] Fix link colors in report and strike details  
							
							... 
							
							
							
							Port SCSS changes from 51e67f3243 
							
						 
						
							2022-02-22 18:10:08 +01:00  
				
					
						
							
							
								 
						
							
								e07f2efc9f 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong styles on strike page  
							
							... 
							
							
							
							Port SCSS changes from 8338826963 
							
						 
						
							2022-02-22 18:09:39 +01:00  
				
					
						
							
							
								 
						
							
								954e052b07 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars. 
							
						 
						
							2022-02-22 18:06:29 +01:00  
				
					
						
							
							
								 
						
							
								51e67f3243 
								
							 
						 
						
							
							
								
								Fix link colors in report and strike details ( #17616 )  
							
							
							
						 
						
							2022-02-22 15:27:25 +01:00  
				
					
						
							
							
								 
						
							
								8338826963 
								
							 
						 
						
							
							
								
								Fix wrong styles on strike page ( #17615 )  
							
							
							
						 
						
							2022-02-22 06:20:04 +01:00  
				
					
						
							
							
								 
						
							
								dc121b609f 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2022-02-19 11:33:18 +01:00  
				
					
						
							
							
								 
						
							
								1761d9ba5d 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #17514 )  
							
							... 
							
							
							
							* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Albanian)
* New translations simple_form.en.yml (Albanian)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Japanese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Hebrew)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.yml (German)
* New translations en.yml (Polish)
* New translations en.yml (Turkish)
* New translations en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations en.yml (Polish)
* New translations en.yml (Turkish)
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations en.yml (Swedish)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Icelandic)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations en.yml (Polish)
* New translations en.json (Polish)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations doorkeeper.en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations en.yml (Albanian)
* New translations en.yml (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.json (Russian)
* New translations en.yml (Albanian)
* New translations en.yml (Indonesian)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.yml (Hungarian)
* New translations en.yml (Icelandic)
* New translations en.yml (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Italian)
* New translations en.yml (Italian)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations en.json (Korean)
* New translations en.yml (Thai)
* New translations en.yml (Spanish)
* New translations en.yml (Spanish)
* New translations en.yml (Thai)
* New translations en.yml (Spanish)
* New translations en.yml (Thai)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Spanish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Spanish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Malay)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Galician)
* New translations en.yml (Hungarian)
* New translations en.yml (Galician)
* New translations en.yml (Catalan)
* New translations en.yml (Hungarian)
* New translations en.yml (Polish)
* New translations en.yml (Breton)
* New translations en.json (Breton)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Spanish)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Portuguese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Portuguese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Portuguese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Italian)
* New translations en.yml (French)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Turkish)
* New translations en.yml (Latvian)
* New translations en.yml (Latvian)
* New translations en.json (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Galician)
* New translations en.yml (Russian)
* New translations en.yml (Indonesian)
* New translations en.yml (Galician)
* New translations en.yml (Galician)
* New translations en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Traditional)
* Ran `yarn manage:translations`
* Ran `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2022-02-19 13:20:00 +09:00  
				
					
						
							
							
								 
						
							
								41a8606627 
								
							 
						 
						
							
							
								
								[Glitch] Fix opening the emoji picker scrolling the single-column view to the top  
							
							... 
							
							
							
							Port aa86cf9557 
							
						 
						
							2022-02-17 11:05:47 +01:00  
				
					
						
							
							
								 
						
							
								d70e4e3da0 
								
							 
						 
						
							
							
								
								[Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden  
							
							... 
							
							
							
							Port 00b45b967e 
							
						 
						
							2022-02-17 11:04:13 +01:00  
				
					
						
							
							
								 
						
							
								5ed35a0df4 
								
							 
						 
						
							
							
								
								[Glitch] Add appeals  
							
							... 
							
							
							
							Port SCSS changes from 564efd0651 
							
						 
						
							2022-02-17 10:58:57 +01:00  
				
					
						
							
							
								 
						
							
								3a0eba4918 
								
							 
						 
						
							
							
								
								[Glitch] Fix privacy policy link not being visible on small screens  
							
							... 
							
							
							
							Port bbd3474416 
							
						 
						
							2022-02-17 10:58:53 +01:00  
				
					
						
							
							
								 
						
							
								f224237862 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's. 
							
						 
						
							2022-02-17 10:58:44 +01:00  
				
					
						
							
							
								 
						
							
								aa86cf9557 
								
							 
						 
						
							
							
								
								Fix opening the emoji picker scrolling the single-column view to the top ( #17579 )  
							
							... 
							
							
							
							Fixes  #17577  
						
							2022-02-16 21:44:47 +01:00  
				
					
						
							
							
								 
						
							
								00b45b967e 
								
							 
						 
						
							
							
								
								Fix edge case where settings/admin page sidebar would be incorrectly hidden ( #17580 )  
							
							
							
						 
						
							2022-02-16 21:44:19 +01:00  
				
					
						
							
							
								 
						
							
								ec4f906618 
								
							 
						 
						
							
							
								
								Fix toggling sidebar on mobile in admin pages  
							
							
							
						 
						
							2022-02-16 16:33:23 +01:00  
				
					
						
							
							
								 
						
							
								564efd0651 
								
							 
						 
						
							
							
								
								Add appeals ( #17364 )  
							
							... 
							
							
							
							* Add appeals
* Add ability to reject appeals and ability to browse pending appeals in admin UI
* Add strikes to account page in settings
* Various fixes and improvements
- Add separate notification setting for appeals, separate from reports
- Fix style of links in report/strike header
- Change approving an appeal to not restore statuses (due to federation complexities)
- Change style of successfully appealed strikes on account settings page
- Change account settings page to only show unappealed or recently appealed strikes
* Change appealed_at to overruled_at
* Fix missing method error 
							
						 
						
							2022-02-14 21:27:53 +01:00  
				
					
						
							
							
								 
						
							
								bbd3474416 
								
							 
						 
						
							
							
								
								Fix privacy policy link not being visible on small screens ( #17533 )  
							
							... 
							
							
							
							Fix  #17482  
						
							2022-02-13 02:52:34 +01:00  
				
					
						
							
							
								 
						
							
								f3429d7354 
								
							 
						 
						
							
							
								
								[Glitch] Fix controls for unchangeable properties on status edit not being disabled  
							
							... 
							
							
							
							Port 38845592c4 
							
						 
						
							2022-02-12 22:36:39 +01:00  
				
					
						
							
							
								 
						
							
								c9669ee167 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2022-02-12 21:36:33 +01:00  
				
					
						
							
							
								 
						
							
								27803cd2b7 
								
							 
						 
						
							
							
								
								Make the settings button go to settings when opened in a new tab  
							
							
							
						 
						
							2022-02-12 20:12:29 +01:00  
				
					
						
							
							
								 
						
							
								38845592c4 
								
							 
						 
						
							
							
								
								Fix controls for unchangeable properties on status edit not being disabled ( #17531 )  
							
							... 
							
							
							
							Fixes  #17520  
						
							2022-02-12 19:00:33 +01:00  
				
					
						
							
							
								 
						
							
								f4db2e1832 
								
							 
						 
						
							
							
								
								[Glitch] Fix layout of the report page on smaller screens in admin UI  
							
							... 
							
							
							
							Port e848d281d5 
							
						 
						
							2022-02-12 13:15:07 +01:00  
				
					
						
							
							
								 
						
							
								958089fb21 
								
							 
						 
						
							
							
								
								[Glitch] Add notifications when a reblogged status has been updated  
							
							... 
							
							
							
							Port front-end changes from 8f03b7a2fb 
							
						 
						
							2022-02-12 13:15:07 +01:00  
				
					
						
							
							
								 
						
							
								d9379f5331 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2022-02-12 11:12:41 +01:00  
				
					
						
							
							
								 
						
							
								e848d281d5 
								
							 
						 
						
							
							
								
								Fix layout of the report page on smaller screens in admin UI ( #17523 )  
							
							... 
							
							
							
							Fix  #17491  
						
							2022-02-12 01:08:23 +01:00  
				
					
						
							
							
								 
						
							
								28ec7def58 
								
							 
						 
						
							
							
								
								Fix missing javascript in some admin pages  
							
							
							
						 
						
							2022-02-12 00:10:28 +01:00  
				
					
						
							
							
								 
						
							
								8f03b7a2fb 
								
							 
						 
						
							
							
								
								Add notifications when a reblogged status has been updated ( #17404 )  
							
							... 
							
							
							
							* Add notifications when a reblogged status has been updated
* Change wording to say "edit" instead of "update" and add missing controls
* Replace previous update notifications with the most up-to-date one 
							
						 
						
							2022-02-11 22:20:19 +01:00  
				
					
						
							
							
								 
						
							
								a34e4f7e27 
								
							 
						 
						
							
							
								
								[Glitch] Change actions in reports to require only one click  
							
							... 
							
							
							
							Port SCSS changes from d0fcf07436 
							
						 
						
							2022-02-11 21:56:27 +01:00  
				
					
						
							
							
								 
						
							
								51cad4f7fb 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2022-02-11 21:53:20 +01:00  
				
					
						
							
							
								 
						
							
								d0fcf07436 
								
							 
						 
						
							
							
								
								Change actions in reports to require only one click ( #17487 )  
							
							
							
						 
						
							2022-02-11 21:51:57 +01:00  
				
					
						
							
							
								 
						
							
								6f38765fcc 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #16858 )  
							
							... 
							
							
							
							* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* New translations activerecord.en.yml (French)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* Ran `i18n-tasks normalize`
* Ran `yarn manage:translations`
* Add space
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2022-02-11 04:50:27 +01:00  
				
					
						
							
							
								 
						
							
								642b5a621a 
								
							 
						 
						
							
							
								
								[Glitch] Chore: Disable menu items for editing statuses in web UI ( #17497 )  
							
							... 
							
							
							
							Port 3dc1e3cfc3 
							
						 
						
							2022-02-10 19:10:59 +01:00  
				
					
						
							
							
								 
						
							
								5e67858fbc 
								
							 
						 
						
							
							
								
								[Glitch] Add editing for published statuses  
							
							... 
							
							
							
							Port 63002cde03 
							
						 
						
							2022-02-10 19:10:20 +01:00  
				
					
						
							
							
								 
						
							
								f1a6f9062e 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream moved things around in a place where glitch-soc had support for
  an extra parameter (`content_type`).
  Follow upstream but reintroduce `content_type`. 
							
						 
						
							2022-02-10 19:09:27 +01:00  
				
					
						
							
							
								 
						
							
								3dc1e3cfc3 
								
							 
						 
						
							
							
								
								Chore: Disable menu items for editing statuses in web UI ( #17497 )  
							
							... 
							
							
							
							Feature must be unlocked in a separate release for max. compatibility 
							
						 
						
							2022-02-10 15:28:53 +01:00  
				
					
						
							
							
								 
						
							
								63002cde03 
								
							 
						 
						
							
							
								
								Add editing for published statuses ( #17320 )  
							
							... 
							
							
							
							* Add editing for published statuses
* Fix change of multiple-choice boolean in poll not resetting votes
* Remove the ability to update existing media attachments for now 
							
						 
						
							2022-02-10 00:15:30 +01:00  
				
					
						
							
							
								 
						
							
								44b06c4d96 
								
							 
						 
						
							
							
								
								[Glitch] Add edit history to web UI  
							
							... 
							
							
							
							Port fd3a45e348 
							
						 
						
							2022-02-09 17:51:35 +01:00  
				
					
						
							
							
								 
						
							
								322e907e04 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change. 
							
						 
						
							2022-02-09 17:28:33 +01:00  
				
					
						
							
							
								 
						
							
								0bb3d445ab 
								
							 
						 
						
							
							
								
								Please Codeclimate  
							
							
							
						 
						
							2022-02-09 17:15:36 +01:00  
				
					
						
							
							
								 
						
							
								e1a4590bca 
								
							 
						 
						
							
							
								
								Rework actions modal to bring it closer to upstream and fix modal stacking issue  
							
							
							
						 
						
							2022-02-09 16:40:23 +01:00  
				
					
						
							
							
								 
						
							
								bc2eaf3581 
								
							 
						 
						
							
							
								
								Remove unused noModal prop  
							
							
							
						 
						
							2022-02-09 16:40:23 +01:00  
				
					
						
							
							
								 
						
							
								f03dc97070 
								
							 
						 
						
							
							
								
								Some more refactoring  
							
							
							
						 
						
							2022-02-09 16:40:23 +01:00  
				
					
						
							
							
								 
						
							
								f87ce13afc 
								
							 
						 
						
							
							
								
								Refactor dropdown and action modal code slightly  
							
							... 
							
							
							
							Simplify it a bit and make it closer to upstream 
							
						 
						
							2022-02-09 13:23:12 +01:00  
				
					
						
							
							
								 
						
							
								fd3a45e348 
								
							 
						 
						
							
							
								
								Add edit history to web UI ( #17390 )  
							
							... 
							
							
							
							* Add edit history to web UI
* Change history reducer to store items per status
* Fix missing loading prop 
							
						 
						
							2022-02-09 01:17:07 +01:00  
				
					
						
							
							
								 
						
							
								1b493c9fee 
								
							 
						 
						
							
							
								
								Add optional hCaptcha support  
							
							... 
							
							
							
							Fixes  #1649 
This requires setting `HCAPTCHA_SECRET_KEY` and `HCAPTCHA_SITE_KEY`, then
enabling the admin setting at
`/admin/settings/edit#form_admin_settings_captcha_enabled`
Subsequently, a hCaptcha widget will be displayed on `/about` and
`/auth/sign_up` unless:
- the user is already signed-up already
- the user has used an invite link
- the user has already solved the captcha (and registration failed for another
  reason)
The Content-Security-Policy headers are altered automatically to allow the
third-party hCaptcha scripts on `/about` and `/auth/sign_up` following the same
rules as above. 
						
							2022-01-24 21:22:13 +01:00  
				
					
						
							
							
								 
						
							
								9483d0c6b2 
								
							 
						 
						
							
							
								
								[Glitch] Change `percent` to `rate` in retention metrics API  
							
							... 
							
							
							
							Port a63495230a 
							
						 
						
							2022-01-23 18:24:40 +01:00  
				
					
						
							
							
								 
						
							
								4dd4fc2e5e 
								
							 
						 
						
							
							
								
								[Glitch] Fix text being incorrectly pre-selected in composer textarea on /share  
							
							... 
							
							
							
							Port 3a103cd317 
							
						 
						
							2022-01-23 18:24:34 +01:00  
				
					
						
							
							
								 
						
							
								61ef81c548 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests. 
							
						 
						
							2022-01-23 18:24:01 +01:00  
				
					
						
							
							
								 
						
							
								a63495230a 
								
							 
						 
						
							
							
								
								Change `percent` to `rate` in retention metrics API ( #16910 )  
							
							
							
						 
						
							2022-01-23 16:01:25 +01:00  
				
					
						
							
							
								 
						
							
								3a103cd317 
								
							 
						 
						
							
							
								
								Fix text being incorrectly pre-selected in composer textarea on /share ( #17339 )  
							
							... 
							
							
							
							Fixes  #17295  
						
							2022-01-20 20:56:21 +01:00  
				
					
						
							
							
								 
						
							
								d4654dc892 
								
							 
						 
						
							
							
								
								[Glitch] Add support for editing for published statuses  
							
							... 
							
							
							
							Port front-end changes from 1060666c58 
							
						 
						
							2022-01-20 00:03:41 +01:00  
				
					
						
							
							
								 
						
							
								fe89554a54 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/lib/activitypub/activity/create.rb`:
  Upstream refactored how `Create` activities are handled and how values are
  extracted from `Create`d objects. This conflicted with how glitch-soc
  supported the `directMessage` flag to explicitly distinguish between
  limited and direct messages.
  Ported glitch-soc's changes to latest upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Upstream largely refactored that file and changed some of the logic.
  This conflicted with glitch-soc's handling of the direct timeline and
  the options to allow replies and boosts in public feeds.
  Ported those glitch-soc changes on top of latest upstream changes.
- `app/services/process_mentions_service.rb`:
  Upstream refactored to move mention-related ActivityPub deliveries to
  `ActivityPub::DeliveryWorker`, while glitch-soc contained an extra check
  to not send local-only toots to remote mentioned users.
  Took upstream's version, as the check is not needed anymore, since it is
  performed at the `ActivityPub::DeliveryWorker` call site already.
- `app/workers/feed_insert_worker.rb`:
  Upstream added support for `update` toot events, while glitch-soc had
  support for an extra timeline support, `direct`.
  Ported upstream changes and extended them to the `direct` timeline.
Additional changes:
- `app/lib/activitypub/parser/status_parser.rb`:
  Added code to handle the `directMessage` flag and take it into account
  to compute visibility.
- `app/lib/feed_manager.rb`:
  Extended upstream's support of `update` toot events to glitch-soc's
  `direct` timeline. 
							
						 
						
							2022-01-19 23:52:48 +01:00  
				
					
						
							
							
								 
						
							
								1060666c58 
								
							 
						 
						
							
							
								
								Add support for editing for published statuses ( #16697 )  
							
							... 
							
							
							
							* Add support for editing for published statuses
* Fix references to stripped-out code
* Various fixes and improvements
* Further fixes and improvements
* Fix updates being potentially sent to unauthorized recipients
* Various fixes and improvements
* Fix wrong words in test
* Fix notifying accounts that were tagged but were not in the audience
* Fix mistake 
							
						 
						
							2022-01-19 22:37:27 +01:00  
				
					
						
							
							
								 
						
							
								69208ef6ff 
								
							 
						 
						
							
							
								
								[Glitch] Add notifications for statuses deleted by moderators  
							
							... 
							
							
							
							Port front-end changes from 14f436c457 
							
						 
						
							2022-01-17 11:19:44 +01:00  
				
					
						
							
							
								 
						
							
								b3bf32a21e 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system. 
							
						 
						
							2022-01-17 10:45:25 +01:00  
				
					
						
							
							
								 
						
							
								14f436c457 
								
							 
						 
						
							
							
								
								Add notifications for statuses deleted by moderators ( #17204 )  
							
							
							
						 
						
							2022-01-17 09:41:33 +01:00  
				
					
						
							
							
								 
						
							
								5effc0f8fa 
								
							 
						 
						
							
							
								
								[Glitch] Add support for private pinned posts  
							
							... 
							
							
							
							Port JS changes from d5c9feb7b7 
							
						 
						
							2022-01-17 08:35:27 +01:00  
				
					
						
							
							
								 
						
							
								2d4b4b0b45 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream introduced support for private pinned toots, but glitch-soc's query
  was a bit different as it filtered out local-only toots.
  Used upstream's query, while adding local-only filtering back.
- `app/controllers/activitypub/collections_controller.rb`:
  Same thing with regards to local-only posts.
- `app/validators/status_pin_validator.rb`:
  Not a real conflict, but the line below was different in glitch-soc due to
  the configurable pinned toots limit. 
							
						 
						
							2022-01-17 08:28:52 +01:00  
				
					
						
							
							
								 
						
							
								d5c9feb7b7 
								
							 
						 
						
							
							
								
								Add support for private pinned posts ( #16954 )  
							
							... 
							
							
							
							* Add support for private pinned toots
* Allow local user to pin private toots
* Change wording to avoid "direct message" 
							
						 
						
							2022-01-17 00:49:55 +01:00  
				
					
						
							
							
								 
						
							
								474cd302c9 
								
							 
						 
						
							
							
								
								[Glitch] Gradually increase retry waiting for media processing  
							
							... 
							
							
							
							Port bc7a8ae6d6 
							
						 
						
							2022-01-16 18:14:33 +01:00  
				
					
						
							
							
								 
						
							
								b61c3ddff8 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged. 
							
						 
						
							2022-01-16 18:11:20 +01:00  
				
					
						
							
							
								 
						
							
								bc7a8ae6d6 
								
							 
						 
						
							
							
								
								Gradually increase retry waiting for media processing ( #17271 )  
							
							
							
						 
						
							2022-01-10 14:25:08 +01:00  
				
					
						
							
							
								 
						
							
								af86c7a5de 
								
							 
						 
						
							
							
								
								[Glitch] Fix media descriptions not being used for client-side filtering  
							
							... 
							
							
							
							Port 37e80994f8 
							
						 
						
							2022-01-07 19:54:58 +01:00  
				
					
						
							
							
								 
						
							
								fca50e4b50 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2022-01-07 19:51:47 +01:00  
				
					
						
							
							
								 
						
							
								37e80994f8 
								
							 
						 
						
							
							
								
								Fix media descriptions not being used for client-side filtering ( #17206 )  
							
							... 
							
							
							
							Fix oversight in #13837  
							
						 
						
							2021-12-28 23:25:50 +01:00  
				
					
						
							
							
								 
						
							
								f011787003 
								
							 
						 
						
							
							
								
								[Glitch] Fix tag rendering error in hashtag column settings  
							
							... 
							
							
							
							Port e65080181a 
							
						 
						
							2021-12-27 15:22:12 +01:00  
				
					
						
							
							
								 
						
							
								09c61e1376 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  We have completely different contents. Kept our version.
- `package.json`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `streaming/index.js`:
  Conflict due to code style changes on parts that were
  modified in glitch-soc to handle local-only toots.
  Changed style according to upstream. 
							
						 
						
							2021-12-27 15:16:18 +01:00  
				
					
						
							
							
								 
						
							
								e65080181a 
								
							 
						 
						
							
							
								
								Fix tag rendering error in hashtag column settings ( #17184 )  
							
							... 
							
							
							
							* Flatten tags in configuration to regular array before converting to JSON
* Render filter tags using toJS instead of toJSON 
							
						 
						
							2021-12-26 19:22:05 +01:00  
				
					
						
							
							
								 
						
							
								e061ea5f71 
								
							 
						 
						
							
							
								
								[Glitch] Change title of retention chart  
							
							... 
							
							
							
							Port 0c17fd9109 
							
						 
						
							2021-12-18 11:47:54 +01:00  
				
					
						
							
							
								 
						
							
								d4f315f304 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-12-18 11:44:54 +01:00  
				
					
						
							
							
								 
						
							
								0c17fd9109 
								
							 
						 
						
							
							
								
								Change title of retention chart ( #16909 )  
							
							... 
							
							
							
							Changes from “Retention” to “User retention rate by month after sign-up”.
This should make it much clearer to people not familiar with retention charts
what it actually means. 
							
						 
						
							2021-12-17 23:00:41 +01:00  
				
					
						
							
							
								 
						
							
								40f202c1e5 
								
							 
						 
						
							
							
								
								Change list title input styling ( #17092 )  
							
							
							
						 
						
							2021-12-17 23:00:05 +01:00  
				
					
						
							
							
								 
						
							
								50d62fe2e7 
								
							 
						 
						
							
							
								
								[Glitch] ignore hashtag suggestions if they vary only in case  
							
							... 
							
							
							
							Port 2aafa5b4e7 
							
						 
						
							2021-12-16 16:48:42 +01:00  
				
					
						
							
							
								 
						
							
								59a5193280 
								
							 
						 
						
							
							
								
								[Glitch] Show correct error message if chosen password is too long  
							
							... 
							
							
							
							Port 66baa629ea 
							
						 
						
							2021-12-16 16:26:04 +01:00  
				
					
						
							
							
								 
						
							
								9cecf59300 
								
							 
						 
						
							
							
								
								[Glitch] Add batch suspend for accounts in admin UI  
							
							... 
							
							
							
							Port SCSS changes from 2aafa5b4e7 
							
						 
						
							2021-12-16 16:25:21 +01:00  
				
					
						
							
							
								 
						
							
								b2526316f5 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.
Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system. 
							
						 
						
							2021-12-16 16:20:44 +01:00  
				
					
						
							
							
								 
						
							
								2aafa5b4e7 
								
							 
						 
						
							
							
								
								ignore hashtag suggestions if they vary only in case ( #16460 )  
							
							... 
							
							
							
							* ignore hashtag suggestions if they vary only in case
* remove console.logs and unused args
* consistently add space when dismissing suggestions
* linting 
							
						 
						
							2021-12-15 23:47:19 +01:00  
				
					
						
							
							
								 
						
							
								66baa629ea 
								
							 
						 
						
							
							
								
								Show correct error message if chosen password is too long ( #17082 )  
							
							... 
							
							
							
							* Add correct error message for exceeding max length on password confirmation field
* Code style fixes 
							
						 
						
							2021-12-05 21:49:50 +01:00  
				
					
						
							
							
								 
						
							
								0fb9536d38 
								
							 
						 
						
							
							
								
								Add batch suspend for accounts in admin UI ( #17009 )  
							
							
							
						 
						
							2021-12-05 21:48:39 +01:00  
				
					
						
							
							
								 
						
							
								d911c17f52 
								
							 
						 
						
							
							
								
								Fix unneeded outline around list name edition input  
							
							
							
						 
						
							2021-12-03 21:03:40 +01:00  
				
					
						
							
							
								 
						
							
								ca5d78816b 
								
							 
						 
						
							
							
								
								[Glitch] Fix searching for additional hashtags in hashtag column  
							
							... 
							
							
							
							Port 3f382e337d 
							
						 
						
							2021-11-26 22:58:46 +01:00  
				
					
						
							
							
								 
						
							
								d5d44b431a 
								
							 
						 
						
							
							
								
								[Glitch] Fix color of hashtag column settings inputs  
							
							... 
							
							
							
							Port 1630807ee2 
							
						 
						
							2021-11-26 22:58:13 +01:00  
				
					
						
							
							
								 
						
							
								9b861d56a9 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version. 
							
						 
						
							2021-11-26 22:53:55 +01:00  
				
					
						
							
							
								 
						
							
								3f382e337d 
								
							 
						 
						
							
							
								
								Fix searching for additional hashtags in hashtag column ( #17054 )  
							
							
							
						 
						
							2021-11-26 22:11:09 +01:00  
				
					
						
							
							
								 
						
							
								1630807ee2 
								
							 
						 
						
							
							
								
								Fix color of hashtag column settings inputs ( #17058 )  
							
							... 
							
							
							
							Fixes  #17057  
						
							2021-11-26 22:09:11 +01:00  
				
					
						
							
							
								 
						
							
								ddcb9da74f 
								
							 
						 
						
							
							
								
								Fix opening wrong profile when clicking on username of boosting user in WebUI ( #17060 )  
							
							... 
							
							
							
							Fixes  #16799  
						
							2021-11-26 22:04:09 +01:00  
				
					
						
							
							
								 
						
							
								97151840b0 
								
							 
						 
						
							
							
								
								[Glitch] Port upstream changes about trending links  
							
							
							
						 
						
							2021-11-26 11:36:22 +01:00  
				
					
						
							
							
								 
						
							
								7de0ee7aba 
								
							 
						 
						
							
							
								
								Remove Keybase integration ( #17045 )  
							
							
							
						 
						
							2021-11-26 05:58:18 +01:00  
				
					
						
							
							
								 
						
							
								67c4e8e317 
								
							 
						 
						
							
							
								
								[Glitch] Fix handling of recursive toots in WebUI  
							
							... 
							
							
							
							Port b1fd6d4490 
							
						 
						
							2021-11-25 23:52:22 +01:00  
				
					
						
							
							
								 
						
							
								443ec4f8ba 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/admin/tags/index.html.haml`:
  Removed upstream while it had changes in glitch-soc to accomodate for the
  theming system.
Additional changes to accomodate for the theming system:
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`
- `app/views/admin/trends/links/index.html.haml`
- `app/views/admin/trends/tags/index.html.haml`
- `app/views/admin/tags/show.html.haml` 
							
						 
						
							2021-11-25 23:50:35 +01:00  
				
					
						
							
							
								 
						
							
								b1fd6d4490 
								
							 
						 
						
							
							
								
								Fix handling of recursive toots in WebUI ( #17041 )  
							
							
							
						 
						
							2021-11-25 23:46:39 +01:00  
				
					
						
							
							
								 
						
							
								6e50134a42 
								
							 
						 
						
							
							
								
								Add trending links ( #16917 )  
							
							... 
							
							
							
							* Add trending links
* Add overriding specific links trendability
* Add link type to preview cards and only trend articles
Change trends review notifications from being sent every 5 minutes to being sent every 2 hours
Change threshold from 5 unique accounts to 15 unique accounts
* Fix tests 
							
						 
						
							2021-11-25 13:07:38 +01:00  
				
					
						
							
							
								 
						
							
								189cf652e6 
								
							 
						 
						
							
							
								
								[Glitch] Fix overflow of long profile fields in admin view  
							
							... 
							
							
							
							Port db32835338 
							
						 
						
							2021-11-19 18:55:27 +01:00  
				
					
						
							
							
								 
						
							
								2b4c7beb73 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-11-19 18:51:41 +01:00  
				
					
						
							
							
								 
						
							
								db32835338 
								
							 
						 
						
							
							
								
								Fix overflow of long profile fields in admin view ( #17010 )  
							
							
							
						 
						
							2021-11-19 18:22:49 +01:00  
				
					
						
							
							
								 
						
							
								6159020617 
								
							 
						 
						
							
							
								
								Fix background-color of emoji-mart selector ( #17011 )  
							
							... 
							
							
							
							Reverts part of #16907  to fix hardcoded color 
							
						 
						
							2021-11-19 18:21:37 +01:00  
				
					
						
							
							
								 
						
							
								2b6a25c609 
								
							 
						 
						
							
							
								
								Add lazy load to emoji-mart ( #16907 )  
							
							... 
							
							
							
							* perf: lazyload emoji-mart!
* Bump lazyload 
							
						 
						
							2021-11-18 22:01:31 +01:00  
				
					
						
							
							
								 
						
							
								8b8d58c670 
								
							 
						 
						
							
							
								
								Rename, move, fix code  
							
							
							
						 
						
							2021-11-12 19:51:35 +01:00  
				
					
						
							
							
								 
						
							
								3238e60823 
								
							 
						 
						
							
							
								
								Fix admin sidebar on Mobile layout  
							
							
							
						 
						
							2021-11-12 19:51:35 +01:00  
				
					
						
							
							
								 
						
							
								f33878969a 
								
							 
						 
						
							
							
								
								Fix some glitch-soc styling issues due to different class names  
							
							... 
							
							
							
							Partial fix to #1629  
							
						 
						
							2021-11-12 16:29:36 +01:00  
				
					
						
							
							
								 
						
							
								4bb6b1a1e7 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-11-06 00:15:38 +01:00  
				
					
						
							
							
								 
						
							
								7ccbfb55dd 
								
							 
						 
						
							
							
								
								ran `yarn manage:translations en` ( #16912 )  
							
							
							
						 
						
							2021-10-28 05:29:49 +02:00  
				
					
						
							
							
								 
						
							
								a30ac454b2 
								
							 
						 
						
							
							
								
								[Glitch] Split context for filter bar and unread markers  
							
							... 
							
							
							
							Port 11d4f9eefc 
							
						 
						
							2021-10-25 20:37:07 +02:00  
				
					
						
							
							
								 
						
							
								dbbb077c19 
								
							 
						 
						
							
							
								
								[Glitch] Enhance dashboard styles  
							
							... 
							
							
							
							Port b58d32cfe2 
							
						 
						
							2021-10-25 20:36:31 +02:00  
				
					
						
							
							
								 
						
							
								e855df149b 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies. 
							
						 
						
							2021-10-25 20:28:51 +02:00  
				
					
						
							
							
								 
						
							
								11d4f9eefc 
								
							 
						 
						
							
							
								
								Split context for filter bar and unread markers ( #16865 )  
							
							... 
							
							
							
							On notifications page, in settings, "Show" for quick filter bar and
unread notifications markers use the same string, while being placed in
the separate contexts - under different settings categories.
This commit splits the contexts, creating new strings:
- "Show filter bar" in place of "Show" for filter bar;
- "Highlight unread notifications" in place of "Show" for unread
  notification markers, which are now simply called "Highlighting";
- There's also "Unread notifications" in place of "Unread notification
  markers" string to accompany the changes to "Show" string under that
  category.
All new strings have new IDs, which will cause previous strings to
invalidate on the next translation update and new strings to be created.
This will help Mastodon translators to know that there are changes and
improve translation in accordance to the source string update. 
							
						 
						
							2021-10-25 16:32:28 +02:00  
				
					
						
							
							
								 
						
							
								dae377b3b5 
								
							 
						 
						
							
							
								
								translation glitch's web interface [ja]  
							
							... 
							
							
							
							Squashed commit of the following:
commit f8c339b4dafd7347c5e824191dbf28d770d6583d
Author: atsuchan <83960488+atsu1125@users.noreply.github.com>
Date:   Sat Oct 23 20:24:28 2021 +0900
    translation glitch's web interface [ja]
commit a9520d5c5fb21490fa66c51bf1063f1edb9150ff
Author: atsu1125 <mastodon@atsuchan.page>
Date:   Sat Oct 23 15:21:55 2021 +0900
    translation glitch's web interface [ja]
commit 699848f2abff24be149c4a1c623df8b920ef2ed9
Author: atsu1125 <mastodon@atsuchan.page>
Date:   Sat Oct 23 13:23:39 2021 +0900
    translation glitch's web interface [ja] 
							
						 
						
							2021-10-24 00:05:33 +09:00  
				
					
						
							
							
								 
						
							
								b58d32cfe2 
								
							 
						 
						
							
							
								
								Enhance dashboard styles ( #16884 )  
							
							... 
							
							
							
							* Display sparkline graph on Chrome
* Heatmap auto overflow
* Change grid columns number on small screen
* Please codeclimate bot
* Remove graph height 
							
						 
						
							2021-10-21 06:24:34 +02:00  
				
					
						
							
							
								 
						
							
								aa6269b08e 
								
							 
						 
						
							
							
								
								translation glitch's client setting interface [ja]  
							
							
							
						 
						
							2021-10-20 13:00:51 +09:00  
				
					
						
							
							
								 
						
							
								f00043dc4b 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #16354 )  
							
							... 
							
							
							
							* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Breton)
[ci skip]
* New translations simple_form.en.yml (Breton)
[ci skip]
* New translations simple_form.en.yml (Breton)
[ci skip]
* New translations simple_form.en.yml (Breton)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations activerecord.en.yml (Latvian)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations doorkeeper.en.yml (Latvian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Latvian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Latvian)
[ci skip]
* New translations doorkeeper.en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations doorkeeper.en.yml (Latvian)
[ci skip]
* New translations doorkeeper.en.yml (Latvian)
[ci skip]
* New translations doorkeeper.en.yml (Latvian)
[ci skip]
* New translations doorkeeper.en.yml (Latvian)
[ci skip]
* New translations devise.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations simple_form.en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Sinhala)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.json (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Tatar)
[ci skip]
* New translations en.yml (Malayalam)
[ci skip]
* New translations en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* Run `i18n-tasks normalize`
* Run `yarn manage:translations`
* Trim unnecessary line breaks
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2021-10-17 10:28:51 +09:00  
				
					
						
							
							
								 
						
							
								b2eaf5562d 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream added some documentation in the README, but our README is pretty
  different and barebone.
  Kept our README. 
							
						 
						
							2021-10-14 22:14:26 +02:00  
				
					
						
							
							
								 
						
							
								7aec1bc308 
								
							 
						 
						
							
							
								
								[Glitch] Add graphs and retention metrics to admin dashboard ( #16829 )  
							
							... 
							
							
							
							Port 07341e7aa6 
							
						 
						
							2021-10-14 21:45:01 +02:00  
				
					
						
							
							
								 
						
							
								694c073d1f 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/admin/dashboard_controller.rb`:
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.
- `app/views/admin/dashboard/index.html.haml`
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram. 
							
						 
						
							2021-10-14 21:44:57 +02:00  
				
					
						
							
							
								 
						
							
								3ec8e04b3b 
								
							 
						 
						
							
							
								
								Add font-display to display text before loading ( #16330 )  
							
							
							
						 
						
							2021-10-14 21:04:26 +02:00  
				
					
						
							
							
								 
						
							
								07341e7aa6 
								
							 
						 
						
							
							
								
								Add graphs and retention metrics to admin dashboard ( #16829 )  
							
							
							
						 
						
							2021-10-14 20:44:59 +02:00  
				
					
						
							
							
								 
						
							
								5169b374c6 
								
							 
						 
						
							
							
								
								[Glitch] Add single option votes tooltip in polls  
							
							... 
							
							
							
							Port 89b5071fde 
							
						 
						
							2021-10-13 15:53:33 +02:00  
				
					
						
							
							
								 
						
							
								1665b84285 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Not really a conflict, just a glitch-soc-only dependency textually too close
  to an updated upstream one.
- `yarn.lock`:
  Not really a conflict, just a glitch-soc-only dependency textually too close
  to an updated upstream one. 
							
						 
						
							2021-10-13 15:50:24 +02:00  
				
					
						
							
							
								 
						
							
								89b5071fde 
								
							 
						 
						
							
							
								
								Add single option votes tooltip in polls ( #16849 )  
							
							... 
							
							
							
							Adds a tooltip when hovering over the percentages in a poll showing how
many votes were cast for that option.
Also removes descriptions from messages here since they are not picked
up by Crowdin anyway and might be confusing to other developers :)
Fixes  #16820  
							
						 
						
							2021-10-13 04:59:31 +02:00  
				
					
						
							
							
								 
						
							
								0220065770 
								
							 
						 
						
							
							
								
								Fix status open hotkey  
							
							
							
						 
						
							2021-10-07 23:40:35 +02:00  
				
					
						
							
							
								 
						
							
								ebb4de7d3e 
								
							 
						 
						
							
							
								
								Add zh-CN translations  
							
							
							
						 
						
							2021-10-07 23:40:18 +02:00  
				
					
						
							
							
								 
						
							
								cef109e046 
								
							 
						 
						
							
							
								
								[Glitch] Improve hover and focus style in columns settings  
							
							... 
							
							
							
							Port 900481b7fa 
							
						 
						
							2021-10-06 16:51:42 +02:00  
				
					
						
							
							
								 
						
							
								079ed6c26d 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-10-06 16:46:32 +02:00  
				
					
						
							
							
								 
						
							
								900481b7fa 
								
							 
						 
						
							
							
								
								Improve hover and focus style in columns settings ( #16222 )  
							
							... 
							
							
							
							* Make focus visible on switches and text buttons in columns settings
* Make hover/focus visible on left/right arrows in columns settings
Use same style as for station action bar (reply/boost/fav/etc.)
* Tab first to “Pin/Unpin” before left/right arrows in columns settings 
							
						 
						
							2021-10-01 00:55:51 +02:00  
				
					
						
							
							
								 
						
							
								b31748a496 
								
							 
						 
						
							
							
								
								Fix clicking on account name in “[xxx] boosted” text leading to broken path  
							
							
							
						 
						
							2021-09-30 12:31:08 +02:00  
				
					
						
							
							
								 
						
							
								56f9c44f33 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-09-30 11:45:13 +02:00  
				
					
						
							
							
								 
						
							
								2e549fa2d5 
								
							 
						 
						
							
							
								
								Fix drawer tab menu routes in advanced web ui ( #16793 )  
							
							
							
						 
						
							2021-09-30 05:19:08 +02:00  
				
					
						
							
							
								 
						
							
								c4ccbbccab 
								
							 
						 
						
							
							
								
								Fixup style issue  
							
							
							
						 
						
							2021-09-28 13:24:34 +02:00  
				
					
						
							
							
								 
						
							
								345b64340b 
								
							 
						 
						
							
							
								
								[Glitch] Fix incorrect use of old WebUI paths  
							
							... 
							
							
							
							Port 6b19e1e632 
							
						 
						
							2021-09-28 13:07:27 +02:00  
				
					
						
							
							
								 
						
							
								188d66c9a8 
								
							 
						 
						
							
							
								
								[Glitch] Add aliases for WebUI routes that were renamed in  #16171  
							
							... 
							
							
							
							Port 11502ae46e 
							
						 
						
							2021-09-28 13:07:27 +02:00  
				
					
						
							
							
								 
						
							
								b2dd2e95ad 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-09-28 12:37:54 +02:00  
				
					
						
							
							
								 
						
							
								6b19e1e632 
								
							 
						 
						
							
							
								
								Fix incorrect use of old WebUI paths ( #16773 )  
							
							... 
							
							
							
							* Fix incorrect use of old WebUI paths
PR #16171  renamed some routes but missed some occurrences.
Without #16772 , this leads to unreachable routes in those cases.
* Fix floating action button being displayed on statuses and compose screen 
							
						 
						
							2021-09-27 07:24:04 +02:00  
				
					
						
							
							
								 
						
							
								11502ae46e 
								
							 
						 
						
							
							
								
								Add aliases for WebUI routes that were renamed in  #16171  ( #16772 )  
							
							... 
							
							
							
							* Add aliases for some WebUI routes that were renamed in #16171 
Accounts and statuses routes need more work as they use different parameters.
* Add aliases for /statuses/* routes
* Add aliases for /accounts/* WebUI routes
Does not correctly set the “active” state on the navigation tabs but this is
a minor issue.
* Fix some routes
* Fix /accounts/:id/{media,followers,following} not loading on legacy routes 
							
						 
						
							2021-09-27 07:23:48 +02:00  
				
					
						
							
							
								 
						
							
								a7f6524c6b 
								
							 
						 
						
							
							
								
								[Glitch] Change routing paths to use usernames in web UI  
							
							... 
							
							
							
							Port 52e5c07948 
							
						 
						
							2021-09-26 21:35:57 +02:00  
				
					
						
							
							
								 
						
							
								3622110778 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `streaming/index.js`:
  Filtering code for streaming notifications has been refactored upstream, but
  glitch-soc had similar code for local-only toots in the same places.
  Ported upstream changes, but did not refactor local-only filtering. 
							
						 
						
							2021-09-26 18:28:59 +02:00  
				
					
						
							
							
								 
						
							
								52e5c07948 
								
							 
						 
						
							
							
								
								Change routing paths to use usernames in web UI ( #16171 )  
							
							
							
						 
						
							2021-09-26 05:46:13 +02:00  
				
					
						
							
							
								 
						
							
								7aa4d481db 
								
							 
						 
						
							
							
								
								Fix media icons not being added in CWs  
							
							
							
						 
						
							2021-09-09 17:14:09 +02:00  
				
					
						
							
							
								 
						
							
								4a94f4127b 
								
							 
						 
						
							
							
								
								Fix glitch-soc front-end not linking to the provided SOURCE_URL  
							
							
							
						 
						
							2021-09-08 16:36:45 +02:00  
				
					
						
							
							
								 
						
							
								6bbcd99f14 
								
							 
						 
						
							
							
								
								Fix media attachments not being displayed on polls  
							
							... 
							
							
							
							Fixes  #1595  
						
							2021-09-08 16:36:30 +02:00  
				
					
						
							
							
								 
						
							
								39193be1c4 
								
							 
						 
						
							
							
								
								[Glitch] Fix follow request count to dynamically update  
							
							... 
							
							
							
							Port 79341d0f5f 
							
						 
						
							2021-08-27 11:31:09 +02:00  
				
					
						
							
							
								 
						
							
								463d23dfd5 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2021-08-27 11:29:03 +02:00  
				
					
						
							
							
								 
						
							
								79341d0f5f 
								
							 
						 
						
							
							
								
								Fix follow request count to dynamically update ( #16652 )  
							
							
							
						 
						
							2021-08-25 17:46:29 +02:00