Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								55f1aec9c4 
								
							 
						 
						
							
							
								
								[Glitch] Fix regression in sparkline style in web UI  
							
							... 
							
							
							
							Port bb9edd6321 
							
						 
						
							2020-05-14 18:50:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								5b9ed6e0c1 
								
							 
						 
						
							
							
								
								[Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted  
							
							... 
							
							
							
							Port 9af0613629 
							
						 
						
							2020-05-13 23:17:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ab970f996b 
								
							 
						 
						
							
							
								
								[Glitch] Fix some account avatars on public pages having incorrect size  
							
							... 
							
							
							
							Port e93c08ab96 
							
						 
						
							2020-05-13 23:17:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								80b1201644 
								
							 
						 
						
							
							
								
								[Glitch] Fix first poll option not being focused when adding a poll  
							
							... 
							
							
							
							Port 60dc5738cb 
							
						 
						
							2020-05-13 23:17:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								885b2e3d86 
								
							 
						 
						
							
							
								
								[Glitch] Add remote only to public timeline  
							
							... 
							
							
							
							Port 861661100c 
							
						 
						
							2020-05-10 16:19:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								5a2f0de845 
								
							 
						 
						
							
							
								
								[Glitch] Fix use of inline CSS in public pages  
							
							... 
							
							
							
							Port 20ffc12cda 
							
						 
						
							2020-05-10 16:19:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								8b8add863e 
								
							 
						 
						
							
							
								
								[Glitch] Fix admin-facing uses of inline CSS  
							
							... 
							
							
							
							Port a30829deee 
							
						 
						
							2020-05-03 21:47:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								3da2cd21fd 
								
							 
						 
						
							
							
								
								[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus  
							
							... 
							
							
							
							Port e88a05f707 
							
						 
						
							2020-05-03 21:47:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2ac3e3dc07 
								
							 
						 
						
							
							
								
								[Glitch] Fix end-user-facing uses of inline CSS  
							
							... 
							
							
							
							Port 3b7373ed4c 
							
						 
						
							2020-05-03 21:44:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								f261370e7c 
								
							 
						 
						
							
							
								
								[Glitch] Refactor/cleanup TIMELINE_DELETE-related code  
							
							... 
							
							
							
							Port df5867f072 
							
						 
						
							2020-05-03 21:42:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								e869a257d8 
								
							 
						 
						
							
							
								
								[Glitch] Fix messed up z-index when NoScript blocks media/previews  
							
							... 
							
							
							
							Port f53bd1bef6 
							
						 
						
							2020-05-03 21:41:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								dfa13deaa1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/statuses_controller.rb`:
  Upstream disabled the embed controller for reblogs.
  Not a real conflict, but glitch-soc has an extra line to deal
  with its theming system.
  Ported upstream changes.
- `app/javascript/packs/public.js`:
  Upstream made changes to get rid of most inline CSS, this changes
  javascript for public pages, which in glitch are split between
  different files. Ported those changes.
- `app/models/status.rb`:
  Upstream changed the block check in `Status#permitted_for` to
  include domain-block checks. Not a real conflict with glitch-soc,
  but our scope is slightly different, as our scope for
  unauthenticated access do not include instance-local toots.
  Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
  Not a real conflict, upstream added a new field to the instance
  serializer, the conflict is one line above since we added more of
  that.
  Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
  Upstream got rid of most inline CSS and moved hidden elements
  to data attributes in the process, in fields were we have
  different values.
  Ported upstream changes while keeping our glitch-specific
  values.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream got rid of inline CSS on an HAML line we treat
  differently, stripping empty text nodes.
  Ported upstream changes to the style attribute, keeping
  the empty text node stripping behavior. 
							
						 
						
							2020-05-03 21:23:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2e92d55b64 
								
							 
						 
						
							
							
								
								[Glitch] Fix uninformative error message when uploading unsupported image files  
							
							... 
							
							
							
							Port cd3a0a17bc 
							
						 
						
							2020-04-25 15:29:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ed2267b78e 
								
							 
						 
						
							
							
								
								[Glitch] Fix expanded video player issues  
							
							... 
							
							
							
							Port 3526163340 
							
						 
						
							2020-04-25 15:28:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Irie Aoi 
								
							 
						 
						
							
							
							
							
								
							
							
								1e1b72ff72 
								
							 
						 
						
							
							
								
								[Glitch] Set max-width and max-height to gif video  
							
							... 
							
							
							
							Port cf1bf9dda9 
							
						 
						
							2020-04-25 15:26:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								7195bca890 
								
							 
						 
						
							
							
								
								[Glitch] Fix and refactor keyboard navigation in dropdown menus  
							
							... 
							
							
							
							Port 69696c62b1 
							
						 
						
							2020-04-25 15:24:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									D Anzorge 
								
							 
						 
						
							
							
							
							
								
							
							
								0b8c354379 
								
							 
						 
						
							
							
								
								[Glitch] Update Twemoji to 12.1.5  
							
							... 
							
							
							
							Port emoji_map.json changes from 945c8e207e 
							
						 
						
							2020-04-20 16:54:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								6556bd1f67 
								
							 
						 
						
							
							
								
								[Glitch] Add local only to hashtag timeline  
							
							... 
							
							
							
							Port front-end changes from f5606cdab4 
							
						 
						
							2020-04-20 16:52:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								f41a61965a 
								
							 
						 
						
							
							
								
								[Glitch] Fix uploaded image orientation in some browsers  
							
							... 
							
							
							
							Port 2444658e4b 
							
						 
						
							2020-04-18 15:48:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2c92697ec8 
								
							 
						 
						
							
							
								
								[Glitch] Fix not being able to vote  
							
							... 
							
							
							
							Port 0f3317fbe2 
							
						 
						
							2020-04-17 22:04:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gurgen Hayrapetyan 
								
							 
						 
						
							
							
							
							
								
							
							
								f451095c04 
								
							 
						 
						
							
							
								
								[Glitch] Fix Poll fetchPoll action not being debounced.  
							
							... 
							
							
							
							Port 53f9f8a4ce 
							
						 
						
							2020-04-17 20:20:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								9e12c3f3a7 
								
							 
						 
						
							
							
								
								[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists  
							
							... 
							
							
							
							Port 9d57af78d2 
							
						 
						
							2020-04-12 17:01:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								6d3e240aa9 
								
							 
						 
						
							
							
								
								Clean up some dead code  
							
							
							
						 
						
							2020-04-10 14:47:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								79e5f368ed 
								
							 
						 
						
							
							
								
								Fix deprecated use of createBrowserHistory  
							
							
							
						 
						
							2020-04-09 17:03:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c13682bc0d 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								08e4bed98c 
								
							 
						 
						
							
							
								
								[Glitch] Add explanation as to why unlocked accounts may have follow requests  
							
							... 
							
							
							
							Port ffd6f3fa8a 
							
						 
						
							2020-04-04 21:59:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								04839f5dda 
								
							 
						 
						
							
							
								
								[Glitch] Add ability to filter audit log in admin UI  
							
							... 
							
							
							
							Port 6932e0e2af 
							
						 
						
							2020-04-04 21:53:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sasha Sorokin 
								
							 
						 
						
							
							
							
							
								
							
							
								56dba219d1 
								
							 
						 
						
							
							
								
								[Glitch] Improve polls: option lengths & redesign  
							
							... 
							
							
							
							Port abbc0c6a87 
							
						 
						
							2020-04-02 20:52:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								660a3d2b7a 
								
							 
						 
						
							
							
								
								[Glitch] Improve toot clicking areas  
							
							... 
							
							
							
							Port part of 899ff914da 
							
						 
						
							2020-04-02 20:49:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								0a02eade54 
								
							 
						 
						
							
							
								
								[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW  
							
							... 
							
							
							
							Port 41ca3cdb37 
							
						 
						
							2020-04-02 20:45:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								989f819191 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI  
							
							... 
							
							
							
							Port 5a211c478d 
							
						 
						
							2020-04-02 20:45:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								61052dfa33 
								
							 
						 
						
							
							
								
								[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI  
							
							... 
							
							
							
							Port front-end changes from 1a993f9675 
							
						 
						
							2020-04-02 20:39:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								5dbcafb998 
								
							 
						 
						
							
							
								
								[Glitch] Fix frontend crash when deleting announcements  
							
							... 
							
							
							
							Port 15c02a7160 
							
						 
						
							2020-03-27 22:06:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6adb571c21 
								
							 
						 
						
							
							
								
								[Glitch] Change poll option hover/active styling to be less confusing  
							
							... 
							
							
							
							Port 421a3a8f08 
							
						 
						
							2020-03-27 22:06:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Sockwell 
								
							 
						 
						
							
							
							
							
								
							
							
								5e3049158e 
								
							 
						 
						
							
							
								
								[Glitch] Fix frontend crash when deleting announcements  
							
							... 
							
							
							
							Port 577f74ad87 
							
						 
						
							2020-03-22 16:31:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								e9338c7640 
								
							 
						 
						
							
							
								
								[Glitch] Fix regression in “Edit media” modal in web UI  
							
							... 
							
							
							
							Port c5731b4dc7 
							
						 
						
							2020-03-22 16:30:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								24e4647483 
								
							 
						 
						
							
							
								
								[Glitch] Change the string "hidden" to "blocked" in WebUI  
							
							... 
							
							
							
							Port 4a87cebf48 
							
						 
						
							2020-03-22 16:29:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3e87f56ab3 
								
							 
						 
						
							
							
								
								[Glitch] Change local media attachments to perform heavy processing asynchronously  
							
							... 
							
							
							
							Port front-end part of f459919552 
							
						 
						
							2020-03-22 16:26:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								99fc46d023 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e16832bc9c 
								
							 
						 
						
							
							
								
								Fix missing media description dialog when sending toots with keyboard shortcuts  
							
							
							
						 
						
							2020-03-14 14:59:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								03309b0dc5 
								
							 
						 
						
							
							
								
								Fix posting privacy on secondary button with missing description confirmation dialog  
							
							
							
						 
						
							2020-03-14 12:33:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9af4ed237c 
								
							 
						 
						
							
							
								
								Fix privacy icon being displayed twice in glitch-soc Web UI  
							
							... 
							
							
							
							Fixes  #1298  
						
							2020-03-11 23:25:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								96df38d753 
								
							 
						 
						
							
							
								
								[Glitch] Add support for links to statuses in announcements to be opened in web UI  
							
							... 
							
							
							
							Port a67fd2fbe1 
							
						 
						
							2020-03-08 20:46:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								8dede28b01 
								
							 
						 
						
							
							
								
								[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI  
							
							... 
							
							
							
							Port 399fa48f8e 
							
						 
						
							2020-03-08 20:45:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bèr Kessels 
								
							 
						 
						
							
							
							
							
								
							
							
								96b18a705f 
								
							 
						 
						
							
							
								
								[Glitch] Code style improvements in JavaScript  
							
							... 
							
							
							
							Port b5d7ec71ef 
							
						 
						
							2020-03-08 20:43:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								ce8d13d2fb 
								
							 
						 
						
							
							
								
								[Glitch] Change description of privacy levels to be more intuitive in web UI  
							
							... 
							
							
							
							Port 263bedff9e 
							
						 
						
							2020-03-08 20:37:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								5325a14430 
								
							 
						 
						
							
							
								
								[Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI  
							
							... 
							
							
							
							Port 38a26d5314 
							
						 
						
							2020-03-08 20:19:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								71d28dcfb9 
								
							 
						 
						
							
							
								
								[Glitch] Fix too large announcements not being scrollable in web UI  
							
							... 
							
							
							
							Port 1eae25af56 
							
						 
						
							2020-03-08 20:16:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									koyu 
								
							 
						 
						
							
							
							
							
								
							
							
								6a7c4c26f0 
								
							 
						 
						
							
							
								
								[Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI  
							
							... 
							
							
							
							Port e899e0dc98 
							
						 
						
							2020-03-08 20:15:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d668512e64 
								
							 
						 
						
							
							
								
								[Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI  
							
							... 
							
							
							
							Port 03d2704430 
							
						 
						
							2020-03-08 20:14:20 +01:00