tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
11,280 Commits 20 Branches 113 Tags 222 MiB
96ec90b986
Commit Graph

11280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugen Rochko
41aac1ba3a
Add GIF and WebP support for custom emojis (#11519) 
Fix #11466
 2019-08-08 23:03:09 +02:00
ThibG
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
ThibG
aa485d6f05
Merge pull request #1194 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-08 09:25:00 +02:00
Thibaut Girka
9b8edbea5b Fix domain block edition in glitch-soc 2019-08-08 09:14:20 +02:00
Eugen Rochko
e823b49214
Fix "cancel follow request" button having unreadable text in web UI (#11521) 
Fix #11478
 2019-08-08 08:56:55 +02:00
Thibaut Girka
ebc0521ba8 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-08 08:44:33 +02:00
Eugen Rochko
f51c7c105f
Fix acct URIs with IDN domains not being resolved (#11520) 
Fix #11494
 2019-08-07 21:14:08 +02:00
Eugen Rochko
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
ThibG
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
ThibG
86cfa2ea6c
Merge pull request #1193 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-07 20:04:22 +02:00
Eugen Rochko
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
Eugen Rochko
7a737c79cc
Add number of pending accounts and pending hashtags to admin dashboard (#11514) 2019-08-07 16:13:34 +02:00
Eugen Rochko
e8ad0a8006 [Glitch] Fix hashtag links always being lowercase 
Port 5e35aa8280 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-07 15:35:44 +02:00
ThibG
e8e980cdac [Glitch] Improve focus handling with dropdown menus 
Port 396b8cdd0f to glitch-soc
 2019-08-07 15:11:59 +02:00
Thibaut Girka
95fc39a1e6 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 15:07:04 +02:00
ThibG
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
Thibaut Girka
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
Eugen Rochko
ac33f1aedd
Fix account tags not being saved correctly (#11507) 
* Fix account tags not being saved correctly

Regression from f371b32

Fix Tag#discoverable not returning tags where listable is nil instead of true

Add notice when saving hashtags in admin UI

Change public hashtag and directory pages to return 404 for forbidden tags

* Remove unused locale string
 2019-08-07 10:01:55 +02:00
Eugen Rochko
5e35aa8280
Fix non-lowercase hashtags not being picked up by the streaming API (#11508) 
Regression from f371b32

Fix hashtag links always being lowercase
 2019-08-07 10:01:19 +02:00
Eugen Rochko
a8958d07e2
Fix featured tags not finding the right tag on save (#11504) 
Regression from f371b32
 2019-08-07 10:00:58 +02:00
Eugen Rochko
dd38c280a5
Fix admin dashboard missing latest features (#11505) 
Fix redis-namespace deprecation warning about administrative commands
 2019-08-06 19:40:06 +02:00
Eugen Rochko
9072fe5ab6
Add trends UI with admin and user settings (#11502) 2019-08-06 17:57:52 +02:00
ThibG
8400ddca71
Merge pull request #1191 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-06 17:25:54 +02:00
Thibaut Girka
d10f6036cf Implement keyboard navigation in glitch-soc composer 2019-08-06 16:36:18 +02:00
Yusuke Nakamura
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
Thibaut Girka
6d2b0fa3f0 Refactor composer Dropdown's component a bit to make it closer to upstream 2019-08-06 15:09:30 +02:00
ThibG
381dbb6569 [Glitch] Fix image uploads being perfectly white when canvas read access is blocked 
Port 111a0628fc to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-06 15:09:30 +02:00
ThibG
a4b15e2cf0 [Glitch] Port changes to IconButton 
Port changes to IconButton from 27a0d02d0d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-06 15:09:30 +02:00
ThibG
fe1de4e49b [Glitch] Improve dropdown menu keyboard navigation 
Port a12f1a0baf to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-06 15:09:30 +02:00
ThibG
6afdb6c2b6 [Glitch] Trap tab in modals 
Port 5c73746b69 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-06 15:09:30 +02:00
Thibaut Girka
cad2e6eb7a Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
Thibaut Girka
3ea7a334d8 Fix up try/catch block in invalid URL handling 2019-08-06 13:09:49 +02:00
Thibaut Girka
cbd75fe128 Remove href attribute of invalid links instead of crashing 2019-08-06 12:32:06 +02:00
Eugen Rochko
1d8d553d8b
Revert "Change links in webUI to rewrite misleading links (#11426)" (#11500) 
This reverts commit b31b232edf.
 2019-08-06 12:09:28 +02:00
ThibG
111a0628fc Fix image uploads being perfectly white when canvas read access is blocked (#11499) 
Fixes #11496
 2019-08-06 12:08:19 +02:00
ThibG
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
ThibG
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
ThibG
5c73746b69 Trap tab in modals (#11493) 2019-08-06 11:59:28 +02:00
ThibG
792d0dd470 Fix privacy dropdown active state when dropdown is placed on top of it (#11495) 2019-08-06 11:59:14 +02:00
Eugen Rochko
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
ThibG
0aee74d78a
Merge pull request #1187 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-05 17:58:39 +02:00
Thibaut Girka
68eb58b805 Fix color of dropdown icons 2019-08-05 14:25:48 +02:00
ThibG
f02ffce249 [Glitch] Change icon button styles to make hover/focus states more obvious 
Port c8fd823327 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-05 14:20:21 +02:00
ThibG
8b57d704dc [Glitch] Disable list title validation button when list title is empty 
Port 089c641020 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-05 13:22:27 +02:00
Thibaut Girka
e50554391a Merge branch 'master' into glitch-soc/merge-upstream 2019-08-05 13:13:28 +02:00
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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