221ea4787f 
								
							 
						 
						
							
							
								
								[Glitch] Update Twemoji to 12.1.5  
							
							... 
							
							
							
							Port emoji_map.json changes from 29f5353f8b 
							
						 
						
							2020-04-20 16:54:01 +02:00  
				
					
						
							
							
								 
						
							
								7ceeb97f3d 
								
							 
						 
						
							
							
								
								[Glitch] Add local only to hashtag timeline  
							
							... 
							
							
							
							Port front-end changes from 2c7128c7f0 
							
						 
						
							2020-04-20 16:52:56 +02:00  
				
					
						
							
							
								 
						
							
								63dc7cfa90 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-20 16:45:40 +02:00  
				
					
						
							
							
								 
						
							
								29f5353f8b 
								
							 
						 
						
							
							
								
								Update Twemoji to 12.1.5 ( #13021 )  
							
							... 
							
							
							
							* Update Twemoji to 12.1.5
SVGs from Twemoji repo https://github.com/twitter/twemoji 
* Update emoji_map.json to Unicode 12 
							
						 
						
							2020-04-19 23:38:31 +02:00  
				
					
						
							
							
								 
						
							
								2c7128c7f0 
								
							 
						 
						
							
							
								
								Add local only to hashtag timeline ( #13502 )  
							
							
							
						 
						
							2020-04-18 21:52:39 +02:00  
				
					
						
							
							
								 
						
							
								bf9da1e734 
								
							 
						 
						
							
							
								
								[Glitch] Fix uploaded image orientation in some browsers  
							
							... 
							
							
							
							Port a1ce9cbb67 
							
						 
						
							2020-04-18 15:48:15 +02:00  
				
					
						
							
							
								 
						
							
								0cbc24e3b6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-18 15:47:32 +02:00  
				
					
						
							
							
								 
						
							
								a1ce9cbb67 
								
							 
						 
						
							
							
								
								Fix uploaded image orientation in some browsers ( #13493 )  
							
							... 
							
							
							
							Some browsers (at least recent Chrome versions) automatically take
image metadata into account when drawing images into a canvas.
There seem to be no way to prevent that behavior, and the only
way to detect it seems to compare with a known image.
See: https://github.com/w3c/csswg-drafts/issues/4666 
Solution adapted from: 1e4df70782 
							
						 
						
							2020-04-18 15:37:03 +02:00  
				
					
						
							
							
								 
						
							
								81ef26b67d 
								
							 
						 
						
							
							
								
								[Glitch] Fix not being able to vote  
							
							... 
							
							
							
							Port e12a5635da 
							
						 
						
							2020-04-17 22:04:10 +02:00  
				
					
						
							
							
								 
						
							
								7ee65ba15e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-17 22:02:55 +02:00  
				
					
						
							
							
								 
						
							
								e12a5635da 
								
							 
						 
						
							
							
								
								Fix not being able to vote ( #13490 )  
							
							... 
							
							
							
							Fix regression introduced by ab8d7c0680 
							
						 
						
							2020-04-17 21:54:25 +02:00  
				
					
						
							
							
								 
						
							
								4849752a9c 
								
							 
						 
						
							
							
								
								[Glitch] Fix Poll fetchPoll action not being debounced.  
							
							... 
							
							
							
							Port ab8d7c0680 
							
						 
						
							2020-04-17 20:20:06 +02:00  
				
					
						
							
							
								 
						
							
								81e49ba5c6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-17 20:16:24 +02:00  
				
					
						
							
							
								 
						
							
								ab8d7c0680 
								
							 
						 
						
							
							
								
								Fix Poll fetchPoll action not being debounced. ( #13485 )  
							
							... 
							
							
							
							* Fix Poll fetchPoll action not being debounced.
* Fix unused import in the Poll component 
							
						 
						
							2020-04-16 20:16:20 +02:00  
				
					
						
							
							
								 
						
							
								a08a2130f0 
								
							 
						 
						
							
							
								
								[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists  
							
							... 
							
							
							
							Port ec31b1b752 
							
						 
						
							2020-04-12 17:01:41 +02:00  
				
					
						
							
							
								 
						
							
								fdd0beefa7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours. 
							
						 
						
							2020-04-12 16:50:27 +02:00  
				
					
						
							
							
								 
						
							
								ec31b1b752 
								
							 
						 
						
							
							
								
								Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists ( #13445 )  
							
							... 
							
							
							
							* Fix following, followers and follow requests pagination
* Fix pagination of blocks and mutes 
							
						 
						
							2020-04-12 13:38:00 +02:00  
				
					
						
							
							
								 
						
							
								51bbf0b68d 
								
							 
						 
						
							
							
								
								Clean up some dead code  
							
							
							
						 
						
							2020-04-10 14:47:06 +02:00  
				
					
						
							
							
								 
						
							
								5d2cdeb225 
								
							 
						 
						
							
							
								
								Fix deprecated use of createBrowserHistory  
							
							
							
						 
						
							2020-04-09 17:03:05 +02:00  
				
					
						
							
							
								 
						
							
								9101254d0a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes. 
							
						 
						
							2020-04-05 18:32:06 +02:00  
				
					
						
							
							
								 
						
							
								510db5eef9 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #13317 )  
							
							... 
							
							
							
							* New translations en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations devise.en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations activerecord.en.yml (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Georgian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Hebrew)
[ci skip]
* New translations activerecord.en.yml (Hebrew)
[ci skip]
* New translations devise.en.yml (Hebrew)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations en.yml (Hindi)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations doorkeeper.en.yml (Esperanto)
[ci skip]
* New translations doorkeeper.en.yml (French)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Estonian)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations doorkeeper.en.yml (Welsh)
[ci skip]
* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Urdu (Pakistan))
[ci skip]
* New translations activerecord.en.yml (Vietnamese)
[ci skip]
* New translations devise.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations devise.en.yml (German)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations devise.en.yml (Galician)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[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 (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations activerecord.en.yml (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[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 simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations 
							
						 
						
							2020-04-05 14:56:18 +02:00  
				
					
						
							
							
								 
						
							
								eea0cd8fad 
								
							 
						 
						
							
							
								
								Fix “Show more” not switching to “Show less” on public pages ( #13174 )  
							
							... 
							
							
							
							* Fix “Show more” not switching to “Show less” on public pages
Fixes  #13169 
* Fix initial text of CW button on public pages when CW are unfolded by default 
							
						 
						
							2020-04-05 14:02:22 +02:00  
				
					
						
							
							
								 
						
							
								fd7a37c371 
								
							 
						 
						
							
							
								
								[Glitch] Add explanation as to why unlocked accounts may have follow requests  
							
							... 
							
							
							
							Port d3ff06a320 
							
						 
						
							2020-04-04 21:59:49 +02:00  
				
					
						
							
							
								 
						
							
								7d5b43d8bb 
								
							 
						 
						
							
							
								
								[Glitch] Add ability to filter audit log in admin UI  
							
							... 
							
							
							
							Port f65568f1d4 
							
						 
						
							2020-04-04 21:53:31 +02:00  
				
					
						
							
							
								 
						
							
								8fef96cbf5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-04-04 21:47:37 +02:00  
				
					
						
							
							
								 
						
							
								d3ff06a320 
								
							 
						 
						
							
							
								
								Add explanation as to why unlocked accounts may have follow requests ( #13385 )  
							
							... 
							
							
							
							* Add explanation as to why unlocked accounts may have follow requests
* Change wording to avoid “silenced” 
							
						 
						
							2020-04-04 19:02:10 +02:00  
				
					
						
							
							
								 
						
							
								f65568f1d4 
								
							 
						 
						
							
							
								
								Add ability to filter audit log in admin UI ( #13381 )  
							
							
							
						 
						
							2020-04-03 13:06:34 +02:00  
				
					
						
							
							
								 
						
							
								b367dd713e 
								
							 
						 
						
							
							
								
								[Glitch] Improve polls: option lengths & redesign  
							
							... 
							
							
							
							Port 37b3985bfa 
							
						 
						
							2020-04-02 20:52:53 +02:00  
				
					
						
							
							
								 
						
							
								2e337d850f 
								
							 
						 
						
							
							
								
								[Glitch] Improve toot clicking areas  
							
							... 
							
							
							
							Port part of 1fb92037e4 
							
						 
						
							2020-04-02 20:49:43 +02:00  
				
					
						
							
							
								 
						
							
								9175ebf20c 
								
							 
						 
						
							
							
								
								[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW  
							
							... 
							
							
							
							Port cf1fa73347 
							
						 
						
							2020-04-02 20:45:46 +02:00  
				
					
						
							
							
								 
						
							
								dcf841545d 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI  
							
							... 
							
							
							
							Port be2f1597cf 
							
						 
						
							2020-04-02 20:45:03 +02:00  
				
					
						
							
							
								 
						
							
								3eede6f64b 
								
							 
						 
						
							
							
								
								[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI  
							
							... 
							
							
							
							Port front-end changes from 0d117c106a 
							
						 
						
							2020-04-02 20:39:44 +02:00  
				
					
						
							
							
								 
						
							
								f3eff922a3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update. 
							
						 
						
							2020-04-02 20:32:00 +02:00  
				
					
						
							
							
								 
						
							
								37b3985bfa 
								
							 
						 
						
							
							
								
								Improve polls: option lengths & redesign ( #13257 )  
							
							... 
							
							
							
							This commit redesign the polls and increases characters limit for the
options from 25 to 50 characters, giving pollsters more freedom.
Summarizing, the redesign is making the polls more adaptive for upcoming
changes to the options characters limit: the bar, or a "chart", is now
displayed separately from the option itself; vote check mark is moved
next to the option text, making the percentages take less space. Option
lengths are taken into account and text is wrapped to multiple lines
if necessary to avoid overflow. 
							
						 
						
							2020-04-02 17:10:55 +02:00  
				
					
						
							
							
								 
						
							
								4bf5aeae83 
								
							 
						 
						
							
							
								
								Fix pinning a column in web UI sometimes redirecting out of web UI ( #13376 )  
							
							... 
							
							
							
							Fix  #13216  
						
							2020-04-02 03:12:10 +02:00  
				
					
						
							
							
								 
						
							
								1fb92037e4 
								
							 
						 
						
							
							
								
								Improve toot clicking areas ( #13327 )  
							
							... 
							
							
							
							* Make the area to the left “Show Thread” also expand the toot in Web UI
* Clicking the left part of a conversation with the avatars now opens it in Web UI 
							
						 
						
							2020-03-31 19:40:23 +02:00  
				
					
						
							
							
								 
						
							
								cf1fa73347 
								
							 
						 
						
							
							
								
								Fix content warning being unnecessarily cleared when enabling/disabling CW ( #13348 )  
							
							
							
						 
						
							2020-03-31 14:10:18 +02:00  
				
					
						
							
							
								 
						
							
								be2f1597cf 
								
							 
						 
						
							
							
								
								Fix wrong color for ellipsis in boost confirmation dialog in Web UI ( #13355 )  
							
							
							
						 
						
							2020-03-31 12:39:50 +02:00  
				
					
						
							
							
								 
						
							
								0d117c106a 
								
							 
						 
						
							
							
								
								Fix 404 and 410 API errors being silently discarded in WebUI ( #13279 )  
							
							... 
							
							
							
							* Fix 404 and 410 API errors being silently discarded in WebUI
Fixes  #13278 
* Return more appropriate error when user replies to a deleted toot
* Please CodeClimate
* Fix 404/410 errors on fetching account timelines & identity proofs
* Refactor error handling
* Move error message string to statuses.errors 
							
						 
						
							2020-03-28 17:59:45 +01:00  
				
					
						
							
							
								 
						
							
								faa56643b8 
								
							 
						 
						
							
							
								
								[Glitch] Fix frontend crash when deleting announcements  
							
							... 
							
							
							
							Port 858d0dd168 
							
						 
						
							2020-03-27 22:06:42 +01:00  
				
					
						
							
							
								 
						
							
								60338b2bee 
								
							 
						 
						
							
							
								
								[Glitch] Change poll option hover/active styling to be less confusing  
							
							... 
							
							
							
							Port beb80adb51 
							
						 
						
							2020-03-27 22:06:06 +01:00  
				
					
						
							
							
								 
						
							
								7b435fd9bf 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly. 
							
						 
						
							2020-03-27 21:54:44 +01:00  
				
					
						
							
							
								 
						
							
								260eb6f2e6 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #13064 )  
							
							... 
							
							
							
							* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations devise.en.yml (Icelandic)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Swedish)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations devise.en.yml (Kabyle)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations simple_form.en.yml (Welsh)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Asturian)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations devise.en.yml (Kabyle)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (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 simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations activerecord.en.yml (Kabyle)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations devise.en.yml (Breton)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations doorkeeper.en.yml (Breton)
[ci skip]
* New translations simple_form.en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations devise.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations 
							
						 
						
							2020-03-25 23:17:14 +01:00  
				
					
						
							
							
								 
						
							
								858d0dd168 
								
							 
						 
						
							
							
								
								Fix frontend crash when deleting announcements ( #13312 )  
							
							... 
							
							
							
							Refactor and fix  #13283 , which only worked in some cases. 
							
						 
						
							2020-03-25 22:39:55 +01:00  
				
					
						
							
							
								 
						
							
								beb80adb51 
								
							 
						 
						
							
							
								
								Change poll option hover/active styling to be less confusing ( #13313 )  
							
							
							
						 
						
							2020-03-25 22:39:18 +01:00  
				
					
						
							
							
								 
						
							
								9da4bd098c 
								
							 
						 
						
							
							
								
								[Glitch] Fix frontend crash when deleting announcements  
							
							... 
							
							
							
							Port 8758221e73 
							
						 
						
							2020-03-22 16:31:01 +01:00  
				
					
						
							
							
								 
						
							
								0ff78befc6 
								
							 
						 
						
							
							
								
								[Glitch] Fix regression in “Edit media” modal in web UI  
							
							... 
							
							
							
							Port 90f3a00062 
							
						 
						
							2020-03-22 16:30:19 +01:00  
				
					
						
							
							
								 
						
							
								912f4a2eba 
								
							 
						 
						
							
							
								
								[Glitch] Change the string "hidden" to "blocked" in WebUI  
							
							... 
							
							
							
							Port 310d729745 
							
						 
						
							2020-03-22 16:29:51 +01:00  
				
					
						
							
							
								 
						
							
								295dadc9f0 
								
							 
						 
						
							
							
								
								[Glitch] Change local media attachments to perform heavy processing asynchronously  
							
							... 
							
							
							
							Port front-end part of 9660aa4543 
							
						 
						
							2020-03-22 16:26:26 +01:00  
				
					
						
							
							
								 
						
							
								9abb227250 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes. 
							
						 
						
							2020-03-22 16:10:44 +01:00