cfca28bc87
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-12 18:01:21 +02:00
789cb3c028
Revert bcrypt to 3.1.12 ( #11555 )
2019-08-12 17:52:12 +02:00
42588ed460
[Glitch] Fix "cancel follow request" button having unreadable text in web UI
...
Port e823b49214
2019-08-12 16:49:12 +02:00
c4ae7aab6f
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-12 16:24:22 +02:00
74111bbb1c
Bump sass from 1.22.7 to 1.22.9 ( #11545 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.22.7 to 1.22.9.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.22.7...1.22.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 21:19:49 +09:00
6fb89d9e9b
Bump parallel_tests from 2.29.1 to 2.29.2 ( #11549 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.29.1...v2.29.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:14:22 +09:00
ccb2b6afb1
Bump devise-two-factor from 3.0.3 to 3.1.0 ( #11550 )
...
Bumps [devise-two-factor](https://github.com/tinfoil/devise-two-factor ) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/tinfoil/devise-two-factor/releases )
- [Changelog](https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tinfoil/devise-two-factor/compare/v3.0.3...v3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:11:55 +09:00
ff1333ff40
Bump puma from 4.0.1 to 4.1.0 ( #11548 )
...
Bumps [puma](https://github.com/puma/puma ) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v4.0.1...v4.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:11:18 +09:00
0617198e41
Bump faker from 2.1.0 to 2.1.2 ( #11547 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.1.0 to 2.1.2.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.1.0...v2.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:10:16 +09:00
4b21a9db2f
Bump webpack-dev-server from 3.7.2 to 3.8.0 ( #11546 )
...
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server ) from 3.7.2 to 3.8.0.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases )
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.7.2...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:08:37 +09:00
0b28890357
Bump css-loader from 3.1.0 to 3.2.0 ( #11544 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.1.0...v3.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:07:57 +09:00
8a2afb576d
Bump terser-webpack-plugin from 1.3.0 to 1.4.1 ( #11542 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 1.3.0 to 1.4.1.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v1.3.0...v1.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 20:06:04 +09:00
093e3756a7
[Security] Bump nokogiri from 1.10.3 to 1.10.4 ( #11540 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.3 to 1.10.4. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.3...v1.10.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-11 23:48:56 +02:00
646f96d448
Fix ActivityPub and REST API queries setting cookies and preventing caching ( #11539 )
...
Regression from #8657
2019-08-11 22:59:40 +02:00
aebefc7ce9
Fix some emojis in profile metadata labels are not emojified. ( #11534 )
2019-08-11 13:15:18 +02:00
c5661b0f92
Fix account search always returning exact match on paginated results ( #11525 )
...
Fix #11365
2019-08-11 13:14:51 +02:00
7a1f8a58df
Fix crash when saving invalid domain name ( #11528 )
...
Fix #7629
2019-08-08 23:04:19 +02:00
699db454c3
Fix pinned statuses API returning pagination headers ( #11526 )
...
Fix #10227
2019-08-08 23:04:04 +02:00
898dacf83e
Fix weekly usage not being displayed correctly in hashtag admin UI ( #11524 )
...
Fix percentages in usage breakdown having too many digits
Change trending hashtags to only ask for review if a hashtag enters
the top 3 position in the set, since it's the only items shown in
the default web UI
2019-08-08 23:03:28 +02:00
41aac1ba3a
Add GIF and WebP support for custom emojis ( #11519 )
...
Fix #11466
2019-08-08 23:03:09 +02:00
fd01043691
Fix “read more” button behing hidden (regression from #11404 ) ( #11522 )
...
* Fix “read more” button behing hidden (regression from #11404 )
This has the side-effect of putting the “Read more” button below possibly
trunctated polls instead of putting the poll below the “Read more”
* Remove dead code
2019-08-08 17:05:50 +02:00
aa485d6f05
Merge pull request #1194 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-08 09:25:00 +02:00
9b8edbea5b
Fix domain block edition in glitch-soc
2019-08-08 09:14:20 +02:00
e823b49214
Fix "cancel follow request" button having unreadable text in web UI ( #11521 )
...
Fix #11478
2019-08-08 08:56:55 +02:00
ebc0521ba8
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-08 08:44:33 +02:00
f51c7c105f
Fix acct URIs with IDN domains not being resolved ( #11520 )
...
Fix #11494
2019-08-07 21:14:08 +02:00
3a6b6c63f2
Add breakdown of usage by source to admin UI for hashtags ( #11517 )
...
Allows determining where the majority of posts in a hashtag come
from on a given day at a glance.
2019-08-07 20:20:39 +02:00
bced70469a
Add domain block notes ( #11515 )
...
* Add database columns for adding notes to domain blocks/restrctions
* Add admin UI to set private and public comments when blocking a domain
* Add text for private and public comments on domain blocks
* Show domain block comments in admin UI
* Add comments to the domain block undo page
* Make UnblockDomainService more robust regarding upgraded domain blocks
* Allow editing domain blocks
* Rename button from “undo domain block” to “view domain block” in account admin UI
* Change test to unsilence silenced users from upgraded blocks
2019-08-07 20:20:23 +02:00
86cfa2ea6c
Merge pull request #1193 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-07 20:04:22 +02:00
94c54997cf
Fix trending tags returning less items than requested sometimes ( #11513 )
...
Add better sorting defaults to the hashtags admin UI
Add "not reviewed" filter to hashtags admin UI
2019-08-07 17:08:30 +02:00
7a737c79cc
Add number of pending accounts and pending hashtags to admin dashboard ( #11514 )
2019-08-07 16:13:34 +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
Thibaut Girka