Claire
							
						 
						
							 
							
							
							
							
								
							
							
								41ef41b900 
								
							 
						 
						
							
							
								
								Fix publish buttons styling  
							
							 
							
							
							
						 
						
							2022-02-23 22:04:12 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								ae3cd3b84c 
								
							 
						 
						
							
							
								
								[Glitch] Fix reporting from profile  
							
							 
							
							... 
							
							
							
							Port b7cf11d5a9  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-23 21:46:46 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								fc2c65d79f 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							 
							
							
							
						 
						
							2022-02-23 21:44:09 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								b7cf11d5a9 
								
							 
						 
						
							
							
								
								Fix reporting from profile ( #17632 )  
							
							 
							
							... 
							
							
							
							* Fix reporting from profile
* Clean up dead code 
							
						 
						
							2022-02-23 21:37:02 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								470c0a8002 
								
							 
						 
						
							
							
								
								[Glitch] Change report modal to include category selection in web UI  
							
							 
							
							... 
							
							
							
							Port a9a43de6d1  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-23 20:25:55 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								9dd62c95c5 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							 
							
							
							
						 
						
							2022-02-23 20:05:04 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								f99943cd74 
								
							 
						 
						
							
							
								
								[Glitch] Add notifications for new sign-ups  
							
							 
							
							... 
							
							
							
							Port 7b816eb5ae  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-23 19:04:09 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								7b816eb5ae 
								
							 
						 
						
							
							
								
								Add notifications for new sign-ups ( #16953 )  
							
							 
							
							
							
						 
						
							2022-02-23 16:45:22 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								luzpaz
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								5169a9f9d9 
								
							 
						 
						
							
							
								
								[Glitch] Fix link colors in report and strike details  
							
							 
							
							... 
							
							
							
							Port SCSS changes from 51e67f3243  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-22 18:10:08 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								e07f2efc9f 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong styles on strike page  
							
							 
							
							... 
							
							
							
							Port SCSS changes from 8338826963 
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-22 18:09:39 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								51e67f3243 
								
							 
						 
						
							
							
								
								Fix link colors in report and strike details ( #17616 )  
							
							 
							
							
							
						 
						
							2022-02-22 15:27:25 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								8338826963 
								
							 
						 
						
							
							
								
								Fix wrong styles on strike page ( #17615 )  
							
							 
							
							
							
						 
						
							2022-02-22 06:20:04 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								dc121b609f 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							 
							
							
							
						 
						
							2022-02-19 11:33:18 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								41a8606627 
								
							 
						 
						
							
							
								
								[Glitch] Fix opening the emoji picker scrolling the single-column view to the top  
							
							 
							
							... 
							
							
							
							Port aa86cf9557  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-17 11:05:47 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								d70e4e3da0 
								
							 
						 
						
							
							
								
								[Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden  
							
							 
							
							... 
							
							
							
							Port 00b45b967e  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-17 11:04:13 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								5ed35a0df4 
								
							 
						 
						
							
							
								
								[Glitch] Add appeals  
							
							 
							
							... 
							
							
							
							Port SCSS changes from 564efd0651  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-17 10:58:57 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								3a0eba4918 
								
							 
						 
						
							
							
								
								[Glitch] Fix privacy policy link not being visible on small screens  
							
							 
							
							... 
							
							
							
							Port bbd3474416  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-17 10:58:53 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								00b45b967e 
								
							 
						 
						
							
							
								
								Fix edge case where settings/admin page sidebar would be incorrectly hidden ( #17580 )  
							
							 
							
							
							
						 
						
							2022-02-16 21:44:19 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								ec4f906618 
								
							 
						 
						
							
							
								
								Fix toggling sidebar on mobile in admin pages  
							
							 
							
							
							
						 
						
							2022-02-16 16:33:23 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								bbd3474416 
								
							 
						 
						
							
							
								
								Fix privacy policy link not being visible on small screens ( #17533 )  
							
							 
							
							... 
							
							
							
							Fix  #17482  
							
						 
						
							2022-02-13 02:52:34 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								f3429d7354 
								
							 
						 
						
							
							
								
								[Glitch] Fix controls for unchangeable properties on status edit not being disabled  
							
							 
							
							... 
							
							
							
							Port 38845592c4  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-12 22:36:39 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								c9669ee167 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							 
							
							
							
						 
						
							2022-02-12 21:36:33 +01:00  
						
					 
				
					
						
							
							
								 
								Holly
							
						 
						
							 
							
							
							
							
								
							
							
								27803cd2b7 
								
							 
						 
						
							
							
								
								Make the settings button go to settings when opened in a new tab  
							
							 
							
							
							
						 
						
							2022-02-12 20:12:29 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								38845592c4 
								
							 
						 
						
							
							
								
								Fix controls for unchangeable properties on status edit not being disabled ( #17531 )  
							
							 
							
							... 
							
							
							
							Fixes  #17520  
							
						 
						
							2022-02-12 19:00:33 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								f4db2e1832 
								
							 
						 
						
							
							
								
								[Glitch] Fix layout of the report page on smaller screens in admin UI  
							
							 
							
							... 
							
							
							
							Port e848d281d5  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-12 13:15:07 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								958089fb21 
								
							 
						 
						
							
							
								
								[Glitch] Add notifications when a reblogged status has been updated  
							
							 
							
							... 
							
							
							
							Port front-end changes from 8f03b7a2fb  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-12 13:15:07 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								d9379f5331 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							 
							
							
							
						 
						
							2022-02-12 11:12:41 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e848d281d5 
								
							 
						 
						
							
							
								
								Fix layout of the report page on smaller screens in admin UI ( #17523 )  
							
							 
							
							... 
							
							
							
							Fix  #17491  
							
						 
						
							2022-02-12 01:08:23 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								28ec7def58 
								
							 
						 
						
							
							
								
								Fix missing javascript in some admin pages  
							
							 
							
							
							
						 
						
							2022-02-12 00:10:28 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								a34e4f7e27 
								
							 
						 
						
							
							
								
								[Glitch] Change actions in reports to require only one click  
							
							 
							
							... 
							
							
							
							Port SCSS changes from d0fcf07436 
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-11 21:56:27 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								51cad4f7fb 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							 
							
							
							
						 
						
							2022-02-11 21:53:20 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								d0fcf07436 
								
							 
						 
						
							
							
								
								Change actions in reports to require only one click ( #17487 )  
							
							 
							
							
							
						 
						
							2022-02-11 21:51:57 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								642b5a621a 
								
							 
						 
						
							
							
								
								[Glitch] Chore: Disable menu items for editing statuses in web UI ( #17497 )  
							
							 
							
							... 
							
							
							
							Port 3dc1e3cfc3  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-10 19:10:59 +01:00  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								5e67858fbc 
								
							 
						 
						
							
							
								
								[Glitch] Add editing for published statuses  
							
							 
							
							... 
							
							
							
							Port 63002cde03  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-10 19:10:20 +01:00  
						
					 
				
					
						
							
							
								 
								Claire
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Eugen Rochko
							
						 
						
							 
							
							
							
							
								
							
							
								44b06c4d96 
								
							 
						 
						
							
							
								
								[Glitch] Add edit history to web UI  
							
							 
							
							... 
							
							
							
							Port fd3a45e348  to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2022-02-09 17:51:35 +01:00