1f94f4009e 
								
							 
						 
						
							
							
								
								Improve appearance of notification cleaning UI  
							
							... 
							
							
							
							- Use smaller font-size for consistency with the rest of the UI
- Make better use of the horizontal space when available 
							
						 
						
							2020-06-01 12:28:27 +02:00  
				
					
						
							
							
								 
						
							
								9707dbee6f 
								
							 
						 
						
							
							
								
								[Glitch] Fix timeline markers in Firefox  
							
							... 
							
							
							
							Port cc650bc023 
							
						 
						
							2020-05-29 20:02:30 +02:00  
				
					
						
							
							
								 
						
							
								9bd30b8dd5 
								
							 
						 
						
							
							
								
								[Glitch] Fix timeline markers not working on Chrome  
							
							... 
							
							
							
							Port 5aff2a6957 
							
						 
						
							2020-05-29 20:02:30 +02:00  
				
					
						
							
							
								 
						
							
								e8714530a4 
								
							 
						 
						
							
							
								
								Fix local-only hashtag columns  
							
							
							
						 
						
							2020-05-28 15:21:16 +02:00  
				
					
						
							
							
								 
						
							
								7a74e46b77 
								
							 
						 
						
							
							
								
								Fix one import being made on mastodon's codebase instead of glitch-soc's  
							
							
							
						 
						
							2020-05-28 15:14:12 +02:00  
				
					
						
							
							
								 
						
							
								0b01492276 
								
							 
						 
						
							
							
								
								[Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI  
							
							... 
							
							
							
							Port 40d81620b0 
							
						 
						
							2020-05-28 14:08:05 +02:00  
				
					
						
							
							
								 
						
							
								44ea965557 
								
							 
						 
						
							
							
								
								[Glitch] Fix local streaming of hashtag timelines  
							
							... 
							
							
							
							Port 3a1a21ad57 
							
						 
						
							2020-05-28 14:05:21 +02:00  
				
					
						
							
							
								 
						
							
								c8cee24cb3 
								
							 
						 
						
							
							
								
								Fix Cmd-Enter not working to send toot  
							
							... 
							
							
							
							Fixes  #1333  
						
							2020-05-26 10:15:35 +02:00  
				
					
						
							
							
								 
						
							
								2b75728a80 
								
							 
						 
						
							
							
								
								[Glitch] Fix regression in sparkline style in web UI  
							
							... 
							
							
							
							Port c9dcc2d39f 
							
						 
						
							2020-05-14 18:50:57 +02:00  
				
					
						
							
							
								 
						
							
								d147dd7588 
								
							 
						 
						
							
							
								
								[Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted  
							
							... 
							
							
							
							Port 92f85bea52 
							
						 
						
							2020-05-13 23:17:10 +02:00  
				
					
						
							
							
								 
						
							
								ef2f98317a 
								
							 
						 
						
							
							
								
								[Glitch] Fix some account avatars on public pages having incorrect size  
							
							... 
							
							
							
							Port 48503384d0 
							
						 
						
							2020-05-13 23:17:10 +02:00  
				
					
						
							
							
								 
						
							
								6a17fa2b99 
								
							 
						 
						
							
							
								
								[Glitch] Fix first poll option not being focused when adding a poll  
							
							... 
							
							
							
							Port af6d356279 
							
						 
						
							2020-05-13 23:17:10 +02:00  
				
					
						
							
							
								 
						
							
								559214c33f 
								
							 
						 
						
							
							
								
								[Glitch] Add remote only to public timeline  
							
							... 
							
							
							
							Port 26b08a3c54 
							
						 
						
							2020-05-10 16:19:59 +02:00  
				
					
						
							
							
								 
						
							
								51508e5061 
								
							 
						 
						
							
							
								
								[Glitch] Fix use of inline CSS in public pages  
							
							... 
							
							
							
							Port c0b849bdfd 
							
						 
						
							2020-05-10 16:19:59 +02:00  
				
					
						
							
							
								 
						
							
								89fcd68b75 
								
							 
						 
						
							
							
								
								[Glitch] Fix admin-facing uses of inline CSS  
							
							... 
							
							
							
							Port b8ba977497 
							
						 
						
							2020-05-03 21:47:58 +02:00  
				
					
						
							
							
								 
						
							
								7ea8b07b93 
								
							 
						 
						
							
							
								
								[Glitch] Fix page incorrectly scrolling when bringing up dropdown menus  
							
							... 
							
							
							
							Port 77ec0875ea 
							
						 
						
							2020-05-03 21:47:11 +02:00  
				
					
						
							
							
								 
						
							
								9e5a216878 
								
							 
						 
						
							
							
								
								[Glitch] Fix end-user-facing uses of inline CSS  
							
							... 
							
							
							
							Port 0e362b7678 
							
						 
						
							2020-05-03 21:44:43 +02:00  
				
					
						
							
							
								 
						
							
								4a5f93c25f 
								
							 
						 
						
							
							
								
								[Glitch] Refactor/cleanup TIMELINE_DELETE-related code  
							
							... 
							
							
							
							Port ad9c7aefe6 
							
						 
						
							2020-05-03 21:42:13 +02:00  
				
					
						
							
							
								 
						
							
								502a0365df 
								
							 
						 
						
							
							
								
								[Glitch] Fix messed up z-index when NoScript blocks media/previews  
							
							... 
							
							
							
							Port 04eb599864 
							
						 
						
							2020-05-03 21:41:15 +02:00  
				
					
						
							
							
								 
						
							
								a22e6a3683 
								
							 
						 
						
							
							
								
								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  
				
					
						
							
							
								 
						
							
								9d41a410a3 
								
							 
						 
						
							
							
								
								[Glitch] Fix uninformative error message when uploading unsupported image files  
							
							... 
							
							
							
							Port be637146f3 
							
						 
						
							2020-04-25 15:29:01 +02:00  
				
					
						
							
							
								 
						
							
								572e89e563 
								
							 
						 
						
							
							
								
								[Glitch] Fix expanded video player issues  
							
							... 
							
							
							
							Port c955f98d36 
							
						 
						
							2020-04-25 15:28:16 +02:00  
				
					
						
							
							
								 
						
							
								0f4a8a6487 
								
							 
						 
						
							
							
								
								[Glitch] Set max-width and max-height to gif video  
							
							... 
							
							
							
							Port c5c8f68031 
							
						 
						
							2020-04-25 15:26:42 +02:00  
				
					
						
							
							
								 
						
							
								ce33822e2c 
								
							 
						 
						
							
							
								
								[Glitch] Fix and refactor keyboard navigation in dropdown menus  
							
							... 
							
							
							
							Port 80182eda62 
							
						 
						
							2020-04-25 15:24:02 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								bf9da1e734 
								
							 
						 
						
							
							
								
								[Glitch] Fix uploaded image orientation in some browsers  
							
							... 
							
							
							
							Port a1ce9cbb67 
							
						 
						
							2020-04-18 15:48:15 +02:00  
				
					
						
							
							
								 
						
							
								81ef26b67d 
								
							 
						 
						
							
							
								
								[Glitch] Fix not being able to vote  
							
							... 
							
							
							
							Port e12a5635da 
							
						 
						
							2020-04-17 22:04:10 +02:00  
				
					
						
							
							
								 
						
							
								4849752a9c 
								
							 
						 
						
							
							
								
								[Glitch] Fix Poll fetchPoll action not being debounced.  
							
							... 
							
							
							
							Port ab8d7c0680 
							
						 
						
							2020-04-17 20:20:06 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								7115b0b8c9 
								
							 
						 
						
							
							
								
								Fix missing media description dialog when sending toots with keyboard shortcuts  
							
							
							
						 
						
							2020-03-14 14:59:14 +01:00  
				
					
						
							
							
								 
						
							
								531658d6cf 
								
							 
						 
						
							
							
								
								Fix posting privacy on secondary button with missing description confirmation dialog  
							
							
							
						 
						
							2020-03-14 12:33:50 +01:00  
				
					
						
							
							
								 
						
							
								e53622442c 
								
							 
						 
						
							
							
								
								Fix privacy icon being displayed twice in glitch-soc Web UI  
							
							... 
							
							
							
							Fixes  #1298  
						
							2020-03-11 23:25:15 +01:00