86cfa2ea6c 
								
							 
						 
						
							
							
								
								Merge pull request  #1193  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2019-08-07 20:04:22 +02:00  
				
					
						
							
							
								 
						
							
								e8ad0a8006 
								
							 
						 
						
							
							
								
								[Glitch] Fix hashtag links always being lowercase  
							
							... 
							
							
							
							Port 5e35aa8280 
							
						 
						
							2019-08-07 15:35:44 +02:00  
				
					
						
							
							
								 
						
							
								e8e980cdac 
								
							 
						 
						
							
							
								
								[Glitch] Improve focus handling with dropdown menus  
							
							... 
							
							
							
							Port 396b8cdd0f 
							
						 
						
							2019-08-07 15:11:59 +02:00  
				
					
						
							
							
								 
						
							
								95fc39a1e6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-08-07 15:07:04 +02:00  
				
					
						
							
							
								 
						
							
								396b8cdd0f 
								
							 
						 
						
							
							
								
								Improve focus handling with dropdown menus ( #11511 )  
							
							... 
							
							
							
							- Focus first item when activated via keyboard
- When the dropdown menu closes, give back the focus to
  the actual element which was focused prior to opening the menu 
							
						 
						
							2019-08-07 13:58:53 +02:00  
				
					
						
							
							
								 
						
							
								04534604c6 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml 
							
						 
						
							2019-08-07 13:56:48 +02:00  
				
					
						
							
							
								 
						
							
								ac33f1aedd 
								
							 
						 
						
							
							
								
								Fix account tags not being saved correctly ( #11507 )  
							
							... 
							
							
							
							* Fix account tags not being saved correctly
Regression from f371b32 
							
						 
						
							2019-08-07 10:01:55 +02:00  
				
					
						
							
							
								 
						
							
								5e35aa8280 
								
							 
						 
						
							
							
								
								Fix non-lowercase hashtags not being picked up by the streaming API ( #11508 )  
							
							... 
							
							
							
							Regression from f371b32 
							
						 
						
							2019-08-07 10:01:19 +02:00  
				
					
						
							
							
								 
						
							
								a8958d07e2 
								
							 
						 
						
							
							
								
								Fix featured tags not finding the right tag on save ( #11504 )  
							
							... 
							
							
							
							Regression from f371b32 
							
						 
						
							2019-08-07 10:00:58 +02:00  
				
					
						
							
							
								 
						
							
								dd38c280a5 
								
							 
						 
						
							
							
								
								Fix admin dashboard missing latest features ( #11505 )  
							
							... 
							
							
							
							Fix redis-namespace deprecation warning about administrative commands 
							
						 
						
							2019-08-06 19:40:06 +02:00  
				
					
						
							
							
								 
						
							
								9072fe5ab6 
								
							 
						 
						
							
							
								
								Add trends UI with admin and user settings ( #11502 )  
							
							
							
						 
						
							2019-08-06 17:57:52 +02:00  
				
					
						
							
							
								 
						
							
								8400ddca71 
								
							 
						 
						
							
							
								
								Merge pull request  #1191  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2019-08-06 17:25:54 +02:00  
				
					
						
							
							
								 
						
							
								d10f6036cf 
								
							 
						 
						
							
							
								
								Implement keyboard navigation in glitch-soc composer  
							
							
							
						 
						
							2019-08-06 16:36:18 +02:00  
				
					
						
							
							
								 
						
							
								82d2069c75 
								
							 
						 
						
							
							
								
								Bump faker from 1.9.6 to 2.1.0 and update faker api ( #11489 )  
							
							... 
							
							
							
							* Bump faker from 1.9.6 to 2.1.0
Bumps [faker](https://github.com/stympy/faker ) from 1.9.6 to 2.1.0.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/1.9.6...v2.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Use faker api v2
https://github.com/stympy/faker/releases/tag/2.0  
							
						 
						
							2019-08-06 15:33:03 +02:00  
				
					
						
							
							
								 
						
							
								6d2b0fa3f0 
								
							 
						 
						
							
							
								
								Refactor composer Dropdown's component a bit to make it closer to upstream  
							
							
							
						 
						
							2019-08-06 15:09:30 +02:00  
				
					
						
							
							
								 
						
							
								381dbb6569 
								
							 
						 
						
							
							
								
								[Glitch] Fix image uploads being perfectly white when canvas read access is blocked  
							
							... 
							
							
							
							Port 111a0628fc 
							
						 
						
							2019-08-06 15:09:30 +02:00  
				
					
						
							
							
								 
						
							
								a4b15e2cf0 
								
							 
						 
						
							
							
								
								[Glitch] Port changes to IconButton  
							
							... 
							
							
							
							Port changes to IconButton from 27a0d02d0d 
							
						 
						
							2019-08-06 15:09:30 +02:00  
				
					
						
							
							
								 
						
							
								fe1de4e49b 
								
							 
						 
						
							
							
								
								[Glitch] Improve dropdown menu keyboard navigation  
							
							... 
							
							
							
							Port a12f1a0baf 
							
						 
						
							2019-08-06 15:09:30 +02:00  
				
					
						
							
							
								 
						
							
								6afdb6c2b6 
								
							 
						 
						
							
							
								
								[Glitch] Trap tab in modals  
							
							... 
							
							
							
							Port 5c73746b69 
							
						 
						
							2019-08-06 15:09:30 +02:00  
				
					
						
							
							
								 
						
							
								cad2e6eb7a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-08-06 13:16:53 +02:00  
				
					
						
							
							
								 
						
							
								3ea7a334d8 
								
							 
						 
						
							
							
								
								Fix up try/catch block in invalid URL handling  
							
							
							
						 
						
							2019-08-06 13:09:49 +02:00  
				
					
						
							
							
								 
						
							
								cbd75fe128 
								
							 
						 
						
							
							
								
								Remove href attribute of invalid links instead of crashing  
							
							
							
						 
						
							2019-08-06 12:32:06 +02:00  
				
					
						
							
							
								 
						
							
								1d8d553d8b 
								
							 
						 
						
							
							
								
								Revert "Change links in webUI to rewrite misleading links ( #11426 )" ( #11500 )  
							
							... 
							
							
							
							This reverts commit b31b232edf 
							
						 
						
							2019-08-06 12:09:28 +02:00  
				
					
						
							
							
								 
						
							
								111a0628fc 
								
							 
						 
						
							
							
								
								Fix image uploads being perfectly white when canvas read access is blocked ( #11499 )  
							
							... 
							
							
							
							Fixes  #11496  
						
							2019-08-06 12:08:19 +02:00  
				
					
						
							
							
								 
						
							
								27a0d02d0d 
								
							 
						 
						
							
							
								
								Improve keyboard navigation in privacy dropdown ( #11492 )  
							
							... 
							
							
							
							* Trap tab in privacy dropdown
* Give focus back to last focused element when privacy dropdown menu closes
* Actually give back focus to the element that had it before clicking the dropdown 
							
						 
						
							2019-08-06 11:59:58 +02:00  
				
					
						
							
							
								 
						
							
								a12f1a0baf 
								
							 
						 
						
							
							
								
								Improve dropdown menu keyboard navigation ( #11491 )  
							
							... 
							
							
							
							* Allow selecting menu items with the space bar in status dropdown menus
* Fix modals opened by keyboard navigation being immediately closed
* Fix menu items triggering modal actions
* Add Tab trapping inside dropdown menu
* Give focus back to last focused element when status dropdown menu closes 
							
						 
						
							2019-08-06 11:59:46 +02:00  
				
					
						
							
							
								 
						
							
								5c73746b69 
								
							 
						 
						
							
							
								
								Trap tab in modals ( #11493 )  
							
							
							
						 
						
							2019-08-06 11:59:28 +02:00  
				
					
						
							
							
								 
						
							
								792d0dd470 
								
							 
						 
						
							
							
								
								Fix privacy dropdown active state when dropdown is placed on top of it ( #11495 )  
							
							
							
						 
						
							2019-08-06 11:59:14 +02:00  
				
					
						
							
							
								 
						
							
								115dab78f1 
								
							 
						 
						
							
							
								
								Change admin UI for hashtags and add back whitelisted trends ( #11490 )  
							
							... 
							
							
							
							Fix  #271 
Add back the `GET /api/v1/trends` API with the caveat that it does
not return tags that have not been allowed to trend by the staff.
When a hashtag begins to trend (internally) and that hashtag has
not been previously reviewed by the staff, the staff is notified.
The new admin UI for hashtags allows filtering hashtags by where
they are used (e.g. in the profile directory), whether they have
been reviewed or are pending reviewal, they show by how many people
the hashtag is used in the directory, how many people used it
today, how many statuses with it have been created today, and it
allows fixing the name of the hashtag to make it more readable.
The disallowed hashtags feature has been reworked. It is now
controlled from the admin UI for hashtags instead of from
the file `config/settings.yml` 
						
							2019-08-05 19:54:29 +02:00  
				
					
						
							
							
								 
						
							
								0aee74d78a 
								
							 
						 
						
							
							
								
								Merge pull request  #1187  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2019-08-05 17:58:39 +02:00  
				
					
						
							
							
								 
						
							
								68eb58b805 
								
							 
						 
						
							
							
								
								Fix color of dropdown icons  
							
							
							
						 
						
							2019-08-05 14:25:48 +02:00  
				
					
						
							
							
								 
						
							
								f02ffce249 
								
							 
						 
						
							
							
								
								[Glitch] Change icon button styles to make hover/focus states more obvious  
							
							... 
							
							
							
							Port c8fd823327 
							
						 
						
							2019-08-05 14:20:21 +02:00  
				
					
						
							
							
								 
						
							
								8b57d704dc 
								
							 
						 
						
							
							
								
								[Glitch] Disable list title validation button when list title is empty  
							
							... 
							
							
							
							Port 089c641020 
							
						 
						
							2019-08-05 13:22:27 +02:00  
				
					
						
							
							
								 
						
							
								e50554391a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-08-05 13:13:28 +02:00  
				
					
						
							
							
								 
						
							
								6201bfdfba 
								
							 
						 
						
							
							
								
								Bump rubocop from 0.73.0 to 0.74.0 ( #11486 )  
							
							... 
							
							
							
							Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.73.0 to 0.74.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.73.0...v0.74.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com> 
							
						 
						
							2019-08-05 18:53:30 +09:00  
				
					
						
							
							
								 
						
							
								dbee35dc80 
								
							 
						 
						
							
							
								
								Bump webmock from 3.6.0 to 3.6.2 ( #11488 )  
							
							... 
							
							
							
							Bumps [webmock](https://github.com/bblimke/webmock ) from 3.6.0 to 3.6.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.6.0...v3.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com> 
							
						 
						
							2019-08-05 18:52:57 +09:00  
				
					
						
							
							
								 
						
							
								73e91d3b4d 
								
							 
						 
						
							
							
								
								Bump dotenv-rails from 2.7.4 to 2.7.5 ( #11487 )  
							
							... 
							
							
							
							Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.7.4 to 2.7.5.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.7.4...v2.7.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com> 
							
						 
						
							2019-08-05 18:42:51 +09:00  
				
					
						
							
							
								 
						
							
								a954159781 
								
							 
						 
						
							
							
								
								Bump @babel/plugin-transform-react-jsx-source from 7.2.0 to 7.5.0 ( #11482 )  
							
							... 
							
							
							
							Bumps [@babel/plugin-transform-react-jsx-source](https://github.com/babel/babel ) from 7.2.0 to 7.5.0.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com> 
							
						 
						
							2019-08-05 18:25:56 +09:00  
				
					
						
							
							
								 
						
							
								f88550a6cb 
								
							 
						 
						
							
							
								
								Bump capybara from 3.27.0 to 3.28.0 ( #11484 )  
							
							... 
							
							
							
							Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.27.0 to 3.28.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.27.0...3.28.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com> 
							
						 
						
							2019-08-05 18:25:40 +09:00  
				
					
						
							
							
								 
						
							
								b5b33fbbeb 
								
							 
						 
						
							
							
								
								Bump webpack-cli from 3.3.5 to 3.3.6 ( #11481 )  
							
							... 
							
							
							
							Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.3.5 to 3.3.6.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.6/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.5...v3.3.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com> 
							
						 
						
							2019-08-05 18:00:15 +09:00  
				
					
						
							
							
								 
						
							
								f640f74c21 
								
							 
						 
						
							
							
								
								Bump eslint-plugin-react from 7.14.2 to 7.14.3 ( #11480 )  
							
							... 
							
							
							
							Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.14.2 to 7.14.3.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.14.2...v7.14.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com> 
							
						 
						
							2019-08-05 17:40:35 +09:00  
				
					
						
							
							
								 
						
							
								45ec360481 
								
							 
						 
						
							
							
								
								Fix timestamp on featured tag ( #11477 )  
							
							... 
							
							
							
							It resolves  #11338  
							
						 
						
							2019-08-04 23:00:38 +02:00  
				
					
						
							
							
								 
						
							
								ff0ceb28b3 
								
							 
						 
						
							
							
								
								Remove link rewriting option as it is easily bypassable  
							
							
							
						 
						
							2019-08-04 22:25:56 +02:00  
				
					
						
							
							
								 
						
							
								76b80a1511 
								
							 
						 
						
							
							
								
								Perform case-insensitive comparison for international domain names  
							
							... 
							
							
							
							Note: this uses `toLowerCase()` instead of doing proper case folding 
							
						 
						
							2019-08-04 22:25:56 +02:00  
				
					
						
							
							
								 
						
							
								43b137e1f9 
								
							 
						 
						
							
							
								
								Perform case-insensitive comparison of non-International domain names  
							
							
							
						 
						
							2019-08-04 22:25:56 +02:00  
				
					
						
							
							
								 
						
							
								a0b6f1665a 
								
							 
						 
						
							
							
								
								Make link target domain tag just a bit smaller  
							
							
							
						 
						
							2019-08-04 22:25:56 +02:00  
				
					
						
							
							
								 
						
							
								c01de0f721 
								
							 
						 
						
							
							
								
								Ensure link rewriting setting changes are immediately applied  
							
							
							
						 
						
							2019-08-04 22:25:56 +02:00  
				
					
						
							
							
								 
						
							
								6600da0f7b 
								
							 
						 
						
							
							
								
								Handle Mastodon-generated links for targets starting with “www.” properly  
							
							
							
						 
						
							2019-08-04 22:25:56 +02:00  
				
					
						
							
							
								 
						
							
								df866a464d 
								
							 
						 
						
							
							
								
								Add options to highlight misleading links in statuses  
							
							... 
							
							
							
							Fixes  #1162  
						
							2019-08-04 22:25:56 +02:00  
				
					
						
							
							
								 
						
							
								49a28e69a5 
								
							 
						 
						
							
							
								
								Move decodeIDNA to app/javascript/flavours/glitch/util  
							
							
							
						 
						
							2019-08-04 22:25:56 +02:00