e4d62042bd 
								
							 
						 
						
							
							
								
								[Glitch] Add limitation of image's max zoom rate (max to the original size of image)  
							
							... 
							
							
							
							Port f720af6b72 
							
						 
						
							2020-11-07 18:33:16 +01:00  
				
					
						
							
							
								 
						
							
								91c2f14fd2 
								
							 
						 
						
							
							
								
								[Glitch] Bump detect-passive-events from 1.0.5 to 2.0.1  
							
							... 
							
							
							
							Port e16b0fb15a 
							
						 
						
							2020-11-07 18:32:09 +01:00  
				
					
						
							
							
								 
						
							
								412218af2e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-11-07 18:23:02 +01:00  
				
					
						
							
							
								 
						
							
								f720af6b72 
								
							 
						 
						
							
							
								
								Add limitation of image's max zoom rate (max to the original size of image) ( #15094 )  
							
							... 
							
							
							
							* limit image max scale rate to fit the actual image size
* replace with MIN_SCALE
* fix behavior on touch screen 
							
						 
						
							2020-11-04 20:43:31 +01:00  
				
					
						
							
							
								 
						
							
								5a9fc749c3 
								
							 
						 
						
							
							
								
								Fix unsightly re-layout delay for media previews  
							
							
							
						 
						
							2020-11-04 18:53:52 +01:00  
				
					
						
							
							
								 
						
							
								a48dbc78f8 
								
							 
						 
						
							
							
								
								Fix hiding video breaking playback  
							
							... 
							
							
							
							Also make the video player code closer to upstream 
							
						 
						
							2020-11-04 18:53:39 +01:00  
				
					
						
							
							
								 
						
							
								e16b0fb15a 
								
							 
						 
						
							
							
								
								Bump detect-passive-events from 1.0.5 to 2.0.1 ( #15003 )  
							
							... 
							
							
							
							* Bump detect-passive-events from 1.0.5 to 2.0.1
Bumps [detect-passive-events](https://github.com/rafgraph/detect-passive-events ) from 1.0.5 to 2.0.1.
- [Release notes](https://github.com/rafgraph/detect-passive-events/releases )
- [Commits](https://github.com/rafgraph/detect-passive-events/compare/v1.0.5...v2.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
* Migrate to detect-passive-events v2
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2020-11-05 02:21:05 +09:00  
				
					
						
							
							
								 
						
							
								dc86d814d9 
								
							 
						 
						
							
							
								
								[Glitch] add mouse scroll lock in image expand view  
							
							... 
							
							
							
							Port f645dad661 
							
						 
						
							2020-11-04 12:24:40 +01:00  
				
					
						
							
							
								 
						
							
								40af1cf65b 
								
							 
						 
						
							
							
								
								[Glitch] Add expand/compress image button on image view box  
							
							... 
							
							
							
							Port 6a2db10f76 
							
						 
						
							2020-11-04 12:24:40 +01:00  
				
					
						
							
							
								 
						
							
								f5df3d1ae2 
								
							 
						 
						
							
							
								
								[Glitch] Fix width of content text fluctuating over time  
							
							... 
							
							
							
							Port 2ae751f19d 
							
						 
						
							2020-11-04 12:24:40 +01:00  
				
					
						
							
							
								 
						
							
								078744f210 
								
							 
						 
						
							
							
								
								[Glitch] Make visibility icon clickable as part of the time of a toot  
							
							... 
							
							
							
							Port 1d07f51039 
							
						 
						
							2020-11-04 12:24:40 +01:00  
				
					
						
							
							
								 
						
							
								578e757d09 
								
							 
						 
						
							
							
								
								[Glitch] Make click area of video/audio player buttons bigger in WebUI  
							
							... 
							
							
							
							Port a5afbb62d2 
							
						 
						
							2020-11-03 17:42:40 +01:00  
				
					
						
							
							
								 
						
							
								adfaf9551c 
								
							 
						 
						
							
							
								
								[Glitch] Fix some account media gallery items having empty labels  
							
							... 
							
							
							
							Port 9d023ed4f6 
							
						 
						
							2020-11-03 17:38:50 +01:00  
				
					
						
							
							
								 
						
							
								37dfb9dddc 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong seek bar width on media player  
							
							... 
							
							
							
							Port 8d7fbe7dd9 
							
						 
						
							2020-11-03 17:37:53 +01:00  
				
					
						
							
							
								 
						
							
								3b96141633 
								
							 
						 
						
							
							
								
								[Glitch] Make “Mark media as sensitive” properly translatable  
							
							... 
							
							
							
							Port c5704e75ae 
							
						 
						
							2020-11-03 17:36:54 +01:00  
				
					
						
							
							
								 
						
							
								cd675fbe18 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2020-11-03 17:28:54 +01:00  
				
					
						
							
							
								 
						
							
								f645dad661 
								
							 
						 
						
							
							
								
								add mouse scroll lock in image expand view ( #15088 )  
							
							... 
							
							
							
							* add mouse scroll lock in image expand view
* enhancement 
							
						 
						
							2020-11-03 06:06:45 +01:00  
				
					
						
							
							
								 
						
							
								6a2db10f76 
								
							 
						 
						
							
							
								
								Add expand/compress image button on image view box ( #15068 )  
							
							... 
							
							
							
							* add zoom image button
* enhance zoom algorithm & add translation
* code structure
* code structure
* code structure
* enhance grab performance
* rm useless state
* fix behavior on Firefox & scroll lock & horizontal scroll with mousewheel
* remove scroll lock on MouseWheelEvent
* code structure
* enhance algorithm and code structure
* rm Gemfile.lock from tree
* codeclimate
* fix a stupid mistake 
							
						 
						
							2020-11-02 21:16:38 +01:00  
				
					
						
							
							
								 
						
							
								9d023ed4f6 
								
							 
						 
						
							
							
								
								Fix some account media gallery items having empty labels ( #15073 )  
							
							... 
							
							
							
							Remove the labels entirely for images instead of putting an empty label. 
							
						 
						
							2020-11-01 18:31:39 +01:00  
				
					
						
							
							
								 
						
							
								b8e790c3c2 
								
							 
						 
						
							
							
								
								Fix crash when viewing a profile with a filtered out pinned toot  
							
							
							
						 
						
							2020-11-01 16:53:03 +01:00  
				
					
						
							
							
								 
						
							
								f1f0400adc 
								
							 
						 
						
							
							
								
								Show announcements in reverse chronological order ( #15065 )  
							
							
							
						 
						
							2020-10-30 13:09:51 +01:00  
				
					
						
							
							
								 
						
							
								8d7fbe7dd9 
								
							 
						 
						
							
							
								
								Fix wrong seek bar width on media player ( #15060 )  
							
							
							
						 
						
							2020-10-30 13:09:20 +01:00  
				
					
						
							
							
								 
						
							
								2ae751f19d 
								
							 
						 
						
							
							
								
								Fix width of content text fluctuating over time ( #15055 )  
							
							
							
						 
						
							2020-10-27 13:34:02 +01:00  
				
					
						
							
							
								 
						
							
								a81bb14abe 
								
							 
						 
						
							
							
								
								Add option to hide notification markers  
							
							
							
						 
						
							2020-10-27 11:20:11 +01:00  
				
					
						
							
							
								 
						
							
								c5704e75ae 
								
							 
						 
						
							
							
								
								Make “Mark media as sensitive” properly translatable ( #15051 )  
							
							
							
						 
						
							2020-10-27 03:05:50 +01:00  
				
					
						
							
							
								 
						
							
								1d07f51039 
								
							 
						 
						
							
							
								
								Make visibility icon clickable as part of the time of a toot ( #15053 )  
							
							... 
							
							
							
							- Makes permalink to a toot more easily clickable
- Fix clicking between icon and time in fact clicking the display name
- Fix clicking slightly under time in fact clicking the display name 
							
						 
						
							2020-10-27 03:00:47 +01:00  
				
					
						
							
							
								 
						
							
								a5afbb62d2 
								
							 
						 
						
							
							
								
								Make click area of video/audio player buttons bigger in WebUI ( #15049 )  
							
							
							
						 
						
							2020-10-27 02:58:47 +01:00  
				
					
						
							
							
								 
						
							
								49ee69f75f 
								
							 
						 
						
							
							
								
								Add local setting for pop-in player position  
							
							
							
						 
						
							2020-10-26 20:51:28 +01:00  
				
					
						
							
							
								 
						
							
								ea5298ab9b 
								
							 
						 
						
							
							
								
								Add setting to disable the pop-in player  
							
							
							
						 
						
							2020-10-26 20:31:54 +01:00  
				
					
						
							
							
								 
						
							
								5ee2b860f9 
								
							 
						 
						
							
							
								
								Respect glitch-soc's reply counter setting in the pop-in player  
							
							
							
						 
						
							2020-10-26 20:31:54 +01:00  
				
					
						
							
							
								 
						
							
								47edac871c 
								
							 
						 
						
							
							
								
								[Glitch] Fix regressions in icon buttons in web UI  
							
							... 
							
							
							
							Port a549415868 
							
						 
						
							2020-10-26 19:51:09 +01:00  
				
					
						
							
							
								 
						
							
								8f950e540b 
								
							 
						 
						
							
							
								
								[Glitch] Add pop-out player for audio/video in web UI  
							
							... 
							
							
							
							port d88a79b456 
							
						 
						
							2020-10-26 19:51:09 +01:00  
				
					
						
							
							
								 
						
							
								ddbb9f0ec4 
								
							 
						 
						
							
							
								
								[Glitch] Fix follow request notifications  
							
							... 
							
							
							
							Port 3678b10823 
							
						 
						
							2020-10-26 15:50:48 +01:00  
				
					
						
							
							
								 
						
							
								9c34090db8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/services/process_mentions_service.rb`:
  glitch-soc local-only handling, ported upstream changes 
							
						 
						
							2020-10-26 15:48:16 +01:00  
				
					
						
							
							
								 
						
							
								3678b10823 
								
							 
						 
						
							
							
								
								Fix follow request notifications ( #15048 )  
							
							
							
						 
						
							2020-10-26 15:41:28 +01:00  
				
					
						
							
							
								 
						
							
								5c60f7eaed 
								
							 
						 
						
							
							
								
								[Glitch] Fix strings that could not be translated  
							
							... 
							
							
							
							Port fb5f3be18f 
							
						 
						
							2020-10-21 21:49:46 +02:00  
				
					
						
							
							
								 
						
							
								4ae4b03974 
								
							 
						 
						
							
							
								
								[Glitch] Change how missing desktop notifications permission is displayed  
							
							... 
							
							
							
							Port a69ca29473 
							
						 
						
							2020-10-21 21:49:46 +02:00  
				
					
						
							
							
								 
						
							
								dca05c79a9 
								
							 
						 
						
							
							
								
								Move columns-related CSS rules into the appropriate files  
							
							
							
						 
						
							2020-10-21 21:28:47 +02:00  
				
					
						
							
							
								 
						
							
								b5927301cf 
								
							 
						 
						
							
							
								
								[Glitch] Fix browser notification permission request logic  
							
							... 
							
							
							
							Port f54ca3d08e 
							
						 
						
							2020-10-21 21:28:47 +02:00  
				
					
						
							
							
								 
						
							
								78ad04420c 
								
							 
						 
						
							
							
								
								[Glitch] Add duration parameter to muting.  
							
							... 
							
							
							
							Port 96761752ec 
							
						 
						
							2020-10-21 21:28:47 +02:00  
				
					
						
							
							
								 
						
							
								813c84cd6c 
								
							 
						 
						
							
							
								
								[Glitch] Change how CDN_HOST is passed down to make assets build reproducible  
							
							... 
							
							
							
							Port 4c45b43cb8 
							
						 
						
							2020-10-21 21:28:47 +02:00  
				
					
						
							
							
								 
						
							
								842c048c6b 
								
							 
						 
						
							
							
								
								[Glitch] Fix unread notification marker not updating when mounting column  
							
							... 
							
							
							
							Port dac3e362fd 
							
						 
						
							2020-10-21 19:36:41 +02:00  
				
					
						
							
							
								 
						
							
								f7306c7b7c 
								
							 
						 
						
							
							
								
								[Glitch] Ignore alt-key hotkeys in text fields  
							
							... 
							
							
							
							Port 63770d3aac 
							
						 
						
							2020-10-21 19:34:44 +02:00  
				
					
						
							
							
								 
						
							
								8071613dd7 
								
							 
						 
						
							
							
								
								[Glitch] Fix mark as read in notifications to be saved immediately  
							
							... 
							
							
							
							Port bec8b12bb5 
							
						 
						
							2020-10-21 19:33:20 +02:00  
				
					
						
							
							
								 
						
							
								c3d82027cf 
								
							 
						 
						
							
							
								
								[Glitch] Fix bell button causing a brief “Cancel follow request” on locked accounts  
							
							... 
							
							
							
							Port 82951920f7 
							
						 
						
							2020-10-21 19:24:32 +02:00  
				
					
						
							
							
								 
						
							
								ec49aa8175 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷 
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency. 
							
						 
						
							2020-10-21 19:10:50 +02:00  
				
					
						
							
							
								 
						
							
								29870d2be6 
								
							 
						 
						
							
							
								
								Glitchsoc translation to 'es' language ( #1439 )  
							
							... 
							
							
							
							glitch-soc-specific translation to 'es' language 
							
						 
						
							2020-10-19 22:17:29 +02:00  
				
					
						
							
							
								 
						
							
								4130aef29c 
								
							 
						 
						
							
							
								
								Fix translation string ( #14986 )  
							
							
							
						 
						
							2020-10-16 21:41:43 +02:00  
				
					
						
							
							
								 
						
							
								fb5f3be18f 
								
							 
						 
						
							
							
								
								Fix strings that could not be translated ( #14980 )  
							
							
							
						 
						
							2020-10-15 21:24:58 +02:00  
				
					
						
							
							
								 
						
							
								a69ca29473 
								
							 
						 
						
							
							
								
								Change how missing desktop notifications permission is displayed ( #14985 )  
							
							... 
							
							
							
							Add missing controls for new notification type 
							
						 
						
							2020-10-15 16:24:47 +02:00